From 8792e072108b46cda4d80a9d47d43e3c460e5c62 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Wed, 7 Mar 2018 08:00:55 +1300 Subject: docs: enable upload to docs.mitmproxy.org/master --- docs/ci | 13 +++++++++++++ docs/upload-master | 8 -------- 2 files changed, 13 insertions(+), 8 deletions(-) create mode 100755 docs/ci delete mode 100755 docs/upload-master (limited to 'docs') 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" -- cgit v1.2.3 From fc23deb9f3c2fff469fa3911d665292de860938a Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Wed, 7 Mar 2018 10:25:38 +1300 Subject: release: revamped release upload process --- docs/ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/ci b/docs/ci index 416738ae..94157116 100755 --- a/docs/ci +++ b/docs/ci @@ -6,7 +6,7 @@ # 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 +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 E3UCZ4MLN4TO7U \ # --paths "/master" -- cgit v1.2.3 From 760882a3d1bf0ad6420bf10cdd24b83bfdf18a02 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Wed, 7 Mar 2018 22:45:08 +1300 Subject: docs: cloudfront invalidation --- docs/ci | 4 ++-- docs/upload-archive | 6 +++--- docs/upload-stable | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'docs') diff --git a/docs/ci b/docs/ci index 94157116..1584c5e1 100755 --- a/docs/ci +++ b/docs/ci @@ -8,6 +8,6 @@ # 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 E3UCZ4MLN4TO7U \ - # --paths "/master" + aws cloudfront create-invalidation --distribution-id E1TH3USJHFQZ5Q \ + --paths "/master" fi diff --git a/docs/upload-archive b/docs/upload-archive index 5622a2ae..86dd248e 100755 --- a/docs/upload-archive +++ b/docs/upload-archive @@ -12,6 +12,6 @@ SPATH="/archive/$1" aws configure set preview.cloudfront true aws --profile mitmproxy \ s3 sync --acl public-read ./public s3://docs.mitmproxy.org$SPATH -# aws --profile mitmproxy \ -# cloudfront create-invalidation --distribution-id E3UCZ4MLN4TO7U \ -# --paths "$SPATH" +aws --profile mitmproxy \ + cloudfront create-invalidation --distribution-id E1TH3USJHFQZ5Q \ + --paths "$SPATH" diff --git a/docs/upload-stable b/docs/upload-stable index 7c658113..c2c1267e 100755 --- a/docs/upload-stable +++ b/docs/upload-stable @@ -3,6 +3,6 @@ aws configure set preview.cloudfront true aws --profile mitmproxy \ s3 sync --acl public-read ./public s3://docs.mitmproxy.org/stable -# aws --profile mitmproxy \ -# cloudfront create-invalidation --distribution-id E3UCZ4MLN4TO7U \ -# --paths "/master" +aws --profile mitmproxy \ + cloudfront create-invalidation --distribution-id E1TH3USJHFQZ5Q \ + --paths "/stable" -- cgit v1.2.3