diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 83fd332c55..c7b54b514d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -25,11 +25,6 @@ jobs: git update-index --assume-unchanged go.sum if [[ -n $(git status --porcelain) ]]; then echo "git repo is dirty after running go generate -- please don't modify generated files"; echo $(git diff);echo $(git status --porcelain); exit 1; fi - # hack to ensure golanglint process generated files - - name: remove "generated by" comments from generated files - run: | - find . -type f -name '*.go' -exec sed -i 's/Code generated by .* DO NOT EDIT/FOO/g' {} \; - # on macos: find . -type f -name '*.go' -exec sed -i '' -E 's/Code generated by .* DO NOT EDIT/FOO/g' {} \; - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 1e21a62c65..6dcc8a68a0 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -28,11 +28,6 @@ jobs: git update-index --assume-unchanged go.sum if [[ -n $(git status --porcelain) ]]; then echo "git repo is dirty after running go generate -- please don't modify generated files"; echo $(git diff);echo $(git status --porcelain); exit 1; fi - # hack to ensure golanglint process generated files - - name: remove "generated by" comments from generated files - run: | - find . -type f -name '*.go' -exec sed -i 's/Code generated by .* DO NOT EDIT/FOO/g' {} \; - # on macos: find . -type f -name '*.go' -exec sed -i '' -E 's/Code generated by .* DO NOT EDIT/FOO/g' {} \; - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: diff --git a/.golangci.yml b/.golangci.yml index fb5d970744..0a86beffd4 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -13,5 +13,7 @@ linters-settings: gosec: excludes: - G115 # Conversions from int -> uint etc. +issues: + exclude-generated: disable run: issues-exit-code: 1 \ No newline at end of file