diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index f47daaf..398160f 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20241223 +# version: 0.19.20260331 # -# REGENDATA ("0.19.20241223",["github","cabal.project"]) +# REGENDATA ("0.19.20260331",["github","cabal.project"]) # name: Haskell-CI on: @@ -20,10 +20,15 @@ on: pull_request: branches: - master + merge_group: + branches: + - master + workflow_dispatch: + {} jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: @@ -32,9 +37,14 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.12.1 + - compiler: ghc-9.14.1 + compilerKind: ghc + compilerVersion: 9.14.1 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.12.4 compilerKind: ghc - compilerVersion: 9.12.1 + compilerVersion: 9.12.4 setup-method: ghcup allow-failure: false - compiler: ghc-9.10.1 @@ -91,12 +101,12 @@ jobs: - name: Install GHCup run: | mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" - name: Install cabal-install run: | - "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) - echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" + "$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV" - name: Install GHC (GHCup) if: matrix.setup-method == 'ghcup' run: | @@ -174,14 +184,14 @@ jobs: - name: install cabal-docspec run: | mkdir -p $HOME/.cabal/bin - curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240703/cabal-docspec-0.0.0.20240703-x86_64-linux.xz > cabal-docspec.xz - echo '48bf3b7fd2f7f0caa6162afee57a755be8523e7f467b694900eb420f5f9a7b76 cabal-docspec.xz' | sha256sum -c - + curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20250606/cabal-docspec-0.0.0.20250606-x86_64-linux.xz > cabal-docspec.xz + echo 'cc20bb5c19501b42bde77556bc419c7c0a5c8d1eb65663024d8a4e4c868bef25 cabal-docspec.xz' | sha256sum -c - xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec rm -f cabal-docspec.xz chmod a+x $HOME/.cabal/bin/cabal-docspec cabal-docspec --version - name: checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: path: source - name: initial cabal.project for sdist @@ -226,17 +236,41 @@ jobs: echo "packages: ${PKGDIR_universe_dependent_sum}" >> cabal.project echo "packages: ${PKGDIR_universe}" >> cabal.project echo "package universe-base" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package universe-instances-extended" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package universe-reverse-instances" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package universe-some" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package universe-dependent-sum" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package universe" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package universe-base" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package universe-instances-extended" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package universe-reverse-instances" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package universe-some" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package universe-dependent-sum" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package universe" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package universe-base" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package universe-instances-extended" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package universe-reverse-instances" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package universe-some" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package universe-dependent-sum" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package universe" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi cat >> cabal.project <> cabal.project.local diff --git a/universe-base/universe-base.cabal b/universe-base/universe-base.cabal index 32b604a..e9b8d0a 100644 --- a/universe-base/universe-base.cabal +++ b/universe-base/universe-base.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 name: universe-base version: 1.1.4 -x-revision: 1 +x-revision: 2 synopsis: A class for finite and recursively enumerable types. description: A class for finite and recursively enumerable types and some helper functions for enumerating them. @@ -34,7 +34,8 @@ tested-with: || ==9.6.6 || ==9.8.4 || ==9.10.1 - || ==9.12.1 + || ==9.12.4 + || ==9.14.1 source-repository head type: git @@ -57,8 +58,8 @@ library TypeFamilies build-depends: - base >=4.12 && <4.22 - , containers >=0.6.0.1 && <0.8 + base >=4.12 && <4.23 + , containers >=0.6.0.1 && <0.9 , tagged >=0.8.8 && <0.9 , transformers >=0.5.6.2 && <0.7 @@ -84,5 +85,5 @@ test-suite tests build-depends: base , containers - , QuickCheck >=2.8.2 && <2.16 + , QuickCheck >=2.8.2 && <2.19 , universe-base diff --git a/universe-dependent-sum/universe-dependent-sum.cabal b/universe-dependent-sum/universe-dependent-sum.cabal index 7a1e24c..1553473 100644 --- a/universe-dependent-sum/universe-dependent-sum.cabal +++ b/universe-dependent-sum/universe-dependent-sum.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 name: universe-dependent-sum version: 1.3.1 -x-revision: 1 +x-revision: 2 synopsis: Universe instances for types from dependent-sum description: A class for finite and recursively enumerable types and some helper functions for enumerating them @@ -40,7 +40,8 @@ tested-with: || ==9.6.6 || ==9.8.4 || ==9.10.1 - || ==9.12.1 + || ==9.12.4 + || ==9.14.1 source-repository head type: git @@ -52,5 +53,5 @@ library hs-source-dirs: src exposed-modules: Data.Universe.DependentSum build-depends: - base >=4.12 && <4.22 + base >=4.12 && <4.23 , universe-some >=1.2.2 && <1.3 diff --git a/universe-instances-extended/universe-instances-extended.cabal b/universe-instances-extended/universe-instances-extended.cabal index 1f475ff..b6cdec3 100644 --- a/universe-instances-extended/universe-instances-extended.cabal +++ b/universe-instances-extended/universe-instances-extended.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 name: universe-instances-extended version: 1.1.4 -x-revision: 1 +x-revision: 2 synopsis: Universe instances for types from selected extra packages description: A class for finite and recursively enumerable types and some helper functions for enumerating them @@ -31,7 +31,8 @@ tested-with: || ==9.6.6 || ==9.8.4 || ==9.10.1 - || ==9.12.1 + || ==9.12.4 + || ==9.14.1 source-repository head type: git @@ -43,7 +44,7 @@ library exposed-modules: Data.Universe.Instances.Extended build-depends: adjunctions >=4.4.2 && <4.5 - , base >=4.12 && <4.22 + , base >=4.12 && <4.23 , comonad >=5.0.8 && <5.1 , containers , universe-base >=1.1.4 && <1.1.5 diff --git a/universe-reverse-instances/universe-reverse-instances.cabal b/universe-reverse-instances/universe-reverse-instances.cabal index 2108d85..900b700 100644 --- a/universe-reverse-instances/universe-reverse-instances.cabal +++ b/universe-reverse-instances/universe-reverse-instances.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 name: universe-reverse-instances version: 1.1.2 -x-revision: 1 +x-revision: 2 synopsis: Instances of standard classes that are made possible by enumerations @@ -32,7 +32,8 @@ tested-with: || ==9.6.6 || ==9.8.4 || ==9.10.1 - || ==9.12.1 + || ==9.12.4 + || ==9.14.1 source-repository head type: git @@ -50,8 +51,8 @@ library Data.Universe.Instances.Traversable build-depends: - base >=4.3 && <4.22 - , containers >=0.4 && <0.8 + base >=4.3 && <4.23 + , containers >=0.4 && <0.9 , universe-base >=1.1.4 && <1.1.5 if impl(ghc >=9.0) diff --git a/universe-some/universe-some.cabal b/universe-some/universe-some.cabal index 99133ba..81994db 100644 --- a/universe-some/universe-some.cabal +++ b/universe-some/universe-some.cabal @@ -1,7 +1,6 @@ cabal-version: 2.2 name: universe-some -version: 1.2.2 -x-revision: 1 +version: 1.2.2.1 synopsis: Universe instances for Some from some description: A class for finite and recursively enumerable types and some helper functions for enumerating them @@ -40,7 +39,8 @@ tested-with: || ==9.6.6 || ==9.8.4 || ==9.10.1 - || ==9.12.1 + || ==9.12.4 + || ==9.14.1 source-repository head type: git @@ -55,11 +55,10 @@ library Data.Universe.Some.TH build-depends: - base >=4.12 && <4.22 + base >=4.12 && <4.23 , some >=1.0.6 && <1.1 - , template-haskell >=2.14 && <2.24 + , template-haskell >=2.14 && <2.25 , th-abstraction >=0.7.0.0 && <0.8 - , transformers >=0.5.6.2 && <0.7 , universe-base >=1.1.4 && <1.1.5 if impl(ghc >=9) diff --git a/universe/universe.cabal b/universe/universe.cabal index f5a85c9..0d78717 100644 --- a/universe/universe.cabal +++ b/universe/universe.cabal @@ -31,7 +31,8 @@ tested-with: || ==9.6.6 || ==9.8.4 || ==9.10.1 - || ==9.12.1 + || ==9.12.4 + || ==9.14.1 source-repository head type: git