Skip to content

Commit a6fb505

Browse files
committed
Refs #21228: Avoid building dependencies again
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
1 parent bef66d9 commit a6fb505

4 files changed

Lines changed: 8 additions & 5 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,12 @@ jobs:
197197
with:
198198
colcon_meta_file: ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/build.meta ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/ubuntu_test.meta
199199
colcon_build_args: ${{ inputs.colcon-args }}
200+
colcon_build_args_default: '--packages-select fastdds_python'
200201
cmake_args: ${{ inputs.cmake-args }}
201202
cmake_args_default: ''
202203
cmake_build_type: ${{ matrix.cmake-build-type }}
203204
workspace: ${{ github.workspace }}
205+
workspace_dependencies: ${{ github.workspace }}/install
204206

205207
- name: Colcon test
206208
id: python_test

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,11 +243,12 @@ jobs:
243243
with:
244244
colcon_meta_file: ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/build_test.meta
245245
colcon_build_args: ${{ inputs.colcon-args }}
246-
colcon_build_args_default: --event-handlers console_direct+
246+
colcon_build_args_default: '--event-handlers console_direct+ --packages-select fastdds_python'
247247
cmake_args: ${{ inputs.cmake-args }}
248248
cmake_args_default: '-T ${{ inputs.vs-toolset }} ${{ env.colcon-build-default-cmake-args }}'
249249
cmake_build_type: ${{ matrix.cmake-build-type }}
250250
workspace: ${{ github.workspace }}
251+
workspace_dependencies: ${{ github.workspace }}/install
251252

252253
- name: Colcon test
253254
id: python_test

.github/workflows/ubuntu-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ concurrency:
5353

5454
jobs:
5555
ubuntu-ci:
56-
if: ${{ (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'conflicts')) && false || true }}
56+
if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') || false }}
5757
uses: ./.github/workflows/reusable-ubuntu-ci.yml
5858
with:
5959
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
@@ -65,5 +65,5 @@ jobs:
6565
ctest-args: ${{ inputs.ctest-args }}
6666
fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref || '1.0.x' }}
6767
fastdds-branch: ${{ inputs.fastdds-branch || '2.6.x' }}
68-
run-build: ${{ !(github.event_name == 'pull_request') && true || (!contains(github.event.pull_request.labels.*.name, 'skip-ci')) && true || false }}
69-
run-tests: ${{ ((inputs.run-tests == true) && true) || false }}
68+
run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') || false }}
69+
run-tests: ${{ (inputs.run-tests == true) || ((github.event_name == 'pull_request') && (!contains(github.event.pull_request.labels.*.name, 'no-test'))) || false }}

.github/workflows/windows-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
vs-toolset:
6060
- 'v141'
6161
- 'v142'
62-
if: ${{ (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'conflicts')) && false || true }}
62+
if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') || false }}
6363
uses: ./.github/workflows/reusable-windows-ci.yml
6464
with:
6565
# It would be desirable to have a matrix of windows OS for this job, but due to the issue opened in this ticket:

0 commit comments

Comments
 (0)