Skip to content

Commit bef66d9

Browse files
JesusPoderosoJesusPoderoso
committed
Refs #21228: Apply rev suggestions in main PR
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
1 parent ee73c4e commit bef66d9

7 files changed

Lines changed: 51 additions & 47 deletions

File tree

‎.github/workflows/config/test.repos‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/workflows/config/test.meta renamed to .github/workflows/config/ubuntu_test.meta

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

‎.github/workflows/config/windows_test.meta‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
names:
2+
fastdds_python:
3+
cmake-args:
4+
- "-DBUILD_TESTING=ON"
5+
ctest-args: [
6+
"--repeat", "until-pass:3",
7+
"--timeout", "300",
8+
"--label-exclude", "xfail"
9+
]

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

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ on:
4242
required: false
4343
type: boolean
4444
default: false
45+
use-ccache:
46+
description: 'Use CCache to speed up the build'
47+
required: false
48+
type: boolean
49+
default: false
4550

4651
defaults:
4752
run:
@@ -84,7 +89,7 @@ jobs:
8489
- name: Install apt dependencies
8590
uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
8691
with:
87-
packages: libasio-dev libtinyxml2-dev libssl-dev swig
92+
packages: libasio-dev libtinyxml2-dev libssl-dev swig doxygen
8893
update: false
8994
upgrade: false
9095

@@ -97,6 +102,12 @@ jobs:
97102
packages: vcstool xmlschema
98103
upgrade: false
99104

105+
- name: Setup CCache
106+
uses: eProsima/eProsima-CI/external/setup-ccache-action@v0
107+
if: ${{ inputs.use-ccache == true }}
108+
with:
109+
api_token: ${{ secrets.GITHUB_TOKEN }}
110+
100111
- name: Get Fast DDS branch
101112
id: get_fastdds_branch
102113
uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
@@ -172,20 +183,19 @@ jobs:
172183
- name: Install Python dependencies
173184
uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0
174185
with:
175-
packages: vcstool xmlschema
186+
packages: xmlschema pytest
176187

177-
- name: Fetch Fast DDS Python CI dependencies
178-
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 }}
179191
with:
180-
vcs_repos_file: ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/test.repos
181-
destination_workspace: src
182-
skip_existing: 'true'
192+
api_token: ${{ secrets.GITHUB_TOKEN }}
183193

184194
- name: Colcon build
185195
continue-on-error: false
186196
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
187197
with:
188-
colcon_meta_file: ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/build.meta ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/test.meta
198+
colcon_meta_file: ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/build.meta ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/ubuntu_test.meta
189199
colcon_build_args: ${{ inputs.colcon-args }}
190200
cmake_args: ${{ inputs.cmake-args }}
191201
cmake_args_default: ''
@@ -196,7 +206,7 @@ jobs:
196206
id: python_test
197207
uses: eProsima/eProsima-CI/multiplatform/colcon_test@v0
198208
with:
199-
colcon_meta_file: ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/test.meta
209+
colcon_meta_file: ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/ubuntu_test.meta
200210
colcon_test_args: ${{ inputs.colcon-args }}
201211
colcon_test_args_default: --event-handlers=console_direct+
202212
ctest_args: ${{ inputs.ctest-args }}

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

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

128-
# Although this is a ubuntu action becuase it uses bash, it is compatible with windows
129128
- name: Get Fast DDS branch
130129
id: get_fastdds_branch
131-
uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
130+
uses: eProsima/eProsima-CI/multiplatform/get_related_branch_from_repo@v0
132131
with:
133132
remote_repository: eProsima/Fast-DDS
134133
fallback_branch: ${{ inputs.fastdds-branch }}
@@ -229,20 +228,15 @@ jobs:
229228
shell: pwsh
230229
run: choco install swig --allow-downgrade --version=4.0.2.04082020
231230

231+
- name: Install doxygen
232+
uses: eProsima/eProsima-CI/external/install_doxygen@v0
232233

