From 113eadf398ba95312518a74132f4380ae24082e2 Mon Sep 17 00:00:00 2001
From: Ar-Ray <67567093+Ar-Ray-code@users.noreply.github.com>
Date: Mon, 12 Aug 2024 11:07:50 +0900
Subject: [PATCH] fix ci

---
 .github/workflows/ci_iron.yml  | 5 +++--
 .github/workflows/ci_jazzy.yml | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci_iron.yml b/.github/workflows/ci_iron.yml
index 86ddaca..ac61208 100644
--- 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
index e4288bf..2e54293 100644
--- 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