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 3def65a update
3def65a is described below
commit 3def65a0332a5ccbd036f755df01170a723df4d4
Author: LiLi <[email protected]>
AuthorDate: Fri Mar 4 14:38:13 2022 +0800
update
Signed-off-by: LiLi <[email protected]>
---
.../workflows/ci-pulsar-website-next-build.yaml | 2 +-
site2/tools/docker-build-site.sh | 36 ++++++++++++----------
2 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/ci-pulsar-website-next-build.yaml
b/.github/workflows/ci-pulsar-website-next-build.yaml
index 04bed6c..33b1154 100644
--- a/.github/workflows/ci-pulsar-website-next-build.yaml
+++ b/.github/workflows/ci-pulsar-website-next-build.yaml
@@ -35,7 +35,7 @@ jobs:
- name: checkout
uses: actions/checkout@v2
with:
- fetch-depth: 1
+ fetch-depth: 2
- name: Get changed files
uses: ./.github/actions/changed-files
diff --git a/site2/tools/docker-build-site.sh b/site2/tools/docker-build-site.sh
index 2a7ff0b..73bfe3b 100755
--- a/site2/tools/docker-build-site.sh
+++ b/site2/tools/docker-build-site.sh
@@ -23,28 +23,32 @@
# Fail script in case of errors
set -e
-ROOT_DIR=$(git rev-parse --show-toplevel)
-cd $ROOT_DIR/pulsar-client-cpp
+echo "some files..."
+echo $@
+./build-site.sh $@
-BUILD_IMAGE_NAME="${BUILD_IMAGE_NAME:-apachepulsar/pulsar-build}"
-BUILD_IMAGE_VERSION="${BUILD_IMAGE_VERSION:-ubuntu-16.04-pb3-website}"
+# ROOT_DIR=$(git rev-parse --show-toplevel)
+# cd $ROOT_DIR/pulsar-client-cpp
-IMAGE="$BUILD_IMAGE_NAME:$BUILD_IMAGE_VERSION"
+# BUILD_IMAGE_NAME="${BUILD_IMAGE_NAME:-apachepulsar/pulsar-build}"
+# BUILD_IMAGE_VERSION="${BUILD_IMAGE_VERSION:-ubuntu-16.04-pb3-website}"
-echo "---- Build Pulsar website using image $IMAGE"
+# IMAGE="$BUILD_IMAGE_NAME:$BUILD_IMAGE_VERSION"
-#docker pull $IMAGE
+# echo "---- Build Pulsar website using image $IMAGE"
-CI_USER=$(id -u)
-CI_GROUP=$(id -g)
+# #docker pull $IMAGE
-# crowdin keys
-CROWDIN_DOCUSAURUS_PROJECT_ID=${CROWDIN_DOCUSAURUS_PROJECT_ID:-"apache-pulsar"}
-CROWDIN_DOCUSAURUS_API_KEY=${CROWDIN_DOCUSAURUS_API_KEY:-UNSET}
+# CI_USER=$(id -u)
+# CI_GROUP=$(id -g)
-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"
+# # crowdin keys
+#
CROWDIN_DOCUSAURUS_PROJECT_ID=${CROWDIN_DOCUSAURUS_PROJECT_ID:-"apache-pulsar"}
+# CROWDIN_DOCUSAURUS_API_KEY=${CROWDIN_DOCUSAURUS_API_KEY:-UNSET}
-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="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 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
+# 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
