From 3e695764cd379f8f3496968d376c6f338814134f Mon Sep 17 00:00:00 2001
From: Tom McLaughlin <tom@codedown.io>
Date: Mon, 26 Jun 2023 01:20:33 -0700
Subject: [PATCH] Switch to using explicit stack.yaml files in CI

---
 .github/workflows/ci.yml                      | 18 ++++++++++--------
 .../src/Kubernetes/Data/K8sJSONPath.hs        |  2 +-
 stack-9.0.2-aeson2.yaml                       |  6 +++---
 stack-9.0.2-aeson2.yaml.lock                  | 18 +++++++++---------
 stack-9.2.8.yaml                              |  8 ++++++++
 stack-9.2.8.yaml.lock                         | 19 +++++++++++++++++++
 6 files changed, 50 insertions(+), 21 deletions(-)
 create mode 100644 stack-9.2.8.yaml
 create mode 100644 stack-9.2.8.yaml.lock

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4643290..47e625a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,13 +29,15 @@ jobs:
       matrix:
         include:
         - ghc: "8.10.7"
-          resolver: "lts-18.28"
-        - ghc: "9.0.2"
-          resolver: "lts-19.33"
+          yaml: "stack-8.10.7.yaml"
+        - ghc: "9.0.2 (aeson-1)"
+          yaml: "stack-9.0.2-aeson1.yaml"
+        - ghc: "9.0.2 (aeson-2)"
+          yaml: "stack-9.0.2-aeson2.yaml"
         - ghc: "9.2.8"
-          resolver: "lts-20.26"
+          yaml: "stack-9.2.8.yaml"
         - ghc: "9.4.5"
-          resolver: "lts-21.0"
+          yaml: "stack.yaml"
     steps:
     - uses: actions/checkout@v3
 
@@ -49,12 +51,12 @@ jobs:
       name: Cache ~/.stack
       with:
         path: ~/.stack
-        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.resolver }}-stack2
+        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.yaml }}-stack2
 
     - name: Build
       run: |
-        stack build --resolver ${{matrix.resolver}} --system-ghc --test --bench --no-run-tests --no-run-benchmarks
+        stack build --stack-yaml ${{matrix.yaml}} --system-ghc --test --bench --no-run-tests --no-run-benchmarks
 
     - name: Test
       run: |
-        stack test --resolver ${{matrix.resolver}} --system-ghc
+        stack test --stack-yaml ${{matrix.yaml}} --system-ghc
diff --git a/kubernetes-client/src/Kubernetes/Data/K8sJSONPath.hs b/kubernetes-client/src/Kubernetes/Data/K8sJSONPath.hs
index 8cde7af..2bc74f8 100644
--- a/kubernetes-client/src/Kubernetes/Data/K8sJSONPath.hs
+++ b/kubernetes-client/src/Kubernetes/Data/K8sJSONPath.hs
@@ -17,7 +17,7 @@ import Text.Megaparsec ( Parsec, eof, runParser, some, takeWhile1P )
 import Text.Megaparsec.Char ( char )
 type Parser a = Parsec Void Text a
 #else
-import Data.Attoparsec.Text ( many1, char, takeWhile1, Parser )
+import Data.Attoparsec.Text ( Parser, char, endOfInput, many1, parseOnly, takeWhile1 )
 #endif
 
 
diff --git a/stack-9.0.2-aeson2.yaml b/stack-9.0.2-aeson2.yaml
index 134bf3a..0215b0f 100644
--- a/stack-9.0.2-aeson2.yaml
+++ b/stack-9.0.2-aeson2.yaml
@@ -1,9 +1,9 @@
 
-resolver: lts-19.7
+resolver: lts-19.33
 
 extra-deps:
-- oidc-client-0.6.0.0@sha256:2079dc5c9dfb5b3e2fa93098254ca16787c01a0cd3634b1d84afe84c9a6c4825,3368
-- jose-jwt-0.9.4@sha256:6db77f81cfcf81cf7faf8a4dc4b2110c1603dbb94249d49d069a17b4897e9d69,3560
+- oidc-client-0.6.0.0
+- jose-jwt-0.9.5
 
 packages:
 - kubernetes
diff --git a/stack-9.0.2-aeson2.yaml.lock b/stack-9.0.2-aeson2.yaml.lock
index d54effc..830cd22 100644
--- a/stack-9.0.2-aeson2.yaml.lock
+++ b/stack-9.0.2-aeson2.yaml.lock
@@ -7,20 +7,20 @@ packages:
 - completed:
     hackage: oidc-client-0.6.0.0@sha256:2079dc5c9dfb5b3e2fa93098254ca16787c01a0cd3634b1d84afe84c9a6c4825,3368
     pantry-tree:
-      size: 1298
       sha256: c8dac64944a1e60d14958067e1992732effe723d60353690720c34b4d126af48
+      size: 1298
   original:
-    hackage: oidc-client-0.6.0.0@sha256:2079dc5c9dfb5b3e2fa93098254ca16787c01a0cd3634b1d84afe84c9a6c4825,3368
+    hackage: oidc-client-0.6.0.0
 - completed:
-    hackage: jose-jwt-0.9.4@sha256:6db77f81cfcf81cf7faf8a4dc4b2110c1603dbb94249d49d069a17b4897e9d69,3560
+    hackage: jose-jwt-0.9.5@sha256:c02db1ef32e582330054d8befa412215afeeb597cb8756dadc75407ba776a159,3557
     pantry-tree:
+      sha256: 778e69fddd33a43f9a2322d4404a27c3f7474295bbdad6f65325fe9c9fee3d86
       size: 1231
-      sha256: fd3145cd8ab15be77d49522c454e86f17cf0f233ada7a623457926dbf6ea47e4
   original:
-    hackage: jose-jwt-0.9.4@sha256:6db77f81cfcf81cf7faf8a4dc4b2110c1603dbb94249d49d069a17b4897e9d69,3560
+    hackage: jose-jwt-0.9.5
 snapshots:
 - completed:
-    size: 618884
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/7.yaml
-    sha256: 57d4ce67cc097fea2058446927987bc1f7408890e3a6df0da74e5e318f051c20
-  original: lts-19.7
+    sha256: 6d1532d40621957a25bad5195bfca7938e8a06d923c91bc52aa0f3c41181f2d4
+    size: 619204
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/33.yaml
+  original: lts-19.33
diff --git a/stack-9.2.8.yaml b/stack-9.2.8.yaml
new file mode 100644
index 0000000..ae83d7c
--- /dev/null
+++ b/stack-9.2.8.yaml
@@ -0,0 +1,8 @@
+resolver: lts-20.26
+
+extra-deps:
+- oidc-client-0.7.0.1
+
+packages:
+- kubernetes
+- kubernetes-client
diff --git a/stack-9.2.8.yaml.lock b/stack-9.2.8.yaml.lock
new file mode 100644
index 0000000..efd3968
--- /dev/null
+++ b/stack-9.2.8.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: oidc-client-0.7.0.1@sha256:557341f7521e62c09abddf0d06c8e8acce119d3a9a4c4ffac1ab8ca3fc0e5067,3382
+    pantry-tree:
+      sha256: 51cfcd6c170923db24ba297ac9937961f6b26e041ceec8ff09500e61017b433b
+      size: 1298
+  original:
+    hackage: oidc-client-0.7.0.1
+snapshots:
+- completed:
+    sha256: 5a59b2a405b3aba3c00188453be172b85893cab8ebc352b1ef58b0eae5d248a2
+    size: 650475
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml
+  original: lts-20.26