From 8389d44e8b397816c5d04aebbd2dab8c4eac63fb Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Tue, 18 Nov 2014 13:08:35 -0500 Subject: [PATCH 1/4] Use the new build env on Travis faster vms, more ram, more cpu, better boot times official docs coming soon --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 958c04b..88fd07e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,4 @@ -before_script: - - mysql -e "create database squeel_test_examples;" - - psql -c "create database squeel_test_examples;" -U postgres - -script: - - bundle exec rake test:$ADAPTER +language: ruby rvm: - 1.9.3 @@ -38,3 +33,9 @@ env: - RAILS=3-2-stable AREL=3-0-stable ADAPTER=postgresql - RAILS=3-1-stable AREL=2-2-stable ADAPTER=postgresql - RAILS=3-0-stable AREL=2-0-stable ADAPTER=postgresql + +before_script: + - mysql -e "create database squeel_test_examples;" + - psql -c "create database squeel_test_examples;" -U postgres + +script: bundle exec rake test:$ADAPTER From 4c55b60b648b97aa6e7b7f5118001b7654643b85 Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Tue, 25 Nov 2014 18:32:02 +0100 Subject: [PATCH 2/4] allow Rails master to fail --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 88fd07e..28d753d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,3 +39,11 @@ before_script: - psql -c "create database squeel_test_examples;" -U postgres script: bundle exec rake test:$ADAPTER + +matrix: + allowed_failures: + - env: RAILS=master AREL=master ADAPTER=sqlite3 + - env: RAILS=master AREL=master ADAPTER=mysql + - env: RAILS=master AREL=master ADAPTER=mysql2 + - env: RAILS=master AREL=master ADAPTER=postgresql + From 5127600988e30ea6f9b5dde5ddc980930f767344 Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Tue, 25 Nov 2014 18:33:24 +0100 Subject: [PATCH 3/4] oops, allow_failures --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 28d753d..d796efb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ before_script: script: bundle exec rake test:$ADAPTER matrix: - allowed_failures: + allow_failures: - env: RAILS=master AREL=master ADAPTER=sqlite3 - env: RAILS=master AREL=master ADAPTER=mysql - env: RAILS=master AREL=master ADAPTER=mysql2 From 5032da4e6930eee56a9f7f5a27adfb8f56904188 Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Tue, 25 Nov 2014 19:32:19 +0100 Subject: [PATCH 4/4] this disappeared somehow :/ --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index d796efb..da9a731 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,8 @@ env: - RAILS=3-1-stable AREL=2-2-stable ADAPTER=postgresql - RAILS=3-0-stable AREL=2-0-stable ADAPTER=postgresql +sudo: false + before_script: - mysql -e "create database squeel_test_examples;" - psql -c "create database squeel_test_examples;" -U postgres