Merge pull request WebAssembly#36 from dhil/wasmfx-merge

Merge with upstream/wasm-3.0 This patch brings in the latest changes from the wasm-3.0. I have adopted the tag and exception handling representations from wasm-3.0.
dhil · Jul 31, 2024 · 41f6d1f · 41f6d1f
2 parents 6ac6b6b + af0bf05
commit 41f6d1f
Show file tree

Hide file tree

Showing 161 changed files with 8,443 additions and 868 deletions.
diff --git a/.github/workflows/ci-spec.yml b/.github/workflows/ci-spec.yml
@@ -40,8 +40,39 @@ jobs:
           name: core-rendered
           path: document/core/_build/html
 
-  build-legacy-exceptions-spec:
+  build-js-api-spec:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+      - name: Setup Bikeshed
+        run: pip install bikeshed && bikeshed update
+      - name: Run Bikeshed
+        run: bikeshed spec "document/js-api/index.bs" "document/js-api/index.html"
+      - name: Upload artifact
+        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:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+      - name: Setup Bikeshed
+        run: pip install bikeshed && bikeshed update
+      - name: Run Bikeshed
+        run: bikeshed spec "document/web-api/index.bs" "document/web-api/index.html"
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: web-api-rendered
+          path: document/web-api/index.html
+
+  build-code-metadata-spec:
     runs-on: ubuntu-latest
+    needs: [build-core-spec]
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -52,46 +83,50 @@ jobs:
       - name: Setup Sphinx
         run: pip install six && pip install sphinx==5.1.0
       - name: Build main spec
-        run: cd document/legacy/exceptions && make main
+        run: cd document/metadata/code && make main
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
-          name: legacy-exceptions-rendered
-          path: document/legacy/exceptions/_build/html
+          name: code-metadata-rendered
+          path: document/metadata/code/_build/html
 
-  build-js-api-spec:
+  build-legacy-exceptions-core-spec:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
-      - name: Setup Bikeshed
-        run: pip install bikeshed && bikeshed update
-      - name: Run Bikeshed
-        run: bikeshed spec "document/js-api/index.bs" "document/js-api/index.html"
+        with:
+          submodules: "recursive"
+      - name: Setup TexLive
+        run: sudo apt-get update -y && sudo apt-get install -y latexmk texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
+      - name: Setup Sphinx
+        run: pip install six && pip install sphinx==5.1.0
+      - name: Build main spec
+        run: cd document/legacy/exceptions/core && make main
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
-          name: js-api-rendered
-          path: document/js-api/index.html
+          name: legacy-exceptions-core-rendered
+          path: document/legacy/exceptions/core/_build/html
 
-  build-web-api-spec:
+  build-legacy-exceptions-js-api-spec:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
       - name: Setup Bikeshed
         run: pip install bikeshed && bikeshed update
       - name: Run Bikeshed
-        run: bikeshed spec "document/web-api/index.bs" "document/web-api/index.html"
+        run: bikeshed spec "document/legacy/exceptions/js-api/index.bs" "document/legacy/exceptions/js-api/index.html"
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
-          name: web-api-rendered
-          path: document/web-api/index.html
+          name: legacy-exceptions-js-api-rendered
+          path: document/legacy/exceptions/js-api/index.html
 
   publish-spec:
     runs-on: ubuntu-latest
-    needs: [build-core-spec, build-legacy-exceptions-spec, build-js-api-spec, build-web-api-spec]
+    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]
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -102,11 +137,6 @@ jobs:
         with:
           name: core-rendered
           path: _output/core
-      - name: Download legacy exceptions spec artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: legacy-exceptions-rendered
-          path: _output/legacy/exceptions
       - name: Download JS API spec artifact
         uses: actions/download-artifact@v2
         with:
@@ -117,6 +147,21 @@ jobs:
         with:
           name: web-api-rendered
           path: _output/web-api
+      - name: Download code metadata spec artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: code-metadata-rendered
+          path: _output/metadata/code
+      - name: Download legacy exceptions core spec artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: legacy-exceptions-core-rendered
+          path: _output/legacy/exceptions/core
+      - name: Download legacy exceptions JS API spec artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: legacy-exceptions-js-api-rendered
+          path: _output/legacy/exceptions/js-api
       - name: Publish to GitHub Pages
         if: github.ref == 'refs/heads/main'
         uses: peaceiris/actions-gh-pages@v3

diff --git a/README.md b/README.md
@@ -21,18 +21,11 @@ Original `README` from upstream repository follows.
 
 # spec
 
-This repository holds a prototypical reference implementation for WebAssembly,
-which is currently serving as the official specification. Eventually, we expect
-to produce a specification either written in human-readable prose or in a formal
-specification language.
+This repository holds the sources for the WebAssembly specification,
+a reference implementation, and the official test suite.
 
-It also holds the WebAssembly testsuite, which tests numerous aspects of
-conformance to the spec.
-
-View the work-in-progress spec at [webassembly.github.io/spec](https://webassembly.github.io/spec/).
-
-At this time, the contents of this repository are under development and known
-to be "incomplet and inkorrect".
+A formatted version of the spec is available here:
+[webassembly.github.io/spec](https://webassembly.github.io/spec/),
 
 Participation is welcome. Discussions about new features, significant semantic
 changes, or any specification change likely to generate substantial discussion

diff --git a/deploy_key b/deploy_key
diff --git a/deploy_key.pub b/deploy_key.pub
diff --git a/document/Makefile b/document/Makefile
@@ -1,4 +1,4 @@
-DIRS     = core js-api web-api legacy/exceptions
+DIRS     = core js-api web-api metadata/code legacy/exceptions
 FILES    = index.html
 BUILDDIR = _build
 TAR      = tar