You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hugegraph.apache.org by je...@apache.org on 2022/11/30 17:31:50 UTC
[incubator-hugegraph-toolchain] branch master updated: adapt new server binary (#386)
This is an automated email from the ASF dual-hosted git repository.
jermy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph-toolchain.git
The following commit(s) were added to refs/heads/master by this push:
new 5f2f6575 adapt new server binary (#386)
5f2f6575 is described below
commit 5f2f657518818a90ebd793479ba84e52c1d526de
Author: 青年 <10...@qq.com>
AuthorDate: Thu Dec 1 01:31:45 2022 +0800
adapt new server binary (#386)
---
.github/workflows/client-ci.yml | 2 +-
.github/workflows/hubble-ci.yml | 2 +-
.github/workflows/loader-ci.yml | 2 +-
.github/workflows/tools-ci.yml | 2 +-
hugegraph-client/assembly/travis/install-hugegraph-from-source.sh | 4 ++--
.../hubble-dist/assembly/travis/download-hugegraph.sh | 4 ++--
.../assembly/travis/hugegraph-server1/install-hugegraph.sh | 2 +-
.../assembly/travis/hugegraph-server2/install-hugegraph.sh | 2 +-
hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh | 8 ++++----
hugegraph-tools/assembly/travis/install-hugegraph-from-source.sh | 4 ++--
10 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/client-ci.yml b/.github/workflows/client-ci.yml
index 2dc7864b..7fc11a42 100644
--- a/.github/workflows/client-ci.yml
+++ b/.github/workflows/client-ci.yml
@@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-20.04
env:
TRAVIS_DIR: hugegraph-client/assembly/travis
- COMMIT_ID: 3b44568e8bdf5ac6873ef29d402633f7f62bbb4c
+ COMMIT_ID: be6ee386b9939dc6bd6fcbdf2274b8acc3a0a314
strategy:
fail-fast: false
matrix:
diff --git a/.github/workflows/hubble-ci.yml b/.github/workflows/hubble-ci.yml
index 7acb65d0..29dbb2f9 100644
--- a/.github/workflows/hubble-ci.yml
+++ b/.github/workflows/hubble-ci.yml
@@ -23,7 +23,7 @@ on:
env:
TRAVIS_DIR: hugegraph-hubble/hubble-dist/assembly/travis
# TODO: need update it later
- COMMIT_ID: 3b44568e8bdf5ac6873ef29d402633f7f62bbb4c
+ COMMIT_ID: be6ee386b9939dc6bd6fcbdf2274b8acc3a0a314
jobs:
hubble-ci:
diff --git a/.github/workflows/loader-ci.yml b/.github/workflows/loader-ci.yml
index dfe80f1e..c2f3b626 100644
--- a/.github/workflows/loader-ci.yml
+++ b/.github/workflows/loader-ci.yml
@@ -24,7 +24,7 @@ jobs:
env:
TRAVIS_DIR: hugegraph-loader/assembly/travis
STATIC_DIR: hugegraph-loader/assembly/static
- COMMIT_ID: 3b44568e8bdf5ac6873ef29d402633f7f62bbb4c
+ COMMIT_ID: be6ee386b9939dc6bd6fcbdf2274b8acc3a0a314
DB_USER: root
DB_PASS: root
DB_DATABASE: load_test
diff --git a/.github/workflows/tools-ci.yml b/.github/workflows/tools-ci.yml
index 400adbe0..5e2c535a 100644
--- a/.github/workflows/tools-ci.yml
+++ b/.github/workflows/tools-ci.yml
@@ -23,7 +23,7 @@ jobs:
env:
TRAVIS_DIR: hugegraph-tools/assembly/travis
# TODO: could we use one param to unify it? or use a action template
- COMMIT_ID: 3b44568e8bdf5ac6873ef29d402633f7f62bbb4c
+ COMMIT_ID: be6ee386b9939dc6bd6fcbdf2274b8acc3a0a314
steps:
- name: Install JDK 8
uses: actions/setup-java@v3
diff --git a/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh b/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh
index 92e12339..51852eff 100755
--- a/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh
+++ b/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh
@@ -32,12 +32,12 @@ git checkout "${COMMIT_ID}"
mvn package -DskipTests -Dmaven.javadoc.skip=true -ntp
# TODO: lack incubator after apache package release (update it later)
-TAR=$(echo hugegraph-*.tar.gz)
+TAR=$(echo apache-hugegraph-*.tar.gz)
tar zxf "${TAR}" -C ../
cd ../
rm -rf "${GIT_DIR}"
# TODO: lack incubator after apache package release (update it later)
-HTTP_SERVER_DIR=$(echo hugegraph-*.*)
+HTTP_SERVER_DIR=$(echo apache-hugegraph-*.*)
HTTPS_SERVER_DIR="hugegraph_https"
cp -r "${HTTP_SERVER_DIR}" "${HTTPS_SERVER_DIR}"
diff --git a/hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh b/hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh
index 35a1138c..7813cc3b 100755
--- a/hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh
+++ b/hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh
@@ -32,7 +32,7 @@ git checkout "${COMMIT_ID}"
mvn package -DskipTests -Dmaven.javadoc.skip=true -ntp
# TODO: lack incubator after apache package release (update it later)
-TAR=$(echo hugegraph-*.tar.gz)
-cp hugegraph-*.tar.gz ../
+TAR=$(echo apache-hugegraph-*.tar.gz)
+cp apache-hugegraph-*.tar.gz ../
cd ../
rm -rf "${GIT_DIR}"
diff --git a/hugegraph-hubble/hubble-dist/assembly/travis/hugegraph-server1/install-hugegraph.sh b/hugegraph-hubble/hubble-dist/assembly/travis/hugegraph-server1/install-hugegraph.sh
index 868bb36f..cb992cbe 100755
--- a/hugegraph-hubble/hubble-dist/assembly/travis/hugegraph-server1/install-hugegraph.sh
+++ b/hugegraph-hubble/hubble-dist/assembly/travis/hugegraph-server1/install-hugegraph.sh
@@ -21,7 +21,7 @@ SERVER_CONFIG_DIR=$(dirname "$0")
SERVER_PARENT_DIR="hugegraph-server1"
mkdir ${SERVER_PARENT_DIR}
-TAR=$(echo hugegraph-*.tar.gz)
+TAR=$(echo apache-hugegraph-*.tar.gz)
tar -zxvf "$TAR" -C "${SERVER_PARENT_DIR}" >/dev/null 2>&1
HUGEGRAPH_NAME=${TAR%%.tar*}
diff --git a/hugegraph-hubble/hubble-dist/assembly/travis/hugegraph-server2/install-hugegraph.sh b/hugegraph-hubble/hubble-dist/assembly/travis/hugegraph-server2/install-hugegraph.sh
index dfa36dd5..71ae5c4c 100755
--- a/hugegraph-hubble/hubble-dist/assembly/travis/hugegraph-server2/install-hugegraph.sh
+++ b/hugegraph-hubble/hubble-dist/assembly/travis/hugegraph-server2/install-hugegraph.sh
@@ -21,7 +21,7 @@ SERVER_CONFIG_DIR=$(dirname "$0")
SERVER_PARENT_DIR="hugegraph-server2"
mkdir ${SERVER_PARENT_DIR}
-TAR=$(echo hugegraph-*.tar.gz)
+TAR=$(echo apache-hugegraph-*.tar.gz)
tar -zxvf "$TAR" -C "${SERVER_PARENT_DIR}" >/dev/null 2>&1
HUGEGRAPH_NAME=${TAR%%.tar*}
diff --git a/hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh b/hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh
index ce209bd2..e668c374 100755
--- a/hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh
+++ b/hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh
@@ -29,16 +29,16 @@ cd hugegraph
git checkout "${COMMIT_ID}"
mvn package -DskipTests -Dmaven.javadoc.skip=true -ntp
# TODO: lack incubator after apache package release (update it later)
-mv hugegraph-*.tar.gz ../
+mv apache-hugegraph-*.tar.gz ../
cd ../
rm -rf hugegraph
-tar zxf hugegraph-*.tar.gz
+tar zxf apache-hugegraph-*.tar.gz
HTTPS_SERVER_DIR="hugegraph_https"
mkdir ${HTTPS_SERVER_DIR}
# TODO: lack incubator after apache package release (update it later)
-cp -r hugegraph-*/. ${HTTPS_SERVER_DIR}
-cd "$(find hugegraph-* | head -1)"
+cp -r apache-hugegraph-*/. ${HTTPS_SERVER_DIR}
+cd "$(find apache-hugegraph-* | head -1)"
# start HugeGraphServer with http protocol
bin/init-store.sh || exit 1
bin/start-hugegraph.sh || exit 1
diff --git a/hugegraph-tools/assembly/travis/install-hugegraph-from-source.sh b/hugegraph-tools/assembly/travis/install-hugegraph-from-source.sh
index 176be211..f4863103 100755
--- a/hugegraph-tools/assembly/travis/install-hugegraph-from-source.sh
+++ b/hugegraph-tools/assembly/travis/install-hugegraph-from-source.sh
@@ -31,12 +31,12 @@ git checkout "${COMMIT_ID}"
mvn package -DskipTests -Dmaven.javadoc.skip=true -ntp
# TODO: lack incubator after apache package release (update it later)
-TAR=$(echo hugegraph-*.tar.gz)
+TAR=$(echo apache-hugegraph-*.tar.gz)
tar zxf "${TAR}" -C ../
cd ../
rm -rf "${GIT_DIR}"
# TODO: lack incubator after apache package release (update it later)
-HTTP_SERVER_DIR=$(echo hugegraph-*.*)
+HTTP_SERVER_DIR=$(echo apache-hugegraph-*.*)
HTTPS_SERVER_DIR="hugegraph_https"
cp -r "${HTTP_SERVER_DIR}" "${HTTPS_SERVER_DIR}"