From 59808cee1db2975cfd6094b6a1df7c1e4bf26e1e Mon Sep 17 00:00:00 2001 From: swa07016 Date: Thu, 14 Dec 2023 17:26:00 +0900 Subject: [PATCH] =?UTF-8?q?:green=5Fheart:=20Ci:=20PR=20=EB=A8=B8=EC=A7=80?= =?UTF-8?q?=EC=8B=9C=EC=A0=90=EC=97=90=20=EC=95=A1=EC=85=98=201=EA=B0=9C?= =?UTF-8?q?=EB=A7=8C=20=EB=8F=8C=EB=8F=84=EB=A1=9D=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 | 2 +- .github/workflows/release_deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index 9ea5484..a5116f1 100644 --- 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 index 25f52d1..448c5da 100644 --- 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: