Skip to content

Commit f38065f

Browse files
authored
Remove Windows 2019 and add Windows 2025 with MSVC-17 (#1209)
1 parent 4c22f5c commit f38065f

File tree

1 file changed

+10
-25
lines changed

1 file changed

+10
-25
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DUSE_CPU_EXTENSIONS=OFF
129129
130130
windows:
131-
runs-on: windows-2022 # latest
131+
runs-on: windows-2025 # latest
132132
steps:
133133
- uses: aws-actions/configure-aws-credentials@v4
134134
with:
@@ -139,8 +139,8 @@ jobs:
139139
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
140140
python builder.pyz build -p ${{ env.PACKAGE_NAME }}
141141
142-
windows-vc16:
143-
runs-on: windows-2022 # latest
142+
windows-vc17:
143+
runs-on: windows-2025 # latest
144144
strategy:
145145
matrix:
146146
arch: [x86, x64]
@@ -152,25 +152,10 @@ jobs:
152152
- name: Build ${{ env.PACKAGE_NAME }} + consumers
153153
run: |
154154
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
155-
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-16
155+
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-17
156156
157-
windows-vc15:
158-
runs-on: windows-2019 # windows-2019 is last env with Visual Studio 2017 (v15.0)
159-
strategy:
160-
matrix:
161-
arch: [x86, x64]
162-
steps:
163-
- uses: aws-actions/configure-aws-credentials@v4
164-
with:
165-
role-to-assume: ${{ env.CRT_CI_ROLE }}
166-
aws-region: ${{ env.AWS_DEFAULT_REGION }}
167-
- name: Build ${{ env.PACKAGE_NAME }} + consumers
168-
run: |
169-
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
170-
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-15
171-
172-
windows-vc14:
173-
runs-on: windows-2019 # windows-2019 is last env with Visual Studio 2015 (v14.0)
157+
windows-vc16:
158+
runs-on: windows-2025 # latest
174159
strategy:
175160
matrix:
176161
arch: [x86, x64]
@@ -182,10 +167,10 @@ jobs:
182167
- name: Build ${{ env.PACKAGE_NAME }} + consumers
183168
run: |
184169
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
185-
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-14
170+
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-16
186171
187172
windows-shared-libs:
188-
runs-on: windows-2022 # latest
173+
runs-on: windows-2025 # latest
189174
steps:
190175
- uses: aws-actions/configure-aws-credentials@v4
191176
with:
@@ -197,7 +182,7 @@ jobs:
197182
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBUILD_SHARED_LIBS=ON
198183
199184
windows-no-cpu-extensions:
200-
runs-on: windows-2022 # latest
185+
runs-on: windows-2025 # latest
201186
steps:
202187
- uses: aws-actions/configure-aws-credentials@v4
203188
with:
@@ -209,7 +194,7 @@ jobs:
209194
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DUSE_CPU_EXTENSIONS=OFF
210195
211196
windows-app-verifier:
212-
runs-on: windows-2022 # latest
197+
runs-on: windows-2025 # latest
213198
steps:
214199
- uses: aws-actions/configure-aws-credentials@v4
215200
with:

0 commit comments

Comments
 (0)