Merge pull request #861 from bobsummerwill/zips

Re-add the ZIP release flow for Solidity

4 files changed, 48 insertions, 52 deletions

diff --git a/.travis.yml b/.travis.yml
index c476c154..c116f1b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -120,33 +120,28 @@ env:
         - ENCRYPTION_LABEL="6d4541b72666"
         - JOB=default
 
-# This is the deploy target for the Emscripten build.
-# It publishes the JS file which was compiled as part of the earlier 'build_emscripten.sh'
-# step to https://github.com/ethereum/solc-bin/tree/gh-pages/bin.
-# Both the build and deploy steps for Emscripten are only run within the Ubuntu
-# configurations (not for macOS).  That is controlled by conditionals within the bash
-# scripts because TravisCI doesn't provide much in the way of conditional logic.
-
 deploy:
-    provider: script
-    script: test $JOB != emscripten || scripts/release_emscripten.sh
-    skip_cleanup: true
-    on:
-        branch: develop
-
-# This is the deploy target for the native build (Linux and macOS)
-# which generates development ZIPs per commit.  We are in agreement
-# that this is probably noisy overkill, so will want to renable this
-# functionality wrapped in some conditionals so that it only runs
-# when building the 'release' branch.
-#
-#deploy:
-#    provider: releases
-#    api_key:
-#        secure: mGeDrlCbhPNQVqrk5wSqFZe/7C5HUIBWcZECJcFrEldN6ELj3a8mhDX9EWebidyFmZsf3ipKVMycJtXZHlH2kVZ0nZdRulq4bYhLiUFRaFQCHMW35dml5mxO/FPp+jhhZaylDUx+cI6AULbj8DvNFqSCfjx8qimRhJjRY4JHeG71N6g5+LU2/dA01D4Y97BUbQ5dYcmEyuEsriSpXOElIQIIv3+Q6MJNnLzxUA6EXsp4Qt3Qf3R1+EkI/RWOPbQsddpFNJBcBNOscCUFSZV3+ZK9E2RyHbPaL+Da4aJKVpgD7X1TFudq4PClMUTkg8CuJh/kvy9wkpaWyYHbLGQqu1vQ+NQ+vlTAKf8U+1xhC1IkX6nA+g4TlRksZRltRhpkBPnFoaQQGjD9eYyT1V/Htrn8Y/VGbYPBVa0GcEYXG5pDCBPz91RBpYwDcyUg9DEPNI6zYfQY8jA8xqtFwPX79Y22MDXIKhBskK00geuzh7Npy5Rnh4fLqVKMlffvYx3kwp444EFWtQ5jxbRCym2Th6EldkOM8Kble1JvixQtVb4s+DpTuwHCTrXZhwMuJpmwgRx52zyIsGrBPF3MOmdlwl+l0TD8UEJXt0JM1XSF1AROyYwXKDZQ9Qt4sd9ZKSWWaLJMEJf4kkZWYgTEI/FhOWlfshQCt8Z9S9r4fq2ywoo=
-#    file: $TRAVIS_BUILD_DIR/solidity-develop-$ZIP_SUFFIX.zip
-#    skip_cleanup: true
-#    on:
-#        repo: ethereum/solidity
-#        branch: develop
+    # This is the deploy target for the Emscripten build.
+    # It publishes the JS file which was compiled as part of the earlier 'build_emscripten.sh'
+    # step to https://github.com/ethereum/solc-bin/tree/gh-pages/bin.
+    # Both the build and deploy steps for Emscripten are only run within the Ubuntu
+    # configurations (not for macOS).  That is controlled by conditionals within the bash
+    # scripts because TravisCI doesn't provide much in the way of conditional logic.
+    - provider: script
+      script: test $JOB != emscripten || scripts/release_emscripten.sh
+      skip_cleanup: true
+      on:
+          branch: develop
 
