Skip to content

Commit

Permalink
reorganized gemfiles for travis, removed jruby 9.2 tests and added CA…
Browse files Browse the repository at this point in the history
…VEATS and removed redundant ||=nil
  • Loading branch information
ddnexus committed Oct 12, 2020
1 parent 619d7d1 commit 261c6a1
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
docs/* linguist-documentation
test/ci-gemfiles/* linguist-language=Ruby
ci-gemfiles/* linguist-language=Ruby
20 changes: 10 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
language: ruby
cache: bundler
gemfile: gemfiles/ruby-others
gemfile: ci-gemfiles/ruby-others
script:
- bundle exec rake default
after_success:
Expand All @@ -12,17 +12,17 @@ matrix:

# ruby
- rvm: 1.9
gemfile: gemfiles/ruby-1.9
gemfile: ci-gemfiles/ruby-1.9
- rvm: 2.0
gemfile: gemfiles/ruby-2.0
gemfile: ci-gemfiles/ruby-2.0
env:
- ENABLE_OJ=true
- rvm: 2.1
gemfile: gemfiles/ruby-2.0
gemfile: ci-gemfiles/ruby-2.0
env:
- ENABLE_OJ=true
- rvm: 2.2
gemfile: gemfiles/ruby-2.0
gemfile: ci-gemfiles/ruby-2.0
env:
- ENABLE_OJ=true
- rvm: 2.3
Expand All @@ -35,11 +35,11 @@ matrix:
env:
- ENABLE_OJ=true
- rvm: 2.6
gemfile: gemfiles/ruby-latest
gemfile: ci-gemfiles/ruby-latest
env:
- ENABLE_OJ=true
- rvm: 2.7
gemfile: gemfiles/ruby-latest
gemfile: ci-gemfiles/ruby-latest
env:
- ENABLE_OJ=true
- RUN_SIMPLECOV=true
Expand All @@ -48,9 +48,9 @@ matrix:

# jruby
- rvm: jruby-1.7
gemfile: gemfiles/ruby-1.9
gemfile: ci-gemfiles/ruby-1.9
- rvm: jruby-9.0
gemfile: gemfiles/ruby-2.0
gemfile: ci-gemfiles/ruby-2.0
- rvm: jruby-9.1
- rvm: jruby-9.2
#- rvm: jruby-9.2

8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,14 @@ Many thanks to:
- [The Contributors](https://github.com/ddnexus/pagy/graphs/contributors) for all the smart code and suggestions merged in the project
- [The Stargazers](https://github.com/ddnexus/pagy/stargazers) for showing their support

## Caveats

### Jruby 9.2+ random exceptions in tests

One of the latest jruby version (9.2.+) raises a couple of random `Java::JavaLang::NullPointerException` while running the frontend tests in Travis. That doesn't happen with previous versions.

It might be just another jruby bug or a number of possible things related to the tests or the Travis build that might or might not affect real usage. I am done with debugging jruby weirdness, so I am not going to investigate it further. If you get any info about it, please, create an issue.

## License

This project is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/pagy/frontend.rb
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def pagy_link_proc(pagy, link_extra='')
end

# Similar to I18n.t: just ~18x faster using ~10x less memory
def pagy_t(path, vars={}) Pagy::I18n.t(@pagy_locale||=nil, path, vars) end
def pagy_t(path, vars={}) Pagy::I18n.t(@pagy_locale, path, vars) end

end
end

0 comments on commit 261c6a1

Please sign in to comment.