Skip to content

Commit

Permalink
Merge pull request envoyproxy#135 from majinghe/majinghe-ci
Browse files Browse the repository at this point in the history
modify mergify file
  • Loading branch information
majinghe authored Nov 12, 2020
2 parents 58fd74a + 68005a5 commit 0b9b009
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 5 deletions.
24 changes: 20 additions & 4 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,39 @@ pull_request_rules:
- name: Automatic merge when approved by Jimmy
conditions:
- "approved-reviews-by=rootsongjc"
- "#approved-reviews-by>=1"
- "#approved-reviews-by>=2"
- base=zh
actions:
merge:
method: merge
- name: Automatic merge on approval by xuzhenwen
conditions:
- "approved-reviews-by=helight"
- "#approved-reviews-by>=1"
- "#approved-reviews-by>=2"
- base=zh
actions:
merge:
method: merge
- name: Automatic merge when approved by majinghe
conditions:
- "approved-reviews-by=lhb008"
- "#approved-reviews-by>=1"
- "approved-reviews-by=majinghe"
- "#approved-reviews-by>=2"
- base=zh
actions:
merge:
method: merge
- name: Automatic merge when approved by liujinxin
conditions:
- "approved-reviews-by=scilla0531"
- "#approved-reviews-by>=2"
- base=zh
actions:
merge:
method: merge
- name: Automatic merge when approved by zhanghaili
conditions:
- "approved-reviews-by=webup"
- "#approved-reviews-by>=2"
- base=zh
actions:
merge:
Expand Down
9 changes: 8 additions & 1 deletion docs/root/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Istio 一直是服务网格产品中的佼佼者,其数据面的组件—— E

| 责任范围 | 人员 |GitHub 账号 |
| :---: | :---: |:---: |
| 翻译跟踪、文档更新 | 马景贺 | [lhb008](https://github.com/lhb008)|
| 翻译跟踪、文档更新 | 马景贺 | [majinghe](https://github.com/majinghe)|
| 翻译跟踪、文档更新 | 许振文 | [helight](https://github.com/helight)|
| 翻译跟踪、文档更新 | 张晓辉 | [addozhang](https://github.com/addozhang)|

Expand Down Expand Up @@ -125,6 +125,13 @@ $ git checkout <自定义分支名>

### 4 本地构建和预览

本地构建可以按照 [Envoy 官方](https://github.com/envoyproxy/envoy/tree/master/docs)给的文档格式进行。进入到与 `docs` 目录同级的目录下,执行以下运行命令:

```
./ci/run_envoy_docker.sh 'docs/build.sh'
```
然后根据编译的结果来对自己的翻译内容进行相应的修改。如果本地编译通过,则可以进行 PR 提交。

> 由于 Envoy 文档的特殊性,本次翻译没有设置 netlify 做预览,只配置了 github action 做定时的翻译发布(每天两次)。当提交PR 之后,等待 reviewer review 之后将代码合入之后,才会在定时发布之后看到[翻译效果](https://cloudnative.to/envoy/)

Expand Down

0 comments on commit 0b9b009

Please sign in to comment.