-
Notifications
You must be signed in to change notification settings - Fork 351
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update backport.yml #6137
Update backport.yml #6137
Conversation
The backport to
To backport this PR manually, you can either: Via the sg toolUse the sg backport -r v1.46.x -p 6137 Via your terminalTo 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-v1.46.x v1.46.x
# Navigate to the new working tree
cd .worktrees/backport-v1.46.x
# Create a new branch
git switch --create backport-6137-to-v1.46.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0070f3c29e2945facce3b1d3774bd23666147e05
# Push it to GitHub
git push --set-upstream origin backport-6137-to-v1.46.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v1.46.x If you encouter conflict, first resolve the conflict and stage all files, then run the commands below: git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-6137-to-v1.46.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v1.46.x
Once the pull request has been created, please ensure the following:
|
The backport to
To backport this PR manually, you can either: Via the sg toolUse the sg backport -r v1.44.x -p 6137 Via your terminalTo 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-v1.44.x v1.44.x
# Navigate to the new working tree
cd .worktrees/backport-v1.44.x
# Create a new branch
git switch --create backport-6137-to-v1.44.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0070f3c29e2945facce3b1d3774bd23666147e05
# Push it to GitHub
git push --set-upstream origin backport-6137-to-v1.44.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v1.44.x If you encouter conflict, first resolve the conflict and stage all files, then run the commands below: git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-6137-to-v1.44.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v1.44.x
Once the pull request has been created, please ensure the following:
|
@kalanchan if you want to backport this to
|
This reverts commit 0070f3c.
This reverts commit 0070f3c. Oversight on my part, I originally wanted to make it easier to type the backport label by chopping off the `vscode-` prefix, but I think this will create more confusion. Changing this back so that the backport label matches the branch that we are targetting So if anyone needs a backport, please follow the format `backport vscode-v.major.minor.x` it should match the release branch ## Test plan N/A <!-- Required. See https://docs-legacy.sourcegraph.com/dev/background-information/testing_principles. --> ## Changelog <!-- OPTIONAL; info at https://www.notion.so/sourcegraph/Writing-a-changelog-entry-dd997f411d524caabf0d8d38a24a878c -->
Fixing backport label regex to match release captain playbook
Test plan
N/A
Changelog