Skip to content

fix keeping support for CUSTOM_SHIM #831

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

Merged
merged 2 commits into from
Sep 25, 2025
+6 −4
Merged

fix keeping support for CUSTOM_SHIM #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02a0cb1
fix keeping support for CUSTOM_SHIM
guybedford Sep 25, 2025
3283676
add docker cache
guybedford Sep 25, 2025
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/pullrequest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ jobs:
push: false
load: true
tags: worker-dev/echocontainer:latest
cache-from: type=gha
cache-to: type=gha,mode=max

- name: Run tests
env:
Expand Down
8 changes: 4 additions & 4 deletions worker-build/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ pub fn main() -> Result<()> {

wasm_pack_build.init()?;

let supports_module_and_reset_state =
wasm_pack_build.supports_target_module_and_reset_state()?;
if supports_module_and_reset_state {
let module_target = wasm_pack_build.supports_target_module_and_reset_state()?
|| env::var("CUSTOM_SHIM").is_ok();
if module_target {
wasm_pack_build
.extra_args
.push("--experimental-reset-state-function".to_string());
Expand All @@ -91,7 +91,7 @@ pub fn main() -> Result<()> {
wasm_coredump()?;
}

if supports_module_and_reset_state {
if module_target {
let (has_fetch_handler, has_queue_handler, has_scheduled_handler) =
detect_exported_handlers()?;

Expand Down