summaryrefslogtreecommitdiff
path: root/automation
diff options
context:
space:
mode:
authorDennis Jackson <djackson@mozilla.com>2022-03-22 16:18:24 +0000
committerDennis Jackson <djackson@mozilla.com>2022-03-22 16:18:24 +0000
commit76d05f70afe7d7f7d3ce30f0356bb38dff9cccca (patch)
tree0caad929ccf7970ef1afa29bf36cbc237a6e40c5 /automation
parentf9b7e4f5547a841e06c30df9804f3122c021d27f (diff)
downloadnss-hg-76d05f70afe7d7f7d3ce30f0356bb38dff9cccca.tar.gz
Bug 1760827 - Add a CI Target for gcc-11. r=nss-reviewers,nkulatova
Depends on D141764 Differential Revision: https://phabricator.services.mozilla.com/D141765
Diffstat (limited to 'automation')
-rw-r--r--automation/taskcluster/docker-builds/Dockerfile8
-rw-r--r--automation/taskcluster/graph/src/extend.js9
2 files changed, 14 insertions, 3 deletions
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
@@ -617,6 +617,15 @@ async function scheduleLinux(name, overrides, args = "") {
}));
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,
env: {NSS_BUILD_MODULAR: "1"},