diff options
88 files changed, 449 insertions, 155 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 2a690178..4a3d06aa 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,7 +1,7 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2015' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib' @@ -11,32 +11,32 @@ Configurations: Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target arch: 'x86' Compiler: 'MSVC2019' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qt-zlib' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2015' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Target arch: 'x86' Compiler: 'MSVC2015' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Target arch: 'armv7' Compiler: 'MSVC2015' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2019' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib' @@ -51,6 +51,11 @@ Configurations: - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-gui -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' Features: ['OutOfSourceBuild', 'Documentation'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' @@ -81,7 +86,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/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index 17e80878..25e71ccf 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -2,12 +2,12 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2019' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2019' Target arch: 'x86' Features: ['Packaging'] diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml index c5bc7538..0b16b11a 100644 --- a/coin/platform_configs/qdb.yaml +++ b/coin/platform_configs/qdb.yaml @@ -2,13 +2,13 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2015' Target arch: 'x86' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86%' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2015' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64%' @@ -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 2e511149..fe4e5b96 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -1,13 +1,13 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Compiler: 'MSVC2015' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Target arch: 'x86' Compiler: 'MSVC2019' @@ -17,29 +17,29 @@ Configurations: Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH'] - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Target arch: 'armv7' Compiler: 'MSVC2019' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-arm-msvc2019' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Compiler: 'MSVC2019' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-x64-msvc2019' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'Android_ANY' Target arch: 'multi' Compiler: 'Mingw' @@ -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,14 +56,14 @@ 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' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'QNX_700' Target arch: 'armv7' Compiler: 'Mingw' @@ -71,7 +71,7 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'QNX_700' Target arch: 'armv8' Compiler: 'Mingw' @@ -79,7 +79,7 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'QNX_700' Target arch: 'x86_64' Compiler: 'Mingw' @@ -101,14 +101,14 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WebAssembly' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] 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/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 5cdca1c0..8ad2a8b1 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -13,7 +13,7 @@ Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Target arch: 'x86_64' Compiler: 'MSVC2015' diff --git a/coin/platform_configs/qtconnectivity.yaml b/coin/platform_configs/qtconnectivity.yaml index f0b33ee4..5e2d5c7e 100644 --- a/coin/platform_configs/qtconnectivity.yaml +++ b/coin/platform_configs/qtconnectivity.yaml @@ -1,5 +1,5 @@ - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Target arch: 'x86_64' Compiler: 'MSVC2015' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index f92b3ba2..e9c2be74 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -1,12 +1,12 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] 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..073ef562 100644 --- a/coin/platform_configs/tqtc-qt-config-gui.yaml +++ b/coin/platform_configs/tqtc-qt-config-gui.yaml @@ -2,12 +2,12 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2019' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2019' Target arch: 'x86' Features: ['Packaging'] @@ -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/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS index ac602763..0b0c89fd 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS @@ -1,12 +1,5 @@ # List about manual pre-installations to Tier1 image: -Virtual Hardware: -CPU: 4 -Memory: 8 GB -Hard Disk: 550 GB -CI_NW -Video Card - total memory: 32MB - VM Options: Boot options/Firmware: BIOS @@ -18,6 +11,14 @@ Windows 10 Enterprise Region: Finland Keyboard layout: United Kingdom +* Don't use online speech recognition +* Let Microsoft and apps use your location: no +* Find my devicer: no +* Send diagnostic data to Microsoft: Send required diagnostic data +* Imporve inking & typing: no +* Get tailored expreriences with diagnostic data: no +* Let apps use advertising ID: no + * VMware tools (complete) installed * Resolution set to 1280x800 * Coin-setup: @@ -45,12 +46,7 @@ Keyboard layout: United Kingdom * (Restart Windows) * Google Chrome installed for RTA * Virus & threat protection settings: - - Real-time protection -> off - - Cloud-delivered protection -> off - - Automatic sample submission -> off - - Tamper protection -> off -* Virus & threat protection notifications: - - Get informational notifications -> off - - Account protection notifications -> off + * Check that there's no active antivirus providers +* From 'Region Settings' + * Set Regional format: English (United States) * Activate Windows - diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 index 21938f7f..08dfb88e 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 @@ -1,6 +1,6 @@ ########################################################################### ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -44,18 +44,6 @@ Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F" Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableRoutinelyTakingAction /T REG_dWORD /D 1 /F" -# 'Windows Defender Cache Maintenance' - "Periodic maintenance task." -DisableSchedulerTask "Windows Defender\Windows Defender Cache Maintenance" - -# 'Windows Defender Cleanup' - "Periodic cleanup task." -DisableSchedulerTask "Windows Defender\Windows Defender Cleanup" - -# 'Windows Defender Scheduled Scan' - "Periodic scan task." -DisableSchedulerTask "Windows Defender\Windows Defender Scheduled Scan" - -# 'Windows Defender Verification' - "Periodic verification task." -DisableSchedulerTask "Windows Defender\Windows Defender Verification" - # Disable 'QueueReporting' - "Windows Error Reporting task to process queued reports." DisableSchedulerTask "Windows Error Reporting\QueueReporting" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt new file mode 100644 index 00000000..c4714602 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt @@ -0,0 +1,18 @@ +# Visual Studio $version was installed manually using $installer. +$version = "2015 update 3" +$version_number ="14.0.25420.1" +$installer = "en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978.exe" + +# default plus following components were selected: +# * Programming Languages +# * Visual C++ +# - Common Tools for Visual C++ 2015 +# * Universal Windows App Development Tools +# - Tools (1.4.1) and Windows SDK (10.0.14393) +# - Windows 10 SDK (10.0.10586) +# - Windows 10 SDK (10.0.10240) +# * Common Tools +# -Visual Studio Extensibility Tools Update 3 + +# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer +$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt index e5fc9e93..163621c5 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt @@ -2,13 +2,13 @@ $version = "2019" # Current version was manually upgraded from the installer -$version_number = "16.6.2" +$version_number = "16.8.1" $installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe" MSVC 2019 build tools (default installation, no additional selections). * Install after MSVC2019 is installed! * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe" - * Version: 16.6.2 + * Version: 16.8.1 Installed MSVC-2019 Components: @@ -38,10 +38,10 @@ Text Template Transformation C# and Visual Basic Roslyn compilers C++ 2019 Redistributable Update C++ Cmake tools for Windows -C++/CLI support for v142 build tools /14.26) +C++/CLI support for v142 build tools /14.28) MSBuild MSVC v142 - VS 2019 C++ ARM build tools (v14.20) -MSVC v142 - VS 2019 C++ ARM build tools (v14.26) +MSVC v142 - VS 2019 C++ ARM build tools (v14.28) MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20) MSVC v142 - VS 2019 C++ ARM64 build tools (v14.26) MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20) @@ -57,7 +57,7 @@ Razor Language Services Graphics debugger and GPU profiler for DirectX Image and 3D model editors C++ ATL for latest v142 build tools (x86 & x64) -TypeScript 3.8 SDK +TypeScript 4.0 SDK Windows 10 SDK (10.0.16299.0) Windows 10 SDK (10.0.17134.0) Windows 10 SDK (10.0.17763.0) diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt b/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt index 4692e4a3..61c89933 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt @@ -4,18 +4,22 @@ Our vanilla images are pre-installed in VMware where we have networking availabl use the VMware installed vmxnet3 NIC to fetch VirtIO drivers, install them, and only then switch to using the VirtIO NIC in KVM. -* Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win-0.1.171.iso -* Mount virtio-win-0.1.171.iso by double clicking it. +NOTE! Install these Virtio drivers in Opennebula when using Windows 10 20H2 +* Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.185-2/virtio-win-0.1.185.iso + cache: http://ci-files01-hki.ci.local/input/windows/virtio/virtio-win-0.1.185.iso +* Mount virtio-win-0.1.185.iso by double clicking it. * Right click 'E:\NetKVM\w10\amd64\netkvm.inf' and select Install * Right click 'E:\Balloon\w10\amd64\balloon.inf' and select Install - * Right click 'E:\vioscsi\w10\amd64\vioscsi.inf' and select Install +* Right click 'E:\vioserial\w10\amd64\vioser.inf' and select Install +* Navigate to E:\guest-agent directory and double click qemu-ga-x86_64 Because vioscsi does not install the entries in windows registry before we actually have a VirtIO device installed, and we can't boot with a VirtIO device before the driver is installed, we have to blindly install the registry entries: * Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg + cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/vioscsi.reg However, we've seen that the Owner in the registry can be wrong. This entry sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index ca9110b8..01de5f07 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -55,8 +55,8 @@ toolsVersion="r26.1.1" toolsFile="sdk-tools-linux-4333796.zip" ndkVersion="r20" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" -sdkBuildToolsVersion="28.0.3" -sdkApiLevel="android-28" +sdkBuildToolsVersion="29.0.3" +sdkApiLevel="android-29" toolsSha1="8c7c28554a32318461802c1291d76fccfafde054" ndkSha1="8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff" diff --git a/coin/provisioning/common/macos/libusb.sh b/coin/provisioning/common/macos/libusb.sh index cf9e7150..0022d209 100755 --- a/coin/provisioning/common/macos/libusb.sh +++ b/coin/provisioning/common/macos/libusb.sh @@ -37,7 +37,7 @@ set -ex source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -brew install libusb +brew install --build-from-source libusb read -r -a arr <<< $(brew list --versions libusb) version=${arr[1]} echo "libusb = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/macos/macos-version.sh b/coin/provisioning/common/macos/macos-version.sh index 9f357b8c..c88cd9b8 100755 --- a/coin/provisioning/common/macos/macos-version.sh +++ b/coin/provisioning/common/macos/macos-version.sh @@ -44,8 +44,6 @@ sw_vers >> ~/versions.txt echo "***** All installed packages *****" >> ~/versions.txt echo "***** HomeBrew *****" >> ~/versions.txt brew list --versions >> ~/versions.txt -echo "***** HomeBrew Casks*****" >> ~/versions.txt -brew cask list --versions >> ~/versions.txt echo "***** Apple's installer *****" >> ~/versions.txt pkgutil --pkgs >> ~/versions.txt echo "*********************************************" >> ~/versions.txt diff --git a/coin/provisioning/common/unix/libclang-v100-dyn.sh b/coin/provisioning/common/unix/libclang-v100-dyn.sh new file mode 100755 index 00000000..d6609429 --- /dev/null +++ b/coin/provisioning/common/unix/libclang-v100-dyn.sh @@ -0,0 +1,83 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). +# The Clang library (C-bindings), version 3.9 or higher is required for building. + +# This same script is used to provision libclang to Linux and macOS. +# In case of Linux, we expect to get the values as args +set -e + +# shellcheck source=./check_and_set_proxy.sh +source "${BASH_SOURCE%/*}/check_and_set_proxy.sh" +# shellcheck source=./SetEnvVar.sh +source "${BASH_SOURCE%/*}/SetEnvVar.sh" +# shellcheck source=./DownloadURL.sh +source "${BASH_SOURCE%/*}/DownloadURL.sh" + +libclang_version=10.0 + +if uname -a |grep -q Darwin; then + version=$libclang_version + url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-based-mac.7z" + sha1="0fe1fa50b1b469d2c05acc3a3468bc93a66f1e5a" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-mac.7z" +elif test -f /etc/redhat-release || /etc/centos-release; then + version=$libclang_version + url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z" + sha1="1d2e265502fc0832a854f989d757105833fbd179" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z" +else + version=$libclang_version + url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z" + sha1="c1580acb3a82e193acf86f18afb52427c5e67de8" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z" +fi + +zip="/tmp/libclang.7z" +destination="/usr/local/libclang-dynlibs-$version" + +DownloadURL $url_cached $url $sha1 $zip +if command -v 7zr &> /dev/null; then + sudo 7zr x $zip -o/usr/local/ +else + sudo 7z x $zip -o/usr/local/ +fi +sudo mv /usr/local/libclang "$destination" +rm -rf $zip + + +echo "export LLVM_DYNAMIC_LIBS_100=$destination" >> ~/.bash_profile +echo "libClang for QtForPython= $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/disable-netadapterlso.ps1 b/coin/provisioning/common/windows/disable-netadapterlso.ps1 index 36fff06e..2df955b9 100644 --- a/coin/provisioning/common/windows/disable-netadapterlso.ps1 +++ b/coin/provisioning/common/windows/disable-netadapterlso.ps1 @@ -1,2 +1,2 @@ -Disable-NetAdapterLso Ethernet +Disable-NetAdapterLso "Ethernet 2" Start-Sleep -s 15 # Give windows some time to adjust network settings diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh b/coin/provisioning/common/windows/install-azure-tool.ps1 index 8a3fc7b9..937804fd 100755..100644 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh +++ b/coin/provisioning/common/windows/install-azure-tool.ps1 @@ -1,8 +1,6 @@ -#!/usr/bin/env bash - ############################################################################# ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -32,8 +30,11 @@ ## $QT_END_LICENSE$ ## ############################################################################# +. "$PSScriptRoot\helpers.ps1" + +# This script will install Azure singtool using Dotnet SDK +$dotnet = "C:\Program Files\dotnet\dotnet.exe" -set -ex +$version = "2.0.17" +Run-Executable "$dotnet" "tool install --global AzureSignTool --version $version" -# shellcheck source=../common/unix/python-modules.sh -source "${BASH_SOURCE%/*}/../common/unix/python-modules.sh" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 b/coin/provisioning/common/windows/install-dotnet.ps1 index 9ac8196e..8578c9b4 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 +++ b/coin/provisioning/common/windows/install-dotnet.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -30,23 +30,30 @@ ## $QT_END_LICENSE$ ## ############################################################################# +. "$PSScriptRoot\helpers.ps1" -# Visual Studio $version was installed manually using $installer. -$version = "2015 update 3" -$version_number ="14.0.25420.1" -$installer = "en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978.exe" +# This script will install Dotnet SDK which is required for Azure installation + +$version = "2.1" +if (Is64BitWinHost) { + $urlCache = "http://ci-files01-hki.intra.qt.io/input/windows/dotnet-sdk-2.1.809-win-x64.exe" + $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/c980b6fb-e570-4c73-b344-e4dae6573777/f844ac1a4c6ea5de7227a701786126fd/dotnet-sdk-2.1.809-win-x64.exe" + $sha1 = "343e80c2ab558a30696dbe03ad2288bf435d5cd8" +} else { + $urlCache = "http://ci-files01-hki.intra.qt.io/input/windows/dotnet-sdk-2.1.809-win-x86.exe" + $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/cf86a2f3-f6b2-4959-8e41-cf84b0d2f294/a61e834f56abe2dc2e12599e1a60c10b/dotnet-sdk-2.1.809-win-x86.exe" + $sha1 = "b38a4e1392f17aed110508a1687f1c65b9d86161" +} +$installer = "C:\Windows\Temp\dotnet-sdk-$version.exe" + +Write-Host "Installing Dotnet SDK $version" +Download $urlOfficial $urlCache $installer +Verify-Checksum $installer $sha1 +Run-Executable "$installer" "/install /passive" +Prepend-Path "C:\Program Files\dotnet" +Remove $installer + +Write-Output "Dotnet SDK = $version" >> ~/versions.txt -# default plus following components were selected: -# * Visual C++ -# - Common Tools for Visual C++ 2015 -# * Universal Windows App Development Tools -# - Tools (1.4.1) and Windows SDK (10.0.14393) -# - Windows 10 SDK (10.0.10586) -# - Windows 10 SDK (10.0.10240) -# * Common Tools -# -Visual Studio Extensibility Tools Update 3 -# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer -$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe" -echo "Visual Studio = $version version $version_number" >> ~\versions.txt diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 index 784b09dc..2be0d35c 100644 --- a/coin/provisioning/common/windows/install-msys2.ps1 +++ b/coin/provisioning/common/windows/install-msys2.ps1 @@ -33,46 +33,50 @@ . "$PSScriptRoot\helpers.ps1" -# This script installs 7-Zip +# This script will installs msys2 -$version = "20181211" +$version = "20200903" $prog = "msys2" -if (Is64BitWinHost) { - $arch = "x86_64" - $sha1 = "d689ff74fd060934bd7aaf458a11db67833463c2" - $folder = "msys64" -} else { - $arch = "i686" - $sha1 = "928f9d1537d1a77dc7f2adab74fb438e7d11a98e" - $folder = "msys32" -} -$package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz" +$arch = "x86_64" +$sha1 = "5a1644585fac2d58855d48b4ba4a92579a14cf03" +$sha1_prebuilt = "d86d45d72228f53f7ae060771bc95b6f54c703c8" +$folder = "msys64" +$package_prebuilt = $folder + "_" + $version + "_prebuilt.7z" +$package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz" +$url_cache_prebuilt = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package_prebuilt" $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package" $url_official = "http://repo.msys2.org/distrib/$arch/$package" -$PackagePath = "C:\Windows\Temp\$package" $TargetLocation = "C:\Utils" -Download $url_official $url_cache $PackagePath -Verify-Checksum $PackagePath $sha1 -Extract-tar_gz $PackagePath $TargetLocation -$msys = "$TargetLocation\$folder\msys2_shell.cmd" +if ((Test-Path $url_cache_prebuilt)) { + $PackagePath = "C:\Windows\Temp\$package_prebuilt" + Download $url_cache_prebuilt $url_cache_prebuilt $PackagePath + Verify-Checksum $PackagePath $sha1_prebuilt + Extract-7Zip $PackagePath $TargetLocation +} else { + $PackagePath = "C:\Windows\Temp\$package" + Download $url_official $url_cache $PackagePath + Verify-Checksum $PackagePath $sha1 + Extract-tar_gz $PackagePath $TargetLocation + $msys = "$TargetLocation\$folder\msys2_shell.cmd" -# install perl -# Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file. -cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`"" -Start-Sleep -s 30 -cmd /c "$msys `"-l`" `"-c`" `"cpan -i Text::Template Test::More`"" + # install perl + # Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file. + cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`"" + Start-Sleep -s 60 + cmd /c "$msys `"-l`" `"-c`" `"echo y | cpan -i Text::Template Test::More`"" -# Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed. -# Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process. -Start-Sleep -s 180 -if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent } -if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr } + # Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed. + # Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process. + Start-Sleep -s 360 + if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent } + if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr } +} Write-Host "Cleaning $PackagePath.." Remove-Item -Recurse -Force -Path "$PackagePath" -Write-Output "7-Zip = $version" >> ~\versions.txt +Write-Output "msys2 = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/windows/libclang-v100-dyn.ps1 b/coin/provisioning/common/windows/libclang-v100-dyn.ps1 new file mode 100644 index 00000000..b0792a07 --- /dev/null +++ b/coin/provisioning/common/windows/libclang-v100-dyn.ps1 @@ -0,0 +1,50 @@ +param( + [Int32]$archVer=32, + [string]$toolchain="vs2019", + [bool]$setDefault=$true +) +. "$PSScriptRoot\helpers.ps1" + +$libclang_version="10.0" +Write-Output "libClang for QtForPython = $libclang_version" >> ~/versions.txt + +# PySide versions following Qt6 use a C++ parser based on Clang (http://clang.org/). +# The Clang library (C-bindings), version 8.0 or higher is required for building. + +# Starting from Qt 5.11 QDoc requires Clang to parse C++ + +$baseDestination = "C:\Utils\libclang-" + $libclang_version + "-dynlibs-" + $toolchain +$libclang_version = $libclang_version -replace '["."]' + +function install() { + + param( + [string]$sha1=$1, + [string]$destination=$2 + ) + + $zip = "c:\users\qt\downloads\libclang-dyn.7z" + + $script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z" + $script:CachedUrl = "http://ci-files01-hki.intra.qt.io/input/libclang/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z" + + Download $OfficialUrl $CachedUrl $zip + Verify-Checksum $zip $sha1 + Extract-7Zip $zip C:\Utils\ + Rename-Item C:\Utils\libclang $destination + Remove-Item -Force -Path $zip +} + +if ( $toolchain -eq "vs2019" ) { + if ( $archVer -eq 64 ) { + $sha1 = "B2C4F24B2388AEBAA6B8FCE3AE4E63D34D1517FE" + } + else { + $sha1 = "b970f51df255a27e0fdb7b665e70ed5281257f40" + } +} + +install $sha1 $baseDestination-$archVer + +Set-EnvironmentVariable "LLVM_DYNAMIC_LIBS_100" ($baseDestination + "-_ARCH_") + diff --git a/coin/provisioning/common/windows/nodejs.ps1 b/coin/provisioning/common/windows/nodejs.ps1 index c56f6db6..24b06751 100644 --- a/coin/provisioning/common/windows/nodejs.ps1 +++ b/coin/provisioning/common/windows/nodejs.ps1 @@ -37,25 +37,25 @@ # Needed by QtWebengine $version = "12.18.0" -$package = "C:\Windows\temp\nodejs-$version.zip" -$targetFolder = "C:\Utils\nodejs" -$arch = "$((Get-WmiObject Win32_Processor).AddressWidth)" -$externalUrl = "https://nodejs.org/dist/v$version/node-v$version-win-x$arch.zip" -$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/node-v$version-win-x$arch.zip" - -if ( $arch -eq 64 ) { +if (Is64BitWinHost) { + $arch = "x64" $sha1 = "457b1527d249ee471a9445953a906cb10c75378d" } else { + $arch = "x86" $sha1 = "58801900f5bddca9c00feed6b84fed729426fc92" - } +$package = "C:\Windows\temp\nodejs-$version.zip" +$targetFolder = "C:\Utils" +$installFolder = "C:\Utils\node-v$version-win-$arch" +$externalUrl = "https://nodejs.org/dist/v$version/node-v$version-win-$arch.zip" +$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/node-v$version-win-$arch.zip" + Write-Host "Installing Node.js" Download $externalUrl $internalUrl $package Verify-Checksum $package $sha1 -mkdir $targetFolder Extract-7Zip $package $targetFolder -Add-Path $targetFolder +Add-Path $installFolder Remove $package Write-Output "Node.js = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 518de783..c615f9eb 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -40,7 +40,7 @@ $version = "6.6.1" $qtBranch = "515x" $targetDir = "C:\Utils\squish" $squishPackage = "C:\Utils\rta_squish" -$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build" +$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable" $licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" # Squish license @@ -62,7 +62,9 @@ if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { $sha1 = "17b5bec83f448877e42e5effdc7daf723d157800" } else { - $sha1 = "1e6c1b3935e1c1bcdd28ec2511f24b8656d3ee6a" + $sha1 = "9c0fc186605522ac0ac11066c10c3f3e8a95a705" + #Remove special handling when all packages are in same dir, exception now for win10 x86->the archive had to be rebuild + $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\6.6.1_rerun" } } elseif ($OSVersion -eq "Windows 7 Enterprise") { $winVersion = "win7" @@ -70,7 +72,7 @@ if ($OSVersion -eq "Windows 10 Enterprise") { } $squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip" -Copy-Item "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\$squishArchive" "C:\Utils" +Copy-Item "$squishUrl\$squishArchive" "C:\Utils" Verify-Checksum "C:\Utils\$squishArchive" $sha1 Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils" Rename-Item "$squishPackage" "$targetDir" diff --git a/coin/provisioning/common/windows/update-msvc2019.ps1 b/coin/provisioning/common/windows/update-msvc2019.ps1 new file mode 100644 index 00000000..0b0f384d --- /dev/null +++ b/coin/provisioning/common/windows/update-msvc2019.ps1 @@ -0,0 +1,71 @@ +############################################################################ +## +## Copyright (C) 2020 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +# This script will update MSVC 2019. +# NOTE! Visual Studio is pre-installed to tier 1 image so this script won't install the whole Visual Studio. See ../../../pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt +# MSVC 2019 online installers can be found from here https://docs.microsoft.com/en-us/visualstudio/releases/2019/history#installing-an-earlier-release + +$version = "16_7_5" +$urlCache_vsInstaller = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msvc\vs2019_Professional_$version.exe" +$urlOfficial_vsInstaller = "https://download.visualstudio.microsoft.com/download/pr/e8bc3741-cb70-42aa-9b4e-2bd497de85dd/74b4e599138d5b5824d87ee657b78cbdeb3716f58a9645047e53bb5f68131516/vs_Professional.exe" +$sha1_vsInstaller = "70062274c1ae79f5f0f7cb91192347abc1ebcb00" +$urlCache_buildToolsInstaller = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msvc\vs2019_BuildTools_$version.exe" +$urlOfficial_buildToolsInstaller = "https://download.visualstudio.microsoft.com/download/pr/e8bc3741-cb70-42aa-9b4e-2bd497de85dd/f3713de3e01b7829d529f67d6240116b73cc0743974bb5373a052f9629cc24d2/vs_BuildTools.exe" +$sha1_buildToolsInstaller = "efb4600bf9bd09adf55a36e2e5d0d47a3abd481e" +$installerPath = "C:\Windows\Temp\installer.exe" + +function Install { + + Param ( + [string] $urlOfficial = $(BadParam("Official url path")), + [string] $urlCache = $(BadParam("Cached url path")), + [string] $sha1 = $(BadParam("SHA1 checksum of the file")) + + ) + + Write-Host "Installing msvc 2019 $version" + Download $urlOfficial $urlCache $installerPath + Verify-Checksum $installerPath $sha1 + Run-Executable "$installerPath" "update --passive --wait" + Remove-Item -Force -Path $installerPath +} + +Install $urlOfficial_vsInstaller $urlCache_vsInstaller $sha1_vsInstaller +Install $urlOfficial_buildToolsInstaller $urlCache_buildToolsInstaller $sha1_buildToolsInstaller + +$msvc2019Version = (cmd /c "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property catalog_productDisplayVersion 2`>`&1) + +Write-Output "Visual Studio 2019 = $msvc2019Version" >> ~\versions.txt +Write-Output "Visual Studio 2019 Build Tools = $version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang-v100-dyn.sh new file mode 100755 index 00000000..fbf34ddd --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang-v100-dyn.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -ex + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/unix/libclang-v100-dyn.sh +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh index e3ba503c..5e3a4f8c 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh @@ -80,7 +80,7 @@ installPackages+=(pulseaudio-libs-devel) installPackages+=(libXtst-devel) installPackages+=(nspr-devel) installPackages+=(nss-devel) -installPackages+=(rh-nodejs12-nodejs) +installPackages+=(rh-nodejs12-nodejs) # NOTE! Nodejs12 needs to be added to PATH! installPackages+=(rh-nodejs12-nodejs-devel) # For Android builds installPackages+=(java-1.8.0-openjdk-devel) @@ -136,6 +136,9 @@ sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3 sudo pip install --upgrade pip sudo pip install virtualenv wheel +# Needed by packaging scripts +sudo /usr/local/bin/pip3 install colorlog --user + sudo /usr/local/bin/pip3 install wheel # Install all needed packages in a special wheel cache directory /usr/local/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" @@ -143,3 +146,8 @@ sudo /usr/local/bin/pip3 install wheel # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" +SetEnvVar "PATH" "/opt/rh/rh-nodejs12/root/usr/bin:\$PATH" + +gccVersion="$(gcc --version |grep gcc |cut -b 11-16)" +echo "GCC = $gccVersion" >> versions.txt + diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/08-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/08-libclang-v100-dyn.sh new file mode 100755 index 00000000..b0080cbc --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/08-libclang-v100-dyn.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/unix/libclang-v100-dyn.sh +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-enable-modules.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-enable-modules.sh new file mode 100644 index 00000000..52c67941 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-enable-modules.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +set -ex + +# Activate these modules + +# This is needed by Nodejs and QtWebEngine +sudo SUSEConnect -p sle-module-web-scripting/15/x86_64 diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh index 8c596142..bed165f1 100755 --- a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -105,3 +105,13 @@ sudo zypper -nq install sqlite3 sqlite3-devel # Java - needed by RTA jenkins sudo zypper -nq install java + +# open-vm-tools requires update. Version in tier1 is broken and causes segfault on boot. +sudo zypper -nq update open-vm-tools + +# Nodejs - needed by QtWebEngine +sudo zypper -nq install nodejs10 +sudo zypper -nq install nodejs10-devel + +gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +echo "GCC = $gccVersion" >> versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh index 573b30a9..15142600 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh @@ -5,4 +5,4 @@ set -ex # shellcheck source=../common/linux/gcc.sh source "${BASH_SOURCE%/*}/../common/linux/gcc.sh" -InstallGCC 9.3.0 50 526bc0ed135e65366080350d0f991157752223c0 b746688bf045a316fc92c3528138ad10d0822b6b +InstallGCC 9.3.0 50 5038e8752407d14e5a70c8efc80c20a6d4219aaa 212f77d7b7fe1fdf01a1c0b0ebc9d82aeda5e1e0 diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-libclang-v100-dyn.sh new file mode 100755 index 00000000..dcd5b2d8 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-libclang-v100-dyn.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh index b509ff6c..79a29837 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh @@ -36,7 +36,7 @@ sudo zypper -nq install libicu-devel libicu60_2 # qtwebengine sudo zypper -nq install alsa-devel dbus-1-devel \ libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \ - mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel + mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel glproto-devel # qtwebkit sudo zypper -nq install libxml2-devel libxslt-devel @@ -50,3 +50,5 @@ sudo zypper -nq install cups-devel #speech-dispatcher sudo zypper -nq install libspeechd-devel +gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +echo "GCC = $gccVersion" >> versions.txt diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang-v100-dyn.sh new file mode 100755 index 00000000..b0080cbc --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang-v100-dyn.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/unix/libclang-v100-dyn.sh +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.13-x86_64/07-openssl-sh index 44fa76f1..44fa76f1 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/07-openssl-sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.13-x86_64/08-homebrew.sh index f7f9e214..f7f9e214 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/08-homebrew.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/08-nodejs.sh b/coin/provisioning/qtci-macos-10.13-x86_64/08-nodejs.sh new file mode 100755 index 00000000..4600a8c2 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/08-nodejs.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install --build-from-source node diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/28-libclang-v100-dyn.sh b/coin/provisioning/qtci-macos-10.13-x86_64/28-libclang-v100-dyn.sh new file mode 100755 index 00000000..c9d6e93d --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/28-libclang-v100-dyn.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh deleted file mode 100755 index ab992405..00000000 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -brew install nodejs - diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/28-libclang-v100-dyn.sh b/coin/provisioning/qtci-macos-10.14-x86_64/28-libclang-v100-dyn.sh new file mode 100755 index 00000000..c9d6e93d --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/28-libclang-v100-dyn.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-enable-guest-logon.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-enable-guest-logon.ps1 new file mode 100644 index 00000000..3cf989d3 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-enable-guest-logon.ps1 @@ -0,0 +1,2 @@ +# Allow SMB client guest logons to SMB server. +reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /V AllowInsecureGuestAuth /T REG_dWORD /D 1 /F diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 index 72ac1ca7..b2949632 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -36,8 +36,5 @@ # MSVC 2015 Update 3 Write-Output "Visual Studio 2015 = Version 14.0.25431.01 Update 3" >> ~\versions.txt -# MSVC 2017 -Write-Output "Visual Studio 2017 = Version 15.8.5" >> ~\versions.txt +# MSVC 2019 and Build Tools are pre-provisioned, but the updating happens with "$PSScriptRoot\..\common\windows\update-msvc2019.ps1" -# MSVC 2017 Build Tools -Write-Output "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-libclang-v100-dyn.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-libclang-v100-dyn.ps1 new file mode 100644 index 00000000..82b91257 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/08-libclang-v100-dyn.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 64 vs2019 +. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 32 vs2019 diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1 new file mode 100644 index 00000000..a2ecfba2 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-dotnet.ps1" + diff --git a/coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1 b/coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1 new file mode 100644 index 00000000..f1d5acc3 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-azure-tool.ps1" diff --git a/qt3d b/qt3d -Subproject 42abb0c194e87596b8fce70985244cc41c0b4b2 +Subproject 67bee4599a28e1cadc14ed9ea4adc7061e250b9 diff --git a/qtactiveqt b/qtactiveqt -Subproject 87e97562466b76fd757ebdfff8978b34c167a6a +Subproject 014285857ef1cfb2d9965cf7bad871bbc336ce6 diff --git a/qtandroidextras b/qtandroidextras -Subproject ce9aa0c91b86f386442379a5e653c32437de1ba +Subproject f4791ee16526505ec1527056c45e3c9d6b3c44b diff --git a/qtbase b/qtbase -Subproject 29ca6b9d14fbf9774e9829e59ac5f4e675c2c1d +Subproject 4e158f6bfa7d0747d8da70b3b15a44b52e35bb8 diff --git a/qtcharts b/qtcharts -Subproject c082168fba5deb930a01502c54bf2080af53b54 +Subproject 3f3f14d69a509c3e8027bfb5d7ffca9b4f3ef00 diff --git a/qtconnectivity b/qtconnectivity -Subproject 8e624270b7af41fe29844a7971c41c98cd251ec +Subproject f1fed9fb2a7e5b877d8408f92040651b0cf47db diff --git a/qtdatavis3d b/qtdatavis3d -Subproject c8a251c1834f499c55a616b1ee10f776f068ab8 +Subproject 6ac6d23a8f558f36f1162b419858cc44dccd4d2 diff --git a/qtdeclarative b/qtdeclarative -Subproject 0f3df189e57d4c2bddce09380bbed8e0ed1fe2b +Subproject 6ab9856ef379fc3fe44d5fac03a83f679f39851 diff --git a/qtdoc b/qtdoc -Subproject 2e1697578072216795d1a3642c7bfbcb0a381fb +Subproject bebd32616d892368706e4ee80abfcfc094f31dc diff --git a/qtgamepad b/qtgamepad -Subproject e92a0864e8aa434f201c12269c66dd5ba373242 +Subproject 44255e2ae53a14e9a3fb671da0782ec5d396220 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 82859f6d41d741c43c4fd6c089526701028c949 +Subproject 895f9753940156dda05aa83d3c7655571514407 diff --git a/qtimageformats b/qtimageformats -Subproject dd8edc701b7bcd90eddf8f4af824efdc4b21271 +Subproject 3c2ad3eed6fc522ad809797747c8028b3dd4778 diff --git a/qtlocation b/qtlocation -Subproject 9ac778b23aa77c62470efcd6bb3afe57576c0aa +Subproject f6953a8d604b906b170fb4610e124e7c31260a1 diff --git a/qtlottie b/qtlottie -Subproject b182dcd78a35b4667b2568857b7719d555c7fdd +Subproject 62f17bbc0ae8649178ac484afc434dbad16d635 diff --git a/qtmacextras b/qtmacextras -Subproject 7fd8ca9462dddb89674e70d86e86c54c890d832 +Subproject 6ecba1864bee0ed9de0897d10a260149d00683e diff --git a/qtmultimedia b/qtmultimedia -Subproject 4b26133b1cac084a61dbbf68b3fff711ca49f71 +Subproject 374d71e29a142bd177cd5b1b7e29a4628085ddc diff --git a/qtnetworkauth b/qtnetworkauth -Subproject 6bfbe5ceeb692ca96e43222327edb75b52b6a31 +Subproject ed2291d454fac207f6b1555d30b9227e51be611 diff --git a/qtpurchasing b/qtpurchasing -Subproject 839f1b41be3f56a05e8f69abc8fbba9d55cff79 +Subproject 7f4ead6f3e6431acee63987a0a1753ff140ac2d diff --git a/qtqa b/qtqa -Subproject bb9309475c4075983d90b05a2dbc410f35685a4 +Subproject 36da1912a90c0e3a91f59f96c984a7e43ab982b diff --git a/qtquick3d b/qtquick3d -Subproject 6722290ac002f7a5c13261215d836947cae5268 +Subproject fbb8186383e7e3389b952c43781755346d5ce37 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject fc0bbf8a78c19a71287c5f37a23d74b723fb35c +Subproject 77fbfa8d313bbdb8fb762f15dd6173a067be55e diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject c9e58c2168450fd3b1fe3aca3dd143d5fd0db8c +Subproject 480694ae720490b162747b07aa0e0bb7e7abc7d diff --git a/qtquicktimeline b/qtquicktimeline -Subproject 725369606acc67783c2b6121a15b6b0b566e9e9 +Subproject 29394e35db43acb20e7b4d5e978a733f5b4232a diff --git a/qtremoteobjects b/qtremoteobjects -Subproject 220fcba0cb8e59ab99236ed4e94395852b1e49d +Subproject 18ef1cdce7bc4c93415f38f1c220ab697aa7590 diff --git a/qtscript b/qtscript -Subproject 3825c13da129e073f1966f3da561da7e732126f +Subproject 5be95f966aabc5170f0aacfd4b0a46217241bfd diff --git a/qtscxml b/qtscxml -Subproject a34700697ed9a46786c8b56356dc19cc871be92 +Subproject 6074956c2089dd0507d2930c638fa8c930f4e21 diff --git a/qtsensors b/qtsensors -Subproject f230ae749d91bede85a27918bce3c88897ca713 +Subproject 7f8b55744f87155a4979dd8ba405bd7feec0304 diff --git a/qtserialbus b/qtserialbus -Subproject e1dd42f75c6d6a7330585cfc7efe6b0d61c9433 +Subproject 5efce7d821bad2f5db95ff3ada5eeddccbb5892 diff --git a/qtserialport b/qtserialport -Subproject 27ca2cef37e59666de7a038c67dc7e04126cb99 +Subproject fc0b6affe244e40366bd624d6e01c62712568eb diff --git a/qtspeech b/qtspeech -Subproject 07ae7523f97ed0eda6ff5b3257499ba62f530fb +Subproject 90e32fa60897f223e80f3e78639c6ba9674c5ad diff --git a/qtsvg b/qtsvg -Subproject 4433f21a54d1987216b6cd97017a90754103a9d +Subproject d44607f07fa66f0f5294c227eba99aac7c8dbeb diff --git a/qttools b/qttools -Subproject ffedf9cf7e6c52d8b59af47b21e7a29ee23720e +Subproject e8c3c391de17edce4542819c79de3d27a57ff40 diff --git a/qttranslations b/qttranslations -Subproject cb1857418b36780b0444333f3aa6250ca3780f1 +Subproject 40aabebd04a30ccef374bf20a7bfaa1d8d665b7 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject e3e57f6f2a2d7e1748c005c0db7a11a68139bba +Subproject 80565aa7fc37ecdb1c08e585d4ae3060618e333 diff --git a/qtwayland b/qtwayland -Subproject 2a77384a4f2485364cefeb825eea63daf13dd3b +Subproject 163ea1a04d1b00c95373d69e8c907e5789082d3 diff --git a/qtwebchannel b/qtwebchannel -Subproject b616ed1f55e6fa36da34c8f9752c4b661afbc98 +Subproject d5eb0142112b2b058e86489f7dae2e00c0aebe4 diff --git a/qtwebengine b/qtwebengine -Subproject 7eea6be3390166943851eb2619eae520f95488b +Subproject f328054d2eafc073b98a0246b2d644ee09c99d9 diff --git a/qtwebglplugin b/qtwebglplugin -Subproject e9ce6565d22dbd6a0c3c115a88956ded060b801 +Subproject 80257933d3bf3a026455d71106e6b3e70dead76 diff --git a/qtwebsockets b/qtwebsockets -Subproject 953ac709b6bb8b8e9dc3302448faaa8b68e6a9f +Subproject 6edf8323d14c531b12d5e818aa5923ca411fe6b diff --git a/qtwebview b/qtwebview -Subproject 779d8246e46d705809e66e6fcc2600df6ac9247 +Subproject 3d9289d73c5c03ed5b2fe246589d0d81cfdaa22 diff --git a/qtwinextras b/qtwinextras -Subproject d1fe52bea1ce58d86bfc639f28d0f533a1570ae +Subproject e6a85ae3306867400b8700600152949656eb21f diff --git a/qtx11extras b/qtx11extras -Subproject 9a989fbcc65b6866e85ce39451419f34e187f80 +Subproject 415ac0d58521be2bb00ef4cecdb16f0b9001e88 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 569c804bf04be76c7213a09c2058d016fad074f +Subproject eb59017f04b44667e0c6778aa3995f8e86c98e4 |