Skip to content

Commit bc6252c

Browse files
authored
Remove Windows 2019 and add Windows 2025 with MSVC-17 (#524)
1 parent 233c587 commit bc6252c

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -69,24 +69,24 @@ jobs:
6969
- name: gcc-8
7070
- name: gcc-11
7171
- name: gcc-13
72-
# See Issue: https://github.com/llvm/llvm-project/issues/59007. Although this issue
73-
# has been fixed in LLVM, the fix will probably not propagate to older versions of Ubuntu and GCC 13.1.
72+
# See Issue: https://github.com/llvm/llvm-project/issues/59007. Although this issue
73+
# has been fixed in LLVM, the fix will probably not propagate to older versions of Ubuntu and GCC 13.1.
7474
#
75-
# Starting with GLIBC version 2.34, the `dn_expand` function, previously found in `libresolv.so`, was moved to `libc.so`. This
75+
# Starting with GLIBC version 2.34, the `dn_expand` function, previously found in `libresolv.so`, was moved to `libc.so`. This
7676
# function is used internally by the `getaddrinfo()` system call.
7777
#
78-
# In our setup (As of December 2024), we are using an Ubuntu 18 Docker image on a newer Ubuntu host.
78+
# In our setup (As of December 2024), we are using an Ubuntu 18 Docker image on a newer Ubuntu host.
7979
# However, due to compatibility issues between newer libasan.so in GCC 13.1
80-
# and the older Ubuntu image, the linker does not link with `libresolv.so`.
80+
# and the older Ubuntu image, the linker does not link with `libresolv.so`.
8181
# This results in crashes in `getaddrinfo()` since Ubuntu-18 GLIBC is 2.31.
8282
#
83-
# This problem does not occur on Ubuntu 22 and newer because GLIBC versions 2.34
84-
# and above include `dn_expand` in `libc.so`, eliminating the dependency on
83+
# This problem does not occur on Ubuntu 22 and newer because GLIBC versions 2.34
84+
# and above include `dn_expand` in `libc.so`, eliminating the dependency on
8585
# `libresolv.so`.
8686
#
87-
# We can bypass this problem by linking with "resolv" manually until we bump
87+
# We can bypass this problem by linking with "resolv" manually until we bump
8888
# our base Linux image to Ubuntu 22.
89-
extra-build-flag: --cmake-extra=-DCMAKE_EXE_LINKER_FLAGS="-lresolv"
89+
extra-build-flag: --cmake-extra=-DCMAKE_EXE_LINKER_FLAGS="-lresolv"
9090
steps:
9191
- uses: aws-actions/configure-aws-credentials@v4
9292
with:
@@ -141,7 +141,7 @@ jobs:
141141
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBYO_CRYPTO=ON --cmake-extra=-DASSERT_LOCK_HELD=ON
142142
143143
windows:
144-
runs-on: windows-2022 # latest
144+
runs-on: windows-2025 # latest
145145
steps:
146146
- uses: aws-actions/configure-aws-credentials@v4
147147
with:
@@ -152,8 +152,8 @@ jobs:
152152
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
153153
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DASSERT_LOCK_HELD=ON
154154
155-
windows-vc14:
156-
runs-on: windows-2019 # windows-2019 is last env with Visual Studio 2015 (v14.0)
155+
windows-vc17:
156+
runs-on: windows-2025 # latest
157157
strategy:
158158
fail-fast: false
159159
matrix:
@@ -166,10 +166,10 @@ jobs:
166166
- name: Build ${{ env.PACKAGE_NAME }} + consumers
167167
run: |
168168
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
169-
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --cmake-extra=-DASSERT_LOCK_HELD=ON --compiler msvc-14
169+
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target windows-${{ matrix.arch }} --cmake-extra=-DASSERT_LOCK_HELD=ON --compiler msvc-17
170170
171171
windows-shared-libs:
172-
runs-on: windows-2022 # latest
172+
runs-on: windows-2025 # latest
173173
steps:
174174
- uses: aws-actions/configure-aws-credentials@v4
175175
with:
@@ -181,7 +181,7 @@ jobs:
181181
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBUILD_SHARED_LIBS=ON --cmake-extra=-DASSERT_LOCK_HELD=ON
182182
183183
windows-app-verifier:
184-
runs-on: windows-2022 # latest
184+
runs-on: windows-2025 # latest
185185
steps:
186186
- uses: aws-actions/configure-aws-credentials@v4
187187
with:

0 commit comments

Comments
 (0)