[Git][ghc/ghc][ghc-9.6] 3 commits: Update haddock submodule to 2.29.1 to restore GHC 9.2 compatibility.

[Zubin (@wz1000)]

Zubin pushed to branch ghc-9.6 at Glasgow Haskell Compiler / GHC


Commits:
4d9abf1e by Zubin Duggal at 2023-09-20T13:36:44+05:30
Update haddock submodule to 2.29.1 to restore GHC 9.2 compatibility.

- - - - -
4031def4 by Ben Gamari at 2023-09-20T13:39:50+05:30
gitlab-ci: Only mark linker_unload_native as broken in static jobs

This test passes on dynamically-linked Alpine.

(cherry picked from commit f356a7e8ec8ec3d6b2b30fd175598b9b80065d87)

- - - - -
5279ff76 by Ben Gamari at 2023-09-20T13:41:34+05:30
gitlab-ci: Mark T22012 as broken on CentOS 7

Due to #23979.

(cherry picked from commit 4cec2feca335377f3b8e4aa448f8997760f5fb64)

- - - - -


4 changed files:

- .gitlab/gen_ci.hs
- .gitlab/jobs.yaml
- docs/users_guide/9.6.3-notes.rst
- utils/haddock


Changes:

=====================================
.gitlab/gen_ci.hs
=====================================
@@ -420,12 +420,11 @@ distroVariables Alpine = mconcat
   , "HADRIAN_ARGS" =: "--docs=no-sphinx"
     -- encoding004: due to lack of locale support
     -- T10458, ghcilink002: due to #17869
