Skip to content

Commit

Permalink
Merge pull request #76 from catdad/apple-silicon-ci
Browse files Browse the repository at this point in the history
fixing apple silicon ci issues
  • Loading branch information
catdad authored Apr 28, 2024
2 parents 882b1fd + 9211377 commit 5d64879
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ jobs:
os: [macos-latest, windows-latest, ubuntu-latest]
node: [16, 18]
electron: [23, 20]
exclude:
# older electron seems to misbehave on apple silicon
- os: macos-latest
electron: 20
include:
- os: ubuntu-latest
node: 14
Expand All @@ -25,13 +29,13 @@ jobs:
- os: windows-latest
node: 14
electron: 14
- os: macos-latest
- os: ubuntu-latest
node: 14
electron: 12
- os: windows-latest
node: 12
electron: 10
- os: macos-latest
- os: ubuntu-latest
node: 10
electron: 8
runs-on: ${{ matrix.os }}
Expand All @@ -46,7 +50,7 @@ jobs:
- run: npm install
- run: npm install electron@${{ matrix.electron }}
- run: node --version
- run: npx electron --version
- run: npx electron --version || echo well that went poorly
- name: npm test
run: npm run citest

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"fs-extra": "^8.1.0",
"mocha": "^6.2.2",
"node-stream": "^1.7.0",
"retry-cli": "^0.7.0",
"retry-cli": "0.6.0",
"symlink-dir": "^3.1.1",
"unstyle": "^0.1.0",
"xvfb-maybe": "^0.2.1"
Expand Down

0 comments on commit 5d64879

Please sign in to comment.