Skip to content

/bundler

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch from Homu to Bors mergebots #6703

Merged
4 commits merged into from Sep 19, 2018

Conversation

Reviewers

@greysteil greysteil

Assignees

@indirect indirect

Labels
status: working type: administrative
Projects
None yet
Milestone
No milestone
5 participants
@indirect @colby-swandale @deivid-rodriguez @simi @greysteil
@indirect
Copy link
Member

indirect commented Sep 19, 2018

What was the end-user problem that led to this PR?

Our existing @bundlerbot mergebot is run by bundlerbot-homu, which is a fork of japaric/homu-on-heroku, which is a fork of servo/homu, which is a fork of barosl/homu. Sadly, most of those forks are now unmaintained, including ours. Also, Homu sets up a list of users who are allowed to approve PRs with a list in a file on an env var, when it probably should just read the list of github users that have the permission to merge.

So the end-user problem is: unmaintained mergebot, very inconvenient to update team members.

What was your diagnosis of the problem?

My diagnosis is that we should migrate from a Homu-based mergebot to a bors-ng-based mergebot. Bors-ng lives at bors-ng/bors-ng, and has a website at bors.tech. Bors-ng is actively maintained, easy to deploy to Heroku, doesn't lose repo and PR state when the webapp is restarted, and uses GitHub permissions to determine who can approve PRs for merging.

What is your fix for the problem, implemented in this PR?

My fix for this problem was to fork bors-ng to the @bundler organization, modify bors-ng to respond to @bundlerbot r+ instead of responding to bors r+, and change the configuration files below to support using bors instead of homu.

The bors-ng repo has already accepted our patch, and we maybe don't even need to keep the forked repo anymore.

The new mergebot lives at https://bundlerbot-bors.herokuapp.com, and has the exact same issue-comment interface as the previous mergebot.

Why did you choose this fix out of the possible options?

I chose this fix because it lets us keep the exact same mergebot interface that we have today, while easing the maintenance burden both on updating end-user permissions and on updating the app over time, since we can simply pull and deploy the latest from bors-ng/bors-ng without maintaining our own specialized fork.
@indirect
configure bors instead of homu
Verified
This commit was signed with a verified signature.
@indirect indirect André Arko
GPG key ID: BBE521252B9D156A Learn about signing commits
Loading status checks…
7856ce7

@indirect indirect added status: working type: administrative labels Sep 19, 2018

@indirect indirect self-assigned this Sep 19, 2018

@indirect indirect requested a review from bundler/maintainers Sep 19, 2018

@colby-swandale

This comment has been minimized.

Sign in to view
Copy link
Member

colby-swandale commented Sep 19, 2018

Great work! This is help us sooooo much 👏

@bundlerbot r+
@ghost

This comment has been minimized.

Sign in to view
Copy link

ghost commented Sep 19, 2018

Configuration problem

bors.toml: syntax error
@greysteil

greysteil approved these changes Sep 19, 2018
View changes

@indirect

This comment has been minimized.

Sign in to view
Copy link
Member Author

indirect commented Sep 19, 2018

lol oh no, my bad 😬 fixing now
@indirect
let's see if the other format parses
Verified
This commit was signed with a verified signature.
@indirect indirect André Arko
GPG key ID: BBE521252B9D156A Learn about signing commits
Loading status checks…
8a8ed57
@indirect

This comment has been minimized.

Sign in to view
Copy link
Member Author

indirect commented Sep 19, 2018

@bundlerbot r=colby-swandale
@ghost

This comment has been minimized.

Sign in to view
Copy link

ghost commented Sep 19, 2018

Configuration problem

bors.toml: does not specify anything to gate on
@indirect

This comment has been minimized.

Sign in to view
Copy link
Member Author

indirect commented Sep 19, 2018

okay, progress! I'll tell it to use travis, I guess.
@indirect
tell bors to use Travis to test
Verified
This commit was signed with a verified signature.
@indirect indirect André Arko
GPG key ID: BBE521252B9D156A Learn about signing commits
Loading status checks…
b8f561d
@indirect

This comment has been minimized.

Sign in to view
Copy link
Member Author

indirect commented Sep 19, 2018

@bundlerbot r=colby-swandale

ghost pushed a commit that referenced this pull request Sep 19, 2018

@bundlerbot @indirect
Merge #6703 
6703: Switch from Homu to Bors mergebots r=colby-swandale a=indirect

### What was the end-user problem that led to this PR?

