You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@s2graph.apache.org by st...@apache.org on 2016/12/02 09:57:15 UTC

[15/17] incubator-s2graph git commit: fix

fix


Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/69961be4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/69961be4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/69961be4

Branch: refs/heads/master
Commit: 69961be46d399f6932272d8b7b4dfad3aeef469b
Parents: c2a45dc
Author: Injun Song <ij...@gmail.com>
Authored: Fri Dec 2 17:00:35 2016 +0900
Committer: Injun Song <ij...@gmail.com>
Committed: Fri Dec 2 17:00:35 2016 +0900

----------------------------------------------------------------------
 .travis.yml              | 6 ++++--
 .travis/install-hbase.sh | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/69961be4/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 3b94132..0140a21 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,8 @@ jdk:
 
 sbt_args: -J-Xmx4G -J-Xms2G -J-Xss1M
 
-before_script:
+before_install:
   - .travis/install-hbase.sh
-  - $HOME/hbase/bin/start-hbase.sh
+
+before_script:
+  - $HOME/hbase-$HBASE_VERSION/bin/start-hbase.sh

http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/69961be4/.travis/install-hbase.sh
----------------------------------------------------------------------
diff --git a/.travis/install-hbase.sh b/.travis/install-hbase.sh
index 5851b5b..126d399 100755
--- a/.travis/install-hbase.sh
+++ b/.travis/install-hbase.sh
@@ -2,7 +2,6 @@
 
 set -xe
 
-if [ ! -d "$HOME/hbase/bin" ]; then
+if [ ! -d "$HOME/hbase-$HBASE_VERSION/bin" ]; then
   cd $HOME && wget -q -O - http://mirror.navercorp.com/apache/hbase/stable/hbase-$HBASE_VERSION-bin.tar.gz | tar xz
-  ln -s $HOME/hbase-$HBASE_VERSION $HOME/hbase
 fi