install-node: Upgrade to Node.js 12.16.1, Yarn 1.22.4, nvm 0.35.3.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg 2020-03-26 18:22:14 -07:00 committed by Tim Abbott
parent 56aadf6503
commit 586f78cb32
2 changed files with 10 additions and 7 deletions

View File

@ -7,8 +7,9 @@ if [ "$TRAVIS" ] ; then
ZULIP_SRV="/home/travis" ZULIP_SRV="/home/travis"
fi fi
YARN_PACKAGE_JSON="$ZULIP_SRV/zulip-yarn/package.json" YARN_PACKAGE_JSON="$ZULIP_SRV/zulip-yarn/package.json"
node_version=12.13.0 node_version=12.16.1
yarn_version=1.19.1 yarn_version=1.22.4
nvm_version=0.35.3
# This is a fix for the fact that nvm uses $HOME to determine which # This is a fix for the fact that nvm uses $HOME to determine which
# user account's home directory to ~/.config to. Ideally, we'd have a # user account's home directory to ~/.config to. Ideally, we'd have a
@ -32,16 +33,18 @@ fi
if [ "$current_node_version" != "v$node_version" ] || ! [ -L "$node_wrapper_path" ]; then if [ "$current_node_version" != "v$node_version" ] || ! [ -L "$node_wrapper_path" ]; then
export NVM_DIR=/usr/local/nvm export NVM_DIR=/usr/local/nvm
if ! [ -e "$NVM_DIR/nvm.sh" ]; then # shellcheck source=/dev/null
if ! [ -e "$NVM_DIR/nvm.sh" ] || { . "$NVM_DIR/nvm.sh"; [ "$(nvm --version)" != "$nvm_version" ]; }; then
mkdir -p "$NVM_DIR"
wget_opts=(-nv) wget_opts=(-nv)
if [ -n "${CUSTOM_CA_CERTIFICATES:-}" ]; then if [ -n "${CUSTOM_CA_CERTIFICATES:-}" ]; then
wget_opts+=(--ca-certificate "${CUSTOM_CA_CERTIFICATES}") wget_opts+=(--ca-certificate "${CUSTOM_CA_CERTIFICATES}")
fi fi
wget "${wget_opts[@]}" -O- https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | bash wget "${wget_opts[@]}" -O- "https://raw.githubusercontent.com/nvm-sh/nvm/v$nvm_version/install.sh" | bash
# shellcheck source=/dev/null
. "$NVM_DIR/nvm.sh"
fi fi
# shellcheck source=/dev/null
source "$NVM_DIR/nvm.sh"
nvm install "$node_version" && nvm alias default "$node_version" nvm install "$node_version" && nvm alias default "$node_version"
NODE_BIN="$(nvm which default)" NODE_BIN="$(nvm which default)"

View File

@ -26,4 +26,4 @@ LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2019/12/13/zulip-2-1-relea
# historical commits sharing the same major version, in which case a # historical commits sharing the same major version, in which case a
# minor version bump suffices. # minor version bump suffices.
PROVISION_VERSION = '75.4' PROVISION_VERSION = '75.5'