Merge pull request #352 from pulumi/publish-branch

Publish builds for topic branches

.travis.yml

@@ -27,7 +27,8 @@ before_script:
     - export PATH=$TRAVIS_BUILD_DIR/sdk/nodejs/bin:$PATH
 script:
     - if [ $TRAVIS_EVENT_TYPE = "cron" ]; then make nightly; else make; fi
-    - if [ $TRAVIS_EVENT_TYPE = "push" ] && [ $TRAVIS_BRANCH = "master" ]; then PUBFORCE=true make publish; fi
+after_success:
+    - if [ $TRAVIS_EVENT_TYPE = "push" ]; then make publish; fi
 notifications:
   slack:
     secure: tPhYdqclnOhFTiKhLn0EqY4/UhJ30c3SFRKHTMPYFfYflCQOyrIARYrzlm+oEOBISw/oNP0wR1LxawhLC2KfDb0ST9Zph8wKyQ8dujk9jXGACuuRic1n/IU9yiu2grZQqcwlieLN6IvGvK+736D2ZxhcjUF5ZwORkpe9jl+nr65NzWH5H+pr4jVWXvYddB2gJ/49i+COydfbaRJ+6O3JORqmSP2VA4CtrArl0L/uDT0osvBwJkeoTSzKjkPWZUwI3ZlGOCSGe+6i5hto6WOzUnU74UgNVZ6dCUOKJrmu146DDzTYB7g4xTkiBi8W5jEo7E6PRqAA6/zGGzUp0J8AMmKcrYnmBf3ALaAIzwiQAFwn9m4V3cKEnnfwzN+SrrmrA3KpwWuj2PNS0UEaxFr35Lb7NNORibmBJi5gj9q138C+b9uD5MQ3poq0PpXG+ZPYTQU1QZODsxcHpR3OyyI89OXBugrP9CTcYpknUgPmiAJgOQn+7H+Xcmme3CB9G5292hC5McZZtyxUAoNwAtg316bXSWWH9MkFRmjTWt7lRGZZ99T1TO/iG0DntyCWxy8lHIbYvCdbY5oTN3WMN93NFrmFMiZJcmmV79meMe/6LNLWVIWVaTXZSpS8IflRmVFp1twveSh4i1+mogh8CsMs2Lqp2Ca7HdakLtRBxHzcH/4=

scripts/make_release.sh

@@ -7,7 +7,11 @@ PUBDIR=$(mktemp -du)
 GITVER=$(git rev-parse HEAD)
 PUBFILE=$(dirname ${PUBDIR})/${GITVER}.tgz
 PUBPREFIX=s3://eng.pulumi.com/releases/pulumi-fabric
-declare -a PUBTARGETS=(${GITVER} $(git describe --tags) $(git rev-parse --abbrev-ref HEAD))
+
+# Figure out which branch we're on. Prefer $TRAVIS_BRANCH, if set, since
+# Travis leaves us at detached HEAD and `git rev-parse` just returns "HEAD".
+BRANCH=${TRAVIS_BRANCH:-$(git rev-parse --abbrev-ref HEAD)}
+declare -a PUBTARGETS=(${GITVER} $(git describe --tags) ${BRANCH})
 
 # Copy the binaries, scripts, and packs.
 mkdir -p ${PUBDIR}/bin/
@@ -21,4 +25,3 @@ echo sdk/nodejs/ >> ${PUBDIR}/packs.txt
 # Tar up the file and then print it out for use by the caller or script.
 tar -czf ${PUBFILE} -C ${PUBDIR} .
 echo ${PUBFILE} ${PUBTARGETS[@]}
-