aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2018-03-07 08:00:55 +1300
committerAldo Cortesi <aldo@corte.si>2018-03-07 09:01:51 +1300
commit8792e072108b46cda4d80a9d47d43e3c460e5c62 (patch)
tree64c0716ced19fe0c3c398f7ed6e90b3e90ed6ec1 /docs
parentcc00b03554d84a37b55f911a84d70b6d7909c9cb (diff)
downloadmitmproxy-8792e072108b46cda4d80a9d47d43e3c460e5c62.tar.gz
mitmproxy-8792e072108b46cda4d80a9d47d43e3c460e5c62.tar.bz2
mitmproxy-8792e072108b46cda4d80a9d47d43e3c460e5c62.zip
docs: enable upload to docs.mitmproxy.org/master
Diffstat (limited to 'docs')
-rwxr-xr-xdocs/ci13
-rwxr-xr-xdocs/upload-master8
2 files changed, 13 insertions, 8 deletions
diff --git a/docs/ci b/docs/ci
new file mode 100755
index 00000000..416738ae
--- /dev/null
+++ b/docs/ci
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# This script gets run from CI to render and upload docs
+
+./build
+
+# 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 == "updocs" ]]; then
+ aws s3 sync --acl public-read ./public s3://docs.mitmproxy.org/master
+ # aws cloudfront create-invalidation --distribution-id E3UCZ4MLN4TO7U \
+ # --paths "/master"
+fi
diff --git a/docs/upload-master b/docs/upload-master
deleted file mode 100755
index c8fcda80..00000000
--- a/docs/upload-master
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-aws configure set preview.cloudfront true
-aws --profile mitmproxy \
- s3 sync --acl public-read ./public s3://docs.mitmproxy.org/master
-# aws --profile mitmproxy \
-# cloudfront create-invalidation --distribution-id E3UCZ4MLN4TO7U \
-# --paths "/master"