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

Merge branch 'actions:main' into macOS-remove-.NET-7

Browse Source
This commit is contained in:
susmitamane
2025-02-21 20:36:28 +05:30
committed by GitHub
parent e045a1667b a4b00d89b9
commit dc15d74126
11 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -22,7 +22,7 @@ To build a VM machine from this repo's source, see the [instructions](docs/creat
| --------------------|---------------------|--------------------|--------------------|
| Ubuntu 24.04 | `ubuntu-latest` or `ubuntu-24.04` | [ubuntu-24.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fubuntu24.json) |
| Ubuntu 22.04 | `ubuntu-22.04` | [ubuntu-22.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fubuntu22.json) |
| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fubuntu20.json) |
| Ubuntu 20.04 <sup>deprecated</sup> | `ubuntu-20.04` | [ubuntu-20.04] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fubuntu20.json) |
| macOS 15 <sup>beta</sup> | `macos-15-large`| [macOS-15] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fmacos-15.json) |
| macOS 15 Arm64 <sup>beta</sup> | `macos-15` or `macos-15-xlarge` | [macOS-15-arm64] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fmacos-15-arm64.json) |
| macOS 14 | `macos-latest-large` or `macos-14-large`| [macOS-14] | ![Endpoint Badge](https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2Fsubir0071%2F385e39188f4280878bada99250e99db7%2Fraw%2Fmacos-14.json) |

8
images.CI/linux-and-win/build-image.ps1
View File

