Repository navigation
Sync release patch v2.338.2 (manual arm conflict resolution) - #262
Merged
Merged
Conversation
Rebases runner-sdk8-{ppc64le,s390x,arm}.patch from v2.338.0 to v2.338.2.
The automated patch_update_release.yml workflow run failed on the arm
leg because upstream bumped the pinned .NET SDK version in src/dev.sh
and src/global.json (8.0.425 -> 8.0.427), conflicting with our
intentional .NET 9 pin (9.0.318, from PR #209, Y2038 SSL fix). Manually
resolved by keeping our 9.0.318 pin; ppc64le/s390x rebased cleanly.
Validated: all three patches apply cleanly to a fresh v2.338.2
checkout, and ./dev.sh test passes 1171/1172 (same pre-existing
unrelated ProcessExtensionL0.SuccessReadProcessEnv failure).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
yanksyoon
approved these changes
Oct 27, 2026
This was referenced Oct 27, 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
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.
Summary
Manually completes the release-patch sync that
patch_update_release.yml(#40573314792, triggered via workflow_dispatch) attempted but could not finish automatically.Upstream released
v2.338.2(last processed:v2.338.0). The automated workflow rebasedppc64le/s390xcleanly but failed onarm:Root cause
Upstream bumped the pinned .NET SDK version in
src/dev.sh/src/global.json(8.0.425→8.0.427). Our armhf fork intentionally pins.NET 9 (9.0.318)instead (PR #209 — Y2038 SSL fix for linux-arm), so the 3-way merge conflicts on that line every time upstream touches its own SDK pin.Resolution
Resolved both conflicts by keeping our
9.0.318pin (upstream's SDK bump doesn't apply to the arm RID anyway, since we build with .NET 9). No other content differs from what the automated workflow would have produced forppc64le/s390x.Validation
git apply --check— all three patches (runner-sdk8-ppc64le.patch,runner-sdk8-s390x.patch,runner-sdk8-arm.patch) apply cleanly to a freshv2.338.2checkout.armpatch and ran./dev.sh testagainst the patchedv2.338.2tree: 1171/1172 passing (same pre-existing, unrelatedProcessExtensionL0.SuccessReadProcessEnvfailure caused by a missing_layout/externals/node20binary in a fresh checkout — not caused by this change).patches/last_processed_tag.txttov2.338.2so future scheduled runs don't try to re-process this tag.Follow-up
Once this merges to
main, the push (matchingpatches/runner-sdk8-*.patchpaths) should re-triggerpatch_update_release.yml, which will push thereleases/v2.338.2branch and in turn triggerrelease.yml(Runner CD) to cut the actual release/tarballs.