Skip to content

Commit 72af9f9

Browse files
authored
Merge pull request #1784 from peternewman/0.10-fix-travis-jshint
Switch node to the latest LTS version we can
2 parents 1b28e79 + a525ea2 commit 72af9f9

1 file changed

Lines changed: 5 additions & 9 deletions

File tree

.travis.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -349,13 +349,6 @@ jobs:
349349
- lintian
350350
- moreutils
351351
allow_failures:
352-
- os: linux
353-
dist: bionic
354-
arch: arm64
355-
env: TASK='jshint'
356-
addons:
357-
apt:
358-
packages:
359352
# - os: osx
360353
# osx_image: xcode9.4
361354
# compiler: clang
@@ -472,6 +465,8 @@ before_install:
472465
- if [ "$PYTHON" == "python3" -a "$TRAVIS_CPU_ARCH" != "arm64" ]; then pyenv global 3.8.1; fi
473466
#On arm64 (at least) pip is now pip3, so symlink it to pip2 unless we're using python3.
474467
- if [ "$PYTHON" != "python3" ]; then sudo rm /usr/local/bin/pip && sudo ln -s /usr/local/bin/pip2 /usr/local/bin/pip; fi
468+
#Switch node to version 16 LTS, as newer LTS ones don't work with Ubuntu 18.04 and some older ones are too old
469+
- if [ "$TASK" = "jshint" ]; then nvm install 16 && nvm use 16; fi
475470
#Fix permissions for unbound (and possibly others)
476471
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [ ! -d /usr/local/sbin ]; then sudo mkdir -p /usr/local/sbin && sudo chown -R $(whoami) /usr/local/sbin; fi; fi
477472
#Add a missing gnupg folder
@@ -512,8 +507,9 @@ install:
512507
- if [ "$TRAVIS_DIST" != "bionic" -o "$PYTHON" == "python3" ]; then pip install --user numpy; fi
513508
- if [ "$TASK" = "coverage" ]; then pip install --user cpp-coveralls; fi
514509
- if [ "$TASK" = "flake8" ]; then pip install --user flake8; fi
515-
- if [ "$TASK" = "codespell" ]; then pip3 install --user git+https://github.com/codespell-project/codespell.git; fi
516-
- if [ "$TASK" = "jshint" ]; then npm install -g grunt-cli; fi
510+
- if [ "$TASK" = "codespell" ]; then pip3 install --user codespell==2.2.1; fi
511+
- if [ "$TASK" = "jshint" ]; then npm --verbose install -g grunt-cli; fi
512+
- if [ "$TASK" = "jshint" ]; then grunt --version --verbose; fi
517513
# Installing via the addon isn't currently working so do it the old fashioned way
518514
- if [ "$TRAVIS_OS_NAME" == "osx" -a "$CPPUNIT" != "1.14" ]; then brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/e6e43cf6a3%5E/Formula/cppunit.rb; fi # install a slightly older cppunit, as latest needs C++11 support
519515

0 commit comments

Comments
 (0)