Backed out changeset b3f4763a4887 (bug 1752111) for causing l10n-bump failures.

This commit is contained in:
Sandor Molnar 2022-08-12 11:27:09 +03:00
parent 53800e2e07
commit d0447e7530
3 changed files with 41 additions and 58 deletions

View File

@ -29,6 +29,8 @@ jobs:
- mozilla-central
when:
by-project:
# `l10n-bumper` job should have enough time to finish before this
# job runs
mozilla-central: [{hour: 10, minute: 0}, {hour: 22, minute: 0}]
# No default
@ -275,14 +277,12 @@ jobs:
treeherder-symbol: l10n-bump
target-tasks-method: l10n_bump
run-on-projects:
- autoland
- mozilla-central
- mozilla-beta
when:
by-project:
# 3h15m before launch of `nightly-desktop`
autoland: [{hour: 6, minute: 45}, {hour: 18, minute: 45}]
mozilla-central: []
mozilla-central: [{hour: 6, minute: 45}, {hour: 18, minute: 45}]
# 3h15m before launch of `daily-releases`
mozilla-beta: [{hour: 18, minute: 45}]
# No default

View File

@ -8,6 +8,7 @@ transforms:
- gecko_taskgraph.transforms.release_version_bump:transforms
- gecko_taskgraph.transforms.task:transforms
job-defaults:
worker-type: tree
worker:
@ -18,20 +19,15 @@ job-defaults:
by-project:
mozilla-beta: false
default: true
ignore-closed-tree:
by-project:
autoland: true
default: false
ignore-closed-tree: false
push:
by-project:
mozilla-(central|beta): true
autoland: true
default: false
source-repo:
by-release-type:
beta: https://hg.mozilla.org/releases/mozilla-beta
nightly: https://hg.mozilla.org/mozilla-central
default: https://hg.mozilla.org/integration/autoland
default: https://hg.mozilla.org/mozilla-central
l10n-bump-info:
by-release-type:
# XXX whenever the `beta` config changes, make sure to make
@ -56,27 +52,23 @@ job-defaults:
- win64-devedition
- win64-aarch64
- win64-aarch64-devedition
platform-configs:
[
{
"platforms":
[
"linux",
"linux-devedition",
"linux64",
"linux64-devedition",
"macosx64",
"macosx64-devedition",
"win32",
"win32-devedition",
"win64",
"win64-devedition",
"win64-aarch64",
"win64-aarch64-devedition",
],
"path": "browser/locales/shipped-locales",
},
]
platform-configs: [{
"platforms": [
"linux",
"linux-devedition",
"linux64",
"linux64-devedition",
"macosx64",
"macosx64-devedition",
"win32",
"win32-devedition",
"win64",
"win64-devedition",
"win64-aarch64",
"win64-aarch64-devedition",
],
"path": "browser/locales/shipped-locales",
}]
default:
name: Firefox l10n changesets
path: browser/locales/l10n-changesets.json
@ -97,27 +89,23 @@ job-defaults:
- win64-devedition
- win64-aarch64
- win64-aarch64-devedition
platform-configs:
[
{
"platforms":
[
"linux",
"linux-devedition",
"linux64",
"linux64-devedition",
"macosx64",
"macosx64-devedition",
"win32",
"win32-devedition",
"win64",
"win64-devedition",
"win64-aarch64",
"win64-aarch64-devedition",
],
"path": "browser/locales/all-locales",
},
]
platform-configs: [{
"platforms": [
"linux",
"linux-devedition",
"linux64",
"linux64-devedition",
"macosx64",
"macosx64-devedition",
"win32",
"win32-devedition",
"win64",
"win64-devedition",
"win64-aarch64",
"win64-aarch64-devedition",
],
"path": "browser/locales/all-locales",
}]
jobs:
l10n-bumper:

View File

@ -21,12 +21,7 @@ def handle_keyed_by(config, tasks):
]
for task in tasks:
fields = default_fields[:]
for additional_field in (
"l10n-bump-info",
"source-repo",
"dontbuild",
"ignore-closed-tree",
):
for additional_field in ("l10n-bump-info", "source-repo", "dontbuild"):
if additional_field in task["worker"]:
fields.append(f"worker.{additional_field}")
for field in fields: