diff --git a/.github/labeler.yml b/.github/labeler.yml index 22c02b7b54..52ea3f4838 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -20,6 +20,7 @@ - ".github/**/*.yml" - ".murdock" - ".murdock.yml" + - "bors.toml" "Area: CoAP": - "sys/net/application_layer/*coap/**/*" diff --git a/.github/workflows/static-test.yml b/.github/workflows/static-test.yml index 8d80d3a781..81b2a51786 100644 --- a/.github/workflows/static-test.yml +++ b/.github/workflows/static-test.yml @@ -4,6 +4,8 @@ on: push: branches: - master + - staging + - trying tags: - '[0-9][0-9][0-9][0-9].[0-9][0-9]-RC[0-9]*' - '[0-9][0-9][0-9][0-9].[0-9][0-9]' diff --git a/.github/workflows/tools-buildtest.yml b/.github/workflows/tools-buildtest.yml index 3934f51727..32096030d9 100644 --- a/.github/workflows/tools-buildtest.yml +++ b/.github/workflows/tools-buildtest.yml @@ -4,6 +4,8 @@ on: push: branches: - master + - staging + - trying tags: - '*' pull_request: diff --git a/bors.toml b/bors.toml new file mode 100644 index 0000000000..2c92b093c1 --- /dev/null +++ b/bors.toml @@ -0,0 +1,35 @@ +# List of commit statuses that must pass on the PR commit when it is r+-ed. +# (listed in same order as in the repo's branch protection settings) +pr_status = [ + "python-tests", + "tools-build", + "check-labels", + "static-tests", + "check-commits (commit-msg)", + "check-commits (pr_check)", + "Murdock", + ] + +# List of commit statuses that must pass on the merge commit before it is +# pushed to master. +status = [ + "Murdock", + "static-tests", + "tools-build", + ] + +# Number of project members who must approve the PR (using GitHub Reviews) +# before it is pushed to master. +# This necessary even with the check-labels action (which checks for >1 ACKs), +# as that passes when there's no review or no special label set. +required_approvals = 1 + +# delete branch after successful merge +delete_merged_branches = true + +# timeout for bors-initiated builds. +# unfortunately bors is not the only entity queuing builds, so this needs +# to take a full nightly build *plus* another full bors build *plus* some +# possible intermediate PR builds into accound. +# let's try ten hours (36000s) +timeout_sec = 36000