Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Meta: update spec deploy and editing infrastructure #478

Merged
merged 1 commit into from
Feb 7, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
@@ -1,4 +1,5 @@
/fetch.spec.whatwg.org/
deploy_key
deploy_key.pub
deploy.sh
fetch.html
12 changes: 3 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,10 @@ language: generic

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It occurs to me we could dedupe this with "make deploy"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll leave it for now since that would require instruction changes in whatwg/meta too. Maybe something to ponder once you add support for additional resources to be copied over.

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: fetch.bs

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

deploy: fetch.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 @@ -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`.

#### Formatting

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

This file was deleted.