Skip to content

Commit

Permalink
chore: sync common files from resources repository
Browse files Browse the repository at this point in the history
  • Loading branch information
MetWork Bot committed Nov 22, 2018
1 parent 0259e1d commit 8534876
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 45 deletions.
33 changes: 6 additions & 27 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,18 @@
pull_request_rules:
- name: metworkbot automerge
actions:
label:
add:
- Merge Now
conditions:
- author=metworkbot
- -merged
- -closed

- name: integration branch
actions:
label:
add:
- Merge Now
merge:
method: rebase
rebase_fallback: merge
strict: false
delete_head_branch: {}
conditions:
- base=integration
- -merged
- -closed
- label!=no-mergify
- '#approved-reviews-by>=1'
- status-success=pr ready to merge
- status-success=license/cla
- author!=metworkbot


- name: merge action
actions:
merge:
method: rebase
rebase_fallback: merge
strict: false
delete_head_branch: {}
label:
remove:
- Merge Now
conditions:
- label!=no-mergify
- label=Merge Now
26 changes: 8 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,33 +1,23 @@
# testrepo
Gtest repo (do not use)
integration
eeee

test
[//]: # (automatically generated from https://github.com/metwork-framework/resources/blob/master/cookiecutter/%7B%7Bcookiecutter.repo%7D%7D/README.md)

## Status (master branch)
[![Drone CI](http://metwork-framework.org:8000/api/badges/metwork-framework/testrepo/status.svg)](http://metwork-framework.org:8000/metwork-framework/testrepo)
[![Maintenance](https://github.com/metwork-framework/resources/blob/master/badges/maintained.svg)]()


ererezezez



e
## Contributing guide

eeeezeze
gggezeze
See [CONTRIBUTING.md](CONTRIBUTING.md) file.

test

rrrr
eeerer

rerettt
## Code of Conduct

See [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md) file.

ezez

ddd



eee

0 comments on commit 8534876

Please sign in to comment.