Skip to content
This repository was archived by the owner on Apr 25, 2025. It is now read-only.

Commit 7378434

Browse files
rossbergrossberg
committed
Merge branch 'upstream'
2 parents 4d503df + 71755b3 commit 7378434

File tree

102 files changed

+2798
-2733
lines changed

Some content is hidden

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

102 files changed

+2798
-2733
lines changed

‎.github/workflows/ci-interpreter.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: CI for interpreter & tests
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
paths: [ .github/**, interpreter/**, test/** ]
7+
8+
pull_request:
9+
branches: [ main ]
10+
paths: [ .github/**, interpreter/**, test/** ]
11+
12+
# Allows you to run this workflow manually from the Actions tab
13+
workflow_dispatch:
14+
15+
jobs:
16+
interpreter:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Checkout repo
20+
uses: actions/checkout@v2
21+
- name: Setup OCaml
22+
uses: ocaml/setup-ocaml@v2
23+
with:
24+
ocaml-compiler: 4.12.x
25+
- name: Setup OCaml tools
26+
run: opam install --yes ocamlfind.1.9.5 js_of_ocaml.4.0.0 js_of_ocaml-ppx.4.0.0
27+
- name: Setup Node.js
28+
uses: actions/setup-node@v2
29+
with:
30+
node-version: 19.x
31+
- name: Build interpreter
32+
run: cd interpreter && opam exec make
33+
- name: Run tests
34+
run: cd interpreter && opam exec make JS=node ci

‎.github/workflows/ci-spec.yml

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
name: CI for specs
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
paths: [ .github/**, document/** ]
7+
8+
pull_request:
9+
branches: [ main ]
10+
paths: [ .github/**, document/** ]
11+
12+
# Allows you to run this workflow manually from the Actions tab
13+
workflow_dispatch:
14+
15+
jobs:
16+
build-core-spec:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Checkout repo
20+
uses: actions/checkout@v2
21+
with:
22+
submodules: "recursive"
23+
- name: Setup Node.js
24+
uses: actions/setup-node@v3
25+
with:
26+
node-version: 16
27+
- name: Setup Bikeshed
28+
run: pip install bikeshed && bikeshed update
29+
- name: Setup TexLive
30+
run: sudo apt-get update -y && sudo apt-get install -y latexmk texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
31+
- name: Setup Sphinx
32+
run: pip install six && pip install sphinx==5.1.0
33+
- name: Build main spec
34+
run: cd document/core && make main
35+
- name: Run Bikeshed
36+
run: cd document/core && make bikeshed
37+
- name: Upload artifact
38+
uses: actions/upload-artifact@v2
39+
with:
40+
name: core-rendered
41+
path: document/core/_build/html
42+
43+
build-js-api-spec:
44+
runs-on: ubuntu-latest
45+
steps:
46+
- name: Checkout repo
47+
uses: actions/checkout@v2
48+
- name: Setup Bikeshed
49+
run: pip install bikeshed && bikeshed update
50+
- name: Run Bikeshed
51+
run: bikeshed spec "document/js-api/index.bs" "document/js-api/index.html"
52+
- name: Upload artifact
53+
uses: actions/upload-artifact@v2
54+
with:
55+
name: js-api-rendered
56+
path: document/js-api/index.html
57+
58+
build-web-api-spec:
59+
runs-on: ubuntu-latest
60+
steps:
61+
- name: Checkout repo
62+
uses: actions/checkout@v2
63+
- name: Setup Bikeshed
64+
run: pip install bikeshed && bikeshed update
65+
- name: Run Bikeshed
66+
run: bikeshed spec "document/web-api/index.bs" "document/web-api/index.html"
67+
- name: Upload artifact
68+
uses: actions/upload-artifact@v2
69+
with:
70+
name: web-api-rendered
71+
path: document/web-api/index.html
72+
73+
publish-spec:
74+
runs-on: ubuntu-latest
75+
needs: [build-core-spec, build-js-api-spec, build-web-api-spec]
76+
steps:
77+
- name: Checkout repo
78+
uses: actions/checkout@v2
79+
- name: Create output directory
80+
run: mkdir _output && cp document/index.html _output/index.html
81+
- name: Download core spec artifact
82+
uses: actions/download-artifact@v2
83+
with:
84+
name: core-rendered
85+
path: _output/core
86+
- name: Download JS API spec artifact
87+
uses: actions/download-artifact@v2
88+
with:
89+
name: js-api-rendered
90+
path: _output/js-api
91+
- name: Download Web API spec artifact
92+
uses: actions/download-artifact@v2
93+
with:
94+
name: web-api-rendered
95+
path: _output/web-api
96+
- name: Publish to GitHub Pages
97+
if: github.ref == 'refs/heads/main'
98+
uses: peaceiris/actions-gh-pages@v3
99+
with:
100+
publish_dir: ./_output
101+
github_token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/main.yml

Lines changed: 0 additions & 105 deletions
This file was deleted.

‎.github/workflows/mirror.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎.github/workflows/w3c-publish.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Publish to W3C TR space
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
paths: [ .github/**, document/** ]
7+
8+
# Allows you to run this workflow manually from the Actions tab
9+
workflow_dispatch:
10+
inputs:
11+
w3c-status:
12+
required: true
13+
type: string
14+
15+
jobs:
16+
publish-to-w3c-TR:
17+
if: github.repository == 'WebAssembly/spec'
18+
runs-on: ubuntu-latest
19+
steps:
20+
- name: Checkout repo
21+
uses: actions/checkout@v2
22+
with:
23+
submodules: "recursive"
24+
- name: Setup Node.js
25+
uses: actions/setup-node@v3
26+
with:
27+
node-version: 16
28+
- name: Setup Bikeshed
29+
run: pip install bikeshed && bikeshed update
30+
- name: Setup TexLive
31+
run: sudo apt-get update -y && sudo apt-get install -y latexmk texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
32+
- name: Setup Sphinx
33+
run: pip install six && pip install sphinx==5.1.0
34+
- name: Publish all specs to their https://www.w3.org/TR/ URLs
35+
run: cd document && make -e WD-echidna-CI
36+
env:
37+
W3C_STATUS: ${{ github.event_name == 'push' && 'WD' || inputs.w3c-status }}
38+
W3C_ECHIDNA_TOKEN_CORE: ${{ secrets.W3C_ECHIDNA_TOKEN_CORE }}
39+
W3C_ECHIDNA_TOKEN_JSAPI: ${{ secrets.W3C_ECHIDNA_TOKEN_JSAPI }}
40+
W3C_ECHIDNA_TOKEN_WEBAPI: ${{ secrets.W3C_ECHIDNA_TOKEN_WEBAPI }}
41+
YARN_ENABLE_IMMUTABLE_INSTALLS: false

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
![Build Status](https://github.com/WebAssembly/multi-memory/actions/workflows/main.yml/badge.svg)
1+
[![CI for specs](https://github.com/WebAssembly/multi-memory/actions/workflows/ci-spec.yml/badge.svg)](https://github.com/WebAssembly/multi-memory/actions/workflows/ci-spec.yml)
2+
[![CI for interpreter & tests](https://github.com/WebAssembly/multi-memory/actions/workflows/ci-interpreter.yml/badge.svg)](https://github.com/WebAssembly/multi-memory/actions/workflows/ci-interpreter.yml)
23

34
# Multi Memory Proposal for WebAssembly
45

‎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: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
DIRS = core js-api web-api
1+
DIRS = js-api web-api core
22
FILES = index.html
33
BUILDDIR = _build
4+
TAR = tar
45

56
# Global targets.
67

@@ -24,6 +25,25 @@ clean: $(DIRS:%=clean-%)
2425
.PHONY: diff
2526
diff: $(DIRS:%=diff-%)
2627

28+
# macOS: do “brew install tar” & run “make” as: TAR=gtar make -e WD-tar
29+
.PHONY: WD-tar
30+
WD-tar:
31+
for dir in $(DIRS); do \
32+
TAR=$(TAR) $(MAKE) -e -C $$dir $@ || exit 1; \
33+
done
34+
35+
# macOS: do “brew install tar” & run “make” as: TAR=gtar make -e WD-echidna
36+
.PHONY: WD-echidna
37+
WD-echidna:
38+
for dir in $(DIRS); do \
39+
$(MAKE) -e -C $$dir $@ || exit 1; \
40+
done
41+
42+
.PHONY: WD-echidna-CI
43+
WD-echidna-CI:
44+
for dir in $(DIRS); do \
45+
$(MAKE) -e -C $$dir $@ || exit 1; \
46+
done
2747

2848
# Directory-specific targets.
2949

‎document/core/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
_build
22
_static
33
document/*.pyc
4-
appendix/index-instructions.rst

0 commit comments

Comments
 (0)