Skip to content

Commit

Permalink
Meta: update spec deploy and editing infrastructure
Browse files Browse the repository at this point in the history
- Updates to the deduplicated deploy script; part of whatwg/meta#6
- As such, stops deploying commit snapshots for branches; part of whatwg/meta#9
- Fixes .travis.yml syntax; part of whatwg/meta#4
- Adds .gitattributes and .editorconfig; part of whatwg/meta#7
  • Loading branch information
domenic authored Jan 24, 2017
1 parent 6b76212 commit 4c5c099
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 106 deletions.
16 changes: 16 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
* text=auto
*.bs diff=html linguist-language=HTML
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
deploy_key
deploy_key.pub
dom.html
deploy.sh
14 changes: 5 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@ language: generic

env:
global:
- ENCRYPTION_LABEL: "0a03797be0f9"
addons:
apt:
packages:
- oracle-java8-set-default
install:
- curl -O https://sideshowbarker.net/nightlies/jar/vnu.jar
- ENCRYPTION_LABEL="0a03797be0f9"
- 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/dom
- curl --remote-name --fail https://resources.whatwg.org/build/deploy.sh && bash ./deploy.sh

notifications:
email:
on_success: never
Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ local: dom.bs

remote: dom.bs
curl https://api.csswg.org/bikeshed/ -f -F [email protected] > dom.html -F md-Text-Macro="SNAPSHOT-LINK LOCAL COPY"

deploy: url.bs
curl --remote-name --fail https://resources.whatwg.org/build/deploy.sh && bash ./deploy.sh
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,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`.

#### Formatting

Expand Down
93 changes: 0 additions & 93 deletions deploy.sh

This file was deleted.

0 comments on commit 4c5c099

Please sign in to comment.