Skip to content

Commit 080d23a

Browse files
Remove deprecated windows-2019 runner (#211) (#213)
* Remove deprecated windows-2019 runner (#211) * Remove deprecated windows-2019 runner Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> * Add vs-toolset matrix Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> --------- Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> (cherry picked from commit 653bb92) # Conflicts: # .github/workflows/nightly-windows-ci.yml # .github/workflows/windows-ci.yml Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> * Resolve backport conflicts Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> --------- Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> Co-authored-by: Raul Sanchez-Mateos Lizano <raulsml18@gmail.com> Co-authored-by: Raul Sanchez-Mateos <raul@eprosima.com>
1 parent abf39ae commit 080d23a

2 files changed

Lines changed: 5 additions & 10 deletions

File tree

.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: 4 additions & 9 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'
@@ -52,15 +47,15 @@ jobs:
5247
fail-fast: false
5348
matrix:
5449
vs-toolset:
55-
- 'v141'
5650
- 'v142'
51+
- 'v143'
5752
if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }}
5853
uses: ./.github/workflows/reusable-windows-ci.yml
5954
with:
6055
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
6156
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
62-
os-version: ${{ inputs.os-version || 'windows-2019' }}
63-
vs-toolset: ${{ inputs.vs-toolset || matrix.vs-toolset }}
57+
os-version: ${{ inputs.os-version || 'windows-2022' }}
58+
vs-toolset: ${{ matrix.vs-toolset }}
6459
label: 'windows-${{ matrix.vs-toolset }}-ci-2.14.x'
6560
colcon-args: ${{ inputs.colcon-args }}
6661
cmake-args: ${{ inputs.cmake-args }}

0 commit comments

Comments
 (0)