From 94d140b7466fe02f4a55c726ee116653cf7ac9cc Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Tue, 12 Mar 2019 15:25:35 +0200 Subject: Log more version information on macOS provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Logs more version information to make easier to reproduce build. Logs macOS build version, homebrew installed packages and apple's installer installed packages. Change-Id: Ia9f2842a3fd2e8e0acf1667c7435a19c7a878aed Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-macos-10.13-x86_64/99-mac-version.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/99-mac-version.sh (limited to 'coin/provisioning/qtci-macos-10.13-x86_64') diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/99-mac-version.sh b/coin/provisioning/qtci-macos-10.13-x86_64/99-mac-version.sh new file mode 100755 index 00000000..99d94150 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/99-mac-version.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/macos/macos-version.sh -- cgit v1.2.3 From 608788de2d10c55b0b3d7c11776f368da015a89a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 17 Jan 2019 15:24:27 +0200 Subject: Provisioning: Update Android NDK to version r19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also let's start using 64-bit Android NDK for Windows Task-number: QTQAINFRA-2568 Change-Id: I2d757aa9e43abf5118abad7bf644e17e88a2ca94 Reviewed-by: Qt CI Bot Reviewed-by: Tony Sarajärvi (cherry picked from commit c09135cb56e03dd6a09b79f2c6e15932e9433df2) Reviewed-by: Jani Heikkinen --- coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning/qtci-macos-10.13-x86_64') diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index c0d75ff6..d0acdd45 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -51,7 +51,7 @@ toolsVersion="r26.1.1" # toolsFile dertermines tools version toolsFile="sdk-tools-darwin-4333796.zip" -ndkVersion="r18b" +ndkVersion="r19c" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version -- cgit v1.2.3 From a2b1dd2d0afe58f27b1585ecab5235ae32932ef8 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 5 Apr 2019 13:43:07 +0300 Subject: Provisioning: Use ANDROID_NDK_ROOT instead of ANDROID_NDK_HOME MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without this binaries will be hardcoded to look in e.g /opt/android/android-ndk-r19b which means that RTA tests will fail Task-number: QTBUG-74952 Change-Id: Ic2b1297e15d905f2250333b6bc884abe2f1472d4 Reviewed-by: Tony Sarajärvi (cherry picked from commit dbaa42baa77309a1aa407cd45078d885f7428aa2) Reviewed-by: Jani Heikkinen --- coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'coin/provisioning/qtci-macos-10.13-x86_64') diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index d0acdd45..544364b0 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -76,6 +76,7 @@ ls -l "$sdkTargetFolder" SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder" SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" +SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion" SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64" SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" -- cgit v1.2.3 From 31f5c48a80e140562588bd673ef35fb4efe3d643 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Thu, 1 Nov 2018 12:23:34 +0200 Subject: Provisioning: Change openssl version to 1.1.1b Use newest LTS version of openssl as support for 1.0.2 series will end at end of 2019. For windows 7 x86 openssl 1.0.2 will be used until all need fixed are made to submodule tests Task-number: QTQAINFRA-2327 Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3 Reviewed-by: Jani Heikkinen (cherry picked from commit 3e838f2a34d0c1538535bd184aa12681497c8a38) --- coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning/qtci-macos-10.13-x86_64') diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh index 963f48d6..44fa76f1 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh @@ -3,4 +3,4 @@ set -ex # shellcheck source=../common/macos/install_openssl.sh -source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh" +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "macos" -- cgit v1.2.3 From dbaa42baa77309a1aa407cd45078d885f7428aa2 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 5 Apr 2019 13:43:07 +0300 Subject: Provisioning: Use ANDROID_NDK_ROOT instead of ANDROID_NDK_HOME MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without this binaries will be hardcoded to look in e.g /opt/android/android-ndk-r19b which means that RTA tests will fail Task-number: QTBUG-74952 Change-Id: Ic2b1297e15d905f2250333b6bc884abe2f1472d4 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'coin/provisioning/qtci-macos-10.13-x86_64') diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index d0acdd45..544364b0 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -76,6 +76,7 @@ ls -l "$sdkTargetFolder" SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder" SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" +SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion" SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64" SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" -- cgit v1.2.3 From 3e838f2a34d0c1538535bd184aa12681497c8a38 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Thu, 1 Nov 2018 12:23:34 +0200 Subject: Provisioning: Change openssl version to 1.1.1b Use newest LTS version of openssl as support for 1.0.2 series will end at end of 2019. For windows 7 x86 openssl 1.0.2 will be used until all need fixed are made to submodule tests Task-number: QTQAINFRA-2327 Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3 Reviewed-by: Jani Heikkinen --- coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning/qtci-macos-10.13-x86_64') diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh index 963f48d6..44fa76f1 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh @@ -3,4 +3,4 @@ set -ex # shellcheck source=../common/macos/install_openssl.sh -source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh" +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "macos" -- cgit v1.2.3 From 5db0ce74b7a681fb57f817751a7db3fe80e8c523 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 2 Apr 2019 12:39:54 +0300 Subject: Provisioning: Update QNX 7.0 packages Updated packages includes QNX Multimedia Suite 2.0, which enables building QtMultimedia QNX plugins Task-number: QTBUG-71073 Change-Id: Iaf7cabfe1dc59441abb978c261590c41f7aa0cdc Reviewed-by: Samuli Piippo --- coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coin/provisioning/qtci-macos-10.13-x86_64') diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh index a5547972..d2905e9d 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh @@ -36,13 +36,13 @@ # This script installs QNX 7. targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-macos.tar.xz" folderName="qnx700" sudo mkdir -p "$targetFolder" echo "Extracting QNX 7" -sudo unzip -q "$sourceFile" -d "$targetFolder" +sudo tar -C "$targetFolder" -Jxf $sourceFile sudo chown -R qt:wheel "$targetFolder"/"$folderName" -- cgit v1.2.3 From 38e416be664dc216b332e6b4ff8d38905dfdc1e9 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Tue, 16 Apr 2019 10:16:41 +0300 Subject: Add webAssembly build for windows and macos Provision emsdk and its dependecies to windows and macos. Task-number: QTBUG-63917 Task-number: QTQAINFRA-2835 Done-with: Juha Karjalainen Change-Id: I24ea9cbc4f7cc95e6952765099d5e46247470011 Reviewed-by: Jani Heikkinen --- coin/provisioning/qtci-macos-10.13-x86_64/36-emsdk.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 coin/provisioning/qtci-macos-10.13-x86_64/36-emsdk.sh (limited to 'coin/provisioning/qtci-macos-10.13-x86_64') diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/36-emsdk.sh b/coin/provisioning/qtci-macos-10.13-x86_64/36-emsdk.sh new file mode 100644 index 00000000..7396d336 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/36-emsdk.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/unix/emsdk.sh +source "${BASH_SOURCE%/*}/../common/unix/emsdk.sh" -- cgit v1.2.3 From 9dd445123465dde1089d2c0285add1db225ccec3 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Tue, 20 Aug 2019 11:07:46 +0300 Subject: Android: Update Android NDK to version r20 Fixes: QTQAINFRA-3152 Change-Id: Ieee56346dd4e29754f259d71465edc8c2a0db2e5 Reviewed-by: Eskil Abrahamsen Blomfeldt --- coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning/qtci-macos-10.13-x86_64') diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index 544364b0..1886cce3 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -51,7 +51,7 @@ toolsVersion="r26.1.1" # toolsFile dertermines tools version toolsFile="sdk-tools-darwin-4333796.zip" -ndkVersion="r19c" +ndkVersion="r20" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version -- cgit v1.2.3