diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-05-16 11:28:15 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-05-19 04:58:27 -0400 |
| commit | a05b62936a7101e265b7b7776d8119754738ca70 (patch) | |
| tree | fab25df6bfe185f9088a3d59fa70d430a9171621 | |
| parent | 297156e0b8053a28a860e7a18e1816207a59547b (diff) | |
| download | haskell-a05b62936a7101e265b7b7776d8119754738ca70.tar.gz | |
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
| -rwxr-xr-x | .gitlab/gen_ci.hs | 3 | ||||
| -rw-r--r-- | .gitlab/jobs.yaml | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs index 7259819576..d6bff8e2da 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 c6217421c4..ed95507314 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" } }, |