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

2.5-alpha #10881

Merged
merged 4 commits into from
Jan 12, 2023
Merged

2.5-alpha #10881

merged 4 commits into from
Jan 12, 2023

Conversation

daschuer
Copy link
Member

@daschuer daschuer commented Sep 8, 2022

This one introduces the new main branch version 2.5 alpha.
After merge we can tag it accordingly and can merge out the 2.4 branch using the commit before.

I have tracked the changes here that we can easily repeat them later:
https://github.com/mixxxdj/mixxx/wiki/Mixxx-Beta-Checklist-2.4-beta

@github-actions github-actions bot added the build label Sep 8, 2022
CHANGELOG.md Outdated Show resolved Hide resolved
@daschuer
Copy link
Member Author

The build failure will be fixed after
#10901
is merged and the 2.3 branch is merged to main

It is really interesting how such CI failures always happen before a release :-/

@Holzhaus
Copy link
Member

the 2.4.0 changelog modification should be a separate commit (first commit in the branch), because that needs to go into 2.4, not 2.5

@daschuer
Copy link
Member Author

The plan is to merge this to main and cut out the 2.4 branch at the previous commit.
This is required to have not two builds with the same number.

@Holzhaus
Copy link
Member

I know, and the 2.4 branch should already use the GitHub milestone link, not Launchpad.

@daschuer
Copy link
Member Author

Ah OK I have reverted the change. The Changelog is incomplete anyway.

@@ -86,7 +86,7 @@
</screenshot>
</screenshots>
<url type="homepage">https://mixxx.org</url>
<url type="bugtracker">https://github.com/mixxxdj/mixxx/issues/</url>
<url type="bugtracker">https://bugs.launchpad.net/mixxx</url>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wrong url for bug tracker

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@daschuer wrong git rerere record? : )

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it seems like I have messed up the merge. I will do it again.

@daschuer
Copy link
Member Author

Done

@ywwg ywwg merged commit a3ad1cd into mixxxdj:main Jan 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants