diff options
| author | Sam Clegg <sbc@chromium.org> | 2020-02-07 20:20:58 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-07 20:20:58 -0800 |
| commit | 11c6d59843967640081d7da32f0c43f9fd6ddce6 (patch) | |
| tree | 5c9df4c6f6c50bdb77935ac0f6ae880955289190 | |
| parent | f16078bf354b91ac56329b12e5c0274524579675 (diff) | |
| download | binaryen-11c6d59843967640081d7da32f0c43f9fd6ddce6.tar.gz binaryen-11c6d59843967640081d7da32f0c43f9fd6ddce6.tar.bz2 binaryen-11c6d59843967640081d7da32f0c43f9fd6ddce6.zip | |
Switch to using ninja on travis (except on OSX) (#2645)
| -rw-r--r-- | .travis.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 813489d62..b0b9ae053 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ jobs: addons: apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['cmake', 'g++-5'] + packages: ['cmake', 'g++-5', 'ninja-build'] before_install: - export ASAN_OPTIONS="$ASAN_OPTIONS symbolize=1" install: @@ -64,13 +64,13 @@ jobs: - set -o errexit - BUILD_DIR=${BUILD_DIR:-.} - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} - - cmake ${TRAVIS_BUILD_DIR} + - cmake ${TRAVIS_BUILD_DIR} -G Ninja -DCMAKE_C_FLAGS="$COMPILER_FLAGS" -DCMAKE_CXX_FLAGS="$COMPILER_FLAGS" -DCMAKE_EXE_LINKER_FLAGS="$LINKER_FLAGS" -DCMAKE_INSTALL_PREFIX=install -DCMAKE_EXPORT_COMPILE_COMMANDS=ON - - make -j2 install + - ninja install # Run tests from source directory - cd ${TRAVIS_BUILD_DIR} - python3 ./check.py --binaryen-bin=${BUILD_DIR}/install/bin @@ -134,10 +134,10 @@ jobs: - alpine() { docker exec -it alpine "$@"; } install: - alpine apk update - - alpine apk add build-base cmake git python2 python3 clang + - alpine apk add build-base cmake git python2 python3 clang ninja script: - - alpine cmake . - - alpine make -j2 + - alpine cmake . -G Ninja + - alpine ninja - alpine python3 ./check.py - name: osx @@ -163,7 +163,7 @@ jobs: -DCMAKE_C_FLAGS="-static" . -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ - - alpine make -j2 + - alpine ninja - alpine find bin/ -type f -perm -u=x -exec strip {} + - alpine ls -lh bin/ # Check if the built executables are really statically linked. |