-
Notifications
You must be signed in to change notification settings - Fork 758
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update image-tools, and remove the duplicate Sirupsen/logrus vendor #426
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_HEAD The initial clone is checked out as A direct git clone -b single-logrus https://github.com/mtrmac/skopeo.git x checks 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
logrus
checkouts.Also re-vendors other packages, now that we can :)
@runcom PTAL.