Skip to content

Backport #11275: Preflight checks for 3.16.1.0 #11281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+51 −0
Closed

Backport #11275: Preflight checks for 3.16.1.0 #11281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions Cabal-QuickCheck/Cabal-QuickCheck.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,15 @@ library
build-depends:
, base
, bytestring
<<<<<<< HEAD
, Cabal ^>=3.12.1.0
, Cabal-syntax ^>=3.12.1.0
, QuickCheck ^>=2.13.2 || ^>=2.14
=======
, Cabal ^>=3.17.0.0
, Cabal-syntax ^>=3.17.0.0
, QuickCheck >= 2.13.2 && < 2.18
>>>>>>> af3395c34 (Bump QuickCheck)

exposed-modules:
Test.QuickCheck.GenericArbitrary
Expand Down
45 changes: 45 additions & 0 deletions cabal-install/cabal-install.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ test-suite unit-tests
UnitTests.Options

build-depends:
<<<<<<< HEAD
array,
bytestring,
cabal-install,
Expand All @@ -354,6 +355,30 @@ test-suite unit-tests
tasty-hunit >= 0.10,
tree-diff,
QuickCheck >= 2.14.3 && <2.16
=======
, array
, bytestring
, cabal-install
, Cabal-tree-diff
, Cabal-QuickCheck
, Cabal-tests
, containers
, directory
, filepath
, mtl
, network-uri >= 2.6.2.0 && <2.7
, random
, tar
, time
, zlib
, tasty >= 1.2.3 && <1.6
, tasty-golden >=2.3.1.1 && <2.4
, tasty-quickcheck ^>=0.11
, tasty-expected-failure
, tasty-hunit >= 0.10
, tree-diff
, QuickCheck >= 2.14.3 && <2.18
>>>>>>> af3395c34 (Bump QuickCheck)


-- Tests to run with a limited stack and heap size
Expand Down Expand Up @@ -423,6 +448,7 @@ test-suite long-tests
UnitTests.Options

build-depends:
<<<<<<< HEAD
Cabal-QuickCheck,
Cabal-described,
Cabal-tests,
Expand All @@ -441,3 +467,22 @@ test-suite long-tests
tasty-quickcheck <0.11,
QuickCheck >= 2.14 && <2.16,
pretty-show >= 1.6.15
=======
, Cabal-QuickCheck
, Cabal-described
, Cabal-tests
, cabal-install
, containers
, directory
, filepath
, mtl
, network-uri >= 2.6.2.0 && <2.7
, random
, tagged
, tasty >= 1.2.3 && <1.6
, tasty-expected-failure
, tasty-hunit >= 0.10
, tasty-quickcheck <0.12
, QuickCheck >= 2.14 && <2.18
, pretty-show >= 1.6.15
>>>>>>> af3395c34 (Bump QuickCheck)
Loading