actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-15 22:26:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

add function and clean up logic for array

Browse Source
This commit is contained in:
Dmitry Shibanov
2020-10-01 13:07:40 +03:00
parent 89bf727a19
commit d0f8592d88
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
images/linux/scripts/helpers/install.sh
View File

@@ -42,4 +42,9 @@ download_with_retries() {
## fi ## fi
function IsPackageInstalled { function IsPackageInstalled {
dpkg -S $1 &> /dev/null dpkg -S $1 &> /dev/null
}
verlte() {
sortedVersion=$(echo -e "$1\n$2" | sort -V | head -n1)
[ "$1" = "$sortedVersion" ]
} }

17
images/linux/scripts/installers/android.sh
View File

@@ -9,12 +9,7 @@ set -e
# Source the helpers for use with the script # Source the helpers for use with the script
source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/os.sh
verlte() { function install_android_package_gte_then {
sortedVersion=$(echo -e "$1\n$2" | sort -V | head -n1)
[ "$1" = "$sortedVersion" ]
}
function install_android_packages {
minimumVersion=$1 minimumVersion=$1
shift shift
toolsArr=("$@") toolsArr=("$@")
@@ -72,13 +67,11 @@ additional=$(jq -r '.android.additional_tools[]' $toolset)
# Install the following SDKs and build tools, passing in "y" to accept licenses. # Install the following SDKs and build tools, passing in "y" to accept licenses.
echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager $extras $google_api_list $addons $additional echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager $extras $google_api_list $addons $additional
platforms=$(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android" | sed -E "s/[[:space:]]+//g" | sed -E "s/\|.*//g") platforms=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android-" | cut -d"|" -f 1 | sed 's/platforms;android-//g'))
buildTools=$(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "build-tools;" | sed -E "s/[[:space:]]+//g" | sed -E "s/\|.*//g") buildTools=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "build-tools;" | cut -d"|" -f 1 | sed 's/build-tools;//g'))
platformsArr=(${platforms}) install_android_package_gte_then $minimumPlatformVersion "${platforms[@]}"
install_android_packages $minimumPlatformVersion "${platformsArr[@]}" install_android_package_gte_then $minimumBuildToolVersion "${buildTools[@]}"
buildToolsArr=(${buildTools})
install_android_packages $minimumBuildToolVersion "${buildToolsArr[@]}"
# Add required permissions # Add required permissions
chmod -R a+rwx ${ANDROID_SDK_ROOT} chmod -R a+rwx ${ANDROID_SDK_ROOT}