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

Track Bevy release on default branch #205

Merged
merged 2 commits into from
Mar 31, 2023
Merged

Track Bevy release on default branch #205

merged 2 commits into from
Mar 31, 2023

Conversation

Nilirad
Copy link
Owner

@Nilirad Nilirad commented Mar 7, 2023

Since Bevy adopted a train release schedule, it makes less sense to closely track Bevy's main branch. This PR will make the master branch depend on Bevy 0.10. I already pushed a bevy-main branch that tracks Bevy as we always did. I also adapted the GitHub Actions workflows to also work with bevy-main.

The new PR policy will be that changes should be targeted preferably on the master branch, while bevy_main is for fixing breaking changes and for using Bevy features not yet supported on release.

TODO

  • Add a Contributing.md guide to help developers choose the right target branch. This will be done in a separate PR.
  • Develop and document a merge strategy of bevy-main into master, needed each time a new Bevy version releases.

@Nilirad Nilirad marked this pull request as ready for review March 31, 2023 17:02
@Nilirad Nilirad mentioned this pull request Mar 31, 2023
@Nilirad Nilirad merged commit c8e78ec into master Mar 31, 2023
@Nilirad Nilirad deleted the track-bevy-release branch March 31, 2023 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant