diff options
| author | John Hodge <tpg@mutabah.net> | 2018-06-02 12:58:34 +0800 |
|---|---|---|
| committer | John Hodge <tpg@mutabah.net> | 2018-06-02 13:05:32 +0800 |
| commit | 49cbfd3f9d42207ebd7bd6613dec075c20e61a52 (patch) | |
| tree | 16b1b25be598960527ac0cb700d659cb28689434 /.travis.yml | |
| parent | 092a639c36b8c64ba5401ffa6c4f1cd4065a0135 (diff) | |
| download | mrust-49cbfd3f9d42207ebd7bd6613dec075c20e61a52.tar.gz | |
Travis CI - Enable OSX builds
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml index 0dc40d9a..5af7b34b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,31 +1,40 @@ language: cpp sudo: false -os: linux -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-6 - - zlib1g-dev - - valgrind + +matrix: + include: + # Linux + - os: linux + env: + - CC=gcc-6 + - CC=g++-6 + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-6 + - zlib1g-dev + - valgrind + # OSX + - os: osx install: # Build mrustc - make RUSTCSRC - - CC=gcc-6 CXX=g++-6 make -j 2 - - CC=gcc-6 CXX=g++-6 make -C tools/minicargo + - make -j 2 + - make -C tools/minicargo script: - - CC=gcc-6 CXX=g++-6 make -f minicargo.mk output/libtest.hir + - make -f minicargo.mk output/libtest.hir # libstd and hello_world - - CC=gcc-6 make test TAIL_COUNT=2 + - make test TAIL_COUNT=2 # rustc (DISABLED: llvm build) -# - CC=gcc-6 CXX=g++-6 make -f minicargo.mk output/rustc +# - make -f minicargo.mk output/rustc # Tests - - CC=gcc-6 CXX=g++-6 make local_tests -k + - make local_tests -k # - CC=gcc-6 make rust_tests -k # cargo -# - CC=gcc-6 CXX=g++-6 make -f minicargo.mk output/cargo +# - make -f minicargo.mk output/cargo # - cat output/cargo-build/cargo_dbg.txt |