From c8959b2911883111617315546f69b1990be7880f Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 29 May 2025 19:39:23 -0700 Subject: [PATCH] GitHub Actions windows-2019 runner is being retired (#617) --- .github/workflows/bvt.yml | 5 +++-- .github/workflows/main.yml | 37 +++++++++++++++++++------------------ .github/workflows/test.yml | 29 +++++++++++++++-------------- .github/workflows/vcpkg.yml | 21 +++++++++++---------- 4 files changed, 48 insertions(+), 44 deletions(-) diff --git a/.github/workflows/bvt.yml b/.github/workflows/bvt.yml index cfd70e7..4de5d15 100644 --- a/.github/workflows/bvt.yml +++ b/.github/workflows/bvt.yml @@ -38,14 +38,14 @@ permissions: jobs: build: - runs-on: ${{ matrix.os }} + runs-on: windows-2022 timeout-minutes: 60 strategy: fail-fast: false matrix: - os: [windows-2019, windows-2022] + toolver: ['14.29', '14'] build_type: [x64-Release] arch: [amd64] @@ -65,6 +65,7 @@ jobs: - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 with: arch: ${{ matrix.arch }} + toolset: ${{ matrix.toolver }} - name: 'Set triplet' shell: pwsh diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d90f1dd..40bcb13 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,62 +38,62 @@ permissions: jobs: build: - runs-on: ${{ matrix.os }} + runs-on: windows-2022 strategy: fail-fast: false matrix: - os: [windows-2019, windows-2022] + toolver: ['14.29', '14'] build_type: [x64-Debug, x64-Release] arch: [amd64] include: - - os: windows-2019 + - toolver: '14.29' build_type: x86-Debug arch: amd64_x86 - - os: windows-2019 + - toolver: '14.29' build_type: x86-Release arch: amd64_x86 - - os: windows-2022 + - toolver: '14' build_type: x86-Debug arch: amd64_x86 - - os: windows-2022 + - toolver: '14' build_type: x86-Release arch: amd64_x86 - - os: windows-2022 + - toolver: '14' build_type: arm64-Debug arch: amd64_arm64 - - os: windows-2022 + - toolver: '14' build_type: arm64-Release arch: amd64_arm64 - - os: windows-2022 + - toolver: '14' build_type: arm64ec-Debug arch: amd64_arm64 - - os: windows-2022 + - toolver: '14' build_type: arm64ec-Release arch: amd64_arm64 - - os: windows-2022 + - toolver: '14' build_type: x64-Debug-Win8 arch: amd64 - - os: windows-2022 + - toolver: '14' build_type: x64-Release-Win8 arch: amd64 - - os: windows-2022 + - toolver: '14' build_type: x64-Debug-Clang arch: amd64 - - os: windows-2022 + - toolver: '14' build_type: x64-Release-Clang arch: amd64 - - os: windows-2022 + - toolver: '14' build_type: x86-Debug-Clang arch: amd64_x86 - - os: windows-2022 + - toolver: '14' build_type: x86-Release-Clang arch: amd64_x86 - - os: windows-2022 + - toolver: '14' build_type: arm64-Debug-Clang arch: amd64_arm64 - - os: windows-2022 + - toolver: '14' build_type: arm64-Release-Clang arch: amd64_arm64 @@ -106,6 +106,7 @@ jobs: - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 with: arch: ${{ matrix.arch }} + toolset: ${{ matrix.toolver }} - name: 'Configure CMake' working-directory: ${{ github.workspace }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cc7634a..6a4fb77 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,51 +41,51 @@ permissions: jobs: build: - runs-on: ${{ matrix.os }} + runs-on: windows-2022 timeout-minutes: 60 strategy: fail-fast: false matrix: - os: [windows-2019, windows-2022] + toolver: ['14.29', '14'] build_type: [x64-Debug, x64-Release] arch: [amd64] include: - - os: windows-2019 + - toolver: '14.29' build_type: x86-Debug arch: amd64_x86 - - os: windows-2019 + - toolver: '14.29' build_type: x86-Release arch: amd64_x86 - - os: windows-2022 + - toolver: '14' build_type: x86-Debug arch: amd64_x86 - - os: windows-2022 + - toolver: '14' build_type: x86-Release arch: amd64_x86 - - os: windows-2022 + - toolver: '14' build_type: x64-Debug-Clang arch: amd64 - - os: windows-2022 + - toolver: '14' build_type: x64-Release-Clang arch: amd64 - - os: windows-2022 + - toolver: '14' build_type: x86-Debug-Clang arch: amd64_x86 - - os: windows-2022 + - toolver: '14' build_type: x86-Release-Clang arch: amd64_x86 - - os: windows-2022 + - toolver: '14' build_type: arm64-Debug arch: amd64_arm64 - - os: windows-2022 + - toolver: '14' build_type: arm64-Release arch: amd64_arm64 - - os: windows-2022 + - toolver: '14' build_type: arm64ec-Debug arch: amd64_arm64 - - os: windows-2022 + - toolver: '14' build_type: arm64ec-Release arch: amd64_arm64 @@ -105,6 +105,7 @@ jobs: - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 with: arch: ${{ matrix.arch }} + toolset: ${{ matrix.toolver }} - name: 'Set triplet' shell: pwsh diff --git a/.github/workflows/vcpkg.yml b/.github/workflows/vcpkg.yml index d506fa2..7a4aa05 100644 --- a/.github/workflows/vcpkg.yml +++ b/.github/workflows/vcpkg.yml @@ -34,46 +34,46 @@ permissions: jobs: build: - runs-on: ${{ matrix.os }} + runs-on: windows-2022 strategy: fail-fast: false matrix: - os: [windows-2019, windows-2022] + toolver: ['14.29', '14'] build_type: [x64-Debug-VCPKG] arch: [amd64] shared: [OFF] include: - - os: windows-2022 + - toolver: '14' build_type: x64-Debug-Clang-VCPKG arch: amd64 shared: OFF - - os: windows-2022 + - toolver: '14' build_type: x86-Debug-VCPKG arch: amd64_x86 shared: OFF - - os: windows-2022 + - toolver: '14' build_type: arm64-Debug-VCPKG arch: amd64_arm64 shared: OFF - - os: windows-2022 + - toolver: '14' build_type: arm64ec-Debug-VCPKG arch: amd64_arm64 shared: OFF - - os: windows-2022 + - toolver: '14' build_type: x64-Debug-MinGW arch: amd64 shared: OFF - - os: windows-2022 + - toolver: '14' build_type: x64-Release-MinGW arch: amd64 shared: OFF - - os: windows-2022 + - toolver: '14' build_type: x64-Debug-MinGW arch: amd64 shared: ON - - os: windows-2022 + - toolver: '14' build_type: x64-Release-MinGW arch: amd64 shared: ON @@ -87,6 +87,7 @@ jobs: - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 with: arch: ${{ matrix.arch }} + toolset: ${{ matrix.toolver }} - name: 'Set triplet' shell: pwsh