Skip to content

Commit fcd7454

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

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
@@ -53,7 +53,7 @@ concurrency:
5353

5454
jobs:
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:
@@ -63,8 +63,8 @@ jobs:
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 }}

.github/workflows/windows-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ concurrency:
5353

5454
jobs:
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:
@@ -64,7 +64,7 @@ jobs:
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'))) }}

0 commit comments

Comments
 (0)