Skip to content

Commit f9df207

Browse files
authored
remove windows-2019 and latest submodules (#624)
1 parent a1c4004 commit f9df207

File tree

6 files changed

+10
-12
lines changed

6 files changed

+10
-12
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${LINUX_BASE_IMAGE} build -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }}
115115
116116
windows:
117-
runs-on: windows-2022 # latest
117+
runs-on: windows-2025 # latest
118118
steps:
119119
- uses: aws-actions/configure-aws-credentials@v4
120120
with:
@@ -125,20 +125,18 @@ jobs:
125125
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
126126
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream
127127
128-
windows-vc14-x86:
129-
runs-on: windows-2019 # windows-2019 is last env with Visual Studio 2015 (v14.0)
128+
windows-vc17-x86:
129+
runs-on: windows-2025 # latest
130130
steps:
131131
- uses: aws-actions/configure-aws-credentials@v4
132132
with:
133133
role-to-assume: ${{ env.CRT_CI_ROLE }}
134134
aws-region: ${{ env.AWS_DEFAULT_REGION }}
135135
- name: Build ${{ env.PACKAGE_NAME }} + consumers
136-
env:
137-
AWS_CMAKE_TOOLSET: v140
138136
run: |
139137
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
140-
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target=windows-x86 --spec=downstream --cmake-extra=-Tv140 --cmake-extra=-Ax86
141-
# cross-compile win32
138+
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --target=windows-x86 --spec=downstream --cmake-extra=-Tv143 --cmake-extra=-Ax86
139+
# cross-compile win32 for x86
142140
- name: Cross-compile win32
143141
run: |
144142
cd aws-crt-nodejs

crt/aws-c-cal

crt/aws-lc

crt/s2n

Submodule s2n updated from 92f7827 to a772605

0 commit comments

Comments
 (0)