From 263414401d03aa9ca2b7f573ad49dbb7b228e66b Mon Sep 17 00:00:00 2001 From: David Sanders Date: Sun, 21 Jan 2024 17:37:19 -0800 Subject: [PATCH] ci: use x86_64 Node.js for some macOS jobs (#1533) --- .circleci/config.yml | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a1c129963b..57a0ea27ee 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,9 +5,15 @@ orbs: commands: install: + parameters: + arch: + type: enum + enum: ['', 'arm64', 'x86_64'] + default: '' steps: - run: git config --global core.autocrlf input - node/install: + arch: << parameters.arch >> node-version: '18.17' - checkout - node/install-packages @@ -40,7 +46,19 @@ jobs: enum: [ 'x64', 'arm64' ] executor: node/macos steps: - - install + - when: + condition: + equal: ['x64', << parameters.arch >>] + steps: + - node/install-rosetta + - install: + arch: 'x86_64' + - when: + condition: + not: + equal: ['x64', << parameters.arch >>] + steps: + - install - test win-test: parameters: @@ -67,7 +85,19 @@ jobs: enum: [ 'x64', 'arm64' ] executor: node/macos steps: - - install + - when: + condition: + equal: ['x64', << parameters.arch >>] + steps: + - node/install-rosetta + - install: + arch: 'x86_64' + - when: + condition: + not: + equal: ['x64', << parameters.arch >>] + steps: + - install - run: chmod +x tools/add-macos-cert.sh && . ./tools/add-macos-cert.sh - run: npx yarn run publish --arch=<< parameters.arch >> --dry-run - store_artifacts: