[Git][ghc/ghc][wip/ghc-9.8] 4 commits: gitlab-ci: Bump ci-images
Ben Gamari (@bgamari)
gitlab at gitlab.haskell.org
Thu Jul 13 12:10:47 UTC 2023
Ben Gamari pushed to branch wip/ghc-9.8 at Glasgow Haskell Compiler / GHC
Commits:
62bfea7a by Ben Gamari at 2023-07-13T08:10:26-04:00
gitlab-ci: Bump ci-images
To freeze emsdk, avoiding #23641.
- - - - -
a01879a7 by Ben Gamari at 2023-07-13T08:10:26-04:00
testsuite: Accept metric changes
Metric Increase:
T6048
- - - - -
c046a238 by Ben Gamari at 2023-07-13T08:10:26-04:00
testsuite: Declare bkpcabal08 as fragile
Due to spurious output changes described in #23648.
- - - - -
f356a7e8 by Ben Gamari at 2023-07-13T08:10:26-04:00
gitlab-ci: Only mark linker_unload_native as broken in static jobs
This test passes on dynamically-linked Alpine.
- - - - -
4 changed files:
- .gitlab-ci.yml
- .gitlab/gen_ci.hs
- .gitlab/jobs.yaml
- testsuite/tests/backpack/cabal/bkpcabal08/all.T
Changes:
=====================================
.gitlab-ci.yml
=====================================
@@ -2,7 +2,7 @@ variables:
GIT_SSL_NO_VERIFY: "1"
# Commit of ghc/ci-images repository from which to pull Docker images
- DOCKER_REV: c29d97c469a23db1c77ac1184eebbb2fd86ef623
+ DOCKER_REV: a9c0f5efbe503c17f63070583b2d815e498acc68
# Sequential version number of all cached things.
# Bump to invalidate GitLab CI cache.
@@ -86,7 +86,7 @@ workflow:
DOCKER_IMAGE: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10-ghc9_2:$DOCKER_REV"
- GHC_VERSION: 9.4.3
DOCKER_IMAGE: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
- - GHC_VERSION: 9.6.1
+ - GHC_VERSION: 9.6.2
DOCKER_IMAGE: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10-ghc9_6:$DOCKER_REV"
# Allow linters to fail on draft MRs.
=====================================
.gitlab/gen_ci.hs
=====================================
@@ -434,9 +434,7 @@ 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"
@@ -940,7 +938,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
=====================================
@@ -598,7 +598,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",
@@ -660,7 +660,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",
@@ -722,7 +722,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",
@@ -2536,7 +2536,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": "--hash-unit-ids --docs=no-sphinx",
@@ -2599,7 +2599,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": "--hash-unit-ids --docs=no-sphinx",
@@ -2662,7 +2662,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": "--hash-unit-ids --docs=no-sphinx",
@@ -3709,7 +3709,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",
=====================================
testsuite/tests/backpack/cabal/bkpcabal08/all.T
=====================================
@@ -6,6 +6,7 @@ else:
test('bkpcabal08',
[extra_files(['p', 'q', 'impl', 'bkpcabal08.cabal', 'Setup.hs', 'R.hs']),
js_broken(22351),
+ fragile(23648),
normalise_slashes,
normalise_version('bkpcabal08')],
run_command,
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/77ee6b043095cd5573409b42c1fd85649d239bc3...f356a7e8ec8ec3d6b2b30fd175598b9b80065d87
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/77ee6b043095cd5573409b42c1fd85649d239bc3...f356a7e8ec8ec3d6b2b30fd175598b9b80065d87
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/20230713/5e9d09e3/attachment-0001.html>
More information about the ghc-commits
mailing list