File tree Expand file tree Collapse file tree 2 files changed +7
-12
lines changed
Expand file tree Collapse file tree 2 files changed +7
-12
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'
@@ -53,20 +48,20 @@ concurrency:
5348
5449jobs :
5550 windows-ci :
51+ if : ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }}
5652 strategy :
5753 fail-fast : false
5854 matrix :
5955 vs-toolset :
60- - ' v141'
6156 - ' v142'
62- if : ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }}
57+ - ' v143 '
6358 uses : ./.github/workflows/reusable-windows-ci.yml
6459 with :
6560 # It would be desirable to have a matrix of windows OS for this job, but due to the issue opened in this ticket:
6661 # https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
67- os-version : ${{ inputs.os-version || 'windows-2019 ' }}
68- vs-toolset : ${{ inputs.vs-toolset || matrix.vs-toolset }}
69- label : ' windows- ${{ matrix.vs-toolset }}-ci-1.4.x '
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 }} '
7065 colcon-args : ${{ inputs.colcon-args }}
7166 cmake-args : ${{ inputs.cmake-args }}
7267 ctest-args : ${{ inputs.ctest-args }}
You can’t perform that action at this time.
0 commit comments