Skip to content

Commit

Permalink
Meta: Review Draft infrastructure
Browse files Browse the repository at this point in the history
See whatwg/whatwg.org#197 and whatwg/meta#92 for details.

This also updates the IRC URL.
  • Loading branch information
annevk authored and domenic committed May 29, 2018
1 parent 23ce6ea commit d39fe99
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 21 deletions.
9 changes: 5 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/infra.spec.whatwg.org/
deploy_key
deploy_key.pub
deploy.sh
infra.html
/deploy_key
/deploy_key.pub
/deploy.sh
/infra.html
/review.sh
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ env:
- ENCRYPTION_LABEL="898853069421"

script:
- curl --remote-name --fail https://resources.whatwg.org/build/deploy.sh && bash ./deploy.sh
- make deploy

branches:
only:
Expand Down
13 changes: 9 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
local: infra.bs
bikeshed spec infra.bs infra.html --md-Text-Macro="SNAPSHOT-LINK LOCAL COPY"

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

local: infra.bs
bikeshed spec infra.bs infra.html --md-Text-Macro="SNAPSHOT-LINK LOCAL COPY"

deploy: infra.bs
curl --remote-name --fail https://resources.whatwg.org/build/deploy.sh && bash ./deploy.sh
curl --remote-name --fail https://resources.whatwg.org/build/deploy.sh
bash ./deploy.sh

review: infra.bs
curl --remote-name --fail https://resources.whatwg.org/build/review.sh
bash ./review.sh
23 changes: 11 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
This repository hosts the [Infra Standard](https://infra.spec.whatwg.org/).

### Code of conduct
## Code of conduct

We are committed to providing a friendly, safe and welcoming environment for all. Please read and
We are committed to providing a friendly, safe, and welcoming environment for all. Please read and
respect the [WHATWG Code of Conduct](https://whatwg.org/code-of-conduct).

### Contribution opportunities
## Contribution opportunities

Folks notice minor and larger issues with the Infra Standard all the time and we'd love
your help fixing those. Pull requests for typographical and grammar errors are also most welcome.

We'd be happy to mentor you through this process. If you're interested and need help getting
started, review the [WHATWG contributing guidelines](https://github.com/whatwg/meta/blob/master/CONTRIBUTING.md),
and leave a comment on the issue or ask around [on IRC](https://wiki.whatwg.org/wiki/IRC).
and leave a comment on the issue or ask around [on IRC](https://whatwg.org/irc).

### Pull requests
## Pull requests

In short, change `infra.bs` and submit your patch after reading through
[WHATWG committing best practices](https://github.com/whatwg/meta/blob/master/COMMITTING.md).
Expand All @@ -23,14 +23,13 @@ Lastly, please review the [WHATWG FAQ](https://wiki.whatwg.org/wiki/FAQ).
Please add your name to the Acknowledgments section in your first pull request, even for trivial
fixes. The names are sorted lexicographically.

If you want to preview the spec locally, you can either use a locally installed copy of
[Bikeshed](https://github.com/tabatkins/bikeshed) by running `make` or use the HTTP API version by
running `make remote`.
## Building "locally"

If you want to do a complete "local deploy" including commit and/or branch snapshots, run
`make deploy`.
For quick local iteration, run `make`. To verify your changes locally, run `make deploy`. See more
in the
[WHATWG Contributor Guidelines](https://github.com/whatwg/meta/blob/master/CONTRIBUTING.md#building).

#### Formatting
## Formatting

Use a column width of 100 characters.

Expand Down Expand Up @@ -82,7 +81,7 @@ is.
End tags must be omitted when possible and attribute values must not be quoted (if necessary, use
double quotes).

### Merge policy
## Merge policy

If you can commit to this repository, see the
[WHATWG maintainer guidelines](https://github.com/whatwg/meta/blob/master/MAINTAINERS.md).

0 comments on commit d39fe99

Please sign in to comment.