Skip to content

Commit 808e0b5

Browse files
committed
Refs #21228: Fix windows CI removing win2017
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
1 parent e7e7163 commit 808e0b5

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/windows-ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ jobs:
5757
fail-fast: false
5858
matrix:
5959
os-version:
60-
- image: 'windows-2019'
61-
vs-toolset: 'v142'
62-
- image: 'windows-2017'
63-
vs-toolset: 'v141'
60+
- 'windows-2019'
61+
vs-toolset:
62+
- 'v141'
63+
- 'v142'
6464
fastdds-python-branch:
6565
- '1.4.x'
6666
fastdds-branch:
@@ -70,9 +70,9 @@ jobs:
7070
with:
7171
# It would be desirable to have a matrix of windows OS for this job, but due to the issue opened in this ticket:
7272
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
73-
os-version: ${{ inputs.os-version || matrix.os-version.image }}
74-
vs-toolset: ${{ inputs.vs-toolset || matrix.os-version.vs-toolset }}
75-
label: '${{ matrix.os-version.image }}-${{ matrix.os-version.vs-toolset }}-ci-${{ matrix.fastdds-python-branch }}-${{ matrix.fastdds-branch }}'
73+
os-version: ${{ inputs.os-version || matrix.os-version }}
74+
vs-toolset: ${{ inputs.vs-toolset || matrix.vs-toolset }}
75+
label: '${{ matrix.os-version }}-${{ matrix.vs-toolset }}-ci-${{ matrix.fastdds-python-branch }}-${{ matrix.fastdds-branch }}'
7676
colcon-args: ${{ inputs.colcon-args }}
7777
cmake-args: ${{ inputs.cmake-args }}
7878
ctest-args: ${{ inputs.ctest-args }}

0 commit comments

Comments
 (0)