Add GHCup version translations

Author: phadej

src/HaskellCI/Ghcup.hs

@@ -6,3 +6,15 @@ import qualified Distribution.Version as C
 
 initialGhcupVersion :: Version
 initialGhcupVersion = C.mkVersion [0,1,20,0]
+
+-- https://github.com/haskell/cabal/issues/10836#issuecomment-2757855218
+-- if you interface with GHCup, you SHOULD be able to deal with non-PVP versions.
+--
+-- Perfectly, we'd have these mappings configurable;
+-- but for now they are hardcoded.
+--
+translateGhcVersion :: Version -> String
+translateGhcVersion = prettyShow
+
+translateCabalVersion :: Version -> String
+translateCabalVersion = prettyShow

src/HaskellCI/GitHub.hs

@@ -40,6 +40,7 @@ import HaskellCI.Config.Jobs
 import HaskellCI.Config.PackageScope
 import HaskellCI.Config.Ubuntu
 import HaskellCI.Config.Validity
+import HaskellCI.Ghcup
 import HaskellCI.GitConfig
 import HaskellCI.GitHub.Yaml
 import HaskellCI.HeadHackage
@@ -561,7 +562,7 @@ makeGitHub _argv config@Config {..} gitconfig prj jobs@JobVersions {..} = do
     mainJobName = "linux"
 
     ubuntuVer    = showUbuntu cfgUbuntu
-    cabalFullVer = dispCabalVersion cfgCabalInstallVersion
+    cabalFullVer = maybe "head" translateCabalVersion cfgCabalInstallVersion
 
     Auxiliary {..} = auxiliary config prj jobs
 

src/HaskellCI/GitHub/Yaml.hs

@@ -8,6 +8,7 @@ import HaskellCI.Prelude
 import qualified Data.Map.Strict as M
 
 import HaskellCI.Compiler
+import HaskellCI.Ghcup
 import HaskellCI.List
 import HaskellCI.SetupMethod
 import HaskellCI.Sh
@@ -129,12 +130,20 @@ instance ToYaml GitHubJob where
 
 instance ToYaml GitHubMatrixEntry where
     toYaml GitHubMatrixEntry {..} = ykeyValuesFilt []
-        [ "compiler"        ~> fromString (dispGhcVersion ghmeCompiler)
+        [ "compiler"        ~> fromString compiler
         , "compilerKind"    ~> fromString (compilerKind ghmeCompiler)
         , "compilerVersion" ~> fromString (compilerVersion ghmeCompiler)
         , "setup-method"    ~> toYaml ghmeSetupMethod
         , "allow-failure"   ~> toYaml ghmeAllowFailure
         ]
+      where
+        compiler
+            | GHCUP <- ghmeSetupMethod
+            , GHC v <- ghmeCompiler
+            = "ghc-" ++ translateGhcVersion v
+
+            | otherwise
+            = dispGhcVersion ghmeCompiler
 
 instance ToYaml GitHubStep where
     toYaml GitHubStep {..} = ykeyValuesFilt [] $ buildList $ do