From 57021a58c2e3e5b45009995719a68d97cdd9d6ed Mon Sep 17 00:00:00 2001
From: Stefan VanBuren <svanburen@buf.build>
Date: Thu, 12 Feb 2026 15:30:49 -0500
Subject: [PATCH] Run `make copyfrommakego`

To bring in the latest `golangci-lint` version.
---
 .dockerignore                | 1 +
 .gitignore                   | 1 +
 make/go/base.mk              | 2 +-
 make/go/dep_buf.mk           | 4 ++--
 make/go/dep_bufstyle.mk      | 6 +++++-
 make/go/dep_godoclint.mk     | 6 +++++-
 make/go/dep_golangci_lint.mk | 4 ++--
 7 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index b29c4a40db..88c9c59f34 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,6 @@
 # Autogenerated by makego. DO NOT EDIT.
 .build/
+.claude/settings.local.json
 .ctrlp
 .env/
 .idea/
diff --git a/.gitignore b/.gitignore
index 4e57db8633..e0a92183f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Autogenerated by makego. DO NOT EDIT.
 /.build/
+/.claude/settings.local.json
 /.ctrlp
 /.env/
 /.idea/
diff --git a/make/go/base.mk b/make/go/base.mk
index f1f6674ee0..5ab195b16d 100644
--- a/make/go/base.mk
+++ b/make/go/base.mk
@@ -20,7 +20,7 @@ TMP := .tmp
 
 # Settable
 # These are exact file paths that are added to .gitignore and .dockerignore
-FILE_IGNORES := $(FILE_IGNORES) $(ENV_DIR)/ $(TMP)/
+FILE_IGNORES := $(FILE_IGNORES) $(ENV_DIR)/ $(TMP)/ .claude/settings.local.json
 # Settable
 # These will be added without any modification to .gitignore
 GIT_FILE_IGNORES ?=
diff --git a/make/go/dep_buf.mk b/make/go/dep_buf.mk
index cd74b49d9a..b8714a4329 100644
--- a/make/go/dep_buf.mk
+++ b/make/go/dep_buf.mk
@@ -7,8 +7,8 @@ $(call _assert_var,CACHE_VERSIONS)
 $(call _assert_var,CACHE_BIN)
 
 # Settable
-# https://github.com/bufbuild/buf/releases 20251125 checked 20251125
-BUF_VERSION ?= v1.61.0
+# https://github.com/bufbuild/buf/releases 20260203 checked 20260203
+BUF_VERSION ?= v1.65.0
 # Settable
 #
 # If set, this path will be installed every time someone depends on $(BUF)
diff --git a/make/go/dep_bufstyle.mk b/make/go/dep_bufstyle.mk
index aee6092f81..13e15441af 100644
--- a/make/go/dep_bufstyle.mk
+++ b/make/go/dep_bufstyle.mk
@@ -8,11 +8,15 @@ $(call _assert_var,CACHE_VERSIONS)
 $(call _assert_var,CACHE_BIN)
 $(call _assert_var,BUF_VERSION)
 
+# We want to ensure we rebuild bufstyle every time we require a new Go minor version.
+# Otherwise, the cached version may not support the latest language features.
+BUFSTYLE_GO_VERSION := $(shell go list -m -f '{{.GoVersion}}' | cut -d'.' -f1-2)
+
 # Settable
 # https://github.com/bufbuild/bufstyle-go/releases
 BUFSTYLE_VERSION ?= v0.5.0
 
-BUFSTYLE := $(CACHE_VERSIONS)/bufstyle/$(BUFSTYLE_VERSION)
+BUFSTYLE := $(CACHE_VERSIONS)/bufstyle/$(BUFSTYLE_VERSION)-go$(BUFSTYLE_GO_VERSION)
 $(BUFSTYLE):
 	@rm -f $(CACHE_BIN)/bufstyle
 	GOBIN=$(CACHE_BIN) go install buf.build/go/bufstyle@$(BUFSTYLE_VERSION)
diff --git a/make/go/dep_godoclint.mk b/make/go/dep_godoclint.mk
index 5ac00a968e..1aab0e48ff 100644
--- a/make/go/dep_godoclint.mk
+++ b/make/go/dep_godoclint.mk
@@ -8,13 +8,17 @@ $(call _assert_var,CACHE_VERSIONS)
 $(call _assert_var,CACHE_BIN)
 $(call _assert_var,BUF_VERSION)
 
+# We want to ensure we rebuild godoclint every time we require a new Go minor version.
+# Otherwise, the cached version may not support the latest language features.
+GODOCLINT_GO_VERSION := $(shell go list -m -f '{{.GoVersion}}' | cut -d'.' -f1-2)
+
 # Settable
 #
 # Based off of dev branch.
 # https://github.com/bufbuild/godoc-lint/commits/dev
 GODOCLINT_VERSION ?= 26c7b506fc2bf37a67fc2b42a3d9825c7ade2068
 
-GODOCLINT := $(CACHE_VERSIONS)/godoclint/$(GODOCLINT_VERSION)
+GODOCLINT := $(CACHE_VERSIONS)/godoclint/$(GODOCLINT_VERSION)-go$(GODOCLINT_GO_VERSION)
 $(GODOCLINT):
 	@rm -f $(CACHE_BIN)/godoclint
 	$(eval GODOCLINT_TMP := $(shell mktemp -d))
diff --git a/make/go/dep_golangci_lint.mk b/make/go/dep_golangci_lint.mk
index 21fdbd7cac..358c875954 100644
--- a/make/go/dep_golangci_lint.mk
+++ b/make/go/dep_golangci_lint.mk
@@ -23,8 +23,8 @@ GOLANGCI_LINT_ARCH := $(UNAME_ARCH)
 endif
 
 # Settable
-# https://github.com/golangci/golangci-lint/releases 20251207 checked 20251208
-GOLANGCI_LINT_VERSION ?= v2.7.2
+# https://github.com/golangci/golangci-lint/releases 20260210 checked 20260211
+GOLANGCI_LINT_VERSION ?= v2.9.0
 
 GOLANGCI_LINT := $(CACHE_VERSIONS)/golangci-lint/$(GOLANGCI_LINT_VERSION)
 $(GOLANGCI_LINT):