Skip to content

Commit

Permalink
Merge pull request #121 from commercialhaskell/tar-conduit
Browse files Browse the repository at this point in the history
Bump lower bound on tar-conduit and bump CI
  • Loading branch information
mpilgrem authored Jan 6, 2024
2 parents 77bc55b + eae7438 commit 7ef6fec
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 24 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- master
workflow_dispatch:

# As of 18 December 2023, ubuntu-latest, windows-latest and macos-latest come
# As of 6 January 2024, ubuntu-latest, windows-latest and macos-latest come
# with Stack 2.13.1.

jobs:
Expand All @@ -20,14 +20,14 @@ jobs:
os:
- ubuntu-latest
resolver:
- stack-ghc-9.2.8.yaml
- stack-ghc-9.4.8.yaml
- stack-ghc-9.6.3.yaml
- stack-ghc-9.8.1.yaml
include:
- os: macos-latest
resolver: stack-ghc-9.6.3.yaml
resolver: stack-ghc-9.8.1.yaml
- os: windows-latest
resolver: stack-ghc-9.6.3.yaml
resolver: stack-ghc-9.8.1.yaml
steps:
- name: Clone project
uses: actions/checkout@v4
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
- ubuntu-latest
- windows-latest
resolver:
- stack-ghc-9.6.3.yaml
- stack-ghc-9.8.1.yaml
steps:
- name: Clone project
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ dependencies:
- rio-orphans
- rio-prettyprint >= 0.1.7.0
- static-bytes
- tar-conduit >= 0.4.0
- tar-conduit >= 0.4.1
- text
- text-metrics
- time
Expand Down
8 changes: 4 additions & 4 deletions pantry.cabal

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion stack-ghc-9.2.8.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ packages:
- rio-prettyprint-0.1.7.0@sha256:4f0f2dabcbc3be1f9871de7c2ff3d090b82462ca5924afa24f7b2540c5511d84,1428
- static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627
# lts-20.26 provides tar-conduit-0.3.2
- tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126
- tar-conduit-0.4.1@sha256:112d28118eb71901ea9e224e1b174c648b378256729669c2739b8b803d25b43a,3126
# crypton-connection-0.3.1 requires tls >= 1.7. lts-20.26 provides tls-1.5.8
- tls-1.8.0@sha256:0ea435fb1969384c76e6b6ba49c509cec55eec29f60dd2c335151d9c8a4e8b4f,5571

Expand Down
2 changes: 1 addition & 1 deletion stack-ghc-9.4.8.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ packages:
- http-download-0.2.1.0@sha256:a97863e96f7d44efc3d0e3061db7fe2540b8374ca44ae90d0b56040140cb7506,1716
- static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627
# lts-21.25 provides tar-conduit-0.3.2.1
- tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126
- tar-conduit-0.4.1@sha256:112d28118eb71901ea9e224e1b174c648b378256729669c2739b8b803d25b43a,3126
# crypton-connection-0.3.1 requires tls >= 1.7. lts-21.25 provides tls-1.6.0
- tls-1.8.0@sha256:0ea435fb1969384c76e6b6ba49c509cec55eec29f60dd2c335151d9c8a4e8b4f,5571

Expand Down
7 changes: 6 additions & 1 deletion stack-ghc-9.6.3.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Snapshot specification for GHC 9.6.3.
resolver: lts-22.0 # GHC 9.6.3
resolver: lts-22.4 # GHC 9.6.3

packages:
# lts-22.4 provides tar-conduit-0.4.0
- tar-conduit-0.4.1@sha256:112d28118eb71901ea9e224e1b174c648b378256729669c2739b8b803d25b43a,3126


flags:
hackage-security:
Expand Down
11 changes: 5 additions & 6 deletions stack-ghc-9.8.1.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# Experimental snapshot specification for GHC 9.8.1.
resolver: nightly-2023-12-18 # GHC 9.6.3
compiler: ghc-9.8.1
# Snapshot specification for GHC 9.8.1.
resolver: nightly-2024-01-06 # GHC 9.8.1

packages:
- aeson-2.2.1.0@sha256:a23a61aada8233e10573e1612c0b2efe5a1aba0d59b05dbe2f63301822f136cb,6582
- attoparsec-aeson-2.2.0.1@sha256:00026bb205aaa087215a4c3a65a62c4561c3fb58e882778c9607c63e2aa960e9,1593
- th-abstraction-0.6.0.0@sha256:d8959fa6a2812afcdd5f6f255fd6be8b3e0ca01e425586a554544fcb70b0ec7c,2303
- hedgehog-1.4@sha256:47633efec27b49fe5a21d51f3b9fce428ca4b945d39eaa163b2b6a1d3e1465be,4724
# nightly-2024-01-06 provides tar-conduit-0.4.0
- tar-conduit-0.4.1@sha256:112d28118eb71901ea9e224e1b174c648b378256729669c2739b8b803d25b43a,3126

flags:
hackage-security:
Expand Down
17 changes: 12 additions & 5 deletions stack.yaml.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7ef6fec

Please sign in to comment.