forked from qmk/qmk_firmware
-
Notifications
You must be signed in to change notification settings - Fork 0
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 'upstream/master'
* upstream/master: (400 commits) keyboards/anavi: Add ANAVI Knobs 3 (qmk#18624) Reject VIA keys within info.json (qmk#20026) Unbreak switchplate/southpaw_65 after qmk#16277 (qmk#20015) Add Keychron Q12 (qmk#19844) Add Support for Lilly58 r2g (qmk#19862) Add new keymap for Preonic rev3 (qmk#19706) Initial deprecation policy documentation. (qmk#19908) Update branch names to reflect configurator's new deployment. (qmk#19999) Check all keys have matrix positions when parsing C LAYOUT macros (qmk#19781) [Keyboard] Clean up contra & move to data-driven (qmk#19973) [Keymap] Add davidrambo lulu keymap (qmk#19448) added Polly40 keyboard (qmk#19936) Remove `all` from list of animations in `info.json` (qmk#19978) Disable safe.directory check (qmk#19970) [Keyboard] Add GPAD8-2R (gpad8_2r) Macro Pad (qmk#19914) [Keymap] sofle/keymaps/michal: rewrite (qmk#19938) [Keyboard] Add FRL84 PCB. (qmk#19942) Bump tj-actions/changed-files from 34 to 35 (qmk#19971) [Keyboard] remove non-existent method from ploopy documentation (qmk#19957) [Keymap] Drashna updates for 0.20.0 (qmk#19960) ...
- Loading branch information
Showing
11,827 changed files
with
118,013 additions
and
114,832 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
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 |
---|---|---|
|
@@ -5,6 +5,7 @@ core: | |
- tests/**/* | ||
- util/**/* | ||
- platforms/**/* | ||
- builddefs/**/* | ||
- Makefile | ||
- '*.mk' | ||
dependencies: | ||
|
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 |
---|---|---|
|
@@ -22,6 +22,9 @@ jobs: | |
container: qmkfm/qmk_cli | ||
|
||
steps: | ||
- name: Disable safe.directory check | ||
run : git config --global --add safe.directory '*' | ||
|
||
- uses: actions/checkout@v3 | ||
with: | ||
fetch-depth: 0 | ||
|
@@ -30,16 +33,14 @@ jobs: | |
run: | | ||
pip3 install -r requirements-dev.txt | ||
- uses: trilom/[email protected] | ||
- name: Get changed files | ||
id: file_changes | ||
with: | ||
output: ' ' | ||
fileOutput: ' ' | ||
uses: tj-actions/changed-files@v35 | ||
|
||
- name: Run qmk formatters | ||
shell: 'bash {0}' | ||
run: | | ||
cat ~/files_added.txt ~/files_modified.txt > ~/files_changed.txt | ||
echo '${{ steps.file_changes.outputs.added_files}}' '${{ steps.file_changes.outputs.modified_files}}' > ~/files_changed.txt | ||
qmk format-c --core-only $(< ~/files_changed.txt) || true | ||
qmk format-python $(< ~/files_changed.txt) || true | ||
qmk format-text $(< ~/files_changed.txt) || true | ||
|
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 |
---|---|---|
|
@@ -15,31 +15,34 @@ jobs: | |
container: qmkfm/qmk_cli | ||
|
||
steps: | ||
- name: Disable safe.directory check | ||
run : git config --global --add safe.directory '*' | ||
|
||
- uses: actions/checkout@v3 | ||
with: | ||
fetch-depth: 0 | ||
|
||
- name: Install dependencies | ||
run: pip3 install -r requirements-dev.txt | ||
|
||
- uses: trilom/[email protected] | ||
- name: Get changed files | ||
id: file_changes | ||
with: | ||
output: '\n' | ||
uses: tj-actions/changed-files@v35 | ||
|
||
- name: Print info | ||
run: | | ||
git rev-parse --short HEAD | ||
echo ${{ github.event.pull_request.base.sha }} | ||
echo '${{ steps.file_changes.outputs.files}}' | ||
echo '${{ steps.file_changes.outputs.all_changed_files}}' | ||
- name: Run qmk lint | ||
shell: 'bash {0}' | ||
run: | | ||
QMK_CHANGES=$(echo -e '${{ steps.file_changes.outputs.files}}') | ||
QMK_CHANGES=$(echo -e '${{ steps.file_changes.outputs.all_changed_files}}' | sed 's/ /\n/g') | ||
QMK_KEYBOARDS=$(qmk list-keyboards) | ||
exit_code=0 | ||
for KB in $QMK_KEYBOARDS; do | ||
KEYBOARD_CHANGES=$(echo "$QMK_CHANGES" | grep -E '^(keyboards/'${KB}'/)') | ||
if [[ -z "$KEYBOARD_CHANGES" ]]; then | ||
|
@@ -55,6 +58,16 @@ jobs: | |
exit_code=$(($exit_code + $?)) | ||
fi | ||
done | ||
qmk format-text ${{ steps.file_changes.outputs.all_changed_files}} || true | ||
for file in ${{ steps.file_changes.outputs.all_changed_files}}; do | ||
if ! git diff --quiet $file; then | ||
echo "File '${file}' Requires Formatting" | ||
echo "::error file=${file}::Requires Formatting" | ||
exit_code=$(($exit_code + 1)) | ||
fi | ||
done | ||
if [[ $exit_code -gt 255 ]]; then | ||
exit 255 | ||
fi | ||
|
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 |
---|---|---|
@@ -0,0 +1,36 @@ | ||
name: PR Regenerate Files | ||
|
||
permissions: | ||
contents: read | ||
|
||
on: | ||
pull_request: | ||
paths: | ||
- 'data/constants/**' | ||
- 'lib/python/**' | ||
|
||
jobs: | ||
regen: | ||
runs-on: ubuntu-latest | ||
|
||
container: qmkfm/qmk_cli | ||
|
||
steps: | ||
- name: Disable safe.directory check | ||
run : git config --global --add safe.directory '*' | ||
|
||
- uses: actions/checkout@v3 | ||
|
||
- name: Run qmk generators | ||
run: | | ||
util/regen.sh | ||
git diff | ||
- name: Fail when regeneration required | ||
run: | | ||
git diff | ||
for file in $(git diff --name-only); do | ||
echo "File '${file}' Requires Regeneration" | ||
echo "::error file=${file}::Requires Regeneration" | ||
done | ||
test -z "$(git diff --name-only)" |
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 |
---|---|---|
@@ -0,0 +1,46 @@ | ||
name: Regenerate Files | ||
|
||
permissions: | ||
contents: write | ||
|
||
on: | ||
push: | ||
branches: | ||
- master | ||
- develop | ||
|
||
jobs: | ||
regen: | ||
runs-on: ubuntu-latest | ||
|
||
container: qmkfm/qmk_cli | ||
|
||
steps: | ||
- name: Disable safe.directory check | ||
run : git config --global --add safe.directory '*' | ||
|
||
- uses: actions/checkout@v3 | ||
|
||
- name: Run qmk generators | ||
run: | | ||
util/regen.sh | ||
git diff | ||
- uses: rlespinasse/[email protected] | ||
|
||
- name: Become QMK Bot | ||
run: | | ||
git config user.name 'QMK Bot' | ||
git config user.email '[email protected]' | ||
- name: Create Pull Request | ||
uses: peter-evans/create-pull-request@v4 | ||
if: ${{ github.repository == 'qmk/qmk_firmware'}} | ||
with: | ||
token: ${{ secrets.QMK_BOT_TOKEN }} | ||
delete-branch: true | ||
branch: bugfix/regen_${{ env.GITHUB_REF_SLUG }} | ||
author: QMK Bot <[email protected]> | ||
committer: QMK Bot <[email protected]> | ||
commit-message: Regenerate Files | ||
title: '[CI] Regenerate Files' |
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
Oops, something went wrong.