mirror of
https://github.com/actions/runner-images.git
synced 2026-01-02 16:24:24 +08:00
virtual-environments => runner-images (#6033)
* virtual-environments => runner-images - as per https://github.blog/changelog/2022-08-08-github-actions-runner-images-repository-refresh * revert readme changes - as per https://github.com/actions/runner-images/pull/6033#discussion_r941173809
This commit is contained in:
Casper da Costa-Luis
committed by
GitHub
GitHub
parent
03b7305ca1
commit
4994130a96
@@ -239,7 +239,7 @@ function Get-VsixExtenstionFromMarketplace {
|
||||
$request -match 'Microsoft\.VisualStudio\.Services\.Payload\.FileName":"(?<filename>[^"]*)' | Out-Null
|
||||
$fileName = $Matches.filename
|
||||
$downloadUri = $assetUri + "/" + $fileName
|
||||
# ProBITools.MicrosoftReportProjectsforVisualStudio2022 has different URL https://github.com/actions/virtual-environments/issues/5340
|
||||
# ProBITools.MicrosoftReportProjectsforVisualStudio2022 has different URL https://github.com/actions/runner-images/issues/5340
|
||||
switch ($ExtensionMarketPlaceName) {
|
||||
"ProBITools.MicrosoftReportProjectsforVisualStudio2022" {
|
||||
$fileName = "Microsoft.DataTools.ReportingServices.vsix"
|
||||
|
||||
@@ -32,7 +32,7 @@ $avPreference | Foreach-Object {
|
||||
Write-Host "Disable Windows Defender scheduled tasks"
|
||||
Get-ScheduledTask -TaskPath '\Microsoft\Windows\Windows Defender\' | Disable-ScheduledTask | Out-Null
|
||||
|
||||
# https://github.com/actions/virtual-environments/issues/4277
|
||||
# https://github.com/actions/runner-images/issues/4277
|
||||
# https://docs.microsoft.com/en-us/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-compatibility?view=o365-worldwide
|
||||
$atpRegPath = 'HKLM:\SOFTWARE\Policies\Microsoft\Windows Advanced Threat Protection'
|
||||
if (Test-Path $atpRegPath) {
|
||||
|
||||
@@ -7,7 +7,7 @@ Write-Host "Cleanup WinSxS"
|
||||
Dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase
|
||||
|
||||
# Sets the default install version to v1 for new distributions
|
||||
# https://github.com/actions/virtual-environments/issues/5760
|
||||
# https://github.com/actions/runner-images/issues/5760
|
||||
if (Test-IsWin22) {
|
||||
Write-Host "Sets the default install version to v1 for new distributions"
|
||||
Add-DefaultItem -DefaultVariable "DefaultVersion" -Value 1 -Name "DEFAULT\Software\Microsoft\Windows\CurrentVersion\Lxss" -Kind "DWord"
|
||||
@@ -40,7 +40,7 @@ cmd /c "yarn cache clean 2>&1" | Out-Null
|
||||
cmd /c "npm cache clean --force 2>&1" | Out-Null
|
||||
|
||||
# allow msi to write to temp folder
|
||||
# see https://github.com/actions/virtual-environments/issues/1704
|
||||
# see https://github.com/actions/runner-images/issues/1704
|
||||
cmd /c "icacls $env:SystemRoot\Temp /grant Users:f /t /c /q 2>&1" | Out-Null
|
||||
|
||||
# Registry settings
|
||||
|
||||
@@ -32,7 +32,7 @@ Invoke-SBWithRetry -Command {
|
||||
Rename-Item "${sdkInstallRoot}\cmdline-tools\cmdline-tools" "latest" -ErrorAction Stop
|
||||
}
|
||||
|
||||
# ANDROID_NDK_PATH/HOME should not contain spaces. Otherwise, the script ndk-build.cmd gives an error https://github.com/actions/virtual-environments/issues/1122
|
||||
# ANDROID_NDK_PATH/HOME should not contain spaces. Otherwise, the script ndk-build.cmd gives an error https://github.com/actions/runner-images/issues/1122
|
||||
# create "C:\Android" directory and a hardlink inside pointed to sdk in Program Files
|
||||
New-Item -Path "C:\Android" -ItemType Directory
|
||||
New-Item -Path "$sdkRoot" -ItemType SymbolicLink -Value "$sdkInstallRoot"
|
||||
@@ -127,7 +127,7 @@ $ndkRoot = "$sdkRoot\ndk\$ndkDefaultVersion"
|
||||
# Create env variables
|
||||
setx ANDROID_HOME $sdkRoot /M
|
||||
setx ANDROID_SDK_ROOT $sdkRoot /M
|
||||
# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_ROOT variables should be set as many customer builds depend on them https://github.com/actions/virtual-environments/issues/5879
|
||||
# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_ROOT variables should be set as many customer builds depend on them https://github.com/actions/runner-images/issues/5879
|
||||
setx ANDROID_NDK $ndkRoot /M
|
||||
setx ANDROID_NDK_HOME $ndkRoot /M
|
||||
setx ANDROID_NDK_ROOT $ndkRoot /M
|
||||
|
||||
@@ -74,7 +74,7 @@ function Install-JavaJDK {
|
||||
$downloadUrl = $asset.binary.package.link
|
||||
$archivePath = Start-DownloadWithRetry -Url $downloadUrl -Name $([IO.Path]::GetFileName($downloadUrl))
|
||||
|
||||
# We have to replace '+' sign in the version to '-' due to the issue with incorrect path in Android builds https://github.com/actions/virtual-environments/issues/3014
|
||||
# We have to replace '+' sign in the version to '-' due to the issue with incorrect path in Android builds https://github.com/actions/runner-images/issues/3014
|
||||
$fullJavaVersion = $asset.version.semver -replace '\+', '-'
|
||||
# Create directories in toolcache path
|
||||
$javaToolcachePath = Join-Path -Path $env:AGENT_TOOLSDIRECTORY -ChildPath "Java_${VendorName}_jdk"
|
||||
|
||||
@@ -12,7 +12,7 @@ if (-not $vsixPackagesList) {
|
||||
|
||||
$vsVersion = $toolset.visualStudio.Version
|
||||
$vsixPackagesList | ForEach-Object {
|
||||
# Retrieve cdn endpoint to avoid HTTP error 429 https://github.com/actions/virtual-environments/issues/3074
|
||||
# Retrieve cdn endpoint to avoid HTTP error 429 https://github.com/actions/runner-images/issues/3074
|
||||
$vsixPackage = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_
|
||||
if ($vsixPackage.FileName.EndsWith(".vsix")) {
|
||||
Install-VsixExtension -Url $vsixPackage.DownloadUri -Name $vsixPackage.FileName -VSversion $vsVersion
|
||||
|
||||
@@ -5,16 +5,16 @@ $osEdition = $caption.Substring($caption.LastIndexOf(" ")+1)
|
||||
$osVersion = $os.Version
|
||||
$imageVersion = $env:IMAGE_VERSION
|
||||
$imageDataFile = $env:IMAGEDATA_FILE
|
||||
$githubUrl="https://github.com/actions/virtual-environments/blob"
|
||||
$githubUrl="https://github.com/actions/runner-images/blob"
|
||||
|
||||
if (Test-IsWin22) {
|
||||
$imageLabel = "windows-2022"
|
||||
$softwareUrl = "${githubUrl}/win22/${imageVersion}/images/win/Windows2022-Readme.md"
|
||||
$releaseUrl="https://github.com/actions/virtual-environments/releases/tag/win22%2F${imageVersion}"
|
||||
$releaseUrl="https://github.com/actions/runner-images/releases/tag/win22%2F${imageVersion}"
|
||||
} elseif (Test-IsWin19) {
|
||||
$imageLabel = "windows-2019"
|
||||
$softwareUrl = "${githubUrl}/win19/${imageVersion}/images/win/Windows2019-Readme.md"
|
||||
$releaseUrl="https://github.com/actions/virtual-environments/releases/tag/win19%2F${imageVersion}"
|
||||
$releaseUrl="https://github.com/actions/runner-images/releases/tag/win19%2F${imageVersion}"
|
||||
} else {
|
||||
throw "Invalid platform version is found. Either Windows Server 2019 or 2022 are required"
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ function Get-JavaVersions {
|
||||
return $javaVersions | Sort-Object $sortRules | ForEach-Object {
|
||||
$javaPath = $_.Value
|
||||
# Take semver from the java path
|
||||
# The path contains '-' sign in the version number instead of '+' due to the following issue, need to substitute it back https://github.com/actions/virtual-environments/issues/3014
|
||||
# The path contains '-' sign in the version number instead of '+' due to the following issue, need to substitute it back https://github.com/actions/runner-images/issues/3014
|
||||
$versionInPath = (Split-Path $javaPath) -replace "\w:\\.*\\"
|
||||
$version = $versionInPath -replace '-', '+'
|
||||
$defaultPostfix = ($javaPath -eq $defaultJavaPath) ? " (default)" : ""
|
||||
|
||||
Reference in New Issue
Block a user