233234
- name: Prepare build meta file
234-
run: |
235-
$build_meta_file = '${{ github.workspace }}\src\fastdds_python\.github\workflows\config\build.meta'
236-
$test_meta_file = '${{ github.workspace }}\src\fastdds_python\.github\workflows\config\test.meta'
237-
$build_test_meta_file = '${{ github.workspace }}\src\fastdds_python\.github\workflows\config\build_test.meta'
238-
# Read the content of the build meta file
239-
$build_meta_content = Get-Content -Path $build_meta_file
240-
# 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])
241-
$test_meta_content = Get-Content -Path $test_meta_file | Select-Object -Skip 3
242-
# Combine the content of the build meta file and the test meta file
243-
$combined_content = $build_meta_content + $test_meta_content
244-
# Write the combined content to the build test meta file
245-
$combined_content | Out-File -FilePath $build_test_meta_file -Encoding UTF8
235+
uses: eProsima/eProsima-CI/windows/merge_yaml_metas@v0
236+
with:
237+
metas: "@('${{ github.workspace }}/src/fastdds_python/.github/workflows/config/build.meta', '${{ github.workspace }}/src/fastdds_python/.github/workflows/config/windows_test.meta')"
238+
path: '${{ github.workspace }}/src/fastdds_python/.github/workflows/config/build_test.meta'
239+
246240
- name: Colcon build
247241
continue-on-error: false
248242
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
@@ -259,9 +253,9 @@ jobs:
259253
id: python_test
260254
uses: eProsima/eProsima-CI/multiplatform/colcon_test@v0
261255
with:
262-
colcon_meta_file: ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/test.meta
256+
colcon_meta_file: ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/windows_test.meta
263257
colcon_test_args: ${{ inputs.colcon-args }}
264-
colcon_test_args_default: --event-handlers=console_direct+
258+
colcon_test_args_default: --event-handlers=console_direct+
265259
ctest_args: ${{ inputs.ctest-args }}
266260
packages_names: fastdds_python
267261
workspace: ${{ github.workspace }}

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

Lines changed: 8 additions & 2 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:
@@ -48,16 +53,17 @@ concurrency:
4853

4954
jobs:
5055
ubuntu-ci:
56+
if: ${{ (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'conflicts')) && false || true }}
5157
uses: ./.github/workflows/reusable-ubuntu-ci.yml
5258
with:
5359
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
5460
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
5561
os-version: ${{ inputs.os-version || 'ubuntu-20.04' }}
56-
label: 'ubuntu-ci'
62+
label: 'ubuntu-ci-1.0.x-2.6.x'
5763
colcon-args: ${{ inputs.colcon-args }}
5864
cmake-args: ${{ inputs.cmake-args }}
5965
ctest-args: ${{ inputs.ctest-args }}
6066
fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref || '1.0.x' }}
6167
fastdds-branch: ${{ inputs.fastdds-branch || '2.6.x' }}
62-
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 }}
68+
run-build: ${{ !(github.event_name == 'pull_request') && true || (!contains(github.event.pull_request.labels.*.name, 'skip-ci')) && true || false }}
6369
run-tests: ${{ ((inputs.run-tests == true) && true) || false }}

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,26 +56,21 @@ jobs:
5656
strategy:
5757
fail-fast: false
5858
matrix:
59-
os-version:
60-
- 'windows-2019'
6159
vs-toolset:
6260
- 'v141'
6361
- 'v142'
64-
fastdds-python-branch:
65-
- '1.0.x'
66-
fastdds-branch:
67-
- '2.6.x'
62+
if: ${{ (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'conflicts')) && false || true }}
6863
uses: ./.github/workflows/reusable-windows-ci.yml
6964
with:
7065
# It would be desirable to have a matrix of windows OS for this job, but due to the issue opened in this ticket:
7166
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
72-
os-version: ${{ inputs.os-version || matrix.os-version }}
67+
os-version: ${{ inputs.os-version || 'windows-2019' }}
7368
vs-toolset: ${{ inputs.vs-toolset || matrix.vs-toolset }}
74-
label: '${{ matrix.os-version }}-${{ matrix.vs-toolset }}-ci-${{ matrix.fastdds-python-branch }}-${{ matrix.fastdds-branch }}'
69+
label: 'windows-${{ matrix.vs-toolset }}-ci-1.0.x-2.6.x'
7570
colcon-args: ${{ inputs.colcon-args }}
7671
cmake-args: ${{ inputs.cmake-args }}
7772
ctest-args: ${{ inputs.ctest-args }}
78-
fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref || matrix.fastdds-python-branch }}
79-
fastdds-branch: ${{ inputs.fastdds-branch || matrix.fastdds-branch }}
73+
fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref || '1.0.x' }}
74+
fastdds-branch: ${{ inputs.fastdds-branch ||'2.6.x' }}
8075
run-build: false
8176
run-tests: ${{ ((inputs.run-tests == true) && true) || false }}

0 commit comments

Comments
 (0)