Skip to content

Commit

Permalink
try to fix bundler issues
Browse files Browse the repository at this point in the history
  • Loading branch information
grosser committed Mar 9, 2020
1 parent a68b8ab commit 08599fc
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AllCops:
TargetRubyVersion: 2.3 # keep in sync with minimum version
TargetRubyVersion: 2.4 # keep in sync with minimum version
Exclude:
- vendor/**/*
- gemfiles/vendor/**/*
Expand Down
24 changes: 10 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,25 @@
bundler_args: ""

# rails 4.2 does not work with bundler 2
# https://gist.github.com/tvdeyen/c0ac49c5dbf0e09e305f180d62b067d0
before_install:
- rvm use @global
- gem uninstall bundler -x || gem uninstall bundler -a || true
- gem install bundler --version 1.17.3

script: "bundle exec rake spec"
sudo: false
rvm:
- 2.4
- 2.5
- 2.6
- 2.7
gemfile:
- gemfiles/rails42.gemfile
- gemfiles/rails52.gemfile
branches:
only: master
maxtrix:
include:
- rvm: 2.3.7 # keep in sync with oldest ruby
- name: Rubocop
rvm: 2.4 # keep in sync with oldest ruby
script: bundle exec rubocop
- rvm: 2.5.3 # keep in sync with newest ruby
- name: Benchmark
rvm: 2.6 # keep in sync with newest ruby
script: gem i gettext && gem i activesupport && bundle exec rake benchmark
- rvm: 2.5.3 # keep in sync with newest ruby
script: bundle exec rake namespaces
- name: Namespaces
rvm: 2.6 # keep in sync with newest ruby
script:
- echo 'gem "gettext"' >> $BUNDLE_GEMFILE
- echo 'gem "iconv"' >> $BUNDLE_GEMFILE
- bundle install --no-deployment && bundle exec rake namespaces
2 changes: 1 addition & 1 deletion lib/fast_gettext/storage.rb
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def weighted_locales(locales)
locales = locales.to_s.gsub(/\s/, '')
found = [[]]
locales.split(',').each do |part|
if part =~ /;q=/ # contains language and weight ?
if /;q=/.match?(part) # contains language and weight ?
found.last << part.split(/;q=/)
found.last.flatten!
found << []
Expand Down

0 comments on commit 08599fc

Please sign in to comment.