diff --git a/.github/workflows/ci-pull-request.yaml b/.github/workflows/ci-pull-request.yaml index e27bf3de97..544640ab60 100644 --- a/.github/workflows/ci-pull-request.yaml +++ b/.github/workflows/ci-pull-request.yaml @@ -60,5 +60,5 @@ jobs: run: ./run.sh pack_tools - name: Unit Testing run: | - source ./config_hdfs.sh + source ./scripts/config_hdfs.sh ./run.sh test --on_travis diff --git a/rdsn b/rdsn index e52e9a0d94..76577b2a40 160000 --- a/rdsn +++ b/rdsn @@ -1 +1 @@ -Subproject commit e52e9a0d94471fad442c6d3f3d46ebe1f7ffa23f +Subproject commit 76577b2a40e7a94bb4f7e4a0ab567ddef4700aad diff --git a/config_hdfs.sh b/scripts/config_hdfs.sh similarity index 100% rename from config_hdfs.sh rename to scripts/config_hdfs.sh diff --git a/scripts/pack_server.sh b/scripts/pack_server.sh index e6126c24d8..40bc7a9f88 100755 --- a/scripts/pack_server.sh +++ b/scripts/pack_server.sh @@ -115,7 +115,7 @@ copy_file ./rdsn/thirdparty/output/lib/sasl2 ${pack}/bin copy_file ./scripts/sendmail.sh ${pack}/bin copy_file ./src/server/config.ini ${pack}/bin copy_file ./src/server/config.min.ini ${pack}/bin -copy_file ./config_hdfs.sh ${pack}/bin +copy_file ./scripts/config_hdfs.sh ${pack}/bin copy_file "$(get_stdcpp_lib $custom_gcc)" "${pack}/bin" diff --git a/scripts/travis.sh b/scripts/travis.sh index 5b851727fa..0dac2d33bb 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -32,7 +32,7 @@ if [ "$modified" ]; then exit 1 fi -source "${root}"/config_hdfs.sh +source "${root}"/scripts/config_hdfs.sh "${root}"/run.sh build -c --skip_thirdparty --disable_gperf && ./run.sh test --on_travis ret=$? if [ $ret ]; then