Skip to content

fix(dist): unify binary name for hubble #392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coderzc merged 4 commits into from
Dec 9, 2022
Merged

fix(dist): unify binary name for hubble #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34c6cfd
fix hugegraph-dist package failed
Dec 6, 2022
064f11e
rename package name
Dec 7, 2022
b8079ba
fix hubble ci error
JackyYangPassion Dec 8, 2022
75a663a
Update install-hugegraph-hubble.sh
imbajin Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions hugegraph-dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}/
Comment on lines +38 to +40
Copy link
Copy Markdown
Member

@imbajin imbajin Dec 8, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@z7658329 will the ${final.name} be different in one pom file? seems a little strange

is the output right?

Copy link
Copy Markdown
Member

@imbajin imbajin Dec 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@z7658329 will the ${final.name} be different in one pom file? seems a little strange

is the output right?

make a mistake, the 2nd param is the dest dir (treat as the source dir before, which is wrong)

and shall we use mv -v xx/*/*hugegraph-*xx/ destDir/ to replace current command?

but current way is more accurate, use it


tar -zcvf $root_path/${final.name}.tar.gz ./${final.name} || exit 1

Expand Down
8 changes: 4 additions & 4 deletions hugegraph-hubble/hubble-dist/assembly/travis/install-hugegraph-hubble.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 6 additions & 6 deletions hugegraph-hubble/hubble-dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -85,12 +85,12 @@
echo -e "Hubble-FE build successfully.\n"

cd ${top.level.dir} &amp;&amp; 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>
Expand Down