From 0ea2c5146aec438673848ef04a8b7237cb9cb85e Mon Sep 17 00:00:00 2001
From: sdiehl <stephen.m.diehl@gmail.com>
Date: Sat, 4 Jan 2020 17:54:59 +0000
Subject: [PATCH] Seperate Stack and Cabal scripts

---
 .github/workflows/{haskell.yml => cabal.yml} |  4 ++--
 .github/workflows/stack.yml                  | 19 ++++++++++---------
 README.md                                    |  3 ++-
 3 files changed, 14 insertions(+), 12 deletions(-)
 rename .github/workflows/{haskell.yml => cabal.yml} (91%)

diff --git a/.github/workflows/haskell.yml b/.github/workflows/cabal.yml
similarity index 91%
rename from .github/workflows/haskell.yml
rename to .github/workflows/cabal.yml
index 10e0a678e..42efe0d9f 100644
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/cabal.yml
@@ -1,4 +1,4 @@
-name: Haskell CI
+name: Cabal CI
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    name: ghc ${{ matrix.ghc }}
+    name: cabal ${{ matrix.ghc }}
     runs-on: ubuntu-16.04
     strategy:
       matrix:
diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml
index 6b3c3f0b4..5ccade04a 100644
--- a/.github/workflows/stack.yml
+++ b/.github/workflows/stack.yml
@@ -7,18 +7,19 @@ on:
 
 jobs:
   build:
+    name: stack ${{ matrix.resolver }}
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest]
         # use this to specify what resolvers and ghc to use
         plan:
-        - { build: stack, resolver: "--resolver lts-9"  }    # ghc-8.0.2
-        - { build: stack, resolver: "--resolver lts-10"  }   # ghc-8.2.2
-        - { build: stack, resolver: "--resolver lts-11"  }   # ghc-8.2.2
-        - { build: stack, resolver: "--resolver lts-12"  }   # ghc-8.4.4
-        - { build: stack, resolver: "--resolver lts-13"  }   # redundant because lts-14 checks ghc-8.6 already
-        - { build: stack, resolver: "--resolver lts-14"  }   # ghc-8.6.5
-        - { build: stack, resolver: "--resolver nightly" }
+        - { build: stack, resolver: "lts-9"  }    # ghc-8.0.2
+        - { build: stack, resolver: "lts-10"  }   # ghc-8.2.2
+        - { build: stack, resolver: "lts-11"  }   # ghc-8.2.2
+        - { build: stack, resolver: "lts-12"  }   # ghc-8.4.4
+        - { build: stack, resolver: "lts-13"  }   # redundant because lts-14 checks ghc-8.6 already
+        - { build: stack, resolver: "lts-14"  }   # ghc-8.6.5
+        - { build: stack, resolver: "nightly" }
         # - { build: stack, resolver: ""                   }
         # use this to include any dependencies from OS package managers
         include: []
@@ -56,7 +57,7 @@ jobs:
         set -ex
         case "$BUILD" in
           stack)
-            stack --no-terminal --install-ghc $ARGS test --bench --only-dependencies
+            stack --no-terminal --install-ghc --resolver $ARGS test --bench --only-dependencies
             ;;
           cabal)
             cabal --version
@@ -75,7 +76,7 @@ jobs:
         set -ex
         case "$BUILD" in
           stack)
-            stack --no-terminal $ARGS test --bench --no-run-benchmarks --haddock --no-haddock-deps
+            stack --no-terminal --resolver $ARGS test --bench --no-run-benchmarks --haddock --no-haddock-deps
             ;;
           cabal)
             PACKAGES=$(stack --install-ghc query locals | grep '^ *path' | sed 's@^ *path:@@')
diff --git a/README.md b/README.md
index a37212e4e..f02c7311c 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,8 @@ Protolude
 =========
 
 [![Build Status](https://travis-ci.org/protolude/protolude.svg?branch=master)](https://travis-ci.org/sdiehl/protolude)
-[![Build Status](https://github.com/protolude/protolude/workflows/Haskell%20CI/badge.svg)](https://github.com/protolude/protolude/actions)
+[![Build Status](https://github.com/protolude/protolude/workflows/Cabal%20CI/badge.svg)](https://github.com/protolude/protolude/actions)
+[![Build Status](https://github.com/protolude/protolude/workflows/Stack%20CI/badge.svg)](https://github.com/protolude/protolude/actions)
 [![Hackage](https://img.shields.io/hackage/v/protolude.svg)](https://hackage.haskell.org/package/protolude)
 
 A sensible starting Prelude for building custom Preludes.