Skip to content

Commit a1fc134

Browse files
authored
Remove Windows 2019 and add Windows 2025 with MSVC-17 (#737)
1 parent 3b500b3 commit a1fc134

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -75,24 +75,24 @@ jobs:
7575
- name: gcc-8
7676
- name: gcc-11
7777
- name: gcc-13
78-
# See Issue: https://github.com/llvm/llvm-project/issues/59007. Although this issue
79-
# has been fixed in LLVM, the fix will probably not propagate to older versions of Ubuntu and GCC 13.1.
78+
# See Issue: https://github.com/llvm/llvm-project/issues/59007. Although this issue
79+
# has been fixed in LLVM, the fix will probably not propagate to older versions of Ubuntu and GCC 13.1.
8080
#
81-
# Starting with GLIBC version 2.34, the `dn_expand` function, previously found in `libresolv.so`, was moved to `libc.so`. This
81+
# Starting with GLIBC version 2.34, the `dn_expand` function, previously found in `libresolv.so`, was moved to `libc.so`. This
8282
# function is used internally by the `getaddrinfo()` system call.
8383
#
84-
# In our setup (As of December 2024), we are using an Ubuntu 18 Docker image on a newer Ubuntu host.
84+
# In our setup (As of December 2024), we are using an Ubuntu 18 Docker image on a newer Ubuntu host.
8585
# However, due to compatibility issues between newer libasan.so in GCC 13.1
86-
# and the older Ubuntu image, the linker does not link with `libresolv.so`.
86+
# and the older Ubuntu image, the linker does not link with `libresolv.so`.
8787
# This results in crashes in `getaddrinfo()` since Ubuntu-18 GLIBC is 2.31.
8888
#
89-
# This problem does not occur on Ubuntu 22 and newer because GLIBC versions 2.34
90-
# and above include `dn_expand` in `libc.so`, eliminating the dependency on
89+
# This problem does not occur on Ubuntu 22 and newer because GLIBC versions 2.34
90+
# and above include `dn_expand` in `libc.so`, eliminating the dependency on
9191
# `libresolv.so`.
9292
#
93-
# We can bypass this problem by linking with "resolv" manually until we bump
93+
# We can bypass this problem by linking with "resolv" manually until we bump
9494
# our base Linux image to Ubuntu 22.
95-
extra-build-flag: --cmake-extra=-DCMAKE_EXE_LINKER_FLAGS="-lresolv"
95+
extra-build-flag: --cmake-extra=-DCMAKE_EXE_LINKER_FLAGS="-lresolv"
9696
steps:
9797
- uses: aws-actions/configure-aws-credentials@v4
9898
with:
@@ -161,7 +161,7 @@ jobs:
161161
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build downstream -p ${{ env.PACKAGE_NAME }}
162162
163163
windows:
164-
runs-on: windows-2022 # latest
164+
runs-on: windows-2025 # latest
165165
steps:
166166
- uses: aws-actions/configure-aws-credentials@v4
167167
with:
@@ -173,7 +173,7 @@ jobs:
173173
python builder.pyz build -p ${{ env.PACKAGE_NAME }}
174174
175175
windows-debug:
176-
runs-on: windows-2022 # latest
176+
runs-on: windows-2025 # latest
177177
steps:
178178
- uses: aws-actions/configure-aws-credentials@v4
179179
with:
@@ -184,8 +184,8 @@ jobs:
184184
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
185185
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --config Debug
186186
187-
windows-vc14:
188-
runs-on: windows-2019 # windows-2019 is last env with Visual Studio 2015 (v14.0)
187+
windows-vc17:
188+
runs-on: windows-2025 # latest
189189
strategy:
190190
matrix:
191191
arch: [x86, x64]
@@ -197,10 +197,10 @@ jobs:
197197
- name: Build ${{ env.PACKAGE_NAME }} + consumers
198198
run: |
199199
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
200-
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-14
200+
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --compiler msvc-17
201201
202202
windows-shared-libs:
203-
runs-on: windows-2022 # latest
203+
runs-on: windows-2025 # latest
204204
steps:
205205
- uses: aws-actions/configure-aws-credentials@v4
206206
with:
@@ -212,7 +212,7 @@ jobs:
212212
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBUILD_SHARED_LIBS=ON
213213
214214
windows-app-verifier:
215-
runs-on: windows-2022 # latest
215+
runs-on: windows-2025 # latest
216216
steps:
217217
- uses: aws-actions/configure-aws-credentials@v4
218218
with:
@@ -291,7 +291,7 @@ jobs:
291291
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
292292
chmod a+x builder
293293
./builder build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DAWS_USE_SECITEM=ON --cmake-extra=-DAWS_USE_APPLE_NETWORK_FRAMEWORK=ON --cmake-extra=-DENABLE_SANITIZERS=ON --cmake-extra=-DSANITIZERS="${{ matrix.sanitizers }}"
294-
294+
295295
freebsd:
296296
runs-on: ubuntu-24.04 # latest
297297
steps:

0 commit comments

Comments
 (0)