Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

docs: Fix link in README #189

Merged
merged 1 commit into from
Oct 25, 2018
Merged

Conversation

ygefen
Copy link
Contributor

@ygefen ygefen commented Oct 23, 2018

Correct rootfs builder link in the image builder README.

Fixes #185.

Signed-off-by: Yonatan Gefen yoni.gefen@gmail.com

@jodh-intel
Copy link
Contributor

Hi @ygefen - thanks for persisting here! 😄

I'm afraid that Travis is still failing so you may have caught it at the wrong time. The failure is unrelated to your change but please can you rebase and re-push again:

$ git checkout master
$ git pull
$ git checkout doc-patch
$ git rebase -i master
$ git push -f

Note that you don't need to close this PR and open a new one - just do a force re-push as shown above:

Also, pullapprove is complaining about your commit. I think this is since the email address you've specified in the commit doesn't match your default github email address.

I appreciate this is a small fix and this is a bit of work all for a 1 byte change. However, we do value every contribution!

Correct rootfs builder link in the image builder README.

Fixes kata-containers#185.

Signed-off-by: Yonatan Gefen <yoni.gefen@gmail.com>
@ygefen
Copy link
Contributor Author

ygefen commented Oct 24, 2018

Thank you for guiding me through this, regardless of how minor of a fix it is.
git log indicates that I already performed a rebase properly.
I think that the issue was that I committed as a different user mistakenly. I have amended the author of the commit to be @ygefen. Hopefully this fixes the Travis issue.

@ygefen
Copy link
Contributor Author

ygefen commented Oct 24, 2018

Hmm, seems to fail again. But I'm pretty sure I rebased properly, could I have made a mistake?

@grahamwhaley
Copy link
Contributor

hi @ygefen hmm, yeah, that is still failing on the xurls item we fixed yesterday over in the tests repo... I have a feeling it could be travis getting in a twist here. It looks to me that you did push a commit update (new SHA), so I would have thought that would have cleared it :-(

package mvdan.cc/xurls/v2: cannot find package "mvdan.cc/xurls/v2" in any of:
	/home/travis/.gimme/versions/go1.7.4.linux.amd64/src/mvdan.cc/xurls/v2 (from $GOROOT)
	/home/travis/gopath/src/mvdan.cc/xurls/v2 (from $GOPATH)

In this instance, we may have to do a hand-review and then force merge it in - let me have a peek at the code to review, and /cc @chavafg in case he has some ideas.

Copy link
Contributor

@grahamwhaley grahamwhaley left a comment

Choose a reason for hiding this comment

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

lgtm
:-)

@ygefen
Copy link
Contributor Author

ygefen commented Oct 24, 2018

If it's easier/cleaner I can redo the fork, branch, & PR so that you don't have to bypass your CI. It should only take me a minute given the simplicity of this change.

@jodh-intel
Copy link
Contributor

Hi @ygefen - thanks for updating!

The Travis issue is rather subtle and since it has nothing to do with your fix, I'm going to merge this PR.

If you want to know the details, the problem is that the osbuilder repo is not setup as a golang project. Due to this, Travis installs the default version of golang which is too old for the xurls utility we use for all our repos CI tests in https://github.com/kata-containers/tests/blob/master/.ci/static-checks.sh.

For the osbuilder repo, we have two options:

@jodh-intel jodh-intel merged commit bdec513 into kata-containers:master Oct 25, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants