From 83bd68d599534fa7c35bcd47ce7cd9629c82a255 Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Tue, 21 Nov 2023 18:52:16 +0000 Subject: [PATCH 1/2] chore: bump electronjs/node in .circleci/config.yml to 2.1.0 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9c5d7c8..7e18283 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@1.4.1 + node: electronjs/node@2.1.0 workflows: test_and_release: From e9eee9aac2536a4167e10b73305e6e6e5579cc4b Mon Sep 17 00:00:00 2001 From: George Xu Date: Tue, 21 Nov 2023 17:31:39 -0800 Subject: [PATCH 2/2] build: add install-rosetta step --- .circleci/config.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7e18283..d983135 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,16 +9,23 @@ workflows: # Run the test jobs first, then the release only when all the test jobs are successful jobs: - node/test: + pre-steps: + - when: + condition: + - equal: [ '14.16', << matrix.node-version >> ] + steps: + - node/install-rosetta executor: node/macos name: test-mac-<< matrix.node-version >> matrix: alias: test-mac parameters: node-version: - - '20.5' + - '20.9' - '18.17' - '16.20' - - '14.21' + # Stay below 14.17.0 or nvm tries to download arm64 artifacts which don't exist + - '14.16' - cfa/release: requires: - test-mac