diff options
| author | Adam Sandberg Ericsson <adam@sandbergericsson.se> | 2020-12-21 09:07:44 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-12-22 22:10:45 -0500 |
| commit | 53fb345d4fb4c06f6f5450b206250eec24578d8b (patch) | |
| tree | da0cf4cdb083ba7118b620e4db24f014bf9ff933 | |
| parent | 553c59ca5581bcba79ea7d9672cffd438905d846 (diff) | |
| download | haskell-53fb345d4fb4c06f6f5450b206250eec24578d8b.tar.gz | |
mkDocs: fix extraction of Win32 docs from hadrian bindist
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | distrib/mkDocs/mkDocs | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca68909926..51b6813f75 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1061,8 +1061,6 @@ release-x86_64-windows-integer-simple: doc-tarball: stage: packaging needs: [validate-x86_64-linux-deb9-debug, validate-x86_64-windows-hadrian, validate-x86_64-linux-deb9-unreg-hadrian] - # N.B. Documentation isn't correctly packaged in Hadrian bindists - allow_failure: true tags: - x86_64-linux image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV" diff --git a/distrib/mkDocs/mkDocs b/distrib/mkDocs/mkDocs index 3cbfec5695..9008a5ca9f 100755 --- a/distrib/mkDocs/mkDocs +++ b/distrib/mkDocs/mkDocs @@ -28,12 +28,16 @@ cd linux make install cd .. [ "$NO_CLEAN" -eq 0 ] && rm -r linux + tar -Jxf "$WINDOWS_BINDIST" mv ghc* windows cd inst/share/doc/ghc*/html/libraries -mv ../../../../../../windows/doc/html/libraries/Win32-* . || \ # make binary distribution - mv ../../../../../../windows/docs/html/libraries/Win32 . || \ # hadrian binary distribution + +# try extracting the make bindist docs and then the hadrian bindist docs +mv ../../../../../../windows/doc/html/libraries/Win32-* . || \ + mv ../../../../../../windows/docs/html/libraries/Win32 . || \ die "failed to find the Win32 package documentation" + sh gen_contents_index cd .. for i in haddock libraries users_guide |