Skip to content
This repository has been archived by the owner on Jun 17, 2024. It is now read-only.

Bug 1800542 - part 6: Support multiple locations of Gecko.kt dependin… #184

Merged
merged 1 commit into from
Nov 18, 2022

Conversation

JohanLorenzo
Copy link
Collaborator

…g on the git history

While working on bug 1799668, I realized our parameter files in taskcluster/test/params/ are now all busted because they all predate #148. I could have updated them but I think we should just support both Gecko.kt locations. This way, taskgraph works no matter the revision.

Follows up:

Copy link
Contributor

@jcristau jcristau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems fine, I guess.

gecko_kt = repo.run(
"show", f"{revision}:android-components/plugins/dependencies/src/main/java/Gecko.kt"
"show", f"{revision}:{gecko_kt_path}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't we just try git show on the new path and fall back to the old path if that doesn't work? Then we don't have to care about the exact moved revision.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could, although any error raised by git will be caught under the generic CalledProcessError. So we would try to fallback to the old path even though the first command failed for an unrelated reason.

In the current implementation, we're safer because git merge-base --is-ancestor fails by design.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm happy to make any follow-up changes, if you wish 🙂

@JohanLorenzo JohanLorenzo self-assigned this Nov 18, 2022
@JohanLorenzo JohanLorenzo added the 🛬 needs landing PRs that are ready to land label Nov 18, 2022
@mergify mergify bot merged commit cd1c066 into mozilla-mobile:main Nov 18, 2022
@JohanLorenzo JohanLorenzo deleted the bug-1800542-6 branch November 18, 2022 18:01
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
🛬 needs landing PRs that are ready to land
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants