diff mbox

[ovs-dev] travis: Fix build on Travis by installing new-enough docutils.

Message ID 20170320183122.29922-1-blp@ovn.org
State Accepted
Headers show

Commit Message

Ben Pfaff March 20, 2017, 6:31 p.m. UTC
This yields a clean build:
https://travis-ci.org/blp/ovs-reviews/builds/213085784

Suggested-by: Ilya Maximets <i.maximets@samsung.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
---
 .travis/linux-prepare.sh | 1 +
 .travis/osx-prepare.sh   | 1 +
 2 files changed, 2 insertions(+)

Comments

Lance Richardson March 20, 2017, 6:38 p.m. UTC | #1
> From: "Ben Pfaff" <blp@ovn.org>
> To: dev@openvswitch.org
> Cc: "Ilya Maximets" <i.maximets@samsung.com>, "Ben Pfaff" <blp@ovn.org>
> Sent: Monday, March 20, 2017 2:31:22 PM
> Subject: [ovs-dev] [PATCH] travis: Fix build on Travis by installing	new-enough docutils.
> 
> This yields a clean build:
> https://travis-ci.org/blp/ovs-reviews/builds/213085784
> 
> Suggested-by: Ilya Maximets <i.maximets@samsung.com>
> Signed-off-by: Ben Pfaff <blp@ovn.org>
> ---
>  .travis/linux-prepare.sh | 1 +
>  .travis/osx-prepare.sh   | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/.travis/linux-prepare.sh b/.travis/linux-prepare.sh
> index 1d0f75c65d48..fa30972bdbfd 100755
> --- a/.travis/linux-prepare.sh
> +++ b/.travis/linux-prepare.sh
> @@ -4,3 +4,4 @@ git clone
> git://git.kernel.org/pub/scm/devel/sparse/chrisl/sparse.git
>  cd sparse && make && make install && cd ..
>  
>  pip install --disable-pip-version-check --user six flake8 hacking
> +pip install --user --upgrade docutils
> diff --git a/.travis/osx-prepare.sh b/.travis/osx-prepare.sh
> index 611c0709d760..25a65e26090a 100755
> --- a/.travis/osx-prepare.sh
> +++ b/.travis/osx-prepare.sh
> @@ -1,5 +1,6 @@
>  #!/bin/bash
>  set -ev
>  pip install --user six
> +pip install --user --upgrade docutils
>  
>  brew uninstall libtool && brew install libtool || true
> --

If it works, it works... LGTM

Acked-by: Lance Richardson <lrichard@redhat.com>
Ben Pfaff March 20, 2017, 6:42 p.m. UTC | #2
On Mon, Mar 20, 2017 at 02:38:08PM -0400, Lance Richardson wrote:
> > From: "Ben Pfaff" <blp@ovn.org>
> > To: dev@openvswitch.org
> > Cc: "Ilya Maximets" <i.maximets@samsung.com>, "Ben Pfaff" <blp@ovn.org>
> > Sent: Monday, March 20, 2017 2:31:22 PM
> > Subject: [ovs-dev] [PATCH] travis: Fix build on Travis by installing	new-enough docutils.
> > 
> > This yields a clean build:
> > https://travis-ci.org/blp/ovs-reviews/builds/213085784
> > 
> > Suggested-by: Ilya Maximets <i.maximets@samsung.com>
> > Signed-off-by: Ben Pfaff <blp@ovn.org>
> > ---
> >  .travis/linux-prepare.sh | 1 +
> >  .travis/osx-prepare.sh   | 1 +
> >  2 files changed, 2 insertions(+)
> > 
> > diff --git a/.travis/linux-prepare.sh b/.travis/linux-prepare.sh
> > index 1d0f75c65d48..fa30972bdbfd 100755
> > --- a/.travis/linux-prepare.sh
> > +++ b/.travis/linux-prepare.sh
> > @@ -4,3 +4,4 @@ git clone
> > git://git.kernel.org/pub/scm/devel/sparse/chrisl/sparse.git
> >  cd sparse && make && make install && cd ..
> >  
> >  pip install --disable-pip-version-check --user six flake8 hacking
> > +pip install --user --upgrade docutils
> > diff --git a/.travis/osx-prepare.sh b/.travis/osx-prepare.sh
> > index 611c0709d760..25a65e26090a 100755
> > --- a/.travis/osx-prepare.sh
> > +++ b/.travis/osx-prepare.sh
> > @@ -1,5 +1,6 @@
> >  #!/bin/bash
> >  set -ev
> >  pip install --user six
> > +pip install --user --upgrade docutils
> >  
> >  brew uninstall libtool && brew install libtool || true
> > --
> 
> If it works, it works... LGTM
> 
> Acked-by: Lance Richardson <lrichard@redhat.com>

Thanks, applied to master.
diff mbox

Patch

diff --git a/.travis/linux-prepare.sh b/.travis/linux-prepare.sh
index 1d0f75c65d48..fa30972bdbfd 100755
--- a/.travis/linux-prepare.sh
+++ b/.travis/linux-prepare.sh
@@ -4,3 +4,4 @@  git clone git://git.kernel.org/pub/scm/devel/sparse/chrisl/sparse.git
 cd sparse && make && make install && cd ..
 
 pip install --disable-pip-version-check --user six flake8 hacking
+pip install --user --upgrade docutils
diff --git a/.travis/osx-prepare.sh b/.travis/osx-prepare.sh
index 611c0709d760..25a65e26090a 100755
--- a/.travis/osx-prepare.sh
+++ b/.travis/osx-prepare.sh
@@ -1,5 +1,6 @@ 
 #!/bin/bash
 set -ev
 pip install --user six
+pip install --user --upgrade docutils
 
 brew uninstall libtool && brew install libtool || true