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

We have both main and master. Let's drop both and just rely on a global next + version-specific nexts. #2894

Open
dead-claudia opened this issue Jun 8, 2024 · 2 comments
Labels
Area: Workflow For anything dealing with Mithril's internal tooling, including the mocks and bundler, but not ospec Type: Meta/Feedback For high-level discussion around the project and/or community itself

Comments

@dead-claudia
Copy link
Member

dead-claudia commented Jun 8, 2024

main was (until about a couple hours ago) only one commit behind master, and I recently fixed that. Let's complete the switch from master to main and delete master, so we have only one branch.

Though...maybe we should just drop master/main entirely and rely on the version branches instead. It'd be a lot simpler to work with, and it'd avoid some future confusion. I'm imagining the following system:

  • Branch release-v{0,1,2,...} points to the commit used to generate the latest release for that major version. These would only be updated on publish.
  • Branch next-v{0,1,2,...} points to the tip of tree for docs for that version, including unreleased updates.
  • Branch next points to the tip of tree. A GH Action will update next-vN where N is the current major version in next, so it can be a one-time setup. If it can't fast-forward (preferred) or rebase against the current next-vN, I'll have it create a pull request.
  • Branch docs points to the tip of tree for the docs. Updates to docs/ in this branch sync to next (in the same way next syncs to next-vN, but updates to docs/ in next do not sync to this.
  • Branch gh-pages will see updates automatically from docs and (to the archive only) release-vN.
@dead-claudia dead-claudia added Area: Workflow For anything dealing with Mithril's internal tooling, including the mocks and bundler, but not ospec Type: Meta/Feedback For high-level discussion around the project and/or community itself labels Jun 8, 2024
@dead-claudia
Copy link
Member Author

cc @MithrilJS/collaborators

@JAForbes
Copy link
Collaborator

Yeah agreed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: Workflow For anything dealing with Mithril's internal tooling, including the mocks and bundler, but not ospec Type: Meta/Feedback For high-level discussion around the project and/or community itself
Projects
None yet
Development

No branches or pull requests

2 participants