Skip to content

Commit 557a5d8

Browse files
committed
Refs #21228: Simplify nightly removing unnecessary matrix options
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
1 parent fcd7454 commit 557a5d8

2 files changed

Lines changed: 39 additions & 65 deletions

File tree

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

Lines changed: 19 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,14 @@ on:
88
jobs:
99
# python main - fastdds master
1010
nightly-ubuntu-ci-main:
11-
strategy:
12-
fail-fast: false
13-
matrix:
14-
os-version:
15-
- 'ubuntu-22.04'
16-
fastdds-branch:
17-
- 'master'
1811
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-ubuntu-ci.yml@main
1912
with:
20-
os-version: ${{ matrix.os-version }}
21-
label: 'nightly-${{ matrix.os-version }}-ci-main-${{ matrix.fastdds-branch }}'
13+
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
14+
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
15+
os-version: 'ubuntu-22.04'
16+
label: 'nightly-ubuntu-ci-main-master'
2217
fastdds-python-branch: 'main'
23-
fastdds-branch: ${{ matrix.fastdds-branch }}
18+
fastdds-branch: 'master'
2419
run-build: true
2520
run-tests: true
2621
use-ccache: false
@@ -30,15 +25,15 @@ jobs:
3025
strategy:
3126
fail-fast: false
3227
matrix:
33-
os-version:
34-
- 'ubuntu-22.04'
3528
fastdds-branch:
3629
- '2.14.x'
3730
- '2.13.x'
3831
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-ubuntu-ci.yml@1.4.x
3932
with:
40-
os-version: ${{ matrix.os-version }}
41-
label: 'nightly-${{ matrix.os-version }}-ci-1.4.x-${{ matrix.fastdds-branch }}'
33+
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
34+
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
35+
os-version: 'ubuntu-22.04'
36+
label: 'nightly-ubuntu-ci-1.4.x-${{ matrix.fastdds-branch }}'
4237
fastdds-python-branch: '1.4.x'
4338
fastdds-branch: ${{ matrix.fastdds-branch }}
4439
run-build: true
@@ -47,38 +42,28 @@ jobs:
4742

4843
# python 1.2.x - fastdds 2.10.x
4944
nightly-ubuntu-ci-1_2_x:
50-
strategy:
51-
fail-fast: false
52-
matrix:
53-
os-version:
54-
- 'ubuntu-22.04'
55-
fastdds-branch:
56-
- '2.10.x'
5745
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-ubuntu-ci.yml@1.2.x
5846
with:
59-
os-version: ${{ matrix.os-version }}
60-
label: 'nightly-${{ matrix.os-version }}-ci-1.2.x-${{ matrix.fastdds-branch }}'
47+
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
48+
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
49+
os-version: 'ubuntu-22.04'
50+
label: 'nightly-ubuntu-ci-1.2.x-2.10.x'
6151
fastdds-python-branch: '1.2.x'
62-
fastdds-branch: ${{ matrix.fastdds-branch }}
52+
fastdds-branch: '2.10.x'
6353
run-build: true
6454
run-tests: true
6555
use-ccache: false
6656

6757
# python 1.0.x - fastdds 2.6.x
6858
nightly-ubuntu-ci-1_0_x:
69-
strategy:
70-
fail-fast: false
71-
matrix:
72-
os-version:
73-
- 'ubuntu-20.04'
74-
fastdds-branch:
75-
- '2.6.x'
7659
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-ubuntu-ci.yml@1.0.x
7760
with:
78-
os-version: ${{ matrix.os-version }}
79-
label: 'nightly-${{ matrix.os-version }}-ci-1.0.x-${{ matrix.fastdds-branch }}'
61+
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
62+
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
63+
os-version: 'ubuntu-20.04'
64+
label: 'nightly-ubuntu-ci-1.0.x-2.6.x'
8065
fastdds-python-branch: '1.0.x'
81-
fastdds-branch: ${{ matrix.fastdds-branch }}
66+
fastdds-branch: '2.6.x'
8267
run-build: true
8368
run-tests: false
8469
use-ccache: false

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

