diff options
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 16 | ||||
| -rw-r--r-- | bors.toml | 1 |
3 files changed, 11 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 8f250501..7956e4d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -125,6 +125,9 @@ branches: # release tags - /^v\d+\.\d+\.\d+.*$/ - master + # bors-ng branches; see https://bors-ng.github.io/getting-started/ + - trying + - staging notifications: email: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9158bf1b..8d8b8ded 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -85,20 +85,18 @@ locally. More information is available in the [CI Readme][ci-readme]. [travis-ci]: https://travis-ci.org/nix-rust/nix [ci-readme]: ci/README.md -## Homu, the bot who merges all the PRs +## bors, the bot who merges all the PRs -All pull requests are merged via [homu], an integration bot. After the +All pull requests are merged via [bors], an integration bot. After the pull request has been reviewed, the reviewer will leave a comment like -> @homu r+ +> bors r+ -to let @homu know that it was approved. Then @homu will check that it passes -tests when merged with the latest changes in the `master` branch, and merge if -the tests succeed. You can check out the [nix queue on homu][queue] to see the -status of PRs and their tests. +to let bors know that it was approved. Then bors will check that it passes +tests when merged with the latest changes in the `master` branch, and +merge if the tests succeed. -[homu]: http://homu.io/ -[queue]: http://homu.io/q/nix-rust/nix +[bors]: https://bors-ng.github.io/ ## API conventions diff --git a/bors.toml b/bors.toml new file mode 100644 index 00000000..359f8947 --- /dev/null +++ b/bors.toml @@ -0,0 +1 @@ +status = ["continuous-integration/travis-ci/push"] |