Skip to content

Commit ce7c368

Browse files
authored
bump go version to 1.24 and fix 1.24 go vet (#1481)
1 parent 04659cb commit ce7c368

File tree

14 files changed

+24
-23
lines changed

14 files changed

+24
-23
lines changed

.github/workflows/code.analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- ".github/workflows/code.analysis.yml"
1212

1313
env:
14-
GO_VERSION: "1.23"
14+
GO_VERSION: "1.24"
1515

1616
jobs:
1717
analysis:

.github/workflows/golangci.lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- ".github/workflows/golangci.lint.yml"
1010

1111
env:
12-
GO_VERSION: "1.23"
12+
GO_VERSION: "1.24"
1313

1414
jobs:
1515
analysis:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- "v*"
77

88
env:
9-
GO_VERSION: "1.23"
9+
GO_VERSION: "1.24"
1010

1111
permissions:
1212
contents: write

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
- ".github/workflows/test.yml"
2323

2424
env:
25-
GO_VERSION: "1.23"
25+
GO_VERSION: "1.24"
2626

2727
jobs:
2828
test-ubuntu:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ INTEGRATION_TEST_PATH := build/test
1414

1515
# Image Name
1616
IMAGE_NAME?=megaease/easegress
17-
BUILDER_IMAGE_NAME?=megaease/golang:1.23-alpine
17+
BUILDER_IMAGE_NAME?=megaease/golang:1.24-alpine
1818

1919
# Version
2020
RELEASE?=v2.9.0

SECURITY.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ Supported [Go versions](https://go.dev/dl/):
66

77
| Version | Supported |
88
| ------- | ------------------ |
9+
| 1.25.x | :white_check_mark: |
910
| 1.24.x | :white_check_mark: |
10-
| 1.23.x | :white_check_mark: |
11-
| < 1.23 | :x: |
11+
| < 1.24 | :x: |
1212

1313
# Reporting a Vulnerability
1414

build/package/Dockerfile.builder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
FROM golang:1.23-alpine
1+
FROM golang:1.24-alpine
22
RUN apk --no-cache add make git

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/megaease/easegress/v2
22

3-
go 1.23.0
3+
go 1.24
44

55
toolchain go1.24.5
66

pkg/api/profile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func (s *Server) startCPUProfile(w http.ResponseWriter, r *http.Request) {
9898

9999
err = s.profile.UpdateCPUProfile(spr.Path)
100100
if err != nil {
101-
HandleAPIError(w, r, http.StatusBadRequest, fmt.Errorf(err.Error()))
101+
HandleAPIError(w, r, http.StatusBadRequest, err)
102102
return
103103
}
104104
}

pkg/object/autocertmanager/autocertmanager_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ domains:
544544
directoryURL: ` + url
545545
etcdDirName, err := os.MkdirTemp("", "autocertmanager-test")
546546
if err != nil {
547-
t.Errorf(err.Error())
547+
t.Error(err.Error())
548548
}
549549
defer os.RemoveAll(etcdDirName)
550550

@@ -599,7 +599,7 @@ directoryURL: ` + url
599599
w := httptest.NewRecorder()
600600
r, err := http.NewRequest("GET", "http://example.org/challenge-suffix", nil)
601601
if err != nil {
602-
t.Errorf(err.Error())
602+
t.Error(err.Error())
603603
}
604604
acm.spec.EnableHTTP01 = false
605605
acm.HandleHTTP01Challenge(w, r)
@@ -624,7 +624,7 @@ directoryURL: ` + url
624624
token := "asdlijasdoiashvouid"
625625
err = cls.Put(key, token) // add data for http01 challenge
626626
if err != nil {
627-
t.Errorf(err.Error())
627+
t.Error(err.Error())
628628
}
629629

630630
w = httptest.NewRecorder()
@@ -678,7 +678,7 @@ domains:
678678
directoryURL: ` + url
679679
etcdDirName, err := os.MkdirTemp("", "autocertmanager-test")
680680
if err != nil {
681-
t.Errorf(err.Error())
681+
t.Error(err.Error())
682682
}
683683
defer os.RemoveAll(etcdDirName)
684684

@@ -726,7 +726,7 @@ domains:
726726
directoryURL: ` + url
727727
etcdDirName, err := os.MkdirTemp("", "autocertmanager-test")
728728
if err != nil {
729-
t.Errorf(err.Error())
729+
t.Error(err.Error())
730730
}
731731
defer os.RemoveAll(etcdDirName)
732732

@@ -819,7 +819,7 @@ func waitDNSRecordTest(t *testing.T, d Domain) {
819819
func TestDomain(t *testing.T) {
820820
etcdDirName, err := os.MkdirTemp("", "autocertmanager-domain-test")
821821
if err != nil {
822-
t.Errorf(err.Error())
822+
t.Error(err.Error())
823823
}
824824
defer os.RemoveAll(etcdDirName)
825825
cls := cluster.CreateClusterForTest(etcdDirName)

0 commit comments

Comments
 (0)