From 2134605bf2c3d68354e265a7fb18d78b73b560a8 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Sat, 28 Jul 2018 14:17:36 -0400
Subject: [PATCH] Drop disable 8.0.2 build

---
 .circleci/config.yml | 14 +-------------
 Makefile             |  6 +++---
 stack-lts-9.21.yaml  |  6 ------
 3 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 stack-lts-9.21.yaml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 842b76c..8f017c9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,20 +34,9 @@ references:
           command: make test
       - run:
           name: Lint
-          command: |
-            if [ "${LINT:-1}" -eq 0 ]; then
-              echo "[LINT=0] Lint step skipped." >&2
-            else
-              make lint
-            fi
+          command: make lint
 
 jobs:
-  build_8.0.2:
-    <<: *stack_build
-    environment:
-      # FIXME: https://circleci.com/gh/thoughtbot/yesod-auth-oauth2/115
-      LINT: "0"
-      STACK_ARGUMENTS: --stack-yaml stack-lts-9.21.yaml
   build_8.2.2:
     <<: *stack_build
     environment:
@@ -63,7 +52,6 @@ workflows:
   version: 2
   builds:
     jobs:
-      # - build_8.0.2
       - build_8.2.2
       - build
       - build_nightly
diff --git a/Makefile b/Makefile
index de8281c..ef41c58 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ setup:
 	stack build $(STACK_ARGUMENTS) \
 	  --flag yesod-auth-oauth2:example \
 	  --dependencies-only --test --no-run-tests
-	stack install $(STACK_ARGUMENTS) hlint weeder
+	stack install $(STACK_ARGUMENTS) --copy-compiler-tool hlint weeder
 
 .PHONY: build
 build:
@@ -23,8 +23,8 @@ test:
 
 .PHONY: lint
 lint:
-	hlint src test
-	weeder .
+	stack exec hlint src test
+	stack exec weeder .
 
 .PHONY: clean
 clean:
diff --git a/stack-lts-9.21.yaml b/stack-lts-9.21.yaml
deleted file mode 100644
index 88e8ecd..0000000
--- a/stack-lts-9.21.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-resolver: lts-9.21
-extra-deps:
-  - load-env-0.1.2
-  - yesod-auth-1.6.1
-  - yesod-core-1.6.1