From 311df61c6a4771757ff959a96b27caacd2324eed Mon Sep 17 00:00:00 2001
From: Anna Weine <anna.weine@mozilla.com>
Date: Thu, 8 Dec 2022 20:50:24 +0000
Subject: Bug 1749030 - Modification of supported compilers
 r=nss-reviewers,bbeurdouche

Adding: clang-10.
Removing: gcc-6, gcc-9, gcc-10.

Differential Revision: https://phabricator.services.mozilla.com/D162545
---
 automation/taskcluster/docker-builds/Dockerfile | 10 +------
 automation/taskcluster/graph/src/extend.js      | 36 ++++++-------------------
 2 files changed, 9 insertions(+), 37 deletions(-)

(limited to 'automation')

diff --git a/automation/taskcluster/docker-builds/Dockerfile b/automation/taskcluster/docker-builds/Dockerfile
index 63e0165c8..6ea254376 100644
--- a/automation/taskcluster/docker-builds/Dockerfile
+++ b/automation/taskcluster/docker-builds/Dockerfile
@@ -11,12 +11,12 @@ RUN apt-get update \
     build-essential \
     ca-certificates \
     clang-4.0 \
+    clang-10 \
     clang \
     cmake \
     curl \
     g++-4.8-multilib \
     g++-5-multilib \
-    g++-6-multilib \
     g++-multilib \
     git \
     gyp \
@@ -42,14 +42,6 @@ RUN apt-get update \
  && add-apt-repository ppa:ubuntu-toolchain-r/test -y \ 
  && apt-get update \
  && apt-get install --no-install-recommends -y \ 
-    gcc-9 \ 
-    g++-9 \ 
-    gcc-9-multilib \
-    g++-9-multilib \ 
-    gcc-10 \
-    g++-10 \ 
-    gcc-10-multilib \
-    g++-10-multilib \
     gcc-11-multilib \
     g++-11-multilib \
  && rm -rf /var/lib/apt/lists/* \
diff --git a/automation/taskcluster/graph/src/extend.js b/automation/taskcluster/graph/src/extend.js
index 773a5fb3a..a2e41a61d 100644
--- a/automation/taskcluster/graph/src/extend.js
+++ b/automation/taskcluster/graph/src/extend.js
@@ -542,7 +542,14 @@ async function scheduleLinux(name, overrides, args = "") {
     },
     symbol: "clang-4"
   }));
-
+  queue.scheduleTask(merge(extra_base, {
+    name: `${name} w/ clang-10`,
+    env: {
+      CC: "clang-10",
+      CCC: "clang++-10",
+    },
+    symbol: "clang-10"
+  }));
   queue.scheduleTask(merge(extra_base, {
     name: `${name} w/ gcc-4.4`,
     image: LINUX_GCC44_IMAGE,
@@ -590,33 +597,6 @@ async function scheduleLinux(name, overrides, args = "") {
     symbol: "gcc-5"
   }));
 
-  queue.scheduleTask(merge(extra_base, {
-    name: `${name} w/ gcc-6`,
-    env: {
-      CC: "gcc-6",
-      CCC: "g++-6"
-    },
-    symbol: "gcc-6"
-  }));
-
-  queue.scheduleTask(merge(extra_base, {
-    name: `${name} w/ gcc-9`,
-    env: {
-      CC: "gcc-9",
-      CCC: "g++-9"
-    },
-    symbol: "gcc-9"
-  }));
-
-  queue.scheduleTask(merge(extra_base, {
-    name: `${name} w/ gcc-10`,
-    env: {
-      CC: "gcc-10",
-      CCC: "g++-10",
-    },
-    symbol: "gcc-10"
-  }));
-
   queue.scheduleTask(merge(extra_base, {
     name: `${name} w/ gcc-11`,
     env: {
-- 
cgit v1.2.1