corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1945334 - Make gradle supports beta build. r=firefox-build-system-reviewers,nalexander

Browse Source 
Remove 'b[0-9]' from MOZ_APP_VERSION before computing version code.

MOZ_APP_VERSION is "136.0b0" with
"--as-milestone=early-beta". However, computeVersionCode() in
m-c/build.gradle fails to parse it. It supports only "136.0a0" or
alike.

Differential Revision: https://phabricator.services.mozilla.com/D236463
This commit is contained in:
Thinker Li
2025-02-03 19:44:52 +00:00
parent 5cb6653481
commit cdd658462b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@@ -239,10 +239,11 @@ ext.geckoBinariesOnlyIf = { task ->
return true return true
} }
// Non-official versions are like "61.0a1", where "a1" is the milestone. // Non-official versions are like "61.0a1" or "61.0b1", where "a1" and "b1"
// are the milestone.
// This simply strips that off, leaving "61.0" in this example. // This simply strips that off, leaving "61.0" in this example.
def getAppVersionWithoutMilestone() { def getAppVersionWithoutMilestone() {
return project.ext.mozconfig.substs.MOZ_APP_VERSION.replaceFirst(/a[0-9]/, "") return project.ext.mozconfig.substs.MOZ_APP_VERSION.replaceFirst(/[ab][0-9]/, "")
} }
// This converts MOZ_APP_VERSION into an integer // This converts MOZ_APP_VERSION into an integer