Skip to content

Commit 44b79b1

Browse files
committed
Merge remote-tracking branch 'origin/main' into LateNightQML/mixer
# Conflicts: # res/qml/BatteryIcon.qml # res/qml/Mixxx/Controls/Knob.qml # res/qml/Mixxx/Controls/Slider.qml # res/skins/LateNightQML/Controls/Panel.qml # res/skins/LateNightQML/Deck/Deck.qml # res/skins/LateNightQML/Deck/DeckSettingsPlaceholder.qml # res/skins/LateNightQML/Deck/FullDeck.qml # res/skins/LateNightQML/Deck/KeyControlsPlaceholder.qml # res/skins/LateNightQML/Deck/LateNightControlButton.qml # res/skins/LateNightQML/Deck/LateNightCycleButton.qml # res/skins/LateNightQML/Deck/OverviewRow.qml # res/skins/LateNightQML/Deck/RatePlaceholder.qml # res/skins/LateNightQML/Deck/TitleTimeRows.qml # res/skins/LateNightQML/Deck/TransportLoopBeatjumpPlaceholders.qml # res/skins/LateNightQML/Deck/VinylControlsPlaceholder.qml # res/skins/LateNightQML/LateNightTheme/LateNightTheme.qml # res/skins/LateNightQML/Toolbar/Toolbar.qml # res/skins/LateNightQML/Waveforms/DeckWaveform.qml # res/skins/LateNightQML/Waveforms/WaveformStack.qml # res/skins/LateNightQML/main.qml # src/qml/qmlapplication.cpp # src/qml/qmlbatteryproxy.cpp # src/qml/qmllibraryproxy.cpp # src/qml/qmllibraryproxy.h # src/qml/qmlrecordingproxy.cpp
2 parents 839b56d + 17be527 commit 44b79b1

507 files changed

Lines changed: 90541 additions & 84767 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/benchmark.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -126,18 +126,17 @@ jobs:
126126
with:
127127
# This should always match the minimum required version in
128128
# our CMakeLists.txt
129-
cmake-version: "3.21.x"
129+
cmake-version: "3.22.x"
130130

131131
- name: "[Windows] Set up cmake"
132132
uses: jwlawson/actions-setup-cmake@v2.2
133133
# Ubuntu 24.04 should use the CMake version from the repos.
134-
# On windows-11-arm this action installs the x64 version which has unwanted side effects
135-
if: matrix.os == 'windows-2022'
134+
# On Windows ARM64 this action installs the x64 version which has unwanted side effects
135+
if: runner.os == 'Windows' && runner.arch != 'ARM64'
136136
with:
137-
# This is a workaround for a SSL false positive in cmake 3.26.4
138-
# When downloading the manual. 3.21 is required for installing the
139-
# ANGLE Dlls via IMPORTED_RUNTIME_ARTIFACTS
140-
cmake-version: "3.21.x"
137+
# This is a workaround for a SSL false positive in cmake 3.26.4 when downloading the manual.
138+
# 3.22 is required for Qt 6.10 https://doc.qt.io/qt-6.10/cmake-supported-cmake-versions.html
139+
cmake-version: "3.22.x"
141140

142141
- name: "[Windows] Set up MSVC Developer Command Prompt"
143142
if: runner.os == 'Windows'
@@ -146,14 +145,13 @@ jobs:
146145
arch: ${{ matrix.arch }}
147146

148147
- name: "[Windows 11 ARM64] Install ARM64 CMake"
149-
if: matrix.os == 'windows-11-arm'
148+
if: runner.os == 'Windows' && runner.arch == 'ARM64'
150149
run: |
151150
Invoke-WebRequest -Uri https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-windows-arm64.zip -OutFile cmake-arm64.zip
152151
Expand-Archive cmake-arm64.zip -DestinationPath $env:USERPROFILE\cmake
153152
$cmakePath = "$env:USERPROFILE\cmake\cmake-3.30.1-windows-arm64\bin"
154153
$cmakePath | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
155154
$env:Path += ";$cmakePath"
156-
cmake --version
157155
158156
- name: "[macOS] install ccache and make"
159157
if: runner.os == 'macOS'

