Skip to content

Commit ad24d0b

Browse files
committed
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 2181ed6 commit ad24d0b

File tree

7 files changed

+29
-107
lines changed

7 files changed

+29
-107
lines changed

.editorconfig

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
root = true
2+
3+
[*]
4+
end_of_line = lf
5+
insert_final_newline = true
6+
charset = utf-8
7+
indent_size = 1
8+
indent_style = space
9+
trim_trailing_whitespace = true
10+
max_line_length = 100
11+
12+
[Makefile]
13+
indent_style = tab
14+
15+
[.travis.yml]
16+
indent_size = 2

.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
* text=auto
2+
*.bs diff=html linguist-language=HTML

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/mimesniff.spec.whatwg.org/
22
deploy_key
33
deploy_key.pub
4+
deploy.sh
45
mimesniff.html

.travis.yml

+5-9
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,12 @@ language: generic
22

33
env:
44
global:
5-
- ENCRYPTION_LABEL: "41e7267a37f4"
6-
addons:
7-
apt:
8-
packages:
9-
- oracle-java8-set-default
10-
install:
11-
- curl -O https://sideshowbarker.net/nightlies/jar/vnu.jar
5+
- ENCRYPTION_LABEL="41e7267a37f4"
6+
- DEPLOY_USER="annevankesteren"
7+
128
script:
13-
- bash ./deploy.sh
14-
- /usr/lib/jvm/java-8-oracle/jre/bin/java -jar vnu.jar --skip-non-html /home/travis/build/whatwg/mimesniff
9+
- curl --remote-name --fail https://resources.whatwg.org/build/deploy.sh && bash ./deploy.sh
10+
1511
notifications:
1612
email:
1713
on_success: never

Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@ local: mimesniff.bs
33

44
remote: mimesniff.bs
55
curl https://api.csswg.org/bikeshed/ -f -F [email protected] > mimesniff.html -F md-Text-Macro="SNAPSHOT-LINK LOCAL COPY"
6+
7+
deploy: mimesniff.bs
8+
curl --remote-name --fail https://resources.whatwg.org/build/deploy.sh && bash ./deploy.sh

README.md

+2-5
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ If you want to preview the spec locally, you can either use a locally installed
2727
running `make remote`.
2828

2929
If you want to do a complete "local deploy" including commit and/or branch snapshots, run
30-
31-
```
32-
./deploy.sh --local
33-
```
30+
`make deploy`.
3431

3532
### Merge policy
3633

@@ -40,4 +37,4 @@ If you can commit to this repository, see the
4037
### Tests
4138

4239
Tests have not yet been created.
43-
[Contributions welcome!](https://github.com/w3c/web-platform-tests/issues/1851).
40+
[Contributions welcome!](https://github.com/w3c/web-platform-tests/issues/1851)

deploy.sh

-93
This file was deleted.

0 commit comments

Comments
 (0)