Skip to content
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.

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

Bug 1862794 - Use function calls instead of const val for version and channel fields in Gecko object #108

Merged
merged 1 commit into from
Nov 14, 2023

Conversation

gabrielluong
Copy link
Member

Changes here are needed to mozilla-mobile/firefox-android#4346

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.

We probably need to handle both the const val and the fun case here, because the former will still be needed on release branches after main switches to fun.

@gabrielluong
Copy link
Member Author

gabrielluong commented Nov 13, 2023

We probably need to handle both the const val and the fun case here, because the former will still be needed on release branches after main switches to fun.

@jcristau Since we are using a tagged version of relbot in our actions https://github.com/mozilla-mobile/firefox-android/blob/main/.github/workflows/ac-update-geckoview.yml#L32, this shouldn't affect the release branches since they will be using a lower relbot version that will still function. We may also potentially be uplifting the const val to fun changes to the release branches as well based on the discussion in https://mozilla.slack.com/archives/C016PEDKY90/p1698969027616489. This will mean we will bump the relbot version in all the branches when this change lands.

Let me know how we should proceed because I can still make your requested changes, but there are implications if we also uplift the changes to the release branches. Alternatively, maybe I should be reading this as just adding both:

new_content = content.replace(
    f'const val version = "{old_gv_version}"',
    f'const val version = "{new_gv_version}"',
)
new_content = new_content.replace(
    f'fun version() = "{old_gv_version}"',
    f'fun version() = "{new_gv_version}"',
)

@jcristau
Copy link
Contributor

Adding both seems reasonable to me, and means we don't have to worry about when/whether the firefox-android side of this change gets uplifted to any/all release branches.

@gabrielluong gabrielluong merged commit 59c0410 into mozilla-mobile:master Nov 14, 2023
2 checks passed
@gabrielluong gabrielluong deleted the bug-1862794 branch November 14, 2023 19:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants