Skip to content

Commit 04a7a8a

Browse files
authored
Use windows-2025 image in CI (#821)
1 parent 71ea290 commit 04a7a8a

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ jobs:
197197
run: |
198198
cd ${{ env.CI_FOLDER }}/aws-iot-device-sdk-cpp-v2
199199
python ./deviceadvisor/script/DATestRun.py
200-
windows-vs14:
201-
runs-on: windows-2019 # windows-2019 is last env with Visual Studio 2015 (v14.0)
200+
windows-vs17:
201+
runs-on: windows-2025
202202
strategy:
203203
matrix:
204204
arch: [Win32, x64]
@@ -212,11 +212,13 @@ jobs:
212212
role-to-assume: ${{ env.CI_IOT_CONTAINERS }}
213213
aws-region: ${{ env.AWS_DEFAULT_REGION }}
214214
- name: Build ${{ env.PACKAGE_NAME }} + consumers
215+
# The "--cmake-extra=-Tv143" explicitly sets VS 17 2022 to be used for compilation.
216+
# See https://cmake.org/cmake/help/latest/generator/Visual%20Studio%2017%202022.html#toolset-selection
215217
run: |
216218
md ${{ env.CI_FOLDER }}
217219
cd ${{ env.CI_FOLDER }}
218220
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
219-
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-Tv140 --cmake-extra=-A${{ matrix.arch }}
221+
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-Tv143 --cmake-extra=-A${{ matrix.arch }}
220222
- name: Running samples in CI setup
221223
run: |
222224
python -m pip install boto3
@@ -302,7 +304,7 @@ jobs:
302304
cd ${{ env.CI_FOLDER }}/aws-iot-device-sdk-cpp-v2
303305
python ./deviceadvisor/script/DATestRun.py
304306
windows-app-verifier:
305-
runs-on: windows-2022 # latest
307+
runs-on: windows-2025 # latest
306308
permissions:
307309
id-token: write # This is required for requesting the JWT
308310
steps:

eventstream_rpc/source/EventStreamClient.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1396,7 +1396,10 @@ namespace Aws
13961396
return true;
13971397
}
13981398

1399-
void StreamResponseHandler::OnStreamEvent(Crt::ScopedResource<AbstractShapeBase> response) {}
1399+
void StreamResponseHandler::OnStreamEvent(Crt::ScopedResource<AbstractShapeBase> response)
1400+
{
1401+
(void)response;
1402+
}
14001403

14011404
void StreamResponseHandler::OnStreamClosed() {}
14021405

0 commit comments

Comments
 (0)