aboutsummaryrefslogtreecommitdiff
path: root/ci/before_install.sh
diff options
context:
space:
mode:
Diffstat (limited to 'ci/before_install.sh')
-rwxr-xr-xci/before_install.sh11
1 files changed, 3 insertions, 8 deletions
diff --git a/ci/before_install.sh b/ci/before_install.sh
index 5cb6894b8c..1cf60edf73 100755
--- a/ci/before_install.sh
+++ b/ci/before_install.sh
@@ -3,10 +3,6 @@
set -e
set -o pipefail
-if [[ "${CI_TARGET}" == lint ]]; then
- exit
-fi
-
echo 'Python info:'
(
set -x
@@ -26,7 +22,7 @@ if [[ "${TRAVIS_OS_NAME}" != osx ]] && command -v pyenv; then
echo 'Setting Python versions via pyenv'
# Prefer Python 2 over 3 (more conservative).
- pyenv global 2.7.15:3.7
+ pyenv global 2.7.15:3.7.1
echo 'Updated Python info:'
(
@@ -47,12 +43,11 @@ if [[ "${TRAVIS_OS_NAME}" == osx ]] || [ ! -f ~/.nvm/nvm.sh ]; then
fi
source ~/.nvm/nvm.sh
-nvm install --lts
-nvm use --lts
+nvm install 10
if [[ -n "$CMAKE_URL" ]]; then
echo "Installing custom CMake: $CMAKE_URL"
- curl --retry 5 --silent --fail -o /tmp/cmake-installer.sh "$CMAKE_URL"
+ curl --retry 5 --silent --show-error --fail -o /tmp/cmake-installer.sh "$CMAKE_URL"
mkdir -p "$HOME/.local/bin" /opt/cmake-custom
bash /tmp/cmake-installer.sh --prefix=/opt/cmake-custom --skip-license
ln -sfn /opt/cmake-custom/bin/cmake "$HOME/.local/bin/cmake"