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

Jump to bottom

Summary of branches #2262

Closed
chickenlj opened this issue Mar 23, 2023 · 10 comments
Closed

Summary of branches #2262

chickenlj opened this issue Mar 23, 2023 · 10 comments

Comments

@chickenlj
Copy link
Contributor

chickenlj commented Mar 23, 2023 •
edited

At present, we have the following branches:

Below is a conclusion of the current status all the branches.

The main branches currently under development are:

  • master, the default branch, works as the stable or bugfix branch, responsible for the 3.0.x version.
  • 3.1, works as the major development or feature branch, as its name shows the first 3.1.0 version will come from here.
  • 3.0 works for the same purpose as master, not necessary.

Feature branches need to be further investigated to decide the current status they are in now, and after that we can decide the following action (merge, delete or keep):

The following branches are not in active development status for years, so they can be deleted and tracked by tags.
@chickenlj chickenlj changed the title Branch Summary of branches Mar 23, 2023
@justxuewei
Copy link
Member

justxuewei commented Mar 24, 2023 •
edited

The dapr-support, 1.5 should be reserved. About the other 1.x branches, they could be reserved as well, cuz they are not harmful and do not cause any inconvenience for development. As for the rest-protocol and the feat/remoting_rocketmq, they could be removed.

@AlexStocks
Copy link
Contributor

change the default branch to master, i think.

@justxuewei
Copy link
Member

I can't agree more. But GitHub uses "main" as the name of the default branch.

@AlexStocks
Copy link
Contributor

AlexStocks commented Mar 24, 2023 •
edited

This is an open source project. I hope we should communicate with the dubbogo community in Apache Way firstly the next time, and then we make an decision based on the Consensus from most of our community members.

@chickenlj
Copy link
Contributor Author

The dapr-support, 1.5 should be reserved

I agree to keep this branch as the only active 1.x branch since we haven't declared 1.x EOL and there still have many users stay on it.

About the other 1.x branches, they could be reserved as well, cuz they are not harmful and do not cause any inconvenience for development.

I personally tend to delete all the other 1.x branches except for the 1.5 branche. We should have announced them as EOL long time ago and encourage users to upgrade to the latest 1.5 branches. But since we haven't done that we still have the responsibility to maintain them for serious bugs or vulnerabilities. But by observing their activities, for being inactive for at least 3 years, I don't see any reason for still keeping them. Even if there's one emergency bugfix happens, we can still quickly do that by checking out the relevant tags, not to say this situation almost never happens.

As for the rest-protocol and the feat/remoting_rocketmq, they could be removed.

This is noted, let's wait for others' opinions.

@chickenlj
Copy link
Contributor Author

change the default branch to master, i think.

Agree, that's what I am suggesting.

The main branches currently under development are:

  • master, the default branch, works as the stable or bugfix branch, responsible for the 3.0.x version.
  • 3.1, works as the major development or feature branch, as its name shows the first 3.1.0 version will come from here.
  • 3.0 works for the same purpose as master, not necessary.

@justxuewei justxuewei mentioned this issue Mar 27, 2023
Merged
@chickenlj
Copy link
Contributor Author

chickenlj commented Mar 27, 2023 •
edited

  1. Merge 3.1 into master and make master the default branch, delete 3.1 branch
  2. Rename 3.0 branch to release-3.0
  3. Delete 1.1, 1.2, 1.3, 1.4 branches
  4. Delete rest-protocol, feat/remoting_rocketmq branches,
  5. Rename 1.5 to release-1.5
  6. Rename dapr-support to feature-dapr-support, 3.0-adaptive-stream to feature-adaptive-stream

The final branch layout would be like this:

  • master (default)
  • feature-dapr-support
  • feature-adaptive-stream
  • release-3.0
  • release-1.5

@chickenlj
Copy link
Contributor Author

Please notice that I have changed the branches to the following:

  • main (the targeted default branch)
  • 3.1 (currently the default one)
  • feature-dapr-support
  • feature-adaptive-stream
  • release-3.0
  • release-1.5

I have also announced the plan about stopping to maintain the 1.x branch in the next few months. Please check tags for previously released versions 1.1, 1.2, 1.3, 1.4, etc.

Here's

@justxuewei
Copy link
Member

I think 3.1 branch could be removed at present.

@chickenlj
Copy link
Contributor Author

I think 3.1 branch could be removed at present.

Yeah, I am removing it now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@AlexStocks @justxuewei @chickenlj