From f2b57d26bb6b6759f4a06123fc00394d26e013cd Mon Sep 17 00:00:00 2001 From: Timo Stamm Date: Mon, 16 Mar 2026 18:44:11 +0100 Subject: [PATCH 1/4] Use buf pinned in Makefile --- .github/workflows/ci.yaml | 4 ---- 1 file changed, 4 deletions(-) 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 From 298e95c8ebfa9cb6f0f08383b84fff095171dba5 Mon Sep 17 00:00:00 2001 From: Timo Stamm Date: Mon, 16 Mar 2026 18:56:56 +0100 Subject: [PATCH 2/4] Drop bazel-contrib/setup-bazel --- .github/workflows/ci.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b6e6d67a..529bd716 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,11 +26,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - - uses: bazel-contrib/setup-bazel@0.18.0 - with: - bazelisk-cache: true - disk-cache: ${{ github.workflow }} - repository-cache: true - uses: actions/setup-go@v6 with: go-version-file: tools/go.mod From ec826c24ac2c4f81123c5e54c87f0439c027ad77 Mon Sep 17 00:00:00 2001 From: Timo Stamm Date: Mon, 16 Mar 2026 19:17:30 +0100 Subject: [PATCH 3/4] Revert "Drop bazel-contrib/setup-bazel" This reverts commit 298e95c8ebfa9cb6f0f08383b84fff095171dba5. --- .github/workflows/ci.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 529bd716..b6e6d67a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,6 +26,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 + - uses: bazel-contrib/setup-bazel@0.18.0 + with: + bazelisk-cache: true + disk-cache: ${{ github.workflow }} + repository-cache: true - uses: actions/setup-go@v6 with: go-version-file: tools/go.mod From 13ccbe05c0d3b9e94f6c4e722a5d3449db426fac Mon Sep 17 00:00:00 2001 From: Timo Stamm Date: Mon, 16 Mar 2026 19:17:46 +0100 Subject: [PATCH 4/4] Simplify generate-license --- Makefile | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) 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