| Message ID | 20180521100346.48699-1-jason@perfinion.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Mon, May 21, 2018 at 12:03 PM, Jason Zaman <jason@perfinion.com> wrote: > > Ruby 2.5 is not installed by default, force reinstall with rvm > > Signed-off-by: Jason Zaman <jason@perfinion.com> > --- > > This passes on my repo: > https://travis-ci.org/perfinion/selinux/builds/381597252 This passes on my repo too, both without any modifications compared to upstream and with some modifications to Makefiles (I enabled more warning flags in my repo, like clang -Weverything, but they trigger some false positive depending on the compiler version, which is why I do not upstream these modifications). For the record, clang did not like the "__error__" attribute used by some Ruby headers (cf. https://travis-ci.org/fishilico/selinux/builds/381760812) and this is not an issue related to the project. Acked-by: Nicolas Iooss <nicolas.iooss@m4x.org> Thanks, Nicolas
On Mon, May 21, 2018 at 10:42:15PM +0200, Nicolas Iooss wrote: > On Mon, May 21, 2018 at 12:03 PM, Jason Zaman <jason@perfinion.com> wrote: > > > > Ruby 2.5 is not installed by default, force reinstall with rvm > > > > Signed-off-by: Jason Zaman <jason@perfinion.com> > > --- > > > > This passes on my repo: > > https://travis-ci.org/perfinion/selinux/builds/381597252 > > This passes on my repo too, both without any modifications compared to > upstream and with some modifications to Makefiles (I enabled more > warning flags in my repo, like clang -Weverything, but they trigger > some false positive depending on the compiler version, which is why I > do not upstream these modifications). For the record, clang did not > like the "__error__" attribute used by some Ruby headers (cf. > https://travis-ci.org/fishilico/selinux/builds/381760812) and this is > not an issue related to the project. Thats awesome! I was looking through your branch, you have a few things marked as not upstreamable (like the flake8 py linter) and a few asserts to silence the static analyzer. I don't see why those couldnt be upstreamed. we have the scripts/ dir with a couple things already, I would support putting more in there then you wouldnt have to maintain it on your own and keep rebasing and whatnot. And maybe the static analyzer isnt quite ready to upstream so fast, but I dont see problems with the fixes. eg this kind of stuff seems good: https://github.com/fishilico/selinux/commit/46b056fdbc90fcf8a22c77bc17b4a4ee77ee28eb > Acked-by: Nicolas Iooss <nicolas.iooss@m4x.org> Cool, i'll push it tmrr then :) -- Jason
diff --git a/.travis.yml b/.travis.yml index 63c7a544..823af7ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,29 +11,30 @@ compiler: env: matrix: # Test the last version of Python and Ruby together, with some linkers - - PYVER=python3.6 RUBYLIBVER=2.4 - - PYVER=python3.6 RUBYLIBVER=2.4 TEST_FLAGS_OVERRIDE=1 - - PYVER=python3.6 RUBYLIBVER=2.4 LINKER=gold - - PYVER=python3.6 RUBYLIBVER=2.4 LINKER=bfd + - PYVER=python3.6 RUBYLIBVER=2.5.1 + - PYVER=python3.6 RUBYLIBVER=2.5.1 TEST_FLAGS_OVERRIDE=1 + - PYVER=python3.6 RUBYLIBVER=2.5.1 LINKER=gold + - PYVER=python3.6 RUBYLIBVER=2.5.1 LINKER=bfd # Test several Python versions - - PYVER=python2.7 RUBYLIBVER=2.4 - - PYVER=python3.3 RUBYLIBVER=2.4 - - PYVER=python3.4 RUBYLIBVER=2.4 - - PYVER=python3.5 RUBYLIBVER=2.4 - - PYVER=pypy RUBYLIBVER=2.4 - - PYVER=pypy3 RUBYLIBVER=2.4 + - PYVER=python2.7 RUBYLIBVER=2.5.1 + - PYVER=python3.3 RUBYLIBVER=2.5.1 + - PYVER=python3.4 RUBYLIBVER=2.5.1 + - PYVER=python3.5 RUBYLIBVER=2.5.1 + - PYVER=pypy RUBYLIBVER=2.5.1 + - PYVER=pypy3 RUBYLIBVER=2.5.1 # Test several Ruby versions - - PYVER=python3.6 RUBYLIBVER=2.2 + - PYVER=python3.6 RUBYLIBVER=2.4 - PYVER=python3.6 RUBYLIBVER=2.3 + - PYVER=python3.6 RUBYLIBVER=2.2 matrix: exclude: - compiler: clang - env: PYVER=python3.6 RUBYLIBVER=2.4 LINKER=gold + env: PYVER=python3.6 RUBYLIBVER=2.5.1 LINKER=gold - compiler: clang - env: PYVER=python3.6 RUBYLIBVER=2.4 LINKER=bfd + env: PYVER=python3.6 RUBYLIBVER=2.5.1 LINKER=bfd # Use Travis-CI Ubuntu 14.04 Trusty infrastructure, "full image" variant sudo: required @@ -98,6 +99,7 @@ before_script: - if echo "$PYVER" | grep -q pypy ; then export PYINC=-I$($PYTHON -c 'import sys;print(sys.prefix)')/include PYLIBS= ; fi # Find the Ruby executable with version $RUBYLIBVER + - rvm reinstall ruby-$RUBYLIBVER --binary - export RUBY="$(ls -d -1 "$HOME/.rvm/rubies/ruby-$RUBYLIBVER"*/bin/ruby | head -n 1)" # Set the linker in $CC so that it gets used everywhere
Ruby 2.5 is not installed by default, force reinstall with rvm Signed-off-by: Jason Zaman <jason@perfinion.com> --- This passes on my repo: https://travis-ci.org/perfinion/selinux/builds/381597252 .travis.yml | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-)