From 742f49c76a5dd81cec030e9018f83c0d6925afc6 Mon Sep 17 00:00:00 2001 From: Johan Lorenzo Date: Mon, 18 Jul 2022 15:56:33 +0200 Subject: [PATCH] [fenix] Bug 1779797 - part 3: Create complete-push taskcluster task --- .mergify.yml | 12 ++++++------ taskcluster/ci/{pr => complete}/kind.yml | 11 +++++++++-- 2 files changed, 15 insertions(+), 8 deletions(-) rename taskcluster/ci/{pr => complete}/kind.yml (78%) diff --git a/.mergify.yml b/.mergify.yml index 2fd025e120..a9ef6b2d50 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,7 +1,7 @@ queue_rules: - name: default conditions: - - status-success=pr-complete + - status-success=complete-pr pull_request_rules: - name: Resolve conflict conditions: @@ -12,7 +12,7 @@ pull_request_rules: - name: MickeyMoz - Auto Merge conditions: - author=MickeyMoz - - status-success=pr-complete + - status-success=complete-pr - files~=(Gecko.kt|AndroidComponents.kt) actions: review: @@ -30,7 +30,7 @@ pull_request_rules: - and: - author=mozilla-l10n-automation-bot - base=main - - status-success=pr-complete + - status-success=complete-pr - and: - author=github-actions[bot] - base~=releases[_/].* @@ -104,7 +104,7 @@ pull_request_rules: force: false - name: Needs landing - Rebase conditions: - - check-success=pr-complete + - check-success=complete-pr - label=pr:needs-landing - "#approved-reviews-by>=1" - -draft @@ -117,8 +117,8 @@ pull_request_rules: rebase_fallback: none - name: Needs landing - Squash conditions: - - check-success=pr-complete - - label=pr:needs-landing-squashed + - check-success=complete-pr + - label=pr:needs-landing-squashed - "#approved-reviews-by>=1" - -draft - label!=pr:work-in-progress diff --git a/taskcluster/ci/pr/kind.yml b/taskcluster/ci/complete/kind.yml similarity index 78% rename from taskcluster/ci/pr/kind.yml rename to taskcluster/ci/complete/kind.yml index 7286e34c8b..9a2ba2a691 100644 --- a/taskcluster/ci/pr/kind.yml +++ b/taskcluster/ci/complete/kind.yml @@ -14,8 +14,15 @@ transforms: - taskgraph.transforms.code_review:transforms - taskgraph.transforms.task:transforms +job-defaults: + worker-type: succeed + + jobs: - complete: + pr: description: PR Summary Task run-on-tasks-for: [github-pull-request] - worker-type: succeed + + push: + description: Push Summary Task + run-on-tasks-for: [github-push]