Skip to content

Commit 64f40c2

Browse files
authored
Merge pull request #2544 from AkihiroSuda/go1.23
CI: use Go 1.23; go.mod: go 1.22
2 parents f58f5e9 + 145e6f9 commit 64f40c2

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
fetch-depth: 1
3131
- uses: actions/setup-go@v5
3232
with:
33-
go-version: 1.22.x
33+
go-version: 1.23.x
3434
- name: Make darwin artifacts
3535
run: make artifacts-darwin
3636
- name: "Upload artifacts"
@@ -57,7 +57,7 @@ jobs:
5757
path: _artifacts/
5858
- uses: actions/setup-go@v5
5959
with:
60-
go-version: 1.22.x
60+
go-version: 1.23.x
6161
- name: Install gcc-x86-64-linux-gnu
6262
run: |
6363
sudo apt-get update

.github/workflows/test.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
fetch-depth: 1
2929
- uses: actions/setup-go@v5
3030
with:
31-
go-version: 1.22.x
31+
go-version: 1.23.x
3232
- name: Install protoc
3333
run: |
3434
sudo apt-get update
@@ -38,7 +38,7 @@ jobs:
3838
- name: Run golangci-lint
3939
uses: golangci/[email protected]
4040
with:
41-
version: v1.59.1
41+
version: v1.60.1
4242
args: --verbose --timeout=10m
4343
- name: Run yamllint
4444
run: yamllint .
@@ -72,7 +72,7 @@ jobs:
7272
fail-fast: false
7373
matrix:
7474
# For non-Homebrew we have to support an old release of Go
75-
go-version: ["1.21.x", "1.22.x"]
75+
go-version: ["1.22.x", "1.23.x"]
7676
steps:
7777
- name: Install test dependencies
7878
run: |
@@ -127,7 +127,7 @@ jobs:
127127
fetch-depth: 1
128128
- uses: actions/setup-go@v5
129129
with:
130-
go-version: 1.22.x
130+
go-version: 1.23.x
131131
- name: Unit tests
132132
run: go test -v ./...
133133
- name: Make
@@ -156,7 +156,7 @@ jobs:
156156
fetch-depth: 1
157157
- uses: actions/setup-go@v5
158158
with:
159-
go-version: 1.22.x
159+
go-version: 1.23.x
160160
- name: Cache ~/Library/Caches/lima/download
161161
uses: actions/cache@v4
162162
with:
@@ -226,7 +226,7 @@ jobs:
226226
fetch-depth: 1
227227
- uses: actions/setup-go@v5
228228
with:
229-
go-version: 1.22.x
229+
go-version: 1.23.x
230230
- id: path_for_hashFiles
231231
# It seems that `hashFiles` cannot use `..` as a path component, so generate a normalized path here.
232232
run: echo "NORMALIZED=$(realpath --relative-to=$PWD examples/${{ matrix.template }})" >> "$GITHUB_OUTPUT"
@@ -282,7 +282,7 @@ jobs:
282282
ref: ${{ github.event.pull_request.head.sha }}
283283
- uses: actions/setup-go@v5
284284
with:
285-
go-version: 1.22.x
285+
go-version: 1.23.x
286286
- uses: actions/cache@v4
287287
with:
288288
path: ~/.cache/lima/download
@@ -327,7 +327,7 @@ jobs:
327327
fetch-depth: 1
328328
- uses: actions/setup-go@v5
329329
with:
330-
go-version: 1.22.x
330+
go-version: 1.23.x
331331
- name: Cache ~/Library/Caches/lima/download
332332
uses: actions/cache@v4
333333
with:
@@ -379,7 +379,7 @@ jobs:
379379
fetch-depth: 0
380380
- uses: actions/setup-go@v5
381381
with:
382-
go-version: 1.22.x
382+
go-version: 1.23.x
383383
- name: Cache ~/Library/Caches/lima/download
384384
uses: actions/cache@v4
385385
with:
@@ -413,7 +413,7 @@ jobs:
413413
fetch-depth: 1
414414
- uses: actions/setup-go@v5
415415
with:
416-
go-version: 1.22.x
416+
go-version: 1.23.x
417417
- id: path_for_hashFiles
418418
# It seems that `hashFiles` cannot use `..` as a path component, so generate a normalized path here.
419419
run: echo "NORMALIZED=$(realpath examples/${{ matrix.template }})" >> "$GITHUB_OUTPUT"

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/lima-vm/lima
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
al.essio.dev/pkg/shellescape v1.5.0

pkg/instance/start.go

+1
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,7 @@ type watchHostAgentEventsTimeoutKey = struct{}
327327
// WithWatchHostAgentTimeout sets the value of the timeout to use for
328328
// watchHostAgentEvents in the given Context.
329329
func WithWatchHostAgentTimeout(ctx context.Context, timeout time.Duration) context.Context {
330+
//nolint:staticcheck // SA1029: should not use empty anonymous struct as key for value; define your own type to avoid collisions (staticcheck)
330331
return context.WithValue(ctx, watchHostAgentEventsTimeoutKey{}, timeout)
331332
}
332333

website/netlify.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ command = "make -C .. docsy && npm run build:preview"
66
publish = "public"
77

88
[build.environment]
9-
GO_VERSION = "1.22.1"
9+
GO_VERSION = "1.23.0"
1010

1111
[context.production]
1212
command = "make -C .. docsy && npm run build:production"

0 commit comments

Comments
 (0)