Merge pull request #113 from Team-Shaka/ci/112

💚 Ci: PR 머지시점에 액션 1개만 돌도록 수정
Team-Shaka · Dec 14, 2023 · 984e62a · 984e62a
2 parents c855efe + 59808ce
commit 984e62a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest # (3).OS환경
-    if: (github.event_name == 'push' && github.ref == 'refs/heads/develop') || (github.event.pull_request && github.event.pull_request.merged == true)
+    if: (github.event_name == 'push' && github.ref == 'refs/heads/develop') || (github.event.pull_request && github.event.pull_request.merged == true && github.base_ref == 'develop')
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/release_deploy.yml b/.github/workflows/release_deploy.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest # (3).OS환경
-    if: (github.event_name == 'push' && github.ref == 'refs/heads/release') || (github.event.pull_request && github.event.pull_request.merged == true)
+    if: (github.event_name == 'push' && github.ref == 'refs/heads/release') || (github.event.pull_request && github.event.pull_request.merged == true && github.base_ref == 'release')
 
 
     steps:
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ on: @@
     jobs:
       build:
         runs-on: ubuntu-latest # (3).OS환경
-        if: (github.event_name == 'push' && github.ref == 'refs/heads/release') || (github.event.pull_request && github.event.pull_request.merged == true)
+        if: (github.event_name == 'push' && github.ref == 'refs/heads/release') || (github.event.pull_request && github.event.pull_request.merged == true && github.base_ref == 'release')
         steps:
@@ Expand Down @@