Skip to content

Sync release patch v2.338.2 (manual arm conflict resolution) - #262

Merged
florentianayuwono merged 1 commit into
mainfrom
patch-sync/v2.338.2-manual
Oct 27, 2026
Merged

florentianayuwono merged 1 commit into
mainfrom
patch-sync/v2.338.2-manual

Conversation

@florentianayuwono

Copy link
Copy Markdown

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 rebased ppc64le/s390x cleanly but failed on arm:

CONFLICT (content): Merge conflict in src/dev.sh
CONFLICT (content): Merge conflict in src/global.json

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.318 pin (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 for ppc64le/s390x.

Validation

  • git apply --check — all three patches (runner-sdk8-ppc64le.patch, runner-sdk8-s390x.patch, runner-sdk8-arm.patch) apply cleanly to a fresh v2.338.2 checkout.
  • Applied the arm patch and ran ./dev.sh test against the patched v2.338.2 tree: 1171/1172 passing (same pre-existing, unrelated ProcessExtensionL0.SuccessReadProcessEnv failure caused by a missing _layout/externals/node20 binary in a fresh checkout — not caused by this change).
  • Updated patches/last_processed_tag.txt to v2.338.2 so future scheduled runs don't try to re-process this tag.

Follow-up

Once this merges to main, the push (matching patches/runner-sdk8-*.patch paths) should re-trigger patch_update_release.yml, which will push the releases/v2.338.2 branch and in turn trigger release.yml (Runner CD) to cut the actual release/tarballs.

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>
@florentianayuwono
florentianayuwono merged commit 2c08f73 into main Oct 27, 2026
8 checks passed
@florentianayuwono
florentianayuwono deleted the patch-sync/v2.338.2-manual branch October 27, 2026 20:15
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