👷 Ci: 스크립트 변경

Team-Shaka · Dec 14, 2023 · 88f2b54 · 88f2b54
1 parent c694bcc
commit 88f2b54
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
@@ -15,7 +15,7 @@ jobs:
   build:
     runs-on: ubuntu-latest # (3).OS환경
     if: >
-      (github.event_name == 'push' && github.ref == 'refs/heads/develop') ||
+      (github.event_name == 'push' && github.ref == 'refs/heads/develop' && github.event.head_commit.message !~ /Merge pull request #\d+ from .+/) ||
       (github.event_name == 'pull_request' && github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'develop')
 
     steps:

diff --git a/.github/workflows/release_deploy.yml b/.github/workflows/release_deploy.yml
@@ -15,7 +15,7 @@ jobs:
   build:
     runs-on: ubuntu-latest # (3).OS환경
     if: >
-      (github.event_name == 'push' && github.ref == 'refs/heads/release') ||
+      (github.event_name == 'push' && github.ref == 'refs/heads/release' && github.event.head_commit.message !~ /Merge pull request #\d+ from .+/) ||
       (github.event_name == 'pull_request' && github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'release')