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

Makefile and indentation fixes #7

Merged
merged 3 commits into from
Apr 23, 2020
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
9 changes: 6 additions & 3 deletions .editorconfig.template
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@ root = true
end_of_line = lf
insert_final_newline = true
charset = utf-8
indent_size = 1
indent_size = 2
indent_style = space
trim_trailing_whitespace = true
max_line_length = 100

[Makefile]
indent_style = tab

[.travis.yml]
indent_size = 2
[*.bs]
indent_size = 1

[*.py]
indent_size = 4
14 changes: 7 additions & 7 deletions .pr-preview.json.template
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"src_file": "@@bs@@.bs",
"type": "bikeshed",
"params": {
"force": 1,
"md-status": "LS-PR",
"md-Text-Macro": "PR-NUMBER {{ pull_request.number }}"
}
"src_file": "@@bs@@.bs",
"type": "bikeshed",
"params": {
"force": 1,
"md-status": "LS-PR",
"md-Text-Macro": "PR-NUMBER {{ pull_request.number }}"
}
}
15 changes: 13 additions & 2 deletions Makefile.template
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,21 @@ SHELL=/bin/bash -o pipefail
.PHONY: local remote deploy review

remote: @@bs@@.bs
curl https://api.csswg.org/bikeshed/ -f -F file=@@@bs@@.bs > @@bs@@.html -F md-Text-Macro="SNAPSHOT-LINK LOCAL COPY"
@ (HTTP_STATUS=$$(curl https://api.csswg.org/bikeshed/ \
--output @@bs@@.html \
--write-out "%{http_code}" \
--header "Accept: text/plain, text/html" \
-F die-on=warning \
-F md-Text-Macro="COMMIT-SHA LOCAL COPY" \
-F file=@@@bs@@.bs) && \
[[ "$$HTTP_STATUS" -eq "200" ]]) || ( \
echo ""; cat @@bs@@.html; echo ""; \
rm -f @@bs@@.html; \
exit 22 \
);

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

deploy: @@bs@@.bs
curl --remote-name --fail https://resources.whatwg.org/build/deploy.sh@@extra_files@@@@post_build_step@@
Expand Down