Makefile: set GOTOOLCHAIN=local

Set GOTOOLCHAIN=local for all make targets, and for renovate. Have the "vendor" target (and by extension, "vendor-in-container", which our validation in CI uses) clear any "toolchain" directive that might have been added to go.mod through manual invocations of the compiler. Signed-off-by: Nalin Dahyabhai <[email protected]>
containers · Apr 22, 2024 · ab791f3 · ab791f3
1 parent 6fab028
commit ab791f3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -56,4 +56,7 @@
     "**/tests/**"
   ],
 
+  "env": {
+    "GOTOOLCHAIN": "local"
+  }
 }
diff --git a/Makefile b/Makefile
@@ -1,4 +1,5 @@
 export GOPROXY=https://proxy.golang.org
+export GOTOOLCHAIN=local
 
 APPARMORTAG := $(shell hack/apparmor_tag.sh)
 STORAGETAGS := exclude_graphdriver_devicemapper $(shell ./btrfs_tag.sh) $(shell ./btrfs_installed_tag.sh) $(shell ./hack/libsubid_tag.sh)
@@ -209,6 +210,7 @@ vendor-in-container:
 
 .PHONY: vendor
 vendor:
+	if test -n $(strip $(shell go env GOTOOLCHAIN)); then go mod edit -toolchain none ; fi
 	GO111MODULE=on $(GO) mod tidy
 	GO111MODULE=on $(GO) mod vendor
 	GO111MODULE=on $(GO) mod verify