You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by xx...@apache.org on 2023/04/21 08:48:30 UTC
[kylin] 02/09: Update release scripts
This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit c0e48bbcab89b1a0b16e3a5e5361eef66179fe71
Author: XiaoxiangYu <xx...@apache.org>
AuthorDate: Tue Apr 4 11:38:52 2023 +0800
Update release scripts
---
.../async-profiler-lib/download-async-profiler.sh | 21 +++++++++++++++++++++
.../libasyncProfiler-linux-arm64.so | Bin 298256 -> 0 bytes
.../libasyncProfiler-linux-x64.so | Bin 303903 -> 0 bytes
build/async-profiler-lib/libasyncProfiler-mac.so | Bin 634272 -> 0 bytes
build/release/compress.sh | 14 ++++++++++----
build/release/jdbc_package.sh | 4 ++--
.../release-machine/script/release-publish.sh | 17 ++++++++++++++++-
pom.xml | 4 ++--
src/jdbc/libs/log4j-api-2.18.0.jar | Bin 315115 -> 0 bytes
src/jdbc/libs/log4j-core-2.18.0.jar | Bin 1861441 -> 0 bytes
src/jdbc/libs/log4j-slf4j-impl-2.18.0.jar | Bin 24801 -> 0 bytes
.../resources/org-apache-kylin-jdbc.properties | 6 +++---
src/spark-project/examples/buildKylinFact.zip | Bin 12326261 -> 0 bytes
13 files changed, 54 insertions(+), 12 deletions(-)
diff --git a/build/async-profiler-lib/download-async-profiler.sh b/build/async-profiler-lib/download-async-profiler.sh
new file mode 100644
index 0000000000..bbb33b26a1
--- /dev/null
+++ b/build/async-profiler-lib/download-async-profiler.sh
@@ -0,0 +1,21 @@
+#
+# /*
+# * Licensed to the Apache Software Foundation (ASF) under one
+# * or more contributor license agreements. See the NOTICE file
+# * distributed with this work for additional information
+# * regarding copyright ownership. The ASF licenses this file
+# * to you under the Apache License, Version 2.0 (the
+# * "License"); you may not use this file except in compliance
+# * with the License. You may obtain a copy of the License at
+# *
+# * http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# */
+#
+
+wget https://github.com/jvm-profiling-tools/async-profiler/releases/download/v2.9/async-profiler-2.9-linux-x64.tar.gz
\ No newline at end of file
diff --git a/build/async-profiler-lib/libasyncProfiler-linux-arm64.so b/build/async-profiler-lib/libasyncProfiler-linux-arm64.so
deleted file mode 100644
index b959823506..0000000000
Binary files a/build/async-profiler-lib/libasyncProfiler-linux-arm64.so and /dev/null differ
diff --git a/build/async-profiler-lib/libasyncProfiler-linux-x64.so b/build/async-profiler-lib/libasyncProfiler-linux-x64.so
deleted file mode 100644
index 6d961cec0d..0000000000
Binary files a/build/async-profiler-lib/libasyncProfiler-linux-x64.so and /dev/null differ
diff --git a/build/async-profiler-lib/libasyncProfiler-mac.so b/build/async-profiler-lib/libasyncProfiler-mac.so
deleted file mode 100644
index ad45237d5f..0000000000
Binary files a/build/async-profiler-lib/libasyncProfiler-mac.so and /dev/null differ
diff --git a/build/release/compress.sh b/build/release/compress.sh
index 71c5ad3978..e0d646fb40 100755
--- a/build/release/compress.sh
+++ b/build/release/compress.sh
@@ -46,10 +46,12 @@ if [[ -d "influxdb" ]]; then
cp -rf postgresql ${package_name}/
fi
-# copy async profiler native files
-cp -rf async-profiler-lib/libasyncProfiler-mac.so "${package_name}"/lib/libasyncProfiler-mac.so
-cp -rf async-profiler-lib/libasyncProfiler-linux-x64.so "${package_name}"/lib/libasyncProfiler-linux-x64.so
-cp -rf async-profiler-lib/libasyncProfiler-linux-arm64.so "${package_name}"/lib/libasyncProfiler-linux-arm64.so
+## copy async profiler native files
+bash async-profiler-lib/download-async-profiler.sh
+cp -rf async-profiler-2.9-linux-x64.tar.gz "${package_name}"/lib/libasyncProfiler-linux-x64.so
+#cp -rf async-profiler-lib/libasyncProfiler-mac.so "${package_name}"/lib/libasyncProfiler-mac.so
+#cp -rf async-profiler-lib/libasyncProfiler-linux-x64.so "${package_name}"/lib/libasyncProfiler-linux-x64.so
+#cp -rf async-profiler-lib/libasyncProfiler-linux-arm64.so "${package_name}"/lib/libasyncProfiler-linux-arm64.so
# Add ssb data preparation files
mkdir -p ${package_name}/tool/ssb
@@ -62,6 +64,10 @@ cp -rf ../build/deploy/grafana/dashboards ${package_name}/tool/grafana/
cp -rf ../build/deploy/grafana/provisioning ${package_name}/tool/grafana/
cp -rf ../build/deploy/grafana/custom.ini ${package_name}/tool/grafana/
+# Add JDBC Driver
+bash release/jdbc_package.sh
+cp ../jdbc_dist/kylin-jdbc-${RELEASE_VERSION}.tar.gz "${package_name}"/lib
+
# Add conf profiles
mkdir -p ${package_name}/conf
mkdir -p ${package_name}/tool/conf
diff --git a/build/release/jdbc_package.sh b/build/release/jdbc_package.sh
index fe8c0f831a..a8c41b8f84 100755
--- a/build/release/jdbc_package.sh
+++ b/build/release/jdbc_package.sh
@@ -23,7 +23,7 @@ cd ${dir}/../..
mvn versions:set -DnewVersion=${RELEASE_VERSION}
RELEASE_VERSION=$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)
-mvn clean install -e -DskipTests -pl src/jdbc
+mvn install -DskipTests -pl src/jdbc
if [[ -d jdbc_dist ]]; then
rm -rf jdbc_dist/*
@@ -32,7 +32,7 @@ mkdir -p jdbc_dist
cp src/jdbc/target/kylin-*.jar jdbc_dist/
cp src/jdbc/target/kylin-jdbc.properties jdbc_dist/
-cp src/jdbc/libs/*.jar jdbc_dist/
+#cp src/jdbc/libs/*.jar jdbc_dist/
rm -f jdbc_dist/*-tests.jar
cd jdbc_dist
tar -zcvf kylin-jdbc-${RELEASE_VERSION}.tar.gz ./*
diff --git a/build/release/release-pipeline-docker/release-machine/script/release-publish.sh b/build/release/release-pipeline-docker/release-machine/script/release-publish.sh
index d868e7e772..8c5c5a082a 100644
--- a/build/release/release-pipeline-docker/release-machine/script/release-publish.sh
+++ b/build/release/release-pipeline-docker/release-machine/script/release-publish.sh
@@ -46,6 +46,12 @@ function run_command {
#### Release Configuration
source /root/scripts/setenv.sh
+if [ $# -eq 0 ]; then
+ RELEASE_STEP="publish-rc"
+else
+ RELEASE_STEP=$1
+fi
+echo "==> Running step : $RELEASE_STEP"
GIT_BRANCH=${GIT_BRANCH:-kylin5}
ASF_USERNAME=${ASF_USERNAME:-xxyu}
@@ -111,6 +117,15 @@ if [[ "$RELEASE_STEP" == "publish-rc" ]]; then
fi
fi
+if [[ "$RELEASE_STEP" == "reset" ]]; then
+ echo "==> reset release folder"
+ cd ${source_code_folder}
+ git reset --hard HEAD~5
+ git pull -r origin "$GIT_BRANCH"
+ mvn clean
+ mvn release:clean
+fi
+
####################################################
####################################################
#### Publish maven artifact and source package
@@ -141,7 +156,7 @@ if [[ "$RELEASE_STEP" == "publish-rc" ]]; then
# Create a directory for this release candidate
mkdir -p ${release_candidate_folder}
- # rm -rf target/apache-kylin-*ource-release.zip.asc.sha256
+ rm -rf target/apache-kylin-*ource-release.zip.asc.sha256
# Move source code and signture of source code to release candidate directory
cp target/apache-kylin-*source-release.zip* "${release_candidate_folder}"
diff --git a/pom.xml b/pom.xml
index 4dfba2dd28..adf6002c5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3633,8 +3633,8 @@
<exclude>src/examples/sample_cube/template/**</exclude>
<exclude>src/examples/test_case_data/localmeta/**</exclude>
<exclude>src/examples/test_case_data/parquet_test/**</exclude>
- <exclude>**/src/spark-project/engine-spark/metastore_db/db.lck</exclude>
- <exclude>**/src/spark-project/engine-spark/metastore_db/service.properties</exclude>
+ <exclude>**/metastore_db/*.lck</exclude>
+ <exclude>**/metastore_db/*.properties</exclude>
<!-- generated files -->
<exclude>**/target/**</exclude>
diff --git a/src/jdbc/libs/log4j-api-2.18.0.jar b/src/jdbc/libs/log4j-api-2.18.0.jar
deleted file mode 100644
index b4e933f7ec..0000000000
Binary files a/src/jdbc/libs/log4j-api-2.18.0.jar and /dev/null differ
diff --git a/src/jdbc/libs/log4j-core-2.18.0.jar b/src/jdbc/libs/log4j-core-2.18.0.jar
deleted file mode 100644
index d6486fdf3d..0000000000
Binary files a/src/jdbc/libs/log4j-core-2.18.0.jar and /dev/null differ
diff --git a/src/jdbc/libs/log4j-slf4j-impl-2.18.0.jar b/src/jdbc/libs/log4j-slf4j-impl-2.18.0.jar
deleted file mode 100644
index cc41910c32..0000000000
Binary files a/src/jdbc/libs/log4j-slf4j-impl-2.18.0.jar and /dev/null differ
diff --git a/src/jdbc/src/main/resources/org-apache-kylin-jdbc.properties b/src/jdbc/src/main/resources/org-apache-kylin-jdbc.properties
index 68918b146c..3814b4baa8 100644
--- a/src/jdbc/src/main/resources/org-apache-kylin-jdbc.properties
+++ b/src/jdbc/src/main/resources/org-apache-kylin-jdbc.properties
@@ -16,10 +16,10 @@
# limitations under the License.
#
-driver.name=Kylin JDBC Driver
-driver.version=0.1
+driver.name=Apache Kylin JDBC Driver
+driver.version=1.0
product.name=Kylin
-product.version=0.1
+product.version=1.0
jdbc.compliant=true
driver.version.major=0
driver.version.minor=8
diff --git a/src/spark-project/examples/buildKylinFact.zip b/src/spark-project/examples/buildKylinFact.zip
deleted file mode 100644
index 96b8652904..0000000000
Binary files a/src/spark-project/examples/buildKylinFact.zip and /dev/null differ