From 0a38fb74c968683d6cac70b71250f4cba89b810a Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Mon, 18 Dec 2023 20:02:17 +0000 Subject: [PATCH] Bump CI for GHC 9.6.3/LTS 22.0 --- .github/workflows/tests.yml | 4 +- stack-ghc-9.4.8.yaml | 12 ++--- stack-ghc-9.6.3.yaml | 2 +- stack-ghc-9.8.1.yaml | 4 +- stack.yaml | 2 +- stack.yaml.lock | 101 ++---------------------------------- 6 files changed, 16 insertions(+), 109 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 305ce941..5ca391c0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,7 +7,7 @@ on: - master workflow_dispatch: -# As of 2 December 2023, ubuntu-latest, windows-latest and macos-latest come +# As of 18 December 2023, ubuntu-latest, windows-latest and macos-latest come # with Stack 2.13.1. jobs: @@ -60,7 +60,7 @@ jobs: - ubuntu-latest - windows-latest resolver: - - stack-ghc-9.4.8.yaml + - stack-ghc-9.6.3.yaml steps: - name: Clone project uses: actions/checkout@v4 diff --git a/stack-ghc-9.4.8.yaml b/stack-ghc-9.4.8.yaml index 4c910ccc..bbd2ba67 100644 --- a/stack-ghc-9.4.8.yaml +++ b/stack-ghc-9.4.8.yaml @@ -1,5 +1,5 @@ # Snapshot specification for GHC 9.4.8. -resolver: lts-21.23 # GHC 9.4.8 +resolver: lts-21.25 # GHC 9.4.8 packages: - aeson-warning-parser-0.1.1@sha256:e5b81492d39bfe5de99fdc838e54e0fc0f2e290eb9fcfd4531cabf24baeada76,1353 @@ -9,16 +9,16 @@ packages: - crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750 - crypton-x509-system-1.6.7@sha256:023ed573d82983bc473a37a89e0434a085b413be9f68d07e085361056afd4637,1532 - crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227 -# lts-21.23 provides hpack-0.35.2 +# lts-21.25 provides hpack-0.35.2 - hpack-0.36.0@sha256:c2daa6556afc57367a5d1dbd878bf515d442d201e24b27473051359abd47ed08,5187 -# lts-21.23 provides http-client-tls-0.3.6.1 +# lts-21.25 provides http-client-tls-0.3.6.1 - http-client-tls-0.3.6.3@sha256:a5909ce412ee65c141b8547f8fe22236f175186c95c708e86a46b5547394f910,2046 -# lts-21.23 provides http-download-0.2.0.0 +# lts-21.25 provides http-download-0.2.0.0 - http-download-0.2.1.0@sha256:a97863e96f7d44efc3d0e3061db7fe2540b8374ca44ae90d0b56040140cb7506,1716 - static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627 -# lts-21.23 provides tar-conduit-0.3.2.1 +# lts-21.25 provides tar-conduit-0.3.2.1 - tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126 -# crypton-connection-0.3.1 requires tls >= 1.7. lts-21.23 provides tls-1.6.0 +# crypton-connection-0.3.1 requires tls >= 1.7. lts-21.25 provides tls-1.6.0 - tls-1.8.0@sha256:0ea435fb1969384c76e6b6ba49c509cec55eec29f60dd2c335151d9c8a4e8b4f,5571 flags: diff --git a/stack-ghc-9.6.3.yaml b/stack-ghc-9.6.3.yaml index fc706edc..8f5b8aeb 100644 --- a/stack-ghc-9.6.3.yaml +++ b/stack-ghc-9.6.3.yaml @@ -1,5 +1,5 @@ # Snapshot specification for GHC 9.6.3. -resolver: nightly-2023-12-08 # GHC 9.6.3 +resolver: lts-22.0 # GHC 9.6.3 flags: hackage-security: diff --git a/stack-ghc-9.8.1.yaml b/stack-ghc-9.8.1.yaml index 7de12c59..c0d9ba7c 100644 --- a/stack-ghc-9.8.1.yaml +++ b/stack-ghc-9.8.1.yaml @@ -1,12 +1,10 @@ # Experimental snapshot specification for GHC 9.8.1. -resolver: nightly-2023-12-08 # GHC 9.6.3 +resolver: nightly-2023-12-18 # GHC 9.6.3 compiler: ghc-9.8.1 packages: - aeson-2.2.1.0@sha256:a23a61aada8233e10573e1612c0b2efe5a1aba0d59b05dbe2f63301822f136cb,6582 - attoparsec-aeson-2.2.0.1@sha256:00026bb205aaa087215a4c3a65a62c4561c3fb58e882778c9607c63e2aa960e9,1593 -- http-api-data-0.6@sha256:fb724ab5d42656b1f0f982ffb73ccb457ef73c6d6461f6a1b2b0a70d41d05d6e,3257 -- tagged-0.8.8@sha256:c4fdbd3e1c423af0ccf8eb9e9962620106c34e32ed8e0cc647fb06899a703e04,2880 - th-abstraction-0.6.0.0@sha256:d8959fa6a2812afcdd5f6f255fd6be8b3e0ca01e425586a554544fcb70b0ec7c,2303 flags: diff --git a/stack.yaml b/stack.yaml index b41dcba3..81cd7970 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1 +1 @@ -resolver: stack-ghc-9.4.8.yaml +resolver: stack-ghc-9.6.3.yaml diff --git a/stack.yaml.lock b/stack.yaml.lock index 0da59a74..ff660137 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -3,101 +3,10 @@ # For more information, please see the documentation at: # https://docs.haskellstack.org/en/stable/lock_files -packages: -- completed: - hackage: aeson-warning-parser-0.1.1@sha256:e5b81492d39bfe5de99fdc838e54e0fc0f2e290eb9fcfd4531cabf24baeada76,1353 - pantry-tree: - sha256: 4bb68448db0906d7b6a189f2eaf1053bd925ab047e290cabd2976fbace560d73 - size: 336 - original: - hackage: aeson-warning-parser-0.1.1@sha256:e5b81492d39bfe5de99fdc838e54e0fc0f2e290eb9fcfd4531cabf24baeada76,1353 -- completed: - hackage: companion-0.1.0@sha256:99f6de52c832d433639232a6d77d33abbca3b3037e49b7db6242fb9f569a8a2b,1093 - pantry-tree: - sha256: 7d36c8a038ab4db197c0a395c63523b47beec9f6c72a64271bb0f6b112d1ebd1 - size: 328 - original: - hackage: companion-0.1.0@sha256:99f6de52c832d433639232a6d77d33abbca3b3037e49b7db6242fb9f569a8a2b,1093 -- completed: - hackage: crypton-connection-0.3.1@sha256:4d0958537197956b536ea91718b1749949757022532f50b8f683290056a19021,1581 - pantry-tree: - sha256: e35ac3a35611afab9fafac633d0c4e6328b9cce4c8262378671d6c5a739e7e70 - size: 394 - original: - hackage: crypton-connection-0.3.1@sha256:4d0958537197956b536ea91718b1749949757022532f50b8f683290056a19021,1581 -- completed: - hackage: crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339 - pantry-tree: - sha256: 729e7db8dfc0a8b43e08bbd8d1387c9065e39beda6ac39e0fb9f10140810a3eb - size: 1080 - original: - hackage: crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339 -- completed: - hackage: crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750 - pantry-tree: - sha256: 87654d130a7f987ee139c821a1be45736d18df9fa4cb1142c4e054d3802338f3 - size: 406 - original: - hackage: crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750 -- completed: - hackage: crypton-x509-system-1.6.7@sha256:023ed573d82983bc473a37a89e0434a085b413be9f68d07e085361056afd4637,1532 - pantry-tree: - sha256: c0ca49e6a9537f3fdb7b47c5cfe93f7d744a369bf9d089f3c668b9c2d97402b7 - size: 399 - original: - hackage: crypton-x509-system-1.6.7@sha256:023ed573d82983bc473a37a89e0434a085b413be9f68d07e085361056afd4637,1532 -- completed: - hackage: crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227 - pantry-tree: - sha256: d4a0135f11218614fcd912cffaf54de8f749caca8696380e2589cbcfd64cc681 - size: 639 - original: - hackage: crypton-x509-validation-1.6.12@sha256:85989721b64be4b90de9f66ef641c26f57575cffed1a50d707065fb60176f386,2227 -- completed: - hackage: hpack-0.36.0@sha256:c2daa6556afc57367a5d1dbd878bf515d442d201e24b27473051359abd47ed08,5187 - pantry-tree: - sha256: 981e8f8ab3dc8305c5131f4686c835f55d4a841abcc867bfdcbf9e6757e9a638 - size: 3742 - original: - hackage: hpack-0.36.0@sha256:c2daa6556afc57367a5d1dbd878bf515d442d201e24b27473051359abd47ed08,5187 -- completed: - hackage: http-client-tls-0.3.6.3@sha256:a5909ce412ee65c141b8547f8fe22236f175186c95c708e86a46b5547394f910,2046 - pantry-tree: - sha256: a5659b6051a40039eec1db4b5350a232e2dced7a557917082a39623cfc605323 - size: 435 - original: - hackage: http-client-tls-0.3.6.3@sha256:a5909ce412ee65c141b8547f8fe22236f175186c95c708e86a46b5547394f910,2046 -- completed: - hackage: http-download-0.2.1.0@sha256:a97863e96f7d44efc3d0e3061db7fe2540b8374ca44ae90d0b56040140cb7506,1716 - pantry-tree: - sha256: fefc789f5b1c1891488b6b45b12423055ec0ddc8027ef6b5a4b871e2934b9f29 - size: 393 - original: - hackage: http-download-0.2.1.0@sha256:a97863e96f7d44efc3d0e3061db7fe2540b8374ca44ae90d0b56040140cb7506,1716 -- completed: - hackage: static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627 - pantry-tree: - sha256: 38980443d7bdf00dde4c34babbb1e4b858cdc3aca8973c50f22444cfb03135a2 - size: 440 - original: - hackage: static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627 -- completed: - hackage: tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126 - pantry-tree: - sha256: 54de1a1b2f3f13ebeea65ea3f13a53c89e8e6e2f85bc5810c2a6eddd428cb827 - size: 828 - original: - hackage: tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126 -- completed: - hackage: tls-1.8.0@sha256:0ea435fb1969384c76e6b6ba49c509cec55eec29f60dd2c335151d9c8a4e8b4f,5571 - pantry-tree: - sha256: 9adcea99bd0d277b8f4eeb03680b7b38bd8c903acfb6d9ed3b2f8016d02db749 - size: 4897 - original: - hackage: tls-1.8.0@sha256:0ea435fb1969384c76e6b6ba49c509cec55eec29f60dd2c335151d9c8a4e8b4f,5571 +packages: [] snapshots: - completed: - sha256: 8809197159ce65ec2d66f91982e4844ad0c2cbd1126df42146dd103c0ea6cac0 - size: 640063 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/23.yaml - original: lts-21.23 + sha256: e176944bc843f740e05242fa7a66ca1f440c127e425254f7f1257f9b19add23f + size: 712153 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/0.yaml + original: lts-22.0