From 6129076e97a51249b7eab3e22c543aee19106683 Mon Sep 17 00:00:00 2001
From: "5684185+vsariola@users.noreply.github.com"
 <5684185+vsariola@users.noreply.github.com>
Date: Thu, 6 Apr 2023 14:27:46 +0300
Subject: [PATCH] upgrade ilammy/setup-nasm to v1.4.0 and wat2wasm to v1.0.29

wat2wasm doesn't support --enable-bulk-memory anymore, presumably because it is part of the standard nowadays
---
 .github/workflows/tests.yml | 4 ++--
 tests/CMakeLists.txt        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4561715..9693a62 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -43,13 +43,13 @@ jobs:
     - uses: lukka/get-cmake@v3.18.3
     - uses: vsariola/setup-wabt@v1.0.1
       with:
-        version: 1.0.20
+        version: 1.0.29
     - uses: actions/setup-go@v2
     - uses: actions/setup-node@v2
       with:
         node-version: '15'
     - uses: actions/checkout@v2
-    - uses: ilammy/setup-nasm@v1.2.0
+    - uses: ilammy/setup-nasm@v1.4.0
     - name: Run ctest
       env:
         ASM_NASM: ${{ matrix.config.asmnasm }}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index eb0adea..1881746 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -27,7 +27,7 @@ function(regression_test testname)
             set(watfile ${CMAKE_CURRENT_BINARY_DIR}/${testname}.wat)
             set(wasmtarget wasm_${testname})
             add_custom_target(${wasmtarget} ALL
-                COMMAND ${compilecmd} ${ARGV4} -arch=wasm -o ${watfile} ${CMAKE_CURRENT_SOURCE_DIR}/${source} && ${WAT2WASM} --enable-bulk-memory -o ${wasmfile} ${watfile}
+                COMMAND ${compilecmd} ${ARGV4} -arch=wasm -o ${watfile} ${CMAKE_CURRENT_SOURCE_DIR}/${source} && ${WAT2WASM} -o ${wasmfile} ${watfile}
                 SOURCES "${source}" "${wasmtemplates}"
                 DEPENDS sointu-compiler
             )