Skip to content

Sync branch 2.5 to 2.6#15119

Merged
ronso0 merged 13 commits into
mixxxdj:2.6from
acolombier:sync-branch-2.5-to-2.6
Jul 24, 2025
Merged

Sync branch 2.5 to 2.6#15119
ronso0 merged 13 commits into
mixxxdj:2.6from
acolombier:sync-branch-2.5-to-2.6

Conversation

@acolombier
Copy link
Copy Markdown
Member

No description provided.

ronso0 and others added 11 commits July 13, 2025 00:08
The support has been dropped
(fix) Avoid engine freeze when loading a new track while scratching with waveform or spinny
…ware/mixxxdj/mixxx2-5/. Compile QM files out of TS files that are used by the localized app
Add missing translation in Eject button tooltip
…-unavailable-tracks

(fix) prevent crash with null track pointer
[2.5] ci: Fix empty pathspec error in sync-branches workflow
@acolombier acolombier changed the base branch from main to 2.6 July 21, 2025 21:55
@acolombier acolombier force-pushed the sync-branch-2.5-to-2.6 branch from 814ebf0 to f2e51b6 Compare July 21, 2025 21:57
@ronso0
Copy link
Copy Markdown
Member

ronso0 commented Jul 22, 2025

Interesting that Clazy now fails even though it succeeded in #15114
https://github.com/mixxxdj/mixxx/actions/runs/16429077353/job/46426518354?pr=15119#step:10:1116

I pushed a fix.

@ronso0
Copy link
Copy Markdown
Member

ronso0 commented Jul 22, 2025

@acolombier
Copy link
Copy Markdown
Member Author

Looking at the log, this looked like some weird runner issue - after kicking the build again, it seems to be working now. Merge?

@ronso0 ronso0 enabled auto-merge July 24, 2025 18:16
@ronso0 ronso0 merged commit eb30627 into mixxxdj:2.6 Jul 24, 2025
28 of 29 checks passed
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