Skip to content

Commit 6032a3f

Browse files
dhildhil
committed
Merge branch 'main' of github.com:WebAssembly/spec into wasmfx-merge
2 parents 6d01dfc + ee82c8e commit 6032a3f

File tree

13 files changed

+249
-20
lines changed

13 files changed

+249
-20
lines changed

‎.github/workflows/w3c-publish.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77

88
# Allows you to run this workflow manually from the Actions tab
99
workflow_dispatch:
10+
inputs:
11+
w3c-status:
12+
required: true
13+
type: string
1014

1115
jobs:
1216
publish-to-w3c-TR:
@@ -30,7 +34,7 @@ jobs:
3034
- name: Publish all specs to their https://www.w3.org/TR/ URLs
3135
run: cd document && make -e WD-echidna-CI
3236
env:
33-
STATUS: --md-status=WD
37+
W3C_STATUS: ${{ github.event_name == 'push' && 'WD' || inputs.w3c-status }}
3438
W3C_ECHIDNA_TOKEN_CORE: ${{ secrets.W3C_ECHIDNA_TOKEN_CORE }}
3539
W3C_ECHIDNA_TOKEN_JSAPI: ${{ secrets.W3C_ECHIDNA_TOKEN_JSAPI }}
3640
W3C_ECHIDNA_TOKEN_WEBAPI: ${{ secrets.W3C_ECHIDNA_TOKEN_WEBAPI }}

‎document/LICENSE‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
This document is licensed under the W3C Software and Document License.
2+
Its text can be found at https://www.w3.org/copyright/software-license/

‎document/Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,21 @@ diff: $(DIRS:%=diff-%)
2828
# macOS: do “brew install tar” & run “make” as: TAR=gtar make -e WD-tar
2929
.PHONY: WD-tar
3030
WD-tar:
31-
for dir in $(DIRS); \
32-
do STATUS=--md-status=WD TAR=$(TAR) $(MAKE) -e -C $$dir $@;\
31+
for dir in $(DIRS); do \
32+
TAR=$(TAR) $(MAKE) -e -C $$dir $@ || exit 1; \
3333
done
3434

3535
# macOS: do “brew install tar” & run “make” as: TAR=gtar make -e WD-echidna
3636
.PHONY: WD-echidna
3737
WD-echidna:
38-
for dir in $(DIRS); \
39-
do $(MAKE) -e -C $$dir $@;\
38+
for dir in $(DIRS); do \
39+
$(MAKE) -e -C $$dir $@ || exit 1; \
4040
done
4141

4242
.PHONY: WD-echidna-CI
4343
WD-echidna-CI:
44-
for dir in $(DIRS); \
45-
do $(MAKE) -e -C $$dir $@;\
44+
for dir in $(DIRS); do \
45+
$(MAKE) -e -C $$dir $@ || exit 1; \
4646
done
4747

4848
# Directory-specific targets.

‎document/core/Makefile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#
33

44
# You can set these variables from the command line.
5+
W3C_STATUS = ED
56
SPHINXOPTS =
67
SPHINXBUILD = sphinx-build
78
PAPER = a4
@@ -154,7 +155,7 @@ bikeshed: $(GENERATED)
154155
@echo
155156
@echo =========================================================================
156157
mkdir -p $(BUILDDIR)/bikeshed_mathjax/
157-
bikeshed spec $(STATUS) index.bs $(BUILDDIR)/bikeshed_mathjax/index.html
158+
bikeshed spec --md-status=$(W3C_STATUS) index.bs $(BUILDDIR)/bikeshed_mathjax/index.html
158159
mkdir -p $(BUILDDIR)/html/bikeshed/
159160
(cd util/katex/ && yarn && yarn build && npm install --only=prod)
160161
python3 util/mathjax2katex.py $(BUILDDIR)/bikeshed_mathjax/index.html \
@@ -196,7 +197,7 @@ WD-echidna: WD-tar
196197
-F "tar=@$(BUILDDIR)/WD.tar" \
197198
-F "decision=$(DECISION_URL)" | tee $(BUILDDIR)/WD-echidna-id.txt
198199
@echo
199-
@echo "Published working draft. Check its status at https://labs.w3.org/echidna/api/status?id=`cat $(BUILDDIR)/WD-echidna-id.txt`"
200+
@echo "Published $(W3C_STATUS). Check its status at https://labs.w3.org/echidna/api/status?id=`cat $(BUILDDIR)/WD-echidna-id.txt`"
200201

