Skip to content

Commit

Permalink
Switch to ruby 2.1.10 and lock gems to try and get Travis to pass.
Browse files Browse the repository at this point in the history
  • Loading branch information
johnantoni committed Aug 25, 2017
1 parent 90d89fb commit bd174dd
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 14 deletions.
1 change: 1 addition & 0 deletions .ruby-version.example
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.1.10
2 changes: 1 addition & 1 deletion .rvmrc.example
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rvm use --create 1.9.3@mercury-rails
rvm use --create 2.1.10@mercury-rails
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
rvm:
- 1.9.3
- 2.1.10
#before_script:
# - 'sh -e /etc/init.d/xvfb start'
#env:

# - DISPLAY=':99.0' CUCUMBER_OPTS='-f progress'
script: bundle exec rake --trace


17 changes: 9 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
source 'http://rubygems.org'
source 'https://rubygems.org'

gemspec

# dependencies for the dummy app
gem 'rails', '>= 3.2.8'
gem 'rails', '3.2.8'
gem 'jquery-rails'
gem 'sqlite3'
gem 'teabag'
gem 'teabag', '0.3.2'

group :assets do
gem 'sass-rails'
Expand All @@ -16,13 +16,14 @@ end

group :development, :test do
gem 'rspec-core'
gem 'cucumber', '~> 1.3.20'
gem 'cucumber-rails'
gem 'capybara-firebug'
gem 'aruba'
gem 'aruba', '0.14.2'
gem 'database_cleaner'

# required for travis-ci and linux environments
gem "phantomjs-linux" if RUBY_PLATFORM =~ /linux/
end


gem 'phantomjs-linux', :git => 'https://github.com/bandzoogle/phantomjs-linux.git'
# if RUBY_PLATFORM =~ /linux/
# gem 'phantomjs-linux'
# end
4 changes: 2 additions & 2 deletions mercury-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Gem::Specification.new do |s|
s.licenses = ['MIT']

# Runtime Dependencies
s.add_dependency 'railties', '>= 4.1.0'
s.add_dependency 'coffee-rails', '>= 4.2.2'
s.add_dependency 'railties'
s.add_dependency 'coffee-rails'

# Gem Files
s.extra_rdoc_files = %w(LICENSE POST_INSTALL)
Expand Down

0 comments on commit bd174dd

Please sign in to comment.