Skip to content

Commit eb8f31c

Browse files
committed
Merge branch 'wasm-3.0' into wasm-3.0+relaxed
2 parents bc87071 + f501994 commit eb8f31c

File tree

27 files changed

+940
-282
lines changed

27 files changed

+940
-282
lines changed

.github/workflows/ci-spec.yml

Lines changed: 36 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Run Bikeshed
3636
run: cd document/core && make bikeshed
3737
- name: Upload artifact
38-
uses: actions/upload-artifact@v2
38+
uses: actions/upload-artifact@v4
3939
with:
4040
name: core-rendered
4141
path: document/core/_build/html
@@ -50,7 +50,7 @@ jobs:
5050
- name: Run Bikeshed
5151
run: bikeshed spec "document/js-api/index.bs" "document/js-api/index.html"
5252
- name: Upload artifact
53-
uses: actions/upload-artifact@v2
53+
uses: actions/upload-artifact@v4
5454
with:
5555
name: js-api-rendered
5656
path: document/js-api/index.html
@@ -65,7 +65,7 @@ jobs:
6565
- name: Run Bikeshed
6666
run: bikeshed spec "document/web-api/index.bs" "document/web-api/index.html"
6767
- name: Upload artifact
68-
uses: actions/upload-artifact@v2
68+
uses: actions/upload-artifact@v4
6969
with:
7070
name: web-api-rendered
7171
path: document/web-api/index.html
@@ -85,7 +85,7 @@ jobs:
8585
- name: Build main spec
8686
run: cd document/metadata/code && make main
8787
- name: Upload artifact
88-
uses: actions/upload-artifact@v2
88+
uses: actions/upload-artifact@v4
8989
with:
9090
name: code-metadata-rendered
9191
path: document/metadata/code/_build/html
@@ -104,7 +104,7 @@ jobs:
104104
- name: Build main spec
105105
run: cd document/legacy/exceptions/core && make main
106106
- name: Upload artifact
107-
uses: actions/upload-artifact@v2
107+
uses: actions/upload-artifact@v4
108108
with:
109109
name: legacy-exceptions-core-rendered
110110
path: document/legacy/exceptions/core/_build/html
@@ -119,49 +119,72 @@ jobs:
119119
- name: Run Bikeshed
120120
run: bikeshed spec "document/legacy/exceptions/js-api/index.bs" "document/legacy/exceptions/js-api/index.html"
121121
- name: Upload artifact
122-
uses: actions/upload-artifact@v2
122+
uses: actions/upload-artifact@v4
123123
with:
124124
name: legacy-exceptions-js-api-rendered
125125
path: document/legacy/exceptions/js-api/index.html
126126

127+
build-spec-versions:
128+
runs-on: ubuntu-latest
129+
steps:
130+
- name: Checkout repo
131+
uses: actions/checkout@v2
132+
- name: Upload artifacts
133+
uses: actions/upload-artifact@v4
134+
with:
135+
name: versions-rendered
136+
path: document/versions/
137+
127138
publish-spec:
128139
runs-on: ubuntu-latest
129-
needs: [build-core-spec, build-js-api-spec, build-web-api-spec, build-code-metadata-spec, build-legacy-exceptions-core-spec, build-legacy-exceptions-js-api-spec]
140+
needs:
141+
- build-core-spec
142+
- build-js-api-spec
143+
- build-web-api-spec
144+
- build-code-metadata-spec
145+
- build-legacy-exceptions-core-spec
146+
- build-legacy-exceptions-js-api-spec
147+
- build-spec-versions
130148
steps:
131149
- name: Checkout repo
132150
uses: actions/checkout@v2
133151
- name: Create output directory
134152
run: mkdir _output && cp document/index.html _output/index.html
135153
- name: Download core spec artifact
136-
uses: actions/download-artifact@v2
154+
uses: actions/download-artifact@v4
137155
with:
138156
name: core-rendered
139157
path: _output/core
140158
- name: Download JS API spec artifact
141-
uses: actions/download-artifact@v2
159+
uses: actions/download-artifact@v4
142160
with:
143161
name: js-api-rendered
144162
path: _output/js-api
145163
- name: Download Web API spec artifact
146-
uses: actions/download-artifact@v2
164+
uses: actions/download-artifact@v4
147165
with:
148166
name: web-api-rendered
149167
path: _output/web-api
150168
- name: Download code metadata spec artifact
151-
uses: actions/download-artifact@v2
169+
uses: actions/download-artifact@v4
152170
with:
153171
name: code-metadata-rendered
154172
path: _output/metadata/code
155173
- name: Download legacy exceptions core spec artifact
156-
uses: actions/download-artifact@v2
174+
uses: actions/download-artifact@v4
157175
with:
158176
name: legacy-exceptions-core-rendered
159177
path: _output/legacy/exceptions/core
160178
- name: Download legacy exceptions JS API spec artifact
161-
uses: actions/download-artifact@v2
179+
uses: actions/download-artifact@v4
162180
with:
163181
name: legacy-exceptions-js-api-rendered
164182
path: _output/legacy/exceptions/js-api
183+
- name: Download spec versions artifacts
184+
uses: actions/download-artifact@v4
185+
with:
186+
name: versions-rendered
187+
path: _output/versions
165188
- name: Publish to GitHub Pages
166189
if: github.ref == 'refs/heads/main'
167190
uses: peaceiris/actions-gh-pages@v3

.github/workflows/w3c-publish.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,23 @@ on:
55
branches: [ main ]
66
paths: [ .github/**, document/** ]
77

8-
# Allows you to run this workflow manually from the Actions tab
8+
# Allows you to run this workflow manually from the Actions tab, gh CLI tool,
9+
# or REST API. THe w3c-status options correspond to the valid options for
10+
# Bikeshed's --md-status flag, and refer to the W3C rec-track document
11+
# stages described in https://www.w3.org/policies/process/#maturity-stages
12+
# (Editor's Draft, Working Draft, Candidiate Recommendation Draft, and
13+
# Candidate Recommendation Snapshot).
914
workflow_dispatch:
1015
inputs:
1116
w3c-status:
1217
required: true
13-
type: string
18+
type: choice
19+
description: W3C Document Status
20+
options:
21+
- ED
22+
- WD
23+
- CRD
24+
- CR
1425

1526
jobs:
1627
publish-to-w3c-TR:
@@ -34,7 +45,7 @@ jobs:
3445
- name: Publish all specs to their https://www.w3.org/TR/ URLs
3546
run: cd document && make -e WD-echidna-CI
3647
env:
37-
W3C_STATUS: ${{ github.event_name == 'push' && 'WD' || inputs.w3c-status }}
48+
W3C_STATUS: ${{ github.event_name == 'push' && 'CRD' || inputs.w3c-status }}
3849
W3C_ECHIDNA_TOKEN_CORE: ${{ secrets.W3C_ECHIDNA_TOKEN_CORE }}
3950
W3C_ECHIDNA_TOKEN_JSAPI: ${{ secrets.W3C_ECHIDNA_TOKEN_JSAPI }}
4051
W3C_ECHIDNA_TOKEN_WEBAPI: ${{ secrets.W3C_ECHIDNA_TOKEN_WEBAPI }}

document/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
DIRS = core js-api web-api metadata/code legacy/exceptions
1+
DIRS = core js-api web-api metadata/code legacy/exceptions versions
22
FILES = index.html
33
BUILDDIR = _build
44
TAR = tar
@@ -60,7 +60,7 @@ $(DIRS:%=build-%): build-%:
6060
(cd $(@:build-%=%); make BUILDDIR=$(BUILDDIR) all)
6161

6262
.PHONY: $(DIRS:%=dir-%)
63-
$(DIRS:%=dir-%): dir-%:
63+
$(DIRS:%=dir-%): dir-%: $(BUILDDIR)
6464
mkdir -p $(BUILDDIR)/$(@:dir-%=%)
6565
rm -rf $(BUILDDIR)/$(@:dir-%=%)/*
6666
cp -R $(@:dir-%=%)/$(BUILDDIR)/html/* $(BUILDDIR)/$(@:dir-%=%)/

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 \

0 commit comments

Comments
 (0)