Merge pull request #1619 from PeterDaveHello/refactor-travis-config

Remove the manual ShellCheck install proecss on Travis CI
Jordan Harband 2017-09-28 10:45:49 -07:00 committed by GitHub
commit 707d268a76
1 changed files with 1 additions and 4 deletions

View File

@ -4,7 +4,6 @@ sudo: required
addons: addons:
apt: apt:
packages: packages:
- cabal-install
- ghc - ghc
- zsh - zsh
# - ksh # - ksh
@ -15,7 +14,6 @@ cache:
directories: directories:
- $HOME/.npm - $HOME/.npm
- $HOME/.ghc - $HOME/.ghc
- $HOME/.cabal
- $TRAVIS_BUILD_DIR/.cache - $TRAVIS_BUILD_DIR/.cache
- $TRAVIS_BUILD_DIR/node_modules - $TRAVIS_BUILD_DIR/node_modules
before_install: before_install:
@ -23,7 +21,6 @@ before_install:
- curl --version - curl --version
- wget --version - wget --version
install: install:
- if [ -n "${SHELLCHECK-}" ]; then cabal update && cabal install ShellCheck && shellcheck --version ; fi
- if [ -z "${SHELLCHECK-}" ]; then nvm install node && npm install && npm prune && npm ls urchin doctoc; fi - if [ -z "${SHELLCHECK-}" ]; then nvm install node && npm install && npm prune && npm ls urchin doctoc; fi
- '[ -z "$WITHOUT_CURL" ] || sudo apt-get remove curl -y' - '[ -z "$WITHOUT_CURL" ] || sudo apt-get remove curl -y'
script: script:
@ -38,7 +35,7 @@ env:
global: global:
- CXX=g++-4.8 - CXX=g++-4.8
- CC=gcc-4.8 - CC=gcc-4.8
- PATH="~/.cabal/bin/:$(echo $PATH | sed 's/::/:/')" - PATH="$(echo $PATH | sed 's/::/:/')"
- NVM_DIR="${TRAVIS_BUILD_DIR}" - NVM_DIR="${TRAVIS_BUILD_DIR}"
matrix: matrix:
- MAKE_RELEASE=true - MAKE_RELEASE=true