Skip to content

Commit 3b53da4

Browse files
crandlescrandles
authored
chore: Bump Go version to 1.26 (#913)
* chore: Bump Go version to 1.26 --------- Signed-off-by: Chris Randles <randles.chris@gmail.com>
1 parent 873566c commit 3b53da4

File tree

7 files changed

+703
-11
lines changed

7 files changed

+703
-11
lines changed

‎.github/workflows/ci-build-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
strategy:
5858
fail-fast: false
5959
matrix:
60-
go: [1.25]
60+
go: [1.26]
6161

6262
steps:
6363
- uses: actions/checkout@v4

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM alpine:latest as certs
22
RUN apk update && apk add ca-certificates
33

44
ARG BUILDPLATFORM=linux/amd64
5-
FROM --platform=${BUILDPLATFORM} golang:1.25 as builder
5+
FROM --platform=${BUILDPLATFORM} golang:1.26 as builder
66
ARG GIT_LATEST_COMMIT_ID
77
ARG TAGVER
88

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,12 @@ style:
117117
LINT_FLAGS ?=
118118
.PHONY: lint
119119
lint:
120-
@golangci-lint run $(LINT_FLAGS) -c .golangci.yml
120+
@go tool golangci-lint run $(LINT_FLAGS) -c .golangci.yml
121121

122122
.PHONY: lint-fix
123123
lint-fix:
124124
@LINT_FLAGS="--fix" $(MAKE) lint
125-
@golangci-lint fmt -c .golangci.yml
125+
@go tool golangci-lint fmt -c .golangci.yml
126126

127127
GO_TEST_FLAGS ?= -coverprofile=.coverprofile
128128
.PHONY: test
@@ -273,12 +273,12 @@ GOLANG_CI_LINT_VERSION ?= v2.7.2
273273
.PHONY: get-tools
274274
get-tools: get-msgpack
275275
@echo "Installing tools..."
276-
go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANG_CI_LINT_VERSION)
277-
go install honnef.co/go/tools/cmd/staticcheck@2025.1.1
276+
go get -tool github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANG_CI_LINT_VERSION)
277+
go get -tool honnef.co/go/tools/cmd/staticcheck@2025.1.1
278278

279279
.PHONY: get-msgpack
280280
get-msgpack:
281-
$(GO) get -tool github.com/tinylib/msgp@v1.4.0
281+
$(GO) get -tool github.com/tinylib/msgp@$(shell go list -m github.com/tinylib/msgp | cut -d' ' -f2)
282282

283283
.PHONY: developer-start
284284
developer-start:

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Trickster Helm Charts are located at <https://helm.tricksterproxy.io> for instal
111111
### Building from source
112112

