From aa19bc7c40f1f8a347214cf5db891e0b2749cea1 Mon Sep 17 00:00:00 2001 From: Alexandr Yepishev Date: Wed, 27 Nov 2024 18:46:17 +0000 Subject: [PATCH] Update paths to linter reports --- .github/actions/golangci-lint/action.yml | 6 +++--- .github/workflows/ci-core.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/golangci-lint/action.yml b/.github/actions/golangci-lint/action.yml index 73ae4add53b..ba846657212 100644 --- a/.github/actions/golangci-lint/action.yml +++ b/.github/actions/golangci-lint/action.yml @@ -57,16 +57,16 @@ runs: with: version: v1.62.2 only-new-issues: true - args: --out-format colored-line-number,checkstyle:${{ steps.set-working-directory.outputs.golangci-lint-working-directory }}_golangci-lint-report.xml -v + args: --out-format colored-line-number,checkstyle:golangci-lint-report.xml -v working-directory: ${{ steps.set-working-directory.outputs.golangci-lint-working-directory }} - name: Print lint report artifact if: failure() shell: bashc - run: cat ./${{ inputs.go-directory }}/${{ steps.set-working-directory.outputs.golangci-lint-working-directory }}_golangci-lint-report.xml + run: cat ./${{ inputs.go-directory }}/golangci-lint-report.xml - name: Store lint report artifact if: always() uses: actions/upload-artifact@v4.4.3 with: name: golangci-lint-report-${{ inputs.go-directory }} # The ./ is needed to preserve the valid pattern for the artifact path - path: ./${{ inputs.go-directory }}/${{ inputs.go-directory }}_golangci-lint-report.xml + path: ./${{ inputs.go-directory }}/golangci-lint-report.xml diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml index 9859c1ad895..2864ec3c02f 100644 --- a/.github/workflows/ci-core.yml +++ b/.github/workflows/ci-core.yml @@ -431,7 +431,7 @@ jobs: fi # Check and assign paths for lint reports - if [ -d "golangci-lint-report" ]; then + if [[ -d "golangci-lint-report"* ]]; then sonarqube_lint_report_paths=$(find -type f -name 'golangci-lint-report.xml' -printf "%p,") else sonarqube_lint_report_paths=""