Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add pre-release support for 9.8.3 #561

Merged
merged 1 commit into from
Oct 24, 2024
Merged

add pre-release support for 9.8.3 #561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CI.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ data GhcFlavor
| GhcMaster String
| Ghc9121
| Ghc9101
| Ghc983
| Ghc982
| Ghc981
| Ghc966
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions examples/ghc-lib-test-utils/src/TestUtils.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ data GhcVersion
| Ghc966
| Ghc981
| Ghc982
| Ghc983
| Ghc9101
| Ghc9121
| GhcMaster
Expand All @@ -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"
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ghc-lib-gen/src/Ghclibgen.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1165,6 +1165,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
Expand Down
1 change: 1 addition & 0 deletions ghc-lib-gen/src/GhclibgenFlavor.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ data GhcFlavor
| Ghc966
| Ghc981
| Ghc982
| Ghc983
| Ghc9101
| Ghc9121
| GhcMaster
Expand Down
1 change: 1 addition & 0 deletions ghc-lib-gen/src/GhclibgenOpts.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading