Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Autogenerated by makego. DO NOT EDIT.
.build/
.claude/settings.local.json
.ctrlp
.env/
.idea/
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Autogenerated by makego. DO NOT EDIT.
/.build/
/.claude/settings.local.json
/.ctrlp
/.env/
/.idea/
Expand Down
2 changes: 1 addition & 1 deletion make/go/base.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?=
Expand Down
4 changes: 2 additions & 2 deletions make/go/dep_buf.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 5 additions & 1 deletion make/go/dep_bufstyle.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 5 additions & 1 deletion make/go/dep_godoclint.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions make/go/dep_golangci_lint.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down