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 bc158f2 update
bc158f2 is described below
commit bc158f28247a725773451b82cc0249c3144fb5c1
Author: LiLi <[email protected]>
AuthorDate: Fri Mar 4 15:12:28 2022 +0800
update
Signed-off-by: LiLi <[email protected]>
---
.../workflows/ci-pulsar-website-next-build.yaml | 86 +++++++++++-----------
site2/tools/build-site.sh | 47 ++++++------
site2/tools/docker-build-site.sh | 6 +-
site2/website-next/scripts/split-version-build.sh | 82 ++++++++++-----------
4 files changed, 110 insertions(+), 111 deletions(-)
diff --git a/.github/workflows/ci-pulsar-website-next-build.yaml
b/.github/workflows/ci-pulsar-website-next-build.yaml
index 33b1154..eac0ab7 100644
--- a/.github/workflows/ci-pulsar-website-next-build.yaml
+++ b/.github/workflows/ci-pulsar-website-next-build.yaml
@@ -50,59 +50,59 @@ jobs:
echo "$file was modified"
done
- # - name: Tune Runner VM
- # uses: ./.github/actions/tune-runner-vm
+ - name: Tune Runner VM
+ uses: ./.github/actions/tune-runner-vm
- # - name: Cache local Maven repository
- # uses: actions/cache@v2
- # with:
- # path: |
- # ~/.m2/repository/*/*/*
- # !~/.m2/repository/org/apache/pulsar
- # key: ${{ runner.os }}-m2-dependencies-website-${{
hashFiles('**/pom.xml') }}
- # restore-keys: |
- # ${{ runner.os }}-m2-dependencies-all-${{ hashFiles('**/pom.xml')
}}
- # ${{ runner.os }}-m2-dependencies-core-modules-${{
hashFiles('**/pom.xml') }}
- # ${{ runner.os }}-m2-dependencies-core-modules-
+ - name: Cache local Maven repository
+ uses: actions/cache@v2
+ with:
+ path: |
+ ~/.m2/repository/*/*/*
+ !~/.m2/repository/org/apache/pulsar
+ key: ${{ runner.os }}-m2-dependencies-website-${{
hashFiles('**/pom.xml') }}
+ restore-keys: |
+ ${{ runner.os }}-m2-dependencies-all-${{ hashFiles('**/pom.xml') }}
+ ${{ runner.os }}-m2-dependencies-core-modules-${{
hashFiles('**/pom.xml') }}
+ ${{ runner.os }}-m2-dependencies-core-modules-
- # - name: Set up JDK 11
- # uses: actions/setup-java@v2
- # with:
- # distribution: "temurin"
- # java-version: 11
+ - name: Set up JDK 11
+ uses: actions/setup-java@v2
+ with:
+ distribution: "temurin"
+ java-version: 11
- # - name: Clean disk
- # run: |
- # sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
- # sudo apt clean
- # docker rmi $(docker images -q) -f
- # df -h
+ - name: Clean disk
+ run: |
+ sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
+ sudo apt clean
+ docker rmi $(docker images -q) -f
+ df -h
- # - name: Clone Pulsar
- # run: |
- # cd ../
- # git clone -b master --depth 1 https://github.com/apache/pulsar.git
- # rm -rf pulsar/.git
- # rm -rf pulsar/site2
- # mv pulsar/* pulsar-site/
+ - name: Clone Pulsar
+ run: |
+ cd ../
+ git clone -b master --depth 1 https://github.com/apache/pulsar.git
+ rm -rf pulsar/.git
+ rm -rf pulsar/site2
+ mv pulsar/* pulsar-site/
- # - name: Run install by skip tests
- # run: mvn -q -B -ntp install -Pcore-modules,-main -DskipTests
-DskipSourceReleaseAssembly=true -Dspotbugs.skip=true -Dlicense.skip=true
+ - name: Run install by skip tests
+ run: mvn -q -B -ntp install -Pcore-modules,-main -DskipTests
-DskipSourceReleaseAssembly=true -Dspotbugs.skip=true -Dlicense.skip=true
- # - name: Generate swagger json file
- # run: mvn -B -ntp -pl pulsar-broker install -DskipTests -Pswagger
+ - name: Generate swagger json file
+ run: mvn -B -ntp -pl pulsar-broker install -DskipTests -Pswagger
- name: Publish
env:
GH_TOKEN: ${{ secrets.PULSARBOT_TOKEN }}
CROWDIN_PERSONAL_TOKEN: ${{
secrets.NEXT_CROWDIN_DOCUSAURUS_API_TOKEN }}
run: |
- # echo "Copying swagger json file ..."
- # mkdir -p site2/website-next/static/swagger/master/
- # cp pulsar-broker/target/docs/swagger*.json
site2/website-next/static/swagger/master
- # echo "Copied swagger json file."
- # echo "Building Website"
- # # Build the new website
- # sed -i "s#CROWDIN_PERSONAL_TOKEN#$CROWDIN_PERSONAL_TOKEN#g"
site2/website-next/crowdin.yml
+ echo "Copying swagger json file ..."
+ mkdir -p site2/website-next/static/swagger/master/
+ cp pulsar-broker/target/docs/swagger*.json
site2/website-next/static/swagger/master
+ echo "Copied swagger json file."
+ echo "Building Website"
+ # Build the new website
+ sed -i "s#CROWDIN_PERSONAL_TOKEN#$CROWDIN_PERSONAL_TOKEN#g"
site2/website-next/crowdin.yml
site2/tools/docker-build-site.sh next ${{
steps.changed-files.outputs.all_changed_and_modified_files }}
- # bash -e site2/tools/publish-website.sh next
+ bash -e site2/tools/publish-website.sh next
diff --git a/site2/tools/build-site.sh b/site2/tools/build-site.sh
index 6eb67f7..ad184bb 100755
--- a/site2/tools/build-site.sh
+++ b/site2/tools/build-site.sh
@@ -91,21 +91,20 @@ EOF
set -x -e
-# export NODE_OPTIONS="--max-old-space-size=16000"
-# ${ROOT_DIR}/site2/tools/generate-api-docs.sh
+export NODE_OPTIONS="--max-old-space-size=16000"
+${ROOT_DIR}/site2/tools/generate-api-docs.sh
cd ${ROOT_DIR}/site2/$WEBSITE_DIR
-# yarn
+yarn
if [ -n "$NEXT" ]; then
- # yarn download
+ yarn download
- # node scripts/replace.js
- # node scripts/split-swagger-by-version.js
- # Because there are too many versions of the document, the memory overflows
during the full build.
+ node scripts/replace.js
+ node scripts/split-swagger-by-version.js
+ # Because there are too many versions of the document, the memory overflows
during the full build.
# The split-version-build script is used to build in different versions, and
finally the build results are merged.
echo "all params: "$@
- echo "split version build for files: "$2
bash scripts/split-version-build.sh $@
else
crowdin
@@ -115,19 +114,19 @@ else
fi
# Generate document for command line tools.
-# ${ROOT_DIR}/site2/tools/pulsar-admin-doc-gen.sh $WEBSITE_DIR
-# ${ROOT_DIR}/site2/tools/pulsar-client-doc-gen.sh $WEBSITE_DIR
-# ${ROOT_DIR}/site2/tools/pulsar-perf-doc-gen.sh $WEBSITE_DIR
-# ${ROOT_DIR}/site2/tools/pulsar-doc-gen.sh $WEBSITE_DIR
-# cd ${ROOT_DIR}/site2/$WEBSITE_DIR
-
-# rm -rf ${ROOT_DIR}/generated-site/content
-# mkdir -p ${ROOT_DIR}/generated-site/content
-# cp -R ${ROOT_DIR}/generated-site/api ${ROOT_DIR}/generated-site/content
-# if [ -n "$NEXT" ]; then
-# cp -R ./build/* ${ROOT_DIR}/generated-site/content
-# else
-# cp -R ./build/pulsar/* ${ROOT_DIR}/generated-site/content
-# fi
-# cp -R ${ROOT_DIR}/generated-site/tools ${ROOT_DIR}/generated-site/content
-# cp -R ${ROOT_DIR}/site2/$WEBSITE_DIR/static/swagger/*
${ROOT_DIR}/generated-site/content/swagger/
+${ROOT_DIR}/site2/tools/pulsar-admin-doc-gen.sh $WEBSITE_DIR
+${ROOT_DIR}/site2/tools/pulsar-client-doc-gen.sh $WEBSITE_DIR
+${ROOT_DIR}/site2/tools/pulsar-perf-doc-gen.sh $WEBSITE_DIR
+${ROOT_DIR}/site2/tools/pulsar-doc-gen.sh $WEBSITE_DIR
+cd ${ROOT_DIR}/site2/$WEBSITE_DIR
+
+rm -rf ${ROOT_DIR}/generated-site/content
+mkdir -p ${ROOT_DIR}/generated-site/content
+cp -R ${ROOT_DIR}/generated-site/api ${ROOT_DIR}/generated-site/content
+if [ -n "$NEXT" ]; then
+ cp -R ./build/* ${ROOT_DIR}/generated-site/content
+else
+ cp -R ./build/pulsar/* ${ROOT_DIR}/generated-site/content
+fi
+cp -R ${ROOT_DIR}/generated-site/tools ${ROOT_DIR}/generated-site/content
+cp -R ${ROOT_DIR}/site2/$WEBSITE_DIR/static/swagger/*
${ROOT_DIR}/generated-site/content/swagger/
diff --git a/site2/tools/docker-build-site.sh b/site2/tools/docker-build-site.sh
index 5b48966..e07a283 100755
--- a/site2/tools/docker-build-site.sh
+++ b/site2/tools/docker-build-site.sh
@@ -24,7 +24,7 @@
set -e
ROOT_DIR=$(git rev-parse --show-toplevel)
-# cd $ROOT_DIR/pulsar-client-cpp
+cd $ROOT_DIR/pulsar-client-cpp
BUILD_IMAGE_NAME="${BUILD_IMAGE_NAME:-apachepulsar/pulsar-build}"
BUILD_IMAGE_VERSION="${BUILD_IMAGE_VERSION:-ubuntu-16.04-pb3-website}"
@@ -44,8 +44,8 @@
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"
-# 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
+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
CMD="export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 && cd /pulsar &&
/pulsar/site2/tools/build-site.sh $@"
echo "docker exec cmd: "$CMD
diff --git a/site2/website-next/scripts/split-version-build.sh
b/site2/website-next/scripts/split-version-build.sh
index a50c98d..9ba56b9 100755
--- a/site2/website-next/scripts/split-version-build.sh
+++ b/site2/website-next/scripts/split-version-build.sh
@@ -7,44 +7,44 @@ latest=$(cat scripts/.latest)
echo "changed files: "
echo $@
-# locals=("en" "zh-CN" "zh-TW" "ja" "ko" "fr")
-
-# while read version; do
-# if [[ $@ == *website-next/versioned_docs/version-$version* ]]; then
-# echo $version "has changed, begin rebuild..."
-# echo "[\"${latest}\", \"${version}\"]" >versions.json
-# yarn build
-# mkdir -p build-${version}/${version} build-${version}/${version}.md
-# cp -r build/docs/${version}/* build-${version}/${version}
-# cp -r build/docs/${version}.md/* build-${version}/${version}.md
-# for language in ${locals[@]}; do
-# if [ -d "build/${language}/docs/${version}" ]; then
-# mkdir -p build-${language}-${version}/${version}
build-${language}-${version}/${version}.md
-# cp -r build/${language}/docs/${version}/*
build-${language}-${version}/${version}
-# cp -r build/${language}/docs/${version}.md/*
build-${language}-${version}/${version}.md
-# fi
-# done
-# echo $version "build done..."
-# else
-# echo $version "no change, skip"
-# fi
-# done <scripts/.versions
-
-# echo "latest version begin build..."
-# echo "[\"${latest}\"]" >versions.json
-# yarn build
-# echo "latest version build done..."
-
-# while read version; do
-# if [[ $@ == *website-next/versioned_docs/version-$version* ]]; then
-# mv build-$version/* build/docs
-# rm -rf build-$version
-
-# for language in ${locals[@]}; do
-# if [ -d "build-$language-$version" ]; then
-# mv build-$language-$version/* build/$language/docs
-# rm -rf build-$language-$version
-# fi
-# done
-# fi
-# done <scripts/.versions
+locals=("en" "zh-CN" "zh-TW" "ja" "ko" "fr")
+
+while read version; do
+ if [[ $@ == *website-next/versioned_docs/version-$version* ]]; then
+ echo $version "has changed, begin rebuild..."
+ echo "[\"${latest}\", \"${version}\"]" >versions.json
+ yarn build
+ mkdir -p build-${version}/${version} build-${version}/${version}.md
+ cp -r build/docs/${version}/* build-${version}/${version}
+ cp -r build/docs/${version}.md/* build-${version}/${version}.md
+ for language in ${locals[@]}; do
+ if [ -d "build/${language}/docs/${version}" ]; then
+ mkdir -p build-${language}-${version}/${version}
build-${language}-${version}/${version}.md
+ cp -r build/${language}/docs/${version}/*
build-${language}-${version}/${version}
+ cp -r build/${language}/docs/${version}.md/*
build-${language}-${version}/${version}.md
+ fi
+ done
+ echo $version "build done..."
+ else
+ echo $version "no change, skip"
+ fi
+done <scripts/.versions
+
+echo "latest version begin build..."
+echo "[\"${latest}\"]" >versions.json
+yarn build
+echo "latest version build done..."
+
+while read version; do
+ if [[ $@ == *website-next/versioned_docs/version-$version* ]]; then
+ mv build-$version/* build/docs
+ rm -rf build-$version
+
+ for language in ${locals[@]}; do
+ if [ -d "build-$language-$version" ]; then
+ mv build-$language-$version/* build/$language/docs
+ rm -rf build-$language-$version
+ fi
+ done
+ fi
+done <scripts/.versions
