diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-24 10:34:21 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-24 19:19:00 +0000 |
commit | 2ea45a59a72402ba65cb484020576aa12a610038 (patch) | |
tree | 09d0d01f022519028e558ea9e6bdea6b8de327c1 /coin/provisioning/qtci-osx-10.11-x86_64 | |
parent | 370fdfcefdee8b5f4103caeb199272b3b0b957a2 (diff) |
Improve Android SDK/NDK installation on macOS
* Remove unused installation on macOS 10.10 as we only build packages
on 10.11.
* Replace the use of the ~1GB downloads of the zip files with a direct
extraction via NFS. This is more resilient to flakyness in the network
connection.
Change-Id: I1bfe5bbf00a6614233b517801daf130069094ec9
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-osx-10.11-x86_64')
-rw-r--r-- | coin/provisioning/qtci-osx-10.11-x86_64/android.sh | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/android.sh b/coin/provisioning/qtci-osx-10.11-x86_64/android.sh index 559eabd6..da37ad52 100644 --- a/coin/provisioning/qtci-osx-10.11-x86_64/android.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/android.sh @@ -43,55 +43,44 @@ set -e targetFolder="/opt/android" -baseUrl="http://ci-files01-hki.ci.local/input/android" +basePath="/net/ci-files01-hki.ci.local/hdd/www/input/android" # SDK sdkVersion="android-sdk_r24.4.1-macosx.zip" sdkBuildToolsVersion="24.0.2" sdkApiLevel="android-18" -sdkUrl="$baseUrl/$sdkVersion" -sdkSha1="85a9cccb0b1f9e6f1f616335c5f07107553840cd" -sdkTargetFile="$targetFolder/$sdkVersion" -sdkExtract="unzip $sdkTargetFile -d $targetFolder" +sdkSourceFile="$basePath/$sdkVersion" +sdkExtract="unzip $sdkSourceFile -d $targetFolder" sdkFolderName="android-sdk-macosx" sdkName="sdk" # NDK ndkVersion="android-ndk-r10e-darwin-x86_64.zip" -ndkUrl="$baseUrl/$ndkVersion" -ndkSha1="6be8598e4ed3d9dd42998c8cb666f0ee502b1294" -ndkTargetFile="$targetFolder/$ndkVersion" -ndkExtract="unzip $ndkTargetFile -d $targetFolder" +ndkSourceFile="$basePath/$ndkVersion" +ndkExtract="unzip $ndkSourceFile -d $targetFolder" ndkFolderName="android-ndk-r10e" ndkName="ndk" function InstallAndroidPackage { targetFolder=$1 version=$2 - url=$3 - sha1=$4 - targetFile=$5 - extract=$6 - folderName=$7 - name=$8 + extract=$3 + folderName=$4 + name=$5 - sudo curl --retry 5 --retry-delay 10 --retry-max-time 60 $url -o $targetFile || echo "Failed to download '$url' multiple times" - shasum $targetFile |grep $sha1 || echo "shasum check failed !" - sudo chmod 755 $targetFile sudo $extract || echo "Failed to extract $url" sudo chown -R qt:wheel $targetFolder/$folderName sudo mv $targetFolder/$folderName $targetFolder/$name || echo "Failed to rename $name" - sudo rm -fr $targetFolder/$version || echo "Failed to remove $targetFolder/$version" } sudo mkdir $targetFolder # Install Android SDK echo "Installing Android SDK version $sdkVersion..." -InstallAndroidPackage $targetFolder $sdkVersion $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName +InstallAndroidPackage $targetFolder $sdkVersion "$sdkExtract" $sdkFolderName $sdkName # Install Android NDK echo "Installing Android NDK version $ndkVersion..." -InstallAndroidPackage $targetFolder $ndkVersion $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName +InstallAndroidPackage $targetFolder $ndkVersion "$ndkExtract" $ndkFolderName $ndkName # run update for Android SDK and install SDK API version 18, latest SDK tools, platform-tools and build-tools echo "Running Android SDK update for API version 18, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..." |