Avoid running GitHub CI if PR has conflicts (#4489)

* Refs #20486: Avoid running GitHub CI if PR has conflicts Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20486: Add missing job Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> (cherry picked from commit 3ed793c)
eProsima · Mar 1, 2024 · c627c5d · c627c5d
1 parent a0b3633
commit c627c5d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/documentation-tests.yaml b/.github/workflows/documentation-tests.yaml
@@ -34,9 +34,8 @@ env:
 jobs:
   ubuntu-build-and-test-documentation:
     name: Documentation build and test
-
-    if: ${{ !(contains(github.event.pull_request.labels.*.name, 'no-test') ||
-              contains(github.event.pull_request.labels.*.name, 'skip-ci')) }}
+    if: ${{ !(contains(github.event.pull_request.labels.*.name, 'skip-ci') ||
+              contains(github.event.pull_request.labels.*.name, 'conflicts')) }}
 
     runs-on: ubuntu-22.04
     steps:

diff --git a/.github/workflows/mac-ci.yml b/.github/workflows/mac-ci.yml
@@ -44,7 +44,8 @@ concurrency:
 jobs:
   mac-ci:
     uses: ./.github/workflows/reusable-mac-ci.yml
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
+    if: ${{ !(contains(github.event.pull_request.labels.*.name, 'skip-ci') ||
+              contains(github.event.pull_request.labels.*.name, 'conflicts')) }}
     with:
       label: ${{ inputs.label || 'mac-ci' }}
       colcon-args: ${{ inputs.colcon-args }}

diff --git a/.github/workflows/sanitizer-tests.yaml b/.github/workflows/sanitizer-tests.yaml
@@ -26,7 +26,8 @@ jobs:
   asan-test:
 
     if: ${{ !(contains(github.event.pull_request.labels.*.name, 'no-test') ||
-              contains(github.event.pull_request.labels.*.name, 'skip-ci')) }}
+              contains(github.event.pull_request.labels.*.name, 'skip-ci') ||
+              contains(github.event.pull_request.labels.*.name, 'conflicts')) }}
 
     runs-on: ubuntu-22.04
 
@@ -113,7 +114,8 @@ jobs:
   asan-discovery-server-test:
 
     if: ${{ !(contains(github.event.pull_request.labels.*.name, 'no-test') ||
-              contains(github.event.pull_request.labels.*.name, 'skip-ci')) }}
+              contains(github.event.pull_request.labels.*.name, 'skip-ci') ||
+              contains(github.event.pull_request.labels.*.name, 'conflicts')) }}
 
     runs-on: ubuntu-22.04
 

diff --git a/.github/workflows/thread-sanitizer.yaml b/.github/workflows/thread-sanitizer.yaml
@@ -41,7 +41,8 @@ jobs:
     name: Sanitizer Evaluation
 
     if: ${{ !(contains(github.event.pull_request.labels.*.name, 'no-test') ||
-              contains(github.event.pull_request.labels.*.name, 'skip-ci')) }}
+              contains(github.event.pull_request.labels.*.name, 'skip-ci') ||
+              contains(github.event.pull_request.labels.*.name, 'conflicts')) }}
 
     runs-on: ubuntu-22.04
 

diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
@@ -44,7 +44,8 @@ concurrency:
 jobs:
   windows-ci:
     uses: ./.github/workflows/reusable-windows-ci.yml
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
+    if: ${{ !(contains(github.event.pull_request.labels.*.name, 'skip-ci') ||
+              contains(github.event.pull_request.labels.*.name, 'conflicts')) }}
     with:
       label: ${{ inputs.label || 'windows-ci' }}
       colcon-args: ${{ inputs.colcon-args }}