From 56f9f42836d8eea7224188604eef13890d720c84 Mon Sep 17 00:00:00 2001 From: Mounir Lamouri Date: Wed, 27 Apr 2016 22:29:58 +0100 Subject: [PATCH 01/11] Add automatic deployment from 'master' to 'gh-pages'. Using @domenic's guide: https://gist.github.com/domenic/ec8b0fc8ab45f39403dd --- .gitignore | 1 + .travis.yml | 8 + deploy.sh | 63 +++ deploy_key.enc | Bin 0 -> 3248 bytes index.bs | 894 ------------------------------------ published/FPWD.html | 1071 ------------------------------------------- 6 files changed, 72 insertions(+), 1965 deletions(-) create mode 100644 .gitignore create mode 100644 .travis.yml create mode 100644 deploy.sh create mode 100644 deploy_key.enc delete mode 100644 index.bs delete mode 100644 published/FPWD.html diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8f00ed6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +deploy_key diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..42f58a4 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,8 @@ +language: generic + +script: bash ./deploy.sh + +env: + global: + - ENCRYPTION_LABEL: 104fbe69e8fa + - COMMIT_AUTHOR_EMAIL: travis-ci@w3.org diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 0000000..be8e31e --- /dev/null +++ b/deploy.sh @@ -0,0 +1,63 @@ +#!/bin/bash +set -e # Exit with nonzero exit code if anything fails + +SOURCE_BRANCH="master" +TARGET_BRANCH="gh-pages" + +function doCompile { + curl https://api.csswg.org/bikeshed/ -f -F file=@index.bs > index.html; +} + +# Pull requests and commits to other branches shouldn't try to deploy, just build to verify +if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "$SOURCE_BRANCH" ]; then + echo "Skipping deploy; just doing a build." + doCompile + exit 0 +fi + +# Save some useful information +REPO=`git config remote.origin.url` +SSH_REPO=${REPO/https:\/\/github.com\//git@github.com:} +SHA=`git rev-parse --verify HEAD` + +# Clone the existing gh-pages for this repo into out/ +# Create a new empty branch if gh-pages doesn't exist yet (should only happen on first deply) +git clone $REPO out +cd out +git checkout $TARGET_BRANCH || git checkout --orphan $TARGET_BRANCH +cd .. + +# Clean out existing contents +rm -rf out/**/* || exit 0 + +# Run our compile script +doCompile + +# Now let's go have some fun with the cloned repo +cd out +git config user.name "Travis CI" +git config user.email "$COMMIT_AUTHOR_EMAIL" + +# If there are no changes to the compiled out (e.g. this is a README update) then just bail. +if [ -z `git diff --exit-code` ]; then + echo "No changes to the output on this push; exiting." + exit 0 +fi + +# Commit the "changes", i.e. the new version. +# The delta will show diffs between new and old versions. +git add . +git commit -m "Deploy to GitHub Pages: ${SHA}" + +# Get the deploy key by using Travis's stored variables to decrypt deploy_key.enc +ENCRYPTED_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key" +ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv" +ENCRYPTED_KEY=${!ENCRYPTED_KEY_VAR} +ENCRYPTED_IV=${!ENCRYPTED_IV_VAR} +openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in deploy_key.enc -out deploy_key -d +chmod 600 deploy_key +eval `ssh-agent -s` +ssh-add deploy_key + +# Now that we're all set up, we can push. +git push $SSH_REPO $TARGET_BRANCH diff --git a/deploy_key.enc b/deploy_key.enc new file mode 100644 index 0000000000000000000000000000000000000000..72f382850da84d90b8e935c876837cf925137aec GIT binary patch literal 3248 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