Forráskód Böngészése

Switch to official Travis deploy mechanism

Kevin van Zonneveld 9 éve
szülő
commit
3cb76c0f80
3 módosított fájl, 20 hozzáadás és 3 törlés
  1. 9 3
      .travis.yml
  2. 8 0
      bin/travis-deploy
  3. 3 0
      bin/web-deploy

+ 9 - 3
.travis.yml

@@ -21,9 +21,6 @@ script:
 - npm run build
 - npm run test
 - npm run test:acceptance:handleservers
-- git config --global user.name 'Uppy Bot'
-- git config --global user.email 'uppybot@uppy.io'
-- if [ "${TRAVIS_PULL_REQUEST}" == "false" ] && [ "${TRAVIS_BRANCH}" == "master" ]; then npm run web:deploy --quiet; else echo "Skipping for non-master/prs"; fi
 env:
   global:
   - CXX=g++-4.8
@@ -37,3 +34,12 @@ env:
 notifications:
   slack:
     secure: L3iQQE8sZ0ik1Z26gPoNMiIam9EOEwYhraHCY60Jk/wmfH6SW/727yKXpgcb/yayx37rUZplvoO7H8e05ISxTJKSepEeqbBUIBQs48S8hr+FHk0VPtpP4HGxqaITRLm+mI1coPRvfISxzrB8d240oup6muhC9Ws4/LXi6v8miyIOs2zoYmGxd56TrUeON3UYlKt6dMava0V4bugARzrafN/tfyI9ccqbHzQLBspQvBI61DzZ5I2vnWpkjfWgIHz9Fl4VzXHqMXwjuTUEu8ibA12b3dHZiJEAoqeb9Oj9QcLPbstPLhlNTZZaOrfiFtwLctI2rFh37slDpAfk5idv3ycxcoG5rbCxgyg5i6dpQqrqHxnyglgHg2/nZ+YA5okeS7nJJNtU/4S6AFRWOUUWMVVY0VBEV+8w+uurl0PDy80RUY3uyK64qAgQ8U0M81/Ys1oyWyn78TqHcbby7V2Ws5I9Yakrq8D+mdfsWYCio8F6LXHSwJ0mt2FanJtdDvpPk9sAwsXZN0n8xhELt5TiRp3bzVIQ0IPUgF54dTG9/zWRvC1P4TFaFU/2fg73ZEUC5aWJoFMnLSZjbZvp5gwpCVd0MjSBk80nF9dHYcavIgJ0wMGI3BMb8Nn6+T11Gw/ycr7OGU4NMkj7i8vSFgKF74piWZyiNW8orkMN6XZgM+o=
+
+# Travis docs: Note that pull request builds skip deployment step altogether.
+# https://docs.travis-ci.com/user/deployment/#Conditional-Releases-with-on
+deploy:
+  skip_cleanup: true
+  provider: script
+  script: bin/travis-deploy
+  on:
+    branch: master

+ 8 - 0
bin/travis-deploy

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -o pipefail
+set -o errexit
+set -o nounset
+# set -o xtrace
+
+# because a Travis deploy script has to be a real file
+npm run web:deploy --quiet

+ 3 - 0
bin/web-deploy

@@ -9,6 +9,9 @@ __dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 __file="${__dir}/$(basename "${BASH_SOURCE[0]}")"
 __base="$(basename ${__file} .sh)"
 
+git config user.name 'Uppy Bot'
+git config user.email 'uppybot@uppy.io'
+
 ghpages_repo=${GHPAGES_REPO:-"transloadit/uppy"}
 ghpages_branch=${GHPAGES_BRANCH:-"gh-pages"}
 ghpages_url=${GHPAGES_URL:-"git@github.com:${ghpages_repo}.git"}