Skip to content

Update landoscript merge_day.py to accomodate Thunderbird #1337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dandarnell wants to merge 2 commits into
base: master
Choose a base branch
from
+16 −9
Open

Update landoscript merge_day.py to accomodate Thunderbird #1337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1b2e79
Update landoscript merge_day.py to accomodate Thunderbird
dandarnell Feb 5, 2026
abc01c6
style: pre-commit.ci auto fixes [...]
pre-commit-ci[bot] Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions landoscript/src/landoscript/actions/merge_day.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def from_payload_data(cls, payload_data) -> Self:


async def run(
session: ClientSession, github_client: GithubClient, github_config: dict[str, str], public_artifact_dir: str, merge_info: MergeInfo
session: ClientSession, github_client: GithubClient, github_config: dict[str, str], public_artifact_dir: str, merge_info: MergeInfo, lando_repo: str
) -> list[LandoAction]:
to_branch = merge_info.to_branch
from_branch = merge_info.from_branch
Expand Down Expand Up @@ -170,15 +170,17 @@ async def run(
raise LandoscriptError(f"Couldn't find file '{fn}' in repository!")
files_to_diff.append((fn, str(orig_contents[fn]), new_contents[fn]))

log.info("Touching clobber file")
orig_clobber_file = (await github_client.get_files("CLOBBER", bump_branch))["CLOBBER"]
if orig_clobber_file is None:
raise LandoscriptError("Couldn't find CLOBBER file in repository!")
# Thunderbird does not have its own CLOBBER file
if "thunderbird" not in lando_repo:
log.info("Touching clobber file")
orig_clobber_file = (await github_client.get_files("CLOBBER", bump_branch))["CLOBBER"]
if orig_clobber_file is None:
raise LandoscriptError("Couldn't find CLOBBER file in repository!")

new_clobber_file = get_new_clobber_file(orig_clobber_file)
files_to_diff.append(("CLOBBER", orig_clobber_file, new_clobber_file))
new_clobber_file = get_new_clobber_file(orig_clobber_file)
files_to_diff.append(("CLOBBER", orig_clobber_file, new_clobber_file))

files_to_diff.sort(key=lambda x: x[0])
files_to_diff.sort(key=lambda x: x[0])

# Generate diffs in sorted order
diffs = []
Expand Down
7 changes: 6 additions & 1 deletion landoscript/src/landoscript/script.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,12 @@ async def process_actions(session, context, owner, repo, public_artifact_dir, br
lando_actions.extend(tag_actions)
elif action == "merge_day":
merge_day_actions = await merge_day.run(
session, gh_client, context.config["github_config"], public_artifact_dir, merge_day.MergeInfo.from_payload_data(payload["merge_info"])
session,
gh_client,
context.config["github_config"],
public_artifact_dir,
merge_day.MergeInfo.from_payload_data(payload["merge_info"]),
lando_repo,
)
lando_actions.extend(merge_day_actions)
elif action == "l10n_bump":
Expand Down