diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b25da3f..77251d5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,15 +1,21 @@ name: production-deploy on: - push: - branches: - - 'main' + # push: + # branches: + # - 'main' + pull_request: + branches: [main] + types: [closed] jobs: deploy: name: deploy to production + if: github.event.pull_request.merged == true runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v3 + with: + ref: 'main' - name: Deploy run: echo Build and Deploy \ No newline at end of file diff --git a/pr4-squash b/pr4-squash new file mode 100644 index 0000000..cbd9a87 --- /dev/null +++ b/pr4-squash @@ -0,0 +1 @@ +pr4 for squash and merge \ No newline at end of file