Skip to content

Commit

Permalink
Refs #21228: Fix windows CI removing win2017
Browse files Browse the repository at this point in the history
Signed-off-by: JesusPoderoso <[email protected]>
  • Loading branch information
JesusPoderoso committed Jun 26, 2024
1 parent e7e7163 commit 808e0b5
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ jobs:
fail-fast: false
matrix:
os-version:
- image: 'windows-2019'
vs-toolset: 'v142'
- image: 'windows-2017'
vs-toolset: 'v141'
- 'windows-2019'
vs-toolset:
- 'v141'
- 'v142'
fastdds-python-branch:
- '1.4.x'
fastdds-branch:
Expand All @@ -70,9 +70,9 @@ jobs:
with:
# It would be desirable to have a matrix of windows OS for this job, but due to the issue opened in this ticket:
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
os-version: ${{ inputs.os-version || matrix.os-version.image }}
vs-toolset: ${{ inputs.vs-toolset || matrix.os-version.vs-toolset }}
label: '${{ matrix.os-version.image }}-${{ matrix.os-version.vs-toolset }}-ci-${{ matrix.fastdds-python-branch }}-${{ matrix.fastdds-branch }}'
os-version: ${{ inputs.os-version || matrix.os-version }}
vs-toolset: ${{ inputs.vs-toolset || matrix.vs-toolset }}
label: '${{ matrix.os-version }}-${{ matrix.vs-toolset }}-ci-${{ matrix.fastdds-python-branch }}-${{ matrix.fastdds-branch }}'
colcon-args: ${{ inputs.colcon-args }}
cmake-args: ${{ inputs.cmake-args }}
ctest-args: ${{ inputs.ctest-args }}
Expand Down

0 comments on commit 808e0b5

Please sign in to comment.