diff --git a/.travis.yml b/.travis.yml index 440a73a..3d86e82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,6 @@ sudo: required addons: apt: packages: - - cabal-install - - ghc - zsh # - ksh # - gcc-4.8 @@ -14,8 +12,6 @@ addons: cache: directories: - $HOME/.npm - - $HOME/.ghc - - $HOME/.cabal - $TRAVIS_BUILD_DIR/.cache - $TRAVIS_BUILD_DIR/node_modules before_install: @@ -23,14 +19,33 @@ before_install: - curl --version - wget --version 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 - '[ -z "$WITHOUT_CURL" ] || sudo apt-get remove curl -y' script: - if [ -n "${DOCTOCCHECK-}" ]; then cp README.markdown README.markdown.orig && npm run doctoc && diff -q README.markdown README.markdown.orig ; fi - - if [ -n "${SHELLCHECK-}" ]; then shellcheck -s bash nvm.sh && shellcheck -s sh nvm.sh && shellcheck -s dash nvm.sh && shellcheck -s ksh nvm.sh ; fi - - if [ -n "${SHELLCHECK-}" ]; then shellcheck -s bash install.sh bash_completion nvm-exec ; fi - if [ -n "${SHELL-}" ] && [ -n "${TEST_SUITE}" ]; then make TEST_SUITE=$TEST_SUITE URCHIN="$(npm bin)/urchin" test-$SHELL ; fi +matrix: + include: + - env: SHELLCHECK=true + addons: + apt: + packages: + - ghc + - cabal-install + cache: + directories: + - $HOME/.ghc + - $HOME/.cabal + before_install: + - cabal update + install: + - cabal install ShellCheck && shellcheck --version + script: + - shellcheck -s bash install.sh bash_completion nvm-exec + - shellcheck -s bash nvm.sh + - shellcheck -s sh nvm.sh + - shellcheck -s dash nvm.sh + - shellcheck -s ksh nvm.sh env: global: - CXX=g++-4.8 @@ -39,7 +54,6 @@ env: - NVM_DIR="${TRAVIS_BUILD_DIR}" matrix: - DOCTOCCHECK=true - - SHELLCHECK=true - SHELL=bash TEST_SUITE=install_script - SHELL=sh TEST_SUITE=fast - SHELL=dash TEST_SUITE=fast