parent
c0b9ad77be
commit
99f3804216
|
@ -1,5 +1,4 @@
|
||||||
---
|
|
||||||
<!-- Text above this line will be added to the commit once "bors" merges this PR -->
|
|
||||||
|
|
||||||
### Pull Request checklist
|
### Pull Request checklist
|
||||||
<!-- Before submitting the PR, please address each item -->
|
<!-- Before submitting the PR, please address each item -->
|
||||||
|
@ -14,4 +13,4 @@
|
||||||
1. click on Show All Checks,
|
1. click on Show All Checks,
|
||||||
2. click Details next to "Taskcluster (pull_request)" after it appears and then finishes with a green checkmark,
|
2. click Details next to "Taskcluster (pull_request)" after it appears and then finishes with a green checkmark,
|
||||||
3. click on the "Fenix - assemble" task, then click "Run Artifacts".
|
3. click on the "Fenix - assemble" task, then click "Run Artifacts".
|
||||||
4. the APK links should be on the left side of the screen, named for each CPU architecture
|
4. the APK links should be on the left side of the screen, named for each CPU architecture
|
|
@ -17,19 +17,15 @@ tasks:
|
||||||
$if: 'tasks_for in ["cron", "action"]'
|
$if: 'tasks_for in ["cron", "action"]'
|
||||||
then: '${tasks_for}@noreply.mozilla.org'
|
then: '${tasks_for}@noreply.mozilla.org'
|
||||||
else:
|
else:
|
||||||
$if: 'event.sender.login == "bors[bot]"'
|
$if: 'tasks_for == "github-push"'
|
||||||
then: 'skaspari+mozlando@mozilla.com' # It must match what's in bors.toml
|
then: '${event.pusher.email}'
|
||||||
|
# Assume Pull Request
|
||||||
else:
|
else:
|
||||||
$if: 'tasks_for == "github-push"'
|
$if: 'tasks_for == "github-pull-request"'
|
||||||
then: '${event.pusher.email}'
|
then: '${event.pull_request.user.login}@users.noreply.github.com'
|
||||||
# Assume Pull Request
|
|
||||||
else:
|
else:
|
||||||
$if: 'tasks_for == "github-pull-request"'
|
$if: 'tasks_for == "github-release"'
|
||||||
then: '${event.pull_request.user.login}@users.noreply.github.com'
|
then: '${event.sender.login}@users.noreply.github.com'
|
||||||
else:
|
|
||||||
$if: 'tasks_for == "github-release"'
|
|
||||||
then: '${event.sender.login}@users.noreply.github.com'
|
|
||||||
|
|
||||||
baseRepoUrl:
|
baseRepoUrl:
|
||||||
$if: 'tasks_for in ["github-push", "github-release"]'
|
$if: 'tasks_for in ["github-push", "github-release"]'
|
||||||
then: '${event.repository.html_url}'
|
then: '${event.repository.html_url}'
|
||||||
|
@ -93,7 +89,7 @@ tasks:
|
||||||
else: 'UNDEFINED'
|
else: 'UNDEFINED'
|
||||||
in:
|
in:
|
||||||
$if: 'tasks_for in ["github-pull-request", "action", "cron"]
|
$if: 'tasks_for in ["github-pull-request", "action", "cron"]
|
||||||
|| (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")'
|
|| (tasks_for == "github-release" && releaseAction == "published")'
|
||||||
then:
|
then:
|
||||||
$let:
|
$let:
|
||||||
|
|
21
bors.toml
21
bors.toml
|
@ -1,21 +0,0 @@
|
||||||
status = [
|
|
||||||
"build-debug",
|
|
||||||
"test-debug",
|
|
||||||
"test-ui",
|
|
||||||
"lint-compare-locales",
|
|
||||||
"lint-detekt",
|
|
||||||
"lint-ktlint",
|
|
||||||
"lint-lint"
|
|
||||||
]
|
|
||||||
block_labels = [
|
|
||||||
"needs:data-review",
|
|
||||||
"do not land",
|
|
||||||
"pr:work-in-progress",
|
|
||||||
"pr:needs-changes"
|
|
||||||
]
|
|
||||||
required_approvals = 1
|
|
||||||
delete_merged_branches = true
|
|
||||||
cut_body_after = "---"
|
|
||||||
[committer]
|
|
||||||
name = "MozLando"
|
|
||||||
email = "skaspari+mozlando@mozilla.com"
|
|
Loading…
Reference in New Issue