Skip to content

Commit da4c330

Browse files
walbournwalbourn
authored
GitHub Actions windows-2019 runner is being retired (#562)
1 parent 13baec3 commit da4c330

5 files changed

Lines changed: 65 additions & 60 deletions

File tree

‎.github/workflows/bvt.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ permissions:
3636

3737
jobs:
3838
build:
39-
runs-on: ${{ matrix.os }}
39+
runs-on: windows-2022
4040
timeout-minutes: 20
4141

4242
strategy:
4343
fail-fast: false
4444

4545
matrix:
46-
os: [windows-2019, windows-2022]
46+
toolver: ['14.29', '14']
4747
build_type: [x64-Release]
4848
arch: [amd64]
4949

@@ -63,6 +63,7 @@ jobs:
6363
- uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
6464
with:
6565
arch: ${{ matrix.arch }}
66+
toolset: ${{ matrix.toolver }}
6667

6768
- name: 'Configure CMake'
6869
working-directory: ${{ github.workspace }}

‎.github/workflows/main.yml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,38 +36,38 @@ permissions:
3636

3737
jobs:
3838
build:
39-
runs-on: ${{ matrix.os }}
39+
runs-on: windows-2022
4040

4141
strategy:
4242
fail-fast: false
4343

4444
matrix:
45-
os: [windows-2019, windows-2022]
45+
toolver: ['14.29', '14']
4646
build_type: [x64-Debug, x64-Release]
4747
arch: [amd64]
4848
include:
49-
- os: windows-2019
49+
- toolver: '14.29'
5050
build_type: x86-Debug
5151
arch: amd64_x86
52-
- os: windows-2019
52+
- toolver: '14.29'
5353
build_type: x86-Release
5454
arch: amd64_x86
55-
- os: windows-2022
55+
- toolver: '14'
5656
build_type: x86-Debug
5757
arch: amd64_x86
58-
- os: windows-2022
58+
- toolver: '14'
5959
build_type: x86-Release
6060
arch: amd64_x86
61-
- os: windows-2022
61+
- toolver: '14'
6262
build_type: x64-Debug-Clang
6363
arch: amd64
64-
- os: windows-2022
64+
- toolver: '14'
6565
build_type: x64-Release-Clang
6666
arch: amd64
67-
- os: windows-2022
67+
- toolver: '14'
6868
build_type: x86-Debug-Clang
6969
arch: amd64_x86
70-
- os: windows-2022
70+
- toolver: '14'
7171
build_type: x86-Release-Clang
7272
arch: amd64_x86
7373

@@ -80,6 +80,7 @@ jobs:
8080
- uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
8181
with:
8282
arch: ${{ matrix.arch }}
83+
toolset: ${{ matrix.toolver }}
8384

8485
- name: 'Configure CMake'
8586
working-directory: ${{ github.workspace }}

‎.github/workflows/test.yml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,51 +36,51 @@ permissions:
3636

3737
jobs:
3838
build:
39-
runs-on: ${{ matrix.os }}
39+
runs-on: windows-2022
4040
timeout-minutes: 20
4141

4242
strategy:
4343
fail-fast: false
4444

4545
matrix:
46-
os: [windows-2019, windows-2022]
46+
toolver: ['14.29', '14']
4747
build_type: [x64-Debug, x64-Release]
4848
arch: [amd64]
4949
include:
50-
- os: windows-2019
50+
- toolver: '14.29'
5151
build_type: x86-Debug
5252
arch: amd64_x86
53-
- os: windows-2019
53+
- toolver: '14.29'
5454
build_type: x86-Release
5555
arch: amd64_x86
56-
- os: windows-2022
56+
- toolver: '14'
5757
build_type: x86-Debug
5858
arch: amd64_x86
59-
- os: windows-2022
59+
- toolver: '14'
6060
build_type: x86-Release
6161
arch: amd64_x86
62-
- os: windows-2022
62+
- toolver: '14'
6363
build_type: x64-Debug-Clang
6464
arch: amd64
65-
- os: windows-2022
65+
- toolver: '14'
6666
build_type: x64-Release-Clang
6767
arch: amd64
68-
- os: windows-2022
68+
- toolver: '14'
6969
build_type: x86-Debug-Clang
7070
arch: amd64_x86
71-
- os: windows-2022
71+
- toolver: '14'
7272
build_type: x86-Release-Clang
7373
arch: amd64_x86
74-
- os: windows-2022
74+
- toolver: '14'
7575
build_type: arm64-Debug
7676
arch: amd64_arm64
77-
- os: windows-2022
77+
- toolver: '14'
7878
build_type: arm64-Release
7979
arch: amd64_arm64
80-
- os: windows-2022
80+
- toolver: '14'
8181
build_type: arm64ec-Debug
8282
arch: amd64_arm64
83-
- os: windows-2022
83+
- toolver: '14'
8484
build_type: arm64ec-Release
8585
arch: amd64_arm64
8686

@@ -100,6 +100,7 @@ jobs:
100100
- uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
101101
with:
102102
arch: ${{ matrix.arch }}
103+
toolset: ${{ matrix.toolver }}
103104

104105
- name: 'Configure CMake'
105106
working-directory: ${{ github.workspace }}

‎.github/workflows/vcpkg.yml‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,94 +32,94 @@ permissions:
3232

3333
jobs:
3434
build:
35-
runs-on: ${{ matrix.os }}
35+
runs-on: windows-2022
3636

3737
strategy:
3838
fail-fast: false
3939

4040
matrix:
41-
os: [windows-2019, windows-2022]
41+
toolver: ['14.29', '14']
4242
build_type: [x64-Debug-VCPKG]
4343
arch: [amd64]
4444
shared: [OFF]
4545
gameinput: [OFF]
4646
include:
47-
- os: windows-2022
47+
- toolver: '14'
4848
build_type: x64-Debug-VCPKG
4949
arch: amd64
5050
shared: OFF
5151
gameinput: ON
52-
- os: windows-2022
52+
- toolver: '14'
5353
build_type: x64-Debug-Clang-VCPKG
5454
arch: amd64
5555
shared: OFF
5656
gameinput: OFF
57-
- os: windows-2022
57+
- toolver: '14'
5858
build_type: x64-Debug-Clang-VCPKG
5959
arch: amd64
6060
shared: OFF
6161
gameinput: ON
62-
- os: windows-2022
62+
- toolver: '14'
6363
build_type: x86-Debug-VCPKG
6464
arch: amd64_x86
6565
shared: OFF
6666
gameinput: OFF
67-
- os: windows-2022
67+
- toolver: '14'
6868
build_type: x64-Debug-Redist
6969
arch: amd64
7070
shared: OFF
7171
gameinput: OFF
72-
- os: windows-2022
72+
- toolver: '14'
7373
build_type: x64-Release-Redist
7474
arch: amd64
7575
shared: OFF
7676
gameinput: OFF
77-
- os: windows-2022
77+
- toolver: '14'
7878
build_type: arm64-Debug-VCPKG
7979
arch: amd64_arm64
8080
shared: OFF
8181
gameinput: OFF
82-
- os: windows-2022
82+
- toolver: '14'
8383
build_type: arm64-Debug-Redist
8484
arch: amd64_arm64
8585
shared: OFF
8686
gameinput: OFF
87-
- os: windows-2022
87+
- toolver: '14'
8888
build_type: arm64ec-Debug-VCPKG
8989
arch: amd64_arm64
9090
shared: OFF
9191
gameinput: OFF
92-
- os: windows-2022
92+
- toolver: '14'
9393
build_type: arm64ec-Debug-Redist
9494
arch: amd64_arm64
9595
shared: OFF
9696
gameinput: OFF
97-
- os: windows-2022
97+
- toolver: '14'
9898
build_type: x64-Debug-MinGW
9999
arch: amd64
100100
shared: OFF
101101
gameinput: OFF
102-
- os: windows-2022
102+
- toolver: '14'
103103
build_type: x64-Release-MinGW
104104
arch: amd64
105105
shared: OFF
106106
gameinput: OFF
107-
- os: windows-2022
107+
- toolver: '14'
108108
build_type: x64-Debug-MinGW
109109
arch: amd64
110110
shared: OFF
111111
gameinput: ON
112-
- os: windows-2022
112+
- toolver: '14'
113113
build_type: x64-Debug-VCPKG
114114
arch: amd64
115115
shared: ON
116116
gameinput: ON
117-
- os: windows-2022
117+
- toolver: '14'
118118
build_type: x64-Debug-MinGW
119119
arch: amd64
120120
shared: ON
121121
gameinput: OFF
122-
- os: windows-2022
122+
- toolver: '14'
123123
build_type: x64-Release-MinGW
124124
arch: amd64
125125
shared: ON
@@ -134,6 +134,7 @@ jobs:
134134
- uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
135135
with:
136136
arch: ${{ matrix.arch }}
137+
toolset: ${{ matrix.toolver }}
137138

138139
- name: 'Set triplet'
139140
shell: pwsh

‎.github/workflows/win10.yml‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,56 +36,56 @@ permissions:
3636

3737
jobs:
3838
build:
39-
runs-on: ${{ matrix.os }}
39+
runs-on: windows-2022
4040

4141
strategy:
4242
fail-fast: false
4343

4444
matrix:
45-
os: [windows-2019, windows-2022]
45+
toolver: ['14.29', '14']
4646
build_type: [x64-Debug-Win10, x64-Release-Win10]
4747
arch: [amd64]
4848
include:
49-
- os: windows-2019
49+
- toolver: '14.29'
5050
build_type: x86-Debug-Win10
5151
arch: amd64_x86
52-
- os: windows-2019
52+
- toolver: '14.29'
5353
build_type: x86-Release-Win10
5454
arch: amd64_x86
55-
- os: windows-2022
55+
- toolver: '14'
5656
build_type: x86-Debug-Win10
5757
arch: amd64_x86
58-
- os: windows-2022
58+
- toolver: '14'
5959
build_type: x86-Release-Win10
6060
arch: amd64_x86
61-
- os: windows-2022
61+
- toolver: '14'
6262
build_type: arm64-Debug
6363
arch: amd64_arm64
64-
- os: windows-2022
64+
- toolver: '14'
6565
build_type: arm64-Release
6666
arch: amd64_arm64
67-
- os: windows-2022
67+
- toolver: '14'
6868
build_type: arm64ec-Debug
6969
arch: amd64_arm64
70-
- os: windows-2022
70+
- toolver: '14'
7171
build_type: arm64ec-Release
7272
arch: amd64_arm64
73-
- os: windows-2022
73+
- toolver: '14'
7474
build_type: x64-Debug-Win10-Clang
7575
arch: amd64
76-
- os: windows-2022
76+
- toolver: '14'
7777
build_type: x64-Release-Win10-Clang
7878
arch: amd64
79-
- os: windows-2022
79+
- toolver: '14'
8080
build_type: x86-Debug-Win10-Clang
8181
arch: amd64_x86
82-
- os: windows-2022
82+
- toolver: '14'
8383
build_type: x86-Release-Win10-Clang
8484
arch: amd64_x86
85-
- os: windows-2022
85+
- toolver: '14'
8686
build_type: arm64-Debug-Clang
8787
arch: amd64_arm64
88-
- os: windows-2022
88+
- toolver: '14'
8989
build_type: arm64-Release-Clang
9090
arch: amd64_arm64
9191

@@ -98,6 +98,7 @@ jobs:
9898
- uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
9999
with:
100100
arch: ${{ matrix.arch }}
101+
toolset: ${{ matrix.toolver }}
101102

102103
- name: 'Configure CMake'
103104
working-directory: ${{ github.workspace }}

0 commit comments

Comments
 (0)