From 34c6cfd846e482920487a99f125b945ae1d81f74 Mon Sep 17 00:00:00 2001 From: yangjiaqi Date: Wed, 7 Dec 2022 00:10:40 +0800 Subject: [PATCH 1/4] fix hugegraph-dist package failed --- hugegraph-dist/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hugegraph-dist/pom.xml b/hugegraph-dist/pom.xml index 7680c6b41..6da4561bc 100644 --- a/hugegraph-dist/pom.xml +++ b/hugegraph-dist/pom.xml @@ -36,8 +36,8 @@ mkdir -p ${final.name} mv $root_path/hugegraph-hubble/hugegraph-hubble ${final.name}/hugegraph-hubble-${project.version} - mv $root_path/hugegraph-loader/hugegraph-loader-${project.version} ${final.name}/hugegraph-loader-${project.version} - mv $root_path/hugegraph-tools/hugegraph-tools-${project.version} ${final.name}/hugegraph-tools-${project.version} + mv $root_path/hugegraph-loader/apache-hugegraph-loader-incubating-${project.version} ${final.name}/apache-hugegraph-loader-incubating-${project.version} + mv $root_path/hugegraph-tools/apache-hugegraph-tools-incubating-${project.version} ${final.name}/apache-hugegraph-tools-incubating-${project.version} tar -zcvf $root_path/${final.name}.tar.gz ./${final.name} || exit 1 From 064f11e810632412df52feb4b1ed56285d6f4a3d Mon Sep 17 00:00:00 2001 From: yangjiaqi Date: Wed, 7 Dec 2022 22:54:23 +0800 Subject: [PATCH 2/4] rename package name --- hugegraph-dist/pom.xml | 6 +++--- hugegraph-hubble/hubble-dist/pom.xml | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hugegraph-dist/pom.xml b/hugegraph-dist/pom.xml index 6da4561bc..0f62a1a39 100644 --- a/hugegraph-dist/pom.xml +++ b/hugegraph-dist/pom.xml @@ -35,9 +35,9 @@ cd $root_path mkdir -p ${final.name} - mv $root_path/hugegraph-hubble/hugegraph-hubble ${final.name}/hugegraph-hubble-${project.version} - mv $root_path/hugegraph-loader/apache-hugegraph-loader-incubating-${project.version} ${final.name}/apache-hugegraph-loader-incubating-${project.version} - mv $root_path/hugegraph-tools/apache-hugegraph-tools-incubating-${project.version} ${final.name}/apache-hugegraph-tools-incubating-${project.version} + mv -v $root_path/hugegraph-hubble/apache-hugegraph-hubble-incubating-${project.version} ${final.name}/ + mv -v $root_path/hugegraph-loader/apache-hugegraph-loader-incubating-${project.version} ${final.name}/ + mv -v $root_path/hugegraph-tools/apache-hugegraph-tools-incubating-${project.version} ${final.name}/ tar -zcvf $root_path/${final.name}.tar.gz ./${final.name} || exit 1 diff --git a/hugegraph-hubble/hubble-dist/pom.xml b/hugegraph-hubble/hubble-dist/pom.xml index 7ac76f5d3..eecfedf53 100644 --- a/hugegraph-hubble/hubble-dist/pom.xml +++ b/hugegraph-hubble/hubble-dist/pom.xml @@ -62,7 +62,7 @@ false ${top.level.dir} ${assembly.descriptor.dir}/assembly.xml - ${release.name} + ${final.name} @@ -85,12 +85,12 @@ echo -e "Hubble-FE build successfully.\n" cd ${top.level.dir} && pwd - rm -rf ${release.name}/ui - cp -r ${hubble-fe.dir}/build ${release.name}/ui + rm -rf ${final.name}/ui + cp -r ${hubble-fe.dir}/build ${final.name}/ui - tar -zcvf ${top.level.dir}/${final.name}.tar.gz ${release.name} || exit 1 - cp -r ${release.name} ./hubble-dist - echo -n "hugegraph-hubble tar.gz available at: " + tar -zcvf ${top.level.dir}/${final.name}.tar.gz ${final.name} || exit 1 + cp -r ${final.name} ./hubble-dist + echo -n "${final.name} tar.gz available at: " echo "${top.level.dir}/${final.name}.tar.gz" rm -f ${top.level.dir}/dist.sh From b8079bacbd9de84183b5587fcff2bee9ac67f9c8 Mon Sep 17 00:00:00 2001 From: JackyYangPassion Date: Thu, 8 Dec 2022 11:11:13 +0800 Subject: [PATCH 3/4] fix hubble ci error --- .../hubble-dist/assembly/travis/install-hugegraph-hubble.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hugegraph-hubble/hubble-dist/assembly/travis/install-hugegraph-hubble.sh b/hugegraph-hubble/hubble-dist/assembly/travis/install-hugegraph-hubble.sh index 4b7759ea4..b2c9de230 100755 --- a/hugegraph-hubble/hubble-dist/assembly/travis/install-hugegraph-hubble.sh +++ b/hugegraph-hubble/hubble-dist/assembly/travis/install-hugegraph-hubble.sh @@ -18,7 +18,7 @@ set -ev TRAVIS_DIR=$(dirname "$0") -HUBBLE_DIR="hugegraph-hubble" +HUBBLE_DIR="apache-hugegraph-hubble-incubating-1.0.0" echo "$TRAVIS_DIR" pwd && mvn -e -X clean package -DskipTests From 75a663a6f1d42cfed42fd398319b95e78df09b52 Mon Sep 17 00:00:00 2001 From: imbajin Date: Thu, 8 Dec 2022 22:44:23 +0800 Subject: [PATCH 4/4] Update install-hugegraph-hubble.sh --- .../assembly/travis/install-hugegraph-hubble.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hugegraph-hubble/hubble-dist/assembly/travis/install-hugegraph-hubble.sh b/hugegraph-hubble/hubble-dist/assembly/travis/install-hugegraph-hubble.sh index b2c9de230..66373aac4 100755 --- a/hugegraph-hubble/hubble-dist/assembly/travis/install-hugegraph-hubble.sh +++ b/hugegraph-hubble/hubble-dist/assembly/travis/install-hugegraph-hubble.sh @@ -18,12 +18,12 @@ set -ev TRAVIS_DIR=$(dirname "$0") -HUBBLE_DIR="apache-hugegraph-hubble-incubating-1.0.0" +HUBBLE_DIR=apache-hugegraph-hubble-* echo "$TRAVIS_DIR" -pwd && mvn -e -X clean package -DskipTests +pwd && mvn -e -X clean package -DskipTests -ntp -cp "${TRAVIS_DIR}"/jacocoagent.jar $HUBBLE_DIR/lib || exit 1 -cp "${TRAVIS_DIR}"/start-hubble.sh $HUBBLE_DIR/bin || exit 1 +cp -v "${TRAVIS_DIR}"/jacocoagent.jar $HUBBLE_DIR/lib || exit 1 +cp -v "${TRAVIS_DIR}"/start-hubble.sh $HUBBLE_DIR/bin || exit 1 ${HUBBLE_DIR}/bin/start-hubble.sh