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

ThinkerYzu1 · ThinkerYzu1 · commit a6f30a2a7157 · 2025-02-03T19:44:52.000Z
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
diff --git a/build.gradle b/build.gradle
@@ -239,10 +239,11 @@ ext.geckoBinariesOnlyIf = { task ->
     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.
 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

Original file line number	Diff line number	Diff line change
`@@ -239,10 +239,11 @@ ext.geckoBinariesOnlyIf = { task ->`
`239`	`239`	`return true`
`240`	`240`	`}`
`241`	`241`
`242`		`-// Non-official versions are like "61.0a1", where "a1" is the milestone.`
	`242`	`+// Non-official versions are like "61.0a1" or "61.0b1", where "a1" and "b1"`
	`243`	`+// are the milestone.`
`243`	`244`	`// This simply strips that off, leaving "61.0" in this example.`
`244`	`245`	`def getAppVersionWithoutMilestone() {`
`245`		`- return project.ext.mozconfig.substs.MOZ_APP_VERSION.replaceFirst(/a[0-9]/, "")`
	`246`	`+ return project.ext.mozconfig.substs.MOZ_APP_VERSION.replaceFirst(/[ab][0-9]/, "")`
`246`	`247`	`}`
`247`	`248`
`248`	`249`	`// This converts MOZ_APP_VERSION into an integer`