diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9efa8f84..b6e6d67a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -35,8 +35,4 @@ jobs: with: go-version-file: tools/go.mod cache-dependency-path: go.work.sum - - uses: bufbuild/buf-action@v1 - with: - setup_only: true - - run: mkdir -p .tmp/bin && cp $(which buf) .tmp/bin/buf - run: make checkgenerate diff --git a/Makefile b/Makefile index 26ecd3df..a3ebc1c8 100644 --- a/Makefile +++ b/Makefile @@ -85,19 +85,10 @@ generate-proto: | $(BIN)/buf .PHONY: generate-license generate-license: | $(BIN)/license-header - @# We want to operate on a list of modified and new files, excluding - @# deleted and ignored files. git-ls-files can't do this alone. comm -23 takes - @# two files and prints the union, dropping lines common to both (-3) and - @# those only in the second file (-2). We make one git-ls-files call for - @# the modified, cached, and new (--others) files, and a second for the - @# deleted files. - comm -23 \ - <(git ls-files --cached --modified --others --no-empty-directory --exclude-standard | sort -u | grep -v $(LICENSE_IGNORE) ) \ - <(git ls-files --deleted | sort -u) | \ - xargs $(BIN)/license-header \ - --license-type apache \ - --copyright-holder "Buf Technologies, Inc." \ - --year-range "$(COPYRIGHT_YEARS)" + $(BIN)/license-header \ + --license-type apache \ + --copyright-holder "Buf Technologies, Inc." \ + --year-range "$(COPYRIGHT_YEARS)" .PHONY: checkgenerate checkgenerate: generate