diff --git a/ceph-website-prs/build/build b/ceph-website-prs/build/build index 1bdb65478..85fb60860 100755 --- a/ceph-website-prs/build/build +++ b/ceph-website-prs/build/build @@ -5,6 +5,14 @@ env BRANCH=$(echo $GIT_BRANCH | sed 's:.*/::') +set +e +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" +set -e + +echo "Using node version $(node -v)" + # https://docs.npmjs.com/cli/v7/commands/npm-ci npm ci diff --git a/ceph-website-prs/config/definitions/ceph-website-prs.yml b/ceph-website-prs/config/definitions/ceph-website-prs.yml index 97e0d0a86..25db65166 100644 --- a/ceph-website-prs/config/definitions/ceph-website-prs.yml +++ b/ceph-website-prs/config/definitions/ceph-website-prs.yml @@ -55,4 +55,5 @@ builders: - shell: !include-raw: + - ../../../scripts/ceph-website/install-deps.sh - ../../build/build diff --git a/ceph-website/build/build b/ceph-website/build/build index d2af5f097..6d2f64e49 100755 --- a/ceph-website/build/build +++ b/ceph-website/build/build @@ -3,6 +3,14 @@ set -ex env +set +e +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" +set -e + +echo "Using node version $(node -v)" + npm install npm run build:production diff --git a/ceph-website/config/definitions/ceph-website.yml b/ceph-website/config/definitions/ceph-website.yml index a61bf6d19..12cf24384 100644 --- a/ceph-website/config/definitions/ceph-website.yml +++ b/ceph-website/config/definitions/ceph-website.yml @@ -32,4 +32,5 @@ builders: - shell: !include-raw: + - ../../../scripts/ceph-website/install-deps.sh - ../../build/build diff --git a/scripts/ceph-website/install-deps.sh b/scripts/ceph-website/install-deps.sh new file mode 100755 index 000000000..c3e35fd9f --- /dev/null +++ b/scripts/ceph-website/install-deps.sh @@ -0,0 +1,19 @@ +#!/bin/bash +set -x + +# install nvm +if [[ ! $(command -v nvm) ]]; then + # install nvm + LATEST_NVM_VERSION=$(curl -s https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') + echo "Installing nvm version ${LATEST_NVM_VERSION}" + + curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/${LATEST_NVM_VERSION}/install.sh | bash + + export NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" +fi + +echo "Installing nodejs from nvm with version $(cat .nvmrc)" +nvm install +nvm use