From 48b51ce3c48308ff58e243dd94cc99c7b16c7109 Mon Sep 17 00:00:00 2001 From: PatTheMav Date: Wed, 19 Jul 2023 12:46:29 +0200 Subject: [PATCH] CI: Fix Qt XML validator attempting to validate non-XML files Explicitly check only for changes `.ui` files in forms subdirectory and pass only changed files with that suffix to validator. --- .github/actions/qt-xml-validator/action.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/actions/qt-xml-validator/action.yaml b/.github/actions/qt-xml-validator/action.yaml index ca7a2f992..0dc0e1b39 100644 --- a/.github/actions/qt-xml-validator/action.yaml +++ b/.github/actions/qt-xml-validator/action.yaml @@ -44,13 +44,14 @@ runs: : Validate XML 💯 if [[ "${RUNNER_DEBUG}" ]]; then set -x; fi shopt -s extglob + shopt -s globstar - changes=($(git diff --name-only HEAD~1 HEAD -- UI/forms)) + changes=($(git diff --name-only HEAD~1 HEAD -- UI/forms/**/*.ui)) case "${GITHUB_EVENT_NAME}" in - pull_request) changes=($(git diff --name-only origin/"${GITHUB_BASE_REF}" HEAD -- UI/forms)) ;; + pull_request) changes=($(git diff --name-only origin/"${GITHUB_BASE_REF}" HEAD -- UI/forms/**/*.ui)) ;; push) if [[ "${GITHUB_EVENT_FORCED}" == false ]]; then - changes=($(git diff --name-only ${GITHUB_REF_BEFORE} HEAD -- UI/forms)) + changes=($(git diff --name-only ${GITHUB_REF_BEFORE} HEAD -- UI/forms/**/*.ui)) fi ;; *) ;;