actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2026-01-06 10:09:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

[windows] implement Android SDK cmdtools checksum (#8357)

Browse Source
This commit is contained in:
ilia-shipitsin
2023-10-05 09:31:22 +02:00
committed by GitHub
parent 31a055838e
commit 2e47a88733
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
images/win/scripts/Installers/Install-AndroidSDK.ps1
View File

@@ -1,14 +1,22 @@
################################################################################ ################################################################################
## File: Install-AndroidSDK.ps1 ## File: Install-AndroidSDK.ps1
## Desc: Install and update Android SDK and tools ## Desc: Install and update Android SDK and tools
## Supply chain security: checksum validation
################################################################################ ################################################################################
# get packages to install from the toolset # get packages to install from the toolset
$androidToolset = (Get-ToolsetContent).android $androidToolset = (Get-ToolsetContent).android
# Newer version(s) require Java 11 by default # Newer version(s) require Java 11 by default
# See https://github.com/actions/runner-images/issues/6960 # See https://github.com/actions/runner-images/issues/6960
$cmdlineToolsUrl = "https://dl.google.com/android/repository/commandlinetools-win-9123335_latest.zip" $cmdlineToolsUrl = $androidToolset.commandline_tools_url
$cmdlineToolsArchPath = Start-DownloadWithRetry -Url $cmdlineToolsUrl -Name "cmdline-tools.zip" $cmdlineToolsArchPath = Start-DownloadWithRetry -Url $cmdlineToolsUrl -Name "cmdline-tools.zip"
#region Supply chain security
$localFileHash = (Get-FileHash -Path $cmdlineToolsArchPath -Algorithm SHA256).Hash
Use-ChecksumComparison -LocalFileHash $localFileHash -DistributorFileHash $androidToolset.hash
#endregion
$sdkInstallRoot = "C:\Program Files (x86)\Android\android-sdk" $sdkInstallRoot = "C:\Program Files (x86)\Android\android-sdk"
$sdkRoot = "C:\Android\android-sdk" $sdkRoot = "C:\Android\android-sdk"
Extract-7Zip -Path $cmdlineToolsArchPath -DestinationPath "${sdkInstallRoot}\cmdline-tools" Extract-7Zip -Path $cmdlineToolsArchPath -DestinationPath "${sdkInstallRoot}\cmdline-tools"

2
images/win/toolsets/toolset-2019.json
View File

@@ -148,6 +148,8 @@
"versions": [ "8", "11", "17" ] "versions": [ "8", "11", "17" ]
}, },
"android": { "android": {
"commandline_tools_url": "https://dl.google.com/android/repository/commandlinetools-win-9123335_latest.zip",
"hash": "8A90E6A3DEB2FA13229B2E335EFD07687DCC8A55A3C544DA9F40B41404993E7D",
"platform_min_version": "19", "platform_min_version": "19",
"build_tools_min_version": "19.1.0", "build_tools_min_version": "19.1.0",
"extra_list": [ "extra_list": [

2
images/win/toolsets/toolset-2022.json
View File

@@ -132,6 +132,8 @@
"versions": [ "8", "11", "17" ] "versions": [ "8", "11", "17" ]
}, },
"android": { "android": {
"commandline_tools_url": "https://dl.google.com/android/repository/commandlinetools-win-9123335_latest.zip",
"hash": "8A90E6A3DEB2FA13229B2E335EFD07687DCC8A55A3C544DA9F40B41404993E7D",
"platform_min_version": "27", "platform_min_version": "27",
"build_tools_min_version": "27.0.0", "build_tools_min_version": "27.0.0",
"extra_list": [ "extra_list": [