Rename make tidy to make vendor in main Makefile

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,14 @@ 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: 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:
 	@$(MAKE) -C common tidy
 	@$(MAKE) -C image tidy
 	@$(MAKE) -C storage tidy
+	$(GO) work vendor
+	$(GO) work sync

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 ]]

vendor/modules.txt

@@ -52,8 +52,6 @@ github.com/containerd/log
 # github.com/containerd/platforms v0.2.1
 ## explicit; go 1.20
 github.com/containerd/platforms
-# github.com/containerd/stargz-snapshotter/estargz v0.17.0
-## explicit; go 1.24.0
 # github.com/containerd/stargz-snapshotter/estargz v0.18.0
 ## explicit; go 1.24.0
 github.com/containerd/stargz-snapshotter/estargz
@@ -249,8 +247,6 @@ github.com/jinzhu/copier
 # github.com/json-iterator/go v1.1.12
 ## explicit; go 1.12
 github.com/json-iterator/go
-# github.com/klauspost/compress v1.18.0
-## explicit; go 1.23
 # github.com/klauspost/compress v1.18.1
 ## explicit; go 1.23
 github.com/klauspost/compress
@@ -508,8 +504,6 @@ github.com/ulikunitz/xz
 github.com/ulikunitz/xz/internal/hash
 github.com/ulikunitz/xz/internal/xlog
 github.com/ulikunitz/xz/lzma
-# github.com/vbatts/tar-split v0.12.1
-## explicit; go 1.17
 # github.com/vbatts/tar-split v0.12.2
 ## explicit; go 1.17
 github.com/vbatts/tar-split/archive/tar