diff options
| author | Bob Summerwill <bob@summerwill.net> | 2016-08-12 20:36:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-12 20:36:42 +0800 |
| commit | 08248ff4edca83c2edc57a4f081002cd2bb393a4 (patch) | |
| tree | e01a2b0ce4699540cad5cb9881eac3bcd5633716 | |
| parent | 17ed5a6b21b60768a176ed9ce602ee1c34b1ad67 (diff) | |
| parent | 7cab48e8fb2312505a697bdf6e397d1a22b11228 (diff) | |
| download | dexon-solidity-08248ff4edca83c2edc57a4f081002cd2bb393a4.tar dexon-solidity-08248ff4edca83c2edc57a4f081002cd2bb393a4.tar.gz dexon-solidity-08248ff4edca83c2edc57a4f081002cd2bb393a4.tar.bz2 dexon-solidity-08248ff4edca83c2edc57a4f081002cd2bb393a4.tar.lz dexon-solidity-08248ff4edca83c2edc57a4f081002cd2bb393a4.tar.xz dexon-solidity-08248ff4edca83c2edc57a4f081002cd2bb393a4.tar.zst dexon-solidity-08248ff4edca83c2edc57a4f081002cd2bb393a4.zip | |
Merge pull request #880 from bobsummerwill/travis_conditionals
Try to fix Travis conditionals
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | appveyor.yml | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index f73c874f..ad5c0e2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -183,4 +183,4 @@ deploy: on: repo: ethereum/solidity branch: develop - condition: $JOB != docs || $JOB != emscripten + condition: $JOB != docs && $JOB != emscripten diff --git a/appveyor.yml b/appveyor.yml index 5850ec62..428a7a68 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,8 +27,6 @@ # (c) 2016 cpp-ethereum contributors. #------------------------------------------------------------------------------ -version: 0.3.6.{build} -skip_tags: true os: Visual Studio 2015 configuration: - RelWithDebInfo @@ -75,8 +73,6 @@ artifacts: # below. deploy: - release: solidity-develop-v$(APPVEYOR_BUILD_VERSION) - tag: develop-v$(APPVEYOR_BUILD_VERSION) description: 'Development build of solidity at commit $(APPVEYOR_REPO_COMMIT).\n\n$(APPVEYOR_REPO_COMMIT_MESSAGE)\n\nCommitted by $(APPVEYOR_REPO_COMMIT_AUTHOR), $(APPVEYOR_REPO_COMMIT_TIMESTAMP).' prerelease: true provider: GitHub |