From 940c0fc0a5637cc3a0b27c9a0a246e62d7692530 Mon Sep 17 00:00:00 2001 From: patrick brisbin Date: Thu, 6 Apr 2023 10:15:28 -0400 Subject: [PATCH] Refactor stack matrix - Use our conventional resolvers by GHC - Use hoauth2-2.8.0 in nightly, instead of allow-newer-deps - Document matrix in CI workflow source --- .github/workflows/ci.yml | 19 ++++++++++--------- stack-hoauth2-2.0.yaml | 4 ++-- stack-hoauth2-2.0.yaml.lock | 12 ++++++------ stack-hoauth2-2.2.yaml | 2 +- stack-hoauth2-2.2.yaml.lock | 6 +++--- stack-hoauth2-2.3.yaml | 2 +- stack-hoauth2-2.3.yaml.lock | 6 +++--- stack-hoauth2-2.6.yaml | 10 +++------- stack-lts-13.2.yaml | 11 ----------- stack-lts-14.27.yaml | 3 +++ ...3.2.yaml.lock => stack-lts-14.27.yaml.lock | 10 +++++----- stack-lts-16.10.yaml | 8 -------- stack-lts-16.31.yaml | 1 + ...7.4.yaml.lock => stack-lts-16.31.yaml.lock | 8 ++++---- stack-lts-17.4.yaml | 1 - stack-lts-18.28.yaml | 1 + ....10.yaml.lock => stack-lts-18.28.yaml.lock | 8 ++++---- stack-lts-19.33.yaml | 1 + stack-lts-19.33.yaml.lock | 12 ++++++++++++ stack-nightly.yaml | 12 ++---------- stack-nightly.yaml.lock | 12 ++++++------ stack.yaml | 2 +- stack.yaml.lock | 8 ++++---- 23 files changed, 73 insertions(+), 86 deletions(-) delete mode 100644 stack-lts-13.2.yaml create mode 100644 stack-lts-14.27.yaml rename stack-lts-13.2.yaml.lock => stack-lts-14.27.yaml.lock (80%) delete mode 100644 stack-lts-16.10.yaml create mode 100644 stack-lts-16.31.yaml rename stack-lts-17.4.yaml.lock => stack-lts-16.31.yaml.lock (65%) delete mode 100644 stack-lts-17.4.yaml create mode 100644 stack-lts-18.28.yaml rename stack-lts-16.10.yaml.lock => stack-lts-18.28.yaml.lock (65%) create mode 100644 stack-lts-19.33.yaml create mode 100644 stack-lts-19.33.yaml.lock diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 26ea065..e903541 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,15 +16,16 @@ jobs: strategy: matrix: stack-yaml: - - stack-nightly.yaml - - stack.yaml - - stack-lts-17.4.yaml - - stack-lts-16.10.yaml - - stack-lts-13.2.yaml - - stack-hoauth2-2.0.yaml - - stack-hoauth2-2.2.yaml - - stack-hoauth2-2.3.yaml - - stack-hoauth2-2.6.yaml + - stack-nightly.yaml # ghc-9.4 + hoauth2-2.8.0 + - stack.yaml # ghc-9.2 + - stack-lts-19.33.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 + hoauth2-1.14.0 + - stack-hoauth2-2.6.yaml # ghc-9.4 (nightly-2022-12-09) + - stack-hoauth2-2.3.yaml # ghc-9.0 (nightly-2022-02-25) + - stack-hoauth2-2.2.yaml # ghc-9.0 (nightly-2022-02-25) + - stack-hoauth2-2.0.yaml # ghc-8.10 fail-fast: false steps: diff --git a/stack-hoauth2-2.0.yaml b/stack-hoauth2-2.0.yaml index 44cc6cb..1aa8208 100644 --- a/stack-hoauth2-2.0.yaml +++ b/stack-hoauth2-2.0.yaml @@ -1,3 +1,3 @@ -resolver: lts-18.23 +resolver: lts-18.28 extra-deps: - - hoauth2-2.0.0@sha256:4686d776272d4c57d3c8dbeb9e58b04afe4d2b410382011bd78a3d2bfb08a3fe,5662 + - hoauth2-2.0.0 diff --git a/stack-hoauth2-2.0.yaml.lock b/stack-hoauth2-2.0.yaml.lock index 2bb99b0..032866a 100644 --- a/stack-hoauth2-2.0.yaml.lock +++ b/stack-hoauth2-2.0.yaml.lock @@ -7,13 +7,13 @@ packages: - completed: hackage: hoauth2-2.0.0@sha256:4686d776272d4c57d3c8dbeb9e58b04afe4d2b410382011bd78a3d2bfb08a3fe,5662 pantry-tree: - size: 2171 sha256: 291b3dd90854ef44f270519ec17e34b6778f8430f6d6517bd67b0128bd549553 + size: 2171 original: - hackage: hoauth2-2.0.0@sha256:4686d776272d4c57d3c8dbeb9e58b04afe4d2b410382011bd78a3d2bfb08a3fe,5662 + hackage: hoauth2-2.0.0 snapshots: - completed: - size: 587819 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/23.yaml - sha256: 7f69bb29a57495586e7e3ed31ecc59c0d2c959cb23bd52b71ca676f254c9beb1 - original: lts-18.23 + sha256: 428ec8d5ce932190d3cbe266b9eb3c175cd81e984babf876b64019e2cbe4ea68 + size: 590100 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/28.yaml + original: lts-18.28 diff --git a/stack-hoauth2-2.2.yaml b/stack-hoauth2-2.2.yaml index 164e32f..c1b27a7 100644 --- a/stack-hoauth2-2.2.yaml +++ b/stack-hoauth2-2.2.yaml @@ -1,3 +1,3 @@ resolver: nightly-2022-02-25 extra-deps: - - hoauth2-2.2.0@sha256:83a96156717d9e2c93394b35bef4151f82b90dc88b83d0e35c0bf1158bd41c6c,2801 + - hoauth2-2.2.0 diff --git a/stack-hoauth2-2.2.yaml.lock b/stack-hoauth2-2.2.yaml.lock index db1c551..de9f9c0 100644 --- a/stack-hoauth2-2.2.yaml.lock +++ b/stack-hoauth2-2.2.yaml.lock @@ -7,13 +7,13 @@ packages: - completed: hackage: hoauth2-2.2.0@sha256:83a96156717d9e2c93394b35bef4151f82b90dc88b83d0e35c0bf1158bd41c6c,2801 pantry-tree: - size: 593 sha256: d6e2d12e0e66eb9392301ec97d50677afb71608568f3664eb466a4451c66ba59 + size: 593 original: - hackage: hoauth2-2.2.0@sha256:83a96156717d9e2c93394b35bef4151f82b90dc88b83d0e35c0bf1158bd41c6c,2801 + hackage: hoauth2-2.2.0 snapshots: - completed: + sha256: b18614ab8986a4ba6d469921a2c18decab244af78309effa3d2dab85dbdfef80 size: 611886 url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2022/2/25.yaml - sha256: b18614ab8986a4ba6d469921a2c18decab244af78309effa3d2dab85dbdfef80 original: nightly-2022-02-25 diff --git a/stack-hoauth2-2.3.yaml b/stack-hoauth2-2.3.yaml index 14bd122..8274e74 100644 --- a/stack-hoauth2-2.3.yaml +++ b/stack-hoauth2-2.3.yaml @@ -1,3 +1,3 @@ resolver: nightly-2022-02-25 extra-deps: - - hoauth2-2.3.0@sha256:213744356007a4686ff3bb72105843d478bc0ba6229659429cbe241a99f55095,2816 + - hoauth2-2.3.0 diff --git a/stack-hoauth2-2.3.yaml.lock b/stack-hoauth2-2.3.yaml.lock index bcb69dd..60671cd 100644 --- a/stack-hoauth2-2.3.yaml.lock +++ b/stack-hoauth2-2.3.yaml.lock @@ -7,13 +7,13 @@ packages: - completed: hackage: hoauth2-2.3.0@sha256:213744356007a4686ff3bb72105843d478bc0ba6229659429cbe241a99f55095,2816 pantry-tree: - size: 594 sha256: e559c811165a2e75cfe649b68396466b3bd0b6a5353a9d6476605e6a40e0eb37 + size: 594 original: - hackage: hoauth2-2.3.0@sha256:213744356007a4686ff3bb72105843d478bc0ba6229659429cbe241a99f55095,2816 + hackage: hoauth2-2.3.0 snapshots: - completed: + sha256: b18614ab8986a4ba6d469921a2c18decab244af78309effa3d2dab85dbdfef80 size: 611886 url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2022/2/25.yaml - sha256: b18614ab8986a4ba6d469921a2c18decab244af78309effa3d2dab85dbdfef80 original: nightly-2022-02-25 diff --git a/stack-hoauth2-2.6.yaml b/stack-hoauth2-2.6.yaml index b3bc7fd..d0c5a78 100644 --- a/stack-hoauth2-2.6.yaml +++ b/stack-hoauth2-2.6.yaml @@ -1,11 +1,7 @@ resolver: nightly-2022-12-09 - extra-deps: - hoauth2-2.6.0 - -# hoauth2 needs upper-bounds relaxed for -# -# - memory-0.18.0 -# - text-2.0.1 -# allow-newer: true +allow-newer-deps: + - memory + - text diff --git a/stack-lts-13.2.yaml b/stack-lts-13.2.yaml deleted file mode 100644 index 8307f8e..0000000 --- a/stack-lts-13.2.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -resolver: lts-13.2 - -extra-deps: - - hoauth2-1.14.0@sha256:fcb4284fc78950c91d5b548317c51bd99a5ced84f4bb9e6153624b5783e4215f,5628 - -# Fix for weeder with stack-2 -ghc-options: - "$locals": - -ddump-to-file - -ddump-hi diff --git a/stack-lts-14.27.yaml b/stack-lts-14.27.yaml new file mode 100644 index 0000000..2be442d --- /dev/null +++ b/stack-lts-14.27.yaml @@ -0,0 +1,3 @@ +resolver: lts-14.27 +extra-deps: + - hoauth2-1.14.0 diff --git a/stack-lts-13.2.yaml.lock b/stack-lts-14.27.yaml.lock similarity index 80% rename from stack-lts-13.2.yaml.lock rename to stack-lts-14.27.yaml.lock index 90b5987..847553f 100644 --- a/stack-lts-13.2.yaml.lock +++ b/stack-lts-14.27.yaml.lock @@ -7,13 +7,13 @@ packages: - completed: hackage: hoauth2-1.14.0@sha256:fcb4284fc78950c91d5b548317c51bd99a5ced84f4bb9e6153624b5783e4215f,5628 pantry-tree: - size: 2046 sha256: f25e2c2c101312196159dad5a3e2a4c8f549ed2d036d9566b66786d758db7dba + size: 2046 original: hackage: hoauth2-1.14.0@sha256:fcb4284fc78950c91d5b548317c51bd99a5ced84f4bb9e6153624b5783e4215f,5628 snapshots: - completed: - size: 492864 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/13/2.yaml - sha256: 586534518d3e7be8617d97ea296f05f497c0b4bb006f100367d66f5c45ae6268 - original: lts-13.2 + sha256: 7ea31a280c56bf36ff591a7397cc384d0dff622e7f9e4225b47d8980f019a0f0 + size: 524996 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/27.yaml + original: lts-14.27 diff --git a/stack-lts-16.10.yaml b/stack-lts-16.10.yaml deleted file mode 100644 index 0a7af1e..0000000 --- a/stack-lts-16.10.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -resolver: lts-16.10 - -# Fix for weeder with stack-2 -ghc-options: - "$locals": - -ddump-to-file - -ddump-hi diff --git a/stack-lts-16.31.yaml b/stack-lts-16.31.yaml new file mode 100644 index 0000000..53095f7 --- /dev/null +++ b/stack-lts-16.31.yaml @@ -0,0 +1 @@ +resolver: lts-16.31 diff --git a/stack-lts-17.4.yaml.lock b/stack-lts-16.31.yaml.lock similarity index 65% rename from stack-lts-17.4.yaml.lock rename to stack-lts-16.31.yaml.lock index 108ab08..a3bf80f 100644 --- a/stack-lts-17.4.yaml.lock +++ b/stack-lts-16.31.yaml.lock @@ -6,7 +6,7 @@ packages: [] snapshots: - completed: - size: 563103 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/4.yaml - sha256: f11e2153044f5f71ea7b1c9398f4721f517c9bd37642ed769647b896564021f3 - original: lts-17.4 + sha256: 637fb77049b25560622a224845b7acfe81a09fdb6a96a3c75997a10b651667f6 + size: 534126 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml + original: lts-16.31 diff --git a/stack-lts-17.4.yaml b/stack-lts-17.4.yaml deleted file mode 100644 index 95ed52c..0000000 --- a/stack-lts-17.4.yaml +++ /dev/null @@ -1 +0,0 @@ -resolver: lts-17.4 diff --git a/stack-lts-18.28.yaml b/stack-lts-18.28.yaml new file mode 100644 index 0000000..773d5c9 --- /dev/null +++ b/stack-lts-18.28.yaml @@ -0,0 +1 @@ +resolver: lts-18.28 diff --git a/stack-lts-16.10.yaml.lock b/stack-lts-18.28.yaml.lock similarity index 65% rename from stack-lts-16.10.yaml.lock rename to stack-lts-18.28.yaml.lock index c1b23d2..da10c3e 100644 --- a/stack-lts-16.10.yaml.lock +++ b/stack-lts-18.28.yaml.lock @@ -6,7 +6,7 @@ packages: [] snapshots: - completed: - size: 532383 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/10.yaml - sha256: 469d781ab6d2a4eceed6b31b6e4ec842dcd3cd1d11577972e86902603dce24df - original: lts-16.10 + sha256: 428ec8d5ce932190d3cbe266b9eb3c175cd81e984babf876b64019e2cbe4ea68 + size: 590100 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/28.yaml + original: lts-18.28 diff --git a/stack-lts-19.33.yaml b/stack-lts-19.33.yaml new file mode 100644 index 0000000..f9994e6 --- /dev/null +++ b/stack-lts-19.33.yaml @@ -0,0 +1 @@ +resolver: lts-19.33 diff --git a/stack-lts-19.33.yaml.lock b/stack-lts-19.33.yaml.lock new file mode 100644 index 0000000..d79c369 --- /dev/null +++ b/stack-lts-19.33.yaml.lock @@ -0,0 +1,12 @@ +# 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: [] +snapshots: +- completed: + 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-nightly.yaml b/stack-nightly.yaml index 875ba4a..4a3223f 100644 --- a/stack-nightly.yaml +++ b/stack-nightly.yaml @@ -1,11 +1,3 @@ -resolver: nightly-2023-04-04 - +resolver: nightly-2023-04-05 extra-deps: - - hoauth2-2.7.0 - -allow-newer: true -allow-newer-deps: - - hoauth2 - # hoauth2 needs upper-bounds relaxed for - - memory - - text + - hoauth2-2.8.0 diff --git a/stack-nightly.yaml.lock b/stack-nightly.yaml.lock index a986d3f..b2f0538 100644 --- a/stack-nightly.yaml.lock +++ b/stack-nightly.yaml.lock @@ -5,15 +5,15 @@ packages: - completed: - hackage: hoauth2-2.7.0@sha256:34c5b82d49a814cfa214b65f5422fda876e38c1275504b574355cf5413e37138,2833 + hackage: hoauth2-2.8.0@sha256:ead0fa524656b42baca8a3c6aef5ac245b28d2923d48ac574d74fc434a61a8ab,2647 pantry-tree: - sha256: f575d77978c823bedba13c67f7e31195da6c5543fbd9b35b9def225a8ace6833 + sha256: 98ac2693937dc8ccaa5508c7bcd8111e15175603ecba75fec27ab604dbf891d5 size: 996 original: - hackage: hoauth2-2.7.0 + hackage: hoauth2-2.8.0 snapshots: - completed: - sha256: eaacd008a9ade10f0a8ff460afdd6564469e70b8e1663c0404d95651788dc7a5 + sha256: 91195434dbc6e4d745301c865e94b798e771db5539625571a19adf6ed4c5e39e size: 600986 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/4/4.yaml - original: nightly-2023-04-04 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/4/5.yaml + original: nightly-2023-04-05 diff --git a/stack.yaml b/stack.yaml index 191295e..a34fe7e 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1 +1 @@ -resolver: lts-18.26 +resolver: lts-20.17 diff --git a/stack.yaml.lock b/stack.yaml.lock index 6eab87d..ca0f44a 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -6,7 +6,7 @@ packages: [] snapshots: - completed: - size: 590102 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/26.yaml - sha256: e76d109964d9335abb412e22139c5bce3078be290ac6d90b8ecea6cc009bb198 - original: lts-18.26 + sha256: 14ca51a9a597c32dd7804c10d079feea3d0ae40c5fbbb346cbd67b3ae49f6d01 + size: 649598 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/17.yaml + original: lts-20.17