File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -195,9 +195,11 @@ jobs:
195195 with :
196196 colcon_meta_file : ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/build.meta ${{ github.workspace }}/src/fastdds_python/.github/workflows/config/ubuntu_test.meta
197197 colcon_build_args : ${{ inputs.colcon-args }}
198+ colcon_build_args_default : ' --packages-select fastdds_python'
198199 cmake_args : ${{ inputs.cmake-args }}
199200 cmake_build_type : ${{ matrix.cmake-build-type }}
200201 workspace : ${{ github.workspace }}
202+ workspace_dependencies : ${{ github.workspace }}/install
201203
202204 - name : Colcon test
203205 id : python_test
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ concurrency:
5353
5454jobs :
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:
6565 ctest-args : ${{ inputs.ctest-args }}
6666 fastdds-python-branch : ${{ inputs.fastdds-python-branch || github.ref || 'main' }}
6767 fastdds-branch : ${{ inputs.fastdds-branch || 'master' }}
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) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no-test')) && 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 }}
7070 use-ccache : ${{ inputs.use-ccache || false }}
Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ concurrency:
5353
5454jobs :
5555 windows-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-windows-ci.yml
5858 with :
5959 # It would be desirable to have a matrix of windows OS for this job, but due to the issue opened in this ticket:
6666 ctest-args : ${{ inputs.ctest-args }}
6767 fastdds-python-branch : ${{ inputs.fastdds-python-branch || github.ref || 'main' }}
6868 fastdds-branch : ${{ inputs.fastdds-branch || 'master' }}
69- run-build : ${{ !(github.event_name == 'pull_request') && true || ( !contains(github.event.pull_request.labels.*.name, 'skip-ci')) && true || false }}
70- run-tests : ${{ (( inputs.run-tests == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no-test')) && true || false }}
69+ run-build : ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') || false }}
70+ run-tests : ${{ (inputs.run-tests == true) || (( github.event_name == 'pull_request') && ( !contains(github.event.pull_request.labels.*.name, 'no-test'))) || false }}
You can’t perform that action at this time.
0 commit comments