This is an automated email from the ASF dual-hosted git repository.
urfree pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pulsar-site.git
The following commit(s) were added to refs/heads/main by this push:
new b501ec8 update
b501ec8 is described below
commit b501ec8efb87c58b42a07e8aae359219cf69c38b
Author: LiLi <[email protected]>
AuthorDate: Fri Jan 21 16:49:10 2022 +0800
update
Signed-off-by: LiLi <[email protected]>
---
.../workflows/ci-pulsar-website-next-build.yaml | 14 ++-----
site2/tools/build-site.sh | 6 ++-
site2/tools/docker-build-site.sh | 11 ++++--
site2/tools/pulsar-admin-doc-gen.sh | 44 ++++++++++++----------
site2/tools/pulsar-client-doc-gen.sh | 9 ++++-
site2/tools/pulsar-doc-gen.sh | 33 +++++++++-------
site2/tools/pulsar-perf-doc-gen.sh | 9 ++++-
site2/tools/python-doc-gen.sh | 18 +++++----
8 files changed, 86 insertions(+), 58 deletions(-)
diff --git a/.github/workflows/ci-pulsar-website-next-build.yaml
b/.github/workflows/ci-pulsar-website-next-build.yaml
index 60f456f..8431247 100644
--- a/.github/workflows/ci-pulsar-website-next-build.yaml
+++ b/.github/workflows/ci-pulsar-website-next-build.yaml
@@ -90,20 +90,14 @@ jobs:
GH_TOKEN: ${{ secrets.PULSARBOT_TOKEN }}
CROWDIN_DOCUSAURUS_API_KEY: ${{
secrets.PULSAR_CROWDIN_DOCUSAURUS_API_KEY }}
run: |
- pwd
- ls -l
- echo "testing..."
-
export CROWDIN_DOCUSAURUS_PROJECT_ID=apache-pulsar
echo "Copying swagger json file ..."
mkdir -p site2/website-next/static/swagger/master/
cp ../pulsar/pulsar-broker/target/docs/swagger*.json
site2/website-next/static/swagger/master
+ echo "Copied swagger json file."
+ echo "Building Website"
+ # Build the new website
+ site2/tools/docker-build-site.sh next
- ls -l site2/website-next/static/swagger
-
- # echo "Copied swagger json file."
- # echo "Building Website"
- # # Build the new website
- # site2/tools/docker-build-site.sh next
# # Script was initially made for travis
# bash -e site2/tools/publish-website.sh next
diff --git a/site2/tools/build-site.sh b/site2/tools/build-site.sh
index d6815b0..04bd757 100755
--- a/site2/tools/build-site.sh
+++ b/site2/tools/build-site.sh
@@ -19,7 +19,11 @@
#
ROOT_DIR=$(git rev-parse --show-toplevel)
-VERSION=$(${ROOT_DIR}/src/get-project-version.py)
+cd $ROOT_DIR/../pulsar
+PULSAR_ROOT_DIR=$(pwd)
+cd -
+
+VERSION=$(${PULSAR_ROOT_DIR}/src/get-project-version.py)
NEXT=$1
WEBSITE_DIR="website"
diff --git a/site2/tools/docker-build-site.sh b/site2/tools/docker-build-site.sh
index 39fec80..87a9497 100755
--- a/site2/tools/docker-build-site.sh
+++ b/site2/tools/docker-build-site.sh
@@ -24,7 +24,12 @@
set -e
ROOT_DIR=$(git rev-parse --show-toplevel)
-cd $ROOT_DIR/pulsar-client-cpp
+cd $ROOT_DIR/../pulsar
+PULSAR_ROOT_DIR=$(pwd)
+
+cd $PULSAR_ROOT_DIR/pulsar-client-cpp
+
+pwd
BUILD_IMAGE_NAME="${BUILD_IMAGE_NAME:-apachepulsar/pulsar-build}"
BUILD_IMAGE_VERSION="${BUILD_IMAGE_VERSION:-ubuntu-16.04-pb3-website}"
@@ -42,9 +47,9 @@ CI_GROUP=$(id -g)
CROWDIN_DOCUSAURUS_PROJECT_ID=${CROWDIN_DOCUSAURUS_PROJECT_ID:-"apache-pulsar"}
CROWDIN_DOCUSAURUS_API_KEY=${CROWDIN_DOCUSAURUS_API_KEY:-UNSET}
-DOCKER_CMD="docker run -i -e CI_USER=$CI_USER -e CI_GROUP=$CI_GROUP -v
$HOME/.m2:/root/.m2 -e
CROWDIN_DOCUSAURUS_PROJECT_ID=${CROWDIN_DOCUSAURUS_PROJECT_ID} -e
CROWDIN_DOCUSAURUS_API_KEY=${CROWDIN_DOCUSAURUS_API_KEY} -v $ROOT_DIR:/pulsar
$IMAGE"
+DOCKER_CMD="docker run -i -e CI_USER=$CI_USER -e CI_GROUP=$CI_GROUP -v
$HOME/.m2:/root/.m2 -e
CROWDIN_DOCUSAURUS_PROJECT_ID=${CROWDIN_DOCUSAURUS_PROJECT_ID} -e
CROWDIN_DOCUSAURUS_API_KEY=${CROWDIN_DOCUSAURUS_API_KEY} -v
$PULSAR_ROOT_DIR:/pulsar $ROOT_DIR:/pulsar-site $IMAGE"
sed -i "s#$ROOT_DIR#/pulsar#g"
$ROOT_DIR/distribution/server/target/classpath.txt
sed -i "s#$HOME#/root#g" $ROOT_DIR/distribution/server/target/classpath.txt
-$DOCKER_CMD bash -l -c "export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 &&
cd /pulsar && /pulsar/site2/tools/build-site.sh $1"
\ No newline at end of file
+$DOCKER_CMD bash -l -c "export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 &&
cd /pulsar-site && /pulsar-site/site2/tools/build-site.sh $1"
\ No newline at end of file
diff --git a/site2/tools/pulsar-admin-doc-gen.sh
b/site2/tools/pulsar-admin-doc-gen.sh
index c86cc53..cdab7e1 100755
--- a/site2/tools/pulsar-admin-doc-gen.sh
+++ b/site2/tools/pulsar-admin-doc-gen.sh
@@ -19,7 +19,13 @@
#
ROOT_DIR=$(git rev-parse --show-toplevel)
-VERSION=`${ROOT_DIR}/src/get-project-version.py`
+
+cd $ROOT_DIR/../pulsar
+PULSAR_ROOT_DIR=$(pwd)
+cd -
+
+
+VERSION=`${PULSAR_ROOT_DIR}/src/get-project-version.py`
DEST_DIR=$ROOT_DIR/generated-site
WEBSITE=$1
@@ -29,24 +35,24 @@ mkdir -p $DEST_DIR/tools/pulsar-admin/${VERSION}
mkdir -p $DEST_DIR/tools/pulsar-admin/${VERSION}/node_modules
mkdir -p $ROOT_DIR/site2/${WEBSITE}/brodocs/documents
-$ROOT_DIR/bin/pulsar-admin documents generate broker-stats >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/broker-stats.md
-$ROOT_DIR/bin/pulsar-admin documents generate brokers >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/brokers.md
-$ROOT_DIR/bin/pulsar-admin documents generate clusters >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/clusters.md
-$ROOT_DIR/bin/pulsar-admin documents generate functions >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/functions.md
-$ROOT_DIR/bin/pulsar-admin documents generate functions-worker >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/functions-worker.md
-$ROOT_DIR/bin/pulsar-admin documents generate namespaces >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/namespaces.md
-$ROOT_DIR/bin/pulsar-admin documents generate ns-isolation-policy >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/ns-isolation-policy.md
-$ROOT_DIR/bin/pulsar-admin documents generate sources >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/sources.md
-$ROOT_DIR/bin/pulsar-admin documents generate sinks >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/sinks.md
-$ROOT_DIR/bin/pulsar-admin documents generate topics >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/topics.md
-$ROOT_DIR/bin/pulsar-admin documents generate topicPolicies >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/topicPolicies.md
-$ROOT_DIR/bin/pulsar-admin documents generate proxy-stats >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/proxy-stats.md
-$ROOT_DIR/bin/pulsar-admin documents generate resourcegroups >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/resourcegroups.md
-$ROOT_DIR/bin/pulsar-admin documents generate transactions >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/transactions.md
-$ROOT_DIR/bin/pulsar-admin documents generate tenants >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/tenants.md
-$ROOT_DIR/bin/pulsar-admin documents generate resource-quotas >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/resource-quotas.md
-$ROOT_DIR/bin/pulsar-admin documents generate schemas >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/schemas.md
-$ROOT_DIR/bin/pulsar-admin documents generate packages >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/packages.md
+$PULSAR_ROOT_DIR/bin/pulsar-admin documents generate broker-stats >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/broker-stats.md
+$PULSAR_ROOT_DIR/bin/pulsar-admin documents generate brokers >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/brokers.md
+$PULSAR_ROOT_DIR/bin/pulsar-admin documents generate clusters >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/clusters.md
+$PULSAR_ROOT_DIR/bin/pulsar-admin documents generate functions >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/functions.md
+$PULSAR_ROOT_DIR/bin/pulsar-admin documents generate functions-worker >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/functions-worker.md
+$PULSAR_ROOT_DIR/bin/pulsar-admin documents generate namespaces >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/namespaces.md
+$PULSAR_ROOT_DIR/bin/pulsar-admin documents generate ns-isolation-policy >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/ns-isolation-policy.md
+$PULSAR_ROOT_DIR/bin/pulsar-admin documents generate sources >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/sources.md
+$PULSAR_ROOT_DIR/bin/pulsar-admin documents generate sinks >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/sinks.md
+$PULSAR_ROOT_DIR/bin/pulsar-admin documents generate topics >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/topics.md
+$PULSAR_ROOT_DIR/bin/pulsar-admin documents generate topicPolicies >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/topicPolicies.md
+$PULSAR_ROOT_DIR/bin/pulsar-admin documents generate proxy-stats >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/proxy-stats.md
+$PULSAR_ROOT_DIR/bin/pulsar-admin documents generate resourcegroups >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/resourcegroups.md
+$PULSAR_ROOT_DIR/bin/pulsar-admin documents generate transactions >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/transactions.md
+$PULSAR_ROOT_DIR/bin/pulsar-admin documents generate tenants >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/tenants.md
+$PULSAR_ROOT_DIR/bin/pulsar-admin documents generate resource-quotas >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/resource-quotas.md
+$PULSAR_ROOT_DIR/bin/pulsar-admin documents generate schemas >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/schemas.md
+$PULSAR_ROOT_DIR/bin/pulsar-admin documents generate packages >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/packages.md
cd $ROOT_DIR/site2/${WEBSITE}/brodocs
cp pulsar-admin-manifest.json manifest.json
diff --git a/site2/tools/pulsar-client-doc-gen.sh
b/site2/tools/pulsar-client-doc-gen.sh
index 1acf533..08bcbe9 100755
--- a/site2/tools/pulsar-client-doc-gen.sh
+++ b/site2/tools/pulsar-client-doc-gen.sh
@@ -19,7 +19,12 @@
#
ROOT_DIR=$(git rev-parse --show-toplevel)
-VERSION=`${ROOT_DIR}/src/get-project-version.py`
+
+cd $ROOT_DIR/../pulsar
+PULSAR_ROOT_DIR=$(pwd)
+cd -
+
+VERSION=`${PULSAR_ROOT_DIR}/src/get-project-version.py`
DEST_DIR=$ROOT_DIR/generated-site
WEBSITE=$1
@@ -29,7 +34,7 @@ mkdir -p $DEST_DIR/tools/pulsar-client/${VERSION}
mkdir -p $DEST_DIR/tools/pulsar-client/${VERSION}/node_modules
mkdir -p $ROOT_DIR/site2/${WEBSITE}/brodocs/documents
-$ROOT_DIR/bin/pulsar-client generate_documentation >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/pulsar-client.md
+$PULSAR_ROOT_DIR/bin/pulsar-client generate_documentation >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/pulsar-client.md
cd $ROOT_DIR/site2/${WEBSITE}/brodocs
cp pulsar-client-manifest.json manifest.json
diff --git a/site2/tools/pulsar-doc-gen.sh b/site2/tools/pulsar-doc-gen.sh
index 3468ea6..370a443 100755
--- a/site2/tools/pulsar-doc-gen.sh
+++ b/site2/tools/pulsar-doc-gen.sh
@@ -19,7 +19,12 @@
#
ROOT_DIR=$(git rev-parse --show-toplevel)
-VERSION=`${ROOT_DIR}/src/get-project-version.py`
+
+cd $ROOT_DIR/../pulsar
+PULSAR_ROOT_DIR=$(pwd)
+cd -
+
+VERSION=`${PULSAR_ROOT_DIR}/src/get-project-version.py`
DEST_DIR=$ROOT_DIR/generated-site
WEBSITE=$1
@@ -29,19 +34,19 @@ mkdir -p $DEST_DIR/tools/pulsar/${VERSION}
mkdir -p $DEST_DIR/tools/pulsar/${VERSION}/node_modules
mkdir -p $ROOT_DIR/site2/${WEBSITE}/brodocs/documents
-$ROOT_DIR/bin/pulsar broker -g >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/broker.md
-$ROOT_DIR/bin/pulsar broker-tool gen-doc >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/broker-tool.md
-$ROOT_DIR/bin/pulsar compact-topic -t tmp -g >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/compact-topic.md
-$ROOT_DIR/bin/pulsar tokens gen-doc >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/tokens.md
-$ROOT_DIR/bin/pulsar proxy -g >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/proxy.md
-$ROOT_DIR/bin/pulsar functions-worker -g >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/functions-worker.md
-$ROOT_DIR/bin/pulsar standalone -g >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/standalone.md
-$ROOT_DIR/bin/pulsar initialize-cluster-metadata -cs cs -uw uw -zk zk -c c -g
> $ROOT_DIR/site2/${WEBSITE}/brodocs/documents/initialize-cluster-metadata.md
-$ROOT_DIR/bin/pulsar delete-cluster-metadata -zk zk -g >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/delete-cluster-metadata.md
-$ROOT_DIR/bin/pulsar initialize-transaction-coordinator-metadata -cs cs -c c
-g >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/initialize-transaction-coordinator-metadata.md
-$ROOT_DIR/bin/pulsar initialize-namespace -cs cs -c c -g demo >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/initialize-namespace.md
-$ROOT_DIR/bin/pulsar version -g >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/version.md
-$ROOT_DIR/bin/pulsar websocket -g >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/websocket.md
+$PULSAR_ROOT_DIR/bin/pulsar broker -g >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/broker.md
+$PULSAR_ROOT_DIR/bin/pulsar broker-tool gen-doc >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/broker-tool.md
+$PULSAR_ROOT_DIR/bin/pulsar compact-topic -t tmp -g >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/compact-topic.md
+$PULSAR_ROOT_DIR/bin/pulsar tokens gen-doc >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/tokens.md
+$PULSAR_ROOT_DIR/bin/pulsar proxy -g >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/proxy.md
+$PULSAR_ROOT_DIR/bin/pulsar functions-worker -g >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/functions-worker.md
+$PULSAR_ROOT_DIR/bin/pulsar standalone -g >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/standalone.md
+$PULSAR_ROOT_DIR/bin/pulsar initialize-cluster-metadata -cs cs -uw uw -zk zk
-c c -g >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/initialize-cluster-metadata.md
+$PULSAR_ROOT_DIR/bin/pulsar delete-cluster-metadata -zk zk -g >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/delete-cluster-metadata.md
+$PULSAR_ROOT_DIR/bin/pulsar initialize-transaction-coordinator-metadata -cs cs
-c c -g >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/initialize-transaction-coordinator-metadata.md
+$PULSAR_ROOT_DIR/bin/pulsar initialize-namespace -cs cs -c c -g demo >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/initialize-namespace.md
+$PULSAR_ROOT_DIR/bin/pulsar version -g >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/version.md
+$PULSAR_ROOT_DIR/bin/pulsar websocket -g >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/websocket.md
cd $ROOT_DIR/site2/${WEBSITE}/brodocs
cp pulsar-manifest.json manifest.json
diff --git a/site2/tools/pulsar-perf-doc-gen.sh
b/site2/tools/pulsar-perf-doc-gen.sh
index cc8b30c..d64756a 100755
--- a/site2/tools/pulsar-perf-doc-gen.sh
+++ b/site2/tools/pulsar-perf-doc-gen.sh
@@ -19,7 +19,12 @@
#
ROOT_DIR=$(git rev-parse --show-toplevel)
-VERSION=`${ROOT_DIR}/src/get-project-version.py`
+
+cd $ROOT_DIR/../pulsar
+PULSAR_ROOT_DIR=$(pwd)
+cd -
+
+VERSION=`${PULSAR_ROOT_DIR}/src/get-project-version.py`
DEST_DIR=$ROOT_DIR/generated-site
WEBSITE=$1
@@ -29,7 +34,7 @@ mkdir -p $DEST_DIR/tools/pulsar-perf/${VERSION}
mkdir -p $DEST_DIR/tools/pulsar-perf/${VERSION}/node_modules
mkdir -p $ROOT_DIR/site2/${WEBSITE}/brodocs/documents
-$ROOT_DIR/bin/pulsar-perf gen-doc >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/pulsar-perf.md
+$PULSAR_ROOT_DIR/bin/pulsar-perf gen-doc >
$ROOT_DIR/site2/${WEBSITE}/brodocs/documents/pulsar-perf.md
cd $ROOT_DIR/site2/${WEBSITE}/brodocs
cp pulsar-perf-manifest.json manifest.json
diff --git a/site2/tools/python-doc-gen.sh b/site2/tools/python-doc-gen.sh
index 1f6b722..54fb700 100755
--- a/site2/tools/python-doc-gen.sh
+++ b/site2/tools/python-doc-gen.sh
@@ -21,15 +21,19 @@
set -xe
ROOT_DIR=$(git rev-parse --show-toplevel)
-VERSION=`${ROOT_DIR}/src/get-project-version.py`
+cd $ROOT_DIR/../pulsar
+PULSAR_ROOT_DIR=$(pwd)
+cd -
+
+VERSION=`${PULSAR_ROOT_DIR}/src/get-project-version.py`
# Make sure the Python client lib is installed
# so that Pdoc can import the module
-find $ROOT_DIR -name CMakeCache.txt | xargs rm -f
-find $ROOT_DIR -name CMakeFiles | xargs rm -rf
-find $ROOT_DIR -name PulsarApi.pb.h | xargs rm -rf
-find $ROOT_DIR -name PulsarApi.pb.cc | xargs rm -rf
-cd $ROOT_DIR/pulsar-client-cpp
+find $PULSAR_ROOT_DIR -name CMakeCache.txt | xargs rm -f
+find $PULSAR_ROOT_DIR -name CMakeFiles | xargs rm -rf
+find $PULSAR_ROOT_DIR -name PulsarApi.pb.h | xargs rm -rf
+find $PULSAR_ROOT_DIR -name PulsarApi.pb.cc | xargs rm -rf
+cd $PULSAR_ROOT_DIR/pulsar-client-cpp
export CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Debug -DBUILD_DYNAMIC_LIB=OFF
-DPYTHON_INCLUDE_DIR=/usr/include/python2.7
-DPYTHON_LIBRARY=/usr/lib/x86_64-linux-gnu/libpython2.7.so"
cmake . $CMAKE_ARGS
make -j8 _pulsar
@@ -43,7 +47,7 @@ pip install pdoc
DESTINATION=$ROOT_DIR/generated-site/api/python/${VERSION}
rm -fr $DESTINATION
mkdir -p $DESTINATION
-PYTHONPATH=$ROOT_DIR/pulsar-client-cpp/python pdoc pulsar \
+PYTHONPATH=$PULSAR_ROOT_DIR/pulsar-client-cpp/python pdoc pulsar \
--html \
--html-dir $DESTINATION
mv -f $DESTINATION/pulsar/* $DESTINATION/
