diff options
| -rw-r--r-- | .travis.yml | 44 | ||||
| -rwxr-xr-x | scripts/travis-before-install.sh | 4 |
2 files changed, 22 insertions, 26 deletions
diff --git a/.travis.yml b/.travis.yml index 609883af..0a8927d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -language: c +language: cpp before_install: - eval "${MATRIX_EVAL}" - scripts/travis-before-install.sh @@ -7,53 +7,51 @@ script: - scripts/travis-test.sh matrix: include: - - os: linux + - name: gcc + os: linux dist: trusty - sudo: required compiler: gcc - - os: linux + - name: gcc-i686 + os: linux dist: trusty sudo: required + addons: + apt: + packages: + - gcc-4.8-multilib + - g++-4.8-multilib compiler: gcc-i686 - - os: linux + - name: clang-release + os: linux dist: trusty - sudo: required compiler: clang env: WABT_DEPLOY=clang-release - - os: linux + - name: asan + os: linux dist: trusty - sudo: required compiler: clang env: SANITIZER=asan # Disabled because MSAN seems to have stopped working on Travis. # - os: linux # dist: trusty -# sudo: required # compiler: clang # env: SANITIZER=msan - - os: linux + - name: lsan + os: linux dist: trusty - sudo: required compiler: clang env: SANITIZER=lsan - - os: linux + - name: ubsan + os: linux dist: trusty - sudo: required compiler: clang env: SANITIZER=ubsan - - os: osx + - name: osx + os: osx compiler: clang env: WABT_DEPLOY=clang-release # Build the .js outputs using emcc - - &test-emcc - stage: test - compiler: clang - python: 2.7 - node_js: 7 - language: node_js - node_js: - - node - sudo: required + - name: emscripten services: - docker before_install: diff --git a/scripts/travis-before-install.sh b/scripts/travis-before-install.sh index 249f0490..fc003f5a 100755 --- a/scripts/travis-before-install.sh +++ b/scripts/travis-before-install.sh @@ -16,9 +16,7 @@ # if [[ ${TRAVIS_OS_NAME} = "linux" ]]; then - sudo apt-get update -qq - sudo apt-get install -qq gcc-4.8-multilib g++-4.8-multilib -y - sudo pip install flake8 + pip install --user flake8 elif [[ ${TRAVIS_OS_NAME} = "osx" ]]; then brew update else |