Rename make tidy to make vendor

And also run the `go work sync` in the end of the main Makefile.

Signed-off-by: Jan Kaluza <[email protected]>

Author: jankaluza

.cirrus.yml

@@ -79,10 +79,10 @@ storage_linux_testing: &linux_testing
         fingerprint_script: cat **/go.sum
         folder: $GOPATH/pkg/mod
         # Note the cache is populated the first time it is used with the given deps.
-        # But because each task might not download all he same deps force make tidy
+        # But because each task might not download all he same deps force make vendor
         # which downloads all deps for all modules. This is only run once when the
         # cache is created so it should not slow things down much.
-        populate_script: make tidy
+        populate_script: make vendor
 
     # Separate scripts for separate outputs, makes debugging easier.
     setup_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/setup.sh |& ${_TIMESTAMP}'

.github/workflows/validate.yml

@@ -87,7 +87,7 @@ jobs:
       # by default git-validation has some special github action handling but that seems broken.
       run: make .install.gitvalidation && git-validation -no-github
 
-  go-tidy:
+  go-vendor:
     runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v5
@@ -96,7 +96,7 @@ jobs:
         go-version: 1.25.x
         # See comment on lint task
         cache-dependency-path: "**/go.sum"
-    - name: tidy
-      run: make tidy
+    - name: vendor
+      run: make vendor
     - name: check if tree is clean
       run: hack/tree_status.sh

CONTRIBUTING_GO.md

