Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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 <<EOF
EOF
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(system-linux-proc)$/; }' >> cabal.project.local
Expand Down
20 changes: 15 additions & 5 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion system-linux-proc.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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