diff --git a/.github/workflows/reusable-ubuntu-ci.yml b/.github/workflows/reusable-ubuntu-ci.yml index 538ab720..8c40f5d9 100644 --- a/.github/workflows/reusable-ubuntu-ci.yml +++ b/.github/workflows/reusable-ubuntu-ci.yml @@ -197,10 +197,12 @@ jobs: with: colcon_meta_file: ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/build.meta ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/ubuntu_test.meta colcon_build_args: ${{ inputs.colcon-args }} + colcon_build_args_default: '--packages-select fastdds_python' cmake_args: ${{ inputs.cmake-args }} cmake_args_default: '' cmake_build_type: ${{ matrix.cmake-build-type }} workspace: ${{ github.workspace }} + workspace_dependencies: ${{ github.workspace }}/install - name: Colcon test id: python_test diff --git a/.github/workflows/reusable-windows-ci.yml b/.github/workflows/reusable-windows-ci.yml index 101aefa3..64131049 100644 --- a/.github/workflows/reusable-windows-ci.yml +++ b/.github/workflows/reusable-windows-ci.yml @@ -243,11 +243,12 @@ jobs: with: colcon_meta_file: ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/build_test.meta colcon_build_args: ${{ inputs.colcon-args }} - colcon_build_args_default: --event-handlers console_direct+ + colcon_build_args_default: '--event-handlers console_direct+ --packages-select fastdds_python' cmake_args: ${{ inputs.cmake-args }} cmake_args_default: '-T ${{ inputs.vs-toolset }} ${{ env.colcon-build-default-cmake-args }}' cmake_build_type: ${{ matrix.cmake-build-type }} workspace: ${{ github.workspace }} + workspace_dependencies: ${{ github.workspace }}/install - name: Colcon test id: python_test diff --git a/.github/workflows/ubuntu-ci.yml b/.github/workflows/ubuntu-ci.yml index 179ea8fc..95551f00 100644 --- a/.github/workflows/ubuntu-ci.yml +++ b/.github/workflows/ubuntu-ci.yml @@ -53,7 +53,7 @@ concurrency: jobs: ubuntu-ci: - if: ${{ (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'conflicts')) && false || true }} + if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') || false }} uses: ./.github/workflows/reusable-ubuntu-ci.yml with: # It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket: @@ -65,6 +65,6 @@ jobs: ctest-args: ${{ inputs.ctest-args }} fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref || '1.2.x' }} fastdds-branch: ${{ inputs.fastdds-branch || '2.10.x' }} - run-build: ${{ !(github.event_name == 'pull_request') && true || (!contains(github.event.pull_request.labels.*.name, 'skip-ci')) && true || false }} - run-tests: ${{ ((inputs.run-tests == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no-test')) && true || false }} + run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') || false }} + run-tests: ${{ (inputs.run-tests == true) || ((github.event_name == 'pull_request') && (!contains(github.event.pull_request.labels.*.name, 'no-test'))) || false }} use-ccache: ${{ inputs.use-ccache || false }} diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index c4460f3b..c87550a6 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -59,7 +59,7 @@ jobs: vs-toolset: - 'v141' - 'v142' - if: ${{ (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'conflicts')) && false || true }} + if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') || false }} uses: ./.github/workflows/reusable-windows-ci.yml with: # It would be desirable to have a matrix of windows OS for this job, but due to the issue opened in this ticket: @@ -72,5 +72,5 @@ jobs: ctest-args: ${{ inputs.ctest-args }} fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref || '1.2.x' }} fastdds-branch: ${{ inputs.fastdds-branch || '2.10.x' }} - run-build: ${{ !(github.event_name == 'pull_request') && true || (!contains(github.event.pull_request.labels.*.name, 'skip-ci')) && true || false }} - run-tests: ${{ ((inputs.run-tests == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no-test')) && true || false }} + run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') || false }} + run-tests: ${{ (inputs.run-tests == true) || ((github.event_name == 'pull_request') && (!contains(github.event.pull_request.labels.*.name, 'no-test'))) || false }}