Skip to content

Commit ab074ae

Browse files
committed
Refs #21228: Add if conflicts check in PR trigger to avoid passing required CI
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
1 parent 8448736 commit ab074ae

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

.github/workflows/ubuntu-ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +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 || true }}
5657
uses: ./.github/workflows/reusable-ubuntu-ci.yml
5758
with:
5859
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
@@ -64,6 +65,6 @@ jobs:
6465
ctest-args: ${{ inputs.ctest-args }}
6566
fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref || 'main' }}
6667
fastdds-branch: ${{ inputs.fastdds-branch || 'master' }}
67-
run-build: ${{ !(github.event_name == 'pull_request') && true || (!contains(github.event.pull_request.labels.*.name, 'skip-ci') && !contains(github.event.pull_request.labels.*.name, 'conflicts')) && true || false }}
68+
run-build: ${{ !(github.event_name == 'pull_request') && true || (!contains(github.event.pull_request.labels.*.name, 'skip-ci')) && true || false }}
6869
run-tests: ${{ ((inputs.run-tests == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no-test')) && true || false }}
6970
use-ccache: ${{ inputs.use-ccache || false }}

.github/workflows/windows-ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +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 || true }}
5657
uses: ./.github/workflows/reusable-windows-ci.yml
5758
with:
5859
# It would be desirable to have a matrix of windows OS for this job, but due to the issue opened in this ticket:
@@ -65,5 +66,5 @@ jobs:
6566
ctest-args: ${{ inputs.ctest-args }}
6667
fastdds-python-branch: ${{ inputs.fastdds-python-branch || github.ref || 'main' }}
6768
fastdds-branch: ${{ inputs.fastdds-branch || 'master' }}
68-
run-build: ${{ !(github.event_name == 'pull_request') && true || (!contains(github.event.pull_request.labels.*.name, 'skip-ci') && !contains(github.event.pull_request.labels.*.name, 'conflicts')) && true || false }}
69+
run-build: ${{ !(github.event_name == 'pull_request') && true || (!contains(github.event.pull_request.labels.*.name, 'skip-ci')) && true || false }}
6970
run-tests: ${{ ((inputs.run-tests == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no-test')) && true || false }}

0 commit comments

Comments
 (0)