lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2025-12-21 15:38:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update macOS 10.13 Tier1 image

Browse Source 
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>
This commit is contained in:
Heikki Halmet
2020-12-18 15:45:39 +02:00
parent 441808dd7e
commit 9a00450454
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
coin/platform_configs/default.yaml
View File

@@ -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'

2
coin/platform_configs/installer-framework.yaml
View File

@@ -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'

6
coin/platform_configs/qt5.yaml
View File

@@ -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'