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: