Julia 1.2 for travis

wookay · Aug 22, 2019 · e9479b2 · e9479b2
1 parent ab34007
commit e9479b2
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 25 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,12 +10,8 @@ os:
   - osx
 
 julia:
-  - 1.1
-
-matrix:
-  include:
-    - os: linux
-      julia: 1.3
+  - 1.2
+  - 1.3
 
 services:
   - postgresql
@@ -68,11 +64,11 @@ before_script:
   - mysql --version
 
 script:
-  -                 julia --color=yes --handle-signals=no --project=. -e 'using Pkg; Pkg.test()'
+  -                 julia --color=yes --handle-signals=no --project=. -e 'using Pkg; Pkg.test(coverage=true)'
   - JIVE_PROCS=auto julia --color=yes                     --project=. -e 'using Pkg; Pkg.test()'
 
 after_success:
-  - if [[ "$TRAVIS_OS_NAME" == linux && "$TRAVIS_JULIA_VERSION" == nightly ]] ; then julia --color=yes --project=. -e 'using Pkg;
-                                                                                                                       Pkg.add("Coverage");
-                                                                                                                       using Coverage;
-                                                                                                                       Codecov.submit(process_folder())' ; fi
+  - if [[ "$TRAVIS_OS_NAME" == linux && "$TRAVIS_JULIA_VERSION" == 1.2 ]] ; then julia --color=yes --project=. -e 'using Pkg;
+                                                                                                                   Pkg.add("Coverage");
+                                                                                                                   using Coverage;
+                                                                                                                   Codecov.submit(process_folder())' ; fi
diff --git a/Manifest.toml b/Manifest.toml
@@ -0,0 +1,12 @@
+# This file is machine-generated - editing it directly is not advised
+
+[[Dates]]
+deps = ["Printf"]
+uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
+
+[[Printf]]
+deps = ["Unicode"]
+uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+
+[[Unicode]]
+uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
diff --git a/Project.toml b/Project.toml
@@ -6,24 +6,24 @@ version = "0.2.4-DEV"
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 
+[compat]
+Hive = "≥ 0.3.0"
+JDBC = "≥ 0.4.0"
+LibPQ = "≥ 0.9.1"
+MySQL = "≥ 0.7.0"
+ODBC = "≥ 0.8.1"
+SQLite = "≥ 0.8.1"
+julia = "1"
+
 [extras]
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+Hive = "6735fb99-e7a2-5b86-aa6b-3fb73ebb43ff"
+JDBC = "6042db11-3c3d-5e84-8dba-9cbf74c9ba48"
 Jive = "ba5e3d4b-8524-549f-bc71-e76ad9e9deed"
 LibPQ = "194296ae-ab2e-5f79-8cd4-7183a0a5a0d1"
-SQLite = "0aa819cd-b072-5ff4-a722-6bc24af294d9"
 MySQL = "39abe10b-433b-5dbd-92d4-e302a9df00cd"
 ODBC = "be6f12e9-ca4f-5eb2-a339-a4f995cc0291"
-JDBC = "6042db11-3c3d-5e84-8dba-9cbf74c9ba48"
-Hive = "6735fb99-e7a2-5b86-aa6b-3fb73ebb43ff"
+SQLite = "0aa819cd-b072-5ff4-a722-6bc24af294d9"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
 test = ["Test", "Jive", "LibPQ", "SQLite", "MySQL", "ODBC", "JDBC", "Hive"]
-
-[compat]
-julia = "1"
-LibPQ = "≥ 0.9.1"
-SQLite = "≥ 0.8.1"
-MySQL = "≥ 0.7.0"
-ODBC = "≥ 0.8.1"
-JDBC = "≥ 0.4.0"
-Hive = "≥ 0.3.0"
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -16,8 +16,12 @@ if haskey(ENV, "TRAVIS") && ENV["TRAVIS_OS_NAME"] == "osx"
 end
 
 using Jive.Distributed: nprocs
-if nprocs() > 1 || !(get(ENV, "JIVE_PROCS", "") in ["", "0"])
+if nprocs() > 1 || !(get(ENV, "JIVE_PROCS", "") in ["", "0"]) || VERSION >= v"1.3.0-alpha"
     push!(ignores, joinpath("adapters", "jdbc"))
 end
 
+# LibPQ v0.11.1
+#     ERROR: LoadError: ArgumentError: cannot convert NULL to string
+push!(ignores, "adapters/postgresql/copy_test")
+
 runtests(@__DIR__, skip=["adapters/mysql/options.jl", ignores...])