diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2023-05-05 12:43:31 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2023-05-11 04:10:54 -0400 |
| commit | 29be39ba3f187279b19cf451f2d8f58822edab4f (patch) | |
| tree | 97499439381ad6ba58cf2de543b5991da4dfff5e /.gitlab/gen_ci.hs | |
| parent | 0a5139522394b901276ffa71283f01420e270746 (diff) | |
| download | haskell-29be39ba3f187279b19cf451f2d8f58822edab4f.tar.gz | |
Build vanilla alpine bindists
We currently attempt to build and distribute fully static alpine
bindists (ones which could be used on any linux platform) but most
people who use the alpine bindists want to use alpine to build their own
static applications (for which a fully static bindist is not necessary).
We should build and distribute these bindists for these users whilst the
fully-static bindist is still unusable.
Fixes #23349
Diffstat (limited to '.gitlab/gen_ci.hs')
| -rwxr-xr-x | .gitlab/gen_ci.hs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs index 66a829d978..ee22aafae1 100755 --- a/.gitlab/gen_ci.hs +++ b/.gitlab/gen_ci.hs @@ -424,7 +424,7 @@ distroVariables Alpine = mconcat -- 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 ghcilink002 linker_unload_native" + , "BROKEN_TESTS" =: "encoding004 T10458 linker_unload_native" ] distroVariables Centos7 = mconcat [ "HADRIAN_ARGS" =: "--docs=no-sphinx" @@ -903,8 +903,11 @@ job_groups = , standardBuildsWithConfig AArch64 (Linux Debian10) (splitSectionsBroken vanilla) , disableValidate (validateBuilds AArch64 (Linux Debian10) llvm) , standardBuildsWithConfig I386 (Linux Debian9) (splitSectionsBroken vanilla) - , standardBuildsWithConfig Amd64 (Linux Alpine) (splitSectionsBroken static) - , disableValidate (allowFailureGroup (standardBuildsWithConfig Amd64 (Linux Alpine) staticNativeInt)) + -- Fully static build, in theory usable on any linux distribution. + , fullyStaticBrokenTests (standardBuildsWithConfig Amd64 (Linux Alpine) (splitSectionsBroken static)) + -- Dynamically linked build, suitable for building your own static executables on alpine + , disableValidate (standardBuildsWithConfig Amd64 (Linux Alpine) (splitSectionsBroken vanilla)) + , fullyStaticBrokenTests (disableValidate (allowFailureGroup (standardBuildsWithConfig Amd64 (Linux Alpine) staticNativeInt))) , validateBuilds Amd64 (Linux Debian11) (crossConfig "aarch64-linux-gnu" (Emulator "qemu-aarch64 -L /usr/aarch64-linux-gnu") Nothing) , validateBuilds Amd64 (Linux Debian11) (crossConfig "javascript-unknown-ghcjs" (Emulator "js-emulator") (Just "emconfigure") ) @@ -919,6 +922,10 @@ job_groups = ] where + + -- ghcilink002 broken due to #17869 + fullyStaticBrokenTests = modifyJobs (addVariable "BROKEN_TESTS" "ghcilink002 ") + hackage_doc_job = rename (<> "-hackage") . modifyJobs (addVariable "HADRIAN_ARGS" "--haddock-base-url") tsan_jobs = |