diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-02-12 02:07:41 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2017-02-12 02:57:14 +0800 |
| commit | 108b79d3bfba648e6e16d8d74c8073eb465f4d6f (patch) | |
| tree | cda8d4ea185d9bc0cb5556022ed99c848cbcf8c4 | |
| parent | a2bcb0008b2278ef469111081708a2274413c5ee (diff) | |
| download | dexon-solidity-108b79d3bfba648e6e16d8d74c8073eb465f4d6f.tar.gz dexon-solidity-108b79d3bfba648e6e16d8d74c8073eb465f4d6f.tar.zst dexon-solidity-108b79d3bfba648e6e16d8d74c8073eb465f4d6f.zip | |
Fix macOS builds
| -rw-r--r-- | .travis.yml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index cfbadb85..0a0aa139 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,7 @@ #------------------------------------------------------------------------------ language: cpp + branches: # We need to whitelist the branches which we want to have "push" automation, # this includes tags (which are treated as branches by travis). @@ -79,6 +80,7 @@ matrix: - SOLC_DOCS=On - SOLC_RELEASE=Off - SOLC_TESTS=Off + # Docker target, which generates a statically linked alpine image - os: linux dist: trusty @@ -126,7 +128,7 @@ matrix: # env: # # Workaround for "macOS - Yosemite, El Capitan and Sierra hanging?" # # https://github.com/ethereum/solidity/issues/894 -# - TRAVIS_TESTS=Off +# - SOLC_TESTS=Off # - ZIP_SUFFIX=osx-yosemite # OS X El Capitan (10.11) @@ -137,10 +139,10 @@ matrix: # env: # # The use of Debug config here ONLY for El Capitan is a workaround for "The Heisenbug" # # See https://github.com/ethereum/webthree-umbrella/issues/565 -# - TRAVIS_BUILD_TYPE=Debug +# - SOLC_BUILD_TYPE=Debug # # Workaround for "macOS - Yosemite, El Capitan and Sierra hanging?" # # https://github.com/ethereum/solidity/issues/894 -# - TRAVIS_TESTS=Off +# - SOLC_TESTS=Off # - ZIP_SUFFIX=osx-elcapitan # macOS Sierra (10.12) @@ -151,10 +153,10 @@ matrix: # env: # # Look like "The Heisenbug" is occurring here too, so we'll do the same workaround. # # See https://travis-ci.org/ethereum/solidity/jobs/150240930 -# - TRAVIS_BUILD_TYPE=Debug +# - SOLC_BUILD_TYPE=Debug # # Workaround for "macOS - Yosemite, El Capitan and Sierra hanging?" # # https://github.com/ethereum/solidity/issues/894 -# - TRAVIS_TESTS=Off +# - SOLC_TESTS=Off # - ZIP_SUFFIX=macos-sierra git: @@ -172,11 +174,13 @@ install: - test "$TRAVIS_OS_NAME" != "linux" || (scripts/install_cmake.sh) - echo -n "$TRAVIS_COMMIT" > commit_hash.txt - test $SOLC_DOCKER != On || (docker build -t ethereum/solc:build -f scripts/Dockerfile .) + before_script: - test $SOLC_EMSCRIPTEN != On || (scripts/build_emscripten.sh) - test $SOLC_RELEASE != On || (scripts/build.sh $SOLC_BUILD_TYPE && scripts/release.sh $ZIP_SUFFIX && scripts/create_source_tarball.sh) + script: - test $SOLC_DOCS != On || (scripts/docs.sh) - test $SOLC_TESTS != On || (cd $TRAVIS_BUILD_DIR && scripts/tests.sh) |