Update image-tools, and remove the duplicate Sirupsen/logrus vendor#426
Update image-tools, and remove the duplicate Sirupsen/logrus vendor#426runcom merged 1 commit intocontainers:masterfrom
Conversation
|
Looks ok but some check fails |
|
Yeah, on macOS (case-insensitive), because Travis does git clone --depth=50 https://github.com/projectatomic/skopeo.git projectatomic/skopeo
cd projectatomic/skopeo
git fetch origin +refs/pull/426/merge:
git checkout -qf FETCH_HEADThe initial clone is checked out as A direct git clone -b single-logrus https://github.com/mtrmac/skopeo.git xchecks out the final state directly, with a So, if it’s OK with you, let’s force merge this through (It does pass on Linux as is, at worst we would only break Mac again). |
|
@runcom ? |
|
So good to merge?! |
|
Yes, I think it is good enough. Up to you whether my reasoning is sound enough. |
|
It seems like I don't have power to merge?! |
|
Me neither, and manual push is also refusing this: I guess this is somewhere in the project settings. |
88cabae to
8982d4c
Compare
|
@mtrmac ping |
|
@runcom Rebased. The tests on macOS are still going to fail, as explained above, and you’ll need your admin permissions (if any) to override the tests and merge. |
|
@runcom ping |
|
I don't have power to merge unfortunately, @rhatdan maybe? |
|
Nope not me |
|
@jwhonce maybe? 👼 |
PR containers#440 reverted the vendor.conf edits of containers#426. This passed CI because the corresponding vendor/* subpackages were not modified. Restore the vendor.conf changes, and re-run full (vndr) to ensure the two are consistent again. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
PR containers#440 reverted the vendor.conf edits of containers#426. This passed CI because the corresponding vendor/* subpackages were not modified. Restore the vendor.conf changes, and re-run full (vndr) to ensure the two are consistent again. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
PR containers#440 reverted the vendor.conf edits of containers#426. This passed CI because the corresponding vendor/* subpackages were not modified. Restore the vendor.conf changes, and re-run full (vndr) to ensure the two are consistent again. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Now that opencontainers/image-tools#176 has been merged, we can stop carrying two
logruscheckouts.Also re-vendors other packages, now that we can :)
@runcom PTAL.