Skip to content
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

Merged
merged 2 commits into from
Nov 16, 2024
Merged

Update backport.yml #6137

merged 2 commits into from
Nov 16, 2024

Conversation

kalanchan
Copy link
Contributor

Fixing backport label regex to match release captain playbook

Test plan

N/A

Changelog

@kalanchan kalanchan requested a review from a team November 15, 2024 23:45
@kalanchan kalanchan enabled auto-merge (squash) November 16, 2024 00:56
@kalanchan kalanchan merged commit 0070f3c into main Nov 16, 2024
17 of 18 checks passed
@kalanchan kalanchan deleted the kalanchan-patch-1 branch November 16, 2024 00:58
@sourcegraph-release-bot
Copy link
Collaborator

The backport to v1.46.x failed at https://github.com/sourcegraph/cody/actions/runs/11940417892:

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

To backport this PR manually, you can either:

Via the sg tool

Use the sg backport command to backport your commit to the release branch.

sg backport -r v1.46.x -p 6137
Via your terminal

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-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
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is v1.46.x and the compare/head branch is backport-6137-to-v1.46.x., click here to create the pull request.

Once the pull request has been created, please ensure the following:

  • Make sure to tag @sourcegraph/release in the pull request description.

  • kindly remove the release-blocker from this pull request.

@sourcegraph-release-bot
Copy link
Collaborator

The backport to v1.44.x failed at https://github.com/sourcegraph/cody/actions/runs/11940453581:

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

To backport this PR manually, you can either:

Via the sg tool

Use the sg backport command to backport your commit to the release branch.

sg backport -r v1.44.x -p 6137
Via your terminal

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-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
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is v1.44.x and the compare/head branch is backport-6137-to-v1.44.x., click here to create the pull request.

Once the pull request has been created, please ensure the following:

  • Make sure to tag @sourcegraph/release in the pull request description.

  • kindly remove the release-blocker from this pull request.

@DaedalusG
Copy link

@kalanchan if you want to backport this to v1.44.x via the backport v1.44.x label you'll need to open up a branch by that name --
Screenshot 2024-11-20 at 12 07 10 PM

  /usr/bin/git switch v1.44.x
  fatal: invalid reference: v1.44.x
  Error: Error: The process '/usr/bin/git' failed with exit code 128

kalanchan added a commit that referenced this pull request Nov 20, 2024
kalanchan added a commit that referenced this pull request Nov 20, 2024
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
-->
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.

4 participants