Skip to content

Commit ce1eeb3

Browse files
runabolrunabol
committed
Upgrade to Go 1.25
1 parent 314232d commit ce1eeb3

10 files changed

Lines changed: 23 additions & 72 deletions

File tree

‎.devcontainer/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ ENV SHELL=/bin/zsh
3131
# --------------------------------------
3232
# Golang
3333
# --------------------------------------
34-
RUN wget https://go.dev/dl/go1.24.4.linux-amd64.tar.gz
35-
RUN tar -xvzf go1.24.4.linux-amd64.tar.gz && rm go1.24.4.linux-amd64.tar.gz
34+
RUN wget https://go.dev/dl/go1.25.0.linux-amd64.tar.gz
35+
RUN tar -xvzf go1.25.0.linux-amd64.tar.gz && rm go1.25.0.linux-amd64.tar.gz
3636
RUN mv go /usr/local/
3737
ENV GOROOT="/usr/local/go"
3838
ENV GOPATH="$HOME/go"

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
ci:
2727
strategy:
2828
matrix:
29-
go-version: [1.23.x]
29+
go-version: [1.25.x]
3030
postgres-version: [15, 16]
3131
runs-on: ubuntu-24.04
3232
services:

‎.github/workflows/lint.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,11 @@ jobs:
3535

3636
- uses: actions/setup-go@v6
3737
with:
38-
go-version: '1.23.x'
38+
go-version: '1.25.x'
3939
cache: false
4040

4141
- name: golangci-lint
4242
uses: golangci/golangci-lint-action@v9
4343
with:
44-
version: v2.1.0
44+
version: v2.12.2
45+
install-mode: goinstall

‎Dockerfile.dev‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.24
1+
FROM golang:1.25
22

33
WORKDIR /app
44

‎conf/conf.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package conf
22

33
import (
4-
"fmt"
54
"os"
65
"strings"
76
"time"
@@ -48,7 +47,7 @@ func LoadConfig() error {
4847
break
4948
}
5049
if !loaded && userConfig != "" {
51-
return errors.Errorf(fmt.Sprintf("could not find config file in: %s", userConfig))
50+
return errors.Errorf("could not find config file in: %s", userConfig)
5251
}
5352
// load configs from env vars
5453
if err := konf.Load(env.Provider("TORK_", ".", func(s string) string {

‎docker-compose.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ services:
4545
- tork_network
4646

4747
migration:
48-
image: golang:1.24
48+
image: golang:1.25
4949
working_dir: /code
5050
environment:
5151
- TORK_CONFIG=configs/config.compose.toml

‎go.mod‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/runabol/tork
22

3-
go 1.23.0
4-
5-
toolchain go1.24.2
3+
go 1.25.0
64

75
retract v0.1.0
86

@@ -32,9 +30,9 @@ require (
3230
github.com/shirou/gopsutil/v3 v3.24.3
3331
github.com/stretchr/testify v1.10.0
3432
github.com/urfave/cli/v2 v2.27.7
35-
golang.org/x/crypto v0.36.0
33+
golang.org/x/crypto v0.52.0
3634
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
37-
golang.org/x/sys v0.32.0
35+
golang.org/x/sys v0.45.0
3836
golang.org/x/time v0.8.0
3937
gopkg.in/yaml.v3 v3.0.1
4038
gotest.tools/v3 v3.5.1
@@ -95,6 +93,6 @@ require (
9593
go.opentelemetry.io/otel/metric v1.26.0 // indirect
9694
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
9795
go.opentelemetry.io/otel/trace v1.26.0 // indirect
98-
golang.org/x/net v0.38.0 // indirect
99-
golang.org/x/text v0.23.0 // indirect
96+
golang.org/x/net v0.54.0 // indirect
97+
golang.org/x/text v0.37.0 // indirect
10098
)

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
211211
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
212212
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
213213
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
214-
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
215-
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
214+
golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988=
215+
golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc=
216216
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
217217
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
218218
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -221,8 +221,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
221221
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
222222
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
223223
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
224-
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
225-
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
224+
golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w=
225+
golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ=
226226
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
227227
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
228228
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -241,12 +241,12 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
241241
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
242242
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
243243
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
244-
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
245-
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
244+
golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
245+
golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
246246
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
247247
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
248-
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
249-
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
248+
golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
249+
golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
250250
golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
251251
golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
252252
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎internal/eval/eval.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func EvaluateTemplate(ex string, c map[string]any) (string, error) {
152152
if err != nil {
153153
return "", err
154154
}
155-
buf.WriteString(fmt.Sprintf("%v", ev))
155+
fmt.Fprintf(&buf, "%v", ev)
156156
loc = endTag
157157
}
158158
buf.WriteString(ex[loc:])

‎internal/fns/fns_test.go‎

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package fns
22

33
import (
4-
"bytes"
54
"errors"
65
"testing"
76
)
@@ -46,49 +45,3 @@ func TestCloseIgnore(t *testing.T) {
4645
})
4746
}
4847
}
49-
50-
func TestFprintf(t *testing.T) {
51-
var buf bytes.Buffer
52-
format := "Hello, %s!"
53-
name := "World"
54-
expected := "Hello, World!"
55-
56-
Fprintf(&buf, format, name)
57-
58-
if buf.String() != expected {
59-
t.Errorf("expected: %q, got: %q", expected, buf.String())
60-
}
61-
}
62-
63-
func TestFprintf_EmptyWriter(t *testing.T) {
64-
var buf bytes.Buffer
65-
format := ""
66-
expected := ""
67-
68-
Fprintf(&buf, format)
69-
70-
if buf.String() != expected {
71-
t.Errorf("expected: %q, got: %q", expected, buf.String())
72-
}
73-
}
74-
75-
func TestFprintf_ErrorWriter(t *testing.T) {
76-
errorWriter := &mockErrorWriter{}
77-
format := "Hello, %s!"
78-
name := "World"
79-
80-
Fprintf(errorWriter, format, name)
81-
82-
if !errorWriter.writeCalled {
83-
t.Errorf("expected write to be called, but it was not")
84-
}
85-
}
86-
87-
type mockErrorWriter struct {
88-
writeCalled bool
89-
}
90-
91-
func (m *mockErrorWriter) Write(p []byte) (n int, err error) {
92-
m.writeCalled = true
93-
return 0, errors.New("mock write error")
94-
}

0 commit comments

Comments
 (0)