From 3050affc45fda105ecae4358e52059a8b231eed0 Mon Sep 17 00:00:00 2001
From: Matthew Draper <matthew@trebex.net>
Date: Sun, 27 Nov 2016 17:03:15 +1030
Subject: Only start rabbitmq when we need it

---
 .travis.yml | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

(limited to '.travis.yml')

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
-- 
cgit v1.2.3