Deploy ZIP, RPM, DEB, and source pkgs to Bintray's pony-language org

killerswan · killerswan · commit 9fd41624c214 · 2016-08-12T15:45:08.000-05:00
Iff this is set up correctly, * on pull requests / random branch updates, tests will run but nothing will be deployed, * on _master_ and _release_ branch builds, packages for several platforms will be deployed to Bintray. AppVeyor will produce: * ZIP files with Win64 binaries. Travis will produce: * source archives, * RPM binary archives, * DEB binary archives. These are all then deployed (and published) to Bintray, using secure keys generated from pony-buildbot-2's API key. For example, on a merge to _master_, while the VERSION file says "0.2.1" at commit b9677ce, the following would be uploaded: 1. ponyc-master-0.2.1-59.b9677ce.tar.bz21 (from Travis) -> ponyc-source / ponyc-master 2. ponyc-master_0.2.1-59.b9677ce.x86_64.rpm (from Travis) -> ponyc-rpm / ponyc-master 3. ponyc_master-0.2.1-59.b9677ce_amd64.deb (from Travis) -> ponyc-debian / ponyc-master 4. ponyc-master-0.2.1-125.b9677ce-win64.zip (from AppVeyor) -> ponyc-win / ponyc-master See the README for usage, and https://bintray.com/pony-language/ for downloads.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -2,20 +2,30 @@ version: "{build}"
 
 image: Visual Studio 2015
 
+branches:
+  only:
+    - master
+    - release
+
 environment:
   matrix:
   - llvm: 3.8.0
   - llvm: 3.7.1
 
 configuration:
-  - Debug
   - Release
+  - Debug
 
 clone_depth: 100
 
 clone_folder: C:\projects\ponyc
 
 install:
+  - ps: |
+      $package_commit = git rev-parse --short --verify "HEAD^{commit}"
+      $package_version = (Get-Content "VERSION")
+      $package_iteration = "$package_iteration${env:appveyor_build_number}.$package_commit"
+      Update-AppveyorBuild -Version "ponyc-${env:appveyor_repo_branch}-$package_version-$package_iteration"
   - ps: |
       cd C:\
       $premakeInstalled = Test-Path C:\premake5.exe
@@ -57,18 +67,53 @@ install:
       $env:path += ";C:\ponyc-windows-libs\lib"
       cd C:\projects\ponyc
       C:\premake5.exe --with-tests --to=work/vs2015 vs2015
-  - ps: |
-      $file_version = (Get-Content "C:\projects\ponyc\VERSION")
-      Update-AppveyorBuild -Version "$file_version.${env:appveyor_build_number}"
 
 after_build:
   - ps: |
-      cd C:\projects\ponyc
-      7z a -tzip "ponyc-win64-${env:appveyor_build_version}-${env:configuration}-llvm-${env:llvm}.zip" "packages\" "build\$env:configuration\ponyc.*" "build\$env:configuration\ponyrt.*"
+      $ponydir = "${env:appveyor_build_version}-win64"
+      md "$ponydir"
+      md "${ponydir}\ponyc"
+      md "${ponydir}\ponyc\bin"
+      copy build\$env:configuration\ponyc.*  "${ponydir}\ponyc\bin"
+      copy build\$env:configuration\ponyrt.* "${ponydir}\ponyc\bin"
+      copy -recurse packages "${ponydir}\packages"
+
+      7z a -tzip "C:\projects\ponyc\${ponydir}.zip" "${ponydir}"
 
 artifacts:
   - path: 'ponyc-*.zip'
 
