diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml index 4a398e7101..f967bbd916 100644 --- a/.github/workflows/reviewdog.yml +++ b/.github/workflows/reviewdog.yml @@ -1,4 +1,6 @@ name: "ReviewDog workflow" +env: + GOLANGCI_LINT_VERSION: "v1.62.0" on: push: branches: @@ -20,7 +22,7 @@ jobs: uses: reviewdog/action-golangci-lint@v2.6.2 with: go_version_file: go.mod - golangci_lint_version: "v1.62.0" + golangci_lint_version: ${{ env.GOLANGCI_LINT_VERSION }} golangci_lint_flags: "-c .golangci.yml --allow-parallel-runners" reporter: "github-pr-check" tool_name: "Lint Errors" @@ -56,14 +58,14 @@ jobs: uses: actions/cache@v3.3.1 with: path: cicdtmp/golangci-lint/golangci-lint-cgo - key: cicd-golangci-lint-cgo-v0.0.2-${{ env.GO_VERSION }} + key: cicd-golangci-lint-cgo-v0.0.3-${{ env.GO_VERSION }}-${{ env.GOLANGCI_LINT_VERSION }} - name: Build custom golangci-lint with CGO_ENABLED if: steps.cache-golangci-lint.outputs.cache-hit != 'true' run: | cd cicdtmp/golangci-lint git clone https://github.com/golangci/golangci-lint.git . - git checkout tags/v1.62.0 + git checkout tags/${GOLANGCI_LINT_VERSION} CGO_ENABLED=true go build -trimpath -o golangci-lint-cgo ./cmd/golangci-lint ./golangci-lint-cgo --version cd ../../ @@ -92,7 +94,7 @@ jobs: cat temp_golangci-lint-cgo.txt | reviewdog \ -f=golangci-lint \ -name="Lint Warnings" \ - -reporter=github-check \ + -reporter=github-pr-check \ -filter-mode=added \ -fail-on-error=true \ -level=warning diff --git a/.golangci-warnings.yml b/.golangci-warnings.yml index d813e97e59..8ab68f9faf 100644 --- a/.golangci-warnings.yml +++ b/.golangci-warnings.yml @@ -9,8 +9,8 @@ linters: - partitiontest linters-settings: - gosec: # we are mostly only interested in G601 - excludes: [G101, G103, G104, G107, G202, G301, G302, G303, G304, G306, G307, G404] + gosec: # Go 1.22 makes G601 irrelevant + excludes: [G101, G103, G104, G107, G115, G202, G301, G302, G303, G304, G306, G307, G404, G601] custom: partitiontest: path: cmd/partitiontest_linter/plugin.so diff --git a/data/transactions/logic/assembler.go b/data/transactions/logic/assembler.go index 06fd1f3953..9ba52138ec 100644 --- a/data/transactions/logic/assembler.go +++ b/data/transactions/logic/assembler.go @@ -2269,7 +2269,7 @@ func define(ops *OpStream, tokens []token) *sourceError { } else { delete(ops.macros, name) // remove new macro that caused cycle } - return tokens[1].errorf("macro expansion cycle discovered: %s", strings.Join(found, " -> ")) + return tokens[1].errorf("macro expansion cycle discovered: %s", strings.Join(found, " -> ")) //nolint:gosec // false positive, len(tokens) >= 3 } return nil }