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

👷 Ci: 스크립트 수정
Team-Shaka · Dec 14, 2023 · db12046 · db12046
2 parents bb991e7 + c694bcc
commit db12046
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
@@ -14,7 +14,9 @@ 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 && github.base_ref == 'develop')
+    if: >
+      (github.event_name == 'push' && github.ref == 'refs/heads/develop') ||
+      (github.event_name == 'pull_request' && github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'develop')
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/release_deploy.yml b/.github/workflows/release_deploy.yml
@@ -14,7 +14,9 @@ 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 && github.base_ref == 'release')
+    if: >
+      (github.event_name == 'push' && github.ref == 'refs/heads/release') ||
+      (github.event_name == 'pull_request' && github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'release')
 
 
     steps: