feat: pr4 squash and merge (#5)

merico-dev · Aug 11, 2023 · 51e0703 · 51e0703
1 parent 962b844
commit 51e0703
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git 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
diff --git a/pr4-squash b/pr4-squash
@@ -0,0 +1 @@
+pr4 for squash and merge