diff --git a/.evergreen.yml b/.evergreen.yml index 6a97e51..09548f0 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -5,17 +5,6 @@ functions: - command: git.get_project params: directory: src - install_node: - - command: shell.exec - params: - working_dir: src - shell: bash - script: | - set -e - set -x - - export NODE_VERSION=16.19.0 - bash .evergreen/install-node.sh install: - command: shell.exec params: @@ -25,7 +14,7 @@ functions: set -e set -x - . .evergreen/use-node.sh + export PATH=/opt/devtools/node16/bin:$PATH npm ci check: - command: shell.exec @@ -36,7 +25,7 @@ functions: set -e set -x - . .evergreen/use-node.sh + export PATH=/opt/devtools/node16/bin:$PATH npm run compile npm run check test: @@ -60,7 +49,7 @@ functions: # just keeps timing out. if echo "${distro_id}" | grep -q ubuntu; then export SKIP_REGULAR_BROWSER_TESTING=true; fi - . .evergreen/use-node.sh + export PATH=/opt/devtools/node16/bin:$PATH npm run test-ci test_electron: - command: shell.exec @@ -77,26 +66,23 @@ functions: set -e set -x - . .evergreen/use-node.sh + export PATH=/opt/devtools/node16/bin:$PATH npm run test-electron tasks: - name: test commands: - func: checkout - - func: install_node - func: install - func: test - name: test_electron commands: - func: checkout - - func: install_node - func: install - func: test_electron - name: check commands: - func: checkout - - func: install_node - func: install - func: check diff --git a/.evergreen/install-node.sh b/.evergreen/install-node.sh deleted file mode 100644 index 8a35449..0000000 --- a/.evergreen/install-node.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -# adapted from the Node.js driver's script for installing Node.js -set -e -set -x - -export BASEDIR="$PWD" -mkdir -p .deps -cd .deps - -NVM_URL="https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh" - -# this needs to be explicitly exported for the nvm install below -export NVM_DIR="$PWD/nvm" -export XDG_CONFIG_HOME=$PWD - -# install Node.js on Windows -if [[ "$OS" == "Windows_NT" ]]; then - curl -o node.zip "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-win-x64.zip" - unzip node.zip - mkdir -p node/bin - mv -v node-v$NODE_VERSION-win-x64/* node/bin - chmod a+x node/bin/* - export PATH="$PWD/node/bin:$PATH" -# install Node.js on Linux/MacOS -else - curl -o- $NVM_URL | bash - set +x - [ -s "${NVM_DIR}/nvm.sh" ] && source "${NVM_DIR}/nvm.sh" - nvm install --no-progress "$NODE_VERSION" -fi - -which node && node -v || echo "node not found, PATH=$PATH" -which npm && npm -v || echo "npm not found, PATH=$PATH" diff --git a/.evergreen/use-node.sh b/.evergreen/use-node.sh deleted file mode 100644 index b657e8c..0000000 --- a/.evergreen/use-node.sh +++ /dev/null @@ -1,8 +0,0 @@ -if [[ "$OS" == "Windows_NT" ]]; then - export PATH="$PWD/.deps/node/bin:$PATH" -else - export NVM_DIR="$PWD/.deps/nvm" - [ -s "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh" -fi - -echo "updated PATH=$PATH"