Our existing @bundlerbot mergebot is run by [bundlerbot-homu](https://github.com/bundler/bundlerbot-homu), which is a fork of japaric/homu-on-heroku, which is a fork of servo/homu, which is a fork of barosl/homu. Sadly, most of those forks are now unmaintained, including ours. Also, Homu sets up a list of users who are allowed to approve PRs with a list in a file on an env var, when it probably should just read the list of github users that have the permission to merge.

So the end-user problem is: unmaintained mergebot, very inconvenient to update team members.

### What was your diagnosis of the problem?

My diagnosis is that we should migrate from a Homu-based mergebot to a bors-ng-based mergebot. Bors-ng lives at [bors-ng/bors-ng](https://github.com/bors-ng/bors-ng), and has a website at [bors.tech](https://bors.tech). Bors-ng is actively maintained, easy to deploy to Heroku, doesn't lose repo and PR state when the webapp is restarted, and uses GitHub permissions to determine who can approve PRs for merging.

### What is your fix for the problem, implemented in this PR?

My fix for this problem was to fork bors-ng to the @bundler organization, modify bors-ng to respond to `@bundlerbot r+` instead of responding to `bors r+`, and change the configuration files below to support using bors instead of homu.

The bors-ng repo has already accepted our patch, and we maybe don't even need to keep the forked repo anymore.

The new mergebot lives at https://bundlerbot-bors.herokuapp.com, and has the exact same issue-comment interface as the previous mergebot.

### Why did you choose this fix out of the possible options?

I chose this fix because it lets us keep the exact same mergebot interface that we have today, while easing the maintenance burden both on updating end-user permissions and on updating the app over time, since we can simply pull and deploy the latest from `bors-ng/bors-ng` without maintaining our own specialized fork.

Co-authored-by: Andre Arko <andre@arko.net>
Loading status checks…
1bda123
@deivid-rodriguez

This comment has been minimized.

Sign in to view
Copy link
Contributor

deivid-rodriguez commented Sep 19, 2018

This time it looks promising!
@ghost

This comment has been minimized.

Sign in to view
Copy link

ghost commented Sep 19, 2018

Timed out
@indirect

This comment has been minimized.

Sign in to view
Copy link
Member Author

indirect commented Sep 19, 2018

aha! the build finished 40 minutes ago, but bors had a build timeout that ran out an hour ago. I will increase the amount of time bors is willing to wait to hear back from travis. :)
@indirect
wait up to 4 hours for staging pushes to build
Verified
This commit was signed with a verified signature.
@indirect indirect André Arko
GPG key ID: BBE521252B9D156A Learn about signing commits
Loading status checks…
7a2509d
@indirect

This comment has been minimized.

Sign in to view
Copy link
Member Author

indirect commented Sep 19, 2018

@bundlerbot r=colby-swandale

ghost pushed a commit that referenced this pull request Sep 19, 2018

@bundlerbot @indirect
Merge #6703 
6703: Switch from Homu to Bors mergebots r=colby-swandale a=indirect

### What was the end-user problem that led to this PR?

Our existing @bundlerbot mergebot is run by [bundlerbot-homu](https://github.com/bundler/bundlerbot-homu), which is a fork of japaric/homu-on-heroku, which is a fork of servo/homu, which is a fork of barosl/homu. Sadly, most of those forks are now unmaintained, including ours. Also, Homu sets up a list of users who are allowed to approve PRs with a list in a file on an env var, when it probably should just read the list of github users that have the permission to merge.

So the end-user problem is: unmaintained mergebot, very inconvenient to update team members.

### What was your diagnosis of the problem?

My diagnosis is that we should migrate from a Homu-based mergebot to a bors-ng-based mergebot. Bors-ng lives at [bors-ng/bors-ng](https://github.com/bors-ng/bors-ng), and has a website at [bors.tech](https://bors.tech). Bors-ng is actively maintained, easy to deploy to Heroku, doesn't lose repo and PR state when the webapp is restarted, and uses GitHub permissions to determine who can approve PRs for merging.

### What is your fix for the problem, implemented in this PR?

My fix for this problem was to fork bors-ng to the @bundler organization, modify bors-ng to respond to `@bundlerbot r+` instead of responding to `bors r+`, and change the configuration files below to support using bors instead of homu.

The bors-ng repo has already accepted our patch, and we maybe don't even need to keep the forked repo anymore.

The new mergebot lives at https://bundlerbot-bors.herokuapp.com, and has the exact same issue-comment interface as the previous mergebot.

### Why did you choose this fix out of the possible options?

I chose this fix because it lets us keep the exact same mergebot interface that we have today, while easing the maintenance burden both on updating end-user permissions and on updating the app over time, since we can simply pull and deploy the latest from `bors-ng/bors-ng` without maintaining our own specialized fork.

Co-authored-by: Andre Arko <andre@arko.net>
Loading status checks…
7146459
@ghost

This comment has been minimized.

Sign in to view
Copy link

ghost commented Sep 19, 2018

Build succeeded

@ghost ghost merged commit 7a2509d into master Sep 19, 2018
2 checks passed

2 checks passed

bors Build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@deivid-rodriguez

This comment has been minimized.

Sign in to view
Copy link
Contributor

deivid-rodriguez commented Sep 19, 2018

Wowowooooooo! 🎉

@deivid-rodriguez deivid-rodriguez deleted the indirect/homu-to-bors branch Sep 19, 2018

@simi

This comment has been minimized.

Sign in to view
Copy link
Contributor

simi commented Sep 19, 2018

Welcome @bundlerbot-bors!

@colby-swandale colby-swandale referenced this pull request Sep 23, 2018

Merged

Configure bors bot #2403

0 of 4 tasks complete

@deivid-rodriguez deivid-rodriguez referenced this pull request Sep 23, 2018

Closed

Short-form of commiter name/email results in conf error #459

This issue was closed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.