Skip to content

Commit 8c709ce

Browse files
authored
Bump Go version from 1.24.2 to 1.26 (#227)
1 parent 9a1beab commit 8c709ce

7 files changed

Lines changed: 79 additions & 53 deletions

File tree

.github/workflows/CI.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: Setup Go
4747
uses: actions/setup-go@v5
4848
with:
49-
go-version: "1.24"
49+
go-version: "1.26"
5050

5151
- name: Check Dependencies License
5252
run: make dependency-license
@@ -60,7 +60,7 @@ jobs:
6060
- name: Set up Go
6161
uses: actions/setup-go@v5
6262
with:
63-
go-version: 1.24
63+
go-version: "1.26"
6464

6565
- name: Check code generation
6666
run: make check-codegen
@@ -88,13 +88,13 @@ jobs:
8888
strategy:
8989
matrix:
9090
oap:
91-
- b55fa2a5193618cdd7d699ad96fa20ceca9d507e
91+
- 42c613bea94999a6cc8e805ed4c8c7659f3a735c
9292
steps:
9393
- uses: actions/checkout@v4
9494
- name: Set up Go
9595
uses: actions/setup-go@v5
9696
with:
97-
go-version: 1.24
97+
go-version: "1.26"
9898

9999
- name: Install swctl
100100
run: make install DESTDIR=/usr/local/bin
@@ -116,7 +116,7 @@ jobs:
116116
- name: setup go
117117
uses: actions/setup-go@v5
118118
with:
119-
go-version: '1.24'
119+
go-version: "1.26"
120120

121121
- name: run unit tests and report coverage
122122
working-directory: ./

.github/workflows/publish-docker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Set up Go
4444
uses: actions/setup-go@v4
4545
with:
46-
go-version: 1.24
46+
go-version: "1.26"
4747
- name: Log in to the Container registry
4848
uses: docker/login-action@v1.10.0
4949
with:

.golangci.yml

Lines changed: 66 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -14,47 +14,10 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
linters-settings:
18-
govet:
19-
enable:
20-
- shadow
21-
gocyclo:
22-
min-complexity: 15
23-
dupl:
24-
threshold: 200
25-
goconst:
26-
min-len: 2
27-
min-occurrences: 2
28-
misspell:
29-
locale: US
30-
lll:
31-
line-length: 150
32-
goimports:
33-
local-prefixes: github.com/apache/skywalking-cli
34-
gocritic:
35-
enabled-tags:
36-
- diagnostic
37-
- experimental
38-
- opinionated
39-
- performance
40-
- style
41-
disabled-checks:
42-
- ifElseChain
43-
funlen:
44-
lines: 100
45-
statements: 50
46-
whitespace:
47-
multi-if: false
48-
multi-func: false
49-
depguard:
50-
rules:
51-
prevent_cli_in_pkg:
52-
files: ["**/pkg/**/*.go"]
53-
deny:
54-
- pkg: "github.com/urfave/cli/v2"
55-
desc: "github.com/urfave/cli/v2 is not allowed in pkg module"
17+
version: "2"
5618

5719
linters:
20+
default: none
5821
enable:
5922
- bodyclose
6023
- dogsled
@@ -64,21 +27,80 @@ linters:
6427
- goconst
6528
- gocritic
6629
- gocyclo
67-
- gofmt
68-
- goimports
6930
- revive
7031
- gosec
71-
- gosimple
7232
- govet
7333
- ineffassign
7434
- lll
7535
- misspell
7636
- nakedret
7737
- staticcheck
78-
- stylecheck
79-
- typecheck
8038
- unconvert
8139
- unparam
8240
- unused
8341
- whitespace
8442
- depguard
43+
settings:
44+
govet:
45+
enable:
46+
- shadow
47+
gocyclo:
48+
min-complexity: 15
49+
dupl:
50+
threshold: 200
51+
goconst:
52+
min-len: 2
53+
min-occurrences: 2
54+
misspell:
55+
locale: US
56+
lll:
57+
line-length: 150
58+
gocritic:
59+
enabled-tags:
60+
- diagnostic
61+
- experimental
62+
- opinionated
63+
- performance
64+
- style
65+
disabled-checks:
66+
- ifElseChain
67+
funlen:
68+
lines: 100
69+
statements: 50
70+
whitespace:
71+
multi-if: false
72+
multi-func: false
73+
depguard:
74+
rules:
75+
prevent_cli_in_pkg:
76+
files: ["**/pkg/**/*.go"]
77+
deny:
78+
- pkg: "github.com/urfave/cli/v2"
79+
desc: "github.com/urfave/cli/v2 is not allowed in pkg module"
80+
exclusions:
81+
generated: lax
82+
presets:
83+
- comments
84+
- common-false-positives
85+
- legacy
86+
- std-error-handling
87+
rules:
88+
- linters: [revive]
89+
text: "exported: exported .* should have comment"
90+
- linters: [gosec]
91+
text: "G104"
92+
- linters: [errcheck]
93+
text: "Error return value of .((os\\.)?std(out|err)\\..*|.*Close|.*Flush|os\\.Remove(All)?|.*printf?|os\\.(Un)?Setenv). is not checked"
94+
paths:
95+
- third_party$
96+
- builtin$
97+
- examples$
98+
99+
formatters:
100+
enable:
101+
- gofmt
102+
- goimports
103+
settings:
104+
goimports:
105+
local-prefixes:
106+
- github.com/apache/skywalking-cli

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
FROM golang:1.24 AS builder
16+
FROM golang:1.26 AS builder
1717

1818
ARG VERSION
1919

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ deps:
5959
@$(GO_GET) -v -t ./...
6060

6161
$(GO_LINT):
62-
@$(GO_LINT) version > /dev/null 2>&1 || go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.0
62+
@$(GO_LINT) version > /dev/null 2>&1 || go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.11.4
6363
$(LICENSE_EYE):
6464
@$(LICENSE_EYE) --version > /dev/null 2>&1 || go install github.com/apache/skywalking-eyes/cmd/license-eye@d38fe05
6565

go.mod

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

3-
go 1.24.2
3+
go 1.26
44

55
require (
66
github.com/apache/skywalking-swck/operator v0.0.0-20250424112814-f5c5243fcfb2

test/cases/basic/expected/layer-list.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
- FAAS
2222
- MESH_CP
2323
- AWS_GATEWAY
24+
- GENAI
25+
- BANYANDB
2426
- NGINX
2527
- SO11Y_JAVA_AGENT
2628
- ACTIVEMQ
@@ -39,7 +41,9 @@
3941
- CACHE
4042
- OS_WINDOWS
4143
- SO11Y_GO_AGENT
44+
- ENVOY_AI_GATEWAY
4245
- MESH_DP
46+
- VIRTUAL_GENAI
4347
- SO11Y_OAP
4448
- DATABASE
4549
- OS_LINUX

0 commit comments

Comments
 (0)