@@ -62,16 +62,18 @@ artifactName arch opsys = archName arch ++ "-" ++ case opsys of
6262
6363data GHC
6464 = GHC948
65- | GHC966
65+ | GHC967
6666 | GHC984
6767 | GHC9101
68+ | GHC9122
6869 deriving (Eq , Enum , Bounded )
6970
7071ghcVersion :: GHC -> String
7172ghcVersion GHC948 = " 9.4.8"
72- ghcVersion GHC966 = " 9.6.6 "
73+ ghcVersion GHC967 = " 9.6.7 "
7374ghcVersion GHC984 = " 9.8.4"
7475ghcVersion GHC9101 = " 9.10.1"
76+ ghcVersion GHC9122 = " 9.12.2"
7577
7678ghcVersionIdent :: GHC -> String
7779ghcVersionIdent = filter (/= ' .' ) . ghcVersion
@@ -186,6 +188,15 @@ runner AArch64 Darwin = ["self-hosted", "macOS", "ARM64"]
186188runner Amd64 Windows = [" windows-latest" ]
187189runner AArch64 Windows = error " aarch64 windows not supported"
188190
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+
189200-------------------------------------------------------------------------------
190201-- Action generatation
191202-------------------------------------------------------------------------------
@@ -279,8 +290,8 @@ data Config = MkConfig Arch Opsys [GHC]
279290instance ToJSON CI where
280291 toJSON (CI cs) = object
281292 [ " 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" ]]
284295 ]
285296 , " env" .= object
286297 [ " CABAL_CACHE_DISABLE" .= str " ${{ vars.CABAL_CACHE_DISABLE }}"
@@ -415,7 +426,7 @@ buildJob arch os v =
415426mkBindistJob :: Arch -> Opsys -> [GHC ] -> Job
416427mkBindistJob arch os vs =
417428 K. fromString (bindistJobName arch os) .= object
418- [ " runs-on" .= runner arch os
429+ [ " runs-on" .= bindistRunner arch os
419430 , " name" .= (bindistJobName arch os ++ " (Prepare bindist)" )
420431 , " needs" .= [buildJobName arch os ver | ver <- vs]
421432 , " env" .= thisEnv
0 commit comments