diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2021-10-01 15:51:57 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2021-10-01 15:51:57 +0200 |
| commit | 11806868351c2024e3e0b8fee9c8a6b44fd39f10 (patch) | |
| tree | 89cbc1726d872093b2b83b57ad9931cc98af8aca | |
| parent | 7feeb5252d8f76ca7823b2e7f8c340e8a7e802e7 (diff) | |
| parent | 809e96cbe6f8d41c2dd06048e8afab9d4dd55b68 (diff) | |
| download | mullvadvpn-11806868351c2024e3e0b8fee9c8a6b44fd39f10.tar.xz mullvadvpn-11806868351c2024e3e0b8fee9c8a6b44fd39f10.zip | |
Merge branch 'use-nvmrc'
| -rw-r--r-- | .github/workflows/frontend.yml | 2 | ||||
| -rw-r--r-- | .nvmrc | 1 | ||||
| -rw-r--r-- | README.md | 10 | ||||
| -rwxr-xr-x | ci/buildserver-build.sh | 5 |
4 files changed, 14 insertions, 4 deletions
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index d3a8bc6748..e8fcd2b348 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -25,7 +25,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v2.1.5 with: - node-version: '14' + node-version: '16.5' - name: Update NPM run: npm i -g npm diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000000..28ebe8b4db --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +16.5.0 @@ -265,8 +265,14 @@ storePassword = keystore-password 1. *This can be skipped for Android builds*. - Get the latest version 16 release of Node.js and the latest version of npm. After installing - Node.js the latest version of npm can be installed by running: + Get the latest version 16 release of Node.js and the latest version of npm. The Node.js version + is specified in `.nvmrc` and can be installed by running the following from any directory within + this repository: + ``` + nvm install --latest-npm + ``` + + If installing Node.js manually then the latest version of npm can be installed by running: ``` npm install -g npm ``` diff --git a/ci/buildserver-build.sh b/ci/buildserver-build.sh index 84d303a1ef..802a45ddc0 100755 --- a/ci/buildserver-build.sh +++ b/ci/buildserver-build.sh @@ -101,8 +101,11 @@ build_ref() { git submodule update git clean -df - # Make sure we have the latest Rust toolchain before the build + # Make sure we have the latest Rust and Node toolchains before the build rustup update + if command -v nvm > /dev/null; then + nvm install --latest-npm + fi ./build.sh || return 0 case "$(uname -s)" in |