This is an automated email from the ASF dual-hosted git repository.
zhaocong 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 e53539b7 fix(dist): unify binary name for hubble (#392)
e53539b7 is described below
commit e53539b7b84c2a51264640192dc1967a3209d634
Author: YangJiaqi <[email protected]>
AuthorDate: Fri Dec 9 16:40:56 2022 +0800
fix(dist): unify binary name for hubble (#392)
---
hugegraph-dist/pom.xml | 6 +++---
.../hubble-dist/assembly/travis/install-hugegraph-hubble.sh | 8 ++++----
hugegraph-hubble/hubble-dist/pom.xml | 12 ++++++------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/hugegraph-dist/pom.xml b/hugegraph-dist/pom.xml
index 7680c6b4..0f62a1a3 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/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 -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/assembly/travis/install-hugegraph-hubble.sh
b/hugegraph-hubble/hubble-dist/assembly/travis/install-hugegraph-hubble.sh
index 4b7759ea..66373aac 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="hugegraph-hubble"
+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
diff --git a/hugegraph-hubble/hubble-dist/pom.xml
b/hugegraph-hubble/hubble-dist/pom.xml
index 7ac76f5d..eecfedf5 100644
--- a/hugegraph-hubble/hubble-dist/pom.xml
+++ b/hugegraph-hubble/hubble-dist/pom.xml
@@ -62,7 +62,7 @@
<appendAssemblyId>false</appendAssemblyId>
<outputDirectory>${top.level.dir}</outputDirectory>
<descriptor>${assembly.descriptor.dir}/assembly.xml</descriptor>
- <finalName>${release.name}</finalName>
+ <finalName>${final.name}</finalName>
</configuration>
</execution>
</executions>
@@ -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
</echo>
