diff options
| author | QMK Bot <hello@qmk.fm> | 2024-03-05 16:59:58 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2024-03-05 16:59:58 +0000 |
| commit | 045e5c9729f22a8ab8a3f22fe9c0e6b51d1940fe (patch) | |
| tree | d1ce702a997334136c8531388a9b110e23f6d7ff /.github | |
| parent | a2c23e9419478cc49d06634732e626a55eec6d66 (diff) | |
| parent | 4443fa8a328c8b6fcef9b00017fe673567222168 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/format.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/lint.yml | 12 |
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: | |||
| 36 | - name: Get changed files | 36 | - name: Get changed files |
| 37 | id: file_changes | 37 | id: file_changes |
| 38 | uses: tj-actions/changed-files@v42 | 38 | uses: tj-actions/changed-files@v42 |
| 39 | with: | ||
| 40 | use_rest_api: true | ||
| 39 | 41 | ||
| 40 | - name: Run qmk formatters | 42 | - name: Run qmk formatters |
| 41 | shell: 'bash {0}' | 43 | 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: | |||
| 28 | - name: Get changed files | 28 | - name: Get changed files |
| 29 | id: file_changes | 29 | id: file_changes |
| 30 | uses: tj-actions/changed-files@v42 | 30 | uses: tj-actions/changed-files@v42 |
| 31 | with: | ||
| 32 | use_rest_api: true | ||
| 31 | 33 | ||
| 32 | - name: Print info | 34 | - name: Print info |
| 33 | run: | | 35 | run: | |
| @@ -62,10 +64,12 @@ jobs: | |||
| 62 | 64 | ||
| 63 | qmk format-text ${{ steps.file_changes.outputs.all_changed_files}} || true | 65 | qmk format-text ${{ steps.file_changes.outputs.all_changed_files}} || true |
| 64 | for file in ${{ steps.file_changes.outputs.all_changed_files}}; do | 66 | for file in ${{ steps.file_changes.outputs.all_changed_files}}; do |
| 65 | if ! git diff --quiet $file; then | 67 | if [[ -f $file ]]; then |
| 66 | echo "File '${file}' Requires Formatting" | 68 | if ! git diff --quiet $file; then |
| 67 | echo "::error file=${file}::Requires Formatting" | 69 | echo "File '${file}' Requires Formatting" |
| 68 | exit_code=$(($exit_code + 1)) | 70 | echo "::error file=${file}::Requires Formatting" |
| 71 | exit_code=$(($exit_code + 1)) | ||
| 72 | fi | ||
| 69 | fi | 73 | fi |
| 70 | done | 74 | done |
| 71 | 75 | ||