Skip to content

Commit e6a69f7

Browse files
rsanchez15mergify[bot]
authored andcommitted
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> (cherry picked from commit 19115c5) # Conflicts: # .github/workflows/nightly-windows-ci.yml # .github/workflows/weekly-windows-ci.yml
1 parent 3e7f83e commit e6a69f7

File tree

4 files changed

+94
-10
lines changed

4 files changed

+94
-10
lines changed
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: Fast DDS Python Windows CI (nightly)
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: '0 1 * * *'
7+
8+
jobs:
9+
# python main - fastdds master
10+
nightly-windows-ci-main:
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
vs-toolset:
15+
- 'v142'
16+
- 'v143'
17+
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@main
18+
with:
19+
os-version: 'windows-2022'
20+
vs-toolset: ${{ matrix.vs-toolset }}
21+
label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-main-master'
22+
fastdds-python-branch: 'main'
23+
fastdds-branch: 'master'
24+
run-build: true
25+
run-tests: true
26+
27+
# python 2.2.x - fastdds 3.2.x
28+
nightly-windows-ci-2_2_x:
29+
strategy:
30+
fail-fast: false
31+
matrix:
32+
vs-toolset:
33+
- 'v142'
34+
- 'v143'
35+
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@2.2.x
36+
with:
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'
40+
fastdds-python-branch: '2.2.x'
41+
fastdds-branch: '3.2.x'
42+
run-build: true
43+
run-tests: true
44+
45+
# python 1.4.x - fastdds 2.14.x
46+
nightly-windows-ci-1_4_x:
47+
strategy:
48+
fail-fast: false
49+
matrix:
50+
vs-toolset:
51+
- 'v142'
52+
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@1.4.x
53+
with:
54+
os-version: 'windows-2022'
55+
vs-toolset: ${{ matrix.vs-toolset }}
56+
label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-1.4.x-2.14.x'
57+
fastdds-python-branch: '1.4.x'
58+
fastdds-branch: '2.14.x'
59+
run-build: true
60+
run-tests: true

.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'
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Fast DDS Python Windows CI (weekly)
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: '0 0 * * 1' # Run at minute 0 on Monday
7+
8+
jobs:
9+
weekly-windows-ci-1_0_x:
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
vs-toolset:
14+
- 'v142'
15+
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@1.0.x
16+
with:
17+
os-version: 'windows-2022'
18+
vs-toolset: ${{ matrix.vs-toolset }}
19+
label: 'weekly-windows-${{ matrix.vs-toolset }}-ci-1.0.x-2.6.x'
20+
fastdds-python-branch: '1.0.x'
21+
fastdds-branch: '2.6.x'
22+
run-build: false
23+
run-tests: false

.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)