Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,17 @@ on:
- opened
- synchronize
jobs:
ormolu:
formatting:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: haskell-actions/run-ormolu@v16
- uses: tfausak/cabal-gild-setup-action@v2
with:
version: 1.5.0.1
- name: Run cabal-gild
run: |
find . -name '*.cabal' -type f -exec cabal-gild --io={} \;
ci:
name: Run tests
runs-on: ubuntu-latest
Expand All @@ -26,11 +32,13 @@ jobs:
- 9.0.2
- 9.2.8
- 9.4.8
- 9.6.3
- 9.8.1
- 9.6.6
- 9.8.4
- 9.10.1
- 9.12.1
steps:
- uses: actions/checkout@v4
- uses: haskell/actions/setup@v2
- uses: haskell-actions/setup@v2
id: setup-haskell
with:
ghc-version: ${{ matrix.ghc }}
Expand All @@ -44,7 +52,7 @@ jobs:
chmod +x "$DOCSPEC"
"$DOCSPEC" --version
env:
CABAL_DOCSPEC_VERSION: "0.0.0.20231219"
CABAL_DOCSPEC_VERSION: "0.0.0.20240703"

- name: Configure
run: cabal configure --enable-tests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: haskell/actions/setup@v2
- uses: haskell-actions/setup@v2
with:
ghc-version: '9.6.3'
ghc-version: '9.6.6'

- run: cabal check
- run: cabal sdist
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# http-client-websockets
![CI](https://github.com/amesgen/http-client-websockets/workflows/CI/badge.svg)
[![Hackage](https://img.shields.io/hackage/v/http-client-websockets)](https://hackage.haskell.org/package/http-client-websockets)
[![Haddocks](https://img.shields.io/badge/documentation-Haddocks-purple)](https://hackage.haskell.org/package/http-client-websockets/docs/Network-HTTP-Client-WebSockets.html)

Glue code for [http-client](https://hackage.haskell.org/package/http-client) and [websockets](https://hackage.haskell.org/package/websockets).
51 changes: 32 additions & 19 deletions http-client-websockets.cabal
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
cabal-version: 2.4
name: http-client-websockets
version: 0.1.1.3

synopsis: Glue code for http-client and websockets
description:
Glue code for http-client and websockets, so that
Expand All @@ -10,8 +9,8 @@ description:
.
This way, all applicable @Manager@ options like
TLS or proxy settings can be reused.
category: Network

category: Network
homepage: https://github.com/amesgen/http-client-websockets
bug-reports: https://github.com/amesgen/http-client-websockets/issues
license: CC0-1.0
Expand All @@ -27,36 +26,50 @@ source-repository head

common commons
default-language: Haskell2010
ghc-options: -Wall -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints -Wmissing-export-lists -fno-warn-name-shadowing -fhide-source-paths
if impl(ghc >= 8.10)
ghc-options:
-Wall
-Wincomplete-record-updates
-Wincomplete-uni-patterns
-Wredundant-constraints
-Wmissing-export-lists
-fno-warn-name-shadowing
-fhide-source-paths

if impl(ghc >=8.10)
ghc-options: -Wunused-packages

library
import: commons
hs-source-dirs: src
exposed-modules:
Network.HTTP.Client.WebSockets

build-depends:
base >= 4.11 && < 5
, bytestring
, text
, network-uri >= 2.6
, http-client >= 0.6
, websockets >= 0.12
base >=4.11 && <5,
bytestring,
http-client >=0.6,
network-uri >=2.6,
text,
websockets >=0.12,

x-docspec-options: --timeout 20

test-suite hspec
import: commons
type: exitcode-stdio-1.0
main-is: Spec.hs
hs-source-dirs: test
ghc-options: -threaded -rtsopts -with-rtsopts=-N
ghc-options:
-threaded
-rtsopts
-with-rtsopts=-N

build-depends:
base
, bytestring
, hspec >= 2.5
, network-uri
, http-client
, websockets
, async ^>= 2.2
, http-client-websockets
async ^>=2.2,
base,
bytestring,
hspec >=2.5,
http-client,
http-client-websockets,
network-uri,
websockets,
Loading