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.

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

Add bors for mergebot action #8

Merged
merged 1 commit into from
Feb 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ gce_instance:

# Update metadata on VM images referenced by this repository state
meta_task:
# see bors.toml
skip: $CIRRUS_BRANCH =~ ".*\.tmp"

container:
image: "quay.io/libpod/imgts:master" # maintained in libpod repo
Expand Down Expand Up @@ -64,6 +66,10 @@ gating_task:

# Only run this on PRs, never during post-merge testing. This is also required
# for proper setting of EPOCH_TEST_COMMIT value, required by validation tools.

# see bors.toml
skip: $CIRRUS_BRANCH =~ ".*\.tmp"

only_if: $CIRRUS_BRANCH != $DEST_BRANCH

env:
Expand All @@ -85,9 +91,12 @@ gating_task:
- make unittest

success_task:

# This task is a required-pass in github settings,
# it blocks PRs from merging if a depends_on task fails

# see bors.toml
skip: $CIRRUS_BRANCH =~ ".*\.tmp"

only_if: $CIRRUS_BRANCH != $DEST_BRANCH

# ignores any dependent task conditions
Expand Down
42 changes: 42 additions & 0 deletions bors.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Bors-ng is a service which provides a merge and review bot for github PRs.
# When approved for merging (`bors r+`) or test merging (`bors try`), all
# pending PRs at the time will be merged together in one of two special
# branches. Either 'staging' or 'trying'. In the case of `staging` branch,
# when all status tests pass (see below) the serialized set of merges will become
# the new destination branch HEAD (i.e. master). This guarantees there is never
# any conflicts with PR merge order on the destination branch(es).
#
# Note: The branches 'staging.tmp' and 'trying.tmp' must always be ignored
# by _all_ CI systems. They are by bors temporarily, and may go away at
# unpredictable times.
#
# Format Ref: https://bors.tech/documentation/#configuration-borstoml
#
# status
# ------------------
# Selects which tests are required for merging, matching against values
# from BOTH the older github 'status API' (ref: https://developer.github.com/v3/repos/statuses
# /#list-statuses-for-a-specific-ref) AND newer 'checks API'. Ref: https://developer.github.com/v3/checks
# /runs/#list-check-runs-in-a-check-suite both return JSON:
#
# Status API: Matches against '[].context' values
# Checks API: Matches against 'check_runs[].name' values
#
# Note: The wild-card character '%' is available.
status = [
"success",
]

# Same as 'status' (above) but statuses that must pass on every PR
pr_status = [
"success",
]

# Cirrus-CI Max Timeout is 60 * 60 * 2
timeout_sec = 7200

# List of strings: PR Labels that must NOT be present
block_labels = ["wip", "hold"]

# The number of required `bors r+` needed for a PR to merge
required_approvals = 1