-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into feat/add-advanced-s…
…tem-load-cos
- Loading branch information
Showing
294 changed files
with
28,190 additions
and
34,590 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,11 +21,17 @@ jobs: | |
- name: clazy | ||
- name: clang-tidy | ||
- name: coverage | ||
runs-on: ubuntu-22.04 | ||
runs-on: ubuntu-24.04 | ||
name: ${{ matrix.name }} | ||
steps: | ||
- name: Check out repository | ||
uses: actions/[email protected] | ||
uses: actions/[email protected] | ||
- name: Add clazy PPA | ||
if: matrix.name == 'clazy' | ||
# Ubuntu2404 comes with v1.11, which is too old for the Qt6.4 shipped with Ubuntu 24.04 | ||
run: | | ||
sudo add-apt-repository ppa:daschuer/clazy | ||
sudo apt update | ||
- name: Install build dependencies | ||
run: tools/debian_buildenv.sh setup | ||
- name: Create build directory | ||
|
@@ -34,6 +40,7 @@ jobs: | |
if: matrix.name == 'clazy' | ||
# Disable optimizations as workaround for Clang 9 bug: https://bugs.llvm.org/show_bug.cgi?id=45034 | ||
run: | | ||
clazy --version | ||
cmake \ | ||
-DCMAKE_BUILD_TYPE=Debug \ | ||
-DWARNINGS_FATAL=ON \ | ||
|
@@ -61,6 +68,8 @@ jobs: | |
CXX: clazy | ||
- name: Configure (clang-tidy) | ||
if: matrix.name == 'clang-tidy' | ||
# Our code contains the use of infinity(), which Clang >= 18 reports | ||
# as error, if you compile with -fast-math | ||
run: | | ||
cmake \ | ||
-DCMAKE_BUILD_TYPE=Debug \ | ||
|
@@ -81,6 +90,7 @@ jobs: | |
-DMAD=ON \ | ||
-DMODPLUG=ON \ | ||
-DWAVPACK=ON \ | ||
-DCMAKE_CXX_FLAGS="-Wno-nan-infinity-disabled" \ | ||
.. | ||
working-directory: build | ||
env: | ||
|
@@ -116,13 +126,6 @@ jobs: | |
working-directory: build | ||
- name: Set up problem matcher | ||
uses: ammaraskar/[email protected] | ||
# Work around https://github.com/actions/runner-images/issues/8659 | ||
- name: "Remove GCC 13 from runner image (workaround)" | ||
shell: bash | ||
run: | | ||
sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list | ||
sudo apt-get update | ||
sudo apt-get install -y --allow-downgrades libc6=2.35* libc6-dev=2.35* libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04 | ||
- name: Build | ||
# Do not abort on errors and build/check the whole project | ||
run: cmake --build . -j $(nproc) -- --keep-going | ||
|
@@ -157,8 +160,8 @@ jobs: | |
- name: "Upload Coverage Report to coveralls.io" | ||
if: matrix.name == 'coverage' | ||
continue-on-error: true | ||
uses: coverallsapp/[email protected].0 | ||
uses: coverallsapp/[email protected].4 | ||
with: | ||
flag-name: ubuntu-22.04 | ||
flag-name: ubuntu-24.04 | ||
path-to-lcov: build/lcov.info | ||
github-token: ${{ secrets.GITHUB_TOKEN }} |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,8 +15,8 @@ jobs: | |
fail-fast: false | ||
matrix: | ||
include: | ||
- name: Ubuntu 22.04 | ||
os: ubuntu-22.04 | ||
- name: Ubuntu 24.04 | ||
os: ubuntu-24.04 | ||
cmake_args: >- | ||
-DQT6=ON | ||
-DQML=ON | ||
|
@@ -34,7 +34,7 @@ jobs: | |
cpack_generator: DEB | ||
buildenv_basepath: /home/runner/buildenv | ||
buildenv_script: tools/debian_buildenv.sh | ||
artifacts_name: Ubuntu 22.04 Qt6 DEB | ||
artifacts_name: Ubuntu 24.04 Qt6 DEB | ||
artifacts_path: build/*.deb | ||
artifacts_slug: ubuntu-jammy | ||
qt_qpa_platform: offscreen | ||
|
@@ -121,7 +121,6 @@ jobs: | |
|
||
env: | ||
# macOS codesigning | ||
APPLE_CODESIGN_IDENTITY: EF241CF990A9BE5477438AEE1F308F76F33FD100 | ||
MACOS_CODESIGN_CERTIFICATE_P12_BASE64: ${{ secrets.MACOS_CODESIGN_CERTIFICATE_P12_BASE64 }} | ||
MACOS_CODESIGN_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CODESIGN_CERTIFICATE_PASSWORD }} | ||
|
||
|
@@ -134,7 +133,7 @@ jobs: | |
artifact-windows-win64: ${{ steps.prepare_deploy.outputs.artifact-windows-win64 }} | ||
steps: | ||
- name: "Check out repository" | ||
uses: actions/checkout@v4.1.7 | ||
uses: actions/checkout@v4.2.2 | ||
with: | ||
# This is necessary for making `git describe` work. | ||
fetch-depth: 0 | ||
|
@@ -152,7 +151,7 @@ jobs: | |
|
||
- name: "[macOS] Set up cmake" | ||
uses: jwlawson/[email protected] | ||
# Ubuntu 22.04 should use the CMake version from the repos. | ||
# Ubuntu 24.04 should use the CMake version from the repos. | ||
if: runner.os == 'macOS' | ||
with: | ||
# This should always match the minimum required version in | ||
|
@@ -161,7 +160,7 @@ jobs: | |
|
||
- name: "[Windows] Set up cmake" | ||
uses: jwlawson/[email protected] | ||
# Ubuntu 22.04 should use the CMake version from the repos. | ||
# Ubuntu 24.04 should use the CMake version from the repos. | ||
if: runner.os == 'Windows' | ||
with: | ||
# This is a workaround for a SSL false positive in cmake 3.26.4 | ||
|
@@ -201,12 +200,15 @@ jobs: | |
security unlock-keychain -p mixxx Mixxx.keychain | ||
security import ~/certificate.p12 -k Mixxx.keychain \ | ||
-P "${MACOS_CODESIGN_CERTIFICATE_PASSWORD}" -A | ||
security find-certificate -a -Z Mixxx.keychain | ||
APPLE_CODESIGN_IDENTITY="$(security find-certificate -a -Z Mixxx.keychain | grep ^SHA-1 | cut -d " " -f3 | uniq)" | ||
security set-key-partition-list -S "apple-tool:,apple:" -k mixxx Mixxx.keychain | ||
# Add keychain to search list | ||
security list-keychains -s Mixxx.keychain | ||
# Prevent keychain access from timing out | ||
security set-keychain-settings Mixxx.keychain | ||
echo "CMAKE_ARGS_EXTRA=${CMAKE_ARGS_EXTRA} -DAPPLE_CODESIGN_IDENTITY=${APPLE_CODESIGN_IDENTITY}" >> "${GITHUB_ENV}" | ||
echo "APPLE_CODESIGN_IDENTITY=${APPLE_CODESIGN_IDENTITY}" >> $GITHUB_ENV | ||
- name: "[macOS/Linux] Set up build environment" | ||
if: matrix.buildenv_script != null && runner.os != 'Windows' | ||
|
@@ -316,7 +318,7 @@ jobs: | |
env: | ||
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} | ||
if: runner.os == 'Windows' && env.AZURE_TENANT_ID | ||
uses: azure/trusted-signing-action@v0.4.0 | ||
uses: azure/trusted-signing-action@v0.5.0 | ||
with: | ||
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }} | ||
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }} | ||
|
@@ -344,7 +346,7 @@ jobs: | |
|
||
- name: "Package for PPA" | ||
# No need to do the PPA build for both Ubuntu versions | ||
if: matrix.name == 'Ubuntu 22.04' | ||
if: matrix.name == 'Ubuntu 24.04' | ||
run: | | ||
if [[ "${{ github.ref }}" == "refs/heads/main" ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then | ||
CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/nightlies" | ||
|
@@ -371,7 +373,7 @@ jobs: | |
env: | ||
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} | ||
if: runner.os == 'Windows' && env.AZURE_TENANT_ID | ||
uses: azure/trusted-signing-action@v0.4.0 | ||
uses: azure/trusted-signing-action@v0.5.0 | ||
with: | ||
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }} | ||
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }} | ||
|
@@ -473,7 +475,7 @@ jobs: | |
- name: "Upload GitHub Actions artifacts" | ||
if: matrix.artifacts_path != null | ||
uses: actions/[email protected].0 | ||
uses: actions/[email protected].3 | ||
with: | ||
name: ${{ matrix.artifacts_name }} | ||
path: ${{ matrix.artifacts_path }} | ||
|
@@ -489,7 +491,7 @@ jobs: | |
if: always() && github.repository == 'mixxxdj/mixxx' | ||
steps: | ||
- name: "Check out repository" | ||
uses: actions/checkout@v4.1.7 | ||
uses: actions/checkout@v4.2.2 | ||
with: | ||
fetch-depth: 0 | ||
|
||
|
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,6 +7,6 @@ jobs: | |
runs-on: ubuntu-22.04 | ||
|
||
steps: | ||
- uses: actions/checkout@v4.1.7 | ||
- uses: actions/checkout@v4.2.2 | ||
- name: Block Fixup Commit Merge | ||
uses: 13rac1/[email protected] |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,7 @@ jobs: | |
container: holzhaus/mixxx-ci:20220930 | ||
steps: | ||
- name: "Check out repository" | ||
uses: actions/checkout@v4.1.7 | ||
uses: actions/checkout@v4.2.2 | ||
with: | ||
# Unfortunately we need the whole history and can't use a shallow clone | ||
# because the Appstream Metadata hook parses the history to find the | ||
|
@@ -67,14 +67,14 @@ jobs: | |
|
||
- name: "Upload patch artifact" | ||
if: failure() && env.UPLOAD_PATCH_FILE != null | ||
uses: actions/[email protected].0 | ||
uses: actions/[email protected].3 | ||
with: | ||
name: ${{ env.UPLOAD_PATCH_FILE }} | ||
path: ${{ env.UPLOAD_PATCH_FILE }} | ||
|
||
- name: "Upload pre-commit.log" | ||
if: failure() && env.UPLOAD_PATCH_FILE == null | ||
uses: actions/[email protected].0 | ||
uses: actions/[email protected].3 | ||
with: | ||
name: pre-commit.log | ||
path: /github/home/.cache/pre-commit/pre-commit.log | ||
|
This file contains 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
Oops, something went wrong.