201202
.PHONY: WD-echidna-CI
202203
WD-echidna-CI: WD-tar
@@ -210,7 +211,7 @@ WD-echidna-CI: WD-tar
210211
-F "token=$(W3C_ECHIDNA_TOKEN_CORE)" \
211212
-F "decision=$(DECISION_URL)" | tee $(BUILDDIR)/WD-echidna-id.txt
212213
@echo
213-
@echo "Published working draft. Check its status at https://labs.w3.org/echidna/api/status?id=`cat $(BUILDDIR)/WD-echidna-id.txt`"
214+
@echo "Published $(W3C_STATUS). Check its status at https://labs.w3.org/echidna/api/status?id=`cat $(BUILDDIR)/WD-echidna-id.txt`"
214215

215216
.PHONY: diff
216217
diff: bikeshed

‎document/core/index.bs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Issue Tracking: GitHub https://github.com/WebAssembly/spec/issues
77
Level: 2
88
TR: https://www.w3.org/TR/wasm-core-2/
99
ED: https://webassembly.github.io/spec/core/bikeshed/
10+
Implementation Report: https://webassembly.org/features/
1011
Editor: Andreas Rossberg, w3cid 82328
1112
Repository: WebAssembly/spec
1213
Markup Shorthands: css no, markdown no, algorithm no, idl no

‎document/core/static/custom.css‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,16 @@ body {
1515
font-size: 15px;
1616
}
1717

18-
div.document { width: 1000px; }
18+
div.document {
19+
width: unset;
20+
max-width: 1000px;
21+
}
1922
div.bodywrapper { margin: 0 0 0 200px; }
2023
div.body { padding: 0 10px 0 10px; }
21-
div.footer { width: 1000px; }
24+
div.footer {
25+
width: unset;
26+
max-width: 1000px;
27+
}
2228

2329
div.body h1 { font-size: 200%; }
2430
div.body h2 { font-size: 150%; }

‎document/js-api/Makefile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
W3C_STATUS = ED
12
BUILDDIR = _build
23
STATICDIR = _static
34
DOWNLOADDIR = _download
@@ -8,7 +9,7 @@ TAR = tar
89
.PHONY: all
910
all:
1011
mkdir -p $(BUILDDIR)/html
11-
bikeshed spec index.bs $(BUILDDIR)/html/index.html
12+
bikeshed spec --md-status=$(W3C_STATUS) index.bs $(BUILDDIR)/html/index.html
1213
@echo "Build finished. The HTML pages are in `pwd`/$(BUILDDIR)/html."
1314

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

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

‎document/js-api/index.bs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Issue Tracking: GitHub https://github.com/WebAssembly/spec/issues
77
Level: 2
88
TR: https://www.w3.org/TR/wasm-js-api-2/
99
ED: https://webassembly.github.io/spec/js-api/
10+
Implementation Report: https://webassembly.org/features/
1011
Editor: Ms2ger, w3cid 46309, Igalia
1112
Repository: WebAssembly/spec
1213
Markup Shorthands: css no, markdown yes

‎document/web-api/Makefile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
W3C_STATUS = ED
12
BUILDDIR = _build
23
STATICDIR = _static
34
DOWNLOADDIR = _download
@@ -8,7 +9,7 @@ TAR = tar
89
.PHONY: all
910
all:
1011
mkdir -p $(BUILDDIR)/html
11-
bikeshed spec index.bs $(BUILDDIR)/html/index.html
12+
bikeshed spec --md-status=$(W3C_STATUS) index.bs $(BUILDDIR)/html/index.html
1213
@echo "Build finished. The HTML pages are in `pwd`/$(BUILDDIR)/html."
1314

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

@@ -62,4 +63,4 @@ WD-echidna-CI: WD-tar
6263
-F "token=$(W3C_ECHIDNA_TOKEN_WEBAPI)" \
6364
-F "decision=$(DECISION_URL)" | tee $(BUILDDIR)/WD-echidna-id.txt
6465
@echo
65-
@echo "Published working draft. Check its status at https://labs.w3.org/echidna/api/status?id=`cat $(BUILDDIR)/WD-echidna-id.txt`"
66+
@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/index.bs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Issue Tracking: GitHub https://github.com/WebAssembly/spec/issues
77
Level: 2
88
TR: https://www.w3.org/TR/wasm-web-api-2/
99
ED: https://webassembly.github.io/spec/web-api/
10+
Implementation Report: https://webassembly.org/features/
1011
Editor: Ms2ger, w3cid 46309, Igalia
1112
Repository: WebAssembly/spec
1213
Abstract: This document describes the integration of WebAssembly with the broader web platform.

0 commit comments

Comments
 (0)