Lines changed: 20 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,15 @@ on:
88
jobs:
99
# python main - fastdds master
1010
nightly-windows-ci-main:
11-
strategy:
12-
fail-fast: false
13-
matrix:
14-
os-version:
15-
- 'windows-2019'
16-
vs-toolset:
17-
- 'v142'
18-
fastdds-branch:
19-
- 'master'
2011
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@main
2112
with:
22-
os-version: ${{ matrix.os-version }}
23-
vs.toolset: ${{ matrix.vs-toolset }}
24-
label: 'nightly-${{ matrix.os-version }}-${{ matrix.vs-toolset }}-ci-main-${{ matrix.fastdds-branch }}'
13+
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
14+
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
15+
os-version: 'windows-2019'
16+
vs.toolset: 'v142'
17+
label: 'nightly-windows-v142-ci-main-master'
2518
fastdds-python-branch: 'main'
26-
fastdds-branch: ${{ matrix.fastdds-branch }}
19+
fastdds-branch: 'master'
2720
run-build: true
2821
run-tests: true
2922

@@ -32,8 +25,6 @@ jobs:
3225
strategy:
3326
fail-fast: false
3427
matrix:
35-
os-version:
36-
- 'windows-2019'
3728
vs-toolset:
3829
- 'v141'
3930
- 'v142'
@@ -42,9 +33,11 @@ jobs:
4233
- '2.13.x'
4334
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@1.4.x
4435
with:
45-
os-version: ${{ matrix.os-version }}
36+
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
37+
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
38+
os-version: 'windows-2019'
4639
vs.toolset: ${{ matrix.vs-toolset }}
47-
label: 'nightly-${{ matrix.os-version }}-${{ matrix.vs-toolset }}-ci-1.4.x-${{ matrix.fastdds-branch }}'
40+
label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-1.4.x-${{ matrix.fastdds-branch }}'
4841
fastdds-python-branch: '1.4.x'
4942
fastdds-branch: ${{ matrix.fastdds-branch }}
5043
run-build: true
@@ -55,20 +48,18 @@ jobs:
5548
strategy:
5649
fail-fast: false
5750
matrix:
58-
os-version:
59-
- 'windows-2019'
6051
vs-toolset:
6152
- 'v141'
6253
- 'v142'
63-
fastdds-branch:
64-
- '2.10.x'
6554
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@1.2.x
6655
with:
67-
os-version: ${{ matrix.os-version }}
56+
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
57+
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
58+
os-version: 'windows-2019'
6859
vs.toolset: ${{ matrix.vs-toolset }}
69-
label: 'nightly-${{ matrix.os-version }}-${{ matrix.vs-toolset }}-ci-1.2.x-${{ matrix.fastdds-branch }}'
60+
label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-1.2.x-2.10.x'
7061
fastdds-python-branch: '1.2.x'
71-
fastdds-branch: ${{ matrix.fastdds-branch }}
62+
fastdds-branch: '2.10.x'
7263
run-build: true
7364
run-tests: true
7465

@@ -77,19 +68,17 @@ jobs:
7768
strategy:
7869
fail-fast: false
7970
matrix:
80-
os-version:
81-
- 'windows-2019'
8271
vs-toolset:
8372
- 'v141'
8473
- 'v142'
85-
fastdds-branch:
86-
- '2.6.x'
8774
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@1.0.x
8875
with:
89-
os-version: ${{ matrix.os-version }}
76+
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
77+
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
78+
os-version: 'windows-2019'
9079
vs.toolset: ${{ matrix.vs-toolset }}
91-
label: 'nightly-${{ matrix.os-version }}-${{ matrix.vs-toolset }}-ci-1.0.x-${{ matrix.fastdds-branch }}'
80+
label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-1.0.x-2.6.x'
9281
fastdds-python-branch: '1.0.x'
93-
fastdds-branch: ${{ matrix.fastdds-branch }}
82+
fastdds-branch: '2.6.x'
9483
run-build: false
9584
run-tests: false

0 commit comments

Comments
 (0)