aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <[email protected]>2024-03-05 16:59:58 +0000
committerQMK Bot <[email protected]>2024-03-05 16:59:58 +0000
commit045e5c9729f22a8ab8a3f22fe9c0e6b51d1940fe (patch)
treed1ce702a997334136c8531388a9b110e23f6d7ff
parenta2c23e9419478cc49d06634732e626a55eec6d66 (diff)
parent4443fa8a328c8b6fcef9b00017fe673567222168 (diff)
downloadqmk_firmware-045e5c9729f22a8ab8a3f22fe9c0e6b51d1940fe.tar.gz
qmk_firmware-045e5c9729f22a8ab8a3f22fe9c0e6b51d1940fe.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--.github/workflows/format.yml2
-rw-r--r--.github/workflows/lint.yml12
2 files changed, 10 insertions, 4 deletions
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 81da72046c..df080cfe8c 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -36,6 +36,8 @@ jobs:
- name: Get changed files
id: file_changes
uses: tj-actions/changed-files@v42
+ with:
+ use_rest_api: true
- name: Run qmk formatters
shell: 'bash {0}'
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 67823103f1..a008ebb829 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -28,6 +28,8 @@ jobs:
- name: Get changed files
id: file_changes
uses: tj-actions/changed-files@v42
+ with:
+ use_rest_api: true
- name: Print info
run: |
@@ -62,10 +64,12 @@ jobs:
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))
+ if [[ -f $file ]]; then
+ if ! git diff --quiet $file; then
+ echo "File '${file}' Requires Formatting"
+ echo "::error file=${file}::Requires Formatting"
+ exit_code=$(($exit_code + 1))
+ fi
fi
done