try: -b o -p macosx64,win64 --artifact draft
authorGeoff Lankow <geoff@darktrojan.net>
Wed, 27 Feb 2019 16:21:25 +1300
changeset 72001 1a1cdb4620c572255a520a30722713bab0614eed
parent 71999 bdc3cc079d337d32403f8980da9f4b0d1be1e0cb
push id7990
push usergeoff@darktrojan.net
push dateSat, 16 Mar 2019 03:35:11 +0000
treeherdertry-comm-central@1a1cdb4620c5 [default view] [failures only]
try: -b o -p macosx64,win64 --artifact
.taskcluster.yml
calendar/lightning/lightning-packager.mk
mail/config/mozconfigs/linux64/artifact
taskcluster/ci/build/linux.yml
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -141,18 +141,18 @@ tasks:
       retries: 5
 
       payload:
         env:
           # checkout-gecko uses these to check out the source; the inputs
           # to `mach taskgraph decision` are all on the command line.
           $merge:
             - GECKO_BASE_REPOSITORY: 'https://hg.mozilla.org/mozilla-unified'
-              GECKO_HEAD_REPOSITORY: 'https://hg.mozilla.org/mozilla-central'
-              GECKO_HEAD_REF: 'default'
+              GECKO_HEAD_REPOSITORY: 'https://hg.mozilla.org/try'
+              GECKO_HEAD_REF: '267f8b9f406a210e1ffe86a4adde10d8d009d608'
               COMM_BASE_REPOSITORY: 'https://hg.mozilla.org/comm-central'
               COMM_HEAD_REPOSITORY: '${repoUrl}'
               COMM_HEAD_REF: '${push.revision}'
               COMM_HEAD_REV: '${push.revision}'
               HG_STORE_PATH: /builds/worker/checkouts/hg-store
               TASKCLUSTER_CACHES: /builds/worker/checkouts
               # someday, these will be provided by the worker - Bug 1492664
               TASKCLUSTER_ROOT_URL: https://taskcluster.net
--- a/calendar/lightning/lightning-packager.mk
+++ b/calendar/lightning/lightning-packager.mk
@@ -177,18 +177,18 @@ stage-upload-%:
 	$(call install_cmd,$(IFLAGS1) $(XPI_STAGE_PATH)/$(XPI_PKGNAME).xpi $(DIST)/$(MOZ_PKG_PLATFORM))
 
 ifdef XPI_INSTALL_EXTENSION
 ifndef XPI_NAME
 $(error XPI_NAME must be set for XPI_INSTALL_EXTENSION)
 endif
 tools::
 	$(RM) -r '$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(XPI_INSTALL_EXTENSION)'
-	$(NSINSTALL) -D '$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions'
-	ln -s $(_ABS_XPI_STAGE_PATH)/$(XPI_NAME) $(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(XPI_INSTALL_EXTENSION)
+	$(NSINSTALL) -D '$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(XPI_INSTALL_EXTENSION)'
+	$(call copy_dir,$(FINAL_TARGET),$(DIST)/bin$(DIST_SUBDIR:%=/%)/extensions/$(XPI_INSTALL_EXTENSION))
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 # If the macbundle dist dir was already created, sync the xpi here to avoid
 # the need to make -C objdir/mail/app each time
 tools::
 	[ -d $(DIST)/$(MOZ_MACBUNDLE_NAME) ] && rsync -aL $(FINAL_TARGET)/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/extensions/$(XPI_INSTALL_EXTENSION) || true
 endif
 
new file mode 100644
--- /dev/null
+++ b/mail/config/mozconfigs/linux64/artifact
@@ -0,0 +1,15 @@
+. "$topsrcdir/build/unix/mozconfig.linux"
+. "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/comm/mail/config/mozconfigs/common"
+
+ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
+ac_add_options --enable-profiling
+
+. "$topsrcdir/build/mozconfig.artifact.automation"
+. "$topsrcdir/build/mozconfig.artifact"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Disable enforcing that add-ons are signed by the trusted root
+MOZ_REQUIRE_ADDON_SIGNING=0
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -16,16 +16,17 @@ linux64/opt:
         actions: [build, check-test]
         config-paths:
             - comm/mozharness
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/releng_base_linux_64_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         need-xvfb: true
+        mozconfig-variant: artifact
     toolchains:
         - linux64-binutils
         - linux64-cbindgen
         - linux64-clang
         - linux64-nasm
         - linux64-node
         - linux64-rust
         - linux64-sccache