Skip to content

Commit 1726692

Browse files
authored
Generate deadline and pass to bikeshed as metadata (#1795)
The Makefiles now generate a date 30 days in the future, and pass this date to bikeshed as the standard 'Deadline' metadata. Along with speced/bikeshed-boilerplate#98, this causes the document status section to generate with a transition deadline always 30 from the generation time.
1 parent 1c238ab commit 1726692

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

document/core/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ DOWNLOADDIR = _download
1212
NAME = WebAssembly
1313
DECISION_URL = https://github.com/WebAssembly/meetings/blob/main/main/2024/WG-06-12.md
1414
TAR = tar
15+
DEADLINE = $(shell date -d "+30 days" +%Y-%m-%d 2>/dev/null || date -v +30d +%Y-%m-%d)
1516

1617
# Internal variables.
1718
PAPEROPT_a4 = -D latex_paper_size=a4
@@ -155,7 +156,7 @@ bikeshed: $(GENERATED)
155156
@echo
156157
@echo =========================================================================
157158
mkdir -p $(BUILDDIR)/bikeshed_mathjax/
158-
bikeshed spec --md-status=$(W3C_STATUS) index.bs $(BUILDDIR)/bikeshed_mathjax/index.html
159+
bikeshed spec --md-status=$(W3C_STATUS) --md-deadline=$(DEADLINE) index.bs $(BUILDDIR)/bikeshed_mathjax/index.html
159160
mkdir -p $(BUILDDIR)/html/bikeshed/
160161
(cd util/katex/ && yarn && yarn build && npm install --only=prod)
161162
python3 util/mathjax2katex.py $(BUILDDIR)/bikeshed_mathjax/index.html \

document/js-api/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ DOWNLOADDIR = _download
55
NAME = WebAssembly
66
DECISION_URL = https://github.com/WebAssembly/meetings/blob/main/main/2024/WG-06-12.md
77
TAR = tar
8+
DEADLINE = $(shell date -d "+30 days" +%Y-%m-%d 2>/dev/null || date -v +30d +%Y-%m-%d)
89

910
.PHONY: all
1011
all:
1112
mkdir -p $(BUILDDIR)/html
12-
bikeshed spec --md-status=$(W3C_STATUS) index.bs $(BUILDDIR)/html/index.html
13+
bikeshed spec --md-status=$(W3C_STATUS) --md-deadline=$(DEADLINE) index.bs $(BUILDDIR)/html/index.html
1314
@echo "Build finished. The HTML pages are in `pwd`/$(BUILDDIR)/html."
1415

1516
.PHONY: publish
@@ -34,7 +35,7 @@ diff: all
3435
# macOS tar has no “--transform” option (only GNU tar does), so on macOS,
3536
# do “brew install tar” & run “make” like this: “TAR=gtar make -e WD-tar”
3637
WD-tar: all
37-
bikeshed spec --md-status=$(W3C_STATUS) index.bs $(BUILDDIR)/html/index.html
38+
bikeshed spec --md-status=$(W3C_STATUS) --md-deadline=$(DEADLINE) index.bs $(BUILDDIR)/html/index.html
3839
$(TAR) -C $(BUILDDIR)/html --transform="s/index.html/Overview.html/" -cf $(BUILDDIR)/WD.tar index.html
3940
@echo "Built $(BUILDDIR)/WD.tar."
4041

@@ -63,4 +64,4 @@ WD-echidna-CI: WD-tar
6364
-F "token=$(W3C_ECHIDNA_TOKEN_JSAPI)" \
6465
-F "decision=$(DECISION_URL)" | tee $(BUILDDIR)/WD-echidna-id.txt
6566
@echo
66-
@echo "Published w$(W3C_STATUS). Check its status at https://labs.w3.org/echidna/api/status?id=`cat $(BUILDDIR)/WD-echidna-id.txt`"
67+
@echo "Published $(W3C_STATUS). Check its status at https://labs.w3.org/echidna/api/status?id=`cat $(BUILDDIR)/WD-echidna-id.txt`"

document/web-api/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ DOWNLOADDIR = _download
55
NAME = WebAssembly
66
DECISION_URL = https://github.com/WebAssembly/meetings/blob/main/main/2024/WG-06-12.md
77
TAR = tar
8+
DEADLINE = $(shell date -d "+30 days" +%Y-%m-%d 2>/dev/null || date -v +30d +%Y-%m-%d)
89

910
.PHONY: all
1011
all:
1112
mkdir -p $(BUILDDIR)/html
12-
bikeshed spec --md-status=$(W3C_STATUS) index.bs $(BUILDDIR)/html/index.html
13+
bikeshed spec --md-status=$(W3C_STATUS) --md-deadline=$(DEADLINE) index.bs $(BUILDDIR)/html/index.html
1314
@echo "Build finished. The HTML pages are in `pwd`/$(BUILDDIR)/html."
1415

1516
.PHONY: publish
@@ -34,7 +35,7 @@ diff: all
3435
# macOS tar has no “--transform” option (only GNU tar does), so on macOS,
3536
# do “brew install tar” & run “make” like this: “TAR=gtar make -e WD-tar”
3637
WD-tar: all
37-
bikeshed spec --md-status=$(W3C_STATUS) index.bs $(BUILDDIR)/html/index.html
38+
bikeshed spec --md-status=$(W3C_STATUS) --md-deadline=$(DEADLINE) index.bs $(BUILDDIR)/html/index.html
3839
$(TAR) -C $(BUILDDIR)/html --transform="s/index.html/Overview.html/" -cf $(BUILDDIR)/WD.tar index.html
3940
@echo "Built $(BUILDDIR)/WD.tar."
4041

0 commit comments

Comments
 (0)