Skip to content

Commit

Permalink
update paths
Browse files Browse the repository at this point in the history
  • Loading branch information
acelyc111 committed Sep 23, 2024
1 parent 1d1a8c8 commit 407bbe0
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/actions/rebuild_thirdparty_if_needed/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ runs:
cmake --build build/ -j $(nproc)
rm -rf build/Build build/Download/[a-y]* build/Source/[a-g]* build/Source/[i-q]* build/Source/[s-z]*
find ./ -name '*CMakeFiles*' -type d -exec rm -rf "{}" +
../build_tools/download_hadoop.sh hadoop-bin
../build_tools/download_zk.sh zookeeper-bin
../admin_tools/download_hadoop.sh hadoop-bin
../admin_tools/download_zk.sh zookeeper-bin
rm -rf hadoop-bin/share/doc
rm -rf zookeeper-bin/docs
mv hadoop-bin ..
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion build_tools/start_zk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ cd "$INSTALL_DIR" || exit
ZOOKEEPER_HOME=`pwd`/apache-zookeeper-3.7.0-bin

if [ ! -d "${ZOOKEEPER_HOME}" ]; then
${CWD}/download_zk.sh zookeeper-bin
${CWD}/../admin_tools/download_zk.sh zookeeper-bin
ZOOKEEPER_HOME=`pwd`/zookeeper-bin
fi

Expand Down
4 changes: 2 additions & 2 deletions docker/thirdparties-bin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ RUN git clone --depth=1 --branch=${GITHUB_BRANCH} ${GITHUB_REPOSITORY_URL} \
&& unzip /root/thirdparties-src.zip -d . \
&& cmake -DCMAKE_BUILD_TYPE=Release -DROCKSDB_PORTABLE=${ROCKSDB_PORTABLE} -DUSE_JEMALLOC=${USE_JEMALLOC} -B build/ . \
&& cmake --build build/ -j $(($(nproc)/2+1)) \
&& ../build_tools/download_hadoop.sh ${HADOOP_BIN_PATH} \
&& ../build_tools/download_zk.sh ${ZOOKEEPER_BIN_PATH} \
&& ../admin_tools/download_hadoop.sh ${HADOOP_BIN_PATH} \
&& ../admin_tools/download_zk.sh ${ZOOKEEPER_BIN_PATH} \
&& zip -r ~/thirdparties-bin.zip output/ build/Source/rocksdb/cmake build/Source/http-parser build/Source/hadoop build/Download/zookeeper ${HADOOP_BIN_PATH} ${ZOOKEEPER_BIN_PATH} \
&& cd ~ \
&& rm -rf incubator-pegasus;
2 changes: 1 addition & 1 deletion run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2107,7 +2107,7 @@ case $cmd in
pack_server)
shift
# source the config_hdfs.sh to get the HADOOP_HOME.
source "${ROOT}"/scripts/config_hdfs.sh
source "${ROOT}"/admin_tools/config_hdfs.sh
PEGASUS_ROOT=$ROOT ./build_tools/pack_server.sh $*
;;
pack_client)
Expand Down

0 comments on commit 407bbe0

Please sign in to comment.