-    -- linker_unload_native: due to musl not supporting any means of probing dynlib dependencies
-    -- (see Note [Object unloading]).
-  , "BROKEN_TESTS" =: "encoding004 T10458 linker_unload_native"
+  , "BROKEN_TESTS" =: "encoding004 T10458"
   ]
 distroVariables Centos7 = mconcat [
-  "HADRIAN_ARGS" =: "--docs=no-sphinx"
+    "HADRIAN_ARGS" =: "--docs=no-sphinx"
+  , "BROKEN_TESTS" =: "T22012" -- due to #23979
   ]
 distroVariables Rocky8 = mconcat [
   "HADRIAN_ARGS" =: "--docs=no-sphinx"
@@ -909,7 +908,10 @@ job_groups =
   where
 
     -- ghcilink002 broken due to #17869
-    fullyStaticBrokenTests = modifyJobs (addVariable "BROKEN_TESTS" "ghcilink002 ")
+    --
+    -- linker_unload_native: due to musl not supporting any means of probing dynlib dependencies
+    -- (see Note [Object unloading]).
+    fullyStaticBrokenTests = modifyJobs (addVariable "BROKEN_TESTS" "ghcilink002 linker_unload_native")
 
     hackage_doc_job = rename (<> "-hackage") . modifyJobs (addVariable "HADRIAN_ARGS" "--haddock-base-url")
 


=====================================
.gitlab/jobs.yaml
=====================================
@@ -661,7 +661,7 @@
     "variables": {
       "BIGNUM_BACKEND": "native",
       "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-int_native-validate+fully_static",
-      "BROKEN_TESTS": "ghcilink002  encoding004 T10458 linker_unload_native",
+      "BROKEN_TESTS": "ghcilink002 linker_unload_native encoding004 T10458",
       "BUILD_FLAVOUR": "validate+fully_static",
       "CONFIGURE_ARGS": "--disable-ld-override ",
       "HADRIAN_ARGS": "--docs=no-sphinx",
@@ -785,7 +785,7 @@
     "variables": {
       "BIGNUM_BACKEND": "gmp",
       "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-validate",
-      "BROKEN_TESTS": "encoding004 T10458 linker_unload_native",
+      "BROKEN_TESTS": "encoding004 T10458",
       "BUILD_FLAVOUR": "validate",
       "CONFIGURE_ARGS": "--disable-ld-override ",
       "HADRIAN_ARGS": "--docs=no-sphinx",
@@ -848,7 +848,7 @@
     "variables": {
       "BIGNUM_BACKEND": "gmp",
       "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-validate+fully_static",
-      "BROKEN_TESTS": "ghcilink002  encoding004 T10458 linker_unload_native",
+      "BROKEN_TESTS": "ghcilink002 linker_unload_native encoding004 T10458",
       "BUILD_FLAVOUR": "validate+fully_static",
       "CONFIGURE_ARGS": "--disable-ld-override ",
       "HADRIAN_ARGS": "--docs=no-sphinx",
@@ -910,6 +910,7 @@
     "variables": {
       "BIGNUM_BACKEND": "gmp",
       "BIN_DIST_NAME": "ghc-x86_64-linux-centos7-validate",
+      "BROKEN_TESTS": "T22012",
       "BUILD_FLAVOUR": "validate",
       "CONFIGURE_ARGS": "",
       "HADRIAN_ARGS": "--docs=no-sphinx",
@@ -2476,7 +2477,7 @@
     "variables": {
       "BIGNUM_BACKEND": "native",
       "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-int_native-release+fully_static",
-      "BROKEN_TESTS": "ghcilink002  encoding004 T10458 linker_unload_native",
+      "BROKEN_TESTS": "ghcilink002 linker_unload_native encoding004 T10458",
       "BUILD_FLAVOUR": "release+fully_static",
       "CONFIGURE_ARGS": "--disable-ld-override ",
       "HADRIAN_ARGS": "--docs=no-sphinx",
@@ -2540,7 +2541,7 @@
     "variables": {
       "BIGNUM_BACKEND": "gmp",
       "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-release+fully_static+no_split_sections",
-      "BROKEN_TESTS": "ghcilink002  encoding004 T10458 linker_unload_native",
+      "BROKEN_TESTS": "ghcilink002 linker_unload_native encoding004 T10458",
       "BUILD_FLAVOUR": "release+fully_static+no_split_sections",
       "CONFIGURE_ARGS": "--disable-ld-override ",
       "HADRIAN_ARGS": "--docs=no-sphinx",
@@ -2604,7 +2605,7 @@
     "variables": {
       "BIGNUM_BACKEND": "gmp",
       "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-release+no_split_sections",
-      "BROKEN_TESTS": "encoding004 T10458 linker_unload_native",
+      "BROKEN_TESTS": "encoding004 T10458",
       "BUILD_FLAVOUR": "release+no_split_sections",
       "CONFIGURE_ARGS": "--disable-ld-override ",
       "HADRIAN_ARGS": "--docs=no-sphinx",
@@ -2667,6 +2668,7 @@
     "variables": {
       "BIGNUM_BACKEND": "gmp",
       "BIN_DIST_NAME": "ghc-x86_64-linux-centos7-release+no_split_sections",
+      "BROKEN_TESTS": "T22012",
       "BUILD_FLAVOUR": "release+no_split_sections",
       "CONFIGURE_ARGS": "",
       "HADRIAN_ARGS": "--docs=no-sphinx",
@@ -3702,7 +3704,7 @@
     "variables": {
       "BIGNUM_BACKEND": "gmp",
       "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-validate+fully_static",
-      "BROKEN_TESTS": "ghcilink002  encoding004 T10458 linker_unload_native",
+      "BROKEN_TESTS": "ghcilink002 linker_unload_native encoding004 T10458",
       "BUILD_FLAVOUR": "validate+fully_static",
       "CONFIGURE_ARGS": "--disable-ld-override ",
       "HADRIAN_ARGS": "--docs=no-sphinx",


=====================================
docs/users_guide/9.6.3-notes.rst
=====================================
@@ -141,7 +141,7 @@ Core libraries
 
 - Bump ``filepath`` to 1.4.100.4
 
-- Bump ``haddock`` to 2.29.0
+- Bump ``haddock`` to 2.29.1
 
 Included libraries
 ------------------


=====================================
utils/haddock
=====================================
@@ -1 +1 @@
-Subproject commit 5c984d9e8b80b5f9a3c6aaa8b0d6eb865e4341c6
+Subproject commit 6c77e0627830c4f07e99aebf63e46fce4c3cb593



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/96c483ebb0729cb090d161862f15da2479a9a1a7...5279ff760800828d48e866c2ffc81325ccc253fb

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/96c483ebb0729cb090d161862f15da2479a9a1a7...5279ff760800828d48e866c2ffc81325ccc253fb
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230920/527b243c/attachment-0001.html>