summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2022-08-04 16:14:12 +0100
committerMatthew Pickering <matthewtpickering@gmail.com>2022-08-04 16:17:40 +0100
commit212e38d4412a95dc3eb69363198da923b6fa59ad (patch)
tree73afba33400ea146c942ee80e7d65c3c9dcdd427
parentb99819bdaa11881f0b0bec29ef6274a8c8e565a0 (diff)
downloadhaskell-wip/fix-pages-job.tar.gz
ci: Fix pages jobwip/fix-pages-job
The job has been failing because we don't bundle haddock docs anymore in the docs dist created by hadrian. Fixes #21789
-rw-r--r--.gitlab-ci.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d16a1af38..9d56997fe3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -814,7 +814,8 @@ pages:
- x86_64-linux
script:
- mkdir -p public/doc
- - tar -xf haddock.html.tar.xz -C public/doc
+ # haddock docs are not in the hadrian produce doc tarballs at the moment
+ # - tar -xf haddock.html.tar.xz -C public/doc
- tar -xf libraries.html.tar.xz -C public/doc
- tar -xf users_guide.html.tar.xz -C public/doc
- |
@@ -828,6 +829,8 @@ pages:
# N.B. only run this on ghc/ghc since the deployed pages are quite large
# and we only serve GitLab Pages for ghc/ghc.
- if: '$CI_COMMIT_BRANCH == "master" && $CI_PROJECT_NAMESPACE == "ghc"'
+ - if: '$CI_MERGE_REQUEST_LABELS =~ /.*publish-docs.*/'
+
artifacts:
paths:
- public