Skip to content

Commit c990530

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

4 files changed

Lines changed: 10 additions & 7 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
@@ -245,11 +245,12 @@ jobs:
245245
with:
246246
colcon_meta_file: ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/build_test.meta
247247
colcon_build_args: ${{ inputs.colcon-args }}
248-
colcon_build_args_default: --event-handlers console_direct+
248+
colcon_build_args_default: '--event-handlers console_direct+ --packages-select fastdds_python'
249249
cmake_args: ${{ inputs.cmake-args }}
250250
cmake_args_default: '-T ${{ inputs.vs-toolset }} ${{ env.colcon-build-default-cmake-args }}'
251251
cmake_build_type: ${{ matrix.cmake-build-type }}
252252
workspace: ${{ github.workspace }}
253+
workspace_dependencies: ${{ github.workspace }}/install
253254

254255
- name: Colcon test
255256
id: python_test

.github/workflows/ubuntu-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
fastdds-branch:
6060
- '2.14.x'
6161
- '2.13.x'
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-ubuntu-ci.yml
6464
with:
6565
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
@@ -71,6 +71,6 @@ jobs:
7171
ctest-args: ${{ inputs.ctest-args }}
7272
fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref || '1.4.x' }}
7373
fastdds-branch: ${{ inputs.fastdds-branch || matrix.fastdds-branch }}
74-
run-build: ${{ !(github.event_name == 'pull_request') && true || (!contains(github.event.pull_request.labels.*.name, 'skip-ci')) && true || false }}
75-
run-tests: ${{ ((inputs.run-tests == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no-test')) && true || false }}
74+
run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') || false }}
75+
run-tests: ${{ (inputs.run-tests == true) || ((github.event_name == 'pull_request') && (!contains(github.event.pull_request.labels.*.name, 'no-test'))) || false }}
7676
use-ccache: ${{ inputs.use-ccache || false }}

.github/workflows/windows-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
fastdds-branch:
6363
- '2.14.x'
6464
- '2.13.x'
65-
if: ${{ (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'conflicts')) && false || true }}
65+
if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') || false }}
6666
uses: ./.github/workflows/reusable-windows-ci.yml
6767
with:
6868
# It would be desirable to have a matrix of windows OS for this job, but due to the issue opened in this ticket:
@@ -75,5 +75,5 @@ jobs:
7575
ctest-args: ${{ inputs.ctest-args }}
7676
fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref || '1.4.x' }}
7777
fastdds-branch: ${{ inputs.fastdds-branch || matrix.fastdds-branch }}
78-
run-build: ${{ !(github.event_name == 'pull_request') && true || (!contains(github.event.pull_request.labels.*.name, 'skip-ci')) && true || false }}
79-
run-tests: ${{ ((inputs.run-tests == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no-test')) && true || false }}
78+
run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') || false }}
79+
run-tests: ${{ (inputs.run-tests == true) || ((github.event_name == 'pull_request') && (!contains(github.event.pull_request.labels.*.name, 'no-test'))) || false }}

0 commit comments

Comments
 (0)