From 025a2375bdab9aacafcee2cd087cc6ea382bc494 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Fri, 8 Sep 2017 10:26:40 -0700
Subject: [PATCH] stack: more thorough make test-stackage (test and bench)

---
 Makefile       | 22 +++++++---------------
 stack.yaml     |  3 +--
 stack7.10.yaml |  2 +-
 stack8.0.yaml  |  3 +--
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index f93c640ba..74e2e8c35 100644
--- a/Makefile
+++ b/Makefile
@@ -579,24 +579,16 @@ travistest: \
 	sh -e bin/compile.sh
 	make functest
 
-STACKTESTACTION=test
-#STACKTESTACTION=bench
-#STACKTESTACTION=build
-#STACKTESTACTION=build --dry-run
+STACKAGETESTACTION=test bench
+# STACKAGETESTACTION=build --dry-run
 
 test-stackage: \
-	test-stackage-ghc710 \
-	test-stackage-ghc80 \
-	test-stackage-ghc82 \
+	test-stack7.10.yaml \
+	test-stack8.0.yaml \
+	test-stack.yaml \
 
-test-stackage-ghc710:
-	stack --stack-yaml stack7.10.yaml $(STACKTESTACTION)
-
-test-stackage-ghc80:
-	stack --stack-yaml stack8.0.yaml $(STACKTESTACTION)
-
-test-stackage-ghc82:
-	stack --stack-yaml stack.yaml $(STACKTESTACTION)
+test-stack%yaml:
+	stack --stack-yaml stack$*yaml $(STACKAGETESTACTION)
 
 # test-ghc-%: # bin/hledgerdev.ghc-$* \
 # 	$(call def-help,test-ghc-%,\
diff --git a/stack.yaml b/stack.yaml
index db3ecd7c5..9c91c86ea 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,5 +1,4 @@
 # stack build plan using GHC 8.2.1
-# keep synced with download.md ?
 
 resolver: nightly-2017-09-07
 
@@ -11,4 +10,4 @@ packages:
 - hledger
 - hledger-ui
 - hledger-web
-- hledger-api
\ No newline at end of file
+- hledger-api
diff --git a/stack7.10.yaml b/stack7.10.yaml
index 025310f49..d74de61fb 100644
--- a/stack7.10.yaml
+++ b/stack7.10.yaml
@@ -1,5 +1,5 @@
 # stack build plan using GHC 7.10.3
-# keep synced with download.md
+# This is unlikely to work on OSX Sierra+ due to https://ghc.haskell.org/trac/ghc/ticket/12479
 
 resolver: lts-6.35
 
diff --git a/stack8.0.yaml b/stack8.0.yaml
index 64f5dcfd2..20ac2e178 100644
--- a/stack8.0.yaml
+++ b/stack8.0.yaml
@@ -1,5 +1,4 @@
-# stack build plan using GHC 8.0.2 (this or newer required for osx sierra+)
-# keep synced with download.md
+# stack build plan using GHC 8.0.2
 
 resolver: lts-9.3