Bug 1620888 - Port bug 1620165: Add win32-cross build job for try builds. r=darktrojan
authorRob Lemley <rob@thunderbird.net>
Sun, 08 Mar 2020 21:21:32 -0400
changeset 38489 1ef289a481bbb5644d91ceca329082ac37021269
parent 38488 9252837caca62e43b24a473e795b185a3ae51d78
child 38490 415078feb8580b0f33b44a607c8a1544940321a0
push id400
push userclokep@gmail.com
push dateMon, 04 May 2020 18:56:09 +0000
reviewersdarktrojan
bugs1620888, 1620165
Bug 1620888 - Port bug 1620165: Add win32-cross build job for try builds. r=darktrojan
mail/config/mozconfigs/win32/common-win32
taskcluster/ci/build/windows-cross.yml
--- a/mail/config/mozconfigs/win32/common-win32
+++ b/mail/config/mozconfigs/win32/common-win32
@@ -1,16 +1,16 @@
 # This file is used by all Win32 builds
 
 ac_add_options --target=i686-pc-mingw32
 
 . $topsrcdir/build/win32/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
 
 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/x86/cl.exe" ]; then
     find "${VSPATH}" -type f -name \*.exe -exec chmod +x {} \;
 fi
--- a/taskcluster/ci/build/windows-cross.yml
+++ b/taskcluster/ci/build/windows-cross.yml
@@ -66,8 +66,69 @@ win64-cross/opt:
             - 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
+
+
+win32-cross/opt:
+    description: "Win32 Opt Cross"
+    index:
+        product: thunderbird
+        job-name: win32-cross-opt
+    attributes:
+        enable-build-signing: true
+        enable-full-crashsymbols: true
+    treeherder:
+        platform: windows2012-32/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/win32/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:
+            stage_platform: win32
+            mozconfig_platform: win32
+            env:
+                LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
+                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-win32: thirdparty-libotr-win32
+    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-win32:
+            - libotr.tar.xz