Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add bors-ng configuration #511

Merged
merged 3 commits into from
Apr 21, 2020
Merged

Add bors-ng configuration #511

merged 3 commits into from
Apr 21, 2020

Conversation

cryslith
Copy link
Member

@cryslith cryslith commented Apr 19, 2020 •
edited by celskeggs
Loading

  • Configure bors-ng
  • Run CircleCI only during bors merges
  • Require branches to have linear git history

Closes #491.

Checklist:

  • I have split up this change into one or more appropriately-delineated commits.
  • The first line of each commit is of the form "[component]: do something"
  • I have written a complete, multi-line commit message for each commit.
  • I have formatted any Go code that I have changed with gofmt.
  • I have written or updated appropriate documentation to cover this change.
  • I have confirmed that this change is covered by at least one appropriate test run by CI.
  • If my change includes new or modified functionality, I have tested that the changes work as expected.
  • I have assigned this issue to an appropriate reviewer. (Choose @celskeggs if you are not otherwise certain.)
  • I consider my PR complete and ready to be merged without my further input, assuming that it passes CI and code review.
  • My changes have passed CI, including an automatic Jenkins deploy.
  • My changes have passed code review.

@cryslith
Copy link
Member Author

Note: for this to work, I think we'll need to change the repo configuration to require continuous-integration/jenkins/branch instead of continuous-integration/jenkins/pr-merge. We would also need to replace the "Require pull request reviews before merging" option with requiring the bors check to pass.

celskeggs
celskeggs reviewed Apr 19, 2020
View reviewed changes
.circleci/config.yml
only:
- staging
- trying
- master
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to apply this same configuration to Jenkins?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure how to do that - I think it requires configuring jenkins through the web interface?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now working; it's configured in jenkins itself.

@cryslith
Copy link
Member Author

bors try

hyades-bors bot pushed a commit that referenced this pull request Apr 19, 2020
Try #511:
8c558b7
@hyades-bors
Copy link

hyades-bors bot commented Apr 19, 2020

try

Timed out.

@cryslith
Copy link
Member Author

bors try

hyades-bors bot pushed a commit that referenced this pull request Apr 19, 2020
Try #511:
8909e61
@hyades-bors
Copy link

hyades-bors bot commented Apr 19, 2020

try

Build succeeded:

@cryslith cryslith requested a review from celskeggs April 19, 2020 23:26
celskeggs
celskeggs previously approved these changes Apr 20, 2020
View reviewed changes
docs/bors-ng-setup.txt Show resolved Hide resolved
@cryslith cryslith requested a review from celskeggs April 20, 2020 07:27
celskeggs
celskeggs approved these changes Apr 20, 2020
View reviewed changes
Copy link
Member

@celskeggs celskeggs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you also want me to do a bors r+ or something?

@celskeggs
Copy link
Member

bors r+

hyades-bors bot pushed a commit that referenced this pull request Apr 20, 2020
@cryslith
Merge #511
9e1bbfe 
511: Add bors-ng configuration r=celskeggs a=cryslith

- Configure bors-ng
- Run CircleCI only during bors merges
- Require branches to have linear git history

Closes #491.



Co-authored-by: Lily Chung <[email protected]>
cryslith
cryslith commented Apr 20, 2020
View reviewed changes
docs/bors-ng-setup.txt
GITHUB_WEBHOOK_SECRET=??? # generate this randomly and input it to github
GITHUB_CLIENT_ID=??? # from github
GITHUB_CLIENT_SECRET=??? # from github
PUBLIC_HOST=localhost
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be hjinks.mit.edu:4002, oops

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean hijinks.mit.edu:4002?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

@cryslith
Copy link
Member Author

bors r+

hyades-bors bot pushed a commit that referenced this pull request Apr 21, 2020
@cryslith
Merge #511
705afae 
511: Add bors-ng configuration r=cryslith a=cryslith

- Configure bors-ng
- Run CircleCI only during bors merges
- Require branches to have linear git history

Closes #491.



Co-authored-by: Lily Chung <[email protected]>
@cryslith
Copy link
Member Author

bors r+

@hyades-bors
Copy link

hyades-bors bot commented Apr 21, 2020

Build succeeded:

@hyades-bors hyades-bors bot merged commit ced57ff into sipb:master Apr 21, 2020
@cryslith
Copy link
Member Author

Reset

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@celskeggs celskeggs celskeggs approved these changes

@krawthekrow krawthekrow Awaiting requested review from krawthekrow

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Set up merge bot for repository
2 participants
@cryslith @celskeggs