Bug 1620888 - Port bug 1620165: Sync win64-cross build job with Firefox. r=darktrojan
authorRob Lemley <rob@thunderbird.net>
Sun, 08 Mar 2020 21:21:01 -0400
changeset 38488 9252837caca62e43b24a473e795b185a3ae51d78
parent 38487 150de041c5e7b85741748536094a7cb89922cb68
child 38489 1ef289a481bbb5644d91ceca329082ac37021269
push id400
push userclokep@gmail.com
push dateMon, 04 May 2020 18:56:09 +0000
reviewersdarktrojan
bugs1620888, 1620165
Bug 1620888 - Port bug 1620165: Sync win64-cross build job with Firefox. r=darktrojan
mail/config/mozconfigs/win64/common-win64
mail/config/mozconfigs/win64/nightly
taskcluster/ci/build/windows-cross.yml
--- a/mail/config/mozconfigs/win64/common-win64
+++ b/mail/config/mozconfigs/win64/common-win64
@@ -1,17 +1,17 @@
 # This file is used by all Win64 builds
 
 ac_add_options --target=x86_64-pc-mingw32
 
 if test -z "$USE_ARTIFACT"; then
 . $topsrcdir/build/win64/mozconfig.vs-latest
 
 # Set up mapi includes (must be done after visual studio setup)
-export INCLUDE=$INCLUDE:${TOOLTOOL_DIR}/mapiheader
+export INCLUDE=${TOOLTOOL_DIR}/mapiheader
 fi
 
 if test `uname -s` = Linux; then
 
 # Configure expects executables for check_prog, so set the relevant files
 # as executable on the first evaluation of the mozconfig where they exist.
 if [ -d "${VSPATH}" -a ! -x "${VSPATH}/VC/bin/Hostx64/x64/cl.exe" ]; then
     find "${VSPATH}" -type f -name \*.exe -exec chmod +x {} \;
--- a/mail/config/mozconfigs/win64/nightly
+++ b/mail/config/mozconfigs/win64/nightly
@@ -1,15 +1,14 @@
 . "$topsrcdir/comm/build/mozconfig.comm-sccache"
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/build/mozconfig.stylo"
 . "$topsrcdir/comm/mail/config/mozconfigs/common"
 . "$topsrcdir/comm/mail/config/mozconfigs/win64/common-win64"
-. "$topsrcdir/comm/mail/config/mozconfigs/win64/cross"
 
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 ac_add_options --enable-profiling
 if test -z "$USE_ARTIFACT"; then
 ac_add_options --enable-jemalloc
 fi
 if test -n "$USE_ARTIFACT"; then
 ac_add_options --disable-mapi
--- a/taskcluster/ci/build/windows-cross.yml
+++ b/taskcluster/ci/build/windows-cross.yml
@@ -12,58 +12,62 @@ job-defaults:
         tooltool-downloads: internal
 
 
 win64-cross/opt:
     description: "Win64 Opt Cross"
     index:
         product: thunderbird
         job-name: win64-cross-opt
+    attributes:
+            enable-build-signing: true
+            enable-full-crashsymbols: true
     treeherder:
         platform: windows2012-64/opt
         symbol: Bx
         tier: 2
     worker-type: b-linux
     worker:
         docker-image: {in-tree: debian9-amd64-build}
         max-run-time: 7200
         env:
             PERFHERDER_EXTRA_OPTIONS: cross
             TOOLTOOL_MANIFEST: "comm/mail/config/tooltool-manifests/win64/releng.manifest"
+            # MOZ_AUTOMATION_PACKAGE_TESTS: "1"
     run:
         actions: [build]
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/releng_base_linux_64_builds.py
         extra-config:
-            disable_package_metrics: true
+            stage_platform: win64
             mozconfig_platform: win64
             env:
-                # Setting LD_PRELOAD at the worker level would set it during
-                # fetch-content, which can fail randomly when a tar/unzip subprocess
-                # of fetch-content starts while the library is being extracted by
-                # another.
                 LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
-                LOWERCASE_DIRS: "/builds/worker/workspace/build/src/vs2017_15.8.4/:/builds/worker/workspace/build/src/mapiheader/"
-    run-on-projects: ['try']
+                LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4:/builds/worker/checkouts/gecko/mapiheader"
+    run-on-projects: ['try-comm-central']
     dependencies:
         win64-clang-cl: toolchain-win64-clang-cl
+        thirdparty-libotr-win64: thirdparty-libotr-win64
     fetches:
         toolchain:
             - linux64-binutils
             - linux64-cbindgen
             - linux64-clang
             - linux64-dump-syms
             - linux64-liblowercase
             - linux64-nasm
             - linux64-node
             - linux64-rust-cross-1.41
+            - linux64-rust-size
             - linux64-sccache
             - linux64-wine
         fetch:
             - nsis-3.01-win
             - upx-3.95-win
         win64-clang-cl:
             - artifact: clang.tar.bz2
               extract: true
               dest: clang-cl
+        thirdparty-libotr-win64:
+            - libotr.tar.xz