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:
2023-04-06 14:50:18 +03:00
parent e73365b980
commit 6129076e97
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -43,13 +43,13 @@ jobs:
- uses: lukka/[email protected] - uses: lukka/[email protected]
- uses: vsariola/[email protected] - uses: vsariola/[email protected]
with: with:
version: 1.0.20 version: 1.0.29
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
- uses: actions/setup-node@v2 - uses: actions/setup-node@v2
with: with:
node-version: '15' node-version: '15'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: ilammy/setup-nasm@v1.2.0 - uses: ilammy/setup-nasm@v1.4.0
- name: Run ctest - name: Run ctest
env: env:
ASM_NASM: ${{ matrix.config.asmnasm }} ASM_NASM: ${{ matrix.config.asmnasm }}
+1 -1
View File
@@ -27,7 +27,7 @@ function(regression_test testname)
set(watfile ${CMAKE_CURRENT_BINARY_DIR}/${testname}.wat) set(watfile ${CMAKE_CURRENT_BINARY_DIR}/${testname}.wat)
set(wasmtarget wasm_${testname}) set(wasmtarget wasm_${testname})
add_custom_target(${wasmtarget} ALL 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}" SOURCES "${source}" "${wasmtemplates}"
DEPENDS sointu-compiler DEPENDS sointu-compiler
) )