Skip to content

Commit

Permalink
Merge pull request #25 from rickowens/pr
Browse files Browse the repository at this point in the history 
refactor: Update dependencies.
  • Loading branch information
@rickowens
rickowens authored Jan 14, 2024
2 parents 0ad6701 + 5d2b2b5 commit 95361b2
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 34 deletions.
22 changes: 14 additions & 8 deletions .github/workflows/haskell.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
on: [pull_request]
on: [push]
name: Haskell Builds
jobs:
build:
Expand All @@ -15,7 +15,7 @@ jobs:
steps:
# Checkout
- uses: actions/checkout@v3

# Setup
- name: Setup Haskell
uses: haskell-actions/setup@v2
Expand All @@ -29,7 +29,7 @@ jobs:
- name: Configure the Build
run: |
rm cabal.project.freeze
cabal configure
cabal configure --enable-tests
cabal build --dry-run
# Restore cache
Expand Down Expand Up @@ -57,10 +57,13 @@ jobs:
# Cabal build
- name: Cabal Bulid
run: |
project="$(cat cabal.project | grep -v -- '-Werror')"
echo "$project" > cabal.project
cabal build all
# Cabal tests
- name: Cabal Test
run: |
cabal test all
build-lower-bounds:
name: Haskell Build (lower bounds)
runs-on: ubuntu-latest # or macOS-latest, or windows-latest
Expand All @@ -72,7 +75,7 @@ jobs:
steps:
# Checkout
- uses: actions/checkout@v3

# Setup
- name: Setup Haskell
uses: haskell-actions/setup@v2
Expand Down Expand Up @@ -110,7 +113,7 @@ jobs:
EOF
) > cabal.project
rm cabal.project.freeze
cabal configure
cabal configure --enable-tests
cabal build --dry-run
# Restore cache
Expand All @@ -135,9 +138,12 @@ jobs:
path: ${{ steps.setup.outputs.cabal-store }}
key: ${{ steps.cache.outputs.cache-primary-key }}

# Cabal build
# Cabal Build
- name: Cabal Bulid
run: cabal build all

# Cabal Test
- name: Cabal Test
run: cabal test all


