Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update bundler before running tests, fixes test run on travis #179

Merged
merged 4 commits into from
Dec 16, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ pkg/*
.rbenv-version
.ruby-gemset
.ruby-version
# Appraisal generated lockfiles
*.gemfile.lock
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
language: ruby
# Explicit usage of containerized builds, should provide faster feedback
# see https://docs.travis-ci.com/user/workers/container-based-infrastructure/
# and https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments
sudo: false
before_install:
- gem update bundler
rvm:
- 1.9.3
- 2.0.0
Expand Down
6 changes: 3 additions & 3 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
appraise "rails-3-2" do
gem "activerecord", "3.2.21"
gem "activerecord", "~> 3.2.21"
end

appraise "rails-4-1" do
gem "activerecord", "4.1.10"
gem "activerecord", "~> 4.1.10"
end

appraise "rails-4-2" do
gem "activerecord", "4.2.1"
gem "activerecord", "~> 4.2.1"
end
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ gem "appraisal"
gem "github_changelog_generator"

group :test do
gem "minitest"
gem "minitest", "~> 5.0"
end
5 changes: 3 additions & 2 deletions gemfiles/rails_3_2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ gem "sqlite3", :platforms => [:ruby]
gem "activerecord-jdbcsqlite3-adapter", :platforms => [:jruby]
gem "rake"
gem "appraisal"
gem "activerecord", "3.2.21"
gem "github_changelog_generator"
gem "activerecord", "~> 3.2.21"

group :test do
gem "minitest"
gem "minitest", "~> 5.0"
end

platforms :rbx do
Expand Down
258 changes: 0 additions & 258 deletions gemfiles/rails_3_2.gemfile.lock

This file was deleted.

5 changes: 3 additions & 2 deletions gemfiles/rails_4_1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ gem "sqlite3", :platforms => [:ruby]
gem "activerecord-jdbcsqlite3-adapter", :platforms => [:jruby]
gem "rake"
gem "appraisal"
gem "activerecord", "4.1.10"
gem "github_changelog_generator"
gem "activerecord", "~> 4.1.10"

group :test do
gem "minitest"
gem "minitest", "~> 5.0"
end

platforms :rbx do
Expand Down
Loading