Skip to content

Commit

Permalink
merge: #544
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
zeebe-bors-camunda[bot] and korthout authored Oct 14, 2022
2 parents f5f694e + 5cf64ab commit 1a58394
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
15 changes: 15 additions & 0 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Build and test
on:
pull_request: { }
push:
branches:
- 'staging'
workflow_call: { }
jobs:
code-formatting:
Expand Down Expand Up @@ -108,6 +111,18 @@ jobs:
path: "*/target/surefire-reports/"
retention-days: 7

test-summary:
# Used by bors to check all tests, including the unit test matrix.
# New test jobs must be added to the `needs` lists!
# This name is hard-referenced from bors.toml; remember to update that if this name changes
name: Test summary
runs-on: ubuntu-latest
needs:
- code-formatting
- build-and-test
- build-and-test-testcontainers
steps:
- run: exit 0

# We need to upload the event file as an artifact in order to support publishing the results of
# forked repositories (https://github.com/EnricoMi/publish-unit-test-result-action#support-fork-repositories-and-dependabot-branches)
Expand Down
9 changes: 9 additions & 0 deletions bors.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
status = [
"Test summary",
]

required_approvals = 1

delete_merged_branches = true

commit_title = "merge: ${PR_REFS}"

0 comments on commit 1a58394

Please sign in to comment.