From 4df379e57a311cfbf4601e4152ac3cb50e3c6509 Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Sat, 12 Jul 2025 00:06:59 +0000 Subject: [PATCH 1/2] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20ch?= =?UTF-8?q?anges=20to=20main=20this=20commit=20is=20based=20on?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Created using spr 1.3.4 [skip ci] --- .github/workflows/build-ci-container-windows.yml | 6 +++--- .../containers/github-action-ci-windows/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-ci-container-windows.yml b/.github/workflows/build-ci-container-windows.yml index 068cb58301080..59079f057d021 100644 --- a/.github/workflows/build-ci-container-windows.yml +++ b/.github/workflows/build-ci-container-windows.yml @@ -20,7 +20,7 @@ on: jobs: build-ci-container-windows: if: github.repository_owner == 'llvm' - runs-on: windows-2019 + runs-on: windows-2022 outputs: container-name: ${{ steps.vars.outputs.container-name }} container-name-tag: ${{ steps.vars.outputs.container-name-tag }} @@ -34,7 +34,7 @@ jobs: id: vars run: | $tag = [int64](Get-Date -UFormat %s) - $container_name="ghcr.io/$env:GITHUB_REPOSITORY_OWNER/ci-windows-2019" + $container_name="ghcr.io/$env:GITHUB_REPOSITORY_OWNER/ci-windows-2022" echo "container-name=${container_name}" >> $env:GITHUB_OUTPUT echo "container-name-tag=${container_name}:${tag}" >> $env:GITHUB_OUTPUT echo "container-filename=ci-windows-${tag}.tar" >> $env:GITHUB_OUTPUT @@ -58,7 +58,7 @@ jobs: - build-ci-container-windows permissions: packages: write - runs-on: windows-2019 + runs-on: windows-2022 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: diff --git a/.github/workflows/containers/github-action-ci-windows/Dockerfile b/.github/workflows/containers/github-action-ci-windows/Dockerfile index c49b6b25ffb68..59ba5c2cebf97 100644 --- a/.github/workflows/containers/github-action-ci-windows/Dockerfile +++ b/.github/workflows/containers/github-action-ci-windows/Dockerfile @@ -1,6 +1,6 @@ # Agent image for LLVM org cluster. # .net 4.8 is required by chocolately package manager. -FROM mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 +FROM mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022 # Restore the default Windows shell for correct batch processing. SHELL ["cmd", "/S", "/C"] From af165870e163f14c31c96a37b1718df735f14472 Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Mon, 14 Jul 2025 16:08:35 +0000 Subject: [PATCH 2/2] feedback Created using spr 1.3.4 --- .../workflows/containers/github-action-ci-windows/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/containers/github-action-ci-windows/Dockerfile b/.github/workflows/containers/github-action-ci-windows/Dockerfile index f829d4e900217..b909d14b4eeeb 100644 --- a/.github/workflows/containers/github-action-ci-windows/Dockerfile +++ b/.github/workflows/containers/github-action-ci-windows/Dockerfile @@ -42,6 +42,9 @@ RUN regsvr32 /S "C:\BuildTools\DIA SDK\bin\amd64\msdia140.dll" & \ # Pin an older version of Python; the current Python 3.10 fails when # doing "pip install" for the other dependencies, as it fails to find libxml # while compiling some package. +# We version pin the other packages as well to ensure the container build is as +# reproducible as possible to prevent issues when upgrading only part of the +# container. RUN choco install -y ninja --version 1.13.1 && \ choco install -y git --version 2.50.1 && \ choco install -y sccache --version 0.10.0 && \