Bug 1518166 - Add thirdparty libotr as build dependency.
authorRob Lemley <rob@thunderbird.net>
Thu, 23 Jan 2020 16:31:39 -0500
changeset 37458 32b795794bfa328f78f81850686241e1bbae66bf
parent 37457 11a79da52f31a2f90b0c168c3de9a7a72a4d90fa
child 37459 e0e05018f705af08c3b98472483c02c69d25d9ec
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)
bugs1518166
Bug 1518166 - Add thirdparty libotr as build dependency. Make the build task depend on the thirdparty-libotr build tasks and download the built artifact for inclusion in the distributed package.
taskcluster/ci/build/kind.yml
taskcluster/ci/build/linux.yml
taskcluster/ci/build/macosx.yml
taskcluster/ci/build/windows.yml
--- a/taskcluster/ci/build/kind.yml
+++ b/taskcluster/ci/build/kind.yml
@@ -1,16 +1,17 @@
 # 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/.
 ---
 loader: taskgraph.loader.transform:loader
 
 kind-dependencies:
     - toolchain
+    - thirdparty
 
 transforms:
     - taskgraph.transforms.build:transforms
     - taskgraph.transforms.build_attrs:transforms
     - taskgraph.transforms.build_lints:transforms
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
@@ -32,16 +33,17 @@ job-defaults:
             - comm/editor
             - comm/ldap
             - comm/mail
             - comm/mailnews
             - comm/mozharness
             - comm/other-licenses
             - comm/taskcluster
             - comm/testing
+            - comm/third_party
             - comm/.gecko_rev.yml
             - comm/.taskcluster.yml
             - comm/moz.build
 
     run:
         mozconfig-variant:
             by-release-type:
                 beta: release
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -2,16 +2,18 @@
 # 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/.
 ---
 linux64/opt:
     description: "Linux64 Opt"
     index:
         product: thunderbird
         job-name: linux64-opt
+    dependencies:
+        thirdparty-libotr-linux64: thirdparty-libotr-linux64
     treeherder:
         platform: linux64/opt
         symbol: B
     worker-type: b-linux
     worker:
         docker-image: {in-tree: "debian7-amd64-build"}
         max-run-time: 7200
         env:
@@ -32,29 +34,33 @@ linux64/opt:
             - linux64-binutils
             - linux64-cbindgen
             - linux64-clang
             - linux64-nasm
             - linux64-node
             - linux64-rust
             - linux64-rust-size
             - linux64-sccache
+        thirdparty-libotr-linux64:
+            - libotr.tar.xz
 
 linux64-shippable/opt:
     description: "Linux64 Shippable"
     attributes:
         shippable: true
         nightly: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: thunderbird
     index:
         product: thunderbird
         job-name: linux64-opt
         type: shippable
+    dependencies:
+        thirdparty-libotr-linux64: thirdparty-libotr-linux64
     treeherder:
         platform: linux64-shippable/opt
         symbol: B
     worker-type: b-linux
     worker:
         docker-image: {in-tree: "debian7-amd64-build"}
         max-run-time: 7200
         env:
@@ -75,22 +81,26 @@ linux64-shippable/opt:
         toolchain:
             - linux64-binutils
             - linux64-cbindgen
             - linux64-clang
             - linux64-nasm
             - linux64-node
             - linux64-rust
             - linux64-rust-size
+        thirdparty-libotr-linux64:
+            - libotr.tar.xz
 
 linux64/debug:
     description: "Linux64 Debug"
     index:
         product: thunderbird
         job-name: linux64-debug
+    dependencies:
+        thirdparty-libotr-linux64: thirdparty-libotr-linux64
     treeherder:
         platform: linux64/debug
         symbol: B
     worker-type: b-linux
     worker:
         docker-image: {in-tree: "debian7-amd64-build"}
         max-run-time: 7200
         env:
@@ -113,22 +123,26 @@ linux64/debug:
             - linux64-binutils
             - linux64-cbindgen
             - linux64-clang
             - linux64-nasm
             - linux64-node
             - linux64-rust
             - linux64-rust-size
             - linux64-sccache
+        thirdparty-libotr-linux64:
+            - libotr.tar.xz
 
 linux/opt:
     description: "Linux32 Opt"
     index:
         product: thunderbird
         job-name: linux32-opt
