Support merge queue in main branch. (#1138)

These are required fixes to enable the merge queue in some minimal form. Tested in staging branch here: #1136
brave · Jul 24, 2024 · d493ec3 · d493ec3
1 parent 3c8034f
commit d493ec3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/generate-test-seed.yml b/.github/workflows/generate-test-seed.yml
@@ -59,7 +59,7 @@ jobs:
 
       - name: Lint
         run: |
-          npm run lint -- --base origin/${{ github.event.pull_request.base.ref }}
+          npm run lint -- --base ${{ github.event.pull_request.base.sha }}
 
       - name: Generate seed
         run: |

diff --git a/.github/workflows/test-src.yml b/.github/workflows/test-src.yml
@@ -2,8 +2,7 @@ name: Tracker&Griffin tests
 
 on:
   pull_request:
-    branches: [main, production]
-  workflow_dispatch:
+  merge_group:
 
 jobs:
   build:
@@ -26,4 +25,4 @@ jobs:
         run: npm run test
 
       - name: lint
-        run: npm run lint -- --base origin/${{ github.event.pull_request.base.ref }}
+        run: npm run lint -- --base ${{ github.event.pull_request.base.sha || github.event.merge_group.base_sha }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,10 +1,8 @@
 name: Test
 
 on:
-  push:
-    branches: [main, production]
   pull_request:
-    branches: [main, production]
+  merge_group:
 
 jobs:
   test: