Support multiple setup methods

Author: phadej

src/HaskellCI/Compiler.hs

@@ -140,7 +140,7 @@ knownGhcVersions = fmap mkVersion
     , [9,2,1],  [9,2,2],  [9,2,3], [9,2,4], [9,2,5], [9,2,6], [9,2,7], [9,2,8]
     , [9,4,1],  [9,4,2],  [9,4,3], [9,4,4], [9,4,5], [9,4,6], [9,4,7], [9,4,8]
     , [9,6,1],  [9,6,2],  [9,6,3], [9,6,4], [9,6,5], [9,6,6]
-    , [9,8,1],  [9,8,2]
+    , [9,8,1],  [9,8,2],  [9,8,3]
     , [9,10,1]
     , [9,12,1]
     ]

src/HaskellCI/Config/Grammar.hs

@@ -138,8 +138,14 @@ configGrammar = Config
         ^^^ metahelp "RANGE" "Jobs to additionally build with OSX"
     <*> booleanFieldDef     "ghcup-cabal"                                                   (field @"cfgGhcupCabal") defaultConfig
         ^^^ help "Use (or don't) ghcup to install cabal"
+    <*> rangeField            "hvr-ppa-jobs"                                                (field @"cfgHvrPaaJobs") defaultConfig
+        ^^^ metahelp "RANGE" "(Linux) jobs to use hvr-ppa to install ghc"
     <*> rangeField            "ghcup-jobs"                                                  (field @"cfgGhcupJobs") defaultConfig
-        ^^^ metahelp "RANGE" "(Linux) jobs to use ghcup to install tools"
+        ^^^ metahelp "RANGE" "(Linux) jobs to use ghcup to install ghc"
+    <*> rangeField            "ghcup-vanilla-jobs"                                          (field @"cfgGhcupVanillaJobs") defaultConfig
+        ^^^ metahelp "RANGE" "(Linux) jobs to use ghcup-vanilla to install ghc"
+    <*> rangeField            "ghcup-prerelease-jobs"                                       (field @"cfgGhcupPrereleaseJobs") defaultConfig
+        ^^^ metahelp "RANGE" "(Linux) jobs to use ghcup-prerelease to install ghc"
     <*> optionalFieldDef    "ghcup-version"                                                 (field @"cfgGhcupVersion") defaultConfig 
         ^^^ metahelp "VERSION" "ghcup version"
     <*> monoidalFieldAla    "apt"                       (alaSet' C.NoCommaFSep C.Token')    (field @"cfgApt")

src/HaskellCI/Config/Initial.hs

@@ -61,7 +61,10 @@ initialConfig = Config
     , cfgLinuxJobs           = anyVersion
     , cfgMacosJobs           = noVersion
     , cfgGhcupCabal          = True
+    , cfgHvrPpaJobs          = noVersion
     , cfgGhcupJobs           = C.unionVersionRanges (C.intersectVersionRanges (C.laterVersion (mkVersion [8,10,4])) (C.earlierVersion (mkVersion [9]))) (C.laterVersion (mkVersion [9,0,1]))
+    , cfgGhcupVanillaJobs    = noVersion -- TODO -- include GHC-9.8.3
+    , cfgGhcupPrereleaseJobs = C.orLaterVersion (mkVersion ([9,11,0]))
     , cfgGhcupVersion        = initialGhcupVersion
     , cfgApt                 = mempty
     , cfgTravisPatches       = []

src/HaskellCI/Config/Type.hs

@@ -66,7 +66,10 @@ data Config = Config
     , cfgLinuxJobs           :: !VersionRange
     , cfgMacosJobs           :: !VersionRange
     , cfgGhcupCabal          :: !Bool
+    , cfgHvrPpaJobs          :: !VersionRange
     , cfgGhcupJobs           :: !VersionRange
+    , cfgGhcupVanillaJobs    :: !VersionRange
+    , cfgGhcupPrereleaseJobs :: !VersionRange
     , cfgGhcupVersion        :: !Version
     , cfgApt                 :: S.Set String
     , cfgTravisPatches       :: [FilePath]