diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2023-02-15 15:12:15 +0000 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2023-02-16 09:46:12 +0000 |
| commit | 62aa596f696ac8aea2e470585cd5981ea46a49a2 (patch) | |
| tree | 44904ffc4c1eced5252adc745c3c38c5dcb5ba00 | |
| parent | 2bb5d1abacc0b914453a14b7be71145a14e26f6f (diff) | |
| download | haskell-wip/metadata-fixes.tar.gz | |
ghcup-metadata: Use Ubuntu and Rocky bindistswip/metadata-fixes
Prefer to use the Ubuntu 20.04 and 18.04 binary distributions on Ubuntu
and Linux Mint. Prefer to use the Rocky 8 binary distribution on
unknown distributions.
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rwxr-xr-x | .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py | 19 |
2 files changed, 20 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98a40cc90e..75ac14db52 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1011,6 +1011,12 @@ ghcup-metadata-nightly: artifacts: false - job: nightly-x86_64-linux-centos7-validate artifacts: false + - job: nightly-x86_64-linux-ubuntu20_04-validate + artifacts: false + - job: nightly-x86_64-linux-ubuntu18_04-validate + artifacts: false + - job: nightly-x86_64-linux-rocky8-validate + artifacts: false - job: nightly-x86_64-darwin-validate artifacts: false - job: nightly-aarch64-darwin-validate diff --git a/.gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py b/.gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py index 5579bd1454..b072f26f0a 100755 --- a/.gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py +++ b/.gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py @@ -94,6 +94,12 @@ def fedora(n): def alpine(n): return linux_platform("x86_64", "x86_64-linux-alpine{n}".format(n=n)) +def rocky(n): + return linux_platform("x86_64", "x86_64-linux-rocky{n}".format(n=n)) + +def ubuntu(n): + return linux_platform("x86_64", "x86_64-linux-ubuntu{n}".format(n=n)) + def linux_platform(arch, opsys): return PlatformSpec( opsys, 'ghc-{version}-{arch}-unknown-linux'.format(version="{version}", arch=arch) ) @@ -157,6 +163,9 @@ def mk_new_yaml(release_mode, version, pipeline_type, job_map): eprint("\n=== " + platform.name + " " + ('=' * (75 - len(platform.name)))) return mk_one_metadata(release_mode, version, job_map, mk_from_platform(pipeline_type, platform)) + ubuntu1804 = mk(ubuntu("18_04")) + ubuntu2004 = mk(ubuntu("20_04")) + rocky8 = mk(rocky("8")) # Here are all the bindists we can distribute centos7 = mk(centos(7)) fedora33 = mk(fedora(33)) @@ -180,18 +189,18 @@ def mk_new_yaml(release_mode, version, pipeline_type, job_map): , "(>= 10 && < 11)": deb10 , ">= 11": deb11 , "unknown_versioning": deb11 } - , "Linux_Ubuntu" : { "unknown_versioning": deb10 - , "( >= 16 && < 19 )": deb9 + , "Linux_Ubuntu" : { "unknown_versioning": ubuntu2004 + , "( >= 16 && < 19 )": ubuntu1804 } - , "Linux_Mint" : { "< 20": deb9 - , ">= 20": deb10 } + , "Linux_Mint" : { "< 20": ubuntu1804 + , ">= 20": ubuntu2004 } , "Linux_CentOS" : { "( >= 7 && < 8 )" : centos7 , "unknown_versioning" : centos7 } , "Linux_Fedora" : { ">= 33": fedora33 , "unknown_versioning": centos7 } , "Linux_RedHat" : { "unknown_versioning": centos7 } #MP: Replace here with Rocky8 when that job is in the pipeline - , "Linux_UnknownLinux" : { "unknown_versioning": fedora33 } + , "Linux_UnknownLinux" : { "unknown_versioning": rocky8 } , "Darwin" : { "unknown_versioning" : darwin_x86 } , "Windows" : { "unknown_versioning" : windows } , "Linux_Alpine" : { "unknown_versioning": alpine3_12 } |