Merge pull request #675 from haskell-CI/ghc-9.8.1-alpha2

Add GHC-9.8.1-alpha2
haskell-CI · Aug 11, 2023 · 43f3361 · 43f3361
2 parents 6fac7ac + a6f2992
commit 43f3361
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 25 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -30,14 +30,14 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.4.5
+          - compiler: ghc-9.4.6
             compilerKind: ghc
-            compilerVersion: 9.4.5
+            compilerVersion: 9.4.6
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.2.7
+          - compiler: ghc-9.2.8
             compilerKind: ghc
-            compilerVersion: 9.2.7
+            compilerVersion: 9.2.8
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.0.2

diff --git a/cabal-install-parsers/cabal-install-parsers.cabal b/cabal-install-parsers/cabal-install-parsers.cabal
@@ -31,8 +31,8 @@ tested-with:
    || ==8.8.4
    || ==8.10.7
    || ==9.0.2
-   || ==9.2.7
-   || ==9.4.5
+   || ==9.2.8
+   || ==9.4.6
 
 extra-source-files:
   Changelog.md

diff --git a/fixtures/all-versions.github b/fixtures/all-versions.github
@@ -33,9 +33,9 @@ jobs:
             compilerVersion: "8.4"
             setup-method: hvr-ppa
             allow-failure: false
-          - compiler: ghc-9.8.1-alpha1
+          - compiler: ghc-9.8.0.20230809
             compilerKind: ghc
-            compilerVersion: 9.8.1-alpha1
+            compilerVersion: 9.8.0.20230809
             setup-method: ghcup
             allow-failure: true
           - compiler: ghc-9.6.2

diff --git a/fixtures/enabled-jobs.github b/fixtures/enabled-jobs.github
@@ -33,9 +33,9 @@ jobs:
             compilerVersion: "8.4"
             setup-method: hvr-ppa
             allow-failure: false
-          - compiler: ghc-9.8.1-alpha1
+          - compiler: ghc-9.8.0.20230809
             compilerKind: ghc
-            compilerVersion: 9.8.1-alpha1
+            compilerVersion: 9.8.0.20230809
             setup-method: ghcup
             allow-failure: true
           - compiler: ghc-9.6.2

diff --git a/haskell-ci.cabal b/haskell-ci.cabal
@@ -1,6 +1,6 @@
 cabal-version:      2.2
 name:               haskell-ci
-version:            0.17.20230808
+version:            0.17.20230811
 synopsis:           Cabal package script generator for Travis-CI
 description:
   Script generator (@haskell-ci@) for
@@ -39,8 +39,8 @@ tested-with:
    || ==8.8.4
    || ==8.10.7
    || ==9.0.2
-   || ==9.2.7
-   || ==9.4.5
+   || ==9.2.8
+   || ==9.4.6
 
 extra-source-files: CHANGELOG.md
 extra-source-files:

diff --git a/haskell-ci.sh b/haskell-ci.sh
@@ -19,7 +19,7 @@ fi
 
 CFG_CABAL_STORE_CACHE=""
 CFG_CABAL_REPO_CACHE=""
-CFG_JOBS="9.4.5 9.2.7 9.0.2 8.10.7 8.8.4 8.6.5 8.4.4 8.2.2"
+CFG_JOBS="9.4.6 9.2.8 9.0.2 8.10.7 8.8.4 8.6.5 8.4.4 8.2.2"
 CFG_CABAL_UPDATE=false
 
 SCRIPT_NAME=$(basename "$0")

diff --git a/src/HaskellCI/Compiler.hs b/src/HaskellCI/Compiler.hs
@@ -185,8 +185,8 @@ dispGhcVersionShort (GHCJS v) = "ghcjs-" ++ C.prettyShow v
 dispCabalVersion :: Maybe Version -> String
 dispCabalVersion = maybe "head" C.prettyShow
 
-ghcAlpha :: Maybe (Version, String)
-ghcAlpha = Just (mkVersion [9,8,1], "9.8.1-alpha1")
+ghcAlpha :: Maybe (Version, Version)
+ghcAlpha = Just (mkVersion [9,8,1], mkVersion [9,8,0,20230809])
 
 -- | Alphas, RCs and HEAD.
 previewGHC
@@ -213,9 +213,9 @@ ghcMajVer v
 -- | Map compiler version to one available to download.
 --
 -- This way we can map e.g. 9.4.1 to 9.4.0.20220501 i.e. a prerelease.
-translateCompilerVersion :: CompilerVersion -> (String, String, String)
+translateCompilerVersion :: CompilerVersion -> CompilerVersion
 translateCompilerVersion (GHC v)
     | Just (u, w) <- ghcAlpha
     , v == u
-    = ("ghc-" ++ w, "ghc", w)
-translateCompilerVersion v = (dispGhcVersion v, compilerKind v, compilerVersion v)
+    = GHC w
+translateCompilerVersion v = v
diff --git a/src/HaskellCI/GitHub/Yaml.hs b/src/HaskellCI/GitHub/Yaml.hs
@@ -7,6 +7,7 @@ import HaskellCI.Prelude
 
 import qualified Data.Map.Strict as M
 
+import HaskellCI.Compiler
 import HaskellCI.List
 import HaskellCI.Sh
 import HaskellCI.YamlSyntax
@@ -45,7 +46,7 @@ data SetupMethod = HVRPPA | GHCUP
   deriving Show
 
 data GitHubMatrixEntry = GitHubMatrixEntry
-    { ghmeCompiler     :: (String, String, String) -- CompilerVersion
+    { ghmeCompiler     :: CompilerVersion
     , ghmeAllowFailure :: Bool
     , ghmeSetupMethod  :: SetupMethod
     }
@@ -134,14 +135,12 @@ instance ToYaml SetupMethod where
 
 instance ToYaml GitHubMatrixEntry where
     toYaml GitHubMatrixEntry {..} = ykeyValuesFilt []
-        [ "compiler"        ~> fromString comp
-        , "compilerKind"    ~> fromString ki
-        , "compilerVersion" ~> fromString ver
+        [ "compiler"        ~> fromString (dispGhcVersion ghmeCompiler)
+        , "compilerKind"    ~> fromString (compilerKind ghmeCompiler)
+        , "compilerVersion" ~> fromString (compilerVersion ghmeCompiler)
         , "setup-method"    ~> toYaml ghmeSetupMethod
         , "allow-failure"   ~> toYaml ghmeAllowFailure
         ]
-       where
-        (comp, ki, ver) = ghmeCompiler
 
 instance ToYaml GitHubStep where
     toYaml GitHubStep {..} = ykeyValuesFilt [] $