Skip to content

Commit

Permalink
Nix/Hydra/GHA: add GHC 9.10, drop GHC 9.8 (#1188)
Browse files Browse the repository at this point in the history
Also drop GHC 9.8 as it is broken due to shipping a buggy `stm` version,
see input-output-hk/io-sim#166.
  • Loading branch information
amesgen authored Aug 15, 2024
2 parents 85f7348 + cfa8d08 commit 330bfa5
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["8.10.7", "9.6.6", "9.8.2", "9.10.1"]
ghc: ["8.10.7", "9.6.6", "9.10.1"]
variant: [default, no-thunks]
test-set: [all, no-thunks-safe]
exclude:
Expand Down
2 changes: 1 addition & 1 deletion cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ index-state:
-- Bump this if you need newer packages from Hackage
, hackage.haskell.org 2024-07-23T00:03:37Z
-- Bump this if you need newer packages from CHaP
, cardano-haskell-packages 2024-07-24T06:25:44Z
, cardano-haskell-packages 2024-08-15T10:40:33Z

packages:
ouroboros-consensus
Expand Down
87 changes: 52 additions & 35 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
default = ghc96;
ghc96 = hydraJobs.native.haskell96.devShell;
ghc96-profiled = hydraJobs.native.haskell96.devShellProfiled;
ghc98 = hydraJobs.native.haskell98.devShell;
ghc98-profiled = hydraJobs.native.haskell98.devShellProfiled;
ghc910 = hydraJobs.native.haskell910.devShell;
ghc910-profiled = hydraJobs.native.haskell910.devShellProfiled;

website = pkgs.mkShell {
packages = [ pkgs.nodejs pkgs.yarn ];
Expand Down
4 changes: 2 additions & 2 deletions nix/ci.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ let
(mkHaskellJobsFor pkgs.hsPkgs.projectVariants.ghc810)
[ "checks" "devShell" "devShellProfiled" ];

# also already test GHC 9.8, but only on Linux to reduce CI load
haskell98 = mkHaskellJobsFor pkgs.hsPkgs.projectVariants.ghc98;
# also already test GHC 9.10, but only on Linux to reduce CI load
haskell910 = mkHaskellJobsFor pkgs.hsPkgs.projectVariants.ghc910;
};
} // lib.optionalAttrs (buildSystem == "x86_64-linux") {
windows = {
Expand Down
2 changes: 1 addition & 1 deletion nix/haskell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ let
compiler-nix-name = "ghc966";
flake.variants = {
ghc810 = { compiler-nix-name = lib.mkForce "ghc8107"; };
ghc98 = { compiler-nix-name = lib.mkForce "ghc982"; };
ghc910 = { compiler-nix-name = lib.mkForce "ghc9101"; };
};
inputMap = {
"https://chap.intersectmbo.org/" = inputs.CHaP;
Expand Down

0 comments on commit 330bfa5

Please sign in to comment.