Vendor also the current c/storage and c/common into Skopeo#304
Vendor also the current c/storage and c/common into Skopeo#304Luap99 merged 1 commit intocontainers:mainfrom
Conversation
image/contrib/cirrus/runner.sh
Outdated
| msg "Replacing upstream skopeo $SKOPEO_CI_BRANCH branch $project_module module" | ||
| go mod edit -replace ${project_module}=$GOSRC | ||
| for subdir in storage image common; do | ||
| project_module=$(sed -n 's/^module //p' < "$GOSRC/$subdir/go.mod") |
There was a problem hiding this comment.
This is not the proper way to parse the information, but I can’t quickly find a clean way.
The previous cd $dir; go list . doesn’t work in common which has no code in the root of the directory hierarchy.
cd $dir; go list -m looks like it should work, but in all three directories it lists all of …/common, …/image/v5, …/storage, always in that order. That’s… sort of the data we want, but I don’t understand why it is listing three items, so I’m not comfortable on relying on it.
The sed does not handle comments and other syntax, but at least it’s likely to fail if something unexpected happens.
There was a problem hiding this comment.
Does the sed gain us anything here, might as well hard code the go.podman.io module paths I think to not have to worry about the go commands behaviours.
Right now, the main thing I can see is the /v5 part of c/image — and that iterating over tuples of (module name, path) is a bit awkward in shell. (Hypothetically, I suppose the vanity names for various libraries in the common-libs repo might use entirely different domains, or something, but that’s not worth worrying about.)
There was a problem hiding this comment.
… Ultimately just hard-coding 3 go mod edit lines might be simplest.
There was a problem hiding this comment.
… Ultimately just hard-coding 3 go mod edit lines might be simplest.
yeah agree
25f0186 to
8b6e19d
Compare
|
Packit jobs failed. @containers/packit-build please check. |
3 similar comments
|
Packit jobs failed. @containers/packit-build please check. |
|
Packit jobs failed. @containers/packit-build please check. |
|
Packit jobs failed. @containers/packit-build please check. |
This is ~necessary to benefit from the monorepo, so that interdependent updates to c/storage and c/image are tested as a single unit by the Skopeo test. Proven in containers#299 . Signed-off-by: Miloslav Trmač <mitr@redhat.com>
8b6e19d to
595243d
Compare
This is ~necessary to benefit from the monorepo, so that interdependent updates to c/storage and c/image are tested as a single unit by the Skopeo test.
Proven in #299 .