Skip to content

Commit 75af025

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

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/ubuntu-ci.yml

Lines changed: 3 additions & 3 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,7 +63,7 @@ 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 || '1.0.x' }}
66+
fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref }}
6767
fastdds-branch: ${{ inputs.fastdds-branch || '2.6.x' }}
68-
run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') || false }}
68+
run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
6969
run-tests: ${{ (inputs.run-tests == true) || false }}

.github/workflows/windows-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
vs-toolset:
6060
- 'v141'
6161
- 'v142'
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-windows-ci.yml
6464
with:
6565
# It would be desirable to have a matrix of windows OS for this job, but due to the issue opened in this ticket:
@@ -70,7 +70,7 @@ jobs:
7070
colcon-args: ${{ inputs.colcon-args }}
7171
cmake-args: ${{ inputs.cmake-args }}
7272
ctest-args: ${{ inputs.ctest-args }}
73-
fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref || '1.0.x' }}
73+
fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref }}
7474
fastdds-branch: ${{ inputs.fastdds-branch ||'2.6.x' }}
7575
run-build: false
7676
run-tests: ${{ ((inputs.run-tests == true) && true) || false }}

0 commit comments

Comments
 (0)