From 4db3c5d73f38ccff66b985d83eb0fc2f5e52ddaf Mon Sep 17 00:00:00 2001 From: David Sanders Date: Tue, 12 Mar 2024 19:48:00 -0700 Subject: [PATCH] ci: fix syntax error (#116) * 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 --- .circleci/config.yml | 10 ++++++---- test/rcedit-test.js | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5377e96..9368ab0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: @@ -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: @@ -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 diff --git a/test/rcedit-test.js b/test/rcedit-test.js index 67f215b..275de26 100644 --- a/test/rcedit-test.js +++ b/test/rcedit-test.js @@ -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