Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/2.4' into firstSoundTest
Browse files Browse the repository at this point in the history
  • Loading branch information
daschuer committed Sep 4, 2023
2 parents 8526157 + d2ce2ea commit 96b00a7
Show file tree
Hide file tree
Showing 14 changed files with 27,654 additions and 22,130 deletions.
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
res/controllers/lodash.mixxx.js
res/controllers/Novation-Launchpad MK2-scripts.js
res/controllers/Novation-Launchpad Mini MK3-scripts.js
res/controllers/Novation-Launchpad-scripts.js
2 changes: 1 addition & 1 deletion .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@v3
uses: actions/checkout@v4
- name: Install build dependencies
run: tools/debian_buildenv.sh setup
- name: Create build directory
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ jobs:
run: cargo install --version "${{ env.SCCACHE_VERSION }}" sccache

- name: "Check out repository"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# This is necessary for making `git describe` work.
fetch-depth: 0
Expand Down Expand Up @@ -479,7 +479,7 @@ jobs:
needs: build
steps:
- name: "Check out repository"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
container: holzhaus/mixxx-ci:20220930
steps:
- name: "Check out repository"
uses: actions/checkout@v3
uses: actions/checkout@v4
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
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ repos:
- commit
- manual
additional_dependencies:
- eslint@^v8.6.0
- eslint-plugin-jsdoc@^v37.5.0
- eslint@^8.48.0
- eslint-plugin-jsdoc@^v46.5.1
- "@typescript-eslint/eslint-plugin"
- "@typescript-eslint/parser"
- repo: local
Expand Down
Loading

0 comments on commit 96b00a7

Please sign in to comment.