Skip to content

Commit 3d073e6

Browse files
author
taylorcyang
committed
feature: update supported emscripten
1 parent c3c1541 commit 3d073e6

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/unit_tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ jobs:
230230
strategy:
231231
fail-fast: false
232232
matrix:
233-
emscripten-version: [ '3.0.0', '3.1.33' ]
233+
emscripten-version: [ '4.0.0', '3.1.33' ]
234234
steps:
235235
- uses: actions/checkout@v4.1.7
236236
- uses: actions/cache@v4.0.2
@@ -245,9 +245,9 @@ jobs:
245245
version: ${{ matrix.emscripten-version }}
246246
actions-cache-folder: emsdk-cache-${{ matrix.emscripten-version }}
247247
- name: Setup Node.js
248-
uses: actions/setup-node@v4.0.4
248+
uses: actions/setup-node@v4
249249
with:
250-
node-version: '19.3.0' # insteadof '>= 14', use fixed version
250+
node-version: 24 # insteadof '>= 14', use fixed version
251251
- name: Configure Webassembly backend
252252
env:
253253
SCRIPTX_TEST_FORCE_UPDATE_DEPS: ON

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.0)
1+
cmake_minimum_required(VERSION 3.6)
22

33
file(STRINGS ${CMAKE_CURRENT_LIST_DIR}/VERSION SCRIPTX_VERSION)
44

src/utils/MessageQueue.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ struct alignas(std::max_align_t) ArbitraryData {
5858
inline ArbitraryData& ArbitraryData::operator=(const ArbitraryData& copy) {
5959
// copy ArbitraryData byte-by-byte
6060
// since is may be used as a chunk of memory to support placement new.
61-
std::memcpy(this, &copy, sizeof(copy)); // NOLINT
61+
std::memcpy(static_cast<void*>(this), &copy, sizeof(copy)); // NOLINT
6262
return *this;
6363
}
6464

test/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.0)
1+
cmake_minimum_required(VERSION 3.6)
22

33
set(CMAKE_CXX_STANDARD 20)
44
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -143,7 +143,7 @@ if (${SCRIPTX_BACKEND} STREQUAL ${SCRIPTX_BACKEND_WEBASSEMBLY})
143143
)
144144
target_link_options(UnitTests PRIVATE
145145
"-sEXPORTED_FUNCTIONS=['_main']"
146-
"-sEXTRA_EXPORTED_RUNTIME_METHODS=['callMain']")
146+
"-sEXPORTED_RUNTIME_METHODS=['callMain', 'HEAPU8', 'HEAP8', 'allocateUTF8']")
147147
endif ()
148148

149149
add_test(

0 commit comments

Comments
 (0)