Skip to content

Commit

Permalink
Merge branch 'mixxxdj:main' into componentsjs_fix_syncbutton
Browse files Browse the repository at this point in the history
  • Loading branch information
JaviVilarroig authored Sep 27, 2021
2 parents 5a0d037 + eff27ab commit 8bedc66
Show file tree
Hide file tree
Showing 2,114 changed files with 378,930 additions and 287,055 deletions.
17 changes: 8 additions & 9 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,14 @@ SpacesBeforeTrailingComments: 1
# StatementMacros don't require a trailing semicolon.
# Trailing semicolons should be omitted after these macros
# when compiling with -Wpedantic to avoid warnings.
# TODO: Enable if Clang 8 is available, Ubuntu 18.04 uses Clang 6
#StatementMacros:
# - Q_DECLARE_FLAGS
# - Q_DECLARE_METATYPE
# - Q_DECLARE_OPERATORS_FOR_FLAGS
# - Q_OBJECT
# - Q_PROPERTY
# - Q_UNUSED
# - QT_REQUIRE_VERSION
StatementMacros:
- Q_DECLARE_FLAGS
- Q_DECLARE_METATYPE
- Q_DECLARE_OPERATORS_FOR_FLAGS
- Q_OBJECT
- Q_PROPERTY
- Q_UNUSED
- QT_REQUIRE_VERSION
---
Language: JavaScript
# Don't format .js files yet
Expand Down
1 change: 1 addition & 0 deletions .codespellignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ Crate
crate
InOut
copyable
sord
24 changes: 21 additions & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,52 +1,70 @@
{
"extends": "eslint:recommended",
"parserOptions": {
"ecmaVersion": 5,
"ecmaVersion": 7,
"sourceType": "script"
},
"env": {
"es6": true
},
"rules": {
"array-bracket-spacing" : "warn",
"block-spacing": "warn",
"brace-style": ["warn", "1tbs", {
"allowSingleLine": true
}],
"curly": "warn",
"camelcase": "warn",
"comma-spacing": "warn",
"computed-property-spacing" : ["warn", "never", {
"enforceForClassMembers": true
}],
"dot-location": "warn",
"dot-notation": "warn",
"eqeqeq": ["error", "always"],
"func-call-spacing": "warn",
"func-style": ["error", "expression", {
"allowArrowFunctions": true
}],
"indent": ["warn", 4],
"key-spacing": "warn",
"keyword-spacing": "warn",
"linebreak-style": ["warn", "unix"],
"no-constructor-return": "warn",
"no-extra-bind": "warn",
"no-sequences": "warn",
"no-useless-call": "warn",
"no-useless-return": "warn",
"no-trailing-spaces": "warn",
"no-unneeded-ternary": ["warn", {
"defaultAssignment": false
}],
"no-unused-vars": ["error", {
"argsIgnorePattern": "^_"
}],
"no-var": "warn",
"object-curly-newline" : ["warn", {
"consistent": true,
"multiline": true
}],
"object-curly-spacing" : "warn",
"prefer-const": "warn",
"prefer-regex-literals": "warn",
"quotes": ["warn", "double"],
"require-atomic-updates": "error",
"semi": "warn",
"semi-spacing": "warn",
"space-before-blocks": ["warn", "always"],
"space-before-function-paren": ["warn", "never"],
"space-in-parens": "warn"
"space-in-parens": "warn",
"yoda": "warn"
},
"globals": {
"console": "writable",
"svg": "writable",
"print": "readonly"
"HIDController": "writable",
"HIDDebug": "writable",
"HIDPacket": "writable",
"controller": "writable"
}
}
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
custom: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QSFMYWN2B3JD2&source=url"
custom: "https://mixxx.org/donate"
97 changes: 59 additions & 38 deletions .github/workflows/build-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,50 +11,14 @@ jobs:
include:
- name: clazy
- name: clang-tidy
- name: coverage
runs-on: ubuntu-20.04
name: ${{ matrix.name }}
steps:
- name: Check out repository
uses: actions/checkout@v2
- name: Install build dependencies
run: |
sudo apt-get update && sudo apt-get install -y --no-install-recommends \
libavformat-dev \
libchromaprint-dev \
libebur128-dev \
libfftw3-dev \
libflac-dev \
libid3tag0-dev \
liblilv-dev \
libmad0-dev \
libmodplug-dev \
libmp3lame-dev \
libopus-dev \
libopusfile-dev \
libportmidi-dev \
libprotobuf-dev \
libqt5opengl5-dev \
libqt5sql5-sqlite \
libqt5svg5-dev \
libqt5x11extras5-dev \
librubberband-dev \
libshout3-dev \
libsndfile1-dev \
libsoundtouch-dev \
libsqlite3-dev \
libtag1-dev \
libupower-glib-dev \
libusb-1.0-0-dev \
libwavpack-dev \
portaudio19-dev \
protobuf-compiler \
qt5-default \
qtdeclarative5-dev \
qtscript5-dev \
qt5keychain-dev \
clazy \
clang-tidy \
cmake
run: tools/debian_buildenv.sh setup
- name: Create build directory
run: mkdir build
- name: Configure (clazy)
Expand Down Expand Up @@ -108,6 +72,31 @@ jobs:
-DWAVPACK=ON \
..
working-directory: build
- name: Configure (coverage)
if: matrix.name == 'coverage'
run: |
cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DOPTIMIZE=off \
-DCOVERAGE=ON \
-DWARNINGS_FATAL=OFF \
-DDEBUG_ASSERTIONS_FATAL=OFF \
-DBATTERY=ON \
-DBROADCAST=ON \
-DBULK=ON \
-DHID=ON \
-DLILV=ON \
-DOPUS=ON \
-DQTKEYCHAIN=ON \
-DVINYLCONTROL=ON \
-DFFMPEG=ON \
-DKEYFINDER=ON \
-DLOCALECOMPARE=ON \
-DMAD=ON \
-DMODPLUG=ON \
-DWAVPACK=ON \
..
working-directory: build
- name: Set up problem matcher
uses: ammaraskar/gcc-problem-matcher@master
- name: Build
Expand All @@ -117,3 +106,35 @@ jobs:
env:
CLAZY_CHECKS: level2,no-rule-of-two-soft,no-non-pod-global-static,no-qproperty-without-notify,no-wrong-qevent-cast,no-qstring-allocations,no-function-args-by-value,no-copyable-polymorphic,no-ctor-missing-parent-argument,no-missing-qobject-macro,no-rule-of-three,no-returning-void-expression,no-missing-typeinfo,no-base-class-event
CLAZY_IGNORE_DIRS: lib/.*
- name: "Test"
if: matrix.name == 'coverage'
run: ctest --timeout 45
working-directory: build
env:
# Render analyzer waveform tests to an offscreen buffer
QT_QPA_PLATFORM: ${{ matrix.qt_qpa_platform }}
GTEST_COLOR: 1
# Only use single thread to prevent *.gcna files from overwriting each other
CTEST_PARALLEL_LEVEL: 1
CTEST_OUTPUT_ON_FAILURE: 1
- name: "Generate Coverage Report"
if: matrix.name == 'coverage'
run: >-
lcov
--capture
--directory .
--base-directory ..
--include "${PWD%/*}/src/*"
--exclude "${PWD%/*}/src/test/*"
--exclude "${PWD%/*}/build/*"
--exclude "${PWD%/*}/lib/*"
--output-file lcov.info
working-directory: build
- name: "Upload Coverage Report to coveralls.io"
if: matrix.name == 'coverage'
continue-on-error: true
uses: coverallsapp/github-action@master
with:
flag-name: ubuntu-20.04
path-to-lcov: build/lcov.info
github-token: ${{ secrets.GITHUB_TOKEN }}
Loading

0 comments on commit 8bedc66

Please sign in to comment.