Skip to content

Commit b12fc2c

Browse files
JesusPoderosoJesusPoderoso
committed
Refs #21228: Apply rev suggestions
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
1 parent 2423de7 commit b12fc2c

6 files changed

Lines changed: 48 additions & 63 deletions

File tree

‎.github/workflows/config/test.meta‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,3 @@ names:
77
"--timeout", "300",
88
"--label-exclude", "xfail"
99
]
10-
googletest-distribution:
11-
cmake-args:
12-
- "-Dgtest_force_shared_crt=ON"
13-
- "-DBUILD_SHARED_LIBS=ON"
14-
- "-DBUILD_GMOCK=ON"

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

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,17 @@ jobs:
1313
matrix:
1414
os-version:
1515
- 'ubuntu-22.04'
16-
fastdds-python-branch:
17-
- 'main'
1816
fastdds-branch:
1917
- 'master'
2018
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-ubuntu-ci.yml@main
2119
with:
2220
os-version: ${{ matrix.os-version }}
23-
label: 'nightly-${{ matrix.os-version }}-ci-${{ matrix.fastdds-python-branch }}-${{ matrix.fastdds-branch }}'
24-
fastdds-python-branch: ${{ matrix.fastdds-python-branch }}
21+
label: 'nightly-${{ matrix.os-version }}-ci-main-${{ matrix.fastdds-branch }}'
22+
fastdds-python-branch: 'main'
2523
fastdds-branch: ${{ matrix.fastdds-branch }}
2624
run-build: true
2725
run-tests: true
26+
use-ccache: false
2827

2928
# python 1.4.x - fastdds 2.14.x/2.13.x
3029
nightly-ubuntu-ci-1_4_x:
@@ -33,19 +32,18 @@ jobs:
3332
matrix:
3433
os-version:
3534
- 'ubuntu-22.04'
36-
fastdds-python-branch:
37-
- '1.4.x'
3835
fastdds-branch:
3936
- '2.14.x'
4037
- '2.13.x'
4138
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-ubuntu-ci.yml@1.4.x
4239
with:
4340
os-version: ${{ matrix.os-version }}
44-
label: 'nightly-${{ matrix.os-version }}-ci-${{ matrix.fastdds-python-branch }}-${{ matrix.fastdds-branch }}'
45-
fastdds-python-branch: ${{ matrix.fastdds-python-branch }}
41+
label: 'nightly-${{ matrix.os-version }}-ci-1.4.x-${{ matrix.fastdds-branch }}'
42+
fastdds-python-branch: '1.4.x'
4643
fastdds-branch: ${{ matrix.fastdds-branch }}
4744
run-build: true
4845
run-tests: true
46+
use-ccache: false
4947

5048
# python 1.2.x - fastdds 2.10.x
5149
nightly-ubuntu-ci-1_2_x:
@@ -54,18 +52,17 @@ jobs:
5452
matrix:
5553
os-version:
5654
- 'ubuntu-22.04'
57-
fastdds-python-branch:
58-
- '1.2.x'
5955
fastdds-branch:
6056
- '2.10.x'
6157
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-ubuntu-ci.yml@1.2.x
6258
with:
6359
os-version: ${{ matrix.os-version }}
64-
label: 'nightly-${{ matrix.os-version }}-ci-${{ matrix.fastdds-python-branch }}-${{ matrix.fastdds-branch }}'
65-
fastdds-python-branch: ${{ matrix.fastdds-python-branch }}
60+
label: 'nightly-${{ matrix.os-version }}-ci-1.2.x-${{ matrix.fastdds-branch }}'
61+
fastdds-python-branch: '1.2.x'
6662
fastdds-branch: ${{ matrix.fastdds-branch }}
6763
run-build: true
6864
run-tests: true
65+
use-ccache: false
6966