+    dependencies:
+        thirdparty-libotr-linux32: thirdparty-libotr-linux32
     treeherder:
         platform: linux32/opt
         symbol: B
     worker-type: b-linux
     worker:
         docker-image: {in-tree: "debian7-i386-build"}
         max-run-time: 7200
         env:
@@ -149,29 +163,33 @@ linux/opt:
             - linux64-binutils
             - linux64-cbindgen
             - linux64-clang
             - linux64-nasm
             - linux64-node
             - linux64-rust
             - linux64-rust-size
             - linux64-sccache
+        thirdparty-libotr-linux32:
+            - libotr.tar.xz
 
 linux-shippable/opt:
     description: "Linux32 Shippable"
     attributes:
         shippable: true
         nightly: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: thunderbird
     index:
         product: thunderbird
         job-name: linux32-opt
         type: shippable
+    dependencies:
+        thirdparty-libotr-linux32: thirdparty-libotr-linux32
     treeherder:
         platform: linux32-shippable/opt
         symbol: B
     worker-type: b-linux
     worker:
         docker-image: {in-tree: "debian7-i386-build"}
         max-run-time: 7200
         env:
@@ -192,22 +210,26 @@ linux-shippable/opt:
         toolchain:
             - linux64-binutils
             - linux64-cbindgen
             - linux64-clang
             - linux64-nasm
             - linux64-node
             - linux64-rust
             - linux64-rust-size
+        thirdparty-libotr-linux32:
+            - libotr.tar.xz
 
 linux/debug:
     description: "Linux32 Debug"
     index:
         product: thunderbird
         job-name: linux32-debug
+    dependencies:
+        thirdparty-libotr-linux32: thirdparty-libotr-linux32
     treeherder:
         platform: linux32/debug
         symbol: B
     worker-type: b-linux
     worker:
         docker-image: {in-tree: "debian7-i386-build"}
         max-run-time: 7200
         env:
@@ -230,8 +252,10 @@ linux/debug:
             - linux64-binutils
             - linux64-cbindgen
             - linux64-clang
             - linux64-nasm
             - linux64-node
             - linux64-rust
             - linux64-rust-size
             - linux64-sccache
+        thirdparty-libotr-linux32:
+            - libotr.tar.xz
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -2,16 +2,18 @@
 # 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/.
 ---
 macosx64/debug:
     description: "MacOS X x64 Cross-compile"
     index:
         product: thunderbird
         job-name: macosx64-debug
+    dependencies:
+        thirdparty-libotr-macosx64: thirdparty-libotr-macosx64
     treeherder:
         platform: osx-cross/debug
         symbol: B
         tier: 1
     worker-type: b-linux
     worker:
         max-run-time: 7200
         env:
@@ -40,22 +42,26 @@ macosx64/debug:
             - linux64-hfsplus
             - linux64-libdmg
             - linux64-llvm-dsymutil
             - linux64-nasm
             - linux64-node
             - linux64-rust-macos
             - linux64-rust-size
             - linux64-sccache
+        thirdparty-libotr-macosx64:
+            - libotr.tar.xz
 
 macosx64/opt:
     description: "MacOS X x64 Cross-compile"
     index:
         product: thunderbird
         job-name: macosx64-opt
+    dependencies:
+        thirdparty-libotr-macosx64: thirdparty-libotr-macosx64
     treeherder:
         platform: osx-cross/opt
         symbol: B
         tier: 1
     worker-type: b-linux
     worker:
         max-run-time: 7200
         env:
@@ -82,29 +88,33 @@ macosx64/opt:
             - linux64-hfsplus
             - linux64-libdmg
             - linux64-llvm-dsymutil
             - linux64-nasm
             - linux64-node
             - linux64-rust-macos
             - linux64-rust-size
             - linux64-sccache
+        thirdparty-libotr-macosx64:
+            - libotr.tar.xz
 
 macosx64-shippable/opt:
     description: "MacOS X x64 Cross-compile"
     attributes:
         shippable: true
         nightly: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: thunderbird
     index:
         product: thunderbird
         job-name: macosx64-opt
         type: shippable
+    dependencies:
+        thirdparty-libotr-macosx64: thirdparty-libotr-macosx64
     treeherder:
         platform: osx-shippable/opt
         symbol: B
         tier: 1
     worker-type: b-linux
     worker:
         max-run-time: 7200
         env:
