aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Summerwill <bob@summerwill.net>2016-08-12 21:16:55 +0800
committerGitHub <noreply@github.com>2016-08-12 21:16:55 +0800
commit04db7b0e525431b4f51f4a13506e85b47451ba7b (patch)
treeac2068634552c4833a8d4fc6e116819361813f6b
parent0d894a6832d21ba68f0f3d2fea66c8f4efc45815 (diff)
parent6a3e53cdeab5b12e6190c5129d4b1b342f748f9f (diff)
downloaddexon-solidity-04db7b0e525431b4f51f4a13506e85b47451ba7b.tar
dexon-solidity-04db7b0e525431b4f51f4a13506e85b47451ba7b.tar.gz
dexon-solidity-04db7b0e525431b4f51f4a13506e85b47451ba7b.tar.bz2
dexon-solidity-04db7b0e525431b4f51f4a13506e85b47451ba7b.tar.lz
dexon-solidity-04db7b0e525431b4f51f4a13506e85b47451ba7b.tar.xz
dexon-solidity-04db7b0e525431b4f51f4a13506e85b47451ba7b.tar.zst
dexon-solidity-04db7b0e525431b4f51f4a13506e85b47451ba7b.zip
Merge pull request #882 from bobsummerwill/travis_conditionals
Flip whitelisting to release branch
-rw-r--r--.travis.yml2
-rw-r--r--appveyor.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index ad5c0e2a..19483bd5 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 428a7a68..82751373 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -80,4 +80,4 @@ deploy:
secure: HPjiugbDSCsEFTphj/qwHuSw80/BV1xWoSvj95CPmtb16Ukh2VQbLVB7iFtZSans
artifact: solidity-windows-zip
on:
- branch: develop
+ branch: release