-
-
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 'origin/2.3' into temposecondsfix
- Loading branch information
Showing
321 changed files
with
42,402 additions
and
61,708 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
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 |
|---|---|---|
|
|
@@ -10,55 +10,64 @@ jobs: | |
| pre-commit: | ||
| name: Detecting code style issues | ||
| runs-on: ubuntu-latest | ||
| # The Dockerfile for this container can be found at: | ||
| # https://github.com/Holzhaus/mixxx-ci-docker | ||
| container: holzhaus/mixxx-ci:20220805 | ||
| steps: | ||
| - name: "Check out repository" | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| fetch-depth: 2 | ||
| - name: "Check out repository" | ||
| uses: actions/checkout@v3 | ||
| 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 | ||
| # latest changelog modification date. Otherwise, `fetch-depth: 2` would | ||
| # suffice. | ||
| fetch-depth: 0 | ||
|
|
||
| - name: "Set up Python" | ||
| uses: actions/setup-python@v2 | ||
| - name: "Add GitHub workspace as a safe directory" | ||
| # Without this, git commands will fail due to mismatching permissions in | ||
| # the container. See actions/runner#2033 for details. | ||
| # | ||
| # The actions/checkout action should already take care of this thanks to | ||
| # commit actions/checkout@55fd82fc42c0cdd6f1f480dd23f60636a42f6f5c, but | ||
| # it seems like that's not working properly. | ||
| run: | | ||
| git config --global --add safe.directory "${GITHUB_WORKSPACE}" | ||
| git config --global --list | ||
| - name: Install clang-format | ||
| run: sudo apt-get update && sudo apt-get install -y --no-install-recommends clang-format-10 | ||
| - name: "Detect code style issues (push)" | ||
| uses: pre-commit/[email protected] | ||
| if: github.event_name == 'push' | ||
| # There are too many files in the repo that have formatting issues. We'll | ||
| # disable these checks for now when pushing directly (but still run these | ||
| # on Pull Requests!). | ||
| env: | ||
| SKIP: end-of-file-fixer,trailing-whitespace,clang-format,eslint,no-commit-to-branch,prettier | ||
|
|
||
| - name: "Detect code style issues (push)" | ||
| uses: pre-commit/[email protected] | ||
| if: github.event_name == 'push' | ||
| # There are too many files in the repo that have formatting issues. We'll | ||
| # disable these checks for now when pushing directly (but still run these | ||
| # on Pull Requests!). | ||
| env: | ||
| SKIP: end-of-file-fixer,trailing-whitespace,clang-format,eslint,no-commit-to-branch | ||
| - name: "Detect code style issues (pull_request)" | ||
| uses: pre-commit/[email protected] | ||
| if: github.event_name == 'pull_request' | ||
| env: | ||
| SKIP: no-commit-to-branch | ||
| with: | ||
| # HEAD is the not yet integrated PR merge commit +refs/pull/xxxx/merge | ||
| # HEAD^1 is the PR target branch and HEAD^2 is the HEAD of the source branch | ||
| extra_args: --from-ref HEAD^1 --to-ref HEAD | ||
|
|
||
| - name: "Detect code style issues (pull_request)" | ||
| uses: pre-commit/[email protected] | ||
| if: github.event_name == 'pull_request' | ||
| env: | ||
| SKIP: no-commit-to-branch | ||
| with: | ||
| # HEAD is the not yet integrated PR merge commit +refs/pull/xxxx/merge | ||
| # HEAD^1 is the PR target branch and HEAD^2 is the HEAD of the source branch | ||
| extra_args: --from-ref HEAD^1 --to-ref HEAD | ||
| - name: "Generate patch file" | ||
| if: failure() | ||
| run: | | ||
| git diff-index -p HEAD > "${PATCH_FILE}" | ||
| [ -s "${PATCH_FILE}" ] && echo "UPLOAD_PATCH_FILE=${PATCH_FILE}" >> "${GITHUB_ENV}" | ||
| env: | ||
| PATCH_FILE: pre-commit.patch | ||
|
|
||
| - name: "Generate patch file" | ||
| if: failure() | ||
| run: | | ||
| git diff-index -p HEAD > "${PATCH_FILE}" | ||
| [ -s "${PATCH_FILE}" ] && echo "UPLOAD_PATCH_FILE=${PATCH_FILE}" >> "${GITHUB_ENV}" | ||
| env: | ||
| PATCH_FILE: pre-commit.patch | ||
| - name: "Upload patch artifact" | ||
| if: failure() && env.UPLOAD_PATCH_FILE != null | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: ${{ env.UPLOAD_PATCH_FILE }} | ||
| path: ${{ env.UPLOAD_PATCH_FILE }} | ||
|
|
||
| - name: "Upload patch artifact" | ||
| if: failure() && env.UPLOAD_PATCH_FILE != null | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: ${{ env.UPLOAD_PATCH_FILE }} | ||
| path: ${{ env.UPLOAD_PATCH_FILE }} | ||
|
|
||
| - name: "Install appstreamcli" | ||
| run: sudo apt-get update && sudo apt-get install -y --no-install-recommends appstream | ||
|
|
||
| # AppStream metadata has been generated/updated by a pre-commit hook | ||
| - name: "Validate AppStream metadata" | ||
| run: appstreamcli validate res/linux/org.mixxx.Mixxx.metainfo.xml | ||
| # AppStream metadata has been generated/updated by a pre-commit hook | ||
| - name: "Validate AppStream metadata" | ||
| run: appstreamcli validate res/linux/org.mixxx.Mixxx.metainfo.xml | ||
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,3 +18,4 @@ jobs: | |
| stale-pr-label: "stale" | ||
| days-before-stale: 90 | ||
| days-before-close: -1 | ||
| exempt-pr-labels: "needs review" | ||
Oops, something went wrong.