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

[macos] Add Android Comand Line tools (#2363)

Browse Source
This commit is contained in:
Sergey Dolin
2020-12-31 13:22:17 +05:00
committed by GitHub
parent 875891b86b
commit 58a6784582
6 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
images/macos/provision/core/android-toolsets.sh
View File

@@ -24,6 +24,7 @@ ANDROID_PLATFORM=($(get_toolset_value '.android.platform_min_version'))
ANDROID_BUILD_TOOL=($(get_toolset_value '.android.build_tools_min_version'))
ANDROID_EXTRA_LIST=($(get_toolset_value '.android."extra-list"[]'))
ANDROID_ADDON_LIST=($(get_toolset_value '.android."addon-list"[]'))
ANDROID_ADDITIONAL_TOOLS=($(get_toolset_value '.android."additional-tools"[]'))
# Get the latest command line tools from https://developer.android.com/studio/index.html
# Release note: https://developer.android.com/studio/releases/sdk-tools.html
@@ -94,6 +95,12 @@ do
echo y | $SDKMANAGER "add-ons;$addon_name"
done
for tool_name in "${ANDROID_ADDITIONAL_TOOLS[@]}"
do
echo "Installing additional tool $tool_name ..."
echo y | $SDKMANAGER "$tool_name"
done
popd
echo "Installing ProGuard-5..."
@@ -107,4 +114,4 @@ tar xzf proguard5.tgz --strip 1 && rm -f proguard5.tgz
cp ../proguard4/proguard-*.txt . # Copy the Proguard Android definitions from the previous version
popd
invoke_tests "Android"
invoke_tests "Android"

4
images/macos/software-report/SoftwareReport.Android.psm1
View File

@@ -50,6 +50,10 @@ function Build-AndroidTable {
"Package" = "Android SDK Build-tools"
"Version" = Get-AndroidBuildToolVersions -PackageInfo $packageInfo
},
@{
"Package" = "Android Command Line Tools"
"Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Command-line Tools"
},
@{
"Package" = "Android SDK Platform-Tools"
"Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Platform-Tools"

5
images/macos/tests/Android.Tests.ps1
View File

@@ -27,7 +27,8 @@ Describe "Android" {
$platforms,
$buildTools,
(Get-ToolsetValue "android.extra-list" | ForEach-Object { "extras/${_}" }),
(Get-ToolsetValue "android.addon-list" | ForEach-Object { "add-ons/${_}" })
(Get-ToolsetValue "android.addon-list" | ForEach-Object { "add-ons/${_}" }),
(Get-ToolsetValue "android.additional-tools")
) | ForEach-Object { $_ }
BeforeAll {
@@ -94,4 +95,4 @@ Describe "Gradle" {
It "Gradle is compatible with init.d plugins" {
"cd /tmp && gradle tasks" | Should -ReturnZeroExitCode
}
}
}

5
images/macos/toolsets/toolset-10.14.json
View File

@@ -209,6 +209,9 @@
],
"addon-list": [
"addon-google_apis-google-24", "addon-google_apis-google-23", "addon-google_apis-google-22", "addon-google_apis-google-21"
],
"additional-tools": [
"cmdline-tools;latest"
]
},
"powershellModules": [
@@ -323,4 +326,4 @@
"2.1"
]
}
}
}

5
images/macos/toolsets/toolset-10.15.json
View File

@@ -139,6 +139,9 @@
],
"addon-list": [
"addon-google_apis-google-24", "addon-google_apis-google-23", "addon-google_apis-google-22", "addon-google_apis-google-21"
],
"additional-tools": [
"cmdline-tools;latest"
]
},
"powershellModules": [
@@ -254,4 +257,4 @@
"5.0"
]
}
}
}

7
images/macos/toolsets/toolset-11.0.json
View File

@@ -72,7 +72,10 @@
"extra-list": [
"android;m2repository", "google;m2repository", "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager"
],
"addon-list": []
"addon-list": [],
"additional-tools": [
"cmdline-tools;latest"
]
},
"powershellModules": [
{
@@ -165,4 +168,4 @@
"5.0"
]
}
}
}