diff --git a/.taskcluster.yml b/.taskcluster.yml index 7eebe65eec3..0b427e1795d 100644 --- a/.taskcluster.yml +++ b/.taskcluster.yml @@ -48,18 +48,7 @@ tasks: $if: "event.ref[:11] == 'refs/heads/'" then: "${event.ref[11:]}" in: - $if: >- - ( - taskcluster_root_url == 'https://community-tc.services.mozilla.com' && - branch == 'try-communitytc' - ) || ( - taskcluster_root_url == 'https://taskcluster.net' && - branch != 'try-communitytc' && - ( - branch in ['auto', 'try', 'master'] || - branch[:4] == 'try-' - ) - ) + $if: "branch in ['auto', 'try', 'master'] || branch[:4] == 'try-'" then: $mergeDeep: - {$eval: "task_common"} diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index 6673a89b6ce..148ee81cc0c 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -24,6 +24,10 @@ def main(task_for): magicleap_nightly = lambda: None if task_for == "github-push": + if not CONFIG.legacy_tc_deployment: # pragma: no cover + # Do nothing (other than the decision task itsef) on community-tc by default for now + return + # FIXME https://github.com/servo/servo/issues/22187 # In-emulator testing is disabled for now. (Instead we only compile.) # This local variable shadows the module-level function of the same name.