Merge pull request #754 from haskell-CI/ghc-9.12-alpha3

GHC-9.12-alpha3
haskell-CI · Nov 21, 2024 · 1010767 · 1010767
2 parents 27f84f6 + df7513d
commit 1010767
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/fixtures/all-versions.github b/fixtures/all-versions.github
@@ -28,9 +28,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.12.0.20241031
+          - compiler: ghc-9.12.0.20241114
             compilerKind: ghc
-            compilerVersion: 9.12.0.20241031
+            compilerVersion: 9.12.0.20241114
             setup-method: ghcup-prerelease
             allow-failure: false
           - compiler: ghc-9.10.1

diff --git a/fixtures/doctest-version.github b/fixtures/doctest-version.github
@@ -28,9 +28,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.12.0.20241031
+          - compiler: ghc-9.12.0.20241114
             compilerKind: ghc
-            compilerVersion: 9.12.0.20241031
+            compilerVersion: 9.12.0.20241114
             setup-method: ghcup-prerelease
             allow-failure: false
           - compiler: ghc-9.10.1

diff --git a/fixtures/doctest.github b/fixtures/doctest.github
@@ -28,9 +28,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.12.0.20241031
+          - compiler: ghc-9.12.0.20241114
             compilerKind: ghc
-            compilerVersion: 9.12.0.20241031
+            compilerVersion: 9.12.0.20241114
             setup-method: ghcup-prerelease
             allow-failure: false
           - compiler: ghc-9.10.1

diff --git a/fixtures/enabled-jobs.github b/fixtures/enabled-jobs.github
@@ -28,9 +28,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.12.0.20241031
+          - compiler: ghc-9.12.0.20241114
             compilerKind: ghc
-            compilerVersion: 9.12.0.20241031
+            compilerVersion: 9.12.0.20241114
             setup-method: ghcup-prerelease
             allow-failure: false
           - compiler: ghc-9.10.1

diff --git a/haskell-ci.cabal b/haskell-ci.cabal
@@ -1,6 +1,6 @@
 cabal-version:      2.2
 name:               haskell-ci
-version:            0.19.20241114
+version:            0.19.20241121
 synopsis:           Cabal package script generator for Travis-CI
 description:
   Script generator (@haskell-ci@) for
@@ -239,4 +239,4 @@ test-suite golden
     , Diff           ^>=0.4.0   || ^>=0.5
     , tasty          ^>=1.4.1   || ^>=1.5
     , tasty-golden   ^>=2.3.1.1
-    , tasty-hunit
+    , tasty-hunit
diff --git a/src/HaskellCI/Config/History.hs b/src/HaskellCI/Config/History.hs
@@ -39,7 +39,7 @@ configHistory =
             , ghcupVanilla    = C.withinVersion (C.mkVersion [9,8,3])
             , ghcupPrerelease = C.orLaterVersion (C.mkVersion [9,12,0])
             }
-    , ver 0 19 2024114 := \cfg -> cfg
+    , ver 0 19 20241114 := \cfg -> cfg
         & field @"cfgSetupMethods" .~ PerSetupMethod
             { hvrPpa          = C.noVersion
             , ghcup           = invertVersionRange (C.withinVersion (C.mkVersion [9,8,3])) /\ C.earlierVersion (C.mkVersion [9,12])
@@ -48,6 +48,8 @@ configHistory =
             }
     , ver 0 19 20241117 := \cfg -> cfg
         & field @"cfgVersionMapping" .~ Map.singleton (mkVersion [9,12,1]) (mkVersion [9,12,0,20241031])
+    , ver 0 19 20241121 := \cfg -> cfg
+        & field @"cfgVersionMapping" .~ Map.singleton (mkVersion [9,12,1]) (mkVersion [9,12,0,20241114])
     ]
   where
     ver x y z = [x, y, z]