7067
# python 1.0.x - fastdds 2.6.x
7168
nightly-ubuntu-ci-1_0_x:
@@ -74,15 +71,14 @@ jobs:
7471
matrix:
7572
os-version:
7673
- 'ubuntu-20.04'
77-
fastdds-python-branch:
78-
- '1.0.x'
7974
fastdds-branch:
8075
- '2.6.x'
8176
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-ubuntu-ci.yml@1.0.x
8277
with:
8378
os-version: ${{ matrix.os-version }}
84-
label: 'nightly-${{ matrix.os-version }}-ci-${{ matrix.fastdds-python-branch }}-${{ matrix.fastdds-branch }}'
85-
fastdds-python-branch: ${{ matrix.fastdds-python-branch }}
79+
label: 'nightly-${{ matrix.os-version }}-ci-1.0.x-${{ matrix.fastdds-branch }}'
80+
fastdds-python-branch: '1.0.x'
8681
fastdds-branch: ${{ matrix.fastdds-branch }}
8782
run-build: true
8883
run-tests: false
84+
use-ccache: false

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

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,14 @@ jobs:
1515
- 'windows-2019'
1616
vs-toolset:
1717
- 'v142'
18-
fastdds-python-branch:
19-
- 'main'
2018
fastdds-branch:
2119
- 'master'
2220
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@main
2321
with:
2422
os-version: ${{ matrix.os-version }}
2523
vs.toolset: ${{ matrix.vs-toolset }}
26-
label: 'nightly-${{ matrix.os-version }}-${{ matrix.vs-toolset }}-ci-${{ matrix.fastdds-python-branch }}-${{ matrix.fastdds-branch }}'
27-
fastdds-python-branch: ${{ matrix.fastdds-python-branch }}
24+
label: 'nightly-${{ matrix.os-version }}-${{ matrix.vs-toolset }}-ci-main-${{ matrix.fastdds-branch }}'
25+
fastdds-python-branch: 'main'
2826
fastdds-branch: ${{ matrix.fastdds-branch }}
2927
run-build: true
3028
run-tests: true
@@ -39,17 +37,15 @@ jobs:
3937
vs-toolset:
4038
- 'v141'
4139
- 'v142'
42-
fastdds-python-branch:
43-
- '1.4.x'
4440
fastdds-branch:
4541
- '2.14.x'
4642
- '2.13.x'
4743
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@1.4.x
4844
with:
4945
os-version: ${{ matrix.os-version }}
5046
vs.toolset: ${{ matrix.vs-toolset }}
51-
label: 'nightly-${{ matrix.os-version }}-${{ matrix.vs-toolset }}-ci-${{ matrix.fastdds-python-branch }}-${{ matrix.fastdds-branch }}'
52-
fastdds-python-branch: ${{ matrix.fastdds-python-branch }}
47+
label: 'nightly-${{ matrix.os-version }}-${{ matrix.vs-toolset }}-ci-1.4.x-${{ matrix.fastdds-branch }}'
48+
fastdds-python-branch: '1.4.x'
5349
fastdds-branch: ${{ matrix.fastdds-branch }}
5450
run-build: true
5551
run-tests: true
@@ -64,16 +60,14 @@ jobs:
6460
vs-toolset:
6561
- 'v141'
6662
- 'v142'
67-
fastdds-python-branch:
68-
- '1.2.x'
6963
fastdds-branch:
7064
- '2.10.x'
7165
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@1.2.x
7266
with:
7367
os-version: ${{ matrix.os-version }}
7468
vs.toolset: ${{ matrix.vs-toolset }}
75-
label: 'nightly-${{ matrix.os-version }}-${{ matrix.vs-toolset }}-ci-${{ matrix.fastdds-python-branch }}-${{ matrix.fastdds-branch }}'
76-
fastdds-python-branch: ${{ matrix.fastdds-python-branch }}
69+
label: 'nightly-${{ matrix.os-version }}-${{ matrix.vs-toolset }}-ci-1.2.x-${{ matrix.fastdds-branch }}'
70+
fastdds-python-branch: '1.2.x'
7771
fastdds-branch: ${{ matrix.fastdds-branch }}
7872
run-build: true
7973
run-tests: true
@@ -88,16 +82,14 @@ jobs:
8882
vs-toolset:
8983
- 'v141'
9084
- 'v142'
91-
fastdds-python-branch:
92-
- '1.0.x'
9385
fastdds-branch:
9486
- '2.6.x'
9587
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@1.0.x
9688
with:
9789
os-version: ${{ matrix.os-version }}
9890
vs.toolset: ${{ matrix.vs-toolset }}
99-
label: 'nightly-${{ matrix.os-version }}-${{ matrix.vs-toolset }}-ci-${{ matrix.fastdds-python-branch }}-${{ matrix.fastdds-branch }}'
100-
fastdds-python-branch: ${{ matrix.fastdds-python-branch }}
91+
label: 'nightly-${{ matrix.os-version }}-${{ matrix.vs-toolset }}-ci-1.0.x-${{ matrix.fastdds-branch }}'
92+
fastdds-python-branch: '1.0.x'
10193
fastdds-branch: ${{ matrix.fastdds-branch }}
10294
run-build: false
10395
run-tests: false

‎.github/workflows/reusable-ubuntu-ci.yml‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ on:
4242
required: false
4343
type: boolean
4444
default: true
45+
use-ccache:
46+
description: 'Use CCache to speed up the build'
47+
required: false
48+
type: boolean
49+
default: false
4550
env:
4651
colcon-build-default-cmake-args: '-DBUILD_DOCUMENTATION=ON'
4752
defaults:
@@ -98,6 +103,12 @@ jobs:
98103
packages: vcstool xmlschema
99104
upgrade: false
100105