+deploy:
+  # On branches `master` and `release`, deploy (and publish) artifacts
+  # to the ponyc-win projects on Bintray.
+  - provider: BinTray
+    username: pony-buildbot-2
+    api_key:
+        secure: GPMFfEx/y9lomGHzZPD+0NtI3z5g9v8nAZJ9q3O0G49aORcBBZ/VUAXwqU82d5C9
+    subject: ponylang
+    repo: ponyc-win
+    package: ponyc-master
+    version: $(appveyor_build_version)
+    on:
+        branch: master
+        llvm: 3.8.0
+        configuration: Release
+    publish: true
+
+  - provider: BinTray
+    username: pony-buildbot-2
+    api_key:
+        secure: GPMFfEx/y9lomGHzZPD+0NtI3z5g9v8nAZJ9q3O0G49aORcBBZ/VUAXwqU82d5C9
+    subject: ponylang
+    repo: ponyc-win
+    package: ponyc-release
+    version: $(appveyor_build_version)
+    on:
+        branch: release
+        llvm: 3.8.0
+        configuration: Release
+    publish: true
+
 cache:
   - 'C:\LLVM-%llvm%\ -> .appveyor.yml'
   - C:\premake5.exe -> .appveyor.yml
diff --git a/.bintray.sh b/.bintray.sh
@@ -1,27 +1,21 @@
-DATE=`date +%Y-%m-%d`
+REPO_TYPE=$1        # e.g., rpm | debian | source
+PACKAGE_VERSION=$2  # e.g., 0.2.1-234.master.abcdefa
+PACKAGE_NAME=$3     # e.g., ponyc-master | ponyc-release
 
-YAML="{
-  \"package\": {
-    \"name\": \"ponyc\",
-    \"repo\": \"$1\", 
-    \"subject\": \"ponylang\"
-  },
-  \"version\": {
-    \"name\": \"$2\",
-    \"desc\": \"ponyc release $2\",
-    \"released\": \"$DATE\",
-    \"vcs_tag\": \"$2\",
-    \"gpgSign\": true
-  },"
+# TODO: cut "ponyc" out of the repo names
+BINTRAY_REPO_NAME="ponyc-$REPO_TYPE"
+OUTPUT_TARGET="bintray_${REPO_TYPE}.yml"
+
+DATE=`date +%Y-%m-%d`
 
