split merge and push workflows

mozilla · Mar 15, 2024 · 9d20724 · 9d20724
1 parent 67bf133
commit 9d20724
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -0,0 +1,22 @@
+name: Merge
+
+on:
+  merge_group:
+
+jobs:
+  log:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Log event
+        run: |
+          echo "json: ${{ github }}"
+          printenv
+  deploy_staging:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Deploy to staging
+        run: |
+          echo "Deploying to staging"
+          # Your deployment script here
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -1,7 +1,6 @@
 name: Push
 
 on:
-  merge_group:
   push:
     branches:
       - main
@@ -14,20 +13,8 @@ jobs:
         run: |
           echo "json: ${{ github }}"
           printenv
-  deploy_staging:
-    if: ${{ github.event_name == 'merge_group' }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Deploy to staging
-        run: |
-          echo "Deploying to staging"
-          # Your deployment script here
   deploy_production:
-    if: ${{ github.event_name == 'push' }} && ${{ github.ref == 'refs/heads/main' }}
     runs-on: ubuntu-latest
-    needs: deploy_staging
     steps:
       - name: Checkout
         uses: actions/checkout@v2