Skip to content

fix: regenerate ARM patches for v2.336.0 and stabilise node22 placement - #200

Merged
weiiwang01 merged 1 commit into
mainfrom
fix/arm-release-patch-v2336
Sep 1, 2026
Merged

fix: regenerate ARM patches for v2.336.0 and stabilise node22 placement#200
weiiwang01 merged 1 commit into
mainfrom
fix/arm-release-patch-v2336

Conversation

@weiiwang01

Copy link
Copy Markdown

patch_update_release.yml failed with 'No valid previous patch for arm -- patch file missing or does not reference v2.336.0'.

runner-sdk8-arm.patch was still based on v2.335.1 because the ARM architecture was only added to the release-to-release loop in #193, after the v2.335.1 -> v2.336.0 sync had already run for ppc64le/s390x only.

  • Rebase runner-sdk8-arm.patch onto v2.336.0 so it matches patches/last_processed_tag.txt.
  • Move the NODE22_VERSION declaration away from NODE20_VERSION/ NODE24_VERSION in both ARM patches. Being adjacent to NODE24_VERSION made the 3-way stash merge conflict on every upstream Node bump, which is what would have broken the v2.336.0 -> v2.337.0 sync as well.

Verified all three arches now apply to v2.336.0 and re-apply cleanly onto v2.337.0, and that the main patches still re-apply onto upstream main.

patch_update_release.yml failed with 'No valid previous patch for arm --
patch file missing or does not reference v2.336.0'.

runner-sdk8-arm.patch was still based on v2.335.1 because the ARM
architecture was only added to the release-to-release loop in #193, after
the v2.335.1 -> v2.336.0 sync had already run for ppc64le/s390x only.

- Rebase runner-sdk8-arm.patch onto v2.336.0 so it matches
  patches/last_processed_tag.txt.
- Move the NODE22_VERSION declaration away from NODE20_VERSION/
  NODE24_VERSION in both ARM patches. Being adjacent to NODE24_VERSION
  made the 3-way stash merge conflict on every upstream Node bump, which
  is what would have broken the v2.336.0 -> v2.337.0 sync as well.

Verified all three arches now apply to v2.336.0 and re-apply cleanly onto
v2.337.0, and that the main patches still re-apply onto upstream main.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@weiiwang01
weiiwang01 merged commit 1ca1fb0 into main Sep 1, 2026
7 of 8 checks passed
@weiiwang01
weiiwang01 deleted the fix/arm-release-patch-v2336 branch September 1, 2026 06:01
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