summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-07-02 12:21:36 -0400
committerMatthew Pickering <matthewtpickering@gmail.com>2019-07-02 22:18:39 +0100
commitf08f4a791118516b231df2f90bb61c1e495dc66f (patch)
treee18c239a28aa1c5f0fdf93c87eb2101d7174bdd8
parentbd660edeb783a74e5ca3f1f82713b2aeedae19dc (diff)
downloadhaskell-wip/fix-doc-tarball.tar.gz
gitlab-ci: Fix doc-tarball jobwip/fix-doc-tarball
Previously we used the deb9-debug job which used the `validate` build flavour which disabled `BUILD_SPHINX_PDF`. Fix this. Fixes #16890.
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--mk/flavours/validate.mk4
2 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b32f8268f0..6d4f28ab1a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -503,6 +503,8 @@ validate-x86_64-linux-deb9-debug:
stage: build
variables:
BUILD_FLAVOUR: validate
+ # Override validate flavour default; see #16890.
+ BUILD_SPHINX_PDF: "YES"
TEST_TYPE: slowtest
TEST_ENV: "x86_64-linux-deb9-debug"
artifacts:
diff --git a/mk/flavours/validate.mk b/mk/flavours/validate.mk
index 6395d2d62f..eddd22fb82 100644
--- a/mk/flavours/validate.mk
+++ b/mk/flavours/validate.mk
@@ -6,8 +6,8 @@ GhcLibHcOpts = -O -dcore-lint -dno-debug-output
BUILD_PROF_LIBS = NO
SplitSections = NO
HADDOCK_DOCS = YES
-BUILD_SPHINX_HTML = YES
-BUILD_SPHINX_PDF = NO
+BUILD_SPHINX_HTML ?= YES
+BUILD_SPHINX_PDF ?= NO
ifeq "$(ValidateHpc)" "YES"
GhcStage2HcOpts += -fhpc -hpcdir $(TOP)/testsuite/hpc_output/