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/02/01 04:14:03 UTC
[servicecomb-docs] branch master updated: trivas remove (#221)
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-docs.git
The following commit(s) were added to refs/heads/master by this push:
new fde4bbf trivas remove (#221)
fde4bbf is described below
commit fde4bbf73e6956fab6b17d05fe211ffc061877e4
Author: bao liu <bi...@qq.com>
AuthorDate: Mon Feb 1 12:13:53 2021 +0800
trivas remove (#221)
---
.github/workflows/maven.yml | 20 ++++++++++++++++
.travis.yml | 13 ----------
scripts/build.sh | 54 +++++++++++++++++++++++++++++++++++++++++
scripts/travis.sh | 58 ---------------------------------------------
4 files changed, 74 insertions(+), 71 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 0000000..7a371d2
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,20 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+ branches: [ master ]
+
+jobs:
+ build:
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+ - name: Compilation and Installation
+ run: bash scripts/build.sh
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 35b627b..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-install:
- - npm install gitbook-cli -g
- - sudo pip install mkdocs
- - sudo pip install ./plugins/bing-search
- - chmod +x scripts/travis.sh
-script:
- - scripts/travis.sh script
-after_success:
- - scripts/travis.sh after_success
-branches:
- only:
- - master
- - java-chassis-1.x
diff --git a/scripts/build.sh b/scripts/build.sh
new file mode 100644
index 0000000..1559ba1
--- /dev/null
+++ b/scripts/build.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+#bin/sh
+echo "start building servicecomb-docs."
+CUR_DIR=$PWD
+echo "env CUR_DIR=$CUR_DIR"
+
+echo "Starting install software"
+npm install gitbook-cli -g
+sudo pip install mkdocs
+sudo pip install ./plugins/bing-search
+chmod +x scripts/travis.sh
+
+echo "Starting compile docs"
+gitbook build saga-reference docs/saga
+gitbook build service-center-reference docs/service-center
+cd $CUR_DIR/java-chassis-reference/zh_CN
+mkdocs build -d ../../docs/java-chassis/zh_CN
+cd $CUR_DIR/java-chassis-reference/en_US
+mkdocs build -d ../../docs/java-chassis/en_US
+cd $CUR_DIR
+
+git clone --depth=10 --branch=master https://github.com/huaweicse/servicecomb-java-chassis-doc.git
+
+rm -r servicecomb-java-chassis-doc/docs/java-chassis/zh_CN/*
+rm -r servicecomb-java-chassis-doc/docs/java-chassis/en_US/*
+rm -r servicecomb-java-chassis-doc/docs/saga/*
+rm -r servicecomb-java-chassis-doc/docs/service-center/*
+cp -r docs/ servicecomb-java-chassis-doc/
+ls -l servicecomb-java-chassis-doc/docs/java-chassis
+ls -l servicecomb-java-chassis-doc/docs/java-chassis/1.x
+
+echo "Starting push docs"
+cd servicecomb-java-chassis-doc
+git add docs
+git commit -m "Publish gitbook docs"
+git push https://3fbf951cac299b8fe7834284bb2a557332fdbf3e@github.com/huaweicse/servicecomb-java-chassis-doc.git master
+
+
diff --git a/scripts/travis.sh b/scripts/travis.sh
deleted file mode 100644
index 41e1a64..0000000
--- a/scripts/travis.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env bash
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-#bin/sh
-CUR_DIR=$PWD
-echo "start building servicecomb-docs."
-echo "env TRAVIS_BRANCH=$TRAVIS_BRANCH"
-echo "env PARAM1=$1"
-echo "env CUR_DIR=$CUR_DIR"
-
-if [ "$1" == "script" ]; then
- gitbook build saga-reference docs/saga
- gitbook build service-center-reference docs/service-center
- cd $CUR_DIR/java-chassis-reference/zh_CN
- mkdocs build -d ../../docs/java-chassis/zh_CN
- cd $CUR_DIR/java-chassis-reference/en_US
- mkdocs build -d ../../docs/java-chassis/en_US
- cd $CUR_DIR
-
- git clone --depth=10 --branch=master https://$PUSH_TARGET_URL servicecomb-java-chassis-doc
- if [ "$TRAVIS_BRANCH" == "master" ]; then
- rm -r servicecomb-java-chassis-doc/docs/java-chassis/zh_CN/*
- rm -r servicecomb-java-chassis-doc/docs/java-chassis/en_US/*
- rm -r servicecomb-java-chassis-doc/docs/saga/*
- rm -r servicecomb-java-chassis-doc/docs/service-center/*
- cp -r docs/ servicecomb-java-chassis-doc/
- ls -l servicecomb-java-chassis-doc/docs/java-chassis
- ls -l servicecomb-java-chassis-doc/docs/java-chassis/1.x
- else
- exit 1
- fi
-elif [ "$1" == "after_success" ]; then
- if [ -z $DEPLOY_TOKEN ]; then
- echo "PR release if ignored"
- else
- cd servicecomb-java-chassis-doc
- git add docs
- git commit -m "Publish gitbook docs"
- git push https://$DEPLOY_TOKEN@$PUSH_TARGET_URL master
- fi
-else
- exit 1
-fi
-