diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-07-02 12:21:36 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-07-03 09:34:16 -0400 |
| commit | 973c61b526d2172d73a6e59977b9f40b5d76650f (patch) | |
| tree | 461dedcd6d72dc070650db1c943e7e7a10079573 | |
| parent | acd795583625401c5554f8e04ec7efca18814011 (diff) | |
| download | haskell-973c61b526d2172d73a6e59977b9f40b5d76650f.tar.gz | |
gitlab-ci: Fix doc-tarball job
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.yml | 2 | ||||
| -rw-r--r-- | mk/flavours/validate.mk | 4 |
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/ |