-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
ci: Setup gitflow process #6890
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
Conversation
size-limit report 📦
|
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.
Seems like a good workflow to me!
Also, great diagram! Once we all agree on this, let's make sure to document this flow in our docs directory and maybe link to it from CONTRIBUTING
or similar?
0507cec
to
929e5a3
Compare
Added docs here: https://github.com/getsentry/sentry-javascript/blob/fn/gitflow/CONTRIBUTING.md Note: I took this opportunity and extracted the publishing stuff out as well. |
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.
LGTM. I like the automatic approach master/develop syncing approach and I think going forward, moving to gitflow will solve our release blocking/multiple teams working on the repo problem. Thanks for updating documentation, I think it makes a lot of sense now.
FYI I updated this slightly:
|
This PR (WIP) sets up some Gitflow processes.
Some requirements that need to be done in order for this to work/make sense:
master
todevelop
(so have them for both branches)develop
the default branch in GithubHow it should work (overview)
develop
branch. Any PRs are merged into developHow to do a release going forward?
Potential streamlining/improvement?
One way in which this could be improved, is to auto-trigger the release whenever we merge into master.
In order to do this, we'll need to somehow know at this point:
We may be able to parse this somehow, but I'd say this is an area for future improvement, if we decide so.
What's missing?
We'll probably have to tweak caching etc. settings a bit to streamline this - e.g. what needs to run when merging develop-> master, what needs to run when merging master->develop, etc.