diff options
author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-08-04 16:14:12 +0100 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-08-05 12:47:40 -0400 |
commit | 78d232f5ca7f02b8f743e6982e710a4bfb309c4f (patch) | |
tree | 16f7c8e3394e8f266a217d73c833fc2d4f0c99ff /.gitlab-ci.yml | |
parent | 52c156748d8883200d73e0ab199f1fb103e1e940 (diff) | |
download | haskell-78d232f5ca7f02b8f743e6982e710a4bfb309c4f.tar.gz |
ci: 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
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 5 |
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 |