diff options
| author | Aldo Cortesi <aldo@corte.si> | 2018-03-08 11:42:36 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-08 11:42:36 +1300 |
| commit | 56174783591700871249445ecefec79e6d6d1a6a (patch) | |
| tree | 48899437289ccafefa043e921ce5d1ac98899d9a /docs | |
| parent | 56904e02c36ddd9c08909ba9909f46bf223e3761 (diff) | |
| parent | 0debcf5bf92b71e58ad723629e35b7f5a3393656 (diff) | |
| download | mitmproxy-56174783591700871249445ecefec79e6d6d1a6a.tar.gz mitmproxy-56174783591700871249445ecefec79e6d6d1a6a.tar.bz2 mitmproxy-56174783591700871249445ecefec79e6d6d1a6a.zip | |
Merge pull request #2977 from mitmproxy/updocs2
Revamp CI generation of snapshots and documentation
Diffstat (limited to 'docs')
| -rwxr-xr-x | docs/ci | 13 | ||||
| -rwxr-xr-x | docs/upload-archive | 6 | ||||
| -rwxr-xr-x | docs/upload-master | 8 | ||||
| -rwxr-xr-x | docs/upload-stable | 6 |
4 files changed, 19 insertions, 14 deletions
diff --git a/docs/ci b/docs/ci new file mode 100755 index 00000000..1584c5e1 --- /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 == "master" ]]; then + aws s3 sync --acl public-read ./public s3://docs.mitmproxy.org/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-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" 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" |