You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2022/01/10 15:43:41 UTC
[incubator-doris-website] branch master updated (90c53d6 -> 71cdadb)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris-website.git.
discard 90c53d6 Update manual-deploy-website.yml
new 71cdadb Update manual-deploy-website.yml
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (90c53d6)
\
N -- N -- N refs/heads/master (71cdadb)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/manual-deploy-website.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[incubator-doris-website] 01/01: Update manual-deploy-website.yml
Posted by mo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris-website.git
commit 71cdadb98f27b257dbb09b64b8617e786ce46fc6
Author: morningman <ch...@baidu.com>
AuthorDate: Mon Jan 10 14:41:30 2022 +0800
Update manual-deploy-website.yml
---
.github/workflows/manual-deploy-website.yml | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/manual-deploy-website.yml b/.github/workflows/manual-deploy-website.yml
index 5fa09d6..60a5002 100644
--- a/.github/workflows/manual-deploy-website.yml
+++ b/.github/workflows/manual-deploy-website.yml
@@ -23,19 +23,36 @@ jobs:
- name: Build
run: |
git clone https://github.com/apache/incubator-doris.git incubator-doris
- git checkout ${{ github.event.inputs.branch }}
export BRANCH=${{ github.event.inputs.branch }}
cp -R blogs/zh-CN/ incubator-doris/docs/zh-CN/article/articles/
cp -R blogs/en/ incubator-doris/docs/en/article/articles/
cp -R blogs/images/blogs/ incubator-doris/docs/.vuepress/public/images/
cd incubator-doris/docs
find ./ -name "*.md" -exec sed -i -e 's/!\[\(.*\)\][(]\(.*\)[)]/<img \:src=\"$withBase\('\''\2'\''\)\" alt=\"\1\">/g' {} \;
- npm install && npm run build
+ sed -i 's/en\///g' .vuepress/config.js
+ sed -i "s/BUILDING_BRANCH\.length > 0/BUILDING_BRANCH\.length > 0 \&\& BUILDING_BRANCH !== 'master'/g" .vuepress/config.js
+ sed -i 's/en\///g' en/README.md
+ mv en/* ./
+ mkdir -p .vuepress/dist/
touch .vuepress/dist/.dummy
ls .vuepress/dist/
export DORIS_COMMIT=`git rev-parse HEAD`
- - name: Deploy
+ - name: Deploy Master
+ if: ${{ github.event.inputs.branch == 'master' }}
+ run: |
+ git fetch
+ git checkout -b asf-site remotes/origin/asf-site
+ /bin/bash remove-non-reserved-dir.sh
+ cp -r incubator-doris/docs/.vuepress/dist/* ./
+ git config user.name "github-actions[bot]"
+ git config user.email "github-actions[bot]@users.noreply.github.com"
+ git add .
+ git commit -m "Automated deployment with doris master"
+ git push --verbose "https://${{ secrets.GITHUB_TOKEN }}@github.com/apache/incubator-doris-website.git" asf-site:asf-site
+
+ - name: Deploy Branch
+ if: ${{ github.event.inputs.branch != 'master' }}
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -45,4 +62,3 @@ jobs:
user_name: 'github-actions[bot]'
user_email: 'github-actions[bot]@users.noreply.github.com'
commit_message: 'Automated deployment with doris branch ${{ github.event.inputs.branch }}@${{ env.DORIS_COMMIT }}'
-
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org