diff --git a/.github/workflows/github-page.yml b/.github/workflows/github-page.yml index 2bfe19bd8ec..384ecc3ac7c 100644 --- a/.github/workflows/github-page.yml +++ b/.github/workflows/github-page.yml @@ -31,17 +31,17 @@ jobs: - name: Fetch nix cache and update cabal indices run: | - nix develop .\#project.x86_64-linux.projectVariants.ghc964.shell --command \ + nix develop .\#project.x86_64-linux.projectVariants.ghc96.shell --command \ cabal update - name: Build whole project run: | - nix develop .\#project.x86_64-linux.projectVariants.ghc964.shell --command \ + nix develop .\#project.x86_64-linux.projectVariants.ghc96.shell --command \ cabal build all - name: Build documentation run: | - nix develop .\#project.x86_64-linux.projectVariants.ghc964.shell --command \ + nix develop .\#project.x86_64-linux.projectVariants.ghc96.shell --command \ cabal haddock-project --local --output=./haddocks --internal --foreign-libraries - name: Compress haddocks diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 3b9bf800118..ea9d34ac183 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -26,7 +26,7 @@ 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.6.4", "9.8.1"] + ghc: ["9.6", "9.8"] cabal: ["3.10.2.1"] os: [windows-latest, ubuntu-latest] include: @@ -34,7 +34,7 @@ jobs: # We want a single job, because macOS runners are scarce. - os: macos-latest cabal: "3.10.2.1" - ghc: "9.6.4" + ghc: "9.6" env: # Modify this value to "invalidate" the cabal cache. diff --git a/nix/haskell.nix b/nix/haskell.nix index 229b2331f62..ab23d4e0db7 100644 --- a/nix/haskell.nix +++ b/nix/haskell.nix @@ -22,7 +22,7 @@ let name = "cardano-node"; compiler-nix-name = lib.mkDefault "ghc8107"; # extra-compilers - flake.variants = lib.genAttrs ["ghc964"] (x: {compiler-nix-name = x;}); + flake.variants = lib.genAttrs ["ghc96"] (x: {compiler-nix-name = x;}); cabalProjectLocal = '' repository cardano-haskell-packages-local url: file:${CHaP}