actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-10 11:07:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ubuntu, macOS] Fix tools version extraction in Install Android SDK scripts (#12911)

Browse Source
This commit is contained in:
Alejandro Rosas
2025-10-23 22:31:30 +03:00
committed by GitHub
parent b1d8e89820
commit dcc9bb6dbf
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
images/macos/scripts/build/install-android-sdk.sh
View File

@@ -12,9 +12,9 @@ add_filtered_installation_components() {
local tools_array=("$@")
for item in ${tools_array[@]}; do
# take the last argument after splitting string by ';'' and '-''
version=$(echo "${item##*[-;]}")
if [[ "$(printf "${minimum_version}\n${version}\n" | sort -V | head -n1)" == "$minimum_version" ]]; then
# Take the last version number that appears after the last '-' or ';'
item_version=$(echo "$item" | grep -oE '[-;][0-9.]+' | grep -oE '[0-9.]+')
if [[ "$(printf "${minimum_version}\n${item_version}\n" | sort -V | head -n1)" == "$minimum_version" ]]; then
components+=($item)
fi
done

4
images/ubuntu/scripts/build/install-android-sdk.sh
View File

@@ -15,8 +15,8 @@ add_filtered_installation_components() {
local tools_array=("$@")
for item in ${tools_array[@]}; do
# Take the last argument after splitting string by ';'' and '-''
item_version=$(echo "${item##*[-;]}")
# Take the last version number that appears after the last '-' or ';'
item_version=$(echo "$item" | grep -oE '[-;][0-9.]+' | grep -oE '[0-9.]+')
# Semver 'comparison'. Add item to components array, if item's version is greater than or equal to minimum version
if [[ "$(printf "${minimum_version}\n${item_version}\n" | sort -V | head -n1)" == "$minimum_version" ]]; then