diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2019-11-05 17:06:48 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2019-11-06 00:43:24 +0100 |
| commit | 6125fe88c36c0181c07c5a4633132fdeb13563e1 (patch) | |
| tree | df96f1d1102ec29d65a4e63b1265922a6bac2c04 | |
| parent | 694e38e163cb023f372bf13480257b5703c216bc (diff) | |
| download | servo-6125fe88c36c0181c07c5a4633132fdeb13563e1.tar.gz servo-6125fe88c36c0181c07c5a4633132fdeb13563e1.zip | |
Run a decision task on both deployments for push events
| -rw-r--r-- | .taskcluster.yml | 13 | ||||
| -rw-r--r-- | etc/taskcluster/decision_task.py | 4 |
2 files changed, 5 insertions, 12 deletions
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. |