From 38d4367c7fe8f6da9042c186d0a0fd631942999e Mon Sep 17 00:00:00 2001
From: Jianjun Zhu <jianjun.zhu@intel.com>
Date: Mon, 17 Jun 2024 13:57:35 +0800
Subject: [PATCH 1/2] Use macos-13 for GitHub Actions on macOS.

Firefox is not installed by default on macos-latest (macos-14).
---
 .github/workflows/ci.yaml        | 9 ++++++---
 test/unit/config/run_matrix.json | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d8d13a74..2d004051 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -7,7 +7,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v2
         with:
           node-version: "20"
@@ -18,7 +18,7 @@ jobs:
     name: Build matrix for unit test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - id: read-matrix
         name: Read build matrix
         run: echo "::set-output name=matrix::`jq -c . test/unit/config/run_matrix.json`"
@@ -30,11 +30,14 @@ jobs:
     strategy:
       matrix: ${{ fromJSON(needs.build-matrix.outputs.matrix)[github.event_name] }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v2
         with:
           node-version: "20"
       - run: npm install
+      - name: Set Firefox path for macOS
+        if: ${{ runner.os == 'macOS' && matrix.browser == 'FirefoxWithFlags' }}
+        run: echo "FIREFOX_BIN=/Applications/Firefox.app/Contents/MacOS/firefox">> $GITHUB_ENV
       - name: Run test cases
         env:
           BROWSER: ${{ matrix.browser }}
diff --git a/test/unit/config/run_matrix.json b/test/unit/config/run_matrix.json
index d28e14b3..76861da6 100644
--- a/test/unit/config/run_matrix.json
+++ b/test/unit/config/run_matrix.json
@@ -3,7 +3,7 @@
     "os": [
       "ubuntu-latest",
       "windows-latest",
-      "macos-latest"
+      "macos-13"
     ],
     "browser": [
       "ChromeWithFlags",

From 55b8acfc849161e8bce853429124e2dffd66d99a Mon Sep 17 00:00:00 2001
From: Jianjun Zhu <jianjun.zhu@intel.com>
Date: Sun, 23 Jun 2024 17:12:53 +0800
Subject: [PATCH 2/2] Update workflow configuration for merge queue.

---
 .github/workflows/ci.yaml        |  2 +-
 test/unit/config/run_matrix.json | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2d004051..5ef72d36 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,7 +1,7 @@
 name: Continuous Integration
 permissions: read-all
 
-on: [push, pull_request]
+on: [push, merge_group, pull_request]
 
 jobs:
   lint:
diff --git a/test/unit/config/run_matrix.json b/test/unit/config/run_matrix.json
index 76861da6..3eb8bc84 100644
--- a/test/unit/config/run_matrix.json
+++ b/test/unit/config/run_matrix.json
@@ -16,6 +16,23 @@
       }
     ]
   },
+  "merge_group": {
+    "os": [
+      "ubuntu-latest",
+      "windows-latest",
+      "macos-13"
+    ],
+    "browser": [
+      "ChromeWithFlags",
+      "FirefoxWithFlags"
+    ],
+    "include": [
+      {
+        "os": "windows-latest",
+        "browser": "EdgeWithFlags"
+      }
+    ]
+  },
   "pull_request": {
     "os": [
       "ubuntu-latest"