aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gröber <dxld@darkboxed.org>2019-09-16 21:23:23 +0200
committerDaniel Gröber <dxld@darkboxed.org>2019-09-29 02:16:25 +0200
commit7ddd09a4862c98dd7115e78d762511dbe1d26e68 (patch)
treec5668fc096d87a191f13373f8d1be926427e495e
parentff39baac5b6572916d68d2979079da588a257f52 (diff)
ghc-session: Remove "stack not installed by CI scripts" error
We include the correct stack version in the CI images now and since the relevant stack version is now released it is easy to install for devs.
-rw-r--r--tests/GhcSession.hs8
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/GhcSession.hs b/tests/GhcSession.hs
index e8eeaa4..e4ae431 100644
--- a/tests/GhcSession.hs
+++ b/tests/GhcSession.hs
@@ -539,13 +539,7 @@ stackBuiltinCabalVersion s_ver g_ver = do
stackCheckCompat :: Version -> Version -> Either SkipReason ()
stackCheckCompat s_ver g_ver =
if| s_ver < parseVer "1.9.4" ->
- if| g_ver >= parseVer "8.2.2" ->
- error $ printf
- "stack-%s is too old, but GHC %s is recent enough to build it.\n\
- \The CI scripts should have installed it! See 25-deps.sh\n"
- (showVersion s_ver) (showVersion g_ver)
- | otherwise ->
- Left $ SkipReason $ "stack-" ++ showVersion s_ver ++ " is too old"
+ Left $ SkipReason $ "stack-" ++ showVersion s_ver ++ " is too old"
| otherwise ->
Right ()