Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
045e5c9729
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}'
|
||||||
|
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
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user