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

update meson.build and wlroots submodule #1152

Merged
merged 4 commits into from May 4, 2021
Merged

update meson.build and wlroots submodule #1152

merged 4 commits into from May 4, 2021

Conversation

ammen99
Copy link
Member

@ammen99 ammen99 commented Apr 21, 2021

Make wayfire compile with wlroots-master

@soreau Some time ago you asked whether we should update the version number immediately after release ... what about having a version 0.7.999 to indicate we're in development?

@soreau
Copy link
Member

soreau commented Apr 21, 2021

Make wayfire compile with wlroots-master

@soreau Some time ago you asked whether we should update the version number immediately after release ... what about having a version 0.7.999 to indicate we're in development?

I'd just make it simple and bump to 0.8.0 so 1) if a user has this and it's not released, we know they are using a git version 2) we don't have to bump again before release, which would halve the bump commit work.
But if we need to make 0.7.2 after bumping though, how does that work? Do we copy branch 0.7.1 to a new 0.7.2 branch, then apply whatever patches on top and tag it?

@ammen99
Copy link
Member Author

ammen99 commented May 4, 2021

I'd just make it simple and bump to 0.8.0 so 1) if a user has this and it's not released, we know they are using a git version 2) we don't have to bump again before release, which would halve the bump commit work.

Ok, fixed.

But if we need to make 0.7.2 after bumping though, how does that work? Do we copy branch 0.7.1 to a new 0.7.2 branch, then apply whatever patches on top and tag it?

When a 0.N.X release happens, I have always created a new branch so far. Development is on master, then if there are enough important bugfixes I would cherry-pick them to the 0.N.X branch and tag a new release there, instead of on master.

Note that releases generally cannot happen on master: we track latest wlroots in master, but wlroots releases do not necessarily align with Wayfire releases, so we do need a separate branch with the necessary commits to make the release compatible with the latest wlroots release.

@ammen99 ammen99 merged commit c8c2ecc into master May 4, 2021
@ammen99 ammen99 deleted the track-wlroots branch May 4, 2021 19:33
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.

None yet

2 participants