Repository navigation
Update patches: 9abfe11 → 4197182e [ppc64le,s390x,arm] - #267
Merged
Merged
Conversation
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
yanksyoon
approved these changes
Oct 28, 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.
Sync main branch patch for commit 4197182 (upstream
actions/runnermain).This is a manual run of the
Update Runner Patches (Commit-to-Commit)workflow(https://github.com/canonical/github-actions-runner/actions/workflows/patch_update_main.yml),
which failed automatically for this commit range
(https://github.com/canonical/github-actions-runner/actions/runs/40580338784/job/122457709786)
due to a conflict in
src/dev.sh/src/global.json: upstream bumped its.NET 8SDK pin to8.0.427, which conflicts with our fork's intentional.NET 9(9.0.318) override for thearmpatch (Y2038/time64 SSL fix, #209).ppc64leands390xrebased cleanly (no functional change, only blob hashchurn from upstream's own unrelated changes).
arm's conflict was resolved by keeping our9.0.318SDK pin, same as theprior manual resolution in Sync release patch v2.338.2 (manual arm conflict resolution) #262.
Validated:
git apply --checkfor all three patches against a fresh checkout ofupstream
actions/runnerat4197182e.armpatch and confirmedDOTNETSDK_VERSION="9.0.318"andNODE22_VERSION="22.23.4"are both still correctly pinned.Updated
patches/last_processed_commit.txtto4197182ef8f39c719f66038c1bc9b34cd9e9ac9a.Co-authored-by: Copilot 223556219+Copilot@users.noreply.github.com