From c694bcc5bba7428e09b90071495de231fbf4c466 Mon Sep 17 00:00:00 2001 From: swa07016 Date: Thu, 14 Dec 2023 18:16:15 +0900 Subject: [PATCH] =?UTF-8?q?:construction=5Fworker:=20Ci:=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev_deploy.yml | 4 +++- .github/workflows/release_deploy.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index a373d23..17a9c4e 100644 --- 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 index 8276502..ffce140 100644 --- 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: