Skip to content

Commit

Permalink
Merge pull request #532 from IntersectMBO/mgalazyn/chore/remove-ghc92…
Browse files Browse the repository at this point in the history
…-from-ci

Remove GHC 9.2 from CI. Set 9.6 as default.
  • Loading branch information
carbolymer authored Jan 25, 2024
2 parents 0dee64b + d997316 commit 3d078b9
Show file tree
Hide file tree
Showing 3 changed files with 91 additions and 38 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ jobs:
fail-fast: false
matrix:
# If you edit these versions, make sure the version in the lonely macos-latest job below is updated accordingly
ghc: ["9.2.8", "9.6.3"]
ghc: ["9.6.4"]
cabal: ["3.10.2.1"]
os: [windows-latest, ubuntu-latest]
include:
# Using include, to make sure there will only be one macOS job, even if the matrix gets expanded later on.
# We want a single job, because macOS runners are scarce.
- os: macos-latest
cabal: "3.10.2.1"
ghc: "9.6.3"
ghc: "9.6.4"

env:
# Modify this value to "invalidate" the cabal cache.
CABAL_CACHE_VERSION: "2024-01-18"
CABAL_CACHE_VERSION: "2024-01-24-2"

concurrency:
group: >
Expand Down
113 changes: 83 additions & 30 deletions flake.lock

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

10 changes: 5 additions & 5 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
inherit (nixpkgs) lib;

# see flake `variants` below for alternative compilers
defaultCompiler = "ghc928";
defaultCompiler = "ghc963";
# We use cabalProject' to ensure we don't build the plan for
# all systems.
cabalProject = nixpkgs.haskell-nix.cabalProject' ({config, ...}: {
Expand All @@ -65,14 +65,14 @@
# tools we want in our shell, from hackage
shell.tools =
{
cabal = "3.10.1.0";
cabal = "3.10.2.0";
ghcid = "0.8.8";
}
// lib.optionalAttrs (config.compiler-nix-name == defaultCompiler) {
# tools that work only with default compiler
stylish-haskell = "0.14.4.0";
hlint = "3.5";
haskell-language-server = "2.0.0.0";
haskell-language-server.src = nixpkgs.haskell-nix.sources."hls-2.5";
hlint = "3.6.1";
stylish-haskell = "0.14.5.0";
};
# and from nixpkgs or other inputs
shell.nativeBuildInputs = with nixpkgs; [ gh jq yq-go ];
Expand Down

0 comments on commit 3d078b9

Please sign in to comment.