Skip to content

Commit 0051841

Browse files
authored
Merge pull request #3222 from AkihiroSuda/go1.24
CI: use Go 1.24
2 parents 7ce6a7a + d4fb0fe commit 0051841

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
fetch-depth: 1
4040
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
4141
with:
42-
go-version: 1.23.x
42+
go-version: 1.24.x
4343
- name: Make darwin artifacts
4444
run: make artifacts-darwin
4545
- name: "Upload artifacts"
@@ -66,7 +66,7 @@ jobs:
6666
path: _artifacts/
6767
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
6868
with:
69-
go-version: 1.23.x
69+
go-version: 1.24.x
7070
- name: Install gcc-x86-64-linux-gnu
7171
run: |
7272
sudo apt-get update

.github/workflows/test.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
fetch-depth: 0
3232
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
3333
with:
34-
go-version: 1.23.x
34+
go-version: 1.24.x
3535
- name: Install protoc
3636
run: |
3737
sudo apt-get update
@@ -41,7 +41,7 @@ jobs:
4141
- name: Run golangci-lint
4242
uses: golangci/golangci-lint-action@051d91933864810ecd5e2ea2cfd98f6a5bca5347 # v6.3.2
4343
with:
44-
version: v1.62.0
44+
version: v1.64.2
4545
args: --verbose --timeout=10m
4646
- name: Run yamllint
4747
run: yamllint .
@@ -96,7 +96,7 @@ jobs:
9696
fail-fast: false
9797
matrix:
9898
# For non-Homebrew we have to support an old release of Go
99-
go-version: ["1.22.x", "1.23.x"]
99+
go-version: ["1.23.x", "1.24.x"]
100100
steps:
101101
- name: Install test dependencies
102102
run: |
@@ -155,7 +155,7 @@ jobs:
155155
fetch-depth: 1
156156
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
157157
with:
158-
go-version: 1.23.x
158+
go-version: 1.24.x
159159
- name: Unit tests
160160
run: go test -v ./...
161161
- name: Make
@@ -188,7 +188,7 @@ jobs:
188188
fetch-depth: 0
189189
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
190190
with:
191-
go-version: 1.23.x
191+
go-version: 1.24.x
192192
- name: Unit tests
193193
run: go test -v ./...
194194
- name: Make
@@ -259,7 +259,7 @@ jobs:
259259
fetch-depth: 1
260260
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
261261
with:
262-
go-version: 1.23.x
262+
go-version: 1.24.x
263263
- name: Make
264264
run: make
265265
- name: Install
@@ -310,7 +310,7 @@ jobs:
310310
ref: ${{ github.event.pull_request.head.sha }}
311311
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
312312
with:
313-
go-version: 1.23.x
313+
go-version: 1.24.x
314314
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
315315
with:
316316
path: ~/.cache/lima/download
@@ -355,7 +355,7 @@ jobs:
355355
fetch-depth: 1
356356
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
357357
with:
358-
go-version: 1.23.x
358+
go-version: 1.24.x
359359
- name: Make
360360
run: make
361361
- name: Install
@@ -418,7 +418,7 @@ jobs:
418418
filter: tree:0
419419
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
420420
with:
421-
go-version: 1.23.x
421+
go-version: 1.24.x
422422
- name: Cache image used by ${{ matrix.oldver }}/examples/ubuntu-lts.yaml
423423
uses: ./.github/actions/setup_cache_for_template
424424
with:
@@ -455,7 +455,7 @@ jobs:
455455
fetch-depth: 1
456456
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
457457
with:
458-
go-version: 1.23.x
458+
go-version: 1.24.x
459459
- name: Make
460460
run: make
461461
- name: Install

pkg/instance/start.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,6 @@ type watchHostAgentEventsTimeoutKey = struct{}
339339
// WithWatchHostAgentTimeout sets the value of the timeout to use for
340340
// watchHostAgentEvents in the given Context.
341341
func WithWatchHostAgentTimeout(ctx context.Context, timeout time.Duration) context.Context {
342-
//nolint:staticcheck // SA1029: should not use empty anonymous struct as key for value; define your own type to avoid collisions (staticcheck)
343342
return context.WithValue(ctx, watchHostAgentEventsTimeoutKey{}, timeout)
344343
}
345344

0 commit comments

Comments
 (0)