This is an automated email from the ASF dual-hosted git repository.

jiafengzheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris-website.git


The following commit(s) were added to refs/heads/master by this push:
     new 57ce626d6b1 [fix] update workflows (#66)
57ce626d6b1 is described below

commit 57ce626d6b111ea2ae2d663cf041aba44aea1cdf
Author: Jeffrey <color.d...@gmail.com>
AuthorDate: Wed Aug 24 19:37:03 2022 +0800

    [fix] update workflows (#66)
    
    update workflows
---
 .github/workflows/cron-deploy-website.yml | 33 +++++++++++-----------------
 .github/workflows/manual-deploy.yml       | 36 +++++++++++++------------------
 2 files changed, 28 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/cron-deploy-website.yml 
b/.github/workflows/cron-deploy-website.yml
index 084fe2f32f3..c6e56a9b4b1 100644
--- a/.github/workflows/cron-deploy-website.yml
+++ b/.github/workflows/cron-deploy-website.yml
@@ -32,8 +32,11 @@ jobs:
         yarn cache clean
         yarn && yarn build
         touch build/.dummy
+        cp .asf-site.yaml ./build/.asf.yaml
+        cp versions.json ./build/
         ls build
         export DORIS_COMMIT=`git rev-parse HEAD`
+
     - name: Upload files to OSS
       uses: ./.github/actions/aliyun-oss-website-action
       with:
@@ -44,27 +47,17 @@ jobs:
           endpoint: ${{ secrets.ALIYUN_OSS_ENDPOINT }}
           folder: build
 
-    - name: Deploy website
+    - name: Deploy Website
       if: ${{ github.event.inputs.branch == 'master' }}
-      run: |
-        git config --global http.postBuffer 524288000
-        git fetch
-        git checkout -b asf-site remotes/origin/asf-site
-        /bin/bash remove-non-reserved-dir.sh
-        cp -r build/* ./
-        rm -rf build/
-        rm -rf .docusaurus
-        rm -rf node_modules
-        rm -rf doris
-        rm -rf yarn.lock
-        rm -rf versioned_docs/
-        rm -rf versioned_sidebars
-        rm -rf i18n/
-        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/doris-website.git" asf-site:asf-site
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        github_token: ${{ github.token }}
+        publish_branch: asf-site
+        publish_dir: ./build
+        destination_dir: ./
+        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 }}'
 
     - name: Deploy Branch
       if: ${{ github.event.inputs.branch != 'master' }}
diff --git a/.github/workflows/manual-deploy.yml 
b/.github/workflows/manual-deploy.yml
index c1bb95e6697..941ef545a11 100644
--- a/.github/workflows/manual-deploy.yml
+++ b/.github/workflows/manual-deploy.yml
@@ -35,8 +35,11 @@ jobs:
         yarn cache clean
         yarn && yarn build
         touch build/.dummy
+        cp .asf-site.yaml ./build/.asf.yaml
+        cp versions.json ./build/
         ls build
         export DORIS_COMMIT=`git rev-parse HEAD`
+
     - name: Upload files to OSS
       uses: ./.github/actions/aliyun-oss-website-action
       with:
@@ -46,28 +49,19 @@ jobs:
           # use your own endpoint
           endpoint: ${{ secrets.ALIYUN_OSS_ENDPOINT }}
           folder: build
-                  
-    - name: Deploy website
+
+    - name: Deploy Website
       if: ${{ github.event.inputs.branch == 'master' }}
-      run: |
-        git config --global http.postBuffer 524288000
-        git fetch
-        git checkout -b asf-site remotes/origin/asf-site
-        /bin/bash remove-non-reserved-dir.sh
-        cp -r build/* ./
-        rm -rf build/
-        rm -rf .docusaurus
-        rm -rf node_modules
-        rm -rf doris
-        rm -rf yarn.lock
-        rm -rf versioned_docs/
-        rm -rf versioned_sidebars
-        rm -rf i18n/
-        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/doris-website.git" asf-site:asf-site
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        github_token: ${{ github.token }}
+        publish_branch: asf-site
+        publish_dir: ./build
+        destination_dir: ./
+        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 }}'
+
     - name: Deploy Branch
       if: ${{ github.event.inputs.branch != 'master' }}
       uses: peaceiris/actions-gh-pages@v3


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org

Reply via email to