Skip to content

Commit 0c80121

Browse files
authored
Add Bors (#103)
1 parent 2a6bfc8 commit 0c80121

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

.github/workflows/test.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
name: Test
22

33
on:
4+
pull_request:
45
push:
6+
# trying and staging branches are for BORS config
57
branches:
8+
- trying
9+
- staging
610
- master
7-
pull_request:
811

912
jobs:
10-
rspec:
11-
name: Rspec against latest docker image
13+
test:
14+
name: ruby-tests
1215
runs-on: ubuntu-latest
1316

1417
steps:

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ We don't follow any other convention, but if you want to use one, we recommend [
148148
Some notes on GitHub PRs:
149149
- [Convert your PR as a draft](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/changing-the-stage-of-a-pull-request) if your changes are a work in progress: no one will review it until you pass your PR as ready for review.<br>
150150
The draft PR can be very useful if you want to show that you are working on something and make your work visible.
151-
- The branch related to the PR must be **up-to-date with `master`** before merging. You need to [rebase your branch](https://gist.github.com/curquiza/5f7ce615f85331f083cd467fc4e19398) if it is not.
151+
- The branch related to the PR must be **up-to-date with `master`** before merging. [Bors](https://github.com/bors-ng/bors-ng) will rebase your branch if it is not. Ask a maintainer to run it.
152152
- All PRs must be reviewed and approved by at least one maintainer.
153153
- All PRs have to be **squashed and merged**.
154154
- The PR title should be accurate and descriptive of the changes. The title of the PR will be indeed automatically added to the next [release changlogs](https://github.com/meilisearch/meilisearch-ruby/releases/).

bors.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
status = ["ruby-tests"]
2+
# 1 hour timeout
3+
timeout-sec = 3600

0 commit comments

Comments
 (0)