aboutsummaryrefslogtreecommitdiffstats
path: root/coin
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-18 15:48:04 +0000
commit9a0045045447bd34c7885b433a7fdfa66bde7ca1 (patch)
tree45932a88cb4265360eb8ebb8d50d0cf333a0ea6a /coin
parent441808dd7ec6dd14635bebf14db9ab9b78d71bc5 (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>
Diffstat (limited to 'coin')
-rw-r--r--coin/platform_configs/default.yaml10
-rw-r--r--coin/platform_configs/installer-framework.yaml2
-rw-r--r--coin/platform_configs/qt5.yaml6
3 files changed, 9 insertions, 9 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml
index 4b023c13..d8ca7bdb 100644
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -99,7 +99,7 @@
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 -qt-xcb -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 -debug-and-release -release -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'
@@ -113,28 +113,28 @@
Compiler: 'Clang'
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include'
-
- Template: 'qtci-macos-10.13-x86_64-2'
+ Template: 'qtci-macos-10.13-x86_64-3'
Target os: 'IOS_ANY'
Target arch: 'multi'
Compiler: 'Clang'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang'
-
- Template: 'qtci-macos-10.13-x86_64-2'
+ Template: 'qtci-macos-10.13-x86_64-3'
Target os: 'TvOS_ANY'
Target arch: 'multi'
Compiler: 'Clang'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang'
-
- Template: 'qtci-macos-10.13-x86_64-2'
+ Template: 'qtci-macos-10.13-x86_64-3'
Target os: 'WatchOS_ANY'
Target arch: 'multi'
Compiler: 'Clang'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang'
-
- Template: 'qtci-macos-10.13-x86_64-2'
+ Template: 'qtci-macos-10.13-x86_64-3'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'Clang'
diff --git a/coin/platform_configs/installer-framework.yaml b/coin/platform_configs/installer-framework.yaml
index aaa563ef..385ff890 100644
--- a/coin/platform_configs/installer-framework.yaml
+++ b/coin/platform_configs/installer-framework.yaml
@@ -10,7 +10,7 @@ Configurations:
Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;']
Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86']
-
- Template: 'qtci-macos-10.13-x86_64-2'
+ Template: 'qtci-macos-10.13-x86_64-3'
Compiler: 'Clang'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install'
diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml
index d67738ab..c2a61816 100644
--- a/coin/platform_configs/qt5.yaml
+++ b/coin/platform_configs/qt5.yaml
@@ -67,7 +67,7 @@
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-r19c -android-arch arm64-v8a'
-
- Template: 'qtci-macos-10.13-x86_64-2'
+ Template: 'qtci-macos-10.13-x86_64-3'
Target os: 'Android_ANY'
Target arch: 'armv7'
Compiler: 'Clang'
@@ -75,7 +75,7 @@
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-r19c -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a'
-
- Template: 'qtci-macos-10.13-x86_64-2'
+ Template: 'qtci-macos-10.13-x86_64-3'
Target os: 'Android_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
@@ -83,7 +83,7 @@
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-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a'
-
- 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'