Merge pull request #24403 from Luap99/tools-vendor

go.mod vendor: ensure we never have the toolchain directive set

Makefile

@@ -348,6 +348,7 @@ vendor:
 	$(GO) mod tidy
 	$(GO) mod vendor
 	$(GO) mod verify
+	$(GO) mod edit -toolchain none
 
 
 # We define *-in-container targets for the following make targets. This allow the targets to be run in a container.

contrib/cirrus/postbuild.sh

@@ -32,7 +32,8 @@ cd $CIRRUS_WORKING_DIR
 
 # Note, make completions and make vendor will already be run in _run_build()
 # so do not run them again for no reason. This just makes CI slower.
-SUGGESTION="run 'make vendor' or 'make completions' and commit all changes" ./hack/tree_status.sh
+showrun make -C test/tools vendor
+SUGGESTION="run 'make vendor', 'make -C test/tools vendor' and 'make completions' and commit all changes" ./hack/tree_status.sh
 
 showrun make .install.goimports
 showrun make generate-bindings

go.mod

@@ -1,6 +1,7 @@
 module github.com/containers/podman/v5
 
-// Warning: Ensure the "go" and "toolchain" versions match exactly to prevent unwanted auto-updates
+// Warning: if there is a "toolchain" directive anywhere in this file (and most of the
+// time there shouldn't be), its version must be an exact match to the "go" directive.
 
 go 1.22.6
 

test/tools/Makefile

@@ -12,6 +12,7 @@ vendor:
 	$(GO) mod tidy
 	$(GO) mod vendor
 	$(GO) mod verify
+	$(GO) mod edit -toolchain none
 
 .PHONY: clean
 clean:

test/tools/go.mod

@@ -1,8 +1,9 @@
 module github.com/containers/podman/test/tools
 
-go 1.22.0
+// Warning: if there is a "toolchain" directive anywhere in this file (and most of the
+// time there shouldn't be), its version must be an exact match to the "go" directive.
 
-toolchain go1.22.7
+go 1.22.0
 
 require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.5