test

nvm-sh · Nov 17, 2016 · 9a1a5f8 · 9a1a5f8
1 parent ab6be9c
commit 9a1a5f8
Showing 1 changed file with 8 additions and 41 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,11 +4,11 @@ addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
+      - fpcomplete-precise
+      - llvm-toolchain-precise
+      - llvm-toolchain-precise-3.8
     packages:
-      - gcc-4.8
-      - g++-4.8
-      - zsh
-      - ksh
+      - clang-3.8
 cache:
   directories:
     - $HOME/.stack
@@ -19,8 +19,8 @@ before_install:
   - wget --version
   - clang --version
   - clang++ --version
-  - if [ -n "${SHELLCHECK-}" ]; then sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 575159689BEFB442 && echo 'deb http://download.fpcomplete.com/ubuntu precise main' | sudo tee /etc/apt/sources.list.d/fpco.list && sudo apt-get update && sudo apt-get install stack bc -y && stack setup && stack install ShellCheck && shellcheck --version ; fi
-  - if [ -z "${SHELLCHECK-}" ]; then wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - && echo -e "deb http://apt.llvm.org/precise/ llvm-toolchain-precise main\ndeb http://apt.llvm.org/precise/ llvm-toolchain-precise-3.8 main" | sudo tee /etc/apt/sources.list.d/clang.list && sudo apt-get update && sudo apt-get install clang-3.8 lldb-3.8 -y --force-yes && sudo ln -sf /usr/bin/clang-3.8 /usr/bin/clang && sudo ln -sf /usr/bin/clang++-3.8 /usr/bin/clang++ && clang --version ; fi
+  - if [ -n "${SHELLCHECK-}" ]; then stack setup && stack install ShellCheck && shellcheck --version ; fi
+  - if [ -z "${SHELLCHECK-}" ]; then sudo ln -sf /usr/bin/clang-3.8 /usr/bin/clang && sudo ln -sf /usr/bin/clang++-3.8 /usr/bin/clang++ && clang --version ; fi
 install:
   - (mkdir /tmp/urchin && cd /tmp/urchin && curl -s "$(curl -s https://registry.npmjs.com/urchin | grep -Eo '"tarball":\s*"[^"]+"' | tail -n 1 | awk -F\" '{ print $4 }')" -O && tar -x -f urchin*)
   - chmod +x /tmp/urchin/package/urchin
@@ -30,45 +30,12 @@ script:
   - if [ -z "${SHELLCHECK-}" ]; then make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin/package/urchin test-$SHELL ; fi
 env:
   global:
-    - CXX=g++-4.8
-    - CC=gcc-4.8
+    - CXX=clang++-3.8
+    - CC=clang-3.8
     - PATH=$(echo $PATH | sed 's/::/:/')
     - NVM_DIR="${TRAVIS_BUILD_DIR}"
   matrix:
     - SHELLCHECK=true
     - SHELL=bash TEST_SUITE=install_script
     - SHELL=sh TEST_SUITE=fast
-    - SHELL=dash TEST_SUITE=fast
-    - SHELL=bash TEST_SUITE=fast
-    - SHELL=zsh TEST_SUITE=fast
-  #  - SHELL=ksh TEST_SUITE=fast
-    - SHELL=sh TEST_SUITE=sourcing
-    - SHELL=dash TEST_SUITE=sourcing
-    - SHELL=bash TEST_SUITE=sourcing
-    - SHELL=zsh TEST_SUITE=sourcing
-  #  - SHELL=ksh TEST_SUITE=sourcing
-    - SHELL=sh TEST_SUITE=slow
-    - SHELL=dash TEST_SUITE=slow
-    - SHELL=bash TEST_SUITE=slow
-    - SHELL=zsh TEST_SUITE=slow
-  #  - SHELL=ksh TEST_SUITE=slow
     - SHELL=sh TEST_SUITE=installation_node
-  #  - SHELL=sh TEST_SUITE=installation_node WITHOUT_CURL=1
-    - SHELL=dash TEST_SUITE=installation_node
-  #  - SHELL=dash TEST_SUITE=installation_node WITHOUT_CURL=1
-    - SHELL=bash TEST_SUITE=installation_node
-  #  - SHELL=bash TEST_SUITE=installation_node WITHOUT_CURL=1
-    - SHELL=zsh TEST_SUITE=installation_node
-  #  - SHELL=zsh TEST_SUITE=installation_node WITHOUT_CURL=1
-  #  - SHELL=ksh TEST_SUITE=installation_node
-  #  - SHELL=ksh TEST_SUITE=installation_node WITHOUT_CURL=1
-    - SHELL=sh TEST_SUITE=installation_iojs
-  #  - SHELL=sh TEST_SUITE=installation_iojs WITHOUT_CURL=1
-    - SHELL=dash TEST_SUITE=installation_iojs
-  #  - SHELL=dash TEST_SUITE=installation_iojs WITHOUT_CURL=1
-    - SHELL=bash TEST_SUITE=installation_iojs
-  #  - SHELL=bash TEST_SUITE=installation_iojs WITHOUT_CURL=1
-    - SHELL=zsh TEST_SUITE=installation_iojs
-  #  - SHELL=zsh TEST_SUITE=installation_iojs WITHOUT_CURL=1
-  #  - SHELL=ksh TEST_SUITE=installation_iojs
-  #  - SHELL=ksh TEST_SUITE=installation_iojs WITHOUT_CURL=1