From cea530c04e969ee04815d9ecaf777d0e33e2f5be Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 5 May 2020 13:00:14 -0700
Subject: [PATCH] Build a non-release version of wabt on CI

---
 .github/workflows/main.yml | 25 ++++++++++++++++++-------
 Cargo.toml                 |  3 ---
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ffcd4f6b..bb0b5b53 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,11 +14,22 @@ jobs:
         submodules: true
     - name: Install Rust
       run: rustup update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
-    - name: Install wabt
+
+    # Build an up-to-date version of wabt since the releases don't always have
+    # all the features we want.
+    - uses: actions/checkout@v2
+      with:
+        repository: WebAssembly/wabt
+        ref: 9068d3927b404ce1e9c600473255a90504034eee
+        path: wabt
+    - name: Build wabt
       run: |
         set -e
-        curl -L https://github.com/WebAssembly/wabt/releases/download/1.0.14/wabt-1.0.14-linux.tar.gz | tar xzf -
-        echo "##[add-path]`pwd`/wabt-1.0.14"
+        cd wabt
+        cmake . -DBUILD_TESTS=OFF
+        make -j$(nproc) wast2json spectest-interp wasm-interp
+        echo ::add-path::`pwd`
+
     - name: Install binaryen
       run: |
         set -e
@@ -40,8 +51,8 @@ jobs:
     - name: Install wabt
       run: |
         set -e
-        curl -L https://github.com/WebAssembly/wabt/releases/download/1.0.14/wabt-1.0.14-linux.tar.gz | tar xzf -
-        echo "##[add-path]`pwd`/wabt-1.0.14"
+        curl -L https://github.com/WebAssembly/wabt/releases/download/1.0.13/wabt-1.0.13-linux.tar.gz | tar xzf -
+        echo "##[add-path]`pwd`/wabt-1.0.13"
     - name: Install binaryen
       run: |
         set -e
@@ -67,8 +78,8 @@ jobs:
     - name: Install wabt
       run: |
         set -e
-        curl -L https://github.com/WebAssembly/wabt/releases/download/1.0.14/wabt-1.0.14-linux.tar.gz | tar xzf -
-        echo "##[add-path]`pwd`/wabt-1.0.14"
+        curl -L https://github.com/WebAssembly/wabt/releases/download/1.0.13/wabt-1.0.13-linux.tar.gz | tar xzf -
+        echo "##[add-path]`pwd`/wabt-1.0.13"
     - name: Install binaryen
       run: |
         set -e
diff --git a/Cargo.toml b/Cargo.toml
index d097cdb8..7e4d8998 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,6 +45,3 @@ members = [
     "./crates/tests",
     "./crates/tests-utils",
 ]
-
-[patch.crates-io]
-wasmparser = { path= "../wasmparser.rs" }