You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by zh...@apache.org on 2022/11/09 13:42:42 UTC
[dolphinscheduler-website] branch master updated: [feat] Change python API into other repo (#839)
This is an automated email from the ASF dual-hosted git repository.
zhongjiajie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler-website.git
The following commit(s) were added to refs/heads/master by this push:
new fa430c6807 [feat] Change python API into other repo (#839)
fa430c6807 is described below
commit fa430c680740f26086cac08f2e0147141a18159c
Author: Jay Chung <zh...@gmail.com>
AuthorDate: Wed Nov 9 21:42:37 2022 +0800
[feat] Change python API into other repo (#839)
ref: https://github.com/apache/dolphinscheduler/pull/12779
https://github.com/apache/dolphinscheduler-sdk-python/pull/1
---
.github/workflows/website.yml | 4 +++-
scripts/conf.sh | 6 ++++++
scripts/prepare_docs.sh | 6 +++++-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
index dc040658b2..0900ace1f5 100644
--- a/.github/workflows/website.yml
+++ b/.github/workflows/website.yml
@@ -9,13 +9,14 @@ on:
env:
# We use the repo in swap/dolphinscheduler to build all python versions docs
- PYDS_HOME: swap/dolphinscheduler/dolphinscheduler-python/pydolphinscheduler
+ PYDS_HOME: swap/dolphinscheduler-sdk-python
DEPENDENCES: pip setuptools wheel tox
jobs:
build-website-deploy:
runs-on: ubuntu-latest
steps:
+ # Build main document: DolphinScheduler documentation
- name: Checkout
uses: actions/checkout@master
@@ -30,6 +31,7 @@ jobs:
- name: Build Main Document
run: npm install && npm run build
+ # Build Python API document: from https://github.com/apache/dolphinscheduler-sdk-python
- name: Set up Python 3.7
uses: actions/setup-python@v2
with:
diff --git a/scripts/conf.sh b/scripts/conf.sh
index fedc20db16..2299526ab3 100644
--- a/scripts/conf.sh
+++ b/scripts/conf.sh
@@ -21,6 +21,11 @@
PROJECT_ORG=${PROJECT_ORG:-apache}
PROJECT_NAME=${PROJECT_NAME:-dolphinscheduler}
PROJECT_BRANCH_NAME=${PROJECT_BRANCH_NAME:-dev}
+
+PROJECT_PYTHON_ORG=${PROJECT_PYTHON_ORG:-apache}
+PROJECT_PYTHON_NAME=${PROJECT_PYTHON_NAME:-${PROJECT_NAME}-sdk-python}
+PROJECT_PYTHON_BRANCH_NAME=${PROJECT_PYTHON_BRANCH_NAME:-main}
+
PROJECT_WEBSITE_ORG=${PROJECT_WEBSITE_ORG:-apache}
PROJECT_WEBSITE_NAME=${PROJECT_WEBSITE_NAME:-${PROJECT_NAME}-website}
PROJECT_WEBSITE_BRANCH_NAME=${PROJECT_WEBSITE_BRANCH_NAME:-history-docs}
@@ -29,6 +34,7 @@ PROJECT_WEBSITE_BRANCH_NAME=${PROJECT_WEBSITE_BRANCH_NAME:-history-docs}
SWAP_DIR=${SWAP_DIR:-${SOURCE_PATH}/swap}
PROJECT_SITE_DOC_DIR=${PROJECT_SITE_DOC_DIR:-${SOURCE_PATH}/docs}
PROJECT_DIR=${PROJECT_DIR:-${SWAP_DIR}/${PROJECT_NAME}}
+PROJECT_PYTHON_DIR=${PROJECT_PYTHON_DIR:-${SWAP_DIR}/${PROJECT_PYTHON_NAME}}
PROJECT_WEBSITE_DIR=${PROJECT_WEBSITE_DIR:-${SWAP_DIR}/${PROJECT_WEBSITE_NAME}}
# docs in apache/dolphinscheduler-webstie branch `history-docs`
diff --git a/scripts/prepare_docs.sh b/scripts/prepare_docs.sh
index 051badc192..ccd252135a 100755
--- a/scripts/prepare_docs.sh
+++ b/scripts/prepare_docs.sh
@@ -29,9 +29,11 @@ source "${SOURCE_PATH}/scripts/conf.sh"
if [ "${PROTOCOL_MODE:-HTTP}" == "ssh" ]; then
PROJECT_REPO="git@github.com:${PROJECT_ORG}/${PROJECT_NAME}.git"
PROJECT_WEBSITE_REPO="git@github.com:${PROJECT_WEBSITE_ORG}/${PROJECT_WEBSITE_NAME}.git"
+ PROJECT_PYTHON_REPO="git@github.com:${PROJECT_PYTHON_ORG}/${PROJECT_PYTHON_NAME}.git"
else
PROJECT_REPO="https://github.com/${PROJECT_ORG}/${PROJECT_NAME}.git"
PROJECT_WEBSITE_REPO="https://github.com/${PROJECT_WEBSITE_ORG}/${PROJECT_WEBSITE_NAME}.git"
+ PROJECT_PYTHON_REPO="https://github.com/${PROJECT_PYTHON_ORG}/${PROJECT_PYTHON_NAME}.git"
fi
##############################################################
@@ -134,8 +136,10 @@ function prepare_docs() {
echo "===>>> Clone repository."
echo " ---> Clone history documents from ${PROJECT_WEBSITE_REPO} branch ${PROJECT_WEBSITE_BRANCH_NAME}."
clone_repo "${PROJECT_WEBSITE_REPO}" "${PROJECT_WEBSITE_BRANCH_NAME}" "${PROJECT_WEBSITE_DIR}"
- echo " ---> Clone dev documents from ${PROJECT_REPO} branch ${PROJECT_BRANCH_NAME}."
+ echo " ---> Clone DolphinScheduler latest documents from ${PROJECT_REPO} branch ${PROJECT_BRANCH_NAME}."
clone_repo "${PROJECT_REPO}" "${PROJECT_BRANCH_NAME}" "${PROJECT_DIR}"
+ echo " ---> Clone Python API latest documents from ${PROJECT_PYTHON_REPO} branch ${PROJECT_PYTHON_BRANCH_NAME}."
+ clone_repo "${PROJECT_PYTHON_REPO}" "${PROJECT_PYTHON_BRANCH_NAME}" "${PROJECT_PYTHON_DIR}"
source "${SOURCE_PATH}/scripts/rsync_content.sh"
echo "===>>> Sync content from cloned repository."