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

[Ubuntu] Get toolset value function. (#2435)

Browse Source 
* [macOS] Fail Pester tests on error

* return it back

* [Ubuntu] add get_toolset_values function

* added fix

* fix all nitpicks

* try to get rid brackets

* removed brackets.

* pipx-package fix
This commit is contained in:
Darii Nurgaleev
2021-01-15 21:12:26 +07:00
committed by GitHub
parent 68e9c68855
commit 7c6117e6ec
13 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,12 +56,11 @@ else
exit 1
fi
toolset="$INSTALLER_SCRIPT_FOLDER/toolset.json"
minimumBuildToolVersion=$(jq -r '.android.build_tools_min_version' $toolset)
minimumPlatformVersion=$(jq -r '.android.platform_min_version' $toolset)
extras=$(jq -r '.android.extra_list[]|"extras;" + .' $toolset)
addons=$(jq -r '.android.addon_list[]|"add-ons;" + .' $toolset)
additional=$(jq -r '.android.additional_tools[]' $toolset)
minimumBuildToolVersion=$(get_toolset_value '.android.build_tools_min_version')
minimumPlatformVersion=$(get_toolset_value '.android.platform_min_version')
extras=$(get_toolset_value '.android.extra_list[]|"extras;" + .')
addons=$(get_toolset_value '.android.addon_list[]|"add-ons;" + .')
additional=$(get_toolset_value '.android.additional_tools[]')
# Install the following SDKs and build tools, passing in "y" to accept licenses.
components=( "${extras[@]}" "${addons[@]}" "${additional[@]}" )