From 365c943d4a807f46222f9125eb80ac2f07e2e2ac Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 8 Apr 2025 13:09:28 -0700 Subject: [PATCH 01/10] Cherry-pick https://github.com/microsoft/vcpkg/pull/44548/ --- scripts/azure-pipelines/android/Dockerfile | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/scripts/azure-pipelines/android/Dockerfile b/scripts/azure-pipelines/android/Dockerfile index 47fc64c923ba33..3a8da7d7ec79de 100644 --- a/scripts/azure-pipelines/android/Dockerfile +++ b/scripts/azure-pipelines/android/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:noble-20250127 ADD https://packages.microsoft.com/config/ubuntu/24.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb -ADD https://builds.openlogic.com/downloadJDK/openlogic-openjdk/11.0.25+9/openlogic-openjdk-11.0.25+9-linux-x64.tar.gz /openlogic-openjdk-11.0.25+9-linux-x64.tar.gz +ADD https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14+7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz /OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz ADD https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip /sdk-commandlinetools-linux-10406996_latest.zip ADD https://dl.google.com/android/repository/build-tools_r34-linux.zip /build-tools_r34-linux.zip ADD https://dl.google.com/android/repository/platform-34-ext7_r03.zip /platform-34-ext7_r03.zip @@ -45,6 +45,8 @@ ENV APT_PACKAGES="$APT_PACKAGES libxext-dev libxfixes-dev libxrender-dev \ ENV APT_PACKAGES="$APT_PACKAGES powershell" RUN < Date: Tue, 8 Apr 2025 13:13:34 -0700 Subject: [PATCH 02/10] Update Azure-CLI to 2.71. --- scripts/azure-pipelines/windows/deploy-azure-cli.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/windows/deploy-azure-cli.ps1 b/scripts/azure-pipelines/windows/deploy-azure-cli.ps1 index 437366fd662198..0d685543c6ee06 100644 --- a/scripts/azure-pipelines/windows/deploy-azure-cli.ps1 +++ b/scripts/azure-pipelines/windows/deploy-azure-cli.ps1 @@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") { [string]$AzCliUrl if ([string]::IsNullOrEmpty($SasToken)) { Write-Host 'Downloading from the Internet' - $AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.68.0-x64.msi' + $AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.71.0-x64.msi' } else { Write-Host 'Downloading from vcpkgimageminting using SAS token' $SasToken = $SasToken.Replace('"', '') - $AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.68.0-x64.msi?$SasToken" + $AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.71.0-x64.msi?$SasToken" } DownloadAndInstall -Url $AzCliUrl -Name 'Azure CLI' -Args @('/quiet', '/norestart') From bf0e7eb4982dc676281a9e70a561b81b7f2dc9a7 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 8 Apr 2025 13:15:09 -0700 Subject: [PATCH 03/10] Update CUDA to 12.8.1. --- scripts/azure-pipelines/windows/deploy-cuda.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/windows/deploy-cuda.ps1 b/scripts/azure-pipelines/windows/deploy-cuda.ps1 index de61ffe55d11aa..a059d197b03c84 100644 --- a/scripts/azure-pipelines/windows/deploy-cuda.ps1 +++ b/scripts/azure-pipelines/windows/deploy-cuda.ps1 @@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") { [string]$CudaUrl if ([string]::IsNullOrEmpty($SasToken)) { Write-Host 'Downloading from the Internet' - $CudaUrl = 'https://developer.download.nvidia.com/compute/cuda/12.8.0/local_installers/cuda_12.8.0_571.96_windows.exe' + $CudaUrl = 'https://developer.download.nvidia.com/compute/cuda/12.8.1/local_installers/cuda_12.8.1_572.61_windows.exe' } else { Write-Host 'Downloading from vcpkgimageminting using SAS token' $SasToken = $SasToken.Replace('"', '') - $CudaUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/cuda_12.8.0_571.96_windows.exe?$SasToken" + $CudaUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/cuda_12.8.1_572.61_windows.exe?$SasToken" } # https://docs.nvidia.com/cuda/cuda-installation-guide-microsoft-windows/index.html From 8c8c9716b4a81d3391717ffa8a043a137506d23e Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 8 Apr 2025 13:16:26 -0700 Subject: [PATCH 04/10] Update CUDNN to 9.8. --- scripts/azure-pipelines/windows/deploy-cudnn.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/windows/deploy-cudnn.ps1 b/scripts/azure-pipelines/windows/deploy-cudnn.ps1 index fbca97abd275e5..10dc9b07ffdc87 100644 --- a/scripts/azure-pipelines/windows/deploy-cudnn.ps1 +++ b/scripts/azure-pipelines/windows/deploy-cudnn.ps1 @@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") { [string]$CudnnUrl if ([string]::IsNullOrEmpty($SasToken)) { Write-Host 'Downloading from the Internet' - $CudnnUrl = 'https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/windows-x86_64/cudnn-windows-x86_64-9.7.0.66_cuda12-archive.zip' + $CudnnUrl = 'https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/windows-x86_64/cudnn-windows-x86_64-9.8.0.87_cuda12-archive.zip' } else { Write-Host 'Downloading from vcpkgimageminting using SAS token' $SasToken = $SasToken.Replace('"', '') - $CudnnUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/cudnn-windows-x86_64-9.7.0.66_cuda12-archive.zip?$SasToken" + $CudnnUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/cudnn-windows-x86_64-9.8.0.87_cuda12-archive.zip?$SasToken" } DownloadAndUnzip -Name 'CUDNN' -Url $CudnnUrl -Destination "$env:ProgramFiles\NVIDIA GPU Computing Toolkit\CUDA\v12.8" From 6264d75e35aad0e93b0eb3148ec17ef2fdce5943 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 8 Apr 2025 13:17:40 -0700 Subject: [PATCH 05/10] Update PowerShell to 7.5.0. --- scripts/azure-pipelines/windows/deploy-pwsh.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 index 76f98fdb99e5e4..33b88e83343f42 100644 --- a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 +++ b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 @@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") { [string]$PwshUrl if ([string]::IsNullOrEmpty($SasToken)) { Write-Host 'Downloading from the Internet' - $PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.6/PowerShell-7.4.6-win-x64.msi' + $PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.5.0/PowerShell-7.5.0-win-x64.msi' } else { Write-Host 'Downloading from vcpkgimageminting using SAS token' $SasToken = $SasToken.Replace('"', '') - $PwshUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/PowerShell-7.4.6-win-x64.msi?$SasToken" + $PwshUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/PowerShell-7.5.0-win-x64.msi?$SasToken" } DownloadAndInstall -Url $PwshUrl -Name 'PowerShell Core' -Args @('/quiet', '/norestart') From 2b9b9f12f30f4e3d4bc061141e871557ed7239b6 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 8 Apr 2025 13:17:46 -0700 Subject: [PATCH 06/10] Fix typo in install disk script. --- scripts/azure-pipelines/windows/deploy-install-disk.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/windows/deploy-install-disk.ps1 b/scripts/azure-pipelines/windows/deploy-install-disk.ps1 index 4a7d5d70e5adf1..c98190055f3924 100644 --- a/scripts/azure-pipelines/windows/deploy-install-disk.ps1 +++ b/scripts/azure-pipelines/windows/deploy-install-disk.ps1 @@ -27,7 +27,7 @@ Param( [string]$Label ) if ($Letter.Length -ne 1) { - throw "Bad drive letter $Letter, expected only one letter. (Did you accidentially add a : ?)" + throw "Bad drive letter $Letter, expected only one letter. (Did you accidentally add a : ?)" } try { From 14b21b84bf52ffc88eb8a21f64424d8fea219e6a Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 8 Apr 2025 13:18:28 -0700 Subject: [PATCH 07/10] Update Visual Studio to 17.13.6 --- scripts/azure-pipelines/windows/deploy-visual-studio.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 index 19a4d2a53d3674..0144f1df5891ae 100644 --- a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 +++ b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 @@ -8,8 +8,8 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") { } # See https://learn.microsoft.com/visualstudio/releases/2022/release-history -# 17.13.3 -$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/9b2a4ec4-2233-4550-bb74-4e7facba2e03/fb4c578235d7e5cb0b1731772624fdd6cdfbb5ea0b6daf77f5988e70dfaf5615/vs_Enterprise.exe' +# 17.13.6 +$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/8fada5c7-8417-4239-acc3-bd499af09222/b9e51a6eacaa38415ad70c4e0f0034d7c213fcdfabea2d96101e2255eb717250/vs_Enterprise.exe' $Workloads = @( 'Microsoft.VisualStudio.Workload.NativeDesktop', 'Microsoft.VisualStudio.Workload.Universal', From 27d80fadb5d29bae5631df59d7c8fad8e77aad67 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 8 Apr 2025 13:21:56 -0700 Subject: [PATCH 08/10] Update the checklist for docker era. --- scripts/azure-pipelines/patch-tuesday-checklist.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/azure-pipelines/patch-tuesday-checklist.md b/scripts/azure-pipelines/patch-tuesday-checklist.md index b5112a55936f75..c87618c6c5d360 100644 --- a/scripts/azure-pipelines/patch-tuesday-checklist.md +++ b/scripts/azure-pipelines/patch-tuesday-checklist.md @@ -12,14 +12,16 @@ so in `scripts/azure-pipelines/windows` * [ ] Check for any updates possible to `vcpkg-tools.json`. Note that PowerShell currently uses the 7.2.x series due to customer reported problems on older Windows with 7.3.x and later. -* [ ] Update the first line of android/Dockerfile with the current 'focal' image according to +* [ ] Update the first line of android/Dockerfile with the current 'noble' image according to https://hub.docker.com/_/ubuntu -* [ ] Run android/create-docker-image.ps1 -* [ ] Update azure-pipelines.yml to point to the new linux docker image from Azure Container Registry +* [ ] Update the first line of linux/Dockerfile with the current 'jammy' image according to + https://hub.docker.com/_/ubuntu +* [ ] Run create-docker-images.ps1 +* [ ] Update android/azure-pipelines.yml and linux/azure-pipelines.yml to point to the new docker + images * [ ] Run windows/create-image.ps1 -* [ ] Update azure-pipelines.yml to point to the new Android image. * [ ] Submit PR with those changes and merge it. * [ ] In the Azure portal, mark the newly created image as the 'latest' one. * [ ] Mint a new macOS base box. (See instructions in `scripts/azure-pipelines/osx/README.md`) * [ ] Deploy the new base box to all hosts. -* [ ] Update the software on the CTI's machine #12 to match. +* [ ] Update the software on the CTI's machine #1 to match. From ace1711afc694fa2600b6ba5735bdeb34bc88736 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 8 Apr 2025 13:31:04 -0700 Subject: [PATCH 09/10] Update docker images. --- scripts/azure-pipelines/android/azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/android/azure-pipelines.yml b/scripts/azure-pipelines/android/azure-pipelines.yml index 401d41c9203677..cc4dab4e9c76b1 100644 --- a/scripts/azure-pipelines/android/azure-pipelines.yml +++ b/scripts/azure-pipelines/android/azure-pipelines.yml @@ -28,9 +28,9 @@ jobs: - name: ANDROID_NDK_HOME value: /android-ndk-r27c - name: ANDROID_DOCKER_IMAGE - value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-03-12' + value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-04-08' - name: LINUX_DOCKER_IMAGE - value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-03-12' + value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-04-08' steps: # Note: /mnt is the Azure machines' temporary disk. - bash: | From a6e69c62a57339f3ce96203c0f79a91c818c1c8d Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 8 Apr 2025 14:59:51 -0700 Subject: [PATCH 10/10] Update Windows pool. --- scripts/azure-pipelines/windows-unstable/azure-pipelines.yml | 2 +- scripts/azure-pipelines/windows/azure-pipelines.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml b/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml index 66b137d4eba046..c9fd092f9aa7f8 100644 --- a/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml @@ -6,7 +6,7 @@ jobs: - job: x64_windows pool: name: vcpkg-testing-msvc - demands: ImageVersionOverride -equals 2025.02.14 + demands: ImageVersionOverride -equals 2025.04.08 timeoutInMinutes: 2880 # 2 days variables: - name: WORKING_ROOT diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index b812b8ed392198..472d7121213be6 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -20,7 +20,7 @@ jobs: condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}')) pool: name: PrWin-WUS - demands: ImageVersionOverride -equals 2025.03.12 + demands: ImageVersionOverride -equals 2025.04.08 timeoutInMinutes: 2880 # 2 days variables: - name: WORKING_ROOT