From d089f1b0d10b755766a891ece5282d6fe38fb258 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Thu, 3 Jun 2021 14:05:02 -1000 Subject: [PATCH] tools: ghc 8.6 is now the oldest, drop older stack configs --- .github/workflows/linux.yml | 10 +---- .github/workflows/mac.yml | 5 +-- .github/workflows/push.yml | 4 +- stack7.10.yaml.disabled | 83 ------------------------------------ stack8.0.yaml | 85 ------------------------------------- stack8.2.yaml | 47 -------------------- 6 files changed, 4 insertions(+), 230 deletions(-) delete mode 100644 stack7.10.yaml.disabled delete mode 100644 stack8.0.yaml delete mode 100644 stack8.2.yaml diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index e26d2e9c8..390ff145f 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -72,14 +72,10 @@ jobs: fail-fast: false matrix: plan: - # GHC 8.0 is still supported but we don't have a build plan for hledger-web, let it go - # XXX func tests in bin (see shelltest below) are run only with GHC 8.2 for now - # - { ghc: "80" , stack: "stack --stack-yaml=stack8.0.yaml" } - - { ghc: "82" , stack: "stack --stack-yaml=stack8.2.yaml" } - # - { ghc: "84" , stack: "stack --stack-yaml=stack8.4.yaml" } - # - { ghc: "86" , stack: "stack --stack-yaml=stack8.6.yaml" } + - { ghc: "86" , stack: "stack --stack-yaml=stack8.6.yaml" } # - { ghc: "88" , stack: "stack --stack-yaml=stack.yaml" } # - { ghc: "810" , stack: "stack --stack-yaml=stack8.10.yaml" } + # - { ghc: "90" , stack: "stack --stack-yaml=stack9.0.yaml" } steps: @@ -218,8 +214,6 @@ jobs: export PATH=~/.local/bin:$PATH COLUMNS=80 $stack exec -- shelltest --execdir -j16 hledger/test -x /_ -x /addons # XXX run the bin/ func tests corresponding to the GHC version enabled above, only - # XXX it's actually too hard to make this reliable for CI right now - # COLUMNS=80 $stack exec -- shelltest --execdir -j16 bin/_scripts8.2.test - name: Test haddock generation env: diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index fe1b9ba24..cce2ce7f1 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -41,13 +41,11 @@ jobs: fail-fast: false matrix: plan: - # - { ghc: "80" , stack: "stack --stack-yaml=stack8.0.yaml" } - # - { ghc: "82" , stack: "stack --stack-yaml=stack8.2.yaml" } - # - { ghc: "84" , stack: "stack --stack-yaml=stack8.4.yaml" } # - { ghc: "86" , stack: "stack --stack-yaml=stack8.6.yaml" } # - { ghc: "88" , stack: "stack --stack-yaml=stack8.8.yaml" } - { ghc: "810" , stack: "stack --stack-yaml=stack.yaml" } # XXX func tests in bin should be run only with GHC 8.10 for now (see shelltest below) + # - { ghc: "90" , stack: "stack --stack-yaml=stack9.0.yaml" } steps: @@ -161,7 +159,6 @@ jobs: run: | export PATH=~/.local/bin:$PATH COLUMNS=80 $stack exec -- shelltest --execdir -j16 hledger/test -x /_ -x /addons # bin - # XXX func tests in bin are run only with GHC 8.2 for now # artifacts: diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 9077e1a4c..80e825b7e 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -37,12 +37,10 @@ jobs: fail-fast: false matrix: plan: - # - { ghc: "80" , stack: "stack --stack-yaml=stack8.0.yaml" } - # - { ghc: "82" , stack: "stack --stack-yaml=stack8.2.yaml" } - # - { ghc: "84" , stack: "stack --stack-yaml=stack8.4.yaml" } # - { ghc: "86" , stack: "stack --stack-yaml=stack8.6.yaml" } # - { ghc: "88" , stack: "stack --stack-yaml=stack8.8.yaml" } - { ghc: "810" , stack: "stack --stack-yaml=stack.yaml" } + # - { ghc: "90" , stack: "stack --stack-yaml=stack9.0.yaml" } steps: diff --git a/stack7.10.yaml.disabled b/stack7.10.yaml.disabled deleted file mode 100644 index 7f4201994..000000000 --- a/stack7.10.yaml.disabled +++ /dev/null @@ -1,83 +0,0 @@ -# 201909: disabled due to hassles with MonadFail in JournalReader.hs. -# Feel free to work on this if you still need GHC 7 support. - -# stack build plan using GHC 7.10.3 -# This is unlikely to work on OSX Sierra+ due to https://ghc.haskell.org/trac/ghc/ticket/12479 - -resolver: lts-6.35 - -packages: -- hledger-lib -- hledger -# 20181024: hledger-ui plan has stopped working due to some change related to config-ini -# (we need megaparsec 7, only config-ini's 0.2.3.0 version allows that, but it requires a newer base/GHC). -#- hledger-ui -- hledger-web - -extra-deps: -# avoid no hashable instance for AccountName from doctests -- hashtables-1.2.3.1 -# Many newer versions to allow using the latest base-compat with all ghc versions. -# This is just the first workable install plan I found. -- adjunctions-4.4 -- aeson-1.3.1.1 -- aeson-compat-0.3.7.1 -- attoparsec-0.13.2.2 -- attoparsec-iso8601-1.0.0.0 -- base-compat-0.10.1 -- base-compat-batteries-0.10.1 -- base-orphans-0.7 -- bifunctors-5.5.2 -- brick-0.37.1 -- cassava-megaparsec-2.0.0 -- config-ini-0.2.3.0 -- criterion-1.4.1.0 -- data-clist-0.1.2.1 -- directory-1.2.7.0 -- doctest-0.16.0 -- exceptions-0.10.0 -- extra-1.6.17 -- fgl-5.5.4.0 -- free-5.0.2 -- generics-sop-0.3.2.0 -- Glob-0.9.2 -- hashable-1.2.7.0 -- http-media-0.7.1.2 -- http-types-0.12.1 -- insert-ordered-containers-0.2.1.0 -- integer-logarithms-1.0.2.1 -- kan-extensions-5.1 -- lens-4.16.1 -- math-functions-0.2.1.0 -- megaparsec-7.0.1 -- microstache-1.0.1.1 -- mmorph-1.1.2 -- monad-control-1.0.2.3 -- network-2.6.3.5 -- optparse-applicative-0.14.2.0 -- parser-combinators-1.0.0 -- persistent-2.7.0 -- persistent-template-2.5.4 -- process-1.2.3.0 -- profunctors-5.2.2 -- resourcet-1.1.11 -- scientific-0.3.6.2 -- semigroupoids-5.2.2 -- semigroups-0.18.4 -- singleton-bool-0.1.4 -- statistics-0.14.0.2 -- tagged-0.8.5 -- text-1.2.3.0 -- text-zipper-0.10.1 -- th-abstraction-0.2.6.0 -- transformers-compat-0.6.1.4 -- unliftio-core-0.1.1.0 -- unordered-containers-0.2.9.0 -- vty-5.21 -- word-wrap-0.4.1 -- yesod-persistent-1.4.2 - -# hledger-ui -# newer fsnotify has a different api and may be more robust -- fsnotify-0.3.0.1 -- shelly-1.7.2 diff --git a/stack8.0.yaml b/stack8.0.yaml deleted file mode 100644 index a8f4972c5..000000000 --- a/stack8.0.yaml +++ /dev/null @@ -1,85 +0,0 @@ -# stack build plan using GHC 8.0.2 - -resolver: lts-9.21 - -packages: -- hledger-lib -- hledger -- hledger-ui -#- hledger-web # disabled for now, can't find an install plan that works - -extra-deps: -# Many newer versions to allow using the latest base-compat. -# This is just the first workable install plan I found. -# Some of these were for hledger-api and can be removed, -# some of them are for hledger-web. -- aeson-1.3.1.1 -- aeson-compat-0.3.7.1 -- aeson-pretty-0.8.8 -- ansi-terminal-0.10.2 -- ansi-wl-pprint-0.6.9 -- attoparsec-0.13.2.2 -- attoparsec-iso8601-1.0.0.0 -- base-compat-0.10.1 -- base-compat-batteries-0.10.1 -- bifunctors-5.5.2 -- binary-0.8.8.0 -- brick-0.23 -- cabal-doctest-1.0.8 -- cassava-megaparsec-2.0.0 -- conduit-1.3.2 -- conduit-extra-1.3.0 -- config-ini-0.2.3.0 -- containers-0.5.11.0 -- criterion-1.4.1.0 -- Decimal-0.5.1 -- directory-1.3.2.2 # avoid hanging with windows symlinks https://github.com/simonmichael/hledger/issues/791 -- extra-1.6.17 -- fast-logger-2.4.17 -- fgl-5.5.4.0 -- fsnotify-0.3.0.1 # newer fsnotify has a different api and may be more robust -- generics-sop-0.3.2.0 -- Glob-0.9.2 -- hashable-1.2.7.0 -- hashtables-1.2.3.1 # avoid no hashable instance for AccountName from doctests -- http-client-0.5.8 -- http-media-0.7.1.2 -- http-types-0.12.1 -- insert-ordered-containers-0.2.1.0 -- lens-4.16.1 -- math-functions-0.3.3.0 -- megaparsec-7.0.1 -- microstache-1.0.1.1 -- mmorph-1.1.2 -- network-2.6.3.5 -- optparse-applicative-0.15.1.0 -- parser-combinators-1.0.0 -- persistent-template-2.5.4 -- process-1.4.3.0 -- scientific-0.3.6.2 -- servant-0.13.0.1 -- servant-server-0.13.0.1 -- servant-swagger-1.1.5 -- singleton-bool-0.1.4 -- statistics-0.14.0.2 -- streaming-commons-0.2.1.2 -- swagger2-2.2.2 -- tasty-1.2.3 -- tasty-hunit-0.10.0.2 -- text-1.2.3.0 -- typed-process-0.2.6.0 -- unix-time-0.4.7 -- unordered-containers-0.2.9.0 -- wai-extra-3.0.22.1 -- wai-handler-launch-3.0.3.1 -- wai-logger-2.3.5 -- warp-3.2.15 -- wcwidth-0.0.2 -- word-wrap-0.4.1 -- mono-traversable-1.0.12.0 -- resourcet-1.2.4 -- http-conduit-1.3.0 -- monad-logger-0.3.28 -- pretty-simple-4.0.0.0 -- prettyprinter-1.7.0 -- prettyprinter-ansi-terminal-1.1.2 diff --git a/stack8.2.yaml b/stack8.2.yaml deleted file mode 100644 index 63f154ab4..000000000 --- a/stack8.2.yaml +++ /dev/null @@ -1,47 +0,0 @@ -# stack build plan using GHC 8.2.2 - -nix: - pure: false - packages: [perl gmp ncurses zlib] - -resolver: lts-11.22 - -packages: -- hledger-lib -- hledger -- hledger-ui -- hledger-web - -# TODO: some of these were for hledger-api and can be removed -extra-deps: -# use the latest base-compat with all ghc versions -- aeson-1.3.1.1 -- ansi-terminal-0.10.3 -- base-compat-0.10.1 -- base-compat-batteries-0.10.1 -- cassava-megaparsec-2.0.0 -- config-ini-0.2.3.0 -- criterion-1.4.1.0 -- doctest-0.16.3 -- megaparsec-7.0.1 -- parser-combinators-1.0.0 -- process-1.6.5.1 -- swagger2-2.2.2 -# avoid no hashable instance for AccountName from doctests -- hashtables-1.2.3.1 -# avoid https://github.com/simonmichael/hledger/issues/791 -- directory-1.3.2.2 -# hledger-ui -# newer fsnotify has a different api and may be more robust -- fsnotify-0.3.0.1 -- tasty-1.2.3 -- tasty-hunit-0.10.0.2 -- wcwidth-0.0.2 -- ansi-wl-pprint-0.6.9 -- wai-handler-launch-3.0.3.1 -- streaming-commons-0.2.1.2 -- network-2.7.0.0 -- math-functions-0.3.3.0 -- pretty-simple-4.0.0.0 -- prettyprinter-1.7.0 -- prettyprinter-ansi-terminal-1.1.2