diff options
| author | Bob Summerwill <bob@summerwill.net> | 2016-08-15 16:12:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-15 16:12:23 +0800 |
| commit | 868a1675a3273253cfbb274cd4e80b2cd2997eb0 (patch) | |
| tree | 36447c3f1e4710a97cd0a12570f3e923c91a0e02 | |
| parent | f186b50c8fa37b13b02d7d55ff9c4e1a9bf29dd7 (diff) | |
| parent | 1a788101409b04ed5bb9a3522c60bc4d711b33d4 (diff) | |
| download | dexon-solidity-868a1675a3273253cfbb274cd4e80b2cd2997eb0.tar dexon-solidity-868a1675a3273253cfbb274cd4e80b2cd2997eb0.tar.gz dexon-solidity-868a1675a3273253cfbb274cd4e80b2cd2997eb0.tar.bz2 dexon-solidity-868a1675a3273253cfbb274cd4e80b2cd2997eb0.tar.lz dexon-solidity-868a1675a3273253cfbb274cd4e80b2cd2997eb0.tar.xz dexon-solidity-868a1675a3273253cfbb274cd4e80b2cd2997eb0.tar.zst dexon-solidity-868a1675a3273253cfbb274cd4e80b2cd2997eb0.zip | |
Merge pull request #896 from bobsummerwill/parameter_for_tests
Fixed conditionals for TravisCI
| -rw-r--r-- | .travis.yml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 53a8d19a..d787c795 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,6 @@ matrix: compiler: gcc env: - TRAVIS_DOCS=On - - TRAVIS_INSTALL_DEPS=Off - TRAVIS_RELEASE=Off - TRAVIS_TESTS=Off @@ -133,17 +132,17 @@ cache: - jsoncpp install: - - test $TRAVIS_INSTALL_DEPS==Off || ./scripts/install_deps.sh + - test $TRAVIS_INSTALL_DEPS != On || ./scripts/install_deps.sh before_script: - - test $TRAVIS_EMSCRIPTEN==Off || ./scripts/build_emscripten.sh - - test $TRAVIS_RELEASE==Off || (mkdir -p build + - test $TRAVIS_EMSCRIPTEN != On || ./scripts/build_emscripten.sh + - test $TRAVIS_RELEASE != On || (mkdir -p build && cd build && cmake .. -DCMAKE_BUILD_TYPE=$TRAVIS_BUILD_TYPE && make -j2 && cd .. && ./scripts/release.sh $ZIP_SUFFIX ) script: - - test $TRAVIS_DOCS==Off || ./scripts/docs.sh + - test $TRAVIS_DOCS != On || ./scripts/docs.sh # There are a variety of reliability issues with the Solidity unit-tests at the time of # writing (especially on macOS), so within TravisCI we will try to run the unit-tests @@ -155,7 +154,7 @@ script: # itself is broken from the failure messages which we are seeing. # # More details on known issues at https://github.com/ethereum/solidity/issues/769 - - test $TRAVIS_TESTS==Off || (cd $TRAVIS_BUILD_DIR && (./scripts/tests.sh || ./scripts/tests.sh || ./scripts/tests.sh) ) + - test $TRAVIS_TESTS != On || (cd $TRAVIS_BUILD_DIR && (./scripts/tests.sh || ./scripts/tests.sh || ./scripts/tests.sh) ) env: global: - ENCRYPTION_LABEL="6d4541b72666" @@ -219,4 +218,4 @@ deploy: on: repo: ethereum/solidity branch: release - condition: $TRAVIS_RELEASE==On + condition: $TRAVIS_RELEASE == On |