Merge changes from 2.5 into 2.6#15035
Merged
Merged
Conversation
…2022_runner_image Update 2.5 to windows2022 runner image
…sert chore: remove bare assert
(fix/feat) Traktor Kontrol S4 Mk3: tempo offset per deck
…9 already existing)
…ware/mixxxdj/mixxx2-5/. Compile QM files out of TS files that are used by the localized app
(fix) Pref Broadcast: make setting string translatable
…-host-triplet ci(2.5): remove all VCPKG_DEFAULT_HOST_TRIPLET entries from build.yml
Member
|
@daschuer Should we merge this now into 2.6, or should we revert the mass reformatting in 2.5 before merge into 2.6? I'm unsure how to handle this. |
This keeps workflows reusable workflows readable without following renaming in the caller. It also allows quickly using the work flow directly without renaming. It will be easier to maintain in case of renaming or adding secrets in the GitHub config.
…ci-on-fork ci(branch): allow running CI on fork branch without PR
Don't rename secrets when passing them to reusable workflows
chore(sync-branches): fix regression preventing trigger
Update CHANGELOG for Mixxx 2.5.3
…9 already existing)
chore(sync-branches): fix regression preventing trigger
Member
Author
|
Will merge if tests are successful, to unblock 2.6 beta snapshots. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
New content has landed in the
2.5branch, so let's merge the changes into2.6NOTE: This is a manual sync as there was currently conflict preventing the
sync_branchworkflow to open a PR. Shall we make it create an issue automatically to detect when this is happening?NOTE 2: Waiting feedback #15031 (comment) and #15034 before merging to prevent subsequent merges.