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

improve backport experience #7

Merged
merged 1 commit into from
Sep 11, 2023
Merged

Conversation

michaellzc
Copy link
Member

@michaellzc michaellzc commented Sep 8, 2023

the current experience is quite bad when you run into conflict, I prefer to have commands I can just copy and paste to resume the process

post-creation step is easy to miss, i.e., remove release-blocker label

https://github.com/sourcegraph/sourcegraph/pull/56448#issuecomment-1711833003

Comment on lines -306 to +316
const runUrl = `${serverUrl}/${owner}/${repo}/actions/runs/${runId}/jobs/${runNumber}`;
const runUrl = `${serverUrl}/${owner}/${repo}/actions/runs/${runId}`;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this link is broken

e.g., https://github.com/sourcegraph/sourcegraph/actions/runs/6123459521/jobs/15021

the job id is not exposed from the context, let's just go as far as the summary page of the workflow run

it's good enough

@michaellzc michaellzc requested a review from a team September 8, 2023 16:13
"```",
"",
"- [ ] Follow above instructions to backport the commit.",
`- [ ] Create a pull request where the \`base\` branch is \`${base}\` and the \`compare\`/\`head\` branch is \`${head}\`., [click here to create the pull request](https://github.com/sourcegraph/sourcegraph/compare/${base}...${head}?expand=1).`,
Copy link
Member Author

@michaellzc michaellzc Sep 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not just send people directly to the page to create the pr

@michaellzc michaellzc requested review from a team September 8, 2023 16:14
Copy link
Member

@unknwon unknwon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@michaellzc michaellzc merged commit 9f811b2 into main Sep 11, 2023
1 check passed
@michaellzc michaellzc deleted the mlzc/improve-backport-experience branch September 11, 2023 00:50
@unknwon
Copy link
Member

unknwon commented Sep 11, 2023

I think we would need to make a new release, then update the version we use in the sg/sg repo

@BolajiOlajide
Copy link

I think we would need to make a new release, then update the version we use in the sg/sg repo

I'll kick off a release. We don't need to update the version in sg/sg if the major version is unchanged.

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.

3 participants