Skip to content

Re-enable vendoring#410

Merged
mtrmac merged 5 commits into
podman-container-tools:mainfrom
jankaluza:vendor-2
Oct 30, 2025
Merged

Re-enable vendoring#410
mtrmac merged 5 commits into
podman-container-tools:mainfrom
jankaluza:vendor-2

Conversation

@jankaluza

Copy link
Copy Markdown
Contributor

The Renovate PR to support top-level vendor directory is merged and should be deployed in the production.

It should be safe to re-enable the vendoring now.

@jankaluza

Copy link
Copy Markdown
Contributor Author

This is an example of Renovate PR opened in my fork with this PR applied: jankaluza#2

@jankaluza

Copy link
Copy Markdown
Contributor Author

Second commit skips the codespell for the ./vendor.

@Luap99 Luap99 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to update the Makefiles to rename tidy to vendor and do the go work vendor step in the Makefiles and I guess we want the go work sync as well added to the top level Makefile. And then update the go-tidy github action to run the make vendor instead

@github-actions github-actions Bot added storage Related to "storage" package common Related to "common" package image Related to "image" package labels Oct 22, 2025
@jankaluza

Copy link
Copy Markdown
Contributor Author

@Luap99 , done in the third commit. I also renamed the tidy-in-container to vendor-in-container, but I did not find any place where this is executed - probably only manually?

@Luap99 Luap99 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, @mtrmac PTAL

@mtrmac mtrmac left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, makes sense overall.

(For the record, AFAICT we need the vendor step because Renovate only does go work sync if vendoring is enabled, per #291 (comment) .)

Comment thread common/Makefile Outdated
The Renovate PR to support top-level vendor directory is merged and
should be deployed in the production.

It should be safe to re-enable the vendoring now.

Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
We do not want to check the spelling in the code we do not own.

Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
And also run the `go work sync` in the end of the main Makefile.

Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
@jankaluza jankaluza force-pushed the vendor-2 branch 2 times, most recently from 83aaec1 to af0fbec Compare October 24, 2025 09:54
Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
@jankaluza

Copy link
Copy Markdown
Contributor Author

I also had to disable the git-validation for the ./vendor directory, otherwise it failed for some trailing white-spaces in the files in the ./vendor directory which are out of our control. This is done in the last commit.

@mtrmac mtrmac left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@mtrmac mtrmac merged commit d9c64b6 into podman-container-tools:main Oct 30, 2025
38 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

common Related to "common" package image Related to "image" package storage Related to "storage" package

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants