diff --git a/.gitattributes b/.gitattributes index 246a309..aedf1a0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ *.pb.go -diff linguist-generated=true +*.pb.*.go -diff linguist-generated=true go.sum -diff linguist-generated=true diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fb2d35d..42c5931 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -26,14 +26,14 @@ jobs: run: "go mod tidy && bash -c '[ $(git status --porcelain | tee /dev/fd/2 | wc -c) -eq 0 ]'" - name: "Formatting (gofumpt)" run: | - GOFUMPT_OUTPUT="$(find . -iname '*.go' -type f | grep -v pb.validate.go | grep -v pb.go | grep -v pb.fix.go | xargs gofumports -d)" + GOFUMPT_OUTPUT="$(find . -iname '*.go' -type f | grep -v pb.go | grep -v 'pb.*.go' | xargs gofumports -d)" if [ -n "$GOFUMPT_OUTPUT" ]; then echo "All the following files are not correctly formatted" echo "${GOFUMPT_OUTPUT}" exit 1 fi - name: "Linting (revive)" - run: "bash -c '[ $(find . -iname '*.go' -type f | grep -v pb.fix.go | xargs revive | tee /dev/fd/2 | wc -c) -eq 0 ]'" + run: "bash -c '[ $(find . -iname '*.go' -type f | grep -v 'pb.*.go' | xargs revive | tee /dev/fd/2 | wc -c) -eq 0 ]'" test: name: "Test"