From 32a4be11d02bfecf32ad2560e5be2f4c1b2b07d2 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Thu, 8 Sep 2022 18:21:37 +0200 Subject: [PATCH] Bug 1781051 - simplify setting ownerEmail in .taskcluster.yml Remove special cases for bors and github-actions: - bors is no longer used for this, as far as I know - the github-actions special case breaks chain-of-trust's ability to rebuild the decision task definition: because we don't leave a breadcrumb to record event.sender.login, it has to guess, and if it gets it wrong, chain of trust verification fails --- .taskcluster.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.taskcluster.yml b/.taskcluster.yml index ec29dc076..2a62f95e1 100644 --- a/.taskcluster.yml +++ b/.taskcluster.yml @@ -13,17 +13,11 @@ 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}' else: - $if: 'event.sender.login == "github-actions[bot]"' - then: 'github-actions[bot]@users.noreply.github.com' - else: - $if: 'tasks_for == "github-push"' - then: '${event.pusher.email}' - else: - $if: 'tasks_for == "github-pull-request"' - then: '${event.pull_request.user.login}@users.noreply.github.com' + $if: 'tasks_for == "github-pull-request"' + then: '${event.pull_request.user.login}@users.noreply.github.com' baseRepoUrl: $if: 'tasks_for == "github-push"' then: '${event.repository.html_url}'