106+
- name: Setup CCache
107+
uses: eProsima/eProsima-CI/external/setup-ccache-action@v0
108+
if: ${{ inputs.use-ccache == true }}
109+
with:
110+
api_token: ${{ secrets.GITHUB_TOKEN }}
111+
101112
- name: Get Fast DDS branch
102113
id: get_fastdds_branch
103114
uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
@@ -119,7 +130,6 @@ jobs:
119130
destination_workspace: src
120131
skip_existing: 'true'
121132

122-
123133
- name: Colcon build
124134
continue-on-error: false
125135
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
@@ -173,14 +183,13 @@ jobs:
173183
- name: Install Python dependencies
174184
uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0
175185
with:
176-
packages: vcstool xmlschema
186+
packages: xmlschema pytest
177187

178-
- name: Fetch Fast DDS Python CI dependencies
179-
uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
188+
- name: Setup CCache
189+
uses: eProsima/eProsima-CI/external/setup-ccache-action@v0
190+
if: ${{ inputs.use-ccache == true }}
180191
with:
181-
vcs_repos_file: ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/test.repos
182-
destination_workspace: src
183-
skip_existing: 'true'
192+
api_token: ${{ secrets.GITHUB_TOKEN }}
184193

185194
- name: Colcon build
186195
continue-on-error: false

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

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,9 @@ jobs:
126126
shell: pwsh
127127
run: choco install swig --allow-downgrade --version=4.0.2.04082020
128128

129-
# Although this is a ubuntu action becuase it uses bash, it is compatible with windows
130129
- name: Get Fast DDS branch
131130
id: get_fastdds_branch
132-
uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
131+
uses: eProsima/eProsima-CI/multiplatform/get_related_branch_from_repo@feature/21228
133132
with:
134133
remote_repository: eProsima/Fast-DDS
135134
fallback_branch: ${{ inputs.fastdds-branch }}
@@ -232,25 +231,13 @@ jobs:
232231
run: choco install swig --allow-downgrade --version=4.0.2.04082020
233232

234233
- name: Install doxygen
235-
uses: ssciwr/doxygen-install@v1
234+
uses: eProsima/eProsima-CI/external/install_doxygen@feature/21228
236235

237236
- name: Prepare build meta file
238-
run: |
239-
$build_meta_file = '${{ github.workspace }}\src\fastdds_python\.github\workflows\config\build.meta'
240-
$test_meta_file = '${{ github.workspace }}\src\fastdds_python\.github\workflows\config\test.meta'
241-
$build_test_meta_file = '${{ github.workspace }}\src\fastdds_python\.github\workflows\config\build_test.meta'
242-
243-
# Read the content of the build meta file
244-
$build_meta_content = Get-Content -Path $build_meta_file
245-
246-
# Read the content of the test meta file, starting from line 4 (skipping "name" line [1], cmake project name line [2] and "cmake-args" line [3])
247-
$test_meta_content = Get-Content -Path $test_meta_file | Select-Object -Skip 3
248-
249-
# Combine the content of the build meta file and the test meta file
250-
$combined_content = $build_meta_content + $test_meta_content
251-
252-
# Write the combined content to the build test meta file
253-
$combined_content | Out-File -FilePath $build_test_meta_file -Encoding UTF8
237+
uses: eProsima/eProsima-CI/windows/merge_yaml_metas@feature/21228
238+
with:
239+
metas: "@('${{ github.workspace }}/src/fastdds_python/.github/workflows/config/build.meta', '${{ github.workspace }}/src/fastdds_python/.github/workflows/config/test.meta')"
240+
path: '${{ github.workspace }}/src/fastdds_python/.github/workflows/config/build_test.meta'
254241

255242
- name: Colcon build
256243
continue-on-error: false

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ on:
3333
required: false
3434
type: boolean
3535
default: true
36+
use-ccache:
37+
description: 'Use CCache to speed up the build'
38+
required: false
39+
type: boolean
40+
default: false
3641

3742
pull_request:
3843
types:
@@ -61,3 +66,4 @@ jobs:
6166
fastdds-branch: ${{ inputs.fastdds-branch || 'master' }}
6267
run-build: ${{ !(github.event_name == 'pull_request') && true || (!contains(github.event.pull_request.labels.*.name, 'skip-ci') && !contains(github.event.pull_request.labels.*.name, 'conflicts')) && true || false }}
6368
run-tests: ${{ ((inputs.run-tests == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no-test')) && true || false }}
69+
use-ccache: ${{ inputs.use-ccache || false }}

0 commit comments

Comments
 (0)