chore: bump default testing C* version to 3.7

thibaultcha · Aug 1, 2016 · 9e15814 · 9e15814
1 parent e9f0e1f
commit 9e15814
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,6 @@
-language: perl
-perl: 5.18
+language: java
+jdk:
+  - oraclejdk8
 sudo: false
 notifications:
   email: false
@@ -13,7 +14,6 @@ addons:
       - build-essential
 env:
   global:
-    - CASSANDRA=2.2.7
     - OPENRESTY=1.9.15.1
     - OPENRESTY_DIR=$HOME/openresty
     - LUA_DIR=$HOME/lua
@@ -24,6 +24,9 @@ env:
     - LUA="luajit 2.1"
     - OPENRESTY_TESTS=true
       LUA="luajit 2.1"
+    - OPENRESTY_TESTS=true
+      LUA="luajit 2.1"
+      CASSANDRA=2.2.7
     - OPENRESTY_TESTS=true
       LUA="luajit 2.1"
       CASSANDRA=2.1.15

diff --git a/Makefile b/Makefile
@@ -1,5 +1,6 @@
 DEV_ROCKS=busted luacov-coveralls luacheck ldoc
 BUSTED_ARGS ?= -v -o gtest
+CASSANDRA ?= 3.7
 
 .PHONY: install dev busted prove test clean coverage lint doc
 
@@ -20,7 +21,7 @@ busted:
 	@busted $(BUSTED_ARGS)
 
 prove:
-	@util/prove_ccm.sh
+	@util/prove_ccm.sh $(CASSANDRA)
 	@t/reindex t/*
 	@prove
 

diff --git a/spec/helpers.lua b/spec/helpers.lua
@@ -16,7 +16,7 @@ local function exec(cmd, ignore)
 end
 
 local _M = {
-  cassandra_version = os.getenv("CASSANDRA") or "2.2.7",
+  cassandra_version = os.getenv("CASSANDRA") or "3.7",
   ssl_path = os.getenv("SSL_PATH") or "spec/fixtures/ssl"
 }
 

diff --git a/util/prove_ccm.sh b/util/prove_ccm.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-CASSANDRA=${1:-2.2.4}
+CASSANDRA=${1}
 
 ccm stop
 ccm create lua_cassandra_prove -v binary:$CASSANDRA -n 3