From 321c72d2961e7734d157f8f88efbf89891fe5e8b Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 17:59:28 -0700 Subject: [PATCH] chore: bump electronjs/node to 2.3.0 (main) (#3596) Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Erik Moura Co-authored-by: David Sanders Co-authored-by: Erick Zhao --- .circleci/config.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c1e1e2fa73..286a6ff8ed 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,14 +1,14 @@ version: 2.1 orbs: - node: electronjs/node@2.2.1 + node: electronjs/node@2.3.0 commands: install: steps: - run: git config --global core.autocrlf input - node/install: - node-version: '18.15.0' + node-version: '18.20.3' - checkout run-lint-and-build: steps: @@ -67,6 +67,17 @@ jobs: executor: << parameters.executor >> steps: - install + - when: + condition: + equal: [node/windows, << parameters.executor >>] + steps: + - run: + name: Windows Setup + shell: bash + command: | + pip install setuptools + cd 'C:\Program Files\nodejs\node_modules\npm\node_modules\@npmcli\run-script' + npm install node-gyp@9.4.0 - when: condition: equal: [node/linux, << parameters.executor >>] @@ -108,6 +119,7 @@ jobs: name: Windows Setup shell: bash command: | + pip install setuptools choco install --no-progress -y wixtoolset --version=3.14.0 echo 'export PATH=$PATH:"/C/Program Files (x86)/WiX Toolset v3.14/bin"' >> "$BASH_ENV" cd 'C:\Program Files\nodejs\node_modules\npm\node_modules\@npmcli\run-script'