You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by fr...@apache.org on 2018/06/23 06:47:05 UTC

calcite-avatica-go git commit: [CALCITE-2372] Simplify travis.yml and upgrade Phoenix to 4.14 in docker-compose.yml

Repository: calcite-avatica-go
Updated Branches:
  refs/heads/master 5f775b740 -> 2e3a26ea6


[CALCITE-2372] Simplify travis.yml and upgrade Phoenix to 4.14 in docker-compose.yml


Project: http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/commit/2e3a26ea
Tree: http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/tree/2e3a26ea
Diff: http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/diff/2e3a26ea

Branch: refs/heads/master
Commit: 2e3a26ea672e2dbcb29cb50478a994e03bf737b1
Parents: 5f775b7
Author: Francis Chuang <fr...@apache.org>
Authored: Sat Jun 23 16:46:45 2018 +1000
Committer: Francis Chuang <fr...@apache.org>
Committed: Sat Jun 23 16:46:45 2018 +1000

----------------------------------------------------------------------
 .travis.yml        | 16 ++++++++--------
 docker-compose.yml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/2e3a26ea/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 66dc98e..f254ee6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,24 +37,24 @@ env:
     - PHOENIX_HOST=http://localhost:8765
     - HSQLDB_HOST=http://localhost:8765
   matrix:
-    - AVATICA_FLAVOR=PHOENIX PHOENIX_IMAGE=boostport/hbase-phoenix-all-in-one:1.3-4.13
-    - AVATICA_FLAVOR=PHOENIX PHOENIX_IMAGE=boostport/hbase-phoenix-all-in-one:1.4-4.14
-    - AVATICA_FLAVOR=HSQLDB HSQLDB_IMAGE=f21global/calcite-avatica:1.11.0-hypersql
+    - AVATICA_FLAVOR=PHOENIX IMAGE=boostport/hbase-phoenix-all-in-one:1.3-4.13
+    - AVATICA_FLAVOR=PHOENIX IMAGE=boostport/hbase-phoenix-all-in-one:1.4-4.14
+    - AVATICA_FLAVOR=HSQLDB IMAGE=f21global/calcite-avatica:1.11.0-hypersql
 
 before_install:
   - go get -u github.com/golang/dep/cmd/dep
   - dep ensure -v
   - if [ $AVATICA_FLAVOR == "PHOENIX" ]; then
-      docker pull $PHOENIX_IMAGE;
-      docker run -d -p 8765:8765 $PHOENIX_IMAGE;
+      docker pull $IMAGE;
+      docker run -d -p 8765:8765 $IMAGE;
     elif [ $AVATICA_FLAVOR == "HSQLDB" ]; then
-      docker pull $HSQLDB_IMAGE;
-      docker run -d -p 8765:8765 $HSQLDB_IMAGE -u jdbc:hsqldb:mem:public;
+      docker pull $IMAGE;
+      docker run -d -p 8765:8765 $IMAGE -u jdbc:hsqldb:mem:public;
     fi
   - docker ps -a
 
 script:
-  - export AVATICA_FLAVOR=$AVATICA_FLAVOR && go test -v ./...
+  - go test -v ./...
 
 git:
   depth: 10000

http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/2e3a26ea/docker-compose.yml
----------------------------------------------------------------------
diff --git a/docker-compose.yml b/docker-compose.yml
index 37f58e1..4f07931 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
       HSQLDB_HOST: http://hsqldb:8765
     command: sh -c "export AVATICA_FLAVOR=HSQLDB && go test -v ./...; export AVATICA_FLAVOR=PHOENIX && go test -v ./..."
   phoenix:
-    image: boostport/hbase-phoenix-all-in-one:1.3-4.13
+    image: boostport/hbase-phoenix-all-in-one:1.4-4.14
   hsqldb:
     image: f21global/calcite-avatica:1.11.0-hypersql
     command: -u jdbc:hsqldb:mem:public
\ No newline at end of file