-
-
Notifications
You must be signed in to change notification settings - Fork 156
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Sync tested GHC versions and update haskell-ci workflow
* Pick the widest common set of GHC major release series to test for all packages and bump to the latest available one. Sadly we can't test 8.6.5 anymore and haskell-ci doesn't know about 9.2.3 yet. * Include all packages tracked by the cabal.project file * Apply PackageMap.hs doctest workaround for distribution-nixpkgs * hlint will need to be reenabled later, see #565.
- Loading branch information
1 parent
be7a6eb
commit fad357e
Showing
10 changed files
with
57 additions
and
457 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml | ||
index 7fca651d..c2b799c0 100644 | ||
--- a/.github/workflows/haskell-ci.yml | ||
+++ b/.github/workflows/haskell-ci.yml | ||
@@ -253,7 +253,7 @@ jobs: | ||
cd ${PKGDIR_language_nix} || false | ||
doctest -i ../../dist-newstyle/build/*/*/cabal2nix-*/build/autogen -XHaskell2010 src | ||
cd ${PKGDIR_distribution_nixpkgs} || false | ||
- doctest -i ../../dist-newstyle/build/*/*/cabal2nix-*/build/autogen -XHaskell2010 src | ||
+ find src -type f -and -not -name 'PackageMap.hs' | xargs doctest -i ../../dist-newstyle/build/*/*/cabal2nix-*/build/autogen -XHaskell2010 | ||
cd ${PKGDIR_hackage_db} || false | ||
doctest -i ../../dist-newstyle/build/*/*/cabal2nix-*/build/autogen -XHaskell2010 src | ||
- name: hlint |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,7 @@ author: Peter Simons <[email protected]> | |
-- list all contributors: git log --pretty='%an' | sort | uniq | ||
maintainer: sternenseemann <[email protected]> | ||
stability: stable | ||
tested-with: GHC == 8.8.4 || == 8.10.7 || == 9.0.2 | ||
tested-with: GHC == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.2 | ||
category: Distribution, Nix | ||
homepage: https://github.com/nixos/cabal2nix#readme | ||
bug-reports: https://github.com/nixos/cabal2nix/issues | ||
|
13 changes: 0 additions & 13 deletions
13
distribution-nixpkgs/.github/workflows/ci-skip-package-map.patch
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ license: BSD3 | |
license-file: LICENSE | ||
author: Peter Simons <[email protected]> | ||
maintainer: sternenseemann <[email protected]> | ||
tested-with: GHC == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.2 | ||
tested-with: GHC == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.2 | ||
category: Distribution, Nix | ||
homepage: https://github.com/NixOS/distribution-nixpkgs | ||
bug-reports: https://github.com/NixOS/distribution-nixpkgs/issues | ||
|
Oops, something went wrong.