Skip to content

Commit a2adb3c

Browse files
authored
emscripten 3.1.73 (#7)
1 parent 227aa50 commit a2adb3c

File tree

3 files changed

+19
-23
lines changed

3 files changed

+19
-23
lines changed

.github/workflows/ci.yaml

+13-22
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,6 @@ jobs:
151151
152152
emscripten:
153153
strategy:
154-
matrix:
155-
include:
156-
- emscripten_version: 3.1.27
157154
fail-fast: false
158155
runs-on: ubuntu-latest
159156
steps:
@@ -174,25 +171,19 @@ jobs:
174171
- name: install emscripten
175172
shell: bash -l {0}
176173
run: |
177-
git clone https://github.com/emscripten-core/emsdk.git
178-
cd emsdk
179-
./emsdk install ${{ matrix.emscripten_version }}
180-
source ./emsdk_env.sh
181-
182-
#- name: install playwright
183-
# shell: bash -l {0}
184-
# run: |
185-
# playwright install
186-
187-
#- name: run emscripten tests
188-
# shell: bash -l {0}
189-
# run: |
190-
# cd emsdk
191-
# ./emsdk activate ${{ matrix.emscripten_version }}
192-
# source ./emsdk_env.sh
193-
# cd ..
194-
# chmod +x ./test/emscripten/test_emscripten.sh
195-
# ./test/emscripten/test_emscripten.sh
174+
$MAMBA_EXE install -c conda-forge -c https://repo.prefix.dev/emscripten-forge-dev \
175+
emscripten_emscripten-wasm32 --yes
176+
177+
- name: install playwright
178+
shell: bash -l {0}
179+
run: |
180+
playwright install
181+
182+
- name: run emscripten tests
183+
shell: bash -l {0}
184+
run: |
185+
chmod +x ./test/emscripten/test_emscripten.sh
186+
./test/emscripten/test_emscripten.sh
196187
197188
docs:
198189
strategy:

CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@ endif()
8181
# Flags
8282
################################################################
8383
if(EMSCRIPTEN)
84+
# extra flags to ensure runtime methods are exported
85+
set(EMS"SHELL: -s EXTRA_EXPORTED_RUNTIME_METHODS=['FS','PATH','loadDynamicLibrary']")
86+
target_compile_options(xplugin_host INTERFACE ${EMS})
87+
target_link_options(xplugin_host INTERFACE ${EMS})
88+
8489
# compiler flags
8590
set_target_properties(xplugin_host PROPERTIES COMPILE_FLAGS "-s MAIN_MODULE=1")
8691
set_target_properties(xplugin_plugin PROPERTIES COMPILE_FLAGS "-s SIDE_MODULE=1")

environment_emscripten.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ channels:
66
dependencies:
77
- cmake
88
- python
9-
- microsoft::playwright
9+
- microsoft::playwright <= 1.50

0 commit comments

Comments
 (0)