Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Fix missing file in WebAssembly deployment #488

Merged
merged 1 commit into from
Sep 2, 2024
Merged

CI: Fix missing file in WebAssembly deployment #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/deploy-wasm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ jobs:
mkdir /tmp/rv32emu-demo
mv assets/html/index.html /tmp/rv32emu-demo
mv assets/js/coi-serviceworker.min.js /tmp/rv32emu-demo
mv build/elf_list.js /tmp/rv32emu-demo
mv build/rv32emu.js /tmp/rv32emu-demo
mv build/rv32emu.wasm /tmp/rv32emu-demo
mv build/rv32emu.worker.js /tmp/rv32emu-demo
Expand All @@ -63,6 +64,7 @@ jobs:
run: |
mv /tmp/rv32emu-demo/index.html .
mv /tmp/rv32emu-demo/coi-serviceworker.min.js .
mv /tmp/rv32emu-demo/elf_list.js .
mv /tmp/rv32emu-demo/rv32emu.js .
mv /tmp/rv32emu-demo/rv32emu.wasm .
mv /tmp/rv32emu-demo/rv32emu.worker.js .
Expand Down
7 changes: 4 additions & 3 deletions mk/wasm.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ EXPORTED_FUNCS := _main,_indirect_rv_halt
DEMO_DIR := demo
WEB_FILES := $(BIN).js \
$(BIN).wasm \
$(BIN).worker.js
$(BIN).worker.js \
$(OUT)/elf_list.js

ifeq ("$(CC_IS_EMCC)", "1")
BIN := $(BIN).js
Expand Down Expand Up @@ -37,11 +38,11 @@ CFLAGS_emcc += -sINITIAL_MEMORY=2GB \
-O3 \
-w

$(DEMO_DIR)/elf_list.js: tools/gen-elf-list-js.py
$(OUT)/elf_list.js: tools/gen-elf-list-js.py
$(Q)tools/gen-elf-list-js.py > $@

# used to download all dependencies of elf executable and bundle into single wasm
deps_emcc += $(DEMO_DIR)/elf_list.js $(DOOM_DATA) $(QUAKE_DATA) $(TIMIDITY_DATA)
deps_emcc += $(OUT)/elf_list.js $(DOOM_DATA) $(QUAKE_DATA) $(TIMIDITY_DATA)

# check browser MAJOR version if supports TCO
CHROME_MAJOR :=
Expand Down