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 bb89b66 update
bb89b66 is described below
commit bb89b669efa306e3717a42246618610edce81190
Author: LiLi <[email protected]>
AuthorDate: Fri Mar 4 14:45:46 2022 +0800
update
Signed-off-by: LiLi <[email protected]>
---
.../workflows/ci-pulsar-website-next-build.yaml | 86 +++++++++++-----------
site2/tools/build-site.sh | 1 +
site2/tools/docker-build-site.sh | 36 ++++-----
3 files changed, 60 insertions(+), 63 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 7428461..f67e942 100755
--- a/site2/tools/build-site.sh
+++ b/site2/tools/build-site.sh
@@ -104,6 +104,7 @@ if [ -n "$NEXT" ]; then
# 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 "split version build for files: "$2
bash scripts/split-version-build.sh $2
else
crowdin
diff --git a/site2/tools/docker-build-site.sh b/site2/tools/docker-build-site.sh
index a1637a0..2a7ff0b 100755
--- a/site2/tools/docker-build-site.sh
+++ b/site2/tools/docker-build-site.sh
@@ -23,32 +23,28 @@
# Fail script in case of errors
set -e
-echo "some files..."
-echo $@
-site2/tools/build-site.sh $@
+ROOT_DIR=$(git rev-parse --show-toplevel)
+cd $ROOT_DIR/pulsar-client-cpp
-# ROOT_DIR=$(git rev-parse --show-toplevel)
-# 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}"
-# BUILD_IMAGE_NAME="${BUILD_IMAGE_NAME:-apachepulsar/pulsar-build}"
-# BUILD_IMAGE_VERSION="${BUILD_IMAGE_VERSION:-ubuntu-16.04-pb3-website}"
+IMAGE="$BUILD_IMAGE_NAME:$BUILD_IMAGE_VERSION"
-# IMAGE="$BUILD_IMAGE_NAME:$BUILD_IMAGE_VERSION"
+echo "---- Build Pulsar website using image $IMAGE"
-# echo "---- Build Pulsar website using image $IMAGE"
+#docker pull $IMAGE
-# #docker pull $IMAGE
+CI_USER=$(id -u)
+CI_GROUP=$(id -g)
-# CI_USER=$(id -u)
-# CI_GROUP=$(id -g)
+# crowdin keys
+CROWDIN_DOCUSAURUS_PROJECT_ID=${CROWDIN_DOCUSAURUS_PROJECT_ID:-"apache-pulsar"}
+CROWDIN_DOCUSAURUS_API_KEY=${CROWDIN_DOCUSAURUS_API_KEY:-UNSET}
-# # crowdin keys
-#
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 $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
-
-# $DOCKER_CMD bash -l -c "export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
&& cd /pulsar && /pulsar/site2/tools/build-site.sh $@"
\ No newline at end of file
+$DOCKER_CMD bash -l -c "export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 &&
cd /pulsar && /pulsar/site2/tools/build-site.sh $@"
\ No newline at end of file
