Mukvin commented on code in PR #1961:
URL: https://github.com/apache/kylin/pull/1961#discussion_r960151400
##########
build/release/download-spark.sh:
##########
@@ -54,7 +54,7 @@ rm -rf build/spark/data
rm -rf build/spark/R
rm -rf build/spark/hive_1_2_2
-cp -rf build/hadoop3 build/spark/
+#cp -rf build/hadoop3 build/spark/
Review Comment:
here will add an external compatible jar for CDH 6.1, it can be removed.
##########
build/release/package.sh:
##########
@@ -20,58 +20,63 @@
dir=$(dirname ${0})
cd ${dir}/../..
-source build/apache_release/functions.sh
+source build/release/functions.sh
-echo "Packing for KE..."
+echo "Packing for Apache Kylin ..."
# Make share commands exist in environment
echo "BUILD STAGE 1 - Checking environment..."
checkCommandExists mvn
checkCommandExists git
checkCommandExists npm
+# Fetch ${release_version} from pom.xml
exportProjectVersions
-kap_commit_sha1=`git rev-parse HEAD`
-echo "${kap_commit_sha1}@KAP" > build/commit_SHA1
+kylin_commit_sha1=`git rev-parse HEAD`
+if [[ "${current_branch}" = "" ]]; then
+ current_branch=$(git branch | sed -n -e 's/^\* \(.*\)/\1/p')
+fi
+echo "${kylin_commit_sha1}@${current_branch}" > build/commit_SHA1
if [ -z "$BUILD_SYSTEM" ]; then
BUILD_SYSTEM="MANUAL"
fi
echo "Build with ${BUILD_SYSTEM} at" `date "+%Y-%m-%d %H:%M:%S"` >>
build/commit_SHA1
-KYLIN_VERSION_NAME="Kylin 5 ${release_version}"
+KYLIN_VERSION_NAME="Apache Kylin ${release_version}"
echo "${KYLIN_VERSION_NAME}" > build/VERSION
echo "VERSION file content:" ${KYLIN_VERSION_NAME}
echo "BUILD STAGE 2 - Build binaries..."
-sh build/apache_release/build.sh $@ || { exit 1; }
+sh build/release/build.sh $@ || { exit 1; }
if [[ "${WITH_SPARK}" = "1" ]]; then
echo "BUILD STAGE 3 - Prepare spark..."
- sh -x build/apache_release/download-spark.sh || { exit 1; }
+ sh build/release/download-spark.sh || { exit 1; }
Review Comment:
it is recommended to use with "-x"
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
