From 5df45541ad688e2e19254c7f0d0d1c7903e369bd Mon Sep 17 00:00:00 2001 From: crohr Date: Wed, 11 Sep 2024 13:36:14 +0000 Subject: [PATCH] Sync from upstream --- .../arm64/images/ubuntu/templates/ubuntu22-full-arm64.pkr.hcl | 1 + .../x64/images/ubuntu/templates/ubuntu22-full-x64.pkr.hcl | 1 + .../arm64/images/ubuntu/templates/ubuntu24-full-arm64.pkr.hcl | 1 + .../x64/images/ubuntu/templates/ubuntu24-full-x64.pkr.hcl | 1 + .../images/windows/scripts/helpers/VisualStudioHelpers.ps1 | 2 +- .../windows22/x64/images/windows/toolsets/toolset-2019.json | 4 +++- 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/releases/ubuntu22/arm64/images/ubuntu/templates/ubuntu22-full-arm64.pkr.hcl b/releases/ubuntu22/arm64/images/ubuntu/templates/ubuntu22-full-arm64.pkr.hcl index 3289d77..f59ffb8 100644 --- a/releases/ubuntu22/arm64/images/ubuntu/templates/ubuntu22-full-arm64.pkr.hcl +++ b/releases/ubuntu22/arm64/images/ubuntu/templates/ubuntu22-full-arm64.pkr.hcl @@ -123,6 +123,7 @@ source "amazon-ebs" "build_ebs" { run_tags = { creator = "RunsOn" contact = "ops@runs-on.com" + ami_name = "${var.ami_name}" } tags = { diff --git a/releases/ubuntu22/x64/images/ubuntu/templates/ubuntu22-full-x64.pkr.hcl b/releases/ubuntu22/x64/images/ubuntu/templates/ubuntu22-full-x64.pkr.hcl index f1ebc13..47f717c 100644 --- a/releases/ubuntu22/x64/images/ubuntu/templates/ubuntu22-full-x64.pkr.hcl +++ b/releases/ubuntu22/x64/images/ubuntu/templates/ubuntu22-full-x64.pkr.hcl @@ -133,6 +133,7 @@ source "amazon-ebs" "build_ebs" { run_tags = { creator = "RunsOn" contact = "ops@runs-on.com" + ami_name = "${var.ami_name}" } tags = { diff --git a/releases/ubuntu24/arm64/images/ubuntu/templates/ubuntu24-full-arm64.pkr.hcl b/releases/ubuntu24/arm64/images/ubuntu/templates/ubuntu24-full-arm64.pkr.hcl index b5a5d6f..82332bc 100644 --- a/releases/ubuntu24/arm64/images/ubuntu/templates/ubuntu24-full-arm64.pkr.hcl +++ b/releases/ubuntu24/arm64/images/ubuntu/templates/ubuntu24-full-arm64.pkr.hcl @@ -133,6 +133,7 @@ source "amazon-ebs" "build_ebs" { run_tags = { creator = "RunsOn" contact = "ops@runs-on.com" + ami_name = "${var.ami_name}" } tags = { diff --git a/releases/ubuntu24/x64/images/ubuntu/templates/ubuntu24-full-x64.pkr.hcl b/releases/ubuntu24/x64/images/ubuntu/templates/ubuntu24-full-x64.pkr.hcl index a98efc5..7ebd09b 100644 --- a/releases/ubuntu24/x64/images/ubuntu/templates/ubuntu24-full-x64.pkr.hcl +++ b/releases/ubuntu24/x64/images/ubuntu/templates/ubuntu24-full-x64.pkr.hcl @@ -133,6 +133,7 @@ source "amazon-ebs" "build_ebs" { run_tags = { creator = "RunsOn" contact = "ops@runs-on.com" + ami_name = "${var.ami_name}" } tags = { diff --git a/releases/windows22/x64/images/windows/scripts/helpers/VisualStudioHelpers.ps1 b/releases/windows22/x64/images/windows/scripts/helpers/VisualStudioHelpers.ps1 index eb45536..da7b3da 100644 --- a/releases/windows22/x64/images/windows/scripts/helpers/VisualStudioHelpers.ps1 +++ b/releases/windows22/x64/images/windows/scripts/helpers/VisualStudioHelpers.ps1 @@ -29,7 +29,7 @@ Function Install-VisualStudio { [Parameter(Mandatory)] [String] $Channel, [Parameter(Mandatory)] [String[]] $RequiredComponents, [String] $ExtraArgs = "", - [Parameter(Mandatory)] [String] $SignatureThumbprint + [Parameter(Mandatory)] [String[]] $SignatureThumbprint ) $bootstrapperUrl = "https://aka.ms/vs/${Version}/${Channel}/vs_${Edition}.exe" diff --git a/releases/windows22/x64/images/windows/toolsets/toolset-2019.json b/releases/windows22/x64/images/windows/toolsets/toolset-2019.json index ff58fa0..553d8a1 100644 --- a/releases/windows22/x64/images/windows/toolsets/toolset-2019.json +++ b/releases/windows22/x64/images/windows/toolsets/toolset-2019.json @@ -247,7 +247,9 @@ "subversion" : "16", "edition" : "Enterprise", "channel": "release", - "signature": "F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE", + "signature": ["F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE", + "C2048FB509F1C37A8C3E9EC6648118458AA01780" + ], "workloads": [ "Component.Dotfuscator", "Component.Linux.CMake",