Backed out changeset 3e3c099a8579 for breaking the OS X build. rs=backout
authorGeoff Lankow <geoff@darktrojan.net>
Fri, 15 May 2020 19:40:36 +1200
changeset 39154 6101367410aa1d14da490e96bfb06e1cbce96257
parent 39153 34122197a6a4cfdc121496238d6f23c859ca6dc7
child 39155 13bfde4dfdd7b2e49fea9be50a56b427333e5119
push id402
push userclokep@gmail.com
push dateMon, 29 Jun 2020 20:48:04 +0000
reviewersbackout
backs out3e3c099a857979693a03ea24c7a4b0149044c917
Backed out changeset 3e3c099a8579 for breaking the OS X build. rs=backout
taskcluster/ci/build/macosx.yml
taskcluster/ci/thirdparty/libotr.yml
taskcluster/ci/toolchain/kind.yml
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -33,17 +33,16 @@ macosx64/debug:
         custom-build-variant-cfg: cross-debug
         mozconfig-variant: debug
         tooltool-downloads: internal
     fetches:
         toolchain:
             - linux64-binutils
             - linux64-cbindgen
             - linux64-cctools-port
-            - linux64-cctools-clang-9-port
             - linux64-clang-macosx-cross
             - linux64-hfsplus
             - linux64-libdmg
             - linux64-llvm-dsymutil
             - linux64-nasm
             - linux64-node
             - linux64-rust-macos
             - linux64-rust-size
@@ -80,17 +79,16 @@ macosx64/opt:
             - builds/releng_base_mac_64_cross_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         tooltool-downloads: internal
     fetches:
         toolchain:
             - linux64-binutils
             - linux64-cbindgen
             - linux64-cctools-port
-            - linux64-cctools-clang-9-port
             - linux64-clang-macosx-cross
             - linux64-hfsplus
             - linux64-libdmg
             - linux64-llvm-dsymutil
             - linux64-nasm
             - linux64-node
             - linux64-rust-macos
             - linux64-rust-size
@@ -135,17 +133,16 @@ macosx64-shippable/opt:
             - taskcluster_nightly.py
         script: "mozharness/scripts/fx_desktop_build.py"
         tooltool-downloads: internal
     fetches:
         toolchain:
             - linux64-binutils
             - linux64-cbindgen
             - linux64-cctools-port
-            - linux64-cctools-clang-9-port
             - linux64-clang-macosx-cross
             - linux64-hfsplus
             - linux64-libdmg
             - linux64-llvm-dsymutil
             - linux64-nasm
             - linux64-node
             - linux64-rust-macos
             - linux64-rust-size
--- a/taskcluster/ci/thirdparty/libotr.yml
+++ b/taskcluster/ci/thirdparty/libotr.yml
@@ -50,17 +50,17 @@ libotr-macosx64:
     treeherder:
         platform: osx-cross/opt
     run:
         tooltool-downloads: internal
     thirdparty:
         args: ['macosx64']
     toolchain:
         - linux64-binutils
-        - linux64-cctools-clang-9-port
+        - linux64-cctools-port
         - linux64-clang-macosx-cross
         - linux64-llvm-dsymutil
 
 libotr-win32:
     worker:
         docker-image: {in-tree: tb-debian-mingw}
     treeherder:
         platform: windows2012-32/opt
--- a/taskcluster/ci/toolchain/kind.yml
+++ b/taskcluster/ci/toolchain/kind.yml
@@ -7,21 +7,18 @@ base-path: taskcluster/ci
 
 kind-dependencies:
     - fetch
 
 jobs:
     - linux64-binutils
     - linux64-cbindgen
     - linux64-cctools-port
-    - linux64-cctools-clang-9-port
     - linux64-clang
     - linux64-clang-7
-    - linux64-clang-9
-    - linux64-clang-10
     - linux64-clang-macosx-cross
     - linux64-clang-mingw-x64
     - linux64-clang-mingw-x86
     - linux64-clang-win-cross
     - linux64-dump-syms
     - linux64-fix-stacks
     - linux64-gcc
     - linux64-gcc-7