Skip to content

Commit

Permalink
Merge pull request #129 from red56/fix-build
Browse files Browse the repository at this point in the history
Fix travis build (and local development testing)
  • Loading branch information
straydogstudio committed Nov 15, 2019
2 parents 1c17e91 + ad0a244 commit e5b969b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Expand Up @@ -14,14 +14,14 @@ env:
- RAILS_VERSION=5.2
- RAILS_VERSION=6.0
rvm:
- 2.4.7
- 2.5.6
- 2.6.4
- 2.4
- 2.5
- 2.6
before_install:
- gem update bundler
script:
spec/ci.rb
matrix:
exclude:
- rvm: 2.4.7
- rvm: 2.4
env: RAILS_VERSION=6.0
5 changes: 4 additions & 1 deletion Gemfile
Expand Up @@ -31,6 +31,9 @@ when '4.2'
# gem 'rails', "~> #{ENV['RAILS_VERSION']}.0"
end

# the dummy apps are set up for sprockets 3
gem 'sprockets', '~> 3.0'

# jquery-rails is used by the dummy application
gem "jquery-rails"
gem "thin"
Expand All @@ -41,6 +44,6 @@ gem "sqlite3", '~> 1.4', :platform => [:ruby, :mswin, :mingw]
# Git. Remember to move these dependencies to your gemspec before releasing
# your gem to rubygems.org.
gem 'capybara', '~> 2.1'
gem 'acts_as_xlsx', git: 'https://github.com/caxlsx/acts_as_caxlsx.git'
gem 'acts_as_caxlsx', git: 'https://github.com/caxlsx/acts_as_caxlsx.git'
# To use debugger
# gem 'pry-debugger'

0 comments on commit e5b969b

Please sign in to comment.