diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 1128a12c7..83169609f 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20240702 +# version: 0.19.20240708 # -# REGENDATA ("0.19.20240702",["--config=cabal.haskell-ci","cabal.project"]) +# REGENDATA ("0.19.20240708",["--config=cabal.haskell-ci","cabal.project"]) # name: Haskell-CI on: @@ -95,7 +95,7 @@ jobs: apt-get update apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) @@ -223,12 +223,6 @@ jobs: if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package lens-properties" >> cabal.project ; fi if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi cat >> cabal.project <> cabal.project.local diff --git a/cabal.project b/cabal.project index 9eccc0224..d0f2215d0 100644 --- a/cabal.project +++ b/cabal.project @@ -3,10 +3,4 @@ packages: . ./lens-properties -- TODO: remove this when dependencies catch up -allow-newer: aeson-2.2.3.0:hashable -allow-newer: semialign-1.3.1:hashable -allow-newer: strict-0.5.1:hashable -allow-newer: these-1.2.1:hashable -allow-newer: unordered-containers-0.2.20:hashable -allow-newer: witherable-0.5:hashable allow-newer: cassava-0.5.3.1:hashable