Merge pull request #880 from bobsummerwill/travis_conditionals

Try to fix Travis conditionals
This commit is contained in:
Bob Summerwill 2016-08-12 05:36:42 -07:00 committed by GitHub
commit 08248ff4ed
2 changed files with 1 additions and 5 deletions

View File

@ -183,4 +183,4 @@ deploy:
on: on:
repo: ethereum/solidity repo: ethereum/solidity
branch: develop branch: develop
condition: $JOB != docs || $JOB != emscripten condition: $JOB != docs && $JOB != emscripten

View File

@ -27,8 +27,6 @@
# (c) 2016 cpp-ethereum contributors. # (c) 2016 cpp-ethereum contributors.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
version: 0.3.6.{build}
skip_tags: true
os: Visual Studio 2015 os: Visual Studio 2015
configuration: configuration:
- RelWithDebInfo - RelWithDebInfo
@ -75,8 +73,6 @@ artifacts:
# below. # below.
deploy: 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).' 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 prerelease: true
provider: GitHub provider: GitHub