From 973c61b526d2172d73a6e59977b9f40b5d76650f Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Tue, 2 Jul 2019 12:21:36 -0400
Subject: [PATCH] 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.
---
.gitlab-ci.yml | 2 ++
mk/flavours/validate.mk | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b32f8268f06b..6d4f28ab1ad4 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 6395d2d62f18..eddd22fb822b 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/
--
GitLab