From c1f3dae9e31cdecb7964f3a3e8b344ffad06f7c3 Mon Sep 17 00:00:00 2001 From: Bob Summerwill Date: Fri, 12 Aug 2016 05:26:23 -0700 Subject: [PATCH 1/2] 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. --- .travis.yml | 2 +- appveyor.yml | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index f73c874f1..d2567637f 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 5850ec626..82751373c 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 From 7cab48e8fb2312505a697bdf6e397d1a22b11228 Mon Sep 17 00:00:00 2001 From: Bob Summerwill Date: Fri, 12 Aug 2016 05:35:43 -0700 Subject: [PATCH 2/2] Flipped back to whitelisting develop, and attempting to fix conditional. --- .travis.yml | 4 ++-- appveyor.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d2567637f..ad5c0e2a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -182,5 +182,5 @@ deploy: skip_cleanup: true on: repo: ethereum/solidity - branch: release - condition: $JOB != docs || $JOB != emscripten + branch: develop + condition: $JOB != docs && $JOB != emscripten diff --git a/appveyor.yml b/appveyor.yml index 82751373c..428a7a686 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -80,4 +80,4 @@ deploy: secure: HPjiugbDSCsEFTphj/qwHuSw80/BV1xWoSvj95CPmtb16Ukh2VQbLVB7iFtZSans artifact: solidity-windows-zip on: - branch: release + branch: develop