Fix regression caused by #25141 - #25153
Merged
juj merged 2 commits intoSep 3, 2025
Merged
Conversation
sbc100
approved these changes
Sep 3, 2025
brendandahl
reviewed
Sep 3, 2025
| import json | ||
| import logging | ||
| import multiprocessing | ||
| import threading |
Collaborator
There was a problem hiding this comment.
This line needs to be removed. Looks like I removed the wrong line. Confused how my pr passed though...
Collaborator
Author
There was a problem hiding this comment.
I think that is because CircleCI tests PR branches as-is without merging to main.
So a PR on top of main can pass, but then main gets other PRs landed in the meanwhile (like my PR that added use of multithreading).
Individually both PRs get a green stamp on CircleCI, but when merged together, they are not compatible.
Collaborator
Author
|
The regression is e.g. here: http://clbri.com:8010/#/builders/11/builds/412 |
brendandahl
approved these changes
Sep 3, 2025
inolen
pushed a commit
to inolen/emscripten
that referenced
this pull request
Feb 13, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix regression caused by https://github.com/emscripten-core/emscripten/pull/25141/files#diff-2ff8ac5244693c408612e27b5740480b110cb2187ef498ee73ad34b19e906169L20
(bad merge?)