@@ -48,7 +48,7 @@ $ make vendor
 
 If you are working in the [container-libs](https://github.com/containers/container-libs) monorepo use:
 ```
-make tidy
+make vendor
 ```
 This command syncs the dependency versions across all modules in the repo.
 

Makefile

@@ -49,12 +49,13 @@ lint: .install.golangci-lint
 	@$(MAKE) -C image lint
 	@$(MAKE) -C storage lint
 
-.PHONY: tidy-in-container
-tidy-in-container:
-	podman run --privileged --rm --env HOME=/root -v `pwd`:/src -w /src golang make tidy
-
-.PHONY: tidy
-tidy:
-	@$(MAKE) -C common tidy
-	@$(MAKE) -C image tidy
-	@$(MAKE) -C storage tidy
+.PHONY: vendor-in-container
+vendor-in-container:
+	podman run --privileged --rm --env HOME=/root -v `pwd`:/src -w /src golang make vendor
+
+.PHONY: vendor
+vendor:
+	@$(MAKE) -C common vendor
+	@$(MAKE) -C image vendor
+	@$(MAKE) -C storage vendor
+	$(GO) work sync

common/Makefile

@@ -78,13 +78,14 @@ lint:
 validate: lint
 	./tools/validate_seccomp.sh ./pkg/seccomp
 
-.PHONY: tidy-in-container
-tidy-in-container:
-	podman run --privileged --rm --env HOME=/root -v `pwd`:/src -w /src golang make tidy
+.PHONY: vendor-in-container
+vendor-in-container:
+	podman run --privileged --rm --env HOME=/root -v `pwd`:/src -w /src golang make vendor
 
-.PHONY: tidy
-tidy:
+.PHONY: vendor
+vendor:
 	$(GO) mod tidy
+	$(GO) work vendor
 	$(GO) mod verify
 	$(GO) mod edit -toolchain none
 

common/go.mod

@@ -64,7 +64,7 @@ require (
 	github.com/containerd/errdefs v1.0.0 // indirect
 	github.com/containerd/errdefs/pkg v0.3.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
-	github.com/containerd/stargz-snapshotter/estargz v0.17.0 // indirect
+	github.com/containerd/stargz-snapshotter/estargz v0.18.0 // indirect
 	github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
 	github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
@@ -85,7 +85,7 @@ require (
 	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/klauspost/compress v1.18.1 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
 	github.com/kr/fs v0.1.0 // indirect
 	github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec // indirect
@@ -113,7 +113,7 @@ require (
 	github.com/tchap/go-patricia/v2 v2.3.3 // indirect
 	github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
 	github.com/ulikunitz/xz v0.5.15 // indirect
-	github.com/vbatts/tar-split v0.12.1 // indirect
+	github.com/vbatts/tar-split v0.12.2 // indirect
 	github.com/vbauerster/mpb/v8 v8.10.2 // indirect
 	github.com/vishvananda/netns v0.0.5 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect

common/go.sum

@@ -41,8 +41,8 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
 github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
 github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw=
-github.com/containerd/stargz-snapshotter/estargz v0.17.0 h1:+TyQIsR/zSFI1Rm31EQBwpAA1ovYgIKHy7kctL3sLcE=
-github.com/containerd/stargz-snapshotter/estargz v0.17.0/go.mod h1:s06tWAiJcXQo9/8AReBCIo/QxcXFZ2n4qfsRnpl71SM=
+github.com/containerd/stargz-snapshotter/estargz v0.18.0 h1:Ny5yptQgEXSkDFKvlKJGTvf1YJ+4xD8V+hXqoRG0n74=
+github.com/containerd/stargz-snapshotter/estargz v0.18.0/go.mod h1:7hfU1BO2KB3axZl0dRQCdnHrIWw7TRDdK6L44Rdeuo0=
 github.com/containernetworking/cni v1.3.0 h1:v6EpN8RznAZj9765HhXQrtXgX+ECGebEYEmnuFjskwo=
 github.com/containernetworking/cni v1.3.0/go.mod h1:Bs8glZjjFfGPHMw6hQu82RUgEPNGEaBb9KS5KtNMnJ4=
 github.com/containernetworking/plugins v1.8.0 h1:WjGbV/0UQyo8A4qBsAh6GaDAtu1hevxVxsEuqtBqUFk=
@@ -139,8 +139,8 @@ github.com/joshdk/go-junit v1.0.0 h1:S86cUKIdwBHWwA6xCmFlf3RTLfVXYQfvanM5Uh+K6GE
 github.com/joshdk/go-junit v1.0.0/go.mod h1:TiiV0PqkaNfFXjEiyjWM3XXrhVyCa1K4Zfga6W52ung=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
-github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
+github.com/klauspost/compress v1.18.1 h1:bcSGx7UbpBqMChDtsF28Lw6v/G94LPrrbMbdC3JH2co=
+github.com/klauspost/compress v1.18.1/go.mod h1:ZQFFVG+MdnR0P+l6wpXgIL4NTtwiKIdBnrBd8Nrxr+0=
 github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
 github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
@@ -286,8 +286,8 @@ github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 h1:e/5i7d4oYZ+C
 github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399/go.mod h1:LdwHTNJT99C5fTAzDz0ud328OgXz+gierycbcIx2fRs=
 github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
 github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/vbatts/tar-split v0.12.1 h1:CqKoORW7BUWBe7UL/iqTVvkTBOF8UvOMKOIZykxnnbo=
-github.com/vbatts/tar-split v0.12.1/go.mod h1:eF6B6i6ftWQcDqEn3/iGFRFRo8cBIMSJVOpnNdfTMFA=
+github.com/vbatts/tar-split v0.12.2 h1:w/Y6tjxpeiFMR47yzZPlPj/FcPLpXbTUi/9H7d3CPa4=
+github.com/vbatts/tar-split v0.12.2/go.mod h1:eF6B6i6ftWQcDqEn3/iGFRFRo8cBIMSJVOpnNdfTMFA=
 github.com/vbauerster/mpb/v8 v8.10.2 h1:2uBykSHAYHekE11YvJhKxYmLATKHAGorZwFlyNw4hHM=
 github.com/vbauerster/mpb/v8 v8.10.2/go.mod h1:+Ja4P92E3/CorSZgfDtK46D7AVbDqmBQRTmyTqPElo0=
 github.com/vishvananda/netlink v1.3.1 h1:3AEMt62VKqz90r0tmNhog0r/PpWKmrEShJU0wJW6bV0=

hack/tree_status.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-SUGGESTION="${SUGGESTION:-run \"make tidy\" and commit all changes.}"
+SUGGESTION="${SUGGESTION:-run \"make vendor\" and commit all changes.}"
 
 STATUS=$(git status --porcelain)
 if [[ -z $STATUS ]]

image/Makefile

@@ -81,12 +81,13 @@ fmt:
 lint:
 	golangci-lint run --build-tags "$(BUILDTAGS)"
 
-.PHONY: tidy-in-container
-tidy-in-container:
-	podman run --privileged --rm --env HOME=/root -v `pwd`:/src -w /src golang make tidy
+.PHONY: vendor-in-container
+vendor-in-container:
+	podman run --privileged --rm --env HOME=/root -v `pwd`:/src -w /src golang make vendor
 
-.PHONY: tidy
-tidy:
+.PHONY: vendor
+vendor:
 	go mod tidy
+	go work vendor
 	go mod verify
 	go mod edit -toolchain none

storage/Makefile

@@ -72,12 +72,13 @@ lint:
 help: ## this help
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-z A-Z_-]+:.*?## / {gsub(" ",",",$$1);gsub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-21s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
 
-.PHONY: tidy-in-container
-tidy-in-container:
-	podman run --privileged --rm --env HOME=/root -v `pwd`:/src -w /src golang make tidy
+.PHONY: vendor-in-container
+vendor-in-container:
+	podman run --privileged --rm --env HOME=/root -v `pwd`:/src -w /src golang make vendor
 
-.PHONY: tidy
-tidy:
+.PHONY: vendor
+vendor:
 	$(GO) mod tidy
+	$(GO) work vendor
 	$(GO) mod verify
 	$(GO) mod edit -toolchain none