Merged
Conversation
Contributor
size-limit report 📦
|
Lms24
reviewed
Jan 22, 2023
Member
Lms24
left a comment
There was a problem hiding this comment.
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
Member
Author
|
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. |
Lms24
approved these changes
Jan 31, 2023
Member
Lms24
left a comment
There was a problem hiding this comment.
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.
Member
Author
|
FYI I updated this slightly:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR (WIP) sets up some Gitflow processes.
Some requirements that need to be done in order for this to work/make sense:
mastertodevelop(so have them for both branches)developthe default branch in GithubHow it should work (overview)
developbranch. 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.