Skip to content
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

Merged
merged 1 commit into from
Oct 31, 2017

Conversation

mtrmac
Copy link
Collaborator

@mtrmac mtrmac commented Sep 26, 2017

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.

@runcom
Copy link
Member

runcom commented Sep 27, 2017

Looks ok but some check fails

@mtrmac
Copy link
Collaborator Author

mtrmac commented Sep 27, 2017

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 Sirupsen, with the duplicate sirupsen ignored. The checkout applies the diff, which removes Sirupsen (EDIT: the FS is case-preserving but case-insensitive, so removing sirupsen removes the other one), and there isn’t any logrus on the filesystem left.

A direct

 git clone -b single-logrus https://github.com/mtrmac/skopeo.git x

checks out the final state directly, with a sirupsen (lowercase only), and everything should work.

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).

@mtrmac
Copy link
Collaborator Author

mtrmac commented Sep 27, 2017

@runcom ?

@runcom
Copy link
Member

runcom commented Sep 27, 2017

So good to merge?!

@mtrmac
Copy link
Collaborator Author

mtrmac commented Sep 27, 2017

Yes, I think it is good enough. Up to you whether my reasoning is sound enough.

@runcom
Copy link
Member

runcom commented Sep 27, 2017

It seems like I don't have power to merge?!

@mtrmac
Copy link
Collaborator Author

mtrmac commented Sep 27, 2017

Me neither, and manual push is also refusing this:

remote: error: GH006: Protected branch update failed for refs/heads/master.
remote: error: Required status check "continuous-integration/travis-ci/pr" is failing.

I guess this is somewhere in the project settings.

@runcom
Copy link
Member

runcom commented Oct 21, 2017

@mtrmac ping

@mtrmac
Copy link
Collaborator Author

mtrmac commented Oct 21, 2017

@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.

@mtrmac
Copy link
Collaborator Author

mtrmac commented Oct 31, 2017

@runcom ping

@runcom
Copy link
Member

runcom commented Oct 31, 2017

I don't have power to merge unfortunately, @rhatdan maybe?

@rhatdan
Copy link
Member

rhatdan commented Oct 31, 2017

Nope not me

@runcom
Copy link
Member

runcom commented Oct 31, 2017

@jwhonce maybe? 👼

@runcom runcom merged commit bd07ffb into containers:master Oct 31, 2017
@mtrmac mtrmac deleted the single-logrus branch October 31, 2017 15:44
mtrmac added a commit to mtrmac/skopeo that referenced this pull request Nov 6, 2017
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>
mtrmac added a commit to mtrmac/skopeo that referenced this pull request Nov 6, 2017
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>
mtrmac added a commit to mtrmac/skopeo that referenced this pull request Nov 7, 2017
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>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 6, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants