From 4443fa8a328c8b6fcef9b00017fe673567222168 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 5 Mar 2024 16:59:09 +0000 Subject: [PATCH] Attempt to fix changed files on CI workflow (#23205) --- .github/workflows/format.yml | 2 ++ .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 81da72046c8..df080cfe8ce 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 67823103f1b..a008ebb829f 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