From d229bdddda0aced9610dbe1444b4d1c1b5cf56e1 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Mon, 16 May 2022 11:28:15 +0100
Subject: [PATCH] ci: Don't build sphinx documentation on centos
The centos docker image lacks the sphinx builder so we disable building
sphinx docs for these jobs.
Fixes #21580
(cherry picked from commit a05b62936a7101e265b7b7776d8119754738ca70)
---
.gitlab/gen_ci.hs | 3 +++
.gitlab/jobs.yaml | 3 +++
2 files changed, 6 insertions(+)
diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs
index 7259819576c4..d6bff8e2da0f 100755
--- a/.gitlab/gen_ci.hs
+++ b/.gitlab/gen_ci.hs
@@ -357,6 +357,9 @@ distroVariables Alpine = mconcat
-- (see Note [Object unloading]).
, "BROKEN_TESTS" =: "encoding004 T10458 ghcilink002 linker_unload_native"
]
+distroVariables Centos7 = mconcat [
+ "HADRIAN_ARGS" =: "--docs=no-sphinx"
+ ]
distroVariables Fedora33 = mconcat
-- LLC/OPT do not work for some reason in our fedora images
-- These tests fail with this error: T11649 T5681 T7571 T8131b
diff --git a/.gitlab/jobs.yaml b/.gitlab/jobs.yaml
index c6217421c465..ed95507314ef 100644
--- a/.gitlab/jobs.yaml
+++ b/.gitlab/jobs.yaml
@@ -781,6 +781,7 @@
"BIN_DIST_NAME": "ghc-x86_64-linux-centos7-validate",
"BUILD_FLAVOUR": "validate",
"CONFIGURE_ARGS": "",
+ "HADRIAN_ARGS": "--docs=no-sphinx",
"TEST_ENV": "x86_64-linux-centos7-validate",
"XZ_OPT": "-9"
}
@@ -2230,6 +2231,7 @@
"BIN_DIST_NAME": "ghc-x86_64-linux-centos7-release",
"BUILD_FLAVOUR": "release",
"CONFIGURE_ARGS": "",
+ "HADRIAN_ARGS": "--docs=no-sphinx",
"IGNORE_PERF_FAILURES": "all",
"TEST_ENV": "x86_64-linux-centos7-release",
"XZ_OPT": "-9"
@@ -3080,6 +3082,7 @@
"BIN_DIST_NAME": "ghc-x86_64-linux-centos7-validate",
"BUILD_FLAVOUR": "validate",
"CONFIGURE_ARGS": "",
+ "HADRIAN_ARGS": "--docs=no-sphinx",
"TEST_ENV": "x86_64-linux-centos7-validate"
}
},
--
GitLab