Skip to content

Commit e415b6e

Browse files
Use ghc-9.14, sync with packcheck (.cirrus.yml)
1 parent c1141d2 commit e415b6e

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

.cirrus.yml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ freebsd_instance:
22
image_family: freebsd-14-3
33

44
task:
5-
name: FreeBSD+ghc-9.10.3+cabal
5+
name: FreeBSD+ghc-9.14.1+cabal
66
env:
77
PACKCHECK_COMMAND: cabal
88

@@ -27,7 +27,7 @@ task:
2727
# ------------------------------------------------------------------------
2828
# For updating see: https://downloads.haskell.org/~ghcup/
2929
GHCUP_VERSION: 0.1.50.2
30-
GHCVER: 9.10.3
30+
GHCVER: 9.14.1
3131

3232
# ------------------------------------------------------------------------
3333
# stack options (if using stack builds)
@@ -56,28 +56,26 @@ task:
5656
# If you have not committed packcheck.sh in your repo at PACKCHECK
5757
# then it is automatically pulled from this URL.
5858
PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
59-
PACKCHECK_GITHUB_COMMIT: "dd6862df527f317fd4987afa523fba3f4fde7e19"
59+
PACKCHECK_GITHUB_COMMIT: "6ee4502650b49cbbdb583fc7a55731738c9303df"
6060

61-
ghcup_cache:
62-
folder: ~/.ghcup
63-
fingerprint_script: echo $GHCUP_VERSION $GHCVER
64-
65-
cabal_packages_cache:
66-
folder: ~/.cabal/packages
61+
cabal_cache:
62+
folder: ~/.cabal
6763
fingerprint_script: echo $GHCVER
6864

69-
cabal_cache:
70-
folder: ~/.cabal/store
65+
# Cabal store is in .local/state/cabal
66+
local_cache:
67+
folder: ~/.local
7168
fingerprint_script: echo $GHCVER
7269

73-
#local_cache:
74-
# folder: ~/.local
75-
# fingerprint_script: echo $GHCVER
70+
ghcup_cache:
71+
folder: ~/.ghcup
72+
fingerprint_script: echo $GHCUP_VERSION $GHCVER
7673

7774
#local_bin_cache:
7875
# folder: ~/.local/bin
7976
# fingerprint_script: echo $HLINT_VERSION
8077

78+
# git is required for cabal files with git URLs
8179
deps_install_script: |
8280
pkg update
8381
pkg install -y gmake

0 commit comments

Comments
 (0)