1
0
Fork 0

Revert "Issue #9295 - Add back non-blocking bors to trigger CI on contributor PRs (#9843)"

This reverts commit b897039f3a.
master
Johan Lorenzo 2020-04-10 17:17:46 +02:00 committed by liuche
parent 1881975a31
commit 7c5e917ce9
2 changed files with 8 additions and 23 deletions

View File

@ -17,17 +17,15 @@ tasks:
$if: 'tasks_for in ["cron", "action"]'
then: '${tasks_for}@noreply.mozilla.org'
else:
$if: 'event.sender.login == "bors[bot]"'
then: 'skaspari+mozlando@mozilla.com' # It must match what's in bors.toml
$if: 'tasks_for == "github-push"'
then: '${event.pusher.email}'
# Assume Pull Request
else:
$if: 'tasks_for == "github-push"'
then: '${event.pusher.email}'
$if: 'tasks_for == "github-pull-request"'
then: '${event.pull_request.user.login}@users.noreply.github.com'
else:
$if: 'tasks_for == "github-pull-request"'
then: '${event.pull_request.user.login}@users.noreply.github.com'
else:
$if: 'tasks_for == "github-release"'
then: '${event.sender.login}@users.noreply.github.com'
$if: 'tasks_for == "github-release"'
then: '${event.sender.login}@users.noreply.github.com'
baseRepoUrl:
$if: 'tasks_for in ["github-push", "github-release"]'
then: '${event.repository.html_url}'
@ -103,7 +101,7 @@ tasks:
$if: >
tasks_for in ["action", "cron"]
|| (tasks_for == "github-pull-request" && pullRequestAction in ["opened", "reopened", "edited", "synchronize"])
|| (tasks_for == "github-push" && head_branch[:10] != "refs/tags/") && (head_branch != "staging.tmp") && (head_branch != "trying.tmp")
|| (tasks_for == "github-push" && head_branch[:10] != "refs/tags/")
|| (tasks_for == "github-release" && releaseAction == "published")
then:
$let:

View File

@ -1,13 +0,0 @@
status = []
block_labels = [
"needs:data-review",
"do not land",
"pr:work-in-progress",
"pr:needs-changes"
]
required_approvals = 0
delete_merged_branches = true
cut_body_after = "---"
[committer]
name = "MozLando"
email = "skaspari+mozlando@mozilla.com"