+    # This is the deploy target for the native build (Linux and macOS)
+    # which generates ZIPs per commit.  We are in agreement that
+    # generating ZIPs per commit for the develop branch is probably
+    # just noise, so we only run this deployment target on 'release'.
+    - provider: releases
+      api_key:
+          secure: mGeDrlCbhPNQVqrk5wSqFZe/7C5HUIBWcZECJcFrEldN6ELj3a8mhDX9EWebidyFmZsf3ipKVMycJtXZHlH2kVZ0nZdRulq4bYhLiUFRaFQCHMW35dml5mxO/FPp+jhhZaylDUx+cI6AULbj8DvNFqSCfjx8qimRhJjRY4JHeG71N6g5+LU2/dA01D4Y97BUbQ5dYcmEyuEsriSpXOElIQIIv3+Q6MJNnLzxUA6EXsp4Qt3Qf3R1+EkI/RWOPbQsddpFNJBcBNOscCUFSZV3+ZK9E2RyHbPaL+Da4aJKVpgD7X1TFudq4PClMUTkg8CuJh/kvy9wkpaWyYHbLGQqu1vQ+NQ+vlTAKf8U+1xhC1IkX6nA+g4TlRksZRltRhpkBPnFoaQQGjD9eYyT1V/Htrn8Y/VGbYPBVa0GcEYXG5pDCBPz91RBpYwDcyUg9DEPNI6zYfQY8jA8xqtFwPX79Y22MDXIKhBskK00geuzh7Npy5Rnh4fLqVKMlffvYx3kwp444EFWtQ5jxbRCym2Th6EldkOM8Kble1JvixQtVb4s+DpTuwHCTrXZhwMuJpmwgRx52zyIsGrBPF3MOmdlwl+l0TD8UEJXt0JM1XSF1AROyYwXKDZQ9Qt4sd9ZKSWWaLJMEJf4kkZWYgTEI/FhOWlfshQCt8Z9S9r4fq2ywoo=
+      file: $TRAVIS_BUILD_DIR/solidity-$ZIP_SUFFIX.zip
+      skip_cleanup: true
+      on:
+          repo: ethereum/solidity
+          branch: release
diff --git a/appveyor.yml b/appveyor.yml
index 97f931e3..6f1836bb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -32,7 +32,10 @@ skip_tags: true
 os: Visual Studio 2015
 configuration:
     - RelWithDebInfo
-cache: build
+# NB: Appveyor cache is disabled, because it is proving very unreliable.
+# We can re-enable it when we find a way to mitigate the unreliability
+# issues.  Have automated builds be reliable is the more important thing.
+#cache: build
 install:
     - git submodule update --init --recursive
     - scripts/install_deps.bat
@@ -54,23 +57,22 @@ build_script:
 #    - pkill eth
 
 artifacts:
-    - path: solidity-develop-windows.zip
-      name: solidity-develop-windows-zip
+    - path: solidity-windows.zip
+      name: solidity-windows-zip
 
-# This is the deploy target for Windows
-# which generates development ZIPs per commit.  We are in agreement
-# that this is probably noisy overkill, so will want to renable this
-# functionality wrapped in some conditionals so that it only runs
-# when building the 'release' branch.
-#
-#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
-#    auth_token:
-#        secure: yukM9mHUbzuZSS5WSBLKSW0yGJerJEqAXkFhDhSHBBcKJE7GAryjQsdO9Kxh3yRv
-#    artifact: solidity-develop-windows-zip
-#    on:
-#        branch: standalone_changes
+# This is the deploy target for Windows which generates ZIPs per commit.
+# We are in agreement that generating ZIPs per commit for the develop
+# branch is probably just noise, so we only run this deployment target
+# on 'release'.
+
+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
+    auth_token:
+        secure: yukM9mHUbzuZSS5WSBLKSW0yGJerJEqAXkFhDhSHBBcKJE7GAryjQsdO9Kxh3yRv
+    artifact: solidity-windows-zip
+    on:
+        branch: release
diff --git a/scripts/release.bat b/scripts/release.bat
index 6f0ef6b0..54d85862 100644
--- a/scripts/release.bat
+++ b/scripts/release.bat
@@ -28,7 +28,6 @@ REM ---------------------------------------------------------------------------
 
 set CONFIGURATION=%1
 
-REM TODO - Add soltest\%CONFIGURATION%\soltest.exe, when that is buildable.
-7z a solidity-develop-windows.zip ^
-    .\build\solc\%CONFIGURATION%\solc.exe ^
+7z a solidity-windows.zip ^
+    .\build\solc\%CONFIGURATION%\solc.exe .\build\test\%CONFIGURATION%\soltest.exe ^
     "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.CRT\msvc*.dll"
diff --git a/scripts/release.sh b/scripts/release.sh
index 275e53bb..e9f43f6c 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -89,4 +89,4 @@ fi
 
 # And ZIP it all up, with a filename suffix passed in on the command-line.
 
-zip -j $REPO_ROOT/solidity-develop-$ZIP_SUFFIX.zip $ZIP_TEMP_DIR/*
+zip -j $REPO_ROOT/solidity-$ZIP_SUFFIX.zip $ZIP_TEMP_DIR/*