From 4c1e9a97f7fb0922ab6b52902d3a7f84e1c762f8 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Mon, 15 Aug 2022 09:46:12 -0400
Subject: [PATCH] Fixup stack-nightly

- Simplify CI nightly build
- Test newer persistent as a dedicated config
- Update to nightly as of today(ish)
---
 .github/workflows/ci.yml        | 16 +++-------------
 stack-nightly.yaml              |  8 +-------
 stack-nightly.yaml.lock         | 21 +++++----------------
 stack-persistent-2.14.yaml      |  5 +++++
 stack-persistent-2.14.yaml.lock | 19 +++++++++++++++++++
 test/README.lhs                 |  1 +
 6 files changed, 34 insertions(+), 36 deletions(-)
 create mode 100644 stack-persistent-2.14.yaml
 create mode 100644 stack-persistent-2.14.yaml.lock

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cfb2477..c71a2ea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,15 +12,17 @@ jobs:
     strategy:
       matrix:
         stack-yaml:
+          - stack-nightly.yaml   # ghc-9.0
           - stack.yaml           # ghc-9.0
           - stack-lts-18.28.yaml # ghc-8.10
           - stack-lts-16.31.yaml # ghc-8.8
           - stack-lts-14.27.yaml # ghc-8.6
           - stack-lts-12.26.yaml # ghc-8.4
+          - stack-persistent-2.14.yaml
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: freckle/stack-cache-action@v2
         with:
           stack-yaml: ${{ matrix.stack-yaml }}
@@ -36,15 +38,3 @@ jobs:
       - uses: rwe/actions-hlint-run@v2
         with:
           fail-on: warning
-
-  nightly:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: freckle/stack-cache-action@v2
-        with:
-          stack-yaml: stack-nightly.yaml
-      - uses: freckle/stack-action@v3
-        with:
-          stack-yaml: stack-nightly.yaml
-          stack-arguments: --resolver nightly
diff --git a/stack-nightly.yaml b/stack-nightly.yaml
index 26e9f51..cd3dc84 100644
--- a/stack-nightly.yaml
+++ b/stack-nightly.yaml
@@ -1,7 +1 @@
-resolver: nightly-2022-08-04
-
-extra-deps:
-  - persistent-2.14.1.0
-  # https://github.com/typeable/generic-arbitrary/issues/12
-  - github: typeable/generic-arbitrary
-    commit: e559ca7591b00ffca49b172b77e9c4150f6c1399
+resolver: nightly-2022-08-15
diff --git a/stack-nightly.yaml.lock b/stack-nightly.yaml.lock
index d12fda7..fe01827 100644
--- a/stack-nightly.yaml.lock
+++ b/stack-nightly.yaml.lock
@@ -3,21 +3,10 @@
 # For more information, please see the documentation at:
 #   https://docs.haskellstack.org/en/stable/lock_files
 
-packages:
-- completed:
-    size: 4911
-    url: https://github.com/typeable/generic-arbitrary/archive/e559ca7591b00ffca49b172b77e9c4150f6c1399.tar.gz
-    name: generic-arbitrary
-    version: 0.2.0
-    sha256: 0da48e4fb19f9b60699a7d3273fae791c1213c07aeba540977cbf2f9efbea571
-    pantry-tree:
-      size: 492
-      sha256: 935937b10d6569ae701a14146b857d45f32a7109f5d8b62e05bae8aa9bb6c4fb
-  original:
-    url: https://github.com/typeable/generic-arbitrary/archive/e559ca7591b00ffca49b172b77e9c4150f6c1399.tar.gz
+packages: []
 snapshots:
 - completed:
-    size: 539378
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2022/3/30.yaml
-    sha256: 745431a4c5b78cc93d81e99b2253a1e0eacd4f94e00cf17dab7cc14e665332e3
-  original: nightly-2022-03-30
+    size: 630638
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2022/8/15.yaml
+    sha256: faa92f1bd6eb0ec0535c43ff1d1719de0968a57e60a2e954d55c0e2ec37a25aa
+  original: nightly-2022-08-15
diff --git a/stack-persistent-2.14.yaml b/stack-persistent-2.14.yaml
new file mode 100644
index 0000000..ceb7b22
--- /dev/null
+++ b/stack-persistent-2.14.yaml
@@ -0,0 +1,5 @@
+# Dedicated config for pre-testing newer persistent. Remove this config once
+# 2.14 is in the nightly's we're using.
+resolver: nightly-2022-08-15
+extra-deps:
+  - persistent-2.14.1.0
diff --git a/stack-persistent-2.14.yaml.lock b/stack-persistent-2.14.yaml.lock
new file mode 100644
index 0000000..14107e6
--- /dev/null
+++ b/stack-persistent-2.14.yaml.lock
@@ -0,0 +1,19 @@
+# This file was autogenerated by Stack.
+# You should not edit this file by hand.
+# For more information, please see the documentation at:
+#   https://docs.haskellstack.org/en/stable/lock_files
+
+packages:
+- completed:
+    hackage: persistent-2.14.1.0@sha256:a7b47a4969eddec09c7fb3d79550bb689e81986cf46e874d06044d27b79b93b5,7060
+    pantry-tree:
+      size: 6511
+      sha256: 7eb0896c61e7fc13d02bd72083b6226a6ba4c5e5fb893ee92457a424a7207ae5
+  original:
+    hackage: persistent-2.14.1.0
+snapshots:
+- completed:
+    size: 630638
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2022/8/15.yaml
+    sha256: faa92f1bd6eb0ec0535c43ff1d1719de0968a57e60a2e954d55c0e2ec37a25aa
+  original: nightly-2022-08-15
diff --git a/test/README.lhs b/test/README.lhs
index 8718c4c..f3a1d3f 100644
--- a/test/README.lhs
+++ b/test/README.lhs
@@ -21,6 +21,7 @@ dependencies. We use this interface to generate fixtures for automated testing.
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Main (module Main) where