aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Summerwill <bob@summerwill.net>2016-08-16 05:37:32 +0800
committerGitHub <noreply@github.com>2016-08-16 05:37:32 +0800
commit5537d3ea82bfc499c8a1777b434e09a2caa77351 (patch)
treed14f18d040aff6c1e416c065368897af0de27234
parent34b8ab700a09385cdc9009e504801f022712f73a (diff)
parent09e9bfb63cf29f4f5591d1d015b31abe4d739a1c (diff)
downloaddexon-solidity-5537d3ea82bfc499c8a1777b434e09a2caa77351.tar
dexon-solidity-5537d3ea82bfc499c8a1777b434e09a2caa77351.tar.gz
dexon-solidity-5537d3ea82bfc499c8a1777b434e09a2caa77351.tar.bz2
dexon-solidity-5537d3ea82bfc499c8a1777b434e09a2caa77351.tar.lz
dexon-solidity-5537d3ea82bfc499c8a1777b434e09a2caa77351.tar.xz
dexon-solidity-5537d3ea82bfc499c8a1777b434e09a2caa77351.tar.zst
dexon-solidity-5537d3ea82bfc499c8a1777b434e09a2caa77351.zip
Merge pull request #900 from bobsummerwill/test_zips
Flipped solidity whitelisting to develop, to check ZIP workflow is OK
-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 d787c795..bddf3f7e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -217,5 +217,5 @@ deploy:
skip_cleanup: true
on:
repo: ethereum/solidity
- branch: release
+ branch: develop
condition: $TRAVIS_RELEASE == On
diff --git a/appveyor.yml b/appveyor.yml
index 2af17912..f76b760a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -80,7 +80,7 @@ deploy:
secure: HPjiugbDSCsEFTphj/qwHuSw80/BV1xWoSvj95CPmtb16Ukh2VQbLVB7iFtZSans
artifact: solidity-windows-zip
on:
- branch: release
+ branch: develop
notifications:
- provider: GitHubPullRequest