Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: fix syntax error #116

Merged
merged 5 commits into from
Mar 13, 2024
+7 −5
Merged

ci: fix syntax error #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c670fc0
ci: fix syntax error
dsanders11 Mar 13, 2024
5764288
ci: bump node-orb version
dsanders11 Mar 13, 2024
0251aee
ci: exclude macOS Node.js 14.21
dsanders11 Mar 13, 2024
d72bf92
ci: always install Rosetta on macOS
dsanders11 Mar 13, 2024
f7b8390
test: bump timeout
dsanders11 Mar 13, 2024
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
10 changes: 6 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1

orbs:
cfa: continuousauth/npm@2.1.0
node: electronjs/node@2.1.0
node: electronjs/node@2.2.1

jobs:
test:
Expand Down Expand Up @@ -65,11 +65,11 @@ workflows:
- test:
name: test-<< matrix.executor >>-<< matrix.node-version >>
pre-steps:
# rc-edit.exe does not support arm64
- when:
condition:
and:
- equal: [ node/macos, << matrix.executor >> ]
- equal: [ '14.16', << matrix.node-version >> ]
steps:
- node/install-rosetta
matrix:
Expand All @@ -83,8 +83,10 @@ workflows:
- '20.9'
- '18.17'
- '16.20'
# Stay below 14.17.0 or nvm tries to download arm64 artifacts which don't exist
- '14.16'd
- '14.21'
exclude:
- executor: node/macos
node-version: '14.21'
- cfa/release:
requires:
- test
Expand Down
2 changes: 1 addition & 1 deletion test/rcedit-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ async function assertRceditError (exePath, options, messages) {
}

describe('async rcedit(exePath, options)', function () {
this.timeout(60000)
this.timeout(90000)

let exePath = null
let tempPath = null
Expand Down