Skip to content

Conversation

@brettlangdon
Copy link
Member

Reverts #15234

@brettlangdon brettlangdon requested review from a team as code owners November 19, 2025 20:14
@brettlangdon brettlangdon added the changelog/no-changelog A changelog entry is not required for this PR. label Nov 19, 2025
@brettlangdon brettlangdon merged commit deb7cf8 into main Nov 19, 2025
473 of 499 checks passed
@brettlangdon brettlangdon deleted the revert-15234-brettlangdon/gha.build.sccache branch November 19, 2025 20:33
@dd-octo-sts
Copy link
Contributor

dd-octo-sts bot commented Nov 19, 2025

The backport to 4.0 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.0 4.0
# Navigate to the new working tree
cd .worktrees/backport-4.0
# Create a new branch
git switch --create backport-15348-to-4.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 deb7cf8ba5d7531b764350f16310f0a01d2899d2
# Push it to GitHub
git push --set-upstream origin backport-15348-to-4.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.0

Then, create a pull request where the base branch is 4.0 and the compare/head branch is backport-15348-to-4.0.

aniszoubiramar pushed a commit that referenced this pull request Nov 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 4.0 changelog/no-changelog A changelog entry is not required for this PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants