Skip to content
This repository has been archived by the owner on Oct 25, 2024. It is now read-only.

Use macos-13 image for GitHub Actions on macOS. #610

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: Continuous Integration
permissions: read-all

on: [push, pull_request]
on: [push, merge_group, pull_request]

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v2
with:
node-version: "20"
Expand All @@ -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`"
Expand All @@ -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 }}
Expand Down
19 changes: 18 additions & 1 deletion test/unit/config/run_matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,24 @@
"os": [
"ubuntu-latest",
"windows-latest",
"macos-latest"
"macos-13"
],
"browser": [
"ChromeWithFlags",
"FirefoxWithFlags"
],
"include": [
{
"os": "windows-latest",
"browser": "EdgeWithFlags"
}
]
},
"merge_group": {
"os": [
"ubuntu-latest",
"windows-latest",
"macos-13"
],
"browser": [
"ChromeWithFlags",
Expand Down
Loading