Build a non-release version of wabt on CI

rustwasm · May 5, 2020 · 5360172 · 5360172
1 parent e9e16b3
commit 5360172
Showing 1 changed file with 24 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,11 +14,28 @@ 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
+        cmake --build .
+      shell: bash
+    - name: Add wabt to path (unix)
+      run: echo ::add-path::`pwd`/wabt
+      if: matrix.os != 'windows-latest'
+    - name: Add wabt to path (windows)
+      run: echo ::add-path::D:/a/walrus/walrus/wabt
+      if: matrix.os == 'windows-latest'
+
     - name: Install binaryen
       run: |
         set -e
@@ -40,8 +57,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 +84,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