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
This commit is contained in:
5684185+vsariola@users.noreply.github.com 2023-04-06 14:27:46 +03:00
parent e73365b980
commit 6129076e97
2 changed files with 3 additions and 3 deletions

View File

@ -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 }}

View File

@ -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
)