.github/workflows/build.yml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ jobs:
117117
artifacts_name: macOS ARM DMG
118118
artifacts_path: build/*.dmg
119119
artifacts_slug: macos-macosarm
120-
- name: Windows 2022 x64
121-
os: windows-2022
120+
- name: Windows Server 2025 VS2026 x64
121+
os: windows-2025-vs2026
122122
# Attention: If you change the cmake_args for the Windows CI build,
123123
# also adjust the for the local Windows build setup in
124124
# ./tools/windows_buildenv.bat
@@ -144,8 +144,8 @@ jobs:
144144
artifacts_path: build/*.msi
145145
artifacts_slug: windows-win64
146146
arch: x64
147-
- name: Windows 11 ARM64
148-
os: windows-11-arm
147+
- name: Windows 11 VS2026 ARM64
148+
os: windows-11-vs2026-arm
149149
# Attention: If you change the cmake_args for the Windows CI build,
150150
# also adjust the for the local Windows build setup in
151151
# ./tools/windows_buildenv.bat
@@ -213,7 +213,7 @@ jobs:
213213
artifact-windows-winarm: ${{ steps.prepare_deploy.outputs.artifact-windows-winarm }}
214214
steps:
215215
- name: "Check out repository"
216-
uses: actions/checkout@v6
216+
uses: actions/checkout@v7
217217
with:
218218
# This is necessary for making `git describe` work.
219219
fetch-depth: 0
@@ -236,13 +236,13 @@ jobs:
236236
with:
237237
# This should always match the minimum required version in
238238
# our CMakeLists.txt
239-
cmake-version: "3.21.x"
239+
cmake-version: "3.22.x"
240240

241241
- name: "[Windows] Set up cmake"
242242
uses: jwlawson/actions-setup-cmake@v2.2
243243
# Ubuntu 24.04 should use the CMake version from the repos.
244-
# On windows-11-arm this action installs the x64 version which has unwanted side effects
245-
if: matrix.os == 'windows-2022'
244+
# On Windows ARM64 this action installs the x64 version which has unwanted side effects
245+
if: runner.os == 'Windows' && runner.arch != 'ARM64'
246246
with:
247247
# This version of CMake is needed for Wix Toolset >= v4 support,
248248
# see: https://cmake.org/cmake/help/latest/cpack_gen/wix.html#variable:CPACK_WIX_VERSION
@@ -255,14 +255,13 @@ jobs:
255255
arch: ${{ matrix.arch }}
256256

257257
- name: "[Windows 11 ARM64] Install ARM64 CMake"
258-
if: matrix.os == 'windows-11-arm'
258+
if: runner.os == 'Windows' && runner.arch == 'ARM64'
259259
run: |
260260
Invoke-WebRequest -Uri https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-windows-arm64.zip -OutFile cmake-arm64.zip
261261
Expand-Archive cmake-arm64.zip -DestinationPath $env:USERPROFILE\cmake
262262
$cmakePath = "$env:USERPROFILE\cmake\cmake-3.30.1-windows-arm64\bin"
263263
$cmakePath | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
264264
$env:Path += ";$cmakePath"
265-
cmake --version
266265
267266
- name: "[macOS] install ccache and make"
268267
if: runner.os == 'macOS'
@@ -339,7 +338,7 @@ jobs:
339338

340339
- name: "[Ubuntu/macOS] Set up GitHub cache for ccache"
341340
if: runner.os != 'windows'
342-
uses: actions/cache@v5
341+
uses: actions/cache@v6
343342
with:
344343
path: ${{ matrix.compiler_cache_path }}
345344
key: ${{ matrix.os }}-${{ matrix.compiler_cache_id }}-${{ inputs.branch }}-${{ github.run_number }}
@@ -691,7 +690,7 @@ jobs:
691690
rm -rf /host/usr/share/dotnet
692691
693692
- name: "Check out repository"
694-
uses: actions/checkout@v6
693+
uses: actions/checkout@v7
695694
with:
696695
fetch-depth: 0
697696

@@ -748,7 +747,7 @@ jobs:
748747
if: always() && github.repository == 'mixxxdj/mixxx'
749748
steps:
750749
- name: "Check out repository"
751-
uses: actions/checkout@v6
750+
uses: actions/checkout@v7
752751
with:
753752
fetch-depth: 0
754753

.github/workflows/changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions: {}
1212
jobs:
1313
trigger-changelog-update:
1414
name: Trigger Changelog update on manual repository
15-
runs-on: ubuntu-latest
15+
runs-on: ubuntu-slim
1616
steps:
1717
- name: Get current branch name
1818
uses: nelonoel/branch-name@v1.0.1

.github/workflows/checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
name: ${{ matrix.name }}
2525
steps:
2626
- name: Check out repository
27-
uses: actions/checkout@v6
27+
uses: actions/checkout@v7
2828
- name: Add clazy PPA
2929
if: matrix.name == 'clazy'
3030
# Ubuntu2404 comes with v1.11, which is too old for the Qt6.4 shipped with Ubuntu 24.04
@@ -157,7 +157,7 @@ jobs:
157157
- name: "Upload Coverage Report to coveralls.io"
158158
if: matrix.name == 'coverage'
159159
continue-on-error: true
160-
uses: coverallsapp/github-action@v2.3.7
160+
uses: coverallsapp/github-action@v2.3.8
161161
with:
162162
flag-name: ubuntu-24.04
163163
path-to-lcov: build/lcov.info

.github/workflows/develop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ permissions:
2121
jobs:
2222
stop-build:
2323
name: Check if build should be stopped
24-
runs-on: ubuntu-latest
24+
runs-on: ubuntu-slim
2525
outputs:
2626
result: ${{ github.event_name == 'push' && steps.stop-build.outputs.result || 'false' }}
2727
steps:
@@ -85,7 +85,7 @@ jobs:
8585
- checks
8686
- git
8787
- build
88-
runs-on: ubuntu-latest
88+
runs-on: ubuntu-slim
8989
steps:
9090
- name: Ready to go
9191
run: "exit 0"

.github/workflows/flatpak.yml

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
jobs:
2121
publish-flatpak:
2222
name: Publish Flatpak
23-
runs-on: ubuntu-latest
23+
runs-on: ubuntu-slim
2424
steps:
2525
- name: "Set up SSH Agent"
2626
shell: bash
@@ -37,7 +37,7 @@ jobs:
3737
3838
- name: Check out repository
3939
if: ${{ inputs.update_repo }}
40-
uses: actions/checkout@v6
40+
uses: actions/checkout@v7
4141

4242
- name: "Prepare"
4343
id: prepare
@@ -118,7 +118,6 @@ jobs:
118118
flatpak build-import-bundle -v --gpg-sign=$GPG_KEY_ID repo.tmp "$file"
119119
checksum=$(ostree --repo=repo.tmp rev-parse "${type}/${id}/${arch}/master")
120120
metadata=$(ostree --repo=repo.tmp show --print-metadata-key=xa.metadata "${type}/${id}/${arch}/master")
121-
ostree --repo=repo pull --depth=-1 --mirror "upstream:${type}/${id}/${arch}/${BRANCH}" || true
122121
ostree --repo=repo pull-local repo.tmp "${checksum}"
123122
ostree --repo=repo commit \
124123
--gpg-sign=$GPG_KEY_ID \
@@ -135,7 +134,8 @@ jobs:
135134
ostree --repo=repo init --mode=archive-z2
136135
137136
# Hook publish repo to the remote
138-
ostree --repo=repo remote add upstream https://downloads.mixxx.org/flatpak/
137+
ostree --repo=repo remote --set=gpg-verify=false add upstream https://downloads.mixxx.org/flatpak/
138+
ostree --repo=repo pull --depth=-1 --mirror "upstream"
139139
140140
for arch in "x86_64" "aarch64"; do
141141
import_to_repo "bundles/Mixxx-${VERSION}-${arch}.flatpak" org.mixxx.Mixxx ${arch} app
@@ -151,8 +151,29 @@ jobs:
151151
shell: bash
152152
env:
153153
EXPIRY: ${{ steps.prepare.outputs.expiry }}
154+
BRANCH: ${{ steps.prepare.outputs.branch }}
154155
run: |
155-
ostree --repo=repo prune --refs-only --keep-younger-than="$EXPIRY ago"
156+
cleanup_repo() {
157+
local id=$1
158+
local arch=$2
159+
local type=$3
160+
161+
local ref="${type}/${id}/${arch}/${BRANCH}"
162+
163+
echo "Pruning ${ref} (keeping ${EXPIRY})"
164+
165+
ostree --repo=repo prune \
166+
--only-branch="$ref" \
167+
--keep-younger-than="${EXPIRY} ago"
168+
}
169+
170+
for arch in x86_64 aarch64; do
171+
cleanup_repo org.mixxx.Mixxx "$arch" app
172+
cleanup_repo org.mixxx.Mixxx.Debug "$arch" runtime
173+
done
174+
175+
# Garbage-collect unreferenced objects.
176+
ostree --repo=repo prune
156177
- name: "Push the updated repo"
157178
env:
158179
SSH_HOST: downloads-hostgator.mixxx.org

.github/workflows/git.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ on:
55

66
jobs:
77
block-fixup:
8-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-slim
99

1010
steps:
11-
- uses: actions/checkout@v6
11+
- uses: actions/checkout@v7
1212
- name: Block Fixup Commit Merge
13-
uses: 13rac1/block-fixup-merge-action@v2.0.0
13+
uses: acolombier/block-fixup-merge-action@master

.github/workflows/labeler.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
permissions:
2020
contents: read # for actions/labeler to determine modified files
2121
pull-requests: write # for actions/labeler to add labels to PRs
22-
runs-on: ubuntu-latest
22+
runs-on: ubuntu-slim
2323

2424
steps:
25-
- uses: actions/labeler@v6.1.0
25+
- uses: actions/labeler@v7.0.0
2626
with:
2727
repo-token: "${{ secrets.GITHUB_TOKEN }}"
2828
sync-labels: false

.github/workflows/pr-command.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
return isMaintainer;
2525
- name: Checkout repository
2626
if: steps.check-maintainer.outputs.result == 'true'
27-
uses: actions/checkout@v6
27+
uses: actions/checkout@v7
2828
# Using an app is the recommended way to allow recursive operations.
2929
# Apps offer a way to have reduced scoped permissions (like GITHUB_TOKEN)
3030
# and short lifespan, unlike PAT.

.github/workflows/pre-commit.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,10 @@ permissions:
1515
jobs:
1616
pre-commit:
1717
name: Detecting code style issues
18-
runs-on: ubuntu-latest
19-
# The Dockerfile for this container can be found at:
20-
# https://github.com/Holzhaus/mixxx-ci-docker
21-
container: holzhaus/mixxx-ci:20220930
18+
runs-on: ubuntu-slim
2219
steps:
2320
- name: "Check out repository"
24-
uses: actions/checkout@v6
21+
uses: actions/checkout@v7
2522
with:
2623
# Unfortunately we need the whole history and can't use a shallow clone
2724
# because the Appstream Metadata hook parses the history to find the

0 commit comments

Comments
 (0)