Add job to allow only dev branch to be merged to main (#22)

airtai · Apr 16, 2024 · 27f53ff · 27f53ff
1 parent 2fc6982
commit 27f53ff
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/.github/workflows/enforcer.yaml b/.github/workflows/enforcer.yaml
@@ -0,0 +1,15 @@
+name: 'Check Branch'
+
+on:
+  pull_request:
+  merge_group:
+
+jobs:
+  check_branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check branch
+        if: github.base_ref == 'main' && github.head_ref != 'dev'
+        run: |
+          echo "ERROR: You can only merge to main from dev."
+          exit 1
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -96,7 +96,6 @@ jobs:
             GOOGLE_CLIENT_SECRET: ${{ github.ref_name == 'main' && secrets.PROD_GOOGLE_CLIENT_SECRET || secrets.STAGING_GOOGLE_CLIENT_SECRET }}
             ADMIN_EMAILS: ${{ vars.ADMIN_EMAILS }}
 
-            WASP_SERVER_URL: ${{ github.ref_name == 'main' && vars.PROD_WASP_SERVER_URL || vars.STAGING_WASP_SERVER_URL }}
             ADS_SERVER_URL: ${{ github.ref_name == 'main' && vars.PROD_ADS_SERVER_URL || vars.STAGING_ADS_SERVER_URL }}
             BACKEND_DOMAIN: ${{ github.ref_name == 'main' && vars.PROD_BACKEND_DOMAIN || vars.STAGING_BACKEND_DOMAIN }}
             WASP_WEB_CLIENT_URL: ${{ github.ref_name == 'main' && vars.PROD_WASP_WEB_CLIENT_URL || vars.STAGING_WASP_WEB_CLIENT_URL }}