From d493ec35f36835fd569be25f1e71103496360158 Mon Sep 17 00:00:00 2001
From: goodov <5928869+goodov@users.noreply.github.com>
Date: Wed, 24 Jul 2024 20:06:56 +0700
Subject: [PATCH] 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:
https://github.com/brave/brave-variations/pull/1136
---
 .github/workflows/generate-test-seed.yml | 2 +-
 .github/workflows/test-src.yml           | 5 ++---
 .github/workflows/test.yml               | 4 +---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/generate-test-seed.yml b/.github/workflows/generate-test-seed.yml
index 3afacec5..ddbae174 100644
--- 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
index 48a205e6..0d296512 100644
--- 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
index 1da1a67e..0c1b4af8 100644
--- 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: