Skip to content

Commit c5a9af1

Browse files
committed
Merge branch 'wasm-3.0' into 'js-primitive-builtins/main'.
2 parents 6f2810b + 9aa45e8 commit c5a9af1

File tree

399 files changed

+73205
-8801
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

399 files changed

+73205
-8801
lines changed

.github/workflows/ci-interpreter.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: CI for interpreter & tests
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches: [ main, wasm-3.0 ]
66
paths: [ .github/**, interpreter/**, test/** ]
77

88
pull_request:
9-
branches: [ main ]
9+
branches: [ main, wasm-3.0 ]
1010
paths: [ .github/**, interpreter/**, test/** ]
1111

1212
# Allows you to run this workflow manually from the Actions tab
@@ -27,8 +27,10 @@ jobs:
2727
- name: Setup Node.js
2828
uses: actions/setup-node@v4
2929
with:
30-
node-version: 19.x
30+
node-version: 20.x
3131
- name: Build interpreter
3232
run: cd interpreter && opam exec make
3333
- name: Run tests
34+
# TODO: reactiate node once it supports all of Wasm 3.0
35+
# run: cd interpreter && opam exec make JS=node ci
3436
run: cd interpreter && opam exec make ci

.github/workflows/ci-spec.yml

Lines changed: 79 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: CI for specs
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches: [ main, wasm-3.0 ]
66
paths: [ .github/**, document/** ]
77

88
pull_request:
9-
branches: [ main ]
9+
branches: [ main, wasm-3.0 ]
1010
paths: [ .github/**, document/** ]
1111

1212
# Allows you to run this workflow manually from the Actions tab
@@ -70,6 +70,60 @@ jobs:
7070
name: web-api-rendered
7171
path: document/web-api/index.html
7272

73+
build-code-metadata-spec:
74+
runs-on: ubuntu-latest
75+
needs: [build-core-spec]
76+
steps:
77+
- name: Checkout repo
78+
uses: actions/checkout@v4
79+
with:
80+
submodules: "recursive"
81+
- name: Setup TexLive
82+
run: sudo apt-get update -y && sudo apt-get install -y latexmk texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
83+
- name: Setup Sphinx
84+
run: pip install six && pip install sphinx==5.1.0
85+
- name: Build main spec
86+
run: cd document/metadata/code && make main
87+
- name: Upload artifact
88+
uses: actions/upload-artifact@v4
89+
with:
90+
name: code-metadata-rendered
91+
path: document/metadata/code/_build/html
92+
93+
build-legacy-exceptions-core-spec:
94+
runs-on: ubuntu-latest
95+
steps:
96+
- name: Checkout repo
97+
uses: actions/checkout@v4
98+
with:
99+
submodules: "recursive"
100+
- name: Setup TexLive
101+
run: sudo apt-get update -y && sudo apt-get install -y latexmk texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
102+
- name: Setup Sphinx
103+
run: pip install six && pip install sphinx==5.1.0
104+
- name: Build main spec
105+
run: cd document/legacy/exceptions/core && make main
106+
- name: Upload artifact
107+
uses: actions/upload-artifact@v4
108+
with:
109+
name: legacy-exceptions-core-rendered
110+
path: document/legacy/exceptions/core/_build/html
111+
112+
build-legacy-exceptions-js-api-spec:
113+
runs-on: ubuntu-latest
114+
steps:
115+
- name: Checkout repo
116+
uses: actions/checkout@v2
117+
- name: Setup Bikeshed
118+
run: pip install bikeshed && bikeshed update
119+
- name: Run Bikeshed
120+
run: bikeshed spec "document/legacy/exceptions/js-api/index.bs" "document/legacy/exceptions/js-api/index.html"
121+
- name: Upload artifact
122+
uses: actions/upload-artifact@v4
123+
with:
124+
name: legacy-exceptions-js-api-rendered
125+
path: document/legacy/exceptions/js-api/index.html
126+
73127
build-spec-versions:
74128
runs-on: ubuntu-latest
75129
steps:
@@ -83,7 +137,14 @@ jobs:
83137

84138
publish-spec:
85139
runs-on: ubuntu-latest
86-
needs: [build-core-spec, build-js-api-spec, build-web-api-spec, build-spec-versions]
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
87148
steps:
88149
- name: Checkout repo
89150
uses: actions/checkout@v4
@@ -104,6 +165,21 @@ jobs:
104165
with:
105166
name: web-api-rendered
106167
path: _output/web-api
168+
- name: Download code metadata spec artifact
169+
uses: actions/download-artifact@v4
170+
with:
171+
name: code-metadata-rendered
172+
path: _output/metadata/code
173+
- name: Download legacy exceptions core spec artifact
174+
uses: actions/download-artifact@v4
175+
with:
176+
name: legacy-exceptions-core-rendered
177+
path: _output/legacy/exceptions/core
178+
- name: Download legacy exceptions JS API spec artifact
179+
uses: actions/download-artifact@v4
180+
with:
181+
name: legacy-exceptions-js-api-rendered
182+
path: _output/legacy/exceptions/js-api
107183
- name: Download spec versions artifacts
108184
uses: actions/download-artifact@v4
109185
with:

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ Original `README` from upstream repository follows...
1515

1616
# spec
1717

18-
This repository holds the sources for the WebAssembly draft specification
19-
(to seed a future
20-
[WebAssembly Working Group](https://lists.w3.org/Archives/Public/public-new-work/2017Jun/0005.html)),
21-
a reference implementation, and the official testsuite.
18+
This repository holds the sources for the WebAssembly specification,
19+
a reference implementation, and the official test suite.
2220

2321
A formatted version of the spec is available here:
2422
[webassembly.github.io/spec](https://webassembly.github.io/spec/),

document/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
DIRS = js-api web-api core versions
1+
DIRS = core js-api web-api metadata/code legacy/exceptions versions
22
FILES = index.html
33
BUILDDIR = _build
44
TAR = tar

0 commit comments

Comments
 (0)