diff options
Diffstat (limited to 'coin/provisioning/qtci-macos-10.14-x86_64')
16 files changed, 79 insertions, 22 deletions
diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/01-disable-notifications_and_warnings.sh b/coin/provisioning/qtci-macos-10.14-x86_64/01-disable-notifications_and_warnings.sh new file mode 100755 index 00000000..27efbb62 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/01-disable-notifications_and_warnings.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/disable-notifications_and_warnings.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh new file mode 100755 index 00000000..08669e52 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/increase_limits.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-macos-10.14-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh index 817e3858..79eba834 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -37,7 +37,13 @@ set -ex # This script modified system settings for automated use -VNCPassword=qt +targetFile="$HOME/vncpw.txt" + +# Fetch password +curl --retry 5 --retry-delay 10 --retry-max-time 60 "http://ci-files01-hki.intra.qt.io/input/semisecure/vncpw.txt" -o "$targetFile" +shasum "$targetFile" |grep "a795fccaa8f277e62ec08e6056c544b8b63924a0" + +{ VNCPassword=$(cat "$targetFile"); } 2> /dev/null NTS_IP=10.212.2.216 echo "Disable Screensaver" @@ -82,11 +88,14 @@ defaults write -g InitialKeyRepeat -int 15 # normal minimum is 2 (30 ms) defaults write -g KeyRepeat -int 2 +set +x echo "Enable remote desktop sharing" sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all +set -x echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts sudo systemsetup settimezone GMT sudo systemsetup setusingnetworktime off +sudo rm -f "$targetFile" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh index ebeadc02..25a53374 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/20-xcode.sh @@ -50,4 +50,4 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_10.2.1.tar.gz 10.2.1 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_11.3.tar.gz 11.3 diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh index 09055ee6..9d38eb10 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/21-install-commandlinetools.sh @@ -37,11 +37,10 @@ set -ex # shellcheck source=../common/macos/install-commandlinetools.sh source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" - -version="10.2.1" -packageName="Command_Line_Tools_macOS_10.14_for_Xcode_$version.dmg" +version="11.3" +packageName="Command_Line_Tools_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.14_mojave/$packageName" -sha1="18fea89bb743107aee372a212be608d6e35fdecf" +sha1="b42a0fdf69ac46de04812cd23f0eefa141371253" InstallCommandLineTools $url $url $sha1 $packageName $version diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh index 06e984ec..f7f9e214 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -ex +set -e BASEDIR=$(dirname "$0") "$BASEDIR/../common/macos/homebrew.sh" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/26-freetype.sh b/coin/provisioning/qtci-macos-10.14-x86_64/26-freetype.sh new file mode 100755 index 00000000..0faec4b4 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/26-freetype.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install freetype diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/26-ninja.sh b/coin/provisioning/qtci-macos-10.14-x86_64/26-ninja.sh new file mode 100755 index 00000000..c9d3e309 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/26-ninja.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install ninja diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/26-pcre2.sh b/coin/provisioning/qtci-macos-10.14-x86_64/26-pcre2.sh new file mode 100755 index 00000000..f8af516b --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/26-pcre2.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install pcre2 diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh index c0d75ff6..aa0935f0 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.14-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="r20" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version @@ -68,14 +68,20 @@ sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder" echo "Changing ownership of Android files." sudo chown -R qt:wheel "$targetFolder" +# Run the following command under `eval` or `sh -c` so that the shell properly splits it +sdkmanager_no_progress_bar_cmd="tr '\r' '\n' | grep -v '^\[[ =]*\]'" + echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion." -(echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" +(echo "y"; echo "y") | "$sdkTargetFolder/tools/bin/sdkmanager" \ + "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \ + | eval $sdkmanager_no_progress_bar_cmd echo "Checking the contents of Android SDK..." 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" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh new file mode 100755 index 00000000..ab992405 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +brew install nodejs + diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh index cf312ed2..57a86c47 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/35-openssl.sh @@ -2,5 +2,6 @@ set -ex -# shellcheck source=../common/macos/install_openssl_111a.sh -source "${BASH_SOURCE%/*}/../common/macos/install_openssl_111a.sh" +# shellcheck source=../common/macos/install_openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "macos" + diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/36-emsdk.sh b/coin/provisioning/qtci-macos-10.14-x86_64/36-emsdk.sh new file mode 100755 index 00000000..7396d336 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-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" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh index 0b8595a0..bded35eb 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh @@ -96,8 +96,8 @@ Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq chmod 755 "$csreq" # iOS signing tools -devIDKeychain="Developer_ID_TheQtCompany.keychain" -shaDevIdKeychain="0420a129c17725a97afd6fdafeb9cddfb80a65ca" +devIDKeychain="Developer_ID_TheQtCompany.keychain-db" +shaDevIdKeychain="972cca1879cdaeeb6042f9879756c748a8d1eddc" Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain echo "Opening $devIDKeychain.." open "$keychains/$devIDKeychain" @@ -114,15 +114,15 @@ sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" { Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null { iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null -iPhoneDeveloper="iosdevelopment_2019.p12" -shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c" -Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper +iPhoneDeveloper="iosDevelopment2019CiTeam.p12" +shaIPhoneDeveloper="fa22abe1b1cc64af6585f7a61c4aba5e00220bdc" +Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper echo "Importing $iPhoneDeveloper.." { security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null -iPhoneDistribution="iosdistribution_2019.p12" -shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac" -Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution +iPhoneDistribution="iosDistribution2019CiTeam.p12" +shaIPhoneDistribution="6510119651c7aecb21d0a1dae329f2eae1e8f4e9" +Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution echo "Importing $iPhoneDistribution.." { security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null @@ -130,8 +130,8 @@ echo "Importing $iPhoneDistribution.." echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." mkdir "$targetFolder/Library/MobileDevice" mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles" -shaMobileprovision="88c67c95a6f59e6463a00da0b5021f581db624bf" -Install "$cacheSigningTools/latest_ios_cert/iOS_Dev08112017.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision +shaMobileprovision="477a7f3876c4333bd56a045df0d82fce795b1ebb" +Install "$cacheSigningTools/latest_ios_cert_2019/iOS_Dev_2019_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision # Removing password files rm -fr "$targetFolder/login_keychain_password.txt" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/97-set-locale.sh b/coin/provisioning/qtci-macos-10.14-x86_64/97-set-locale.sh new file mode 100755 index 00000000..e34b7381 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/97-set-locale.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/macos/set-locale.sh |