Skip to content

Commit

Permalink
Update stackage pins to latest in series (#34)
Browse files Browse the repository at this point in the history
* Update stackage pins to latest in series

* fix syntax

* Allow megaparsec

* Still pin GHC in upper-bounds

* Update cabal bounds based on build plans

---------

Co-authored-by: nomeata <[email protected]>
  • Loading branch information
nomeata and nomeata committed Oct 16, 2023
1 parent 3ab6761 commit 350c2a6
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 22 deletions.
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ jobs:
ref: 6edd82f928b6242c596003ced00ffc8e099ee04e

- name: Detect GHC version
if: matrix.plan != 'upper-bounds'
run: |
ver=$(grep -o -P '(?<=with-compiler: ghc-).*' ci-configs/${{ matrix.plan }}.config)
echo "Detected compiler version $ver in ci-configs/${{ matrix.plan }}.config"
Expand Down
12 changes: 6 additions & 6 deletions candid.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ library
default-language: Haskell2010
ghc-options: -Wall -Wno-name-shadowing
build-depends:
base ^>=4.14.3 || ^>=4.15.1 || ^>=4.16.3 || ^>=4.17.0 || ^>=4.18.0,
base ^>=4.14.3 || ^>=4.15.1 || ^>=4.16.3 || ^>=4.17.0 || ^>=4.18.1,
text ^>=1.2.4 || ^>=2.0.1 || ^>=2.1,
dlist ^>=1.0,
vector ^>=0.12.3 || ^>=0.13.0,
Expand All @@ -56,7 +56,7 @@ library
transformers ^>=0.5.6 || ^>=0.6.1,
hex-text ^>=0.1.0,
digest ^>=0.0.1,
megaparsec ^>=9.2.1 || ^>=9.3.1 || ^>=9.5.0,
megaparsec ^>=9.2.1 || ^>=9.3.1 || ^>=9.4.1 || ^>=9.5.0,
parser-combinators ^>=1.3.0,
scientific ^>=0.3.7,
cereal ^>=0.5.8,
Expand All @@ -76,9 +76,9 @@ executable hcandid
default-language: Haskell2010
ghc-options: -Wall -Wno-name-shadowing
build-depends:
base ^>=4.14.3 || ^>=4.15.1 || ^>=4.16.3 || ^>=4.17.0 || ^>=4.18.0,
base ^>=4.14.3 || ^>=4.15.1 || ^>=4.16.3 || ^>=4.17.0 || ^>=4.18.1,
candid,
optparse-applicative ^>=0.17.0 || ^>=0.18.1,
optparse-applicative ^>=0.17.1 || ^>=0.18.1,
text ^>=1.2.4 || ^>=2.0.1 || ^>=2.1,
bytestring ^>=0.10.12 || ^>=0.11.3,
hex-text ^>=0.1.0,
Expand All @@ -96,7 +96,7 @@ test-suite test
default-language: Haskell2010
ghc-options: -Wall -Wno-name-shadowing -rtsopts
build-depends:
base ^>=4.14.3 || ^>=4.15.1 || ^>=4.16.3 || ^>=4.17.0 || ^>=4.18.0,
base ^>=4.14.3 || ^>=4.15.1 || ^>=4.16.3 || ^>=4.17.0 || ^>=4.18.1,
tasty ^>=1.4.3 || ^>=1.5,
tasty-hunit ^>=0.10.0,
tasty-smallcheck ^>=0.8.2,
Expand All @@ -120,7 +120,7 @@ test-suite doctest
default-language: Haskell2010
ghc-options: -threaded
build-depends:
base ^>=4.14.3 || ^>=4.15.1 || ^>=4.16.3 || ^>=4.17.0 || ^>=4.18.0,
base ^>=4.14.3 || ^>=4.15.1 || ^>=4.16.3 || ^>=4.17.0 || ^>=4.18.1,
candid,
doctest ^>=0.20.1 || ^>=0.21.1 || ^>=0.22.2,
row-types ^>=1.0.1,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import: ../cabal.project
active-repositories: hackage.haskell.org:merge
index-state: hackage.haskell.org 2023-06-04T10:33:14Z
with-compiler: ghc-9.6.1
with-compiler: ghc-9.6.3
5 changes: 0 additions & 5 deletions ci-configs/stackage-20.5.config

This file was deleted.

5 changes: 5 additions & 0 deletions ci-configs/stackage-20.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import: ../cabal.project
active-repositories: hackage.haskell.org:merge
index-state: hackage.haskell.org 2023-10-16T18:53:04Z
import: https://www.stackage.org/lts-20.26/cabal.config
with-compiler: ghc-9.2.8
5 changes: 0 additions & 5 deletions ci-configs/stackage-21.6.config

This file was deleted.

5 changes: 5 additions & 0 deletions ci-configs/stackage-21.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import: ../cabal.project
active-repositories: hackage.haskell.org:merge
index-state: hackage.haskell.org 2023-10-16T18:53:04Z
import: https://www.stackage.org/lts-21.16/cabal.config
with-compiler: ghc-9.4.5
6 changes: 3 additions & 3 deletions ci-configs/stackage-nightly.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import: ../cabal.project
active-repositories: hackage.haskell.org:merge
index-state: hackage.haskell.org 2023-06-04T10:33:14Z
import: https://www.stackage.org/nightly-2023-06-04/cabal.config
with-compiler: ghc-9.4.4
index-state: hackage.haskell.org 2023-10-16T18:53:04Z
import: https://www.stackage.org/nightly-2023-10-16/cabal.config
with-compiler: ghc-9.6.3
2 changes: 1 addition & 1 deletion ci-configs/upper-bounds.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
-- With https://github.com/haskell/cabal/issues/8387 this could maybe be implemented
-- without this being special
import: ../cabal.project
with-compiler: ghc
with-compiler: ghc-9.6.3


0 comments on commit 350c2a6

Please sign in to comment.