Skip to content
This repository was archived by the owner on Jan 12, 2024. It is now read-only.

Travis and Gemfile - Bundler version hinting #51

Merged
mikker merged 1 commit into from
Jun 16, 2017
Merged

Travis and Gemfile - Bundler version hinting #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ language: ruby
cache: bundler
env:
- CI=true
before_install:
- gem install bundler
rvm:
- 2.0.0
- 2.1.6
Expand Down
9 changes: 6 additions & 3 deletions gemfiles/Gemfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ source "http://rubygems.org"

gemspec path: File.expand_path('../..', __FILE__)

ruby RUBY_VERSION

gem 'rake'
gem 'rspec'
gem 'timecop'
Expand All @@ -15,12 +17,13 @@ gem 'simplecov'

gem 'redis'
gem 'fakeredis'
gem 'sqlite3'
gem 'sqlite3', platform: :mri
Copy link
Contributor Author

@olleolleolle olleolleolle Jun 16, 2017

Choose a reason for hiding this comment

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

Note: This is not strictly necessary in this change. I could get rid of it.

gem 'sequel'

gem 'delayed_job', require: false
gem 'resque', require: false

unless RUBY_VERSION.to_i <= 1
gem 'sidekiq', require: false
# Freeze Sidekiq to < 5 in Ruby 2.2 Gemfiles
if RUBY_VERSION >= '2'
gem 'sidekiq', (RUBY_VERSION >= '2.2.2' ? '~> 5' : '~> 4'), require: false
end
2 changes: 1 addition & 1 deletion gemfiles/Gemfile.rails-5.0.x
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
eval_gemfile File.expand_path('../Gemfile.base', __FILE__)

gem 'rails', '~> 5.0.0'
gem 'sinatra', git: 'https://github.com/sinatra/sinatra.git'
gem 'sinatra'