Skip to content

Commit ef43b62

Browse files
committed
Refs #21228: Apply rev suggestions
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
1 parent c990530 commit ef43b62

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/ubuntu-ci.yml

Lines changed: 4 additions & 4 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 }}
62+
if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }}
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:
@@ -69,8 +69,8 @@ jobs:
6969
colcon-args: ${{ inputs.colcon-args }}
7070
cmake-args: ${{ inputs.cmake-args }}
7171
ctest-args: ${{ inputs.ctest-args }}
72-
fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref || '1.4.x' }}
72+
fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref }}
7373
fastdds-branch: ${{ inputs.fastdds-branch || matrix.fastdds-branch }}
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 }}
74+
run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
75+
run-tests: ${{ (inputs.run-tests == true) || ((github.event_name == 'pull_request') && (!contains(github.event.pull_request.labels.*.name, 'no-test'))) }}
7676
use-ccache: ${{ inputs.use-ccache || false }}

.github/workflows/windows-ci.yml

Lines changed: 4 additions & 4 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 }}
65+
if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }}
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:
@@ -73,7 +73,7 @@ jobs:
7373
colcon-args: ${{ inputs.colcon-args }}
7474
cmake-args: ${{ inputs.cmake-args }}
7575
ctest-args: ${{ inputs.ctest-args }}
76-
fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref || '1.4.x' }}
76+
fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref }}
7777
fastdds-branch: ${{ inputs.fastdds-branch || matrix.fastdds-branch }}
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 }}
78+
run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
79+
run-tests: ${{ (inputs.run-tests == true) || ((github.event_name == 'pull_request') && (!contains(github.event.pull_request.labels.*.name, 'no-test'))) }}

0 commit comments

Comments
 (0)