You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2021/06/26 01:29:07 UTC

[servicecomb-website] branch master updated: update release guide and fix navigation error (#272)

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 1aca724  update release guide and fix navigation error (#272)
1aca724 is described below

commit 1aca7240425ac0c432644e1aa384e866456e2a3e
Author: liubao68 <bi...@qq.com>
AuthorDate: Sat Jun 26 09:28:55 2021 +0800

    update release guide and fix navigation error (#272)
---
 README.md            | 17 +----------------
 _data/navigation.yml |  6 ++----
 script/release       | 27 ++++++++++++++++++++++++---
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index fd1f5ef..aace589 100644
--- a/README.md
+++ b/README.md
@@ -33,22 +33,7 @@ Please sent your PR to the master branch instead of asf-site.
 
 # How to push the change to apache website
 
-* Switch to asf-site branch
-
-  `git checkout asf-site`
-  
-* Merge the changes of master branch
-
-  `git merge master`
-  
-* Generate the website static pages
-
-  `bundle exec jekyll build`
-  
-* Commit the changes into git repo
-
-  `git add content `
-  `git commit -m "publish website"`
+[Follow This Script](script/release.sh)
 
 **Note that tested versions of the tools covered in this section are as following,**    
 
diff --git a/_data/navigation.yml b/_data/navigation.yml
index 63ef737..ba98929 100755
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -100,8 +100,7 @@ t:
 
       - title: ServiceCenter User Guide
         children:
-
-      - title: 2.0.0
+          - title: 2.0.0
             url: https://service-center.readthedocs.io/en/latest/user-guides.html
 
       - title: Kie User Guide
@@ -293,8 +292,7 @@ t:
 
       - title: ServiceCenter用户手册
         children:
-      
-      - title: 2.0.0(英文版)
+          - title: 2.0.0(英文版)
             url: https://service-center.readthedocs.io/en/latest/user-guides.html
 
       - title: Kie 用户手册
diff --git a/script/release b/script/release
index 916ae00..475de04 100755
--- a/script/release
+++ b/script/release
@@ -1,7 +1,28 @@
 #!/bin/sh
-#push a release to branch asf-site
 
+## publish website steps
+CUR_DIR=$PWD
 
-bundle update
+## downlowd code
+git clone https://github.com/apache/servicecomb-website.git servicecomb-website-master
+cp -R servicecomb-website-master servicecomb-website-publish
+git clone https://github.com/huaweicse/servicecomb-java-chassis-doc.git 
 
-git push origin asf-site
+## build source
+cd $CUR_DIR/servicecomb-website-master
+git checkout -f master
+bundle exec jekyll build
+
+## copy complied files
+cd $CUR_DIR/servicecomb-website-publish
+git checkout -B liubao -t origin/asf-site 
+rm -R content/*
+mkdir content/references
+cp -R $CUR_DIR/servicecomb-website-master/content/* ./content/
+cp -R $CUR_DIR/servicecomb-java-chassis-doc/docs/* ./content/references/
+git add content 
+git commit -m "publish website"
+
+## push
+# git remote add liubao https://github.com/liubao68/servicecomb-website
+# git push --force --progress liubao liubao:liubao