mirror of
https://github.com/actions/runner-images.git
synced 2026-01-06 10:09:20 +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
@@ -32,7 +32,7 @@ EOF
|
||||
apt-get purge unattended-upgrades
|
||||
|
||||
# Need to limit arch for default apt repos due to
|
||||
# https://github.com/actions/virtual-environments/issues/1961
|
||||
# https://github.com/actions/runner-images/issues/1961
|
||||
sed -i'' -E 's/^deb http:\/\/(azure.archive|security).ubuntu.com/deb [arch=amd64,i386] http:\/\/\1.ubuntu.com/' /etc/apt/sources.list
|
||||
|
||||
echo 'APT sources limited to the actual architectures'
|
||||
|
||||
@@ -97,7 +97,7 @@ ANDROID_NDK_MAJOR_LATEST=(${ANDROID_NDK_MAJOR_VERSIONS[-1]})
|
||||
ndkDefaultFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_DEFAULT)
|
||||
ndkLatestFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST)
|
||||
ANDROID_NDK="$ANDROID_SDK_ROOT/ndk/$ndkDefaultFullVersion"
|
||||
# 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
|
||||
echo "ANDROID_NDK=${ANDROID_NDK}" | tee -a /etc/environment
|
||||
echo "ANDROID_NDK_HOME=${ANDROID_NDK}" | tee -a /etc/environment
|
||||
echo "ANDROID_NDK_ROOT=${ANDROID_NDK}" | tee -a /etc/environment
|
||||
|
||||
@@ -10,7 +10,7 @@ echo ImageOS=$IMAGE_OS | tee -a /etc/environment
|
||||
# Set the ACCEPT_EULA variable to Y value to confirm your acceptance of the End-User Licensing Agreement
|
||||
echo ACCEPT_EULA=Y | tee -a /etc/environment
|
||||
|
||||
# This directory is supposed to be created in $HOME and owned by user(https://github.com/actions/virtual-environments/issues/491)
|
||||
# This directory is supposed to be created in $HOME and owned by user(https://github.com/actions/runner-images/issues/491)
|
||||
mkdir -p /etc/skel/.config/configstore
|
||||
echo 'XDG_CONFIG_HOME=$HOME/.config' | tee -a /etc/environment
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ function GetChromiumRevision {
|
||||
|
||||
# Some Google Chrome versions are based on Chromium revisions for which a (usually very old) Chromium release with the same number exist. So far this has heppened with 4 digits long Chromium revisions (1060, 1086).
|
||||
# Use the previous Chromium release when this happens to avoid downloading and installing very old Chromium releases that would break image build because of incompatibilities.
|
||||
# First reported with: https://github.com/actions/virtual-environments/issues/5256
|
||||
# First reported with: https://github.com/actions/runner-images/issues/5256
|
||||
if [ ${#REVISION} -eq 4 ]; then
|
||||
CURRENT_REVISIONS=$(curl -s "https://omahaproxy.appspot.com/all.json?os=linux&channel=stable")
|
||||
PREVIOUS_VERSION=$(echo "$CURRENT_REVISIONS" | jq -r '.[].versions[].previous_version')
|
||||
@@ -28,7 +28,7 @@ function GetChromiumRevision {
|
||||
FIRST_PART_OF_REVISION=${REVISION:0:${#REVISION}/2}
|
||||
FIRST_PART_OF_PREVIOUS_REVISION=$(expr $FIRST_PART_OF_REVISION - 1)
|
||||
URL="https://www.googleapis.com/storage/v1/b/chromium-browser-snapshots/o?delimiter=/&prefix=Linux_x64"
|
||||
# Revision can include a hash instead of a number. Need to filter it out https://github.com/actions/virtual-environments/issues/5256
|
||||
# Revision can include a hash instead of a number. Need to filter it out https://github.com/actions/runner-images/issues/5256
|
||||
VERSIONS=$((curl -s $URL/${FIRST_PART_OF_REVISION} | jq -r '.prefixes[]' && curl -s $URL/${FIRST_PART_OF_PREVIOUS_REVISION} | jq -r '.prefixes[]') | grep -E "Linux_x64\/[0-9]+\/"| cut -d "/" -f 2 | sort --version-sort)
|
||||
|
||||
# If required Chromium revision is not found in the list
|
||||
|
||||
@@ -20,7 +20,7 @@ echo "Creating the symlink for [now] command to vercel CLI"
|
||||
ln -s /usr/local/bin/vercel /usr/local/bin/now
|
||||
|
||||
# fix global modules installation as regular user
|
||||
# related issue https://github.com/actions/virtual-environments/issues/3727
|
||||
# related issue https://github.com/actions/runner-images/issues/3727
|
||||
sudo chmod -R 777 /usr/local/lib/node_modules
|
||||
sudo chmod -R 777 /usr/local/bin
|
||||
|
||||
|
||||
@@ -102,7 +102,7 @@ chmod +x phpunit
|
||||
mv phpunit /usr/local/bin/phpunit
|
||||
|
||||
# ubuntu 20.04 libzip-dev is libzip5 based and is not compatible libzip-dev of ppa:ondrej/php
|
||||
# see https://github.com/actions/virtual-environments/issues/1084
|
||||
# see https://github.com/actions/runner-images/issues/1084
|
||||
if isUbuntu20 || isUbuntu22; then
|
||||
rm /etc/apt/sources.list.d/ondrej-*.list
|
||||
apt-get update
|
||||
|
||||
@@ -7,10 +7,10 @@ os_version=$(lsb_release -rs)
|
||||
image_label="ubuntu-${os_version}"
|
||||
version_major=${os_version/.*/}
|
||||
version_wo_dot=${os_version/./}
|
||||
github_url="https://github.com/actions/virtual-environments/blob"
|
||||
github_url="https://github.com/actions/runner-images/blob"
|
||||
|
||||
software_url="${github_url}/ubuntu${version_major}/${image_version}/images/linux/Ubuntu${version_wo_dot}-Readme.md"
|
||||
releaseUrl="https://github.com/actions/virtual-environments/releases/tag/ubuntu${version_major}%2F${image_version}"
|
||||
releaseUrl="https://github.com/actions/runner-images/releases/tag/ubuntu${version_major}%2F${image_version}"
|
||||
|
||||
cat <<EOF > $imagedata_file
|
||||
[
|
||||
|
||||
@@ -15,8 +15,8 @@ else
|
||||
fi
|
||||
image_label="macos-${label_version}"
|
||||
release_label="macOS-${label_version}"
|
||||
software_url="https://github.com/actions/virtual-environments/blob/${release_label}/${image_version}/images/macos/${image_label}-Readme.md"
|
||||
releaseUrl="https://github.com/actions/virtual-environments/releases/tag/${release_label}%2F${image_version}"
|
||||
software_url="https://github.com/actions/runner-images/blob/${release_label}/${image_version}/images/macos/${image_label}-Readme.md"
|
||||
releaseUrl="https://github.com/actions/runner-images/releases/tag/${release_label}%2F${image_version}"
|
||||
|
||||
cat <<EOF > $imagedata_file
|
||||
[
|
||||
|
||||
@@ -86,7 +86,7 @@ ndkDefault=$(get_full_ndk_version $ANDROID_NDK_MAJOR_DEFAULT)
|
||||
ANDROID_NDK_HOME=$ANDROID_HOME/ndk/$ndkDefault
|
||||
ndkLatest=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST)
|
||||
ANDROID_NDK_LATEST_HOME=$ANDROID_HOME/ndk/$ndkLatest
|
||||
# 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
|
||||
echo "export ANDROID_NDK=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc"
|
||||
echo "export ANDROID_NDK_HOME=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc"
|
||||
echo "export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc"
|
||||
|
||||
@@ -44,7 +44,7 @@ bazel
|
||||
# Install Azure DevOps extension for Azure Command Line Interface
|
||||
az extension add -n azure-devops
|
||||
|
||||
# Workaround https://github.com/actions/virtual-environments/issues/4931
|
||||
# Workaround https://github.com/actions/runner-images/issues/4931
|
||||
# by making Tcl/Tk paths the same on macOS 10.15 and macOS 11
|
||||
if is_BigSur; then
|
||||
version=$(brew info tcl-tk --json | jq -r '.[].installed[].version')
|
||||
|
||||
@@ -7,7 +7,7 @@ for gccVersion in $gccVersions; do
|
||||
brew_smart_install "gcc@${gccVersion}"
|
||||
done
|
||||
|
||||
# Delete default gfortran link if it exists https://github.com/actions/virtual-environments/issues/1280
|
||||
# Delete default gfortran link if it exists https://github.com/actions/runner-images/issues/1280
|
||||
gfortranPath=$(which gfortran)
|
||||
if [ $gfortranPath ]; then
|
||||
rm $gfortranPath
|
||||
|
||||
@@ -18,7 +18,7 @@ if is_Veertu; then
|
||||
fi
|
||||
|
||||
# Explicitly overwrite symlinks created by Python2 such as /usr/local/bin/2to3 since they conflict with symlinks from Python3
|
||||
# https://github.com/actions/virtual-environments/issues/2322
|
||||
# https://github.com/actions/runner-images/issues/2322
|
||||
echo "Brew Installing Python 3"
|
||||
brew_smart_install "python@3.9" || brew link --overwrite python@3.9
|
||||
|
||||
|
||||
@@ -82,7 +82,7 @@ PREFERENCES_XAMARIN_DIR="${HOME}/Library/Preferences/Xamarin"
|
||||
mkdir -p $PREFERENCES_XAMARIN_DIR
|
||||
/usr/libexec/PlistBuddy -c "add :AppleSdkRoot string /Applications/Xcode_${DEFAULT_XCODE_VERSION}.app" $PREFERENCES_XAMARIN_DIR/Settings.plist
|
||||
|
||||
# Temporary workaround to recreate nuget.config file with a correct feed https://github.com/actions/virtual-environments/issues/5768
|
||||
# Temporary workaround to recreate nuget.config file with a correct feed https://github.com/actions/runner-images/issues/5768
|
||||
rm -rf $HOME/.config/NuGet/NuGet.Config
|
||||
nuget config
|
||||
|
||||
|
||||
@@ -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