aboutsummaryrefslogtreecommitdiffstats
path: root/docs/ci
diff options
context:
space:
mode:
authorMiheer Dewaskar <miheerdew@gmail.com>2018-03-24 10:49:08 -0400
committerMiheer Dewaskar <miheerdew@gmail.com>2018-03-24 10:49:08 -0400
commit9ee96f022764c71a4a776956037230d6ef4fee7e (patch)
tree8ebae8b64fcc0474466b3321efec201416d75ed0 /docs/ci
parent00d51db9250bedf8a36924e15345648b0cecc38f (diff)
parent2859ee2fa8c7f3311c069a40ada3975d31e8eccf (diff)
downloadmitmproxy-9ee96f022764c71a4a776956037230d6ef4fee7e.tar.gz
mitmproxy-9ee96f022764c71a4a776956037230d6ef4fee7e.tar.bz2
mitmproxy-9ee96f022764c71a4a776956037230d6ef4fee7e.zip
Merge master
Diffstat (limited to 'docs/ci')
-rwxr-xr-xdocs/ci5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/ci b/docs/ci
index 1584c5e1..ab442257 100755
--- a/docs/ci
+++ b/docs/ci
@@ -1,13 +1,14 @@
#!/bin/bash
+set -e
# This script gets run from CI to render and upload docs
-./build
+./build-current
# Only upload if we have defined credentials - we only have these defined for
# trusted commits (i.e. not PRs).
if [[ ! -z "${AWS_ACCESS_KEY_ID}" && $TRAVIS_BRANCH == "master" ]]; then
aws s3 sync --acl public-read ./public s3://docs.mitmproxy.org/master
aws cloudfront create-invalidation --distribution-id E1TH3USJHFQZ5Q \
- --paths "/master"
+ --paths "/master/*"
fi