Skip to content

Commit a3c4d64

Browse files
authored
Merge pull request #6897 from thaJeztah/bump_minimum_go
update minimum go version to go1.25
2 parents eecf813 + bf6a1e1 commit a3c4d64

106 files changed

Lines changed: 108 additions & 108 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

cli-plugins/hooks/hook_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2-
//go:build go1.24
2+
//go:build go1.25
33

44
// Package hooks defines the contract between the Docker CLI and CLI plugin hook
55
// implementations.

cli-plugins/hooks/template.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2-
//go:build go1.24
2+
//go:build go1.25
33

44
package hooks
55

cli-plugins/manager/error.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2-
//go:build go1.24
2+
//go:build go1.25
33

44
package manager
55

cli-plugins/manager/hooks.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2-
//go:build go1.24
2+
//go:build go1.25
33

44
package manager
55

cli-plugins/socket/socket_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ func TestPluginServer(t *testing.T) {
5454
})
5555

5656
t.Run("allows reconnects", func(t *testing.T) {
57-
var calls int32
57+
var calls atomic.Int32
5858
h := func(_ net.Conn) {
59-
atomic.AddInt32(&calls, 1)
59+
calls.Add(1)
6060
}
6161

6262
srv, err := NewPluginServer(h)
@@ -70,7 +70,7 @@ func TestPluginServer(t *testing.T) {
7070

7171
waitForCalls := func(n int) {
7272
poll.WaitOn(t, func(t poll.LogT) poll.Result {
73-
if atomic.LoadInt32(&calls) == int32(n) {
73+
if calls.Load() == int32(n) {
7474
return poll.Success()
7575
}
7676
return poll.Continue("waiting for handler to be called")

cli/command/cli.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2-
//go:build go1.24
2+
//go:build go1.25
33

44
package command
55

cli/command/config/inspect.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2-
//go:build go1.24
2+
//go:build go1.25
33

44
package config
55

cli/command/container/completion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2-
//go:build go1.24
2+
//go:build go1.25
33

44
package container
55

cli/command/container/inspect.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2-
//go:build go1.24
2+
//go:build go1.25
33

44
package container
55

cli/command/container/opts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
2-
//go:build go1.24
2+
//go:build go1.25
33

44
package container
55

0 commit comments

Comments
 (0)