Merge pull request #139 from bpitman/master

Misc testing
Netflix · Jul 15, 2015 · 68fff61 · 68fff61
2 parents 52e96ff + c4b31f3
commit 68fff61
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: scala
 jdk:
   - oraclejdk7
 scala:
-  - 2.11.5
+  - 2.11.6
 sudo: false
 script:
   - "make travis"

diff --git a/Makefile b/Makefile
@@ -18,15 +18,17 @@ endif
 
 build:
 	echo "Starting build"
-	$(SBT) 'inspect tree clean' test checkLicenseHeaders
+	$(SBT) 'inspect tree clean' clean test checkLicenseHeaders
 
 publish:
 	echo "Starting publish"
-	$(SBT) 'inspect tree clean' test checkLicenseHeaders storeBintrayCredentials publish
+	$(SBT) storeBintrayCredentials
+	$(SBT) 'inspect tree clean' clean test checkLicenseHeaders publish
 
 release:
 	echo "Starting release"
-	$(SBT) 'inspect tree clean' test checkLicenseHeaders storeBintrayCredentials publish bintrayRelease
+	$(SBT) storeBintrayCredentials
+	$(SBT) 'inspect tree clean' clean test checkLicenseHeaders publish bintrayRelease
 
 coverage:
 	$(SBT) clean coverage test coverageReport
@@ -37,5 +39,8 @@ license:
 
 get-ivy-cache:
 	stty cols 5000
+	which java
+	#find ${WORKSPACE:-$HOME}/.sbt
+	#$(SBT) --version
 	curl -L $(IVY_CACHE_URL) -o $(HOME)/ivy.tar.gz
 	tar -C $(HOME) -xzf $(HOME)/ivy.tar.gz
diff --git a/project/sbt b/project/sbt
@@ -1,3 +1,5 @@
+#!/bin/bash -v
+
 # This script is used to launch sbt on developer workstations.
 
 # Additional options to add in when calling java
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ language: scala @@
     jdk:
       - oraclejdk7
     scala:
-      - 2.11.5
+      - 2.11.6
     sudo: false
     script:
       - "make travis"
@@ Expand Down @@