@@ -62,16 +62,18 @@ artifactName arch opsys = archName arch ++ "-" ++ case opsys of
62
62
63
63
data GHC
64
64
= GHC948
65
- | GHC966
65
+ | GHC967
66
66
| GHC984
67
67
| GHC9101
68
+ | GHC9122
68
69
deriving (Eq , Enum , Bounded )
69
70
70
71
ghcVersion :: GHC -> String
71
72
ghcVersion GHC948 = " 9.4.8"
72
- ghcVersion GHC966 = " 9.6.6 "
73
+ ghcVersion GHC967 = " 9.6.7 "
73
74
ghcVersion GHC984 = " 9.8.4"
74
75
ghcVersion GHC9101 = " 9.10.1"
76
+ ghcVersion GHC9122 = " 9.12.2"
75
77
76
78
ghcVersionIdent :: GHC -> String
77
79
ghcVersionIdent = filter (/= ' .' ) . ghcVersion
@@ -186,6 +188,15 @@ runner AArch64 Darwin = ["self-hosted", "macOS", "ARM64"]
186
188
runner Amd64 Windows = [" windows-latest" ]
187
189
runner AArch64 Windows = error " aarch64 windows not supported"
188
190
191
+ -- | Runner selection for bindist jobs
192
+ bindistRunner :: Arch -> Opsys -> [Value ]
193
+ bindistRunner Amd64 (Linux _) = [" self-hosted" , " linux-space" , " maerwald" ]
194
+ bindistRunner AArch64 (Linux _) = [" self-hosted" , " Linux" , " ARM64" , " maerwald" ]
195
+ bindistRunner Amd64 Darwin = [" macOS-13" ]
196
+ bindistRunner AArch64 Darwin = [" self-hosted" , " macOS" , " ARM64" ]
197
+ bindistRunner Amd64 Windows = [" windows-latest" ]
198
+ bindistRunner AArch64 Windows = error " aarch64 windows not supported"
199
+
189
200
-------------------------------------------------------------------------------
190
201
-- Action generatation
191
202
-------------------------------------------------------------------------------
@@ -279,8 +290,8 @@ data Config = MkConfig Arch Opsys [GHC]
279
290
instance ToJSON CI where
280
291
toJSON (CI cs) = object
281
292
[ " name" .= str " Build and release"
282
- , " on" .= object [ " push" .= [ object [" tags" .= [str " *" ] ]]
283
- , " schedule" .= [object [" cron" .= str " 0 2 * * 1" ]]
293
+ , " on" .= object [ " push" .= object [" tags" .= [str " *" ]]
294
+ , " schedule" .= [object [" cron" .= str " 0 2 * * 1" ]]
284
295
]
285
296
, " env" .= object
286
297
[ " CABAL_CACHE_DISABLE" .= str " ${{ vars.CABAL_CACHE_DISABLE }}"
@@ -415,7 +426,7 @@ buildJob arch os v =
415
426
mkBindistJob :: Arch -> Opsys -> [GHC ] -> Job
416
427
mkBindistJob arch os vs =
417
428
K. fromString (bindistJobName arch os) .= object
418
- [ " runs-on" .= runner arch os
429
+ [ " runs-on" .= bindistRunner arch os
419
430
, " name" .= (bindistJobName arch os ++ " (Prepare bindist)" )
420
431
, " needs" .= [buildJobName arch os ver | ver <- vs]
421
432
, " env" .= thisEnv
0 commit comments