Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/2.5' into SlowEventLoopNotify
Browse files Browse the repository at this point in the history
  • Loading branch information
JoergAtGithub committed Jun 28, 2024
2 parents 9ab79a6 + c6d1d5f commit 21c8452
Show file tree
Hide file tree
Showing 1,878 changed files with 418,293 additions and 925,918 deletions.
1 change: 0 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Checks: >-
readability-qualified-auto
WarningsAsErrors: ""
HeaderFilterRegex: ""
AnalyzeTemporaryDtors: false
FormatStyle: none
User: user
CheckOptions:
Expand Down
3 changes: 2 additions & 1 deletion .codespellignorelines
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
CSAMPLE* pInOut,
void EnginePregain::process(CSAMPLE* pInOut, const int iBufferSize) {
void EngineDelay::process(CSAMPLE* pInOut, const int iBufferSize) {
void EngineFilter::process(CSAMPLE* pInOut, const int iBufferSize)
pInOut[i] = (CSAMPLE) processSample(fbuf1, (double) pInOut[i]);
pInOut[i + 1] = (CSAMPLE) processSample(fbuf2, (double) pInOut[i + 1]);
m_pDelayBuffer[m_iDelayPos] = pInOut[i];
Expand Down Expand Up @@ -72,3 +71,5 @@ void EngineEffectsDelay::process(CSAMPLE* pInOut,
// Source: FIPS 180-4 Secure Hash Standard (SHS)
// ALAC/CAF has been added in version 1.0.26
QStringLiteral("caf"),
void EngineFilter::process(CSAMPLE* pInOut, const int iBufferSize)
// Note(RRyan/Max Linke):
4 changes: 3 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"extends": [ "eslint:recommended",
"plugin:jsdoc/recommended"],
"plugin:jsdoc/recommended",
"plugin:diff/diff"],

"parser": "@typescript-eslint/parser",
"parserOptions": {
Expand Down Expand Up @@ -83,6 +84,7 @@
"object-curly-spacing": "warn",
"prefer-const": "warn",
"prefer-regex-literals": "warn",
"prefer-template": "warn",
"quotes": [ "warn", "double" ],
"require-atomic-updates": "error",
"semi": "warn",
Expand Down
156 changes: 137 additions & 19 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,147 @@
build:
- default.nix
- CMakeLists.txt
- build/**
- cmake/**
- changed-files:
- any-glob-to-any-file:
- default.nix
- CMakeLists.txt
- build/**
- cmake/**

cmake:
- changed-files:
- any-glob-to-any-file:
- cmake/**

code quality:
- src/test/**
- .clang-format
- .codespell
- .eslint*
- .flake8
- .pre-commit-config.yaml
- pyproject.toml
- changed-files:
- any-glob-to-any-file:
- src/test/**
- .clang-format
- .codespell
- .eslint*
- .flake8
- .pre-commit-config.yaml
- pyproject.toml

controller backend:
- changed-files:
- any-glob-to-any-file:
- src/controllers/**

controller mappings:
- changed-files:
- any-glob-to-any-file:
- res/controllers/**

analyzer:
- changed-files:
- any-glob-to-any-file:
- src/analyzer/**

broadcast:
- changed-files:
- any-glob-to-any-file:
- src/broadcast/**

effects:
- changed-files:
- any-glob-to-any-file:
- src/effects/**

controllers:
- res/controllers/**
engine:
- changed-files:
- any-glob-to-any-file:
- src/engine/**

sync:
- changed-files:
- any-glob-to-any-file:
- src/engine/sync/**

library:
- src/library/**
- changed-files:
- any-glob-to-any-file:
- src/library/**

autodj:
- changed-files:
- any-glob-to-any-file:
- src/library/autodj/**

browse:
- changed-files:
- any-glob-to-any-file:
- src/library/browse/**

itunes:
- changed-files:
- any-glob-to-any-file:
- src/library/itunes/**

rekordbox:
- changed-files:
- any-glob-to-any-file:
- src/library/rekordbox/**

scanner:
- changed-files:
- any-glob-to-any-file:
- src/library/scanner/**

search:
- changed-files:
- any-glob-to-any-file:
- src/library/searchquery*

serato:
- changed-files:
- any-glob-to-any-file:
- src/library/serato/**

packaging:
- changed-files:
- any-glob-to-any-file:
- packaging/**

preferences:
- changed-files:
- any-glob-to-any-file:
- src/preferences/**

qml:
- changed-files:
- any-glob-to-any-file:
- res/qml/**
- src/qml/**

skins:
- res/skins/**
- changed-files:
- any-glob-to-any-file:
- res/skins/**

soundio:
- changed-files:
- any-glob-to-any-file:
- src/soundio/**

soundsource:
- changed-files:
- any-glob-to-any-file:
- src/sources/soundsource*

ui:
- src/**.ui
- src/dialog/**
- src/preferences/**
- src/widget/**
- changed-files:
- any-glob-to-any-file:
- src/**.ui
- src/dialog/**
- src/preferences/**
- src/widget/**

vinylcontrol:
- changed-files:
- any-glob-to-any-file:
- src/vinylcontrol/**

waveform:
- changed-files:
- any-glob-to-any-file:
- src/waveform/**
11 changes: 7 additions & 4 deletions .github/workflows/build-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
name: ${{ matrix.name }}
steps:
- name: Check out repository
uses: actions/checkout@v4
uses: actions/checkout@v4.1.6
- name: Install build dependencies
run: tools/debian_buildenv.sh setup
- name: Create build directory
Expand All @@ -37,6 +37,7 @@ jobs:
cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DWARNINGS_FATAL=ON \
-DQT6=ON \
-DOPTIMIZE=off \
-DBATTERY=ON \
-DBROADCAST=ON \
Expand Down Expand Up @@ -65,6 +66,7 @@ jobs:
-DCMAKE_BUILD_TYPE=Debug \
-DCLANG_TIDY=clang-tidy \
-DWARNINGS_FATAL=ON \
-DQT6=ON \
-DBATTERY=ON \
-DBROADCAST=ON \
-DBULK=ON \
Expand All @@ -91,6 +93,7 @@ jobs:
cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DOPTIMIZE=off \
-DQT6=ON \
-DCOVERAGE=ON \
-DWARNINGS_FATAL=OFF \
-DDEBUG_ASSERTIONS_FATAL=OFF \
Expand All @@ -111,14 +114,14 @@ jobs:
..
working-directory: build
- name: Set up problem matcher
uses: ammaraskar/gcc-problem-matcher@0.2.0
uses: ammaraskar/gcc-problem-matcher@0.3.0
# 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-0ubuntu3.4 libc6-dev=2.35-0ubuntu3.4 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
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
Expand Down Expand Up @@ -153,7 +156,7 @@ jobs:
- name: "Upload Coverage Report to coveralls.io"
if: matrix.name == 'coverage'
continue-on-error: true
uses: coverallsapp/github-action@v2.2.3
uses: coverallsapp/github-action@v2.3.0
with:
flag-name: ubuntu-22.04
path-to-lcov: build/lcov.info
Expand Down
Loading

0 comments on commit 21c8452

Please sign in to comment.