From 76d05f70afe7d7f7d3ce30f0356bb38dff9cccca Mon Sep 17 00:00:00 2001
From: Dennis Jackson <djackson@mozilla.com>
Date: Tue, 22 Mar 2022 16:18:24 +0000
Subject: Bug 1760827 - Add a CI Target for gcc-11. r=nss-reviewers,nkulatova

Depends on D141764

Differential Revision: https://phabricator.services.mozilla.com/D141765
---
 automation/taskcluster/docker-builds/Dockerfile | 8 +++++---
 automation/taskcluster/graph/src/extend.js      | 9 +++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'automation')

diff --git a/automation/taskcluster/docker-builds/Dockerfile b/automation/taskcluster/docker-builds/Dockerfile
index aa40aaacb..1e166317a 100644
--- a/automation/taskcluster/docker-builds/Dockerfile
+++ b/automation/taskcluster/docker-builds/Dockerfile
@@ -46,10 +46,12 @@ RUN apt-get update \
     g++-9 \ 
     gcc-9-multilib \
     g++-9-multilib \ 
-    gcc-10 \ 
+    gcc-10 \
     g++-10 \ 
-    gcc-10-multilib \ 
-    g++-10-multilib \ 
+    gcc-10-multilib \
+    g++-10-multilib \
+    gcc-11-multilib \
+    g++-11-multilib \
  && rm -rf /var/lib/apt/lists/* \
  && apt-get autoremove -y && apt-get clean -y
 
diff --git a/automation/taskcluster/graph/src/extend.js b/automation/taskcluster/graph/src/extend.js
index 18491a6a3..0f2498bb2 100644
--- a/automation/taskcluster/graph/src/extend.js
+++ b/automation/taskcluster/graph/src/extend.js
@@ -616,6 +616,15 @@ async function scheduleLinux(name, overrides, args = "") {
     symbol: "gcc-10"
   }));
 
+  queue.scheduleTask(merge(extra_base, {
+    name: `${name} w/ gcc-11`,
+    env: {
+      CC: "gcc-11",
+      CCC: "g++-11",
+    },
+    symbol: "gcc-11"
+  }));
+
   queue.scheduleTask(merge(extra_base, {
     name: `${name} w/ modular builds`,
     image: LINUX_IMAGE,
-- 
cgit v1.2.1