mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-04-09 23:35:44 +00:00
Merge branch 'master' into set_st-keyboards
This commit is contained in:
commit
91df014311
2
.github/workflows/format.yml
vendored
2
.github/workflows/format.yml
vendored
@ -36,6 +36,8 @@ jobs:
|
|||||||
- name: Get changed files
|
- name: Get changed files
|
||||||
id: file_changes
|
id: file_changes
|
||||||
uses: tj-actions/changed-files@v42
|
uses: tj-actions/changed-files@v42
|
||||||
|
with:
|
||||||
|
use_rest_api: true
|
||||||
|
|
||||||
- name: Run qmk formatters
|
- name: Run qmk formatters
|
||||||
shell: 'bash {0}'
|
shell: 'bash {0}'
|
||||||
|
2
.github/workflows/format_push.yml
vendored
2
.github/workflows/format_push.yml
vendored
@ -47,7 +47,7 @@ jobs:
|
|||||||
git config user.email 'hello@qmk.fm'
|
git config user.email 'hello@qmk.fm'
|
||||||
|
|
||||||
- name: Create Pull Request
|
- name: Create Pull Request
|
||||||
uses: peter-evans/create-pull-request@v5
|
uses: peter-evans/create-pull-request@v6
|
||||||
if: ${{ github.repository == 'qmk/qmk_firmware'}}
|
if: ${{ github.repository == 'qmk/qmk_firmware'}}
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.QMK_BOT_TOKEN }}
|
token: ${{ secrets.QMK_BOT_TOKEN }}
|
||||||
|
12
.github/workflows/lint.yml
vendored
12
.github/workflows/lint.yml
vendored
@ -28,6 +28,8 @@ jobs:
|
|||||||
- name: Get changed files
|
- name: Get changed files
|
||||||
id: file_changes
|
id: file_changes
|
||||||
uses: tj-actions/changed-files@v42
|
uses: tj-actions/changed-files@v42
|
||||||
|
with:
|
||||||
|
use_rest_api: true
|
||||||
|
|
||||||
- name: Print info
|
- name: Print info
|
||||||
run: |
|
run: |
|
||||||
@ -62,10 +64,12 @@ jobs:
|
|||||||
|
|
||||||
qmk format-text ${{ steps.file_changes.outputs.all_changed_files}} || true
|
qmk format-text ${{ steps.file_changes.outputs.all_changed_files}} || true
|
||||||
for file in ${{ steps.file_changes.outputs.all_changed_files}}; do
|
for file in ${{ steps.file_changes.outputs.all_changed_files}}; do
|
||||||
if ! git diff --quiet $file; then
|
if [[ -f $file ]]; then
|
||||||
echo "File '${file}' Requires Formatting"
|
if ! git diff --quiet $file; then
|
||||||
echo "::error file=${file}::Requires Formatting"
|
echo "File '${file}' Requires Formatting"
|
||||||
exit_code=$(($exit_code + 1))
|
echo "::error file=${file}::Requires Formatting"
|
||||||
|
exit_code=$(($exit_code + 1))
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
2
.github/workflows/regen_push.yml
vendored
2
.github/workflows/regen_push.yml
vendored
@ -34,7 +34,7 @@ jobs:
|
|||||||
git config user.email 'hello@qmk.fm'
|
git config user.email 'hello@qmk.fm'
|
||||||
|
|
||||||
- name: Create Pull Request
|
- name: Create Pull Request
|
||||||
uses: peter-evans/create-pull-request@v5
|
uses: peter-evans/create-pull-request@v6
|
||||||
if: ${{ github.repository == 'qmk/qmk_firmware'}}
|
if: ${{ github.repository == 'qmk/qmk_firmware'}}
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.QMK_BOT_TOKEN }}
|
token: ${{ secrets.QMK_BOT_TOKEN }}
|
||||||
|
Loading…
Reference in New Issue
Block a user