Skip to content

Commit 7b7a574

Browse files
Remove deprecated windows-2019 runner (#245)
* Remove deprecated windows-2019 runner * Add matrix to windows-ci --------- (cherry picked from commit 19115c5) Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> Co-authored-by: Raul Sanchez-Mateos Lizano <raul@eprosima.com>
1 parent 3685455 commit 7b7a574

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

.github/workflows/reusable-windows-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
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'

.github/workflows/windows-ci.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ on:
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

5449
jobs:
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 }}

0 commit comments

Comments
 (0)