Add Bors to merge pull requests #537
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bors needs a GH job that it can await and check the result of. Since there is a matrix of testing related jobs in the build-test.yml workflow, we need a final job that is only executed once all the other test jobs have completed. We also use this approach in the zeebe repo.
Bors requires a bit of configuration. This configuration is mostly copied from the Zeebe repo. The status list specifies the CI jobs that bors will await. This result determines whether or not bors will actually fast-forward the target branch. The entry "Test summary" is the name of a job added to the build-test.yml workflow. A comment is placed in that job definition to highlight that bors depends on it. The other properties are pretty straightforward.
Bors will push merge commits to a branch called 'staging'. This push should trigger the CI to run. Bors will then await the completion of that run.
|
Note that one final step is needed, which is to configure our bors instance for this repo. I've made a request to infra for this here. |
|
The new workflow looks like this now: |
|
bors try |
tryTimed out. |
remcowesterhoud
approved these changes
Oct 14, 2022
|
It's happening 🙏 EDIT: I'm not sure whether the |
|
Build succeeded: |
ghost
merged commit 
|
Apparently not 😄 |
|
/backport |
|
Git push to origin failed for stable/8.0 with exitcode 1 |
|
Successfully created backport PR #543 for |
ghost
pushed a commit
that referenced
this pull request
Oct 14, 2022
ghost
pushed a commit
that referenced
this pull request
Oct 14, 2022
544: [Backport stable/8.0] Add Bors to merge pull requests r=remcowesterhoud a=korthout # Description Backport of #537 to `stable/8.0`. relates to #536 Backported manually because there was a failure in the backport-action. Although the cherry-pick was without conflicts: `git cherry-pick -x 9810bb4 2ff389d b577b16`, I still needed to fix the CI. Specifically one of the jobs has a different name. Co-authored-by: Nico Korthout <nico.korthout@camunda.com>
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This adds bors support to this repo.
staging(typically what bors does when instructed to merge a pull request)Related issues
closes #536
Definition of Done
Not all items need to be done depending on the issue and the pull request.
Code changes:
Testing:
Documentation: