diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 1d29da0..e24845f 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.20250605 +# version: 0.19.20250801 # -# REGENDATA ("0.19.20250605",["github","system-linux-proc.cabal"]) +# REGENDATA ("0.19.20250801",["github","system-linux-proc.cabal"]) # name: Haskell-CI on: @@ -66,8 +66,8 @@ jobs: chmod a+x "$HOME/.ghcup/bin/ghcup" - name: Install cabal-install run: | - "$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) - echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" + "$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV" - name: Install GHC (GHCup) if: matrix.setup-method == 'ghcup' run: | @@ -168,7 +168,11 @@ jobs: touch cabal.project.local echo "packages: ${PKGDIR_system_linux_proc}" >> cabal.project echo "package system-linux-proc" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project + if [ $((HCNUMVER >= 90600)) -ne 0 ] ; then echo "package system-linux-proc" >> cabal.project ; fi + if [ $((HCNUMVER >= 90600)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + if [ $((HCNUMVER >= 90600)) -ne 0 ] ; then echo "package system-linux-proc" >> cabal.project ; fi + if [ $((HCNUMVER >= 90600)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi cat >> cabal.project <> cabal.project.local diff --git a/cabal.project b/cabal.project index 0f6e45c..f387dce 100644 --- a/cabal.project +++ b/cabal.project @@ -7,15 +7,25 @@ tests: True -- Show full test output test-show-details: direct -if impl (ghc >= 9.12) +if impl (ghc >= 9.14) allow-newer: - , attoparsec:ghc-prim + , async:base , boring:base , hashable:base + , hashable:ghc-bignum + , hashable:containers + , hedgehog:time , hedgehog:template-haskell + , hsc2hs:base + , hsc2hs:process , integer-logarithms:base - , integer-logarithms:ghc-prim + , integer-logarithms:ghc-bignum + , lifted-async:base + , primitive:base + , process:base , scientific:base + , scientific:containers , scientific:template-haskell - , text:bytestring - , text:ghc-prim + , tagged:template-haskell + , terminal-size:base + , unix:time diff --git a/system-linux-proc.cabal b/system-linux-proc.cabal index 845e028..fef75c7 100644 --- a/system-linux-proc.cabal +++ b/system-linux-proc.cabal @@ -51,7 +51,6 @@ test-suite test Test.System.Linux.Proc.Hedgehog build-depends: base >= 4.8 && < 5.0 - , directory == 1.3.* , hedgehog >= 1.0 && < 1.6 , pretty-show == 1.10.* , system-linux-proc