-case $1 in
+case "$REPO_TYPE" in
   "debian")
     FILES="\"files\":
         [
           {
-            \"includePattern\": \"build/bin/(.*\.deb)\", \"uploadPattern\": \"\$1\",
+            \"includePattern\": \"\\\\/home\\\\/travis\\\\/build\\\\/ponylang\\\\/ponyc\\\\/build\\\\/bin\\\\/(.*\\\\.deb)\", \"uploadPattern\": \"\$1\",
             \"matrixParams\": {
-            \"deb_distribution\": \"vivid\",
+            \"deb_distribution\": \"pony-language\",
             \"deb_component\": \"main\",
             \"deb_architecture\": \"amd64\"}
          }
@@ -31,19 +25,39 @@ case $1 in
   "rpm")
     FILES="\"files\":
       [
-        {\"includePattern\": \"build/bin/(.*\.rpm)\", \"uploadPattern\": \"\$1\"}
+        {\"includePattern\": \"\\\\/home\\\\/travis\\\\/build\\\\/ponylang\\\\/ponyc\\\\/build\\\\/bin\\\\/(.*\\\\.rpm)\", \"uploadPattern\": \"\$1\"}
       ],
     \"publish\": true" 
     ;;
   "source")
     FILES="\"files\":
       [
-        {\"includePattern\": \"build/bin/(.*\.tar.bz2)\", \"uploadPattern\": \"\$1\"}
+        {\"includePattern\": \"\\\\/home\\\\/travis\\\\/build\\\\/ponylang\\\\/ponyc\\\\/build\\\\/bin\\\\/(.*\\\\.tar.bz2)\", \"uploadPattern\": \"\$1\"}
       ],
     \"publish\": true"
     ;;
 esac
 
-YAML=$YAML$FILES"}"  
+YAML="{
+  \"package\": {
+    \"repo\": \"$BINTRAY_REPO_NAME\",
+    \"name\": \"$PACKAGE_NAME\",
+    \"subject\": \"pony-language\"
+  },
+  \"version\": {
+    \"name\": \"$PACKAGE_VERSION\",
+    \"desc\": \"ponyc release $PACKAGE_VERSION\",
+    \"released\": \"$DATE\",
+    \"vcs_tag\": \"$PACKAGE_VERSION\",
+    \"gpgSign\": false
+  },"
+
+YAML="$YAML$FILES}"
+
+echo "Writing YAML to file: $OUTPUT_TARGET, from within `pwd` ..."
+echo "$YAML" >> "$OUTPUT_TARGET"
+
+echo "=== WRITTEN FILE =========================="
+cat -v "$OUTPUT_TARGET"
+echo "==========================================="
 
-echo $YAML >> bintray_$1.yml
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ language: c
 branches:
   only:
     - master
+    - release
 
 dist: trusty
 sudo: required
@@ -64,7 +65,30 @@ matrix:
         - LLVM_CONFIG="llvm-config-3.8"
         - config=release
 
+rvm:
+  - 2.2.3
+
 install:
+  # For a master or release release build with the latest stable LLVM,
+  # prepare to deploy artifacts.
+  - if [[
+        "$TRAVIS_REPO_SLUG" == "ponylang/ponyc" &&
+        "$LLVM_VERSION" == "3.8.0" &&
+        "$config" == "release" &&
+        "$TRAVIS_OS_NAME" == "linux" &&
+        "$TRAVIS_PULL_REQUEST" == "false"
+    ]];
+    then
+        if [[ "$TRAVIS_BRANCH" == "master" || "$TRAVIS_BRANCH" == "release" ]];
+        then
+            export CREATE_PACKAGES=yes;
+
+            sudo apt-get install -y rpm;
+            rvm use 2.2.3 --default;
+            gem install fpm;
+        fi;
+    fi;
+
   - if [ "${TRAVIS_OS_NAME}" = "linux" ];
     then
       wget "http://llvm.org/releases/${LLVM_VERSION}/clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-ubuntu-14.04.tar.xz";
@@ -93,47 +117,100 @@ notifications:
     recipients:
     - buildbot@lists.ponylang.org
 
+after_success:
+  # If successful, set $UPLOAD to "yes".
+  #
+  # The PACKAGE_ITERATION will be fed to the DEB and RPM systems by FPM
+  # as a suffix to the base version (DEB:debian_revision or RPM:release,
+  # used to disambiguate packages with the same version).
+  #
+  # PACKAGE_NAME and PACKAGE_CONFLICTS are used (by FPM) to create mutually exclusive packages
+  # like "ponyc-master" and "ponyc-release".
+  - if [[ "$CREATE_PACKAGES" == "yes" ]];
+    then
+      if [[ "$TRAVIS_BRANCH" == "release" ]];
+      then
+          PACKAGE_NAME="ponyc-release";
+          PACKAGE_CONFLICTS="ponyc-master";
+      else
+          PACKAGE_NAME="ponyc-$TRAVIS_BRANCH";
+          PACKAGE_CONFLICTS="ponyc-release";
+      fi;
+      PACKAGE_ITERATION="${PACKAGE_ITERATION}${TRAVIS_BUILD_NUMBER}.`git rev-parse --short --verify HEAD^{commit}`";
+      make verbose=1 config=release package_name="$PACKAGE_NAME" package_conflicts="$PACKAGE_CONFLICTS" package_base_version="`cat VERSION`" package_iteration="$PACKAGE_ITERATION" deploy && export UPLOAD=yes;
+    fi;
+
+  # For a master release build with the latest stable LLVM, upload docs.
+  - if [[
+        "$TRAVIS_REPO_SLUG" == "ponylang/ponyc" &&
+        "$LLVM_VERSION" == "3.8.0" &&
+        "$config" == "release" &&
+        "$TRAVIS_OS_NAME" == "linux" &&
+        "$TRAVIS_PULL_REQUEST" == "false" &&
+        "$TRAVIS_BRANCH" == "master"
+    ]];
+    then
+      git remote add gh-token "https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}";
+      git fetch gh-token && git fetch gh-token gh-pages:gh-pages;
+      build/release/ponyc packages/stdlib --docs;
+      cd stdlib-docs;
+      sudo -H pip install mkdocs;
+      sed -i '' 's/site_name:\ stdlib/site_name:\ Pony Standard Library/' mkdocs.yml;
+      mkdocs gh-deploy -v --clean --remote-name gh-token;
+    fi;
+
 deploy:
   - provider: bintray
-    user: pony-buildbot
-    file: bintray_debian.yml
+    user: pony-buildbot-2
+    file: /home/travis/build/ponylang/ponyc/bintray_debian.yml
+    on:
+      branch: master
+      condition: "$UPLOAD = yes"
+    key:
+      secure: "GGDPvrwx0nY09smgUP0ocbBCIdvl1r96bzM7NYxxS9l9d6xGegaSFzUF6B19mdIRT4A+mR9fxpc2eQpxC6iduWVOWGwXGqtYtWzKz/C1I3s/UICPWDl2f4wsO8KGqcO2+M87aw3bwUKC4GgzKa956HKm8BVeCWhbwyFSf0c4UyST8Lkv2vAFWeRDmu/fzUwwFFpiHwlE7W1rlJhQV2xiY8pwVntgxAmTL5ssSOYdk+t65H1fIfjF3k+dU0KkARa8y2JaVhtYHlisHjCki2V3hhKenGcoK22WnNckaCM9sn/ppCm6KRhqcbtGrbEYu8XAA/xXnw3xtgZWVHhcLdTXDl13rxCGchdF1f2rtEZCfI9BSJeQlLBRrf8lF9rEdLgfUqOKSq47KKrENa5PclhGiby9iICBuzRMJxbKUvXo8dcCvFP+/Q8ekIMyAItIK/AJBX9Gx4Yv25g8n5XZDzgfNlOEou27emo7zv1/nCEZkwKQyfHAEbnpz56y0JaR+eMotBdLIHsDNZSAh+/tWNiUYBaKfZydawrnHlWxiX8diMEOqZWHhlIHRljCmt2NUxAevht2mzzoZ+NBZxfyaDcw0dt8A1cGpigZh995Pj+LaFidPK7lvIwJGJ1956Iaj+wnZxJCkCOHuTLtO5KYDTIlgbmd7vVQfX5wm9uKsrsifF8="
+
+  - provider: bintray
+    user: pony-buildbot-2
+    file: /home/travis/build/ponylang/ponyc/bintray_rpm.yml
+    on:
+      branch: master
+      condition: "$UPLOAD = yes"
+    key:
+      secure: "GGDPvrwx0nY09smgUP0ocbBCIdvl1r96bzM7NYxxS9l9d6xGegaSFzUF6B19mdIRT4A+mR9fxpc2eQpxC6iduWVOWGwXGqtYtWzKz/C1I3s/UICPWDl2f4wsO8KGqcO2+M87aw3bwUKC4GgzKa956HKm8BVeCWhbwyFSf0c4UyST8Lkv2vAFWeRDmu/fzUwwFFpiHwlE7W1rlJhQV2xiY8pwVntgxAmTL5ssSOYdk+t65H1fIfjF3k+dU0KkARa8y2JaVhtYHlisHjCki2V3hhKenGcoK22WnNckaCM9sn/ppCm6KRhqcbtGrbEYu8XAA/xXnw3xtgZWVHhcLdTXDl13rxCGchdF1f2rtEZCfI9BSJeQlLBRrf8lF9rEdLgfUqOKSq47KKrENa5PclhGiby9iICBuzRMJxbKUvXo8dcCvFP+/Q8ekIMyAItIK/AJBX9Gx4Yv25g8n5XZDzgfNlOEou27emo7zv1/nCEZkwKQyfHAEbnpz56y0JaR+eMotBdLIHsDNZSAh+/tWNiUYBaKfZydawrnHlWxiX8diMEOqZWHhlIHRljCmt2NUxAevht2mzzoZ+NBZxfyaDcw0dt8A1cGpigZh995Pj+LaFidPK7lvIwJGJ1956Iaj+wnZxJCkCOHuTLtO5KYDTIlgbmd7vVQfX5wm9uKsrsifF8="
+
+  - provider: bintray
+    user: pony-buildbot-2
+    file: /home/travis/build/ponylang/ponyc/bintray_source.yml
+    on:
+      branch: master
+      condition: "$UPLOAD = yes"
+    key:
+      secure: "GGDPvrwx0nY09smgUP0ocbBCIdvl1r96bzM7NYxxS9l9d6xGegaSFzUF6B19mdIRT4A+mR9fxpc2eQpxC6iduWVOWGwXGqtYtWzKz/C1I3s/UICPWDl2f4wsO8KGqcO2+M87aw3bwUKC4GgzKa956HKm8BVeCWhbwyFSf0c4UyST8Lkv2vAFWeRDmu/fzUwwFFpiHwlE7W1rlJhQV2xiY8pwVntgxAmTL5ssSOYdk+t65H1fIfjF3k+dU0KkARa8y2JaVhtYHlisHjCki2V3hhKenGcoK22WnNckaCM9sn/ppCm6KRhqcbtGrbEYu8XAA/xXnw3xtgZWVHhcLdTXDl13rxCGchdF1f2rtEZCfI9BSJeQlLBRrf8lF9rEdLgfUqOKSq47KKrENa5PclhGiby9iICBuzRMJxbKUvXo8dcCvFP+/Q8ekIMyAItIK/AJBX9Gx4Yv25g8n5XZDzgfNlOEou27emo7zv1/nCEZkwKQyfHAEbnpz56y0JaR+eMotBdLIHsDNZSAh+/tWNiUYBaKfZydawrnHlWxiX8diMEOqZWHhlIHRljCmt2NUxAevht2mzzoZ+NBZxfyaDcw0dt8A1cGpigZh995Pj+LaFidPK7lvIwJGJ1956Iaj+wnZxJCkCOHuTLtO5KYDTIlgbmd7vVQfX5wm9uKsrsifF8="
+
+  - provider: bintray
+    user: pony-buildbot-2
+    file: /home/travis/build/ponylang/ponyc/bintray_debian.yml
     on:
       branch: release
-      condition: $UPLOAD = yes
+      condition: "$UPLOAD = yes"
     key:
-      secure: lHcuHpEj2N/P5SajENhVOT+mH1pwlInlBfk0l09fUuvoqLAIJI6Gb1OHGbNnazxxxH/ANVmP14XIU8hGWwQBGMTjUkJ8/FyyzGCHJlMiSSBzdAozLp1rG4A5IaNg9KvHgwljjerGp1FcTDjySV7v+I4eouhIravc6223xOrpPIQo8U0ZXm6vIIP4g8CVqMzBBsJh6O79GiGceV9x4G1nky40Tf1ulA0BmDiv1k1NEjMQKq04PX/OzQSSF/eHeVXOHFVmbz7dwngKtdMoZodsZDLfSJgG7aCH7k6opg0M+OkitB+RHR7O8cpPcbbOVuJTYcbiKeHvctN2yVXXiwNiawuGGw6M2ik+fSqrPg5POr+vbbXruGlr55ZmTP1WMbF750heKjNsSvrSAdsdquCv3vVvAbBykVO0cDrYWrMnik7cbT5nzFSwrZYiQorKC6HrBHQ6LFaK4hKNh0xVPu8WTCmWQBGtDjpEIlKDuLH2A0K3mz+DJGgn4Y+TIHJeKwp6yPZTaa6h+w0afDmA9cHzG73mp8S9u1NIc4P2HObIdkTnvb/5EoQ0r+46uPVETmRnspxlYZYPg/76jrrRTeAfEj8OI57IeRi2Yxa5iUyiA6/Pe/Kyfxkly8fV/JBQYjgDKmB9zUjKT7RAvSk1adSL69+PKWeU6Y6zYrz+c92CMGA=
+      secure: "GGDPvrwx0nY09smgUP0ocbBCIdvl1r96bzM7NYxxS9l9d6xGegaSFzUF6B19mdIRT4A+mR9fxpc2eQpxC6iduWVOWGwXGqtYtWzKz/C1I3s/UICPWDl2f4wsO8KGqcO2+M87aw3bwUKC4GgzKa956HKm8BVeCWhbwyFSf0c4UyST8Lkv2vAFWeRDmu/fzUwwFFpiHwlE7W1rlJhQV2xiY8pwVntgxAmTL5ssSOYdk+t65H1fIfjF3k+dU0KkARa8y2JaVhtYHlisHjCki2V3hhKenGcoK22WnNckaCM9sn/ppCm6KRhqcbtGrbEYu8XAA/xXnw3xtgZWVHhcLdTXDl13rxCGchdF1f2rtEZCfI9BSJeQlLBRrf8lF9rEdLgfUqOKSq47KKrENa5PclhGiby9iICBuzRMJxbKUvXo8dcCvFP+/Q8ekIMyAItIK/AJBX9Gx4Yv25g8n5XZDzgfNlOEou27emo7zv1/nCEZkwKQyfHAEbnpz56y0JaR+eMotBdLIHsDNZSAh+/tWNiUYBaKfZydawrnHlWxiX8diMEOqZWHhlIHRljCmt2NUxAevht2mzzoZ+NBZxfyaDcw0dt8A1cGpigZh995Pj+LaFidPK7lvIwJGJ1956Iaj+wnZxJCkCOHuTLtO5KYDTIlgbmd7vVQfX5wm9uKsrsifF8="
+
   - provider: bintray
-    user: pony-buildbot
-    file: bintray_rpm.yml
+    user: pony-buildbot-2
+    file: /home/travis/build/ponylang/ponyc/bintray_rpm.yml
     on:
       branch: release
-      condition: $UPLOAD = yes
+      condition: "$UPLOAD = yes"
     key:
-      secure: lHcuHpEj2N/P5SajENhVOT+mH1pwlInlBfk0l09fUuvoqLAIJI6Gb1OHGbNnazxxxH/ANVmP14XIU8hGWwQBGMTjUkJ8/FyyzGCHJlMiSSBzdAozLp1rG4A5IaNg9KvHgwljjerGp1FcTDjySV7v+I4eouhIravc6223xOrpPIQo8U0ZXm6vIIP4g8CVqMzBBsJh6O79GiGceV9x4G1nky40Tf1ulA0BmDiv1k1NEjMQKq04PX/OzQSSF/eHeVXOHFVmbz7dwngKtdMoZodsZDLfSJgG7aCH7k6opg0M+OkitB+RHR7O8cpPcbbOVuJTYcbiKeHvctN2yVXXiwNiawuGGw6M2ik+fSqrPg5POr+vbbXruGlr55ZmTP1WMbF750heKjNsSvrSAdsdquCv3vVvAbBykVO0cDrYWrMnik7cbT5nzFSwrZYiQorKC6HrBHQ6LFaK4hKNh0xVPu8WTCmWQBGtDjpEIlKDuLH2A0K3mz+DJGgn4Y+TIHJeKwp6yPZTaa6h+w0afDmA9cHzG73mp8S9u1NIc4P2HObIdkTnvb/5EoQ0r+46uPVETmRnspxlYZYPg/76jrrRTeAfEj8OI57IeRi2Yxa5iUyiA6/Pe/Kyfxkly8fV/JBQYjgDKmB9zUjKT7RAvSk1adSL69+PKWeU6Y6zYrz+c92CMGA=
+      secure: "GGDPvrwx0nY09smgUP0ocbBCIdvl1r96bzM7NYxxS9l9d6xGegaSFzUF6B19mdIRT4A+mR9fxpc2eQpxC6iduWVOWGwXGqtYtWzKz/C1I3s/UICPWDl2f4wsO8KGqcO2+M87aw3bwUKC4GgzKa956HKm8BVeCWhbwyFSf0c4UyST8Lkv2vAFWeRDmu/fzUwwFFpiHwlE7W1rlJhQV2xiY8pwVntgxAmTL5ssSOYdk+t65H1fIfjF3k+dU0KkARa8y2JaVhtYHlisHjCki2V3hhKenGcoK22WnNckaCM9sn/ppCm6KRhqcbtGrbEYu8XAA/xXnw3xtgZWVHhcLdTXDl13rxCGchdF1f2rtEZCfI9BSJeQlLBRrf8lF9rEdLgfUqOKSq47KKrENa5PclhGiby9iICBuzRMJxbKUvXo8dcCvFP+/Q8ekIMyAItIK/AJBX9Gx4Yv25g8n5XZDzgfNlOEou27emo7zv1/nCEZkwKQyfHAEbnpz56y0JaR+eMotBdLIHsDNZSAh+/tWNiUYBaKfZydawrnHlWxiX8diMEOqZWHhlIHRljCmt2NUxAevht2mzzoZ+NBZxfyaDcw0dt8A1cGpigZh995Pj+LaFidPK7lvIwJGJ1956Iaj+wnZxJCkCOHuTLtO5KYDTIlgbmd7vVQfX5wm9uKsrsifF8="
+
   - provider: bintray
-    user: pony-buildbot
-    file: bintray_source.yml
+    user: pony-buildbot-2
+    file: /home/travis/build/ponylang/ponyc/bintray_source.yml
     on:
       branch: release
-      condition: $UPLOAD = yes
+      condition: "$UPLOAD = yes"
     key:
-      secure: lHcuHpEj2N/P5SajENhVOT+mH1pwlInlBfk0l09fUuvoqLAIJI6Gb1OHGbNnazxxxH/ANVmP14XIU8hGWwQBGMTjUkJ8/FyyzGCHJlMiSSBzdAozLp1rG4A5IaNg9KvHgwljjerGp1FcTDjySV7v+I4eouhIravc6223xOrpPIQo8U0ZXm6vIIP4g8CVqMzBBsJh6O79GiGceV9x4G1nky40Tf1ulA0BmDiv1k1NEjMQKq04PX/OzQSSF/eHeVXOHFVmbz7dwngKtdMoZodsZDLfSJgG7aCH7k6opg0M+OkitB+RHR7O8cpPcbbOVuJTYcbiKeHvctN2yVXXiwNiawuGGw6M2ik+fSqrPg5POr+vbbXruGlr55ZmTP1WMbF750heKjNsSvrSAdsdquCv3vVvAbBykVO0cDrYWrMnik7cbT5nzFSwrZYiQorKC6HrBHQ6LFaK4hKNh0xVPu8WTCmWQBGtDjpEIlKDuLH2A0K3mz+DJGgn4Y+TIHJeKwp6yPZTaa6h+w0afDmA9cHzG73mp8S9u1NIc4P2HObIdkTnvb/5EoQ0r+46uPVETmRnspxlYZYPg/76jrrRTeAfEj8OI57IeRi2Yxa5iUyiA6/Pe/Kyfxkly8fV/JBQYjgDKmB9zUjKT7RAvSk1adSL69+PKWeU6Y6zYrz+c92CMGA=
+      secure: "GGDPvrwx0nY09smgUP0ocbBCIdvl1r96bzM7NYxxS9l9d6xGegaSFzUF6B19mdIRT4A+mR9fxpc2eQpxC6iduWVOWGwXGqtYtWzKz/C1I3s/UICPWDl2f4wsO8KGqcO2+M87aw3bwUKC4GgzKa956HKm8BVeCWhbwyFSf0c4UyST8Lkv2vAFWeRDmu/fzUwwFFpiHwlE7W1rlJhQV2xiY8pwVntgxAmTL5ssSOYdk+t65H1fIfjF3k+dU0KkARa8y2JaVhtYHlisHjCki2V3hhKenGcoK22WnNckaCM9sn/ppCm6KRhqcbtGrbEYu8XAA/xXnw3xtgZWVHhcLdTXDl13rxCGchdF1f2rtEZCfI9BSJeQlLBRrf8lF9rEdLgfUqOKSq47KKrENa5PclhGiby9iICBuzRMJxbKUvXo8dcCvFP+/Q8ekIMyAItIK/AJBX9Gx4Yv25g8n5XZDzgfNlOEou27emo7zv1/nCEZkwKQyfHAEbnpz56y0JaR+eMotBdLIHsDNZSAh+/tWNiUYBaKfZydawrnHlWxiX8diMEOqZWHhlIHRljCmt2NUxAevht2mzzoZ+NBZxfyaDcw0dt8A1cGpigZh995Pj+LaFidPK7lvIwJGJ1956Iaj+wnZxJCkCOHuTLtO5KYDTIlgbmd7vVQfX5wm9uKsrsifF8="
 
-after_success:
-  - if [[ $TRAVIS_OSNAME == "linux" && $CC == "gcc" && $TRAVIS_BRANCH == "release" ]];
-    then
-      cat VERSION | xargs sh .bintray.sh debian $1;
-      cat VERSION | xargs sh .bintray.sh rpm $1;
-      cat VERSION | xargs sh .bintray.sh source $1;
-      make config=release deploy;
-      export UPLOAD=yes;
-    fi;
-  - if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then
-      git remote add gh-token "https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}";
-      git fetch gh-token && git fetch gh-token gh-pages:gh-pages;
-      build/release/ponyc packages/stdlib --docs;
-      cd stdlib-docs;
-      sudo -H pip install mkdocs;
-      sed -i '' 's/site_name:\ stdlib/site_name:\ Pony Standard Library/' mkdocs.yml;
-      mkdocs gh-deploy -v --clean --remote-name gh-token;
-    fi;
diff --git a/Makefile b/Makefile
@@ -49,9 +49,14 @@ tag := $(shell cat VERSION)
 git := no
 endif
 
-package_version := $(tag)
-archive = ponyc-$(package_version).tar
-package = build/ponyc-$(package_version)
+# package_name, _version, and _iteration can be overriden by Travis or AppVeyor
+package_base_version ?= $(tag)
+package_iteration ?= "1"
+package_name ?= "ponyc-unknown"
+package_conflicts ?= "ponyc-release"
+package_version = $(package_base_version)-$(package_iteration)
+archive = $(package_name)-$(package_version).tar
+package = build/$(package_name)-$(package_version)
 
 symlink := yes
 
@@ -625,8 +630,12 @@ release: prerelease setversion
 endif
 
 # Note: linux only
+# FIXME: why is $(branch) empty?
 define EXPAND_DEPLOY
 deploy: test
+	$(SILENT)sh .bintray.sh debian "$(package_version)" "$(package_name)"
+	$(SILENT)sh .bintray.sh rpm    "$(package_version)" "$(package_name)"
+	$(SILENT)sh .bintray.sh source "$(package_version)" "$(package_name)"
 	@mkdir build/bin
 	@mkdir -p $(package)/usr/bin
 	@mkdir -p $(package)/usr/include
@@ -650,9 +659,9 @@ endif
 	$(SILENT)ln -s /usr/lib/pony/$(package_version)/include/pony.h $(package)/usr/include/pony.h
 	$(SILENT)cp -r packages $(package)/usr/lib/pony/$(package_version)/
 	$(SILENT)build/release/ponyc packages/stdlib -rexpr -g -o $(package)/usr/lib/pony/$(package_version)
-	$(SILENT)fpm -s dir -t deb -C $(package) -p build/bin --name ponyc --version $(package_version) --description "The Pony Compiler"
-	$(SILENT)fpm -s dir -t rpm -C $(package) -p build/bin --name ponyc --version $(package_version) --description "The Pony Compiler"
-	$(SILENT)git archive release > build/bin/$(archive)
+	$(SILENT)fpm -s dir -t deb -C $(package) -p build/bin --name $(package_name) --conflicts $(package_conflicts) --version $(package_base_version) --iteration "$(package_iteration)" --description "The Pony Compiler"
+	$(SILENT)fpm -s dir -t rpm -C $(package) -p build/bin --name $(package_name) --conflicts $(package_conflicts) --version $(package_base_version) --iteration "$(package_iteration)" --description "The Pony Compiler"
+	$(SILENT)git archive HEAD > build/bin/$(archive)
 	$(SILENT)cp -r $(package)/usr/lib/pony/$(package_version)/stdlib-docs stdlib-docs
 	$(SILENT)tar rvf build/bin/$(archive) stdlib-docs
 	$(SILENT)bzip2 build/bin/$(archive)
diff --git a/README.md b/README.md
