re-relax tasty dependency version for i386ancient build

Dependency issues were looking difficult to support tasty-1.2 with that
build. Not using `after` only affects rerunning and limiting tests,
since tasty's concurrency is not used, so this build will just not
support that.

We are probably nearing end of life on this build; it also doesn't
support git-lfs or http-client-restricted. The 2.6.32 kernel it supports
is at this point 13 years old, and stopped being supported by linux LTS
developers 10 years ago. It was supported by RHEL 6.10 through November
2020. At this point, no new hardware should be shipping with this
kernel, but that probably does not stop certian embedded vendors from
shipping it. And there is certainly some hardware still using it. But
the returns from supporting it are diminishing, and the quality of the
build for it is also diminishing.

Sponsored-by: Nicholas Golder-Manning on Patreon

diff --git a/Test.hs b/Test.hs
index d10ef8b4cffd397dac4899b7401c98347c8be9cc..9a2444a6394d6b3f9469c39be8aa4e514ed2e304 100644 (file)
--- a/Test.hs
+++ b/Test.hs
@@ -339,7 +339,12 @@ repoTests note numparts = map mk $ sep
        ]
   where
        mk l = testGroup groupname (initTests : map adddep l)
+#ifdef MIN_VERSION_tasty(1,2)
        adddep = Test.Tasty.after AllSucceed (groupname ++ ".Init Tests")
+#else
+#warning tasty is too old to support limiting or rerunning tests
+       adddep = id
+#endif
        groupname = "Repo Tests " ++ note
        sep = sep' (replicate numparts [])
        sep' (p:ps) (l:ls) = sep' (ps++[l:p]) ls

diff --git a/git-annex.cabal b/git-annex.cabal
index 0a015d44152aedc360ba5edaecb92a34ea9906b6..f18af00ba1024ffc9b6ea0f8261f16293848012c 100644 (file)
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -374,7 +374,7 @@ Executable git-annex
    attoparsec (>= 0.13.2.2),
    concurrent-output (>= 1.10),
    QuickCheck (>= 2.10.0),
-   tasty (>= 1.2),
+   tasty (>= 0.7),
    tasty-hunit,
    tasty-quickcheck,
    tasty-rerun,

diff --git a/standalone/linux/stack-i386ancient.yaml b/standalone/linux/stack-i386ancient.yaml
index db8e9fd14b1d0666ec213149fadb2d80ea21012d..6ef4435cd2dd93bd80216235dd928989cc03b452 100644 (file)
--- a/standalone/linux/stack-i386ancient.yaml
+++ b/standalone/linux/stack-i386ancient.yaml
@@ -18,13 +18,12 @@ extra-deps:
 - IfElse-0.85
 - aws-0.21.1
 - bloomfilter-2.0.1.0
-- tasty-1.2
-- tasty-rerun-1.1.14
+- tasty-1.1.0.4
+- tasty-rerun-1.1.13
 - torrent-10000.1.1
 - sandi-0.5
 - http-client-0.5.14
 - filepath-bytestring-1.4.2.1.6
-- ansi-terminal-0.9
 explicit-setup-deps:
   git-annex: true
 resolver: lts-12.14