113113
To build Trickster from the source code yourself you need to have a working
114-
Go environment with [version 1.25 or greater installed](http://golang.org/doc/install).
114+
Go environment with [version 1.26 or greater installed](http://golang.org/doc/install).
115115

116116
You can directly use the `go` tool to download and install the `trickster`
117117
binary into your `GOPATH`:

‎docs/developer/environment/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Prerequisites
44

55
* Docker is installed and running, and the `docker` command is available.
6-
* Golang 1.25 is installed
6+
* Golang 1.26 is installed
77
* Make and other tools are installed
88

99
## Running

‎go.mod‎

Lines changed: 194 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/trickstercache/trickster/v2
22

3-
go 1.25.7
3+
go 1.26.0
44

55
require (
66
github.com/alicebob/miniredis/v2 v2.35.0
@@ -32,34 +32,218 @@ require (
3232
)
3333

3434
require (
35+
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
36+
4d63.com/gochecknoglobals v0.2.2 // indirect
37+
codeberg.org/chavacava/garif v0.2.0 // indirect
38+
dev.gaijin.team/go/exhaustruct/v4 v4.0.0 // indirect
39+
dev.gaijin.team/go/golib v0.6.0 // indirect
40+
github.com/4meepo/tagalign v1.4.3 // indirect
41+
github.com/Abirdcfly/dupword v0.1.7 // indirect
42+
github.com/AdminBenni/iota-mixing v1.0.0 // indirect
43+
github.com/AlwxSin/noinlineerr v1.0.5 // indirect
44+
github.com/Antonboom/errname v1.1.1 // indirect
45+
github.com/Antonboom/nilnil v1.1.1 // indirect
46+
github.com/Antonboom/testifylint v1.6.4 // indirect
47+
github.com/BurntSushi/toml v1.5.0 // indirect
48+
github.com/Djarvur/go-err113 v0.1.1 // indirect
49+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
50+
github.com/MirrexOne/unqueryvet v1.3.0 // indirect
51+
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
52+
github.com/alecthomas/chroma/v2 v2.20.0 // indirect
53+
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
54+
github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
55+
github.com/alexkohler/prealloc v1.0.0 // indirect
56+
github.com/alfatraining/structtag v1.0.0 // indirect
57+
github.com/alingse/asasalint v0.0.11 // indirect
58+
github.com/alingse/nilnesserr v0.2.0 // indirect
59+
github.com/ashanbrown/forbidigo/v2 v2.3.0 // indirect
60+
github.com/ashanbrown/makezero/v2 v2.1.0 // indirect
3561
github.com/aws/aws-sdk-go v1.55.8 // indirect
62+
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
3663
github.com/beorn7/perks v1.0.1 // indirect
64+
github.com/bkielbasa/cyclop v1.2.3 // indirect
65+
github.com/blizzy78/varnamelen v0.8.0 // indirect
66+
github.com/bombsimon/wsl/v4 v4.7.0 // indirect
67+
github.com/bombsimon/wsl/v5 v5.3.0 // indirect
68+
github.com/breml/bidichk v0.3.3 // indirect
69+
github.com/breml/errchkjson v0.4.1 // indirect
70+
github.com/butuzov/ireturn v0.4.0 // indirect
71+
github.com/butuzov/mirror v1.3.0 // indirect
72+
github.com/catenacyber/perfsprint v0.10.1 // indirect
73+
github.com/ccojocar/zxcvbn-go v1.0.4 // indirect
3774
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
3875
github.com/cespare/xxhash/v2 v2.3.0 // indirect
76+
github.com/charithe/durationcheck v0.0.11 // indirect
77+
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
78+
github.com/charmbracelet/lipgloss v1.1.0 // indirect
79+
github.com/charmbracelet/x/ansi v0.8.0 // indirect
80+
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
81+
github.com/charmbracelet/x/term v0.2.1 // indirect
82+
github.com/ckaznocha/intrange v0.3.1 // indirect
83+
github.com/curioswitch/go-reassign v0.3.0 // indirect
84+
github.com/daixiang0/gci v0.13.7 // indirect
85+
github.com/dave/dst v0.27.3 // indirect
3986
github.com/davecgh/go-spew v1.1.1 // indirect
87+
github.com/denis-tingaikin/go-header v0.5.0 // indirect
4088
github.com/dgraph-io/ristretto/v2 v2.4.0 // indirect
4189
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
90+
github.com/dlclark/regexp2 v1.11.5 // indirect
4291
github.com/dustin/go-humanize v1.0.1 // indirect
92+
github.com/ettle/strcase v0.2.0 // indirect
93+
github.com/fatih/color v1.18.0 // indirect
94+
github.com/fatih/structtag v1.2.0 // indirect
95+
github.com/firefart/nonamedreturns v1.0.6 // indirect
96+
github.com/fsnotify/fsnotify v1.5.4 // indirect
97+
github.com/fzipp/gocyclo v0.6.0 // indirect
98+
github.com/ghostiam/protogetter v0.3.17 // indirect
99+
github.com/go-critic/go-critic v0.14.2 // indirect
43100
github.com/go-logr/logr v1.4.3 // indirect
44101
github.com/go-logr/stdr v1.2.2 // indirect
102+
github.com/go-toolsmith/astcast v1.1.0 // indirect
103+
github.com/go-toolsmith/astcopy v1.1.0 // indirect
104+
github.com/go-toolsmith/astequal v1.2.0 // indirect
105+
github.com/go-toolsmith/astfmt v1.1.0 // indirect
106+
github.com/go-toolsmith/astp v1.1.0 // indirect
107+
github.com/go-toolsmith/strparse v1.1.0 // indirect
108+
github.com/go-toolsmith/typep v1.1.0 // indirect
109+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
110+
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
111+
github.com/gobwas/glob v0.2.3 // indirect
112+
github.com/godoc-lint/godoc-lint v0.10.2 // indirect
113+
github.com/gofrs/flock v0.13.0 // indirect
45114
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
115+
github.com/golangci/asciicheck v0.5.0 // indirect
116+
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
117+
github.com/golangci/go-printf-func-name v0.1.1 // indirect
118+
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
119+
github.com/golangci/golangci-lint/v2 v2.7.2 // indirect
120+
github.com/golangci/golines v0.0.0-20250217134842-442fd0091d95 // indirect
121+
github.com/golangci/misspell v0.7.0 // indirect
122+
github.com/golangci/plugin-module-register v0.1.2 // indirect
123+
github.com/golangci/revgrep v0.8.0 // indirect
124+
github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
125+
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
46126
github.com/google/flatbuffers v25.12.19+incompatible // indirect
127+
github.com/google/go-cmp v0.7.0 // indirect
47128
github.com/google/uuid v1.6.0 // indirect
129+
github.com/gordonklaus/ineffassign v0.2.0 // indirect
130+
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
131+
github.com/gostaticanalysis/comment v1.5.0 // indirect
132+
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
133+
github.com/gostaticanalysis/nilerr v0.1.2 // indirect
48134
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.8 // indirect
135+
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
136+
github.com/hashicorp/go-version v1.8.0 // indirect
137+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
138+
github.com/hashicorp/hcl v1.0.0 // indirect
139+
github.com/hexops/gotextdiff v1.0.3 // indirect
140+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
141+
github.com/jgautheron/goconst v1.8.2 // indirect
142+
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
143+
github.com/jjti/go-spancheck v0.6.5 // indirect
49144
github.com/jmespath/go-jmespath v0.4.0 // indirect
50145
github.com/jpillora/backoff v1.0.0 // indirect
146+
github.com/julz/importas v0.2.0 // indirect
147+
github.com/karamaru-alpha/copyloopvar v1.2.2 // indirect
148+
github.com/kisielk/errcheck v1.9.0 // indirect
149+
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
150+
github.com/kulti/thelper v0.7.1 // indirect
151+
github.com/kunwardeep/paralleltest v1.0.15 // indirect
152+
github.com/lasiar/canonicalheader v1.1.2 // indirect
153+
github.com/ldez/exptostd v0.4.5 // indirect
154+
github.com/ldez/gomoddirectives v0.7.1 // indirect
155+
github.com/ldez/grignotin v0.10.1 // indirect
156+
github.com/ldez/tagliatelle v0.7.2 // indirect
157+
github.com/ldez/usetesting v0.5.0 // indirect
158+
github.com/leonklingele/grouper v1.1.2 // indirect
159+
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
160+
github.com/macabu/inamedparam v0.2.0 // indirect
161+
github.com/magiconair/properties v1.8.6 // indirect
162+
github.com/manuelarte/embeddedstructfieldcheck v0.4.0 // indirect
163+
github.com/manuelarte/funcorder v0.5.0 // indirect
164+
github.com/maratori/testableexamples v1.0.1 // indirect
165+
github.com/maratori/testpackage v1.1.2 // indirect
166+
github.com/matoous/godox v1.1.0 // indirect
167+
github.com/mattn/go-colorable v0.1.14 // indirect
168+
github.com/mattn/go-isatty v0.0.20 // indirect
169+
github.com/mattn/go-runewidth v0.0.16 // indirect
170+
github.com/mgechev/revive v1.13.0 // indirect
171+
github.com/mitchellh/go-homedir v1.1.0 // indirect
172+
github.com/mitchellh/mapstructure v1.5.0 // indirect
173+
github.com/moricho/tparallel v0.3.2 // indirect
174+
github.com/muesli/termenv v0.16.0 // indirect
51175
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
52176
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
177+
github.com/nakabonne/nestif v0.3.1 // indirect
178+
github.com/nishanths/exhaustive v0.12.0 // indirect
179+
github.com/nishanths/predeclared v0.2.2 // indirect
180+
github.com/nunnatsa/ginkgolinter v0.21.2 // indirect
181+
github.com/pelletier/go-toml v1.9.5 // indirect
182+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
53183
github.com/philhofer/fwd v1.2.0 // indirect
54184
github.com/pmezard/go-difflib v1.0.0 // indirect
185+
github.com/polyfloyd/go-errorlint v1.8.0 // indirect
55186
github.com/prometheus/common v0.67.5 // indirect
56187
github.com/prometheus/procfs v0.19.2 // indirect
188+
github.com/quasilyte/go-ruleguard v0.4.5 // indirect
189+
github.com/quasilyte/go-ruleguard/dsl v0.3.23 // indirect
190+
github.com/quasilyte/gogrep v0.5.0 // indirect
191+
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
192+
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
193+
github.com/raeperd/recvcheck v0.2.0 // indirect
194+
github.com/rivo/uniseg v0.4.7 // indirect
195+
github.com/rogpeppe/go-internal v1.14.1 // indirect
196+
github.com/ryancurrah/gomodguard v1.4.1 // indirect
197+
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
198+
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
199+
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
200+
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
201+
github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
202+
github.com/securego/gosec/v2 v2.22.11-0.20251204091113-daccba6b93d7 // indirect
203+
github.com/sirupsen/logrus v1.9.3 // indirect
204+
github.com/sivchari/containedctx v1.0.3 // indirect
205+
github.com/sonatard/noctx v0.4.0 // indirect
206+
github.com/sourcegraph/go-diff v0.7.0 // indirect
207+
github.com/spf13/afero v1.15.0 // indirect
208+
github.com/spf13/cast v1.5.0 // indirect
209+
github.com/spf13/cobra v1.10.2 // indirect
210+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
211+
github.com/spf13/pflag v1.0.10 // indirect
212+
github.com/spf13/viper v1.12.0 // indirect
213+
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
214+
github.com/stbenjam/no-sprintf-host-port v0.3.1 // indirect
215+
github.com/stretchr/objx v0.5.2 // indirect
216+
github.com/subosito/gotenv v1.4.1 // indirect
217+
github.com/tetafro/godot v1.5.4 // indirect
218+
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 // indirect
219+
github.com/timonwong/loggercheck v0.11.0 // indirect
220+
github.com/tomarrell/wrapcheck/v2 v2.12.0 // indirect
221+
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
222+
github.com/ultraware/funlen v0.2.0 // indirect
223+
github.com/ultraware/whitespace v0.2.0 // indirect
224+
github.com/uudashr/gocognit v1.2.0 // indirect
225+
github.com/uudashr/iface v1.4.1 // indirect
226+
github.com/xen0n/gosmopolitan v1.3.0 // indirect
227+
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
228+
github.com/yagipy/maintidx v1.0.0 // indirect
229+
github.com/yeya24/promlinter v0.3.0 // indirect
230+
github.com/ykadowak/zerologlint v0.1.5 // indirect
57231
github.com/yuin/gopher-lua v1.1.1 // indirect
232+
gitlab.com/bosi/decorder v0.4.2 // indirect
233+
go-simpler.org/musttag v0.14.0 // indirect
234+
go-simpler.org/sloglint v0.11.1 // indirect
235+
go.augendre.info/arangolint v0.3.1 // indirect
236+
go.augendre.info/fatcontext v0.9.0 // indirect
58237
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
59238
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect
60239
go.opentelemetry.io/otel/metric v1.40.0 // indirect
61240
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
241+
go.uber.org/automaxprocs v1.6.0 // indirect
242+
go.uber.org/multierr v1.10.0 // indirect
243+
go.uber.org/zap v1.27.0 // indirect
62244
go.yaml.in/yaml/v2 v2.4.3 // indirect
245+
go.yaml.in/yaml/v3 v3.0.4 // indirect
246+
golang.org/x/exp/typeparams v0.0.0-20251023183803-a4bb9ffd2546 // indirect
63247
golang.org/x/mod v0.32.0 // indirect
64248
golang.org/x/oauth2 v0.35.0 // indirect
65249
golang.org/x/sys v0.41.0 // indirect
@@ -69,7 +253,15 @@ require (
69253
google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 // indirect
70254
google.golang.org/grpc v1.78.0 // indirect
71255
google.golang.org/protobuf v1.36.11 // indirect
256+
gopkg.in/ini.v1 v1.67.0 // indirect
72257
gopkg.in/yaml.v3 v3.0.1 // indirect
258+
honnef.co/go/tools v0.6.1 // indirect
259+
mvdan.cc/gofumpt v0.9.2 // indirect
260+
mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 // indirect
73261
)
74262

75-
tool github.com/tinylib/msgp
263+
tool (
264+
github.com/golangci/golangci-lint/v2/cmd/golangci-lint
265+
github.com/tinylib/msgp
266+
honnef.co/go/tools/cmd/staticcheck
267+
)

0 commit comments

Comments
 (0)