@@ -1,7 +1,7 @@
param(
[String] [Parameter (Mandatory=$true)] $TemplatePath,
[String] [Parameter (Mandatory=$true)] $ClientId,
[String] [Parameter (Mandatory=$true)] $ClientSecret,
[String] [Parameter (Mandatory=$false)] $ClientSecret,
[String] [Parameter (Mandatory=$true)] $Location,
[String] [Parameter (Mandatory=$true)] $ImageName,
[String] [Parameter (Mandatory=$true)] $ImageResourceGroupName,
@@ -13,7 +13,7 @@ param(
[String] [Parameter (Mandatory=$false)] $VirtualNetworkRG,
[String] [Parameter (Mandatory=$false)] $VirtualNetworkSubnet,
[String] [Parameter (Mandatory=$false)] $AllowedInboundIpAddresses = "[]",
[hashtable] [Parameter (Mandatory=$False)] $Tags = @{}
[hashtable] [Parameter (Mandatory=$false)] $Tags = @{}
)
if (-not (Test-Path $TemplatePath))
@@ -35,7 +35,7 @@ $SensitiveData = @(
': ->'
)
$azure_tags = ($Tags.GetEnumerator() | ForEach-Object { "{0}={1}" -f $_.Key, $_.Value }) -join ","
$azure_tags = $Tags | ConvertTo-Json -Compress
Write-Host "Show Packer Version"
packer --version
@@ -60,7 +60,7 @@ packer build -var "client_id=$ClientId" `
-var "virtual_network_resource_group_name=$VirtualNetworkRG" `
-var "virtual_network_subnet_name=$VirtualNetworkSubnet" `
-var "allowed_inbound_ip_addresses=$($AllowedInboundIpAddresses)" `
-var "azure_tags={$azure_tags}" `
-var "azure_tags=$azure_tags" `
-color=false `
$TemplatePath `
| Where-Object {

9
images.CI/linux-and-win/cleanup.ps1
View File

@@ -1,14 +1,7 @@
param(
[Parameter (Mandatory=$true)] [string] $TempResourceGroupName,
[Parameter (Mandatory=$true)] [string] $SubscriptionId,
[Parameter (Mandatory=$true)] [string] $ClientId,
[Parameter (Mandatory=$true)] [string] $ClientSecret,
[Parameter (Mandatory=$true)] [string] $TenantId
[Parameter (Mandatory=$true)] [string] $TempResourceGroupName
)
az login --service-principal --username $ClientId --password=$ClientSecret --tenant $TenantId | Out-Null
az account set --subscription $SubscriptionId | Out-Null
$groupExist = az group exists --name $TempResourceGroupName
if ($groupExist -eq "true") {
Write-Host "Found a match, deleting temporary files"

4
images/ubuntu/toolsets/toolset-2004.json
View File

@@ -88,9 +88,9 @@
"addon_list": [
],
"additional_tools": [
"cmake;3.10.2.4988404",
"cmake;3.18.1",
"cmake;3.22.1"
"cmake;3.22.1",
"cmake;3.31.5"
],
"ndk": {
"default": "27",

4
images/ubuntu/toolsets/toolset-2204.json
View File

@@ -85,9 +85,9 @@
"addon_list": [
],
"additional_tools": [
"cmake;3.10.2.4988404",
"cmake;3.18.1",
"cmake;3.22.1"
"cmake;3.22.1",
"cmake;3.31.5"
],
"ndk": {
"default": "27",

3
images/ubuntu/toolsets/toolset-2404.json
View File

@@ -81,11 +81,12 @@
"addon_list": [
],
"additional_tools": [
"cmake;3.31.5"
],
"ndk": {
"default": "27",
"versions": [
"26", "27"
"26", "27", "28"
]
}
},

2
images/windows/scripts/build/Install-EdgeDriver.ps1
View File

@@ -27,7 +27,7 @@ Write-Host "Expand Microsoft Edge WebDriver archive..."
Expand-7ZipArchive -Path $archivePath -DestinationPath $edgeDriverPath
#Validate the EdgeDriver signature
$signatureThumbprint = "0BD8C56733FDCC06F8CB919FF5A200E39B1ACF71"
$signatureThumbprint = "7920AC8FB05E0FFFE21E8FF4B4F03093BA6AC16E"
Test-FileSignature -Path "$edgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $signatureThumbprint
Write-Host "Setting the environment variables..."

2
images/windows/scripts/build/Install-WSL2.ps1
View File

@@ -8,7 +8,7 @@ $downloadUrl = Resolve-GithubReleaseAssetUrl `
Install-Binary -Type MSI `
-Url $downloadUrl `
-ExpectedSHA256Sum "5A1EAD8E553ABBFB4DBB8291A329F3CA859DB2B8D887849F3F8CD19F7FABEF21"
-ExpectedSHA256Sum "3CC2866BE450210BDD7A7449DF96E0B1EAE25067EE348631A5B9BFC62C943740"
Write-Host "Performing wsl --install --no-distribution"
wsl.exe --install --no-distribution

6
images/windows/toolsets/toolset-2019.json
View File

@@ -143,14 +143,14 @@
"addon-google_apis-google-21"
],
"additional_tools": [
"cmake;3.10.2.4988404",
"cmake;3.18.1",
"cmake;3.22.1"
"cmake;3.22.1",
"cmake;3.31.5"
],
"ndk": {
"default": "27",
"versions": [
"26" , "27"
"26" , "27", "28"
]
}
},

9
images/windows/toolsets/toolset-2022.json
View File

@@ -115,7 +115,7 @@
{
"name": "az",
"versions": [
"12.1.0"
"12.4.0"
],
"zip_versions": [
@@ -139,12 +139,13 @@
"addons": [],
"additional_tools": [
"cmake;3.18.1",
"cmake;3.22.1"
"cmake;3.22.1",
"cmake;3.31.5"
],
"ndk": {
"default": "27",
"versions": [
"26", "27"
"26", "27", "28"
]
}
},
@@ -179,7 +180,7 @@
"subversion" : "17",
"edition" : "Enterprise",
"channel": "release",
"signature": "8F985BE8FD256085C90A95D3C74580511A1DB975",
"signature": "245D262748012A4FE6CE8BA6C951A4C4AFBC3E5D",
"workloads": [
"Component.Dotfuscator",
"Component.Linux.CMake",

7
images/windows/toolsets/toolset-2025.json
View File

@@ -96,12 +96,13 @@
"addons": [],
"additional_tools": [
"cmake;3.22.1",
"cmake;3.30.5"
"cmake;3.30.5",
"cmake;3.31.5"
],
"ndk": {
"default": "27",
"versions": [
"26", "27"
"26", "27", "28"
]
}
},
@@ -136,7 +137,7 @@
"subversion" : "17",
"edition" : "Enterprise",
"channel": "release",
"signature": "8F985BE8FD256085C90A95D3C74580511A1DB975",
"signature": "245D262748012A4FE6CE8BA6C951A4C4AFBC3E5D",
"workloads": [
"Component.Dotfuscator",
"Component.Linux.CMake",