Bug 1725400 - Fix GeckoView release artifactId. r=nalexander,owlish

The problem here is that the release artifactId was using single quotes instead
of double. I rewrote this code a little bit to avoid this sort of problem next
time by not having a release-build-only conditional branch.

Differential Revision: https://phabricator.services.mozilla.com/D122496
This commit is contained in:
Agi Sferro 2021-08-12 18:36:42 +00:00
Родитель 36904ac58d
Коммит c14e63e428
1 изменённых файлов: 6 добавлений и 5 удалений

Просмотреть файл

@ -437,13 +437,14 @@ publishing {
omniSuffix = "-omni"
}
if (mozconfig.substs.MOZ_UPDATE_CHANNEL == 'release') {
// Release artifacts don't specify the channel, for the sake of simplicity.
artifactId = 'geckoview$omniSuffix'
} else {
artifactId = "geckoview-${mozconfig.substs.MOZ_UPDATE_CHANNEL}$omniSuffix"
def channelSuffix = ""
// Release artifacts don't specify the channel, for the sake of simplicity.
if (mozconfig.substs.MOZ_UPDATE_CHANNEL != 'release') {
channelSuffix = "-${mozconfig.substs.MOZ_UPDATE_CHANNEL}"
}
artifactId = "geckoview$channelSuffix$omniSuffix"
if (mozconfig.substs.MOZILLA_OFFICIAL && !mozconfig.substs.MOZ_ANDROID_FAT_AAR_ARCHITECTURES) {
// In automation, per-architecture artifacts identify
// the architecture; multi-architecture artifacts don't.