Merge branch 'actions:main' into macOS-remove-.NET-7
This commit is contained in:
@@ -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] |  |
|
| Ubuntu 24.04 | `ubuntu-latest` or `ubuntu-24.04` | [ubuntu-24.04] |  |
|
||||||
| Ubuntu 22.04 | `ubuntu-22.04` | [ubuntu-22.04] |  |
|
| Ubuntu 22.04 | `ubuntu-22.04` | [ubuntu-22.04] |  |
|
||||||
| Ubuntu 20.04 | `ubuntu-20.04` | [ubuntu-20.04] |  |
|
| Ubuntu 20.04 <sup>deprecated</sup> | `ubuntu-20.04` | [ubuntu-20.04] |  |
|
||||||
| macOS 15 <sup>beta</sup> | `macos-15-large`| [macOS-15] |  |
|
| macOS 15 <sup>beta</sup> | `macos-15-large`| [macOS-15] |  |
|
||||||
| macOS 15 Arm64 <sup>beta</sup> | `macos-15` or `macos-15-xlarge` | [macOS-15-arm64] |  |
|
| macOS 15 Arm64 <sup>beta</sup> | `macos-15` or `macos-15-xlarge` | [macOS-15-arm64] |  |
|
||||||
| macOS 14 | `macos-latest-large` or `macos-14-large`| [macOS-14] |  |
|
| macOS 14 | `macos-latest-large` or `macos-14-large`| [macOS-14] |  |
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
param(
|
param(
|
||||||
[String] [Parameter (Mandatory=$true)] $TemplatePath,
|
[String] [Parameter (Mandatory=$true)] $TemplatePath,
|
||||||
[String] [Parameter (Mandatory=$true)] $ClientId,
|
[String] [Parameter (Mandatory=$true)] $ClientId,
|
||||||
[String] [Parameter (Mandatory=$true)] $ClientSecret,
|
[String] [Parameter (Mandatory=$false)] $ClientSecret,
|
||||||
[String] [Parameter (Mandatory=$true)] $Location,
|
[String] [Parameter (Mandatory=$true)] $Location,
|
||||||
[String] [Parameter (Mandatory=$true)] $ImageName,
|
[String] [Parameter (Mandatory=$true)] $ImageName,
|
||||||
[String] [Parameter (Mandatory=$true)] $ImageResourceGroupName,
|
[String] [Parameter (Mandatory=$true)] $ImageResourceGroupName,
|
||||||
@@ -13,7 +13,7 @@ param(
|
|||||||
[String] [Parameter (Mandatory=$false)] $VirtualNetworkRG,
|
[String] [Parameter (Mandatory=$false)] $VirtualNetworkRG,
|
||||||
[String] [Parameter (Mandatory=$false)] $VirtualNetworkSubnet,
|
[String] [Parameter (Mandatory=$false)] $VirtualNetworkSubnet,
|
||||||
[String] [Parameter (Mandatory=$false)] $AllowedInboundIpAddresses = "[]",
|
[String] [Parameter (Mandatory=$false)] $AllowedInboundIpAddresses = "[]",
|
||||||
[hashtable] [Parameter (Mandatory=$False)] $Tags = @{}
|
[hashtable] [Parameter (Mandatory=$false)] $Tags = @{}
|
||||||
)
|
)
|
||||||
|
|
||||||
if (-not (Test-Path $TemplatePath))
|
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"
|
Write-Host "Show Packer Version"
|
||||||
packer --version
|
packer --version
|
||||||
@@ -60,7 +60,7 @@ packer build -var "client_id=$ClientId" `
|
|||||||
-var "virtual_network_resource_group_name=$VirtualNetworkRG" `
|
-var "virtual_network_resource_group_name=$VirtualNetworkRG" `
|
||||||
-var "virtual_network_subnet_name=$VirtualNetworkSubnet" `
|
-var "virtual_network_subnet_name=$VirtualNetworkSubnet" `
|
||||||
-var "allowed_inbound_ip_addresses=$($AllowedInboundIpAddresses)" `
|
-var "allowed_inbound_ip_addresses=$($AllowedInboundIpAddresses)" `
|
||||||
-var "azure_tags={$azure_tags}" `
|
-var "azure_tags=$azure_tags" `
|
||||||
-color=false `
|
-color=false `
|
||||||
$TemplatePath `
|
$TemplatePath `
|
||||||
| Where-Object {
|
| Where-Object {
|
||||||
|
|||||||
@@ -1,14 +1,7 @@
|
|||||||
param(
|
param(
|
||||||
[Parameter (Mandatory=$true)] [string] $TempResourceGroupName,
|
[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
|
|
||||||
)
|
)
|
||||||
|
|
||||||
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
|
$groupExist = az group exists --name $TempResourceGroupName
|
||||||
if ($groupExist -eq "true") {
|
if ($groupExist -eq "true") {
|
||||||
Write-Host "Found a match, deleting temporary files"
|
Write-Host "Found a match, deleting temporary files"
|
||||||
|
|||||||
@@ -88,9 +88,9 @@
|
|||||||
"addon_list": [
|
"addon_list": [
|
||||||
],
|
],
|
||||||
"additional_tools": [
|
"additional_tools": [
|
||||||
"cmake;3.10.2.4988404",
|
|
||||||
"cmake;3.18.1",
|
"cmake;3.18.1",
|
||||||
"cmake;3.22.1"
|
"cmake;3.22.1",
|
||||||
|
"cmake;3.31.5"
|
||||||
],
|
],
|
||||||
"ndk": {
|
"ndk": {
|
||||||
"default": "27",
|
"default": "27",
|
||||||
|
|||||||
@@ -85,9 +85,9 @@
|
|||||||
"addon_list": [
|
"addon_list": [
|
||||||
],
|
],
|
||||||
"additional_tools": [
|
"additional_tools": [
|
||||||
"cmake;3.10.2.4988404",
|
|
||||||
"cmake;3.18.1",
|
"cmake;3.18.1",
|
||||||
"cmake;3.22.1"
|
"cmake;3.22.1",
|
||||||
|
"cmake;3.31.5"
|
||||||
],
|
],
|
||||||
"ndk": {
|
"ndk": {
|
||||||
"default": "27",
|
"default": "27",
|
||||||
|
|||||||
@@ -81,11 +81,12 @@
|
|||||||
"addon_list": [
|
"addon_list": [
|
||||||
],
|
],
|
||||||
"additional_tools": [
|
"additional_tools": [
|
||||||
|
"cmake;3.31.5"
|
||||||
],
|
],
|
||||||
"ndk": {
|
"ndk": {
|
||||||
"default": "27",
|
"default": "27",
|
||||||
"versions": [
|
"versions": [
|
||||||
"26", "27"
|
"26", "27", "28"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ Write-Host "Expand Microsoft Edge WebDriver archive..."
|
|||||||
Expand-7ZipArchive -Path $archivePath -DestinationPath $edgeDriverPath
|
Expand-7ZipArchive -Path $archivePath -DestinationPath $edgeDriverPath
|
||||||
|
|
||||||
#Validate the EdgeDriver signature
|
#Validate the EdgeDriver signature
|
||||||
$signatureThumbprint = "0BD8C56733FDCC06F8CB919FF5A200E39B1ACF71"
|
$signatureThumbprint = "7920AC8FB05E0FFFE21E8FF4B4F03093BA6AC16E"
|
||||||
Test-FileSignature -Path "$edgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $signatureThumbprint
|
Test-FileSignature -Path "$edgeDriverPath\msedgedriver.exe" -ExpectedThumbprint $signatureThumbprint
|
||||||
|
|
||||||
Write-Host "Setting the environment variables..."
|
Write-Host "Setting the environment variables..."
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ $downloadUrl = Resolve-GithubReleaseAssetUrl `
|
|||||||
|
|
||||||
Install-Binary -Type MSI `
|
Install-Binary -Type MSI `
|
||||||
-Url $downloadUrl `
|
-Url $downloadUrl `
|
||||||
-ExpectedSHA256Sum "5A1EAD8E553ABBFB4DBB8291A329F3CA859DB2B8D887849F3F8CD19F7FABEF21"
|
-ExpectedSHA256Sum "3CC2866BE450210BDD7A7449DF96E0B1EAE25067EE348631A5B9BFC62C943740"
|
||||||
|
|
||||||
Write-Host "Performing wsl --install --no-distribution"
|
Write-Host "Performing wsl --install --no-distribution"
|
||||||
wsl.exe --install --no-distribution
|
wsl.exe --install --no-distribution
|
||||||
|
|||||||
@@ -143,14 +143,14 @@
|
|||||||
"addon-google_apis-google-21"
|
"addon-google_apis-google-21"
|
||||||
],
|
],
|
||||||
"additional_tools": [
|
"additional_tools": [
|
||||||
"cmake;3.10.2.4988404",
|
|
||||||
"cmake;3.18.1",
|
"cmake;3.18.1",
|
||||||
"cmake;3.22.1"
|
"cmake;3.22.1",
|
||||||
|
"cmake;3.31.5"
|
||||||
],
|
],
|
||||||
"ndk": {
|
"ndk": {
|
||||||
"default": "27",
|
"default": "27",
|
||||||
"versions": [
|
"versions": [
|
||||||
"26" , "27"
|
"26" , "27", "28"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -115,7 +115,7 @@
|
|||||||
{
|
{
|
||||||
"name": "az",
|
"name": "az",
|
||||||
"versions": [
|
"versions": [
|
||||||
"12.1.0"
|
"12.4.0"
|
||||||
],
|
],
|
||||||
"zip_versions": [
|
"zip_versions": [
|
||||||
|
|
||||||
@@ -139,12 +139,13 @@
|
|||||||
"addons": [],
|
"addons": [],
|
||||||
"additional_tools": [
|
"additional_tools": [
|
||||||
"cmake;3.18.1",
|
"cmake;3.18.1",
|
||||||
"cmake;3.22.1"
|
"cmake;3.22.1",
|
||||||
|
"cmake;3.31.5"
|
||||||
],
|
],
|
||||||
"ndk": {
|
"ndk": {
|
||||||
"default": "27",
|
"default": "27",
|
||||||
"versions": [
|
"versions": [
|
||||||
"26", "27"
|
"26", "27", "28"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -179,7 +180,7 @@
|
|||||||
"subversion" : "17",
|
"subversion" : "17",
|
||||||
"edition" : "Enterprise",
|
"edition" : "Enterprise",
|
||||||
"channel": "release",
|
"channel": "release",
|
||||||
"signature": "8F985BE8FD256085C90A95D3C74580511A1DB975",
|
"signature": "245D262748012A4FE6CE8BA6C951A4C4AFBC3E5D",
|
||||||
"workloads": [
|
"workloads": [
|
||||||
"Component.Dotfuscator",
|
"Component.Dotfuscator",
|
||||||
"Component.Linux.CMake",
|
"Component.Linux.CMake",
|
||||||
|
|||||||
@@ -96,12 +96,13 @@
|
|||||||
"addons": [],
|
"addons": [],
|
||||||
"additional_tools": [
|
"additional_tools": [
|
||||||
"cmake;3.22.1",
|
"cmake;3.22.1",
|
||||||
"cmake;3.30.5"
|
"cmake;3.30.5",
|
||||||
|
"cmake;3.31.5"
|
||||||
],
|
],
|
||||||
"ndk": {
|
"ndk": {
|
||||||
"default": "27",
|
"default": "27",
|
||||||
"versions": [
|
"versions": [
|
||||||
"26", "27"
|
"26", "27", "28"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -136,7 +137,7 @@
|
|||||||
"subversion" : "17",
|
"subversion" : "17",
|
||||||
"edition" : "Enterprise",
|
"edition" : "Enterprise",
|
||||||
"channel": "release",
|
"channel": "release",
|
||||||
"signature": "8F985BE8FD256085C90A95D3C74580511A1DB975",
|
"signature": "245D262748012A4FE6CE8BA6C951A4C4AFBC3E5D",
|
||||||
"workloads": [
|
"workloads": [
|
||||||
"Component.Dotfuscator",
|
"Component.Dotfuscator",
|
||||||
"Component.Linux.CMake",
|
"Component.Linux.CMake",
|
||||||
|
|||||||
Reference in New Issue
Block a user