aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-11-27 17:03:15 +1030
committerMatthew Draper <matthew@trebex.net>2016-11-27 17:50:17 +1030
commit3050affc45fda105ecae4358e52059a8b231eed0 (patch)
tree1f636434dd3825eb26d210c3c0555a0b23414898 /.travis.yml
parentf4c24767c9f15a45011a26be29b899631df7f05a (diff)
downloadrails-3050affc45fda105ecae4358e52059a8b231eed0.tar.gz
rails-3050affc45fda105ecae4358e52059a8b231eed0.tar.bz2
rails-3050affc45fda105ecae4358e52059a8b231eed0.zip
Only start rabbitmq when we need it
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml25
1 files changed, 19 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index bafceaa292..86328e0ef6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,6 @@ cache:
services:
- memcached
- redis
- - rabbitmq
addons:
postgresql: "9.4"
@@ -23,8 +22,6 @@ before_install:
- "pushd /tmp/beanstalkd-1.10 && make && (./beanstalkd &); popd"
before_script:
- - bundle update
-
# Set Sauce Labs username and access key. Obfuscated, purposefully not encrypted.
# Decodes to e.g. `export VARIABLE=VALUE`
- $(base64 --decode <<< "ZXhwb3J0IFNBVUNFX0FDQ0VTU19LRVk9YTAzNTM0M2YtZTkyMi00MGIzLWFhM2MtMDZiM2VhNjM1YzQ4")
@@ -45,7 +42,6 @@ env:
- "GEM=ar:mysql2"
- "GEM=ar:sqlite3"
- "GEM=ar:postgresql"
- - "GEM=aj:integration"
- "GEM=guides"
rvm:
@@ -55,10 +51,27 @@ rvm:
matrix:
include:
- # Latest compiled version in http://rubies.travis-ci.org
+ - rvm: 2.2.6
+ env: "GEM=aj:integration"
+ services:
+ - memcached
+ - redis
+ - rabbitmq
+ - rvm: 2.3.3
+ env: "GEM=aj:integration"
+ services:
+ - memcached
+ - redis
+ - rabbitmq
+ - rvm: ruby-head
+ env: "GEM=aj:integration"
+ services:
+ - memcached
+ - redis
+ - rabbitmq
- rvm: 2.3.3
env:
- - "GEM=ar:mysql2"
+ - "GEM=ar:mysql2 MYSQL=mariadb"
addons:
mariadb: 10.0
- rvm: jruby-9.1.5.0