Merge pull request #646 from peer-42seoul/wochae-patch-2

[Fix] : 배포 지정 대상 수정 #643
peer-42seoul · Jan 19, 2024 · 4084ec3 · 4084ec3
2 parents 1308056 + 1f56988
commit 4084ec3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
@@ -49,7 +49,7 @@ jobs:
       run: ./gradlew test
 
   deploy-dev:
-    if: (github.event_name == 'repository_dispatch' && github.event.action == 'resources_update') || (github.ref == 'refs/heads/dev' && (github.event.pull_request.merged == true || github.event_name == 'push'))
+    if: (github.ref == 'refs/heads/dev' && (github.event.pull_request.merged == true || github.event_name == 'push'))
     needs: build
     runs-on: ubuntu-latest
 

diff --git a/.github/workflows/test_ci_cd.yml b/.github/workflows/test_ci_cd.yml
@@ -7,7 +7,7 @@ on:
   pull_request:
     branches: [ "main", "dev" ]
     types: [ "opened", "reopened", "synchronize", "closed" ]
-  # workflow_call:
+
 
 permissions:
   contents: read
@@ -49,7 +49,7 @@ jobs:
       run: ./gradlew test
 
   deploy-dev:
-    if: github.ref == 'refs/heads/test' && (github.event.pull_request.merged == true || github.event_name == 'push')
+    if: (github.event_name == 'repository_dispatch' && github.event.action == 'resources_update') || (github.ref == 'refs/heads/dev' && (github.event.pull_request.merged == true || github.event_name == 'push'))
     needs: build
     runs-on: ubuntu-latest