opentelemetry-js
opentelemetry-js copied to clipboard
open-telemetry
Consider using `develop` branch
Currently, we are merging all PRs into main and cutting releases periodically. I propose we change that flow so that all PRs go into a develop branch which is merged into main only on release. This has a few advantages:
main branch will reflect currently released state. To me this is the biggest advantage. In the current state, any new features documented in README files, examples, or other places are actually not useable by the latest release. Ensuring main always reflects the latest release will alleviate this issue.
Bug fixes can be easily released without new features that aren't ready. Currently, we have to release whatever is in main in order to get bug fixes out. This hasn't been a problem in the past, but as the project is maturing I think we will need to solve this issue. There are other ways to solve it, but this seems the simplest to me.
Release automations can run when a PR is merged into main. This is a secondary concern as there are other ways to solve it, but releasing when a branch is merged is a very simple workflow.
/cc @open-telemetry/javascript-maintainers
:+1: for adopting this flow. Especially having the ability to quickly release bug fixes would be a great improvement in my opinion. :slightly_smiling_face:
This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 14 days.
![github-actions[bot] avatar](https://avatars.githubusercontent.com/in/15368?v=4 "Published by a pub.dev verified publisher"){kind=small}
This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 14 days.
Do you think we should get started with this?
I guess the first step would be to introduce the develop branch, then set it as the default branch. Then we can gradually start testing the flow with bugfix PRs targeting main instead (then merging back to develop). We can still keep releasing manually, then gradually add automations.
I can get started on this. :slightly_smiling_face:
WDYT @open-telemetry/javascript-maintainers?
This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 14 days.