Function references merge

.github/workflows/main.yml

@@ -0,0 +1,105 @@
+name: CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  ref-interpreter:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup OCaml
+        uses: ocaml/setup-ocaml@v2
+        with:
+          ocaml-compiler: 4.13.x
+      - run: opam install --yes ocamlbuild.0.14.0
+      - name: Setup Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: 19.x
+      # TODO: disable node.js run until it fully implements proposal
+      # - run: cd interpreter && opam exec make JS=node all
+      - run: cd interpreter && opam exec make all
+
+  ref-interpreter-js-library:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup OCaml
+        uses: ocaml/setup-ocaml@v2
+        with:
+          ocaml-compiler: 4.13.x
+      - run: opam install --yes ocamlbuild.0.14.0 ocamlfind.1.9.5 js_of_ocaml.4.0.0 js_of_ocaml-ppx.4.0.0
+      - run: cd interpreter && opam exec make wast.js
+
+  build-js-api-spec:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: pip install bikeshed && bikeshed update
+      - run: bikeshed spec "document/js-api/index.bs" "document/js-api/index.html"
+      - uses: actions/upload-artifact@v2
+        with:
+          name: js-api-rendered
+          path: document/js-api/index.html
+
+  build-web-api-spec:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: pip install bikeshed && bikeshed update
+      - run: bikeshed spec "document/web-api/index.bs" "document/web-api/index.html"
+      - uses: actions/upload-artifact@v2
+        with:
+          name: web-api-rendered
+          path: document/web-api/index.html
+
+  build-core-spec:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: "recursive"
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+      - run: pip install bikeshed && bikeshed update
+      - run: pip install six
+      - run: sudo apt-get update -y && sudo apt-get install -y latexmk texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
+      - run: pip install sphinx==5.1.0
+      - run: cd document/core && make all
+      - uses: actions/upload-artifact@v2
+        with:
+          name: core-api-rendered
+          path: document/core/_build/html
+
+  publish-spec:
+    runs-on: ubuntu-latest
+    needs: [build-core-spec, build-js-api-spec, build-web-api-spec]
+    steps:
+      - uses: actions/checkout@v2
+      - run: mkdir _output && cp document/index.html _output/index.html
+      - uses: actions/download-artifact@v2
+        with:
+          name: js-api-rendered
+          path: _output/js-api
+      - uses: actions/download-artifact@v2
+        with:
+          name: web-api-rendered
+          path: _output/web-api
+      - uses: actions/download-artifact@v2
+        with:
+          name: core-api-rendered
+          path: _output/core
+      - name: Publish HTML to GitHub Pages
+        if: github.ref == 'refs/heads/main'
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          publish_dir: ./_output
+          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/mirror.yml

@@ -0,0 +1,17 @@
+on:
+  push:
+    branches:
+      - 'main'
+
+jobs:
+  mirror_job:
+    runs-on: ubuntu-latest
+    name: Mirror main branch to master branch
+    steps:
+    - name: Mirror action step
+      id: mirror
+      uses: google/[email protected]
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        source: 'main'
+        dest: 'master'

Contributing.md

@@ -3,6 +3,6 @@
 Interested in participating? Please follow
 [the same contributing guidelines as the design repository][].
 
-  [the same contributing guidelines as the design repository]: https://github.com/WebAssembly/design/blob/master/Contributing.md
+  [the same contributing guidelines as the design repository]: https://github.com/WebAssembly/design/blob/main/Contributing.md
 
 Also, please be sure to read [the README.md](README.md) for this repository.

document/README.md

@@ -3,9 +3,9 @@
 This directory contains the source code for the WebAssembly spec documents, as served from the [webassembly.github.io/spec](https://webassembly.github.io/spec) pages.
 It uses [Sphinx](http://www.sphinx-doc.org/) and [Bikeshed](https://github.com/tabatkins/bikeshed).
 
-To install Sphinx:
+To install Sphinx (and required library six):
 ```
-pip install sphinx
+pip install sphinx six
 ```
 
 To install Bikeshed, see the instructions [here](https://tabatkins.github.io/bikeshed/#installing).
@@ -42,7 +42,7 @@ pipenv shell
 Install Python dependencies:
 
 ```
-pipenv install Sphinx==3.5.2
+pipenv install Sphinx==4.0.0 six
 ```
 
 ### Checking out the repository

document/core/.gitignore

@@ -1,3 +1,4 @@
 _build
 _static
 document/*.pyc
+appendix/index-instructions.rst

document/core/Makefile

@@ -91,7 +91,7 @@ bikeshed-keep:
 
 .PHONY: index
 index:
-	(cd appendix; ./gen-index-instructions.py)
+	(cd appendix; ./index-instructions.py)
 
 .PHONY: pdf
 pdf:	index latexpdf
@@ -103,6 +103,7 @@ pdf:	index latexpdf
 clean:
 	rm -rf $(BUILDDIR)
 	rm -rf $(STATICDIR)
+	rm -f appendix/index-instructions.rst
 
 .PHONY: html
 html: index