Skip to content

Fix failing jruby tests, change default REDIS_BRANCH to 4.0 #761

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

Merged
merged 1 commit into from
May 25, 2018

Conversation

ajlai
Copy link
Contributor

@ajlai ajlai commented May 25, 2018

Fix: #756

jruby tests fail when using jruby_openssl 0.10.0 but not when using 0.9.21
This change adds 0.9.21 to the travis build matrix and sets 0.10.0 as an allowed failure.

This change also switches the default REDIS_BRANCH to stable since
the unstable branch of redis isn't always in a buildable state.

This change adds a Gemfile dependency for jruby_openssl <0.10.0

This change also switches the default REDIS_BRANCH to 4.0 since
the unstable branch of redis isn't always in a buildable state.

Also adds minor tweaks to how the tests are run due to minor issues with Gemfile / bundle usage.

Copy link
Collaborator

@byroot byroot left a comment

Choose a reason for hiding this comment

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

Thanks a lot for figuring this out.

Just a couple nitpicks because I would like to reduce the number of Travis jobs as much as possible. We already have 31 jobs on master and I'd rather get rid of some than add 3 more.

.travis.yml Outdated
# jruby-openssl 0.9.21 required tests have been added above in the include section.
- rvm: jruby-9.1.17.0
env: DRIVER=ruby REDIS_BRANCH=3.0
- rvm: jruby-9.1.17.0
Copy link
Collaborator

Choose a reason for hiding this comment

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

I don't think it's worth running test we know will fail. If the fix for the jruby test suite is to use jruby-openssl < 0.10 then let's add this to the Gemfile / gemspec and that's it.

.travis.yml Outdated
@@ -33,7 +33,7 @@ env:
- DRIVER=hiredis REDIS_BRANCH=3.2
- DRIVER=synchrony REDIS_BRANCH=3.0
- DRIVER=synchrony REDIS_BRANCH=3.2
- DRIVER=ruby REDIS_BRANCH=unstable
- DRIVER=ruby REDIS_BRANCH=stable
Copy link
Collaborator

Choose a reason for hiding this comment

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

In think the intent of building unstable was to test 4.0. The build matrix could simply be 3.0 3.2 4.0.

@ajlai ajlai force-pushed the fix-buggy-jruby-tests branch from 5faa6a2 to 9a7b303 Compare May 25, 2018 16:56
jruby tests fail when using jruby_openssl 0.10.0 but not when using 0.9.21
This change adds a Gemfile dependency for jruby_openssl <0.10.0

This change also switches the default REDIS_BRANCH to 4.0 since
the unstable branch of redis isn't always in a buildable state.

Also adds minor tweaks to how the tests are run due to minor issues with Gemfile usage.
@ajlai ajlai force-pushed the fix-buggy-jruby-tests branch from 9a7b303 to 775f860 Compare May 25, 2018 17:00
@ajlai ajlai changed the title Fix failing jruby tests, change default REDIS_BRANCH to stable Fix failing jruby tests, change default REDIS_BRANCH to 4.0 May 25, 2018
Copy link
Collaborator

@byroot byroot left a comment

Choose a reason for hiding this comment

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

Thanks a lot !

@byroot byroot merged commit bc80cb1 into redis:master May 25, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants