Skip to content

Commit

Permalink
Merge pull request #4537 from IntersectMBO/jdral/gha-cabal-mismatch
Browse files Browse the repository at this point in the history
GHA: fix cabal version mismatch between build and test job
  • Loading branch information
lehins authored Aug 9, 2024
2 parents 7e65f03 + 2987a5a commit a34f878
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
uses: input-output-hk/actions/haskell@latest
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: 3.10.3.0
cabal-version: 3.12.1.0

- name: Configure to use libsodium
run: |
Expand Down Expand Up @@ -236,7 +236,7 @@ jobs:
uses: input-output-hk/actions/haskell@latest
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: latest
cabal-version: 3.12.1.0

- name: Set up Ruby 2.7
uses: ruby/setup-ruby@v1
Expand Down Expand Up @@ -276,9 +276,13 @@ jobs:
uses: actions/download-artifact@v4
with:
name: state-${{ matrix.ghc }}-${{ matrix.os }}

- name: Unarchive working directory
run: tar -xf state.tar && rm state.tar

- name: Cabal update
run: cabal update

# A dependencies.txt file should have been created by the build job, so we
# check if it exists and is not empty.
- name: Check dependencies to be used as cache keys
Expand All @@ -300,9 +304,6 @@ jobs:
# test job, or otherwise we would start rebuilding all the dependencies.
fail-on-cache-miss: true

- name: Cabal update
run: cabal update

- name: Run tests
run: |
export CARDANO_MAINNET_MIRROR="$(pwd)/epochs"
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
# tools we want in our shell, from hackage
tools =
{
cabal = "3.10.3.0";
cabal = "3.12.1.0";
ghcid = "0.8.9";
}
// lib.optionalAttrs (config.compiler-nix-name == defaultCompiler) {
Expand Down

0 comments on commit a34f878

Please sign in to comment.