diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9f84d346a5a..2ad165cca4e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,9 +19,9 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v4 with: - node-version: "14.x" + node-version-file: ".nvmrc" - run: npm install -g yarn@^1.19.0 && yarn install - name: Check formatting with prettier diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9fcea52b7a1..3728b1f2ced 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -7,9 +7,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v4 with: - node-version: "14.x" + node-version-file: ".nvmrc" - uses: google-github-actions/setup-gcloud@v0.2.1 with: service_account_key: ${{ secrets.GCP_CREDENTIALS }} diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml index cac8a87486c..2a0a5a9edae 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/npm-publish.yml @@ -33,10 +33,10 @@ jobs: - name: Set up Node.js for NPM if: steps.detect.outputs.previous-version != steps.detect.outputs.current-version - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: registry-url: "https://registry.npmjs.org" - node-version: "14.x" + node-version-file: ".nvmrc" - name: Install yarn if: steps.detect.outputs.previous-version != steps.detect.outputs.current-version diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 00000000000..2ab3d4be550 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +v16.20.2 diff --git a/buildprocess/ci-deploy.sh b/buildprocess/ci-deploy.sh index 06ff60bc1b0..17853023a67 100644 --- a/buildprocess/ci-deploy.sh +++ b/buildprocess/ci-deploy.sh @@ -18,8 +18,8 @@ gh api /repos/${GITHUB_REPOSITORY}/statuses/${GITHUB_SHA} -f state=pending -f co # Install some tools we need from npm npm install -g https://github.com/terriajs/sync-dependencies -npm install request@^2.83.0 npm install -g yarn@^1.19.0 +yarn add -W request@2.83.0 # Clone and build TerriaMap, using this version of TerriaJS TERRIAJS_COMMIT_HASH=$(git rev-parse HEAD) diff --git a/doc/customizing/cloning-and-building.md b/doc/customizing/cloning-and-building.md index 133711c5a01..a80078559dd 100644 --- a/doc/customizing/cloning-and-building.md +++ b/doc/customizing/cloning-and-building.md @@ -21,8 +21,8 @@ If you run into trouble or want more explanation, read on. TerriaJS can be built and run on almost any macOS, Linux, or Windows system. The following are required to build TerriaJS: - The Bash command shell. On macOS or Linux you almost certainly already have this. On Windows, you can easily get it by installing [Git for Windows](https://gitforwindows.org/). In the instructions below, we assume you're using a Bash command prompt. -- [Node.js](https://nodejs.org) v14.0 or later. You can check your node version by running `node --version` on the command-line. -- [npm](https://www.npmjs.com/) v6.0 or later. npm is usually installed automatically alongside the above. You can check your npm version by running `npm --version`. +- [Node.js](https://nodejs.org) v16.0. You can check your node version by running `node --version` on the command-line. +- [npm](https://www.npmjs.com/) v8.0. npm is usually installed automatically alongside the above. You can check your npm version by running `npm --version`. - [yarn](https://yarnpkg.com/) v1.19.0 or later. This can be installed using `npm install -g yarn@^1.19.0` ### Cloning TerriaMap diff --git a/package.json b/package.json index ae540de8108..e81c7cfd621 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "Geospatial data visualization platform.", "license": "Apache-2.0", "engines": { - "node": ">= 14.0.0" + "node": ">= 16.0.0" }, "repository": { "type": "git",