Skip to content

Handle DEPS.tagged-release in sync_deps.py - #28031

Merged
sbc100 merged 1 commit into
emscripten-core:mainfrom
sbc100:tagged_release_deps
Oct 20, 2026
Merged

sbc100 merged 1 commit into
emscripten-core:mainfrom
sbc100:tagged_release_deps

Conversation

@sbc100

@sbc100 sbc100 commented Oct 20, 2026 •

Copy link
Copy Markdown
Collaborator

When a release candidate commit in emscripten-releases modifies
DEPS.tagged-release, the waterfall builds that revision using
DEPS.tagged-release (which may be branched from an older revision)
rather than DEPS.

Teach tools/maint/sync_deps.py to fetch DEPS.tagged-release when
the target emscripten-releases revision modifies that file, matching
what the corresponding prebuilt emsdk archive was built from.

This is needed because we actually did sync to tagged release in #28031.

@sbc100
sbc100 requested a review from dschuff October 20, 2026 17:31

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request introduces a mechanism to detect and handle tagged releases of the Emscripten SDK by checking for the presence of a 'DEPS.tagged-release' file in the commit. This check is implemented in both 'rebaseline_tests.py' and 'sync_deps.py'. The feedback suggests improving the robustness of the network requests by using a 'with' statement in 'rebaseline_tests.py' to prevent resource leaks, and adding a timeout to the request in 'sync_deps.py' to prevent it from hanging indefinitely.

Comment thread tools/maint/rebaseline_tests.py Outdated
Comment thread tools/maint/sync_deps.py
@sbc100
sbc100 force-pushed the tagged_release_deps branch from 79c48dd to f5e2512 Compare October 20, 2026 17:32
sbc100 added a commit to sbc100/emscripten that referenced this pull request Oct 20, 2026
When a release candidate commit in `emscripten-releases` modifies
`DEPS.tagged-release`, the waterfall builds that revision using
`DEPS.tagged-release` (which may be branched from an older revision)
rather than `DEPS`.

Teach `tools/maint/sync_deps.py` to fetch `DEPS.tagged-release` when
the target `emscripten-releases` revision modifies that file, matching
what the corresponding prebuilt `emsdk` archive was built from.

This is needed because we actually did sync to tagged release in emscripten-core#28031.
@sbc100
sbc100 force-pushed the tagged_release_deps branch from f5e2512 to 807c865 Compare October 20, 2026 17:51
@sbc100 sbc100 changed the title Handle DEPS.tagged-release in sync_deps.py and rebaseline_tests.py Handle DEPS.tagged-release in sync_deps.py Oct 20, 2026
@sbc100

sbc100 commented Oct 20, 2026

Copy link
Copy Markdown
Collaborator Author

Simplified to only change sync_deps.py

When a release candidate commit in `emscripten-releases` modifies
`DEPS.tagged-release`, the waterfall builds that revision using
`DEPS.tagged-release` (which may be branched from an older revision)
rather than `DEPS`.

Teach `tools/maint/sync_deps.py` to fetch `DEPS.tagged-release` when
the target `emscripten-releases` revision modifies that file, matching
what the corresponding prebuilt `emsdk` archive was built from.

This is needed because we actually did sync to tagged release in emscripten-core#28031.
@sbc100
sbc100 force-pushed the tagged_release_deps branch from 807c865 to 72725ae Compare October 20, 2026 18:51
@sbc100
sbc100 enabled auto-merge (squash) October 20, 2026 19:25
@sbc100
sbc100 merged commit fed1eca into emscripten-core:main Oct 20, 2026
42 checks passed
@sbc100
sbc100 deleted the tagged_release_deps branch October 20, 2026 22:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants