Skip to content

Commit 28e2650

Browse files
committed
fix(lando): generate file-specific version_bump scopes (bug 2037926)
1 parent cddf8e1 commit 28e2650

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

src/mozilla_taskgraph/worker_types.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ def build_lando_payload(config, task, task_def):
335335
if worker.get("force-dry-run"):
336336
task_def["payload"]["dry_run"] = True
337337

338+
bump_files: list[str] = []
338339
for action in worker["actions"]:
339340
if info := action.get("android-l10n-import"):
340341
android_l10n_import_info = dash_to_underscore(info)
@@ -384,6 +385,7 @@ def build_lando_payload(config, task, task_def):
384385
bump_info = {}
385386
bump_info["next_version"] = release_config["next_version"]
386387
bump_info["files"] = info["bump-files"]
388+
bump_files = info["bump-files"]
387389
task_def["payload"]["version_bump_info"] = bump_info
388390
actions.append("version_bump")
389391

@@ -423,7 +425,9 @@ def build_lando_payload(config, task, task_def):
423425

424426
scopes = set(task_def.get("scopes", []))
425427
scopes.add(f"project:releng:lando:repo:{worker['lando-repo']}")
426-
scopes.update([f"project:releng:lando:action:{action}" for action in actions])
428+
scopes.update(f"project:releng:lando:action:{a}" for a in actions if a != "version_bump")
429+
if "version_bump" in actions:
430+
scopes.update(f"project:releng:lando:action:version_bump:file:{f}" for f in bump_files)
427431

428432
for matrix_room in worker.get("matrix-rooms", []):
429433
task_def.setdefault("routes", [])

test/test_worker_types.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,8 @@ def test_lando_version_bump(build_payload):
750750
},
751751
},
752752
"scopes": [
753-
"project:releng:lando:action:version_bump",
753+
"project:releng:lando:action:version_bump:file:another/file.txt",
754+
"project:releng:lando:action:version_bump:file:foo/bar/a.txt",
754755
"project:releng:lando:repo:testrepo",
755756
],
756757
"tags": {"worker-implementation": "scriptworker"},

0 commit comments

Comments
 (0)