diff options
| author | QMK Bot <hello@qmk.fm> | 2023-10-05 23:35:02 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2023-10-05 23:35:02 +0000 |
| commit | 0ca60eb759d567878024eaabc613d6193f560745 (patch) | |
| tree | 7ddbd6335f67a067a02053b041186aecef2cbfad /.github | |
| parent | a7406a429eb726731fe2a69e284282994dc9cd0c (diff) | |
| parent | 127560ae223255d0e081b932e902d2da242abf06 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/lint.yml | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9862ff502c..19dd7c70a9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -74,31 +74,10 @@ jobs: fi exit $exit_code - - name: Verify at most one added keyboard + - name: Verify keyboard aliases if: always() shell: 'bash {0}' run: | git reset --hard git clean -xfd - - # Get the keyboard list and count for the target branch - git checkout -f ${{ github.base_ref }} - git pull --ff-only - QMK_KEYBOARDS_BASE=$(qmk list-keyboards) - QMK_KEYBOARDS_BASE_COUNT=$(qmk list-keyboards | wc -l) - - # Get the keyboard list and count for the PR - git checkout -f ${{ github.head_ref }} - git merge --no-commit --squash ${{ github.base_ref }} - QMK_KEYBOARDS_PR=$(qmk list-keyboards) - QMK_KEYBOARDS_PR_COUNT=$(qmk list-keyboards | wc -l) - - echo "::group::Keyboards changes in this PR" - diff -d -U 0 <(echo "$QMK_KEYBOARDS_BASE") <(echo "$QMK_KEYBOARDS_PR") | grep -vE '^(---|\+\+\+|@@)' | sed -e 's@^-@Removed: @g' -e 's@^+@ Added: @g' - echo "::endgroup::" - - if [[ $QMK_KEYBOARDS_PR_COUNT -gt $(($QMK_KEYBOARDS_BASE_COUNT + 1)) ]]; then - echo "More than one keyboard added in this PR -- see the PR Checklist." - echo "::error::More than one keyboard added in this PR -- see the PR Checklist." - exit 1 - fi + qmk ci-validate-aliases |