Permalink
Browse files

Meta: update spec deploy and editing infrastructure

- Updates to the deduplicated deploy script; part of whatwg/meta#11
- As such, stops deploying commit snapshots for branches
- Fixes .travis.yml syntax; part of whatwg/meta#4
- Adds .gitattributes and .editorconfig; part of whatwg/meta#7
1 parent a36be08 commit 0e1703382fae5b2da567244c663c185c7c383577 @annevk annevk committed Feb 15, 2017
Showing with 28 additions and 106 deletions.
  1. +16 −0 .editorconfig
  2. +2 −0 .gitattributes
  3. +1 −0 .gitignore
  4. +5 −9 .travis.yml
  5. +3 −0 Makefile
  6. +1 −4 README.md
  7. +0 −93 deploy.sh
View
@@ -0,0 +1,16 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_size = 1
+indent_style = space
+trim_trailing_whitespace = true
+max_line_length = 100
+
+[Makefile]
+indent_style = tab
+
+[.travis.yml]
+indent_size = 2
View
@@ -0,0 +1,2 @@
+* text=auto
+*.bs diff=html linguist-language=HTML
View
@@ -1,4 +1,5 @@
/fullscreen.spec.whatwg.org/
deploy_key
deploy_key.pub
+deploy.sh
fullscreen.html
View
@@ -2,16 +2,12 @@ language: generic
env:
global:
- - ENCRYPTION_LABEL: "f5b0eb183bc9"
-addons:
- apt:
- packages:
- - oracle-java8-set-default
-install:
- - curl -O https://sideshowbarker.net/nightlies/jar/vnu.jar
+ - ENCRYPTION_LABEL="f5b0eb183bc9"
+ - DEPLOY_USER="annevankesteren"
+
script:
- - bash ./deploy.sh
- - /usr/lib/jvm/java-8-oracle/jre/bin/java -jar vnu.jar --skip-non-html /home/travis/build/whatwg/fullscreen
+ - curl --remote-name --fail https://resources.whatwg.org/build/deploy.sh && bash ./deploy.sh
+
notifications:
email:
on_success: never
View
@@ -3,3 +3,6 @@ local: fullscreen.bs
remote: fullscreen.bs
curl https://api.csswg.org/bikeshed/ -f -F file=@fullscreen.bs > fullscreen.html -F md-Text-Macro="SNAPSHOT-LINK LOCAL COPY"
+
+deploy: fullscreen.bs
+ curl --remote-name --fail https://resources.whatwg.org/build/deploy.sh && bash ./deploy.sh
View
@@ -27,10 +27,7 @@ If you want to preview the spec locally, you can either use a locally installed
running `make remote`.
If you want to do a complete "local deploy" including commit and/or branch snapshots, run
-
-```
-./deploy.sh --local
-```
+`make deploy`.
### Merge policy
View
@@ -1,93 +0,0 @@
-#!/bin/bash
-set -e
-
-DEPLOY_USER="annevankesteren"
-
-TITLE="Fullscreen API Standard"
-LS_URL="https://fullscreen.spec.whatwg.org/"
-COMMIT_URL_BASE="https://github.com/whatwg/fullscreen/commit/"
-BRANCH_URL_BASE="https://github.com/whatwg/fullscreen/tree/"
-
-INPUT_FILE="fullscreen.bs"
-SERVER="fullscreen.spec.whatwg.org"
-WEB_ROOT="fullscreen.spec.whatwg.org"
-COMMITS_DIR="commit-snapshots"
-BRANCHES_DIR="branch-snapshots"
-
-if [ "$1" != "--local" -a "$DEPLOY_USER" == "" ]; then
- echo "No deploy credentials present; skipping deploy"
- exit 0
-fi
-
-if [ "$1" == "--local" ]; then
- echo "Running a local deploy into $WEB_ROOT directory"
- echo ""
-fi
-
-SHA="`git rev-parse HEAD`"
-BRANCH="`git rev-parse --abbrev-ref HEAD`"
-if [ "$BRANCH" == "HEAD" ]; then # Travis does this for some reason
- BRANCH=$TRAVIS_BRANCH
-fi
-
-if [ "$BRANCH" == "master" -a "$TRAVIS_PULL_REQUEST" != "false" -a "$TRAVIS_PULL_REQUEST" != "" ]; then
- echo "Skipping deploy for a pull request; the branch build will suffice"
- exit 0
-fi
-
-BACK_TO_LS_LINK="<a href=\"/\" id=\"commit-snapshot-link\">Go to the living standard</a>"
-SNAPSHOT_LINK="<a href=\"/commit-snapshots/$SHA/\" id=\"commit-snapshot-link\">Snapshot as of this commit</a>"
-
-echo "Branch = $BRANCH"
-echo "Commit = $SHA"
-echo ""
-
-rm -rf $WEB_ROOT || exit 0
-
-# Commit snapshot
-COMMIT_DIR=$WEB_ROOT/$COMMITS_DIR/$SHA
-mkdir -p $COMMIT_DIR
-curl https://api.csswg.org/bikeshed/ -f -F file=@$INPUT_FILE -F md-status=LS-COMMIT \
- -F md-warning="Commit $SHA $COMMIT_URL_BASE$SHA replaced by $LS_URL" \
- -F md-title="$TITLE (Commit Snapshot $SHA)" \
- -F md-Text-Macro="SNAPSHOT-LINK $BACK_TO_LS_LINK" \
- > $COMMIT_DIR/index.html;
-echo "Commit snapshot output to $WEB_ROOT/$COMMITS_DIR/$SHA"
-echo ""
-
-if [ $BRANCH != "master" ] ; then
- # Branch snapshot, if not master
- BRANCH_DIR=$WEB_ROOT/$BRANCHES_DIR/$BRANCH
- mkdir -p $BRANCH_DIR
- curl https://api.csswg.org/bikeshed/ -f -F file=@$INPUT_FILE -F md-status=LS-BRANCH \
- -F md-warning="Branch $BRANCH $BRANCH_URL_BASE$BRANCH replaced by $LS_URL" \
- -F md-title="$TITLE (Branch Snapshot $BRANCH)" \
- -F md-Text-Macro="SNAPSHOT-LINK $SNAPSHOT_LINK" \
- > $BRANCH_DIR/index.html;
- echo "Branch snapshot output to $WEB_ROOT/$BRANCHES_DIR/$BRANCH"
-else
- # Living standard, if master
- curl https://api.csswg.org/bikeshed/ -f -F file=@$INPUT_FILE \
- -F md-Text-Macro="SNAPSHOT-LINK $SNAPSHOT_LINK" \
- > $WEB_ROOT/index.html
- echo "Living standard output to $WEB_ROOT"
-fi
-
-echo ""
-find $WEB_ROOT -print
-echo ""
-
-if [ "$1" != "--local" ]; then
- # 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
-
- # scp the output directory up
- scp -r -o StrictHostKeyChecking=no $WEB_ROOT $DEPLOY_USER@$SERVER:
-fi

0 comments on commit 0e17033

Please sign in to comment.