48 changes: 24 additions & 24 deletions cabal.project.freeze
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
active-repositories: owensmurray:merge, hackage.haskell.org:merge
constraints: any.Cabal ==3.10.1.0,
any.Cabal-syntax ==3.10.1.0,
active-repositories: hackage.haskell.org:merge, owensmurray:merge
constraints: any.Cabal ==3.10.2.0,
any.Cabal-syntax ==3.10.2.0,
any.OneTuple ==0.4.1.1,
any.QuickCheck ==2.14.3,
QuickCheck -old-random +templatehaskell,
any.StateVar ==1.2.2,
any.aeson ==2.2.1.0,
aeson +ordered-keymap,
any.appar ==0.1.8,
any.array ==0.5.5.0,
any.array ==0.5.6.0,
any.asn1-encoding ==0.9.6,
any.asn1-parse ==0.9.5,
any.asn1-types ==0.3.4,
Expand All @@ -19,7 +19,7 @@ constraints: any.Cabal ==3.10.1.0,
any.attoparsec ==0.14.4,
attoparsec -developer,
any.auto-update ==0.1.6,
any.base ==4.18.1.0,
any.base ==4.19.0.0,
any.base-compat ==0.13.1,
any.base-orphans ==0.9.1,
any.basement ==0.0.16,
Expand All @@ -32,14 +32,14 @@ constraints: any.Cabal ==3.10.1.0,
boring +tagged,
any.bsb-http-chunked ==0.0.0.4,
any.byteorder ==1.0.4,
any.bytestring ==0.11.5.2,
any.bytestring ==0.12.0.2,
any.case-insensitive ==1.2.1.0,
any.comonad ==5.0.8,
comonad +containers +distributive +indexed-traversable,
any.conduit ==1.3.5,
any.conduit-extra ==1.3.6,
any.constraints ==0.14,
any.containers ==0.6.7,
any.containers ==0.6.8,
any.contravariant ==1.5.5,
contravariant +semigroups +statevar +tagged,
any.cookie ==0.4.6,
Expand All @@ -51,7 +51,7 @@ constraints: any.Cabal ==3.10.1.0,
any.data-default-class ==0.1.2.0,
any.data-fix ==0.3.2,
any.dec ==0.0.5,
any.deepseq ==1.4.8.1,
any.deepseq ==1.5.0.0,
any.directory ==1.3.8.1,
any.distributive ==0.6.2.1,
distributive +semigroups +tagged,
Expand All @@ -65,8 +65,8 @@ constraints: any.Cabal ==3.10.1.0,
any.filepath ==1.4.100.4,
any.generically ==0.1.1,
any.ghc-bignum ==1.3,
any.ghc-boot-th ==9.6.3,
any.ghc-prim ==0.10.0,
any.ghc-boot-th ==9.8.1,
any.ghc-prim ==0.11.0,
any.hashable ==1.4.3.0,
hashable +integer-gmp -random-initial-seed,
any.hourglass ==0.2.12,
Expand All @@ -77,7 +77,7 @@ constraints: any.Cabal ==3.10.1.0,
any.http-date ==0.0.11,
any.http-media ==0.8.1.1,
any.http-types ==0.12.4,
any.http2 ==5.0.0,
any.http2 ==5.0.1,
http2 -devel -h2spec,
any.indexed-traversable ==0.1.3,
any.indexed-traversable-instances ==0.1.1.2,
Expand Down Expand Up @@ -105,13 +105,13 @@ constraints: any.Cabal ==3.10.1.0,
any.network-info ==0.2.1,
any.network-uri ==2.6.4.2,
any.old-locale ==1.0.0.7,
any.old-time ==1.1.0.3,
any.old-time ==1.1.0.4,
any.om-show ==0.1.2.9,
any.parsec ==3.1.16.1,
any.parsec ==3.1.17.0,
any.pem ==0.2.4,
any.pretty ==1.1.3.6,
any.primitive ==0.9.0.0,
any.process ==1.6.17.0,
any.process ==1.6.18.0,
any.psqueues ==0.2.8.0,
any.random ==1.2.1.1,
any.recv ==0.1.0,
Expand All @@ -131,19 +131,19 @@ constraints: any.Cabal ==3.10.1.0,
any.some ==1.0.6,
some +newtype-unsafe,
any.sop-core ==0.5.0.2,
any.split ==0.2.4,
any.split ==0.2.5,
any.splitmix ==0.1.0.5,
splitmix -optimised-mixer,
any.stm ==2.5.1.0,
any.stm ==2.5.2.1,
any.stm-chans ==3.0.0.9,
any.streaming-commons ==0.2.2.6,
streaming-commons -use-bytestring-builder,
any.strict ==0.5,
any.string-conversions ==0.4.0.1,
any.tagged ==0.8.8,
tagged +deepseq +transformers,
any.template-haskell ==2.20.0.0,
any.text ==2.0.2,
any.template-haskell ==2.21.0.0,
any.text ==2.1,
any.text-iso8601 ==0.1,
any.text-short ==0.1.5,
text-short -asserts,
Expand All @@ -161,13 +161,13 @@ constraints: any.Cabal ==3.10.1.0,
transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
any.type-equality ==1,
any.typed-process ==0.2.11.1,
any.unix ==2.8.1.0,
any.unix-compat ==0.7,
any.unix ==2.8.3.0,
any.unix-compat ==0.7.1,
unix-compat -old-time,
any.unix-time ==0.4.11,
any.unliftio ==0.2.25.0,
any.unliftio-core ==0.2.1.0,
any.unordered-containers ==0.2.19.1,
any.unordered-containers ==0.2.20,
unordered-containers -debug,
any.utf8-string ==1.0.2,
any.uuid ==1.3.15,
Expand All @@ -178,12 +178,12 @@ constraints: any.Cabal ==3.10.1.0,
vector +boundschecks -internalchecks -unsafechecks -wall,
any.vector-algorithms ==0.9.0.1,
vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
any.vector-stream ==0.1.0.0,
any.wai ==3.2.3,
any.vector-stream ==0.1.0.1,
any.wai ==3.2.4,
any.warp ==3.3.31,
warp +allow-sendfilefd -network-bytestring -warp-debug +x509,
any.witherable ==0.4.2,
any.word8 ==0.1.3,
any.zlib ==0.6.3.0,
zlib -bundled-c-zlib -non-blocking-ffi -pkg-config
index-state: hackage.haskell.org 2023-12-05T03:35:45Z
index-state: hackage.haskell.org 2024-01-14T19:10:15Z
4 changes: 2 additions & 2 deletions om-http.cabal
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: om-http
version: 0.3.0.5
version: 0.3.0.6
synopsis: Http utilities.
description: Random HTTP utilities.
homepage: https://github.com/owensmurray/om-http
Expand All @@ -19,7 +19,7 @@ common dependencies
build-depends:
, async >= 2.2.4 && < 2.3
, base >= 4.15.1.0 && < 4.20
, bytestring >= 0.10.12.1 && < 0.12
, bytestring >= 0.10.12.1 && < 0.13
, directory >= 1.3.6.2 && < 1.4
, filepath >= 1.4.2.1 && < 1.5
, http-types >= 0.12.3 && < 0.13
Expand Down

0 comments on commit 95361b2

Please sign in to comment.