From ef0a26c8c893649af8caab11f41c20cb5c736c22 Mon Sep 17 00:00:00 2001
From: Timothy Clem <timothy.clem@gmail.com>
Date: Mon, 30 Sep 2019 11:43:06 -0700
Subject: [PATCH] Readme and action.yml cleanup

---
 README.md  | 42 +++++++++++++++++++++++-------------------
 action.yml |  7 +++++--
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 8d1230f..7fe66d5 100644
--- a/README.md
+++ b/README.md
@@ -7,22 +7,8 @@
 This action sets up a Haskell environment for use in actions by:
 
 - optionally installing a version of ghc and cabal and adding to PATH. Note that this action only uses versions of ghc and cabal already installed in the cache. The action will fail if no matching versions are found.
- - Supported versions of GHC:
-    - `8.0.2`
-    - `8.2.2`
-    - `8.4.4`
-    - `8.6.2`
-    - `8.6.3`
-    - `8.6.4`
-    - `8.6.5`
-    - `8.8.1`
- - Supported versions of Cabal:
-    - `2.0`
-    - `2.2`
-    - `2.4`
-    - `3.0`
 
-# Usage
+## Usage
 
 See [action.yml](action.yml)
 
@@ -59,10 +45,28 @@ jobs:
       - run: runghc Hello.hs
 ```
 
-# License
+Supported versions of GHC:
 
-The scripts and documentation in this project are released under the [MIT License](LICENSE)
+- `8.0.2`
+- `8.2.2`
+- `8.4.4`
+- `8.6.2`
+- `8.6.3`
+- `8.6.4`
+- `8.6.5`
+- `8.8.1`
 
-# Contributions
+Supported versions of Cabal:
 
-Contributions are welcome!  See [Contributor's Guide](docs/contributors.md)
+- `2.0`
+- `2.2`
+- `2.4`
+- `3.0`
+
+## License
+
+The scripts and documentation in this project are released under the [MIT License](LICENSE).
+
+## Contributions
+
+Contributions are welcome!  See the [Contributor's Guide](docs/contributors.md).
diff --git a/action.yml b/action.yml
index d979070..b5978a2 100644
--- a/action.yml
+++ b/action.yml
@@ -3,8 +3,11 @@ description: 'Setup a Haskell environment and add it to the PATH'
 author: 'GitHub'
 inputs:
   ghc-version:
-    description: 'Version range or exact version of ghc to use.'
-    default: '>= 8.6.5'
+    description: 'Exact version of ghc to use.'
+    default: '8.6.5'
+  cabal-version:
+    description: 'Exact version of cabal to use.'
+    default: '3.0'
 runs:
   using: 'node12'
   main: 'lib/setup-haskell.js'