Bug 1496190 - Pre: Fail automation builds that check out l10n repos. r=Pike,Callek
authorNick Alexander <nalexander@mozilla.com>
Mon, 07 Jan 2019 19:22:39 +0000
changeset 509861 e1f71a0cf95f027d4c688d1bfac407cfcb609c2b
parent 509860 48b9df6b128401dfb47f2b3fecd5fed11c12a7b4
child 509862 8c34488a6c8a09f29ff42b9e3a36c0cbc69321e6
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersPike, Callek
bugs1496190
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1496190 - Pre: Fail automation builds that check out l10n repos. r=Pike,Callek Differential Revision: https://phabricator.services.mozilla.com/D15777
toolkit/locales/l10n.mk
--- a/toolkit/locales/l10n.mk
+++ b/toolkit/locales/l10n.mk
@@ -178,24 +178,32 @@ L10N_CO = $(HG) --cwd $(L10NBASEDIR) clo
 else
 ifeq ($(VCS_CHECKOUT_TYPE),git)
 L10N_CO = $(GIT) -C $(L10NBASEDIR) clone hg://hg.mozilla.org/l10n-central/$(AB_CD)/
 else
 L10N_CO = $(error You need to use either hg or git)
 endif
 endif
 
-
 merge-%: IS_LANGUAGE_REPACK=1
 merge-%: AB_CD=$*
 merge-%:
 # For nightly builds, we automatically check out missing localizations
-# from l10n-central.
+# from l10n-central.  We never automatically check out in automation:
+# automation builds check out revisions that have been signed-off by
+# l10n drivers prior to use.
+ifdef MOZ_AUTOMATION
+	if  ! test -d $(L10NBASEDIR)/$(AB_CD) ; then \
+		echo 'Error: Automation requires l10n repositories to be checked out: $(L10NBASEDIR)/$(AB_CD)' ; \
+		exit 1 ; \
+	fi
+endif
 ifdef NIGHTLY_BUILD
-	@if  ! test -d $(L10NBASEDIR)/$(AB_CD) ; then \
+	if  ! test -d $(L10NBASEDIR)/$(AB_CD) ; then \
+		echo 'Checking out $(L10NBASEDIR)/$(AB_CD)' ; \
 		$(NSINSTALL) -D $(L10NBASEDIR) ; \
 		$(L10N_CO) ; \
 	fi
 endif
 	$(RM) -rf $(REAL_LOCALE_MERGEDIR)
 	-$(MOZILLA_DIR)/mach compare-locales $(COMPARE_LOCALES_DEFINES) --merge $(BASE_MERGE) $(srcdir)/l10n.toml $(L10NBASEDIR) $*
 
 langpack-%: IS_LANGUAGE_REPACK=1