fix ci

Ar-Ray-code · Aug 12, 2024 · 113eadf · 113eadf
1 parent 540ac16
commit 113eadf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/ci_iron.yml b/.github/workflows/ci_iron.yml
@@ -11,8 +11,9 @@ jobs:
   ci:
     runs-on: ${{ matrix.os }}
     if: |
-      ((github.event.action == 'labeled') && (github.event.label.name == 'TESTING')) ||
-      ((github.event.action == 'synchronize') && contains(github.event.pull_request.labels.*.name, 'TESTING'))
+      ((github.event.action == 'labeled') && (github.event.label.name == 'TESTING') && (github.base_ref == 'iron' )) ||
+      ((github.event.action == 'synchronize') && (github.base_ref == 'iron') && contains(github.event.pull_request.labels.*.name, 'TESTING')) ||
+      (github.ref_name == 'iron')
     container:
       image: osrf/ros:${{ matrix.ros_distribution }}-desktop
     timeout-minutes: 20

diff --git a/.github/workflows/ci_jazzy.yml b/.github/workflows/ci_jazzy.yml
@@ -11,8 +11,9 @@ jobs:
   ci:
     runs-on: ${{ matrix.os }}
     if: |
-      ((github.event.action == 'labeled') && (github.event.label.name == 'TESTING')) ||
-      ((github.event.action == 'synchronize') && contains(github.event.pull_request.labels.*.name, 'TESTING'))
+      ((github.event.action == 'labeled') && (github.event.label.name == 'TESTING') && (github.base_ref == 'jazzy' )) ||
+      ((github.event.action == 'synchronize') && (github.base_ref == 'jazzy') && contains(github.event.pull_request.labels.*.name, 'TESTING')) ||
+      (github.ref_name == 'jazzy')
     container:
       image: osrf/ros:${{ matrix.ros_distribution }}-desktop
     timeout-minutes: 20