diff --git a/.travis.yml b/.travis.yml index 1cc66109..10e1814f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,9 @@ sudo: false go: - 1.4 +env: + - PATH="${PATH}:${HOME}/.local/bin" + addons: apt: packages: @@ -11,6 +14,11 @@ addons: install: - go clean -i net - go install -tags netgo std + - pip install --user --upgrade gcloud gsutil + - openssl aes-256-cbc + -K $encrypted_5ba036e89377_key -iv $encrypted_5ba036e89377_iv + -in bin/setup-ci-secrets.enc -out bin/setup-ci-secrets -d + - chmod +x bin/setup-ci-secrets - make travis script: @@ -20,3 +28,5 @@ script: after_success: - go get github.com/mattn/goveralls - $HOME/gopath/bin/goveralls -coverprofile=profile.cov -service=travis-ci + - bin/setup-ci-secrets + - site/build-and-publish.sh diff --git a/bin/setup-ci-secrets.enc b/bin/setup-ci-secrets.enc new file mode 100644 index 00000000..b9d25c24 Binary files /dev/null and b/bin/setup-ci-secrets.enc differ diff --git a/bin/setup-ci-secrets.readme b/bin/setup-ci-secrets.readme new file mode 100644 index 00000000..16b37e81 --- /dev/null +++ b/bin/setup-ci-secrets.readme @@ -0,0 +1,21 @@ +This is the shape of unencrypted `setup-ci-secrets` + +cat > /tmp/boto_gsutil_cert.pem << EOF +-----BEGIN PRIVATE KEY----- +<...> +-----END PRIVATE KEY----- +EOF + +cat > ~/.boto << EOF +[Credentials] +gs_service_client_id = <...> +gs_service_key_file = /tmp/boto_gsutil_cert.pem + +[Boto] +https_validate_certificates = True + +[GSUtil] +content_language = en +default_api_version = 2 +default_project_id = <...> +EOF diff --git a/site/Gemfile b/site/Gemfile new file mode 100644 index 00000000..e8a70063 --- /dev/null +++ b/site/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' + +gem 'jekyll' diff --git a/site/_config.yml b/site/_config.yml index cfb2b170..1d373602 100644 --- a/site/_config.yml +++ b/site/_config.yml @@ -2,3 +2,9 @@ markdown: redcarpet redcarpet: extensions: ['fenced_code_blocks', 'smart'] + +exclude: + - 'Gemfile' + - 'Gemfile.lock' + - 'params.json' + - 'build-and-publish.sh' diff --git a/site/build-and-publish.sh b/site/build-and-publish.sh new file mode 100755 index 00000000..41961ac1 --- /dev/null +++ b/site/build-and-publish.sh @@ -0,0 +1,14 @@ +#!/bin/sh -ex + +cd $(dirname $0)/ + +## Use GCS until we set up Route53/CloudFront/S3 + +BRANCH=${TRAVIS_BRANCH:-`git rev-parse --abbrev-ref @`} +COMMIT=${TRAVIS_COMMIT:-`git rev-parse @`} + +export BRANCH COMMIT + +bundle install --path=.bundle +bundle exec jekyll build --verbose +gsutil -m cp -z html,css -a public-read -R _site gs://docs.weave.works/weave/${BRANCH}/${COMMIT}