Merge branch 'travis'

Swirrl · Apr 7, 2017 · e4ff2fe · e4ff2fe
2 parents 7917779 + 4950c38
commit e4ff2fe
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,9 @@
+language: clojure
+sudo: required
+lein: 2.7.1
+jdk:
+  - oraclejdk8
+before_install:
+  - sudo ./travis/setup-lein-travis.sh
+
+script: travis_retry env JAVA_HOME=/usr/lib/jvm/java-8-oracle/bin/java lein test
diff --git a/project.clj b/project.clj
@@ -57,10 +57,7 @@
             :path "src/tabular"
             :levels 2}]
 
-
-  :profiles {:uberjar {:aot :all}
-
-             :clj-19 { :dependencies [[org.clojure/clojure "1.9.0-alpha14"]] }
+  :profiles {:clj-19 { :dependencies [[org.clojure/clojure "1.9.0-alpha14"]] }
 
              :dev {:plugins [[com.aphyr/prism "0.1.1"] ;; autotest support simply run: lein prism
                              [codox "0.8.10"]

diff --git a/src/pipeline/grafter/pipeline/types.clj b/src/pipeline/grafter/pipeline/types.clj
@@ -166,6 +166,8 @@
 
 (prefer-method parse-parameter [String ::tabular-dataset] [String Map])
 
+(prefer-method parse-parameter [String Map] [String ::root-type])
+
 (prefer-method parse-parameter [Map ::tabular-dataset] [Map Map])
 
 (swap! parameter-types derive java.io.InputStream ::binary-file)

diff --git a/travis/profiles.clj b/travis/profiles.clj
@@ -0,0 +1 @@
+{}
diff --git a/travis/setup-lein-travis.sh b/travis/setup-lein-travis.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+chown -R travis ../travis/*
+mkdir -p /etc/leiningen/
+mv ./travis/profiles.clj /etc/leiningen/profiles.clj