summaryrefslogtreecommitdiffhomepage
path: root/ci
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2021-10-01 15:51:57 +0200
committerOskar Nyberg <oskar@mullvad.net>2021-10-01 15:51:57 +0200
commit11806868351c2024e3e0b8fee9c8a6b44fd39f10 (patch)
tree89cbc1726d872093b2b83b57ad9931cc98af8aca /ci
parent7feeb5252d8f76ca7823b2e7f8c340e8a7e802e7 (diff)
parent809e96cbe6f8d41c2dd06048e8afab9d4dd55b68 (diff)
downloadmullvadvpn-11806868351c2024e3e0b8fee9c8a6b44fd39f10.tar.xz
mullvadvpn-11806868351c2024e3e0b8fee9c8a6b44fd39f10.zip
Merge branch 'use-nvmrc'
Diffstat (limited to 'ci')
-rwxr-xr-xci/buildserver-build.sh5
1 files changed, 4 insertions, 1 deletions
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