Skip to content

Commit 19115c5

Browse files
authored
Remove deprecated windows-2019 runner (#243)
* Remove deprecated windows-2019 runner Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> * Add matrix to windows-ci Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> --------- Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com>
1 parent d294198 commit 19115c5

4 files changed

Lines changed: 31 additions & 20 deletions

File tree

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

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,35 @@ on:
88
jobs:
99
# python main - fastdds master
1010
nightly-windows-ci-main:
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
vs-toolset:
15+
- 'v142'
16+
- 'v143'
1117
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@main
1218
with:
13-
os-version: 'windows-2019'
14-
vs-toolset: 'v142'
15-
label: 'nightly-windows-v142-ci-main-master'
19+
os-version: 'windows-2022'
20+
vs-toolset: ${{ matrix.vs-toolset }}
21+
label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-main-master'
1622
fastdds-python-branch: 'main'
1723
fastdds-branch: 'master'
1824
run-build: true
1925
run-tests: true
2026

2127
# python 2.2.x - fastdds 3.2.x
2228
nightly-windows-ci-2_2_x:
29+
strategy:
30+
fail-fast: false
31+
matrix:
32+
vs-toolset:
33+
- 'v142'
34+
- 'v143'
2335
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@2.2.x
2436
with:
25-
os-version: 'windows-2019'
26-
vs-toolset: 'v142'
27-
label: 'nightly-windows-v142-ci-2.2.x-3.2.x'
37+
os-version: 'windows-2022'
38+
vs-toolset: ${{ matrix.vs-toolset }}
39+
label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-2.2.x-3.2.x'
2840
fastdds-python-branch: '2.2.x'
2941
fastdds-branch: '3.2.x'
3042
run-build: true
@@ -36,11 +48,10 @@ jobs:
3648
fail-fast: false
3749
matrix:
3850
vs-toolset:
39-
- 'v141'
4051
- 'v142'
4152
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@1.4.x
4253
with:
43-
os-version: 'windows-2019'
54+
os-version: 'windows-2022'
4455
vs-toolset: ${{ matrix.vs-toolset }}
4556
label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-1.4.x-2.14.x'
4657
fastdds-python-branch: '1.4.x'

.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/weekly-windows-ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
vs-toolset:
14-
- 'v141'
1514
- 'v142'
1615
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@1.0.x
1716
with:
18-
os-version: 'windows-2019'
17+
os-version: 'windows-2022'
1918
vs-toolset: ${{ matrix.vs-toolset }}
2019
label: 'weekly-windows-${{ matrix.vs-toolset }}-ci-1.0.x-2.6.x'
2120
fastdds-python-branch: '1.0.x'

.github/workflows/windows-ci.yml

Lines changed: 10 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'
@@ -54,13 +49,19 @@ concurrency:
5449
jobs:
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 }}

0 commit comments

Comments
 (0)