GitLab

Zubin pushed to branch wip/9.10.3-backports at Glasgow Haskell Compiler / GHC

Commits:

e7df6f9f

by Teo Camarasu at 2025-09-05T16:57:32+05:30

Fix documentation preview from doc-tarball job

- Include all the .html files and assets in the job artefacts
- Include all the .pdf files in the job artefacts
- Mark the artefact as an "exposed" artefact meaning it turns up in the
  UI.

Resolves #24651

(cherry picked from commit 9f99126a7b4991e777dbdb5baf029d452fa9d533)

fdaa5306
by Zubin Duggal at 2025-09-05T17:09:33+05:30
```
Prepare 9.10.3 final
```

6 changed files:

.gitlab-ci.yml
.gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py
.gitlab/rel_eng/upload.sh
configure.ac
distrib/mkDocs/mkDocs
docs/users_guide/9.10.3-notes.rst

Changes:

.gitlab-ci.yml

@@ -569,12 +569,17 @@ doc-tarball:
      LINUX_BINDIST: "ghc-x86_64-linux-deb10.tar.xz"
      WINDOWS_BINDIST: "ghc-x86_64-windows.tar.xz"
    artifacts:
 +    expose_as: "Documentation Preview"
      paths:
        - haddock.html.tar.xz
 +      - docs/haddock/
        - libraries.html.tar.xz
 +      - docs/libraries/
        - users_guide.html.tar.xz
 -      - index.html
 -      - "*.pdf"
 +      - docs/users_guide/
 +      - docs/index.html
 +      - Haddock.pdf
 +      - users_guide.pdf
    script:
      - |
        mv "ghc-x86_64-linux-deb10-numa-slow-validate.tar.xz" "$LINUX_BINDIST" \
@@ -594,8 +599,8 @@ doc-tarball:
        fi
      - rm -Rf docs
      - bash -ex distrib/mkDocs/mkDocs $LINUX_BINDIST $WINDOWS_BINDIST
 +    - mv docs/*.tar.xz docs/*.pdf .
      - ls -lh
 -    - mv docs/*.tar.xz docs/index.html .
  hackage-doc-tarball:
    stage: packaging

.gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py

@@ -129,7 +129,7 @@ def fetch_artifacts(release: str, pipeline_id: int,
                  for f in doc_files:
                      subprocess.run(['tar', '-xf', f, '-C', dest])
                      logging.info(f'extracted docs {f} to {dest}')
 -                index_path = destdir / 'docs' / 'index.html'
 +                index_path = destdir / 'index.html'
                  index_path.replace(dest / 'index.html')
                  pdfs = list(destdir.glob('*.pdf'))
                  for f in pdfs:
@@ -165,3 +165,4 @@ def main():
      gl = gitlab.Gitlab.from_config(args.profile)
      fetch_artifacts(args.release, args.pipeline,
                      dest_dir=args.output, gl=gl)
 +main()

.gitlab/rel_eng/upload.sh

 -#!/usr/bin/env nix-shell
 -#! nix-shell -i bash -p moreutils lzip zip lftp gnupg
 +#!/usr/bin/bash
  set -Eeuo pipefail
@@ -41,7 +40,7 @@ set -Eeuo pipefail
  : ${ver:=$(ls ghc-*.tar.* | sed -ne 's/ghc-\([0-9]\+\.[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?\).\+/\1/p' | head -n1)}
  if [ -z "$ver" ]; then echo "Failed to infer \$ver"; exit 1; fi
 -host="gitlab-storage.haskell.org"
 +host="gitlab.haskell.org:2222"
  usage() {
      echo "Usage: [rel_name=<name>] ver=7.10.3-rc2 $0 <action>"

configure.ac

@@ -22,7 +22,7 @@ AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.10.2], [glasgow-ha
  AC_CONFIG_MACRO_DIRS([m4])
  # Set this to YES for a released version, otherwise NO
 -: ${RELEASE=NO}
 +: ${RELEASE=YES}
  # The primary version (e.g. 7.5, 7.4.1) is set in the AC_INIT line
  # above.  If this is not a released version, then we will append the

distrib/mkDocs/mkDocs

@@ -43,7 +43,7 @@ do
      dir=${i%*/}
      tar -Jcf ../../../../../$dir.html.tar.xz $dir
  done
 -mv index.html ../../../../..
 +mv index.html users_guide libraries ../../../../..
  cd ..
  mv ./*.pdf ../../../.. || \
      die "failed to find PDFs"

docs/users_guide/9.10.3-notes.rst

@@ -22,9 +22,6 @@ Compiler
  - Fix GHC.SysTools.Ar archive member size writing logic that was emitting wrong
    archive member sizes in headers. (:ghc-ticket:`26120`, :ghc-ticket:`22586`)
 -- Fix multiple bugs in name resolution of subordinate import lists related to
 -  type namespace specifiers and hiding clauses. (:ghc-ticket:`22581`, :ghc-ticket:`25983`, :ghc-ticket:`25984`, :ghc-ticket:`25991`)
+-
  - Use mkTrAppChecked in ds_ev_typeable to avoid false negatives for type
    equality involving function types. (:ghc-ticket:`25998`)
@@ -40,6 +37,9 @@ Compiler
  - Introduce a separate argument limit for forced specs via SPEC argument with
    warning when limit is exceeded. (:ghc-ticket:`25197`)
 +- Fix compiler crash in the renamer with certain programs referencing out of
 +  scope record fields (:ghc-ticket:`25056`)
++
  Build system and packaging
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -79,6 +79,8 @@ WebAssembly backend
  Runtime system
  ~~~~~~~~~~~~~~
 +- rts: Fix a segfault involving STM (:ghc-ticket:`26205`).
++
  - rts: Implement WEAK EXTERNAL undef redirection by target symbol name.
  - rts: Handle API set symbol versioning conflicts.
@@ -97,12 +99,12 @@ Runtime system
  ``base`` library
  ~~~~~~~~~~~~~~~~
 -- base: Expose Backtraces constructor and fields. (:ghc-ticket:`26049`)
+-
  - base: Note strictness changes made in 4.16.0.0. (:ghc-ticket:`25886`)
  - Fix bugs in ``integerRecipMod`` and ``integerPowMod`` return values. (:ghc-ticket:`26017`)
 +- Fix incorrect results for ``naturalAndNot`` (:ghc-ticket:`26230`)
++
  ``ghc`` library
  ~~~~~~~~~~~~~~~
@@ -112,9 +114,6 @@ Runtime system
  Build tools
  ~~~~~~~~~~~
 -- configure: Drop probing of ld.gold since `gold` has been dropped from
 -  binutils-2.44. (:ghc-ticket:`25716`)
+-
  - get-win32-tarballs.py: List tarball files to be downloaded if we cannot find
    them. (:ghc-ticket:`25929`)
@@ -162,4 +161,4 @@ for further change information.
      libraries/transformers/transformers.cabal: Dependency of ``ghc`` library
      libraries/unix/unix.cabal:               Dependency of ``ghc`` library
      libraries/Win32/Win32.cabal:             Dependency of ``ghc`` library
 -    libraries/xhtml/xhtml.cabal:             Dependency of ``haddock`` executable
 \ No newline at end of file
 +    libraries/xhtml/xhtml.cabal:             Dependency of ``haddock`` executable