From 8f7dc04070206b38aec41a7c643e53db20742232 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 17 Mar 2026 19:19:17 +0100 Subject: [PATCH 1/2] update minimum go version to go1.25 - drop support for go1.24 - update vendor.mod to go1.25.0 - update //go:build tags to go1.25 The golang.org/x/ dependencies now require go1.25 as a minimum, so updating our build tags accordingly. Signed-off-by: Sebastiaan van Stijn --- cli-plugins/hooks/hook_types.go | 2 +- cli-plugins/hooks/template.go | 2 +- cli-plugins/manager/error.go | 2 +- cli-plugins/manager/hooks.go | 2 +- cli/command/cli.go | 2 +- cli/command/config/inspect.go | 2 +- cli/command/container/completion.go | 2 +- cli/command/container/inspect.go | 2 +- cli/command/container/opts.go | 2 +- cli/command/container/stats.go | 2 +- cli/command/container/tty.go | 2 +- cli/command/context.go | 2 +- cli/command/context/completion.go | 2 +- cli/command/context/create.go | 2 +- cli/command/context/create_test.go | 2 +- cli/command/context/inspect.go | 2 +- cli/command/context/list.go | 2 +- cli/command/context_test.go | 2 +- cli/command/defaultcontextstore.go | 2 +- cli/command/defaultcontextstore_test.go | 2 +- cli/command/formatter/container.go | 2 +- cli/command/formatter/container_test.go | 2 +- cli/command/formatter/custom.go | 2 +- cli/command/formatter/displayutils.go | 2 +- cli/command/formatter/formatter.go | 2 +- cli/command/formatter/formatter_test.go | 2 +- cli/command/formatter/reflect.go | 2 +- cli/command/formatter/reflect_test.go | 2 +- cli/command/formatter/volume_test.go | 2 +- cli/command/idresolver/idresolver.go | 2 +- cli/command/image/inspect.go | 2 +- cli/command/image/list.go | 2 +- cli/command/image/push.go | 2 +- cli/command/image/tree.go | 2 +- cli/command/inspect/inspector.go | 2 +- cli/command/manifest/annotate.go | 2 +- cli/command/network/formatter_test.go | 2 +- cli/command/network/inspect.go | 2 +- cli/command/node/formatter_test.go | 2 +- cli/command/node/inspect.go | 2 +- cli/command/node/update.go | 2 +- cli/command/plugin/formatter_test.go | 2 +- cli/command/plugin/inspect.go | 2 +- cli/command/secret/inspect.go | 2 +- cli/command/service/formatter_test.go | 2 +- cli/command/service/inspect.go | 2 +- cli/command/service/inspect_test.go | 2 +- cli/command/service/internal/genericresource/parse.go | 2 +- cli/command/service/opts.go | 2 +- cli/command/service/progress/progress.go | 2 +- cli/command/service/update.go | 2 +- cli/command/stack/loader.go | 2 +- cli/command/system/info.go | 2 +- cli/command/system/inspect.go | 2 +- cli/command/system/prune.go | 2 +- cli/command/system/pruner/pruner.go | 2 +- cli/command/telemetry_docker.go | 2 +- cli/command/utils.go | 2 +- cli/command/volume/create.go | 2 +- cli/command/volume/create_test.go | 2 +- cli/command/volume/inspect.go | 2 +- cli/compose/convert/service.go | 2 +- cli/compose/interpolation/interpolation.go | 2 +- cli/compose/interpolation/interpolation_test.go | 2 +- cli/compose/loader/full-struct_test.go | 2 +- cli/compose/loader/interpolate.go | 2 +- cli/compose/loader/loader.go | 2 +- cli/compose/loader/loader_test.go | 2 +- cli/compose/loader/merge.go | 2 +- cli/compose/loader/merge_test.go | 2 +- cli/compose/schema/schema.go | 2 +- cli/compose/schema/schema_test.go | 2 +- cli/compose/template/template.go | 2 +- cli/compose/template/template_test.go | 2 +- cli/compose/types/types.go | 2 +- cli/config/configfile/file.go | 2 +- cli/config/memorystore/store.go | 2 +- cli/connhelper/connhelper.go | 2 +- cli/context/store/metadata_test.go | 2 +- cli/context/store/metadatastore.go | 2 +- cli/context/store/store.go | 2 +- cli/context/store/store_test.go | 2 +- cli/context/store/storeconfig.go | 2 +- cli/context/store/storeconfig_test.go | 2 +- cmd/docker-trust/internal/registry/config.go | 2 +- cmd/docker-trust/internal/registry/errors.go | 2 +- cmd/docker-trust/trust/inspect.go | 2 +- cmd/docker/builder_test.go | 2 +- cmd/docker/docker.go | 2 +- internal/oauth/api/api.go | 2 +- internal/registry/config.go | 2 +- internal/registry/errors.go | 2 +- internal/test/strings.go | 2 +- internal/tui/chip.go | 2 +- internal/tui/colors.go | 2 +- internal/tui/count.go | 2 +- internal/tui/note.go | 2 +- internal/tui/output.go | 2 +- internal/tui/str.go | 2 +- internal/volumespec/volumespec.go | 2 +- opts/opts.go | 2 +- opts/swarmopts/port.go | 2 +- opts/swarmopts/port_test.go | 2 +- templates/templates.go | 2 +- vendor.mod | 2 +- 105 files changed, 105 insertions(+), 105 deletions(-) diff --git a/cli-plugins/hooks/hook_types.go b/cli-plugins/hooks/hook_types.go index 02cd93c8f1b7..c2b0b3ba4fca 100644 --- a/cli-plugins/hooks/hook_types.go +++ b/cli-plugins/hooks/hook_types.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 // Package hooks defines the contract between the Docker CLI and CLI plugin hook // implementations. diff --git a/cli-plugins/hooks/template.go b/cli-plugins/hooks/template.go index cc8901593c30..0652296001df 100644 --- a/cli-plugins/hooks/template.go +++ b/cli-plugins/hooks/template.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package hooks diff --git a/cli-plugins/manager/error.go b/cli-plugins/manager/error.go index 01ee8dbdc480..6dd06405d6d7 100644 --- a/cli-plugins/manager/error.go +++ b/cli-plugins/manager/error.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package manager diff --git a/cli-plugins/manager/hooks.go b/cli-plugins/manager/hooks.go index a58a4439449a..9bbacb1c9c99 100644 --- a/cli-plugins/manager/hooks.go +++ b/cli-plugins/manager/hooks.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package manager diff --git a/cli/command/cli.go b/cli/command/cli.go index 42d01b95644e..d2805f2530e6 100644 --- a/cli/command/cli.go +++ b/cli/command/cli.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package command diff --git a/cli/command/config/inspect.go b/cli/command/config/inspect.go index e423a4891e32..1991922ed8c3 100644 --- a/cli/command/config/inspect.go +++ b/cli/command/config/inspect.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package config diff --git a/cli/command/container/completion.go b/cli/command/container/completion.go index 73ae61fa1b20..d88da97ccbee 100644 --- a/cli/command/container/completion.go +++ b/cli/command/container/completion.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package container diff --git a/cli/command/container/inspect.go b/cli/command/container/inspect.go index 867fc5fd1e80..df01341955bc 100644 --- a/cli/command/container/inspect.go +++ b/cli/command/container/inspect.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package container diff --git a/cli/command/container/opts.go b/cli/command/container/opts.go index c4dcea38e9e4..f9d896882ebf 100644 --- a/cli/command/container/opts.go +++ b/cli/command/container/opts.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package container diff --git a/cli/command/container/stats.go b/cli/command/container/stats.go index 861d3e6db2ff..1902fac833fe 100644 --- a/cli/command/container/stats.go +++ b/cli/command/container/stats.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package container diff --git a/cli/command/container/tty.go b/cli/command/container/tty.go index a9a0b70ec364..3bf03a990678 100644 --- a/cli/command/container/tty.go +++ b/cli/command/container/tty.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package container diff --git a/cli/command/context.go b/cli/command/context.go index b926b303aa1a..b876e225ef43 100644 --- a/cli/command/context.go +++ b/cli/command/context.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package command diff --git a/cli/command/context/completion.go b/cli/command/context/completion.go index 65453cc57c8b..aba7d5b74b55 100644 --- a/cli/command/context/completion.go +++ b/cli/command/context/completion.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package context diff --git a/cli/command/context/create.go b/cli/command/context/create.go index 2d5b7ab6fabe..f7e62205ba21 100644 --- a/cli/command/context/create.go +++ b/cli/command/context/create.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package context diff --git a/cli/command/context/create_test.go b/cli/command/context/create_test.go index 0e7ccb03f508..a9d64e1248be 100644 --- a/cli/command/context/create_test.go +++ b/cli/command/context/create_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package context diff --git a/cli/command/context/inspect.go b/cli/command/context/inspect.go index 9772469e8063..4e9ab2822202 100644 --- a/cli/command/context/inspect.go +++ b/cli/command/context/inspect.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package context diff --git a/cli/command/context/list.go b/cli/command/context/list.go index 6065a1b85817..d0236d814f65 100644 --- a/cli/command/context/list.go +++ b/cli/command/context/list.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package context diff --git a/cli/command/context_test.go b/cli/command/context_test.go index 3f3b03c77259..421102d242a1 100644 --- a/cli/command/context_test.go +++ b/cli/command/context_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package command diff --git a/cli/command/defaultcontextstore.go b/cli/command/defaultcontextstore.go index e6315b8e89a4..54ca58d2d8d4 100644 --- a/cli/command/defaultcontextstore.go +++ b/cli/command/defaultcontextstore.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package command diff --git a/cli/command/defaultcontextstore_test.go b/cli/command/defaultcontextstore_test.go index 5231cc9ff653..6a4f0866f2b7 100644 --- a/cli/command/defaultcontextstore_test.go +++ b/cli/command/defaultcontextstore_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package command diff --git a/cli/command/formatter/container.go b/cli/command/formatter/container.go index fafa6a56e0d9..ab4d5c84232f 100644 --- a/cli/command/formatter/container.go +++ b/cli/command/formatter/container.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package formatter diff --git a/cli/command/formatter/container_test.go b/cli/command/formatter/container_test.go index a38e75e87d53..fe7b57dd7f52 100644 --- a/cli/command/formatter/container_test.go +++ b/cli/command/formatter/container_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package formatter diff --git a/cli/command/formatter/custom.go b/cli/command/formatter/custom.go index 27931af76eed..b845e191fa20 100644 --- a/cli/command/formatter/custom.go +++ b/cli/command/formatter/custom.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package formatter diff --git a/cli/command/formatter/displayutils.go b/cli/command/formatter/displayutils.go index 7b0bd687ff59..ef008006ffb6 100644 --- a/cli/command/formatter/displayutils.go +++ b/cli/command/formatter/displayutils.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package formatter diff --git a/cli/command/formatter/formatter.go b/cli/command/formatter/formatter.go index 88905cd1be5c..24142b21a0ab 100644 --- a/cli/command/formatter/formatter.go +++ b/cli/command/formatter/formatter.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package formatter diff --git a/cli/command/formatter/formatter_test.go b/cli/command/formatter/formatter_test.go index 6d58aaad36d4..7e58791b46f6 100644 --- a/cli/command/formatter/formatter_test.go +++ b/cli/command/formatter/formatter_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package formatter diff --git a/cli/command/formatter/reflect.go b/cli/command/formatter/reflect.go index 89da07b8a392..de03fb763821 100644 --- a/cli/command/formatter/reflect.go +++ b/cli/command/formatter/reflect.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package formatter diff --git a/cli/command/formatter/reflect_test.go b/cli/command/formatter/reflect_test.go index 76ca1a5376c0..fdff3f58994e 100644 --- a/cli/command/formatter/reflect_test.go +++ b/cli/command/formatter/reflect_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package formatter diff --git a/cli/command/formatter/volume_test.go b/cli/command/formatter/volume_test.go index 857f4530e385..1fa2770fa966 100644 --- a/cli/command/formatter/volume_test.go +++ b/cli/command/formatter/volume_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package formatter diff --git a/cli/command/idresolver/idresolver.go b/cli/command/idresolver/idresolver.go index d1ef3834db10..95e334535eb6 100644 --- a/cli/command/idresolver/idresolver.go +++ b/cli/command/idresolver/idresolver.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package idresolver diff --git a/cli/command/image/inspect.go b/cli/command/image/inspect.go index e0b0a04fc722..714c7c738440 100644 --- a/cli/command/image/inspect.go +++ b/cli/command/image/inspect.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package image diff --git a/cli/command/image/list.go b/cli/command/image/list.go index 6e0675c8f8b7..4f5da98b6323 100644 --- a/cli/command/image/list.go +++ b/cli/command/image/list.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package image diff --git a/cli/command/image/push.go b/cli/command/image/push.go index b2aa73d52441..770bad985a4e 100644 --- a/cli/command/image/push.go +++ b/cli/command/image/push.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package image diff --git a/cli/command/image/tree.go b/cli/command/image/tree.go index 6616e9e207a1..a15e01e1b497 100644 --- a/cli/command/image/tree.go +++ b/cli/command/image/tree.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package image diff --git a/cli/command/inspect/inspector.go b/cli/command/inspect/inspector.go index 526cfda9f8c0..63e7b597ba53 100644 --- a/cli/command/inspect/inspector.go +++ b/cli/command/inspect/inspector.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package inspect diff --git a/cli/command/manifest/annotate.go b/cli/command/manifest/annotate.go index 8658022b9094..9bdb7b1d26cc 100644 --- a/cli/command/manifest/annotate.go +++ b/cli/command/manifest/annotate.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package manifest diff --git a/cli/command/network/formatter_test.go b/cli/command/network/formatter_test.go index 3f864065462e..4642ee35b402 100644 --- a/cli/command/network/formatter_test.go +++ b/cli/command/network/formatter_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package network diff --git a/cli/command/network/inspect.go b/cli/command/network/inspect.go index accf7c484217..77f55d6535b1 100644 --- a/cli/command/network/inspect.go +++ b/cli/command/network/inspect.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package network diff --git a/cli/command/node/formatter_test.go b/cli/command/node/formatter_test.go index fa44d44111dc..bd378806ba7d 100644 --- a/cli/command/node/formatter_test.go +++ b/cli/command/node/formatter_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package node diff --git a/cli/command/node/inspect.go b/cli/command/node/inspect.go index cd65f7a3e4f9..9ae166f30ba5 100644 --- a/cli/command/node/inspect.go +++ b/cli/command/node/inspect.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package node diff --git a/cli/command/node/update.go b/cli/command/node/update.go index 38e94bd2fa80..542152895ce3 100644 --- a/cli/command/node/update.go +++ b/cli/command/node/update.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package node diff --git a/cli/command/plugin/formatter_test.go b/cli/command/plugin/formatter_test.go index 08f6d98fc6d8..b0098f308d76 100644 --- a/cli/command/plugin/formatter_test.go +++ b/cli/command/plugin/formatter_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package plugin diff --git a/cli/command/plugin/inspect.go b/cli/command/plugin/inspect.go index 17d7b89169e4..1b6ec03a6a8c 100644 --- a/cli/command/plugin/inspect.go +++ b/cli/command/plugin/inspect.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package plugin diff --git a/cli/command/secret/inspect.go b/cli/command/secret/inspect.go index 4c2718cfe347..165645f1923a 100644 --- a/cli/command/secret/inspect.go +++ b/cli/command/secret/inspect.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package secret diff --git a/cli/command/service/formatter_test.go b/cli/command/service/formatter_test.go index dc21f7b8a07a..4ff8b1718675 100644 --- a/cli/command/service/formatter_test.go +++ b/cli/command/service/formatter_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package service diff --git a/cli/command/service/inspect.go b/cli/command/service/inspect.go index 9896eabbb475..6ec3a3974b8a 100644 --- a/cli/command/service/inspect.go +++ b/cli/command/service/inspect.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package service diff --git a/cli/command/service/inspect_test.go b/cli/command/service/inspect_test.go index 129998bd2b3a..24981ed2f4a1 100644 --- a/cli/command/service/inspect_test.go +++ b/cli/command/service/inspect_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package service diff --git a/cli/command/service/internal/genericresource/parse.go b/cli/command/service/internal/genericresource/parse.go index e06ed95c1910..37305fee2b91 100644 --- a/cli/command/service/internal/genericresource/parse.go +++ b/cli/command/service/internal/genericresource/parse.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 // Package genericresource is a local fork of SwarmKit's [genericresource] package, // without protobuf dependencies. diff --git a/cli/command/service/opts.go b/cli/command/service/opts.go index bdd1e365e979..ba2735ace259 100644 --- a/cli/command/service/opts.go +++ b/cli/command/service/opts.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package service diff --git a/cli/command/service/progress/progress.go b/cli/command/service/progress/progress.go index fc6ff7eb52f5..36f5d19e465a 100644 --- a/cli/command/service/progress/progress.go +++ b/cli/command/service/progress/progress.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package progress diff --git a/cli/command/service/update.go b/cli/command/service/update.go index 95d38a782501..62f5376ae29a 100644 --- a/cli/command/service/update.go +++ b/cli/command/service/update.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package service diff --git a/cli/command/stack/loader.go b/cli/command/stack/loader.go index 356e24dbc859..60107f7f17ae 100644 --- a/cli/command/stack/loader.go +++ b/cli/command/stack/loader.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package stack diff --git a/cli/command/system/info.go b/cli/command/system/info.go index 95115f110f31..5ae650a17c6a 100644 --- a/cli/command/system/info.go +++ b/cli/command/system/info.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package system diff --git a/cli/command/system/inspect.go b/cli/command/system/inspect.go index 8bd191e2813d..76cb4faaae9a 100644 --- a/cli/command/system/inspect.go +++ b/cli/command/system/inspect.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package system diff --git a/cli/command/system/prune.go b/cli/command/system/prune.go index 5f0896289b10..accbb8558ddc 100644 --- a/cli/command/system/prune.go +++ b/cli/command/system/prune.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package system diff --git a/cli/command/system/pruner/pruner.go b/cli/command/system/pruner/pruner.go index 90011eb85679..ab744c1adcd5 100644 --- a/cli/command/system/pruner/pruner.go +++ b/cli/command/system/pruner/pruner.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 // Package pruner registers "prune" functions to be included as part of // "docker system prune". diff --git a/cli/command/telemetry_docker.go b/cli/command/telemetry_docker.go index f0a43a4259b2..0cd37b3a1cb7 100644 --- a/cli/command/telemetry_docker.go +++ b/cli/command/telemetry_docker.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package command diff --git a/cli/command/utils.go b/cli/command/utils.go index dcbeed2f7191..bf7638f37b3c 100644 --- a/cli/command/utils.go +++ b/cli/command/utils.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package command diff --git a/cli/command/volume/create.go b/cli/command/volume/create.go index a0405c97707d..dacd382d2f7f 100644 --- a/cli/command/volume/create.go +++ b/cli/command/volume/create.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package volume diff --git a/cli/command/volume/create_test.go b/cli/command/volume/create_test.go index 8adc3327a748..8992950951ef 100644 --- a/cli/command/volume/create_test.go +++ b/cli/command/volume/create_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package volume diff --git a/cli/command/volume/inspect.go b/cli/command/volume/inspect.go index 9b06a3491dfd..54a9f63ca9d0 100644 --- a/cli/command/volume/inspect.go +++ b/cli/command/volume/inspect.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package volume diff --git a/cli/compose/convert/service.go b/cli/compose/convert/service.go index f12bd821a92a..b67d6ae61029 100644 --- a/cli/compose/convert/service.go +++ b/cli/compose/convert/service.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package convert diff --git a/cli/compose/interpolation/interpolation.go b/cli/compose/interpolation/interpolation.go index 25fafdd44cc6..0965b436cf36 100644 --- a/cli/compose/interpolation/interpolation.go +++ b/cli/compose/interpolation/interpolation.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package interpolation diff --git a/cli/compose/interpolation/interpolation_test.go b/cli/compose/interpolation/interpolation_test.go index 9f4ae5d1d20b..24018245190d 100644 --- a/cli/compose/interpolation/interpolation_test.go +++ b/cli/compose/interpolation/interpolation_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package interpolation diff --git a/cli/compose/loader/full-struct_test.go b/cli/compose/loader/full-struct_test.go index 5d420c872bcf..62defa9cc3ca 100644 --- a/cli/compose/loader/full-struct_test.go +++ b/cli/compose/loader/full-struct_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package loader diff --git a/cli/compose/loader/interpolate.go b/cli/compose/loader/interpolate.go index edacd4f831ed..3eee05679e78 100644 --- a/cli/compose/loader/interpolate.go +++ b/cli/compose/loader/interpolate.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package loader diff --git a/cli/compose/loader/loader.go b/cli/compose/loader/loader.go index eec1967090bf..0ddebce78543 100644 --- a/cli/compose/loader/loader.go +++ b/cli/compose/loader/loader.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package loader diff --git a/cli/compose/loader/loader_test.go b/cli/compose/loader/loader_test.go index cb2c9f20a191..8df5d150934d 100644 --- a/cli/compose/loader/loader_test.go +++ b/cli/compose/loader/loader_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package loader diff --git a/cli/compose/loader/merge.go b/cli/compose/loader/merge.go index e69787cfac40..9d8da3c6d81b 100644 --- a/cli/compose/loader/merge.go +++ b/cli/compose/loader/merge.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package loader diff --git a/cli/compose/loader/merge_test.go b/cli/compose/loader/merge_test.go index 03040cb44416..11c1e888ead2 100644 --- a/cli/compose/loader/merge_test.go +++ b/cli/compose/loader/merge_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package loader diff --git a/cli/compose/schema/schema.go b/cli/compose/schema/schema.go index ea8543a85957..394d8f06b3a9 100644 --- a/cli/compose/schema/schema.go +++ b/cli/compose/schema/schema.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package schema diff --git a/cli/compose/schema/schema_test.go b/cli/compose/schema/schema_test.go index 8d039a6a8ccb..c64a799ee087 100644 --- a/cli/compose/schema/schema_test.go +++ b/cli/compose/schema/schema_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package schema diff --git a/cli/compose/template/template.go b/cli/compose/template/template.go index 1a32b90bd973..1bceadd9e313 100644 --- a/cli/compose/template/template.go +++ b/cli/compose/template/template.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package template diff --git a/cli/compose/template/template_test.go b/cli/compose/template/template_test.go index 2ae3baaa4816..2286ef7a2fe0 100644 --- a/cli/compose/template/template_test.go +++ b/cli/compose/template/template_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package template diff --git a/cli/compose/types/types.go b/cli/compose/types/types.go index 83d72423fdf4..6a7b41fbb5d5 100644 --- a/cli/compose/types/types.go +++ b/cli/compose/types/types.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package types diff --git a/cli/config/configfile/file.go b/cli/config/configfile/file.go index 246f23e983d8..1a0e5b46cad6 100644 --- a/cli/config/configfile/file.go +++ b/cli/config/configfile/file.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package configfile diff --git a/cli/config/memorystore/store.go b/cli/config/memorystore/store.go index f8ec62b95a8e..44523d392ba8 100644 --- a/cli/config/memorystore/store.go +++ b/cli/config/memorystore/store.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package memorystore diff --git a/cli/connhelper/connhelper.go b/cli/connhelper/connhelper.go index 38e9a2d72b0b..8d97a2a40b7f 100644 --- a/cli/connhelper/connhelper.go +++ b/cli/connhelper/connhelper.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 // Package connhelper provides helpers for connecting to a remote daemon host with custom logic. package connhelper diff --git a/cli/context/store/metadata_test.go b/cli/context/store/metadata_test.go index ac60d9073bae..aff59820926f 100644 --- a/cli/context/store/metadata_test.go +++ b/cli/context/store/metadata_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package store diff --git a/cli/context/store/metadatastore.go b/cli/context/store/metadatastore.go index ecef656d89ac..8703e1c6c0d7 100644 --- a/cli/context/store/metadatastore.go +++ b/cli/context/store/metadatastore.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package store diff --git a/cli/context/store/store.go b/cli/context/store/store.go index f73b710c50cc..2b8b5c311478 100644 --- a/cli/context/store/store.go +++ b/cli/context/store/store.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package store diff --git a/cli/context/store/store_test.go b/cli/context/store/store_test.go index 4603bde6056f..20d0ef6463f6 100644 --- a/cli/context/store/store_test.go +++ b/cli/context/store/store_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package store diff --git a/cli/context/store/storeconfig.go b/cli/context/store/storeconfig.go index 1b7f33106dae..4b42e7377931 100644 --- a/cli/context/store/storeconfig.go +++ b/cli/context/store/storeconfig.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package store diff --git a/cli/context/store/storeconfig_test.go b/cli/context/store/storeconfig_test.go index a805cef1a777..840d4ee53b21 100644 --- a/cli/context/store/storeconfig_test.go +++ b/cli/context/store/storeconfig_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package store diff --git a/cmd/docker-trust/internal/registry/config.go b/cmd/docker-trust/internal/registry/config.go index 07237020e6a5..e753fd11aff5 100644 --- a/cmd/docker-trust/internal/registry/config.go +++ b/cmd/docker-trust/internal/registry/config.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package registry diff --git a/cmd/docker-trust/internal/registry/errors.go b/cmd/docker-trust/internal/registry/errors.go index 06533446a9c0..a9e75dbdd9ec 100644 --- a/cmd/docker-trust/internal/registry/errors.go +++ b/cmd/docker-trust/internal/registry/errors.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package registry diff --git a/cmd/docker-trust/trust/inspect.go b/cmd/docker-trust/trust/inspect.go index 5578b4b00975..c7688e50b239 100644 --- a/cmd/docker-trust/trust/inspect.go +++ b/cmd/docker-trust/trust/inspect.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package trust diff --git a/cmd/docker/builder_test.go b/cmd/docker/builder_test.go index 75b94e3fa919..a23b52b92219 100644 --- a/cmd/docker/builder_test.go +++ b/cmd/docker/builder_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package main diff --git a/cmd/docker/docker.go b/cmd/docker/docker.go index 4936f2b28e48..672e77b42dcb 100644 --- a/cmd/docker/docker.go +++ b/cmd/docker/docker.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package main diff --git a/internal/oauth/api/api.go b/internal/oauth/api/api.go index 13d107db6973..f0d744da3cc1 100644 --- a/internal/oauth/api/api.go +++ b/internal/oauth/api/api.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package api diff --git a/internal/registry/config.go b/internal/registry/config.go index ef68ebf8b421..11d6c9562502 100644 --- a/internal/registry/config.go +++ b/internal/registry/config.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package registry diff --git a/internal/registry/errors.go b/internal/registry/errors.go index 05638eb7088a..589831bf0565 100644 --- a/internal/registry/errors.go +++ b/internal/registry/errors.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package registry diff --git a/internal/test/strings.go b/internal/test/strings.go index 2bbae223178b..0532de8a037b 100644 --- a/internal/test/strings.go +++ b/internal/test/strings.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package test diff --git a/internal/tui/chip.go b/internal/tui/chip.go index c48158e75d07..477d43103b80 100644 --- a/internal/tui/chip.go +++ b/internal/tui/chip.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package tui diff --git a/internal/tui/colors.go b/internal/tui/colors.go index 6f1d8e6b797f..854e55ecd0c3 100644 --- a/internal/tui/colors.go +++ b/internal/tui/colors.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package tui diff --git a/internal/tui/count.go b/internal/tui/count.go index a626b24f83dd..303d650e5113 100644 --- a/internal/tui/count.go +++ b/internal/tui/count.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package tui diff --git a/internal/tui/note.go b/internal/tui/note.go index 759d8d0e295b..83f1f621e912 100644 --- a/internal/tui/note.go +++ b/internal/tui/note.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package tui diff --git a/internal/tui/output.go b/internal/tui/output.go index 34bc13a3a09e..1776640af517 100644 --- a/internal/tui/output.go +++ b/internal/tui/output.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package tui diff --git a/internal/tui/str.go b/internal/tui/str.go index 82fc59f1caec..9d50f7bd369f 100644 --- a/internal/tui/str.go +++ b/internal/tui/str.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package tui diff --git a/internal/volumespec/volumespec.go b/internal/volumespec/volumespec.go index cb468d0d414e..fcc5aa823b7f 100644 --- a/internal/volumespec/volumespec.go +++ b/internal/volumespec/volumespec.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package volumespec diff --git a/opts/opts.go b/opts/opts.go index 142740bf77b8..2e0adac6e0db 100644 --- a/opts/opts.go +++ b/opts/opts.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package opts diff --git a/opts/swarmopts/port.go b/opts/swarmopts/port.go index 839d058f335e..2ed10bb2dd94 100644 --- a/opts/swarmopts/port.go +++ b/opts/swarmopts/port.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package swarmopts diff --git a/opts/swarmopts/port_test.go b/opts/swarmopts/port_test.go index 4aa7f702d71d..12eb7b653418 100644 --- a/opts/swarmopts/port_test.go +++ b/opts/swarmopts/port_test.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package swarmopts diff --git a/templates/templates.go b/templates/templates.go index 1145e82c82ad..e156ca57514f 100644 --- a/templates/templates.go +++ b/templates/templates.go @@ -1,5 +1,5 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: -//go:build go1.24 +//go:build go1.25 package templates diff --git a/vendor.mod b/vendor.mod index b97eb6108f48..c766b7ba8793 100644 --- a/vendor.mod +++ b/vendor.mod @@ -4,7 +4,7 @@ module github.com/docker/cli // There is no 'go.mod' file, as that would imply opting in for all the rules // around SemVer, which this repo cannot abide by as it uses CalVer. -go 1.24.0 +go 1.25.0 require ( dario.cat/mergo v1.0.2 From bf6a1e1fcf581c90c0aeba5f6162d662b69cd24e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 17 Mar 2026 19:24:21 +0100 Subject: [PATCH 2/2] cli-plugins/socket: modernize Signed-off-by: Sebastiaan van Stijn --- cli-plugins/socket/socket_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cli-plugins/socket/socket_test.go b/cli-plugins/socket/socket_test.go index 9d609880891a..543f6269ab4d 100644 --- a/cli-plugins/socket/socket_test.go +++ b/cli-plugins/socket/socket_test.go @@ -54,9 +54,9 @@ func TestPluginServer(t *testing.T) { }) t.Run("allows reconnects", func(t *testing.T) { - var calls int32 + var calls atomic.Int32 h := func(_ net.Conn) { - atomic.AddInt32(&calls, 1) + calls.Add(1) } srv, err := NewPluginServer(h) @@ -70,7 +70,7 @@ func TestPluginServer(t *testing.T) { waitForCalls := func(n int) { poll.WaitOn(t, func(t poll.LogT) poll.Result { - if atomic.LoadInt32(&calls) == int32(n) { + if calls.Load() == int32(n) { return poll.Success() } return poll.Continue("waiting for handler to be called")