add pre-release support fot 9.8.3 (#561)

digital-asset · Oct 24, 2024 · e470e18 · e470e18
1 parent a4e4560
commit e470e18
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 0 deletions.
diff --git a/CI.hs b/CI.hs
@@ -47,6 +47,7 @@ data GhcFlavor
   | GhcMaster String
   | Ghc9121
   | Ghc9101
+  | Ghc983
   | Ghc982
   | Ghc981
   | Ghc966
@@ -103,6 +104,7 @@ ghcFlavorOpt :: GhcFlavor -> String
 ghcFlavorOpt = \case
   Ghc9121 -> "--ghc-flavor ghc-9.12.1"
   Ghc9101 -> "--ghc-flavor ghc-9.10.1"
+  Ghc983 -> "--ghc-flavor ghc-9.8.3"
   Ghc982 -> "--ghc-flavor ghc-9.8.2"
   Ghc981 -> "--ghc-flavor ghc-9.8.1"
   Ghc966 -> "--ghc-flavor ghc-9.6.6"
@@ -166,6 +168,7 @@ genVersionStr flavor suffix =
       GhcMaster _ -> "0"
       Ghc9121 -> "9.12.1"
       Ghc9101 -> "9.10.1"
+      Ghc983 -> "9.8.3"
       Ghc982 -> "9.8.2"
       Ghc981 -> "9.8.1"
       Ghc966 -> "9.6.6"
@@ -233,6 +236,7 @@ parseOptions =
     readFlavor = Opts.eitherReader $ \case
       "ghc-9.12.1" -> Right Ghc9121
       "ghc-9.10.1" -> Right Ghc9101
+      "ghc-9.8.3" -> Right Ghc983
       "ghc-9.8.2" -> Right Ghc982
       "ghc-9.8.1" -> Right Ghc981
       "ghc-9.6.6" -> Right Ghc966
@@ -492,6 +496,7 @@ buildDists ghcFlavor noGhcCheckout noBuilds versionSuffix = do
     branch = \case
       Ghc9121 -> "ghc-9.12"
       Ghc9101 -> "ghc-9.10.1-release"
+      Ghc983 -> "ghc-9.8"
       Ghc982 -> "ghc-9.8.2-release"
       Ghc981 -> "ghc-9.8.1-release"
       Ghc966 -> "ghc-9.6.6-release"

diff --git a/examples/ghc-lib-test-utils/src/TestUtils.hs b/examples/ghc-lib-test-utils/src/TestUtils.hs
@@ -57,6 +57,7 @@ data GhcVersion
   | Ghc966
   | Ghc981
   | Ghc982
+  | Ghc983
   | Ghc9101
   | Ghc9121
   | GhcMaster
@@ -69,6 +70,7 @@ showGhcVersion :: GhcVersion -> String
 showGhcVersion = \case
   Ghc9121 -> "ghc-9.12.1"
   Ghc9101 -> "ghc-9.10.1"
+  Ghc983 -> "ghc-9.8.3"
   Ghc982 -> "ghc-9.8.2"
   Ghc981 -> "ghc-9.8.1"
   Ghc961 -> "ghc-9.6.1"
@@ -112,6 +114,7 @@ readFlavor =
     -- ghc-9.10
     "ghc-9.10.1" -> Just Ghc9101
     -- ghc-9.8
+    "ghc-9.8.3" -> Just Ghc983
     "ghc-9.8.2" -> Just Ghc982
     "ghc-9.8.1" -> Just Ghc981
     -- ghc-9.6

diff --git a/ghc-lib-gen/src/Ghclibgen.hs b/ghc-lib-gen/src/Ghclibgen.hs
@@ -1176,6 +1176,7 @@ baseBounds = \case
   Ghc981 -> "base >= 4.17 && < 4.19.1" -- [ghc-9.4.1, ghc-9.8.2)
   -- base-4.19.1.0
   Ghc982 -> "base >= 4.17 && < 4.20" -- [ghc-9.4.1, ghc-9.10.1)
+  Ghc983 -> "base >= 4.17 && < 4.20" -- [ghc-9.4.1, ghc-9.10.1)
   -- base-4.20.0.0
   Ghc9101 -> "base >= 4.18 && < 4.21" -- [ghc-9.6.1, ghc-9.12.1)
   -- base-4.20.0.0 TODO bump

diff --git a/ghc-lib-gen/src/GhclibgenFlavor.hs b/ghc-lib-gen/src/GhclibgenFlavor.hs
@@ -49,6 +49,7 @@ data GhcFlavor
   | Ghc966
   | Ghc981
   | Ghc982
+  | Ghc983
   | Ghc9101
   | Ghc9121
   | GhcMaster

diff --git a/ghc-lib-gen/src/GhclibgenOpts.hs b/ghc-lib-gen/src/GhclibgenOpts.hs
@@ -98,6 +98,7 @@ readFlavor = eitherReader $ \case
   -- ghc-9.10
   "ghc-9.10.1" -> Right Ghc9101
   -- ghc-9.8
+  "ghc-9.8.3" -> Right Ghc983
   "ghc-9.8.2" -> Right Ghc982
   "ghc-9.8.1" -> Right Ghc981
   -- ghc-9.6