File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree 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 }}
56+ if : ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }}
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:
6363 colcon-args : ${{ inputs.colcon-args }}
6464 cmake-args : ${{ inputs.cmake-args }}
6565 ctest-args : ${{ inputs.ctest-args }}
66- fastdds-python-branch : ${{ inputs.fastdds-python-branch || github.ref || 'main' }}
66+ fastdds-python-branch : ${{ inputs.fastdds-python-branch || github.ref }}
6767 fastdds-branch : ${{ inputs.fastdds-branch || 'master' }}
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 }}
68+ run-build : ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
69+ run-tests : ${{ (inputs.run-tests == true) || ((github.event_name == 'pull_request') && (!contains(github.event.pull_request.labels.*.name, 'no-test'))) }}
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 }}
56+ if : ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }}
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:
6464 colcon-args : ${{ inputs.colcon-args }}
6565 cmake-args : ${{ inputs.cmake-args }}
6666 ctest-args : ${{ inputs.ctest-args }}
67- fastdds-python-branch : ${{ inputs.fastdds-python-branch || github.ref || 'main' }}
67+ fastdds-python-branch : ${{ inputs.fastdds-python-branch || github.ref }}
6868 fastdds-branch : ${{ inputs.fastdds-branch || 'master' }}
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 }}
69+ run-build : ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
70+ run-tests : ${{ (inputs.run-tests == true) || ((github.event_name == 'pull_request') && (!contains(github.event.pull_request.labels.*.name, 'no-test'))) }}
You can’t perform that action at this time.
0 commit comments