File tree Expand file tree Collapse file tree 2 files changed +11
-10
lines changed
Expand file tree Collapse file tree 2 files changed +11
-10
lines changed Original file line number Diff line number Diff line change 66 os-version :
77 description : ' The OS image for the workflow'
88 required : false
9- default : ' windows-2019 '
9+ default : ' windows-2022 '
1010 type : string
1111 vs-toolset :
1212 description : ' The VS toolset to use for the build'
Original file line number Diff line number Diff line change 66 os-version :
77 description : ' OS version to run the workflow'
88 required : false
9- default : ' windows-2019'
10- type : string
11- vs-toolset :
12- description : ' The VS toolset to use for the build'
13- required : false
14- default : ' v142'
9+ default : ' windows-2022'
1510 type : string
1611 colcon-args :
1712 description : ' Extra arguments for colcon cli'
@@ -54,13 +49,19 @@ concurrency:
5449jobs :
5550 windows-ci :
5651 if : ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }}
52+ strategy :
53+ fail-fast : false
54+ matrix :
55+ vs-toolset :
56+ - ' v142'
57+ - ' v143'
5758 uses : ./.github/workflows/reusable-windows-ci.yml
5859 with :
5960 # It would be desirable to have a matrix of windows OS for this job, but due to the issue opened in this ticket:
6061 # https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
61- os-version : ${{ inputs.os-version || 'windows-2019 ' }}
62- vs-toolset : ${{ inputs .vs-toolset || 'v142' }}
63- label : ' ${{ inputs.os-version }}-${{ inputs .vs-toolset }}-ci-${{ inputs.fastdds-python-branch }}-${{ inputs.fastdds-branch }}'
62+ os-version : ${{ inputs.os-version || 'windows-2022 ' }}
63+ vs-toolset : ${{ matrix .vs-toolset }}
64+ label : ' ${{ inputs.os-version }}-${{ matrix .vs-toolset }}-ci-${{ inputs.fastdds-python-branch }}-${{ inputs.fastdds-branch }}'
6465 colcon-args : ${{ inputs.colcon-args }}
6566 cmake-args : ${{ inputs.cmake-args }}
6667 ctest-args : ${{ inputs.ctest-args }}
You can’t perform that action at this time.
0 commit comments