aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2020-12-18 15:45:39 +0200
committerHeikki Halmet <heikki.halmet@qt.io>2020-12-21 07:50:13 +0200
commitbf9b9f9b988fca415edc26882eac06bdc9d66f70 (patch)
tree4fdd495924d9a6aa31ae393091f53d2a0881f35b
parentec0fff7cbb7f2d3d905c31bb9dedafd3713c217f (diff)
Update macOS 10.13 Tier1 image
Software updates are disabled from tier1 image. It seems, that without this macOS 10.13 keep on crashing. This is related to QTQAINFRA-4104 Change-Id: I92f0039102d93268358301bfb789765ca39fd1ae Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 9a0045045447bd34c7885b433a7fdfa66bde7ca1) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r--coin/platform_configs/default.yaml2
-rw-r--r--coin/platform_configs/qdb.yaml2
-rw-r--r--coin/platform_configs/qt5.yaml6
-rw-r--r--coin/platform_configs/tqtc-qt-config-gui.yaml2
4 files changed, 6 insertions, 6 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml
index 2a690178..3a4c9eb3 100644
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -81,7 +81,7 @@ Configurations:
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s'
-
- Template: 'qtci-macos-10.13-x86_64-2'
+ Template: 'qtci-macos-10.13-x86_64-3'
Compiler: 'Clang'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'
diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml
index c5bc7538..7b4660a2 100644
--- a/coin/platform_configs/qdb.yaml
+++ b/coin/platform_configs/qdb.yaml
@@ -18,7 +18,7 @@ Configurations:
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu'
-
- Template: 'qtci-macos-10.13-x86_64-2'
+ Template: 'qtci-macos-10.13-x86_64-3'
Compiler: 'Clang'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu'
diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml
index b359f966..9d8eeeff 100644
--- a/coin/platform_configs/qt5.yaml
+++ b/coin/platform_configs/qt5.yaml
@@ -48,7 +48,7 @@ Configurations:
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20'
-
- Template: 'qtci-macos-10.13-x86_64-2'
+ Template: 'qtci-macos-10.13-x86_64-3'
Target os: 'Android_ANY'
Target arch: 'multi'
Compiler: 'Clang'
@@ -56,7 +56,7 @@ Configurations:
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64'
-
- Template: 'qtci-macos-10.13-x86_64-2'
+ Template: 'qtci-macos-10.13-x86_64-3'
Target os: 'QNX_700'
Target arch: 'x86'
Compiler: 'GCC'
@@ -108,7 +108,7 @@ Configurations:
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake examples -nomake tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -platform win32-g++ -xplatform wasm-emscripten'
-
- Template: 'qtci-macos-10.13-x86_64-2'
+ Template: 'qtci-macos-10.13-x86_64-3'
Target os: 'WebAssembly'
Compiler: 'Clang'
Features: ['Packaging', 'DisableTests']
diff --git a/coin/platform_configs/tqtc-qt-config-gui.yaml b/coin/platform_configs/tqtc-qt-config-gui.yaml
index 6c5d1d43..fb14fe15 100644
--- a/coin/platform_configs/tqtc-qt-config-gui.yaml
+++ b/coin/platform_configs/tqtc-qt-config-gui.yaml
@@ -18,7 +18,7 @@ Configurations:
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu'
-
- Template: 'qtci-macos-10.13-x86_64-2'
+ Template: 'qtci-macos-10.13-x86_64-3'
Compiler: 'Clang'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu'