Permalink
Browse files

Changed travis config to work with gemfiles

  • Loading branch information...
pyromaniac committed Jan 29, 2013
1 parent 0d77297 commit 6c2a8fd48a2eedf22a3e99f5a67b942a07b5c056
Showing with 27 additions and 30 deletions.
  1. +11 −20 .travis.yml
  2. +1 −10 Gemfile
  3. +5 −0 gemfiles/Gemfile.rails-3-1
  4. +5 −0 gemfiles/Gemfile.rails-3-2
  5. +5 −0 gemfiles/Gemfile.rails-head
View
@@ -3,32 +3,23 @@ before_script:
- psql -c 'create database activeuuid_test;' -U postgres
rvm:
+ - 1.9.2
- 1.9.3
- 2.0.0
- rbx-19mode
+gemfile:
+ - Gemfile
+ - gemfiles/Gemfile.rails-3-1
+ - gemfiles/Gemfile.rails-3-2
+ - gemfiles/Gemfile.rails-head
+
env:
- - ACTIVERECORD_VERSION='~>3.1.0'
- - ACTIVERECORD_VERSION='~>3.1.0' DB=mysql
- - ACTIVERECORD_VERSION='~>3.1.0' DB=postgresql
- - ACTIVERECORD_VERSION='~>3.2.0'
- - ACTIVERECORD_VERSION='~>3.2.0' DB=mysql
- - ACTIVERECORD_VERSION='~>3.2.0' DB=postgresql
- - ACTIVERECORD_VERSION=3-1-stable
- - ACTIVERECORD_VERSION=3-1-stable DB=mysql
- - ACTIVERECORD_VERSION=3-1-stable DB=postgresql
- - ACTIVERECORD_VERSION=3-2-stable
- - ACTIVERECORD_VERSION=3-2-stable DB=mysql
- - ACTIVERECORD_VERSION=3-2-stable DB=postgresql
- - ACTIVERECORD_VERSION=master
- - ACTIVERECORD_VERSION=master DB=mysql
- - ACTIVERECORD_VERSION=master DB=postgresql
+ - DB=sqlite3
+ - DB=mysql
+ - DB=postgresql
matrix:
exclude:
- rvm: 1.9.2
- env: ACTIVERECORD_VERSION=master
- - rvm: 1.9.2
- env: ACTIVERECORD_VERSION=master DB=mysql
- - rvm: 1.9.2
- env: ACTIVERECORD_VERSION=master DB=postgresql
+ gemfile: gemfiles/Gemfile.rails-head
View
11 Gemfile
@@ -3,13 +3,4 @@ source "http://rubygems.org"
# Specify your gem's dependencies in activeuuid.gemspec
gemspec
-case version = ENV['ACTIVERECORD_VERSION'] || '~> 3.2'
-when /master/
- gem "activerecord", :github => "rails/rails"
-when /3-1-stable/
- gem "activerecord", :github => "rails/rails", :branch => "3-1-stable"
-when /3-2-stable/
- gem "activerecord", :github => "rails/rails", :branch => "3-2-stable"
-else
- gem "activerecord", version
-end
+gem "activerecord"
@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 3.1.0'
@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 3.2.0'
@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gemspec path: '../'
+
+gem 'activerecord', github: 'rails/rails'

0 comments on commit 6c2a8fd

Please sign in to comment.