@@ -131,8 +141,10 @@ macosx64-shippable/opt:
             - linux64-clang-macosx-cross
             - linux64-hfsplus
             - linux64-libdmg
             - linux64-llvm-dsymutil
             - linux64-nasm
             - linux64-node
             - linux64-rust-macos
             - linux64-rust-size
+        thirdparty-libotr-macosx64:
+            - libotr.tar.xz
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -20,16 +20,18 @@ job-defaults:
             - win64-rust
             - win64-rust-size
 
 win32/opt:
     description: "Win32 Opt"
     index:
         product: thunderbird
         job-name: win32-opt
+    dependencies:
+        thirdparty-libotr-win32: thirdparty-libotr-win32
     attributes:
         enable-build-signing: true
     treeherder:
         platform: windows2012-32/opt
         symbol: B
         tier: 1
     worker-type: b-win2012
     worker:
@@ -45,23 +47,27 @@ win32/opt:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win32.py
         extra-config:
             stage_platform: win32
     fetches:
         toolchain:
             - win64-sccache
+        thirdparty-libotr-win32:
+            - libotr.tar.xz
 
 win32-shippable/opt:
     description: "Win32 Opt Shippable"
     index:
         product: thunderbird
         job-name: win32-opt
         type: shippable
+    dependencies:
+        thirdparty-libotr-win32: thirdparty-libotr-win32
     attributes:
         shippable: true
         nightly: true
         enable-build-signing: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: thunderbird
     treeherder:
@@ -80,22 +86,27 @@ win32-shippable/opt:
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win32.py
             - taskcluster_nightly.py
         extra-config:
             stage_platform: win32
+    fetches:
+        thirdparty-libotr-win32:
+            - libotr.tar.xz
 
 win32/debug:
     description: "Win32 Debug"
     index:
         product: thunderbird
         job-name: win32-debug
+    dependencies:
+        thirdparty-libotr-win32: thirdparty-libotr-win32
     attributes:
         enable-build-signing: true
     treeherder:
         platform: windows2012-32/debug
         symbol: B
         tier: 1
     worker-type: b-win2012
     worker:
@@ -111,22 +122,26 @@ win32/debug:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win32.py
             - builds/taskcluster_sub_win32/debug.py
         mozconfig-variant: debug
     fetches:
         toolchain:
             - win64-sccache
+        thirdparty-libotr-win32:
+            - libotr.tar.xz
 
 win64/opt:
     description: "Win64 Opt"
     index:
         product: thunderbird
         job-name: win64-opt
+    dependencies:
+        thirdparty-libotr-win64: thirdparty-libotr-win64
     attributes:
         enable-build-signing: true
     treeherder:
         platform: windows2012-64/opt
         symbol: B
         tier: 1
     worker-type: b-win2012
     worker:
@@ -142,23 +157,27 @@ win64/opt:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win64.py
         extra-config:
             stage_platform: win64
     fetches:
         toolchain:
             - win64-sccache
+        thirdparty-libotr-win64:
+            - libotr.tar.xz
 
 win64-shippable/opt:
     description: "Win64 Opt Shippable"
     index:
         product: thunderbird
         job-name: win64-opt
         type: shippable
+    dependencies:
+        thirdparty-libotr-win64: thirdparty-libotr-win64
     attributes:
         shippable: true
         nightly: true
         enable-build-signing: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: thunderbird
     treeherder:
@@ -177,22 +196,27 @@ win64-shippable/opt:
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win64.py
             - taskcluster_nightly.py
         extra-config:
             stage_platform: win64
+    fetches:
+        thirdparty-libotr-win64:
+            - libotr.tar.xz
 
 win64/debug:
     description: "Win64 Debug"
     index:
         product: thunderbird
         job-name: win64-debug
+    dependencies:
+        thirdparty-libotr-win64: thirdparty-libotr-win64
     attributes:
         enable-build-signing: true
     treeherder:
         platform: windows2012-64/debug
         symbol: B
         tier: 1
     worker-type: b-win2012
     worker:
@@ -208,8 +232,10 @@ win64/debug:
             - builds/taskcluster_base_thunderbird.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_base_win64.py
             - builds/taskcluster_sub_win64/debug.py
         mozconfig-variant: debug
     fetches:
         toolchain:
             - win64-sccache
+        thirdparty-libotr-win64:
+            - libotr.tar.xz