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

fix function accroding to comments

Browse Source
This commit is contained in:
Dmitry Shibanov
2020-10-01 16:33:20 +03:00
parent 16a27e2045
commit 9956daab66
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@ set -e
source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/os.sh
source $HELPER_SCRIPTS/install.sh source $HELPER_SCRIPTS/install.sh
function install_android_package_gte_then { function filter_components_by_version {
minimumVersion=$1 minimumVersion=$1
shift shift
toolsArr=("$@") toolsArr=("$@")
@@ -20,8 +20,7 @@ function install_android_package_gte_then {
version=$(echo "${item##*[-;]}") version=$(echo "${item##*[-;]}")
if verlte $minimumVersion $version if verlte $minimumVersion $version
then then
echo "Start installing $item" components+=($item)
echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager $item
fi fi
done done
} }
@@ -66,13 +65,15 @@ addons=$(jq -r '.android.addon_list[]|"add-ons;" + .' $toolset)
additional=$(jq -r '.android.additional_tools[]' $toolset) 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 components=( "${extras[@]}" "${addons[@]}" "${additional[@]}" )
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')) availablePlatforms=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android-" | cut -d"|" -f 1))
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')) availableBuildTools=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "build-tools;" | cut -d"|" -f 1))
install_android_package_gte_then $minimumPlatformVersion "${platforms[@]}" filter_components_by_version $minimumPlatformVersion "${availablePlatforms[@]}"
install_android_package_gte_then $minimumBuildToolVersion "${buildTools[@]}" filter_components_by_version $minimumBuildToolVersion "${availableBuildTools[@]}"
echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager ${components[@]}
# Add required permissions # Add required permissions
chmod -R a+rwx ${ANDROID_SDK_ROOT} chmod -R a+rwx ${ANDROID_SDK_ROOT}