-
Notifications
You must be signed in to change notification settings - Fork 24
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
feat(rel): add steps to update main with latest versions #600
Conversation
with: | ||
python-version: 3.7 | ||
python-version: '3.13' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you 🙏🏽
This had been bothering me
git fetch origin main | ||
git switch main | ||
echo "Creating branch origin/${branch}" | ||
git switch -c "${branch}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not following something here. We pull main, switch to main, and then switch to another release-branch, and then perform the changes we'd already performed on the previous release branch, in the promote to public step.
What's the expected flow here? We close the other (internal) branch PR that gets generated and merge this one?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The earlier step is just assigning the name right? The git switch main
part is also confusing to me though. In all these deploy repos we're now cutting releases from a release branch, so this likely needs to be whatever the base branch sg release <>
Otherwise this just looks like making sure things are up to date with main 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So the idea here is to update main
with the latest version of Sourcegraph. So to do that we:
- checkout
main
- create a new PR off
main
with the updated version and tags we need via these steps:- create a new branch
- make the changes
- commit the changes
- open the PR
We don't really need to do anything with the other release PRs. They are similar, but not really related. The idea here is to keep them separated and intentionally create a PR for the changes we want made to main
.
This will create a new PR that we just then have to merge.
Unless I'm missing something here 😆
We close the other (internal) branch PR that gets generated and merge this one?
Yup, really those should be auto-closed in the future in my opinion, as they are really just placeholders for steps in our release process.
996dd7c
to
1bc01f8
Compare
Add a step to our build process that creates a PR with the latest release version to merge back into
main
.Also updates broken Github action Python dependency in CI.
Checklist
Test plan
Part of CI steps during release process.