diff options
| author | chriseth <chris@ethereum.org> | 2018-04-17 17:42:29 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-17 17:42:29 +0800 |
| commit | 0304582cbf61798d0a088c46681ffb4f0ab5793c (patch) | |
| tree | 4ece726d9a764e5a496ad2fdabf75466bafd3800 | |
| parent | 08b0ed4116c9266a52b5d9606f2e1529b2683291 (diff) | |
| parent | 4d1467eee2aa256e1f2df06fc10cc8f8303405d6 (diff) | |
| download | dexon-solidity-0304582cbf61798d0a088c46681ffb4f0ab5793c.tar dexon-solidity-0304582cbf61798d0a088c46681ffb4f0ab5793c.tar.gz dexon-solidity-0304582cbf61798d0a088c46681ffb4f0ab5793c.tar.bz2 dexon-solidity-0304582cbf61798d0a088c46681ffb4f0ab5793c.tar.lz dexon-solidity-0304582cbf61798d0a088c46681ffb4f0ab5793c.tar.xz dexon-solidity-0304582cbf61798d0a088c46681ffb4f0ab5793c.tar.zst dexon-solidity-0304582cbf61798d0a088c46681ffb4f0ab5793c.zip | |
Merge pull request #3898 from ethereum/reEnableTestsOnTravisDevelop
Enable travis tests when run by daily cron.
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 539e6088..e9d2dde6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -159,8 +159,8 @@ cache: install: - test $SOLC_INSTALL_DEPS_TRAVIS != On || (scripts/install_deps.sh) - test "$TRAVIS_OS_NAME" != "linux" || (scripts/install_cmake.sh) -# - if [ "$TRAVIS_BRANCH" != release -a -z "$TRAVIS_TAG" ]; then SOLC_TESTS=Off; fi - - SOLC_TESTS=Off + # Disable tests unless run on the release branch, on tags or with daily cron + - if [ "$TRAVIS_BRANCH" != release -a -z "$TRAVIS_TAG" -a "$TRAVIS_EVENT_TYPE" != cron ]; then SOLC_TESTS=Off; fi - if [ "$TRAVIS_BRANCH" = release -o -n "$TRAVIS_TAG" ]; then echo -n > prerelease.txt; else date -u +"nightly.%Y.%-m.%-d" > prerelease.txt; fi - echo -n "$TRAVIS_COMMIT" > commit_hash.txt |