Ben Gamari pushed to branch ghc-9.10 at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py
    ... ... @@ -97,16 +97,16 @@ windowsArtifact = PlatformSpec ( 'x86_64-windows'
    97 97
                                    , 'ghc-{version}-x86_64-unknown-mingw32' )
    
    98 98
     
    
    99 99
     def fedora(n, arch='x86_64'):
    
    100
    -    return linux_platform(arch, "x86_64-linux-fedora{n}".format(n=n))
    
    100
    +    return linux_platform(arch, "{arch}-linux-fedora{n}".format(n=n,arch=arch))
    
    101 101
     
    
    102 102
     def alpine(n, arch='x86_64'):
    
    103
    -    return linux_platform(arch, "x86_64-linux-alpine{n}".format(n=n))
    
    103
    +    return linux_platform(arch, "{arch}-linux-alpine{n}".format(n=n,arch=arch))
    
    104 104
     
    
    105 105
     def rocky(n, arch='x86_64'):
    
    106
    -    return linux_platform(arch, "x86_64-linux-rocky{n}".format(n=n))
    
    106
    +    return linux_platform(arch, "{arch}-linux-rocky{n}".format(n=n,arch=arch))
    
    107 107
     
    
    108 108
     def ubuntu(n, arch='x86_64'):
    
    109
    -    return linux_platform(arch, "x86_64-linux-ubuntu{n}".format(n=n))
    
    109
    +    return linux_platform(arch, "{arch}-linux-ubuntu{n}".format(n=n,arch=arch))
    
    110 110
     
    
    111 111
     def linux_platform(arch, opsys):
    
    112 112
         return PlatformSpec( opsys, 'ghc-{version}-{arch}-unknown-linux'.format(version="{version}", arch=arch) )
    
    ... ... @@ -216,7 +216,7 @@ def mk_new_yaml(release_mode, version, date, pipeline_type, job_map) -> object:
    216 216
         a64 = { "Linux_Debian": { "< 10": deb9
    
    217 217
                                , "( >= 10 && < 11 )": deb10
    
    218 218
                                , "( >= 11 && < 12 )": deb11
    
    219
    -                           , ">= 11": deb12
    
    219
    +                           , ">= 12": deb12
    
    220 220
                                , "unknown_versioning": deb11 }
    
    221 221
               , "Linux_Ubuntu" : { "unknown_versioning": ubuntu2004
    
    222 222
                                  , "( >= 16 && < 18 )": deb9