summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-03-31 01:47:17 -0700
committerelijah <elijah@riseup.net>2015-03-31 01:47:17 -0700
commit7454a0004b2f6a374d4967b2635ec6f6161ee90f (patch)
treeee44bdf3ed7b2cf9cf648034bc631aefe2ca4e78
parent25b34acce7612f58c5d40819de79734b08cdfb8f (diff)
pin travis ruby to a version installed on travis-ci.org
-rw-r--r--.travis.yml4
-rw-r--r--test/travis/ruby-version1
-rw-r--r--test/travis/setup_couch.sh (renamed from test/setup_couch.sh)0
3 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 7e980b8..322aa07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,9 @@ services:
notifications:
email: false
before_script:
- - "/bin/bash test/setup_couch.sh"
+ - "rm .ruby-version"
+ - "mv test/travis/ruby-version .ruby-version"
+ - "/bin/bash test/travis/setup_couch.sh"
- "touch /tmp/tapicero_test.log"
- "bundle exec bin/tapicero start test/config.yaml"
- "bundle exec bin/tapicero status"
diff --git a/test/travis/ruby-version b/test/travis/ruby-version
new file mode 100644
index 0000000..68b3a4c
--- /dev/null
+++ b/test/travis/ruby-version
@@ -0,0 +1 @@
+1.9.3-p551
diff --git a/test/setup_couch.sh b/test/travis/setup_couch.sh
index c11993d..c11993d 100644
--- a/test/setup_couch.sh
+++ b/test/travis/setup_couch.sh