Bug 1614463 - Port bug 1527313: Source directory caching for Windows builds part 2. r=darktrojan
authorRob Lemley <rob@thunderbird.net>
Thu, 20 Feb 2020 12:24:19 -0500
changeset 37512 58a1cb2582f5f286cd9139d1aeb30544009f81c2
parent 37511 42930fd343fe9fdcee6000d6f7be316d42b55d17
child 37513 15b43b265eb46cbfcd989bb9e817cdead267fef1
push id2566
push userclokep@gmail.com
push dateMon, 09 Mar 2020 19:20:31 +0000
treeherdercomm-beta@a352facfa0a4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdarktrojan
bugs1614463, 1527313
Bug 1614463 - Port bug 1527313: Source directory caching for Windows builds part 2. r=darktrojan
mozharness/builds/taskcluster_base_thunderbird.py
mozharness/builds/thunderbird_source.py
mozharness/single_locale/thunderbird.py
taskcluster/ci/build/windows.yml
--- a/mozharness/builds/taskcluster_base_thunderbird.py
+++ b/mozharness/builds/taskcluster_base_thunderbird.py
@@ -1,10 +1,9 @@
 config = {
     'stage_product': 'thunderbird',
     'stage_username': 'tbirdbld',
     'stage_ssh_key': 'tbirdbld_rsa',
     'app_name': 'comm/mail',
-    'objdir': 'obj-thunderbird',
 
     # Thunderbird doesn't compile under pgo
     'pgo_platforms': []
 }
--- a/mozharness/builds/thunderbird_source.py
+++ b/mozharness/builds/thunderbird_source.py
@@ -1,12 +1,12 @@
 config = {
     'default_actions': ['package-source'],
-    'objdir': 'obj-firefox',
     'stage_platform': 'source',  # Not used, but required by the script
     'app_ini_path': 'FAKE',  # Not used, but required by the script
     'env': {
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'TINDERBOX_OUTPUT': '1',
         'LC_ALL': 'C',
+        'MOZ_OBJDIR': '%(abs_obj_dir)s',
     },
     'src_mozconfig': 'comm/mail/config/mozconfigs/linux64/source',
 }
--- a/mozharness/single_locale/thunderbird.py
+++ b/mozharness/single_locale/thunderbird.py
@@ -1,11 +1,7 @@
 config = {
     # Source path
     'app_name': 'comm/mail',
     'mozconfig_variant': 'l10n-mozconfig',
-
-    # FIXME: See bug 1522715. -rjl
-    "objdir": "obj-firefox",
-    "l10n_dir": "l10n",
     "locales_file": "src/comm/mail/locales/all-locales",
     "locales_dir": "comm/mail/locales",
 }
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -1,16 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 ---
 job-defaults:
     run:
         using: mozharness
-        use-caches: false
         comm-checkout: true
         config-paths:
             - comm/mozharness
         tooltool-downloads: internal
     fetches:
         toolchain:
             - win64-cbindgen
             - win64-clang-cl