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"]