aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Summerwill <bob@summerwill.net>2016-08-12 20:26:23 +0800
committerBob Summerwill <bob@summerwill.net>2016-08-12 20:26:23 +0800
commitc1f3dae9e31cdecb7964f3a3e8b344ffad06f7c3 (patch)
tree573fdf4437e1e801d58c331413979faba0e5b08c
parent3d94b0a8e14623bfed83d1985327305ac1af7245 (diff)
downloaddexon-solidity-c1f3dae9e31cdecb7964f3a3e8b344ffad06f7c3.tar
dexon-solidity-c1f3dae9e31cdecb7964f3a3e8b344ffad06f7c3.tar.gz
dexon-solidity-c1f3dae9e31cdecb7964f3a3e8b344ffad06f7c3.tar.bz2
dexon-solidity-c1f3dae9e31cdecb7964f3a3e8b344ffad06f7c3.tar.lz
dexon-solidity-c1f3dae9e31cdecb7964f3a3e8b344ffad06f7c3.tar.xz
dexon-solidity-c1f3dae9e31cdecb7964f3a3e8b344ffad06f7c3.tar.zst
dexon-solidity-c1f3dae9e31cdecb7964f3a3e8b344ffad06f7c3.zip
Switched whitelisting to 'release' branch for Appveyor and TravisCI.
Disabled auto-tagging. We will create our own tags manually now, and for the release branch, this act should auto-generate ZIPs.
-rw-r--r--.travis.yml2
-rw-r--r--appveyor.yml6
2 files changed, 2 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index f73c874f..d2567637 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -182,5 +182,5 @@ deploy:
skip_cleanup: true
on:
repo: ethereum/solidity
- branch: develop
+ branch: release
condition: $JOB != docs || $JOB != emscripten
diff --git a/appveyor.yml b/appveyor.yml
index 5850ec62..82751373 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
@@ -84,4 +80,4 @@ deploy:
secure: HPjiugbDSCsEFTphj/qwHuSw80/BV1xWoSvj95CPmtb16Ukh2VQbLVB7iFtZSans
artifact: solidity-windows-zip
on:
- branch: develop
+ branch: release