Skip to content

Commit

Permalink
ci: fix syntax error (#116)
Browse files Browse the repository at this point in the history
* ci: fix syntax error

* ci: bump node-orb version

* ci: exclude macOS Node.js 14.21

* ci: always install Rosetta on macOS

* test: bump timeout
  • Loading branch information
dsanders11 authored Mar 13, 2024
1 parent eccd354 commit 4db3c5d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
10 changes: 6 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1

orbs:
cfa: continuousauth/[email protected]
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
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

0 comments on commit 4db3c5d

Please sign in to comment.