From bb5d7dcf811cde0068776cf468ca7d5b2d1535b8 Mon Sep 17 00:00:00 2001 From: Edward McFarlane Date: Wed, 19 Aug 2026 19:27:21 +0100 Subject: [PATCH 1/5] Bump to Go 1.27 --- .github/workflows/ci.yaml | 2 +- .github/workflows/make-upgrade.yaml | 2 +- go.mod | 2 +- make/go/go.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index eece73f..5903b5a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,7 +11,7 @@ jobs: - name: setup-go uses: actions/setup-go@v7 with: - go-version: 1.26.x + go-version: 1.27.x check-latest: true cache: true - name: ci diff --git a/.github/workflows/make-upgrade.yaml b/.github/workflows/make-upgrade.yaml index f668c27..41d4baf 100644 --- a/.github/workflows/make-upgrade.yaml +++ b/.github/workflows/make-upgrade.yaml @@ -22,7 +22,7 @@ jobs: - name: setup-go uses: actions/setup-go@v7 with: - go-version: '1.25.x' + go-version: '1.26.x' cache: false - name: Set up Git name and email run: | diff --git a/go.mod b/go.mod index 86d6001..249d4c9 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/bufbuild/makego -go 1.25.6 +go 1.26.7 require ( github.com/stretchr/testify v1.12.0 diff --git a/make/go/go.mk b/make/go/go.mk index 0fb7170..4c421a6 100644 --- a/make/go/go.mk +++ b/make/go/go.mk @@ -25,7 +25,7 @@ GO_TEST_WASM_BINS ?= # Settable GO_GET_PKGS ?= # Settable -GO_MOD_VERSION ?= 1.25.6 +GO_MOD_VERSION ?= 1.26.7 # Settable GO_MOD_TOOLCHAIN ?= # Settable From e3a04af3ec3a2a5406bb41057195c3b31a2aada4 Mon Sep 17 00:00:00 2001 From: Edward McFarlane Date: Wed, 19 Aug 2026 20:05:48 +0100 Subject: [PATCH 2/5] Bump bufstyle --- .github/workflows/ci.yaml | 2 +- make/go/dep_bufstyle.mk | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5903b5a..eece73f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,7 +11,7 @@ jobs: - name: setup-go uses: actions/setup-go@v7 with: - go-version: 1.27.x + go-version: 1.26.x check-latest: true cache: true - name: ci diff --git a/make/go/dep_bufstyle.mk b/make/go/dep_bufstyle.mk index 0c153d8..f0b08be 100644 --- a/make/go/dep_bufstyle.mk +++ b/make/go/dep_bufstyle.mk @@ -13,8 +13,10 @@ $(call _assert_var,BUF_VERSION) BUFSTYLE_GO_VERSION := $(call _major_minor,$(shell go list -m -f '{{.GoVersion}}')) # Settable -# https://github.com/bufbuild/bufstyle-go/releases -BUFSTYLE_VERSION ?= v0.5.0 +# +# Based off of main branch, pending a release including golang.org/x/tools v0.49.0. +# https://github.com/bufbuild/bufstyle-go/commits/main +BUFSTYLE_VERSION ?= ce18c4427ccee4b402ecf98dd7996b3e3b98a320 BUFSTYLE := $(CACHE_BIN)/bufstyle From 24d7baa5db7f6ba765de702f0c6e707650405865 Mon Sep 17 00:00:00 2001 From: Edward McFarlane Date: Thu, 20 Aug 2026 15:57:46 +0100 Subject: [PATCH 3/5] Upgrade CI go and golangcilint version --- .github/workflows/ci.yaml | 2 +- .github/workflows/make-upgrade.yaml | 2 +- make/go/dep_golangci_lint.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index eece73f..5903b5a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,7 +11,7 @@ jobs: - name: setup-go uses: actions/setup-go@v7 with: - go-version: 1.26.x + go-version: 1.27.x check-latest: true cache: true - name: ci diff --git a/.github/workflows/make-upgrade.yaml b/.github/workflows/make-upgrade.yaml index 41d4baf..e08b36a 100644 --- a/.github/workflows/make-upgrade.yaml +++ b/.github/workflows/make-upgrade.yaml @@ -22,7 +22,7 @@ jobs: - name: setup-go uses: actions/setup-go@v7 with: - go-version: '1.26.x' + go-version: '1.27.x' cache: false - name: Set up Git name and email run: | diff --git a/make/go/dep_golangci_lint.mk b/make/go/dep_golangci_lint.mk index eab701b..aafbb05 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 20260506 checked 20260512 -GOLANGCI_LINT_VERSION ?= v2.12.2 +# https://github.com/golangci/golangci-lint/releases 20260819 checked 20260820 +GOLANGCI_LINT_VERSION ?= v2.13.0 GOLANGCI_LINT := $(CACHE_BIN)/golangci-lint From 69cb9edec1c142b2ee4fdfe5e45a1e4ad5c23110 Mon Sep 17 00:00:00 2001 From: Edward McFarlane Date: Thu, 20 Aug 2026 16:13:22 +0100 Subject: [PATCH 4/5] Bufstyle v0.6.0 --- make/go/dep_bufstyle.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/make/go/dep_bufstyle.mk b/make/go/dep_bufstyle.mk index f0b08be..872a8da 100644 --- a/make/go/dep_bufstyle.mk +++ b/make/go/dep_bufstyle.mk @@ -13,10 +13,8 @@ $(call _assert_var,BUF_VERSION) BUFSTYLE_GO_VERSION := $(call _major_minor,$(shell go list -m -f '{{.GoVersion}}')) # Settable -# -# Based off of main branch, pending a release including golang.org/x/tools v0.49.0. -# https://github.com/bufbuild/bufstyle-go/commits/main -BUFSTYLE_VERSION ?= ce18c4427ccee4b402ecf98dd7996b3e3b98a320 +# https://github.com/bufbuild/bufstyle-go/releases +BUFSTYLE_VERSION ?= v0.6.0 BUFSTYLE := $(CACHE_BIN)/bufstyle From 71ba843b40bbff8118c2bdf863e881266304ea5e Mon Sep 17 00:00:00 2001 From: Edward McFarlane Date: Thu, 20 Aug 2026 17:23:12 +0100 Subject: [PATCH 5/5] Upgrade godoc-lint --- make/go/dep_godoclint.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/go/dep_godoclint.mk b/make/go/dep_godoclint.mk index 6452607..a96b888 100644 --- a/make/go/dep_godoclint.mk +++ b/make/go/dep_godoclint.mk @@ -19,7 +19,7 @@ GODOCLINT_GO_VERSION := $(call _major_minor,$(GODOCLINT_GOTOOLCHAIN_VERSION)) # # Based off of dev branch. # https://github.com/bufbuild/godoc-lint/commits/dev -GODOCLINT_VERSION ?= 26c7b506fc2bf37a67fc2b42a3d9825c7ade2068 +GODOCLINT_VERSION ?= cbd52eb03aba73a3658b97058e44039f41e45a33 GODOCLINT := $(CACHE_BIN)/godoclint