From f89709926e8c79810281e031d779179fc3df7f72 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Sun, 5 Jan 2025 05:15:48 +0200 Subject: [PATCH] Remove allow-newer from cabal.project --- .github/workflows/haskell-ci.yml | 10 ++++------ cabal.project | 3 --- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index fd8c84f..9f09969 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.20241223 +# version: 0.19.20250104 # -# REGENDATA ("0.19.20241223",["github","cabal.project"]) +# REGENDATA ("0.19.20250104",["github","cabal.project"]) # name: Haskell-CI on: @@ -95,8 +95,8 @@ jobs: chmod a+x "$HOME/.ghcup/bin/ghcup" - name: Install cabal-install run: | - "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) - echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" + "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1 || (cat "$HOME"/.ghcup/logs/*.* && false) + echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1 -vnormal+nowrap" >> "$GITHUB_ENV" - name: Install GHC (GHCup) if: matrix.setup-method == 'ghcup' run: | @@ -199,8 +199,6 @@ jobs: echo "package binary-orphans" >> cabal.project echo " ghc-options: -Werror=missing-methods" >> cabal.project cat >> cabal.project <> cabal.project.local cat cabal.project diff --git a/cabal.project b/cabal.project index aa657b9..7ef286b 100644 --- a/cabal.project +++ b/cabal.project @@ -1,5 +1,2 @@ packages: . tests: True - -allow-newer: quickcheck-instances:base -allow-newer: these:base