diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 619d189..888927f 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.20250104 +# version: 0.19.20260331 # -# REGENDATA ("0.19.20250104",["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.1 || (cat "$HOME"/.ghcup/logs/*.* && false) - echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1 -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: | @@ -172,7 +182,7 @@ jobs: chmod a+x $HOME/.cabal/bin/cabal-plan cabal-plan --version - name: checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: path: source - name: initial cabal.project for sdist @@ -217,17 +227,41 @@ jobs: echo "packages: ${PKGDIR_monad_chronicle}" >> cabal.project echo "packages: ${PKGDIR_these_tests}" >> cabal.project echo "package these" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package these-lens" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package these-optics" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package semialign" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package monad-chronicle" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package these-tests" >> 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 these" >> 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 these-lens" >> 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 these-optics" >> 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 semialign" >> 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 monad-chronicle" >> 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 these-tests" >> 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 these" >> 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 these-lens" >> 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 these-optics" >> 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 semialign" >> 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 monad-chronicle" >> 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 these-tests" >> 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/monad-chronicle/monad-chronicle.cabal b/monad-chronicle/monad-chronicle.cabal index 8e119ed..5a8b080 100644 --- a/monad-chronicle/monad-chronicle.cabal +++ b/monad-chronicle/monad-chronicle.cabal @@ -1,6 +1,6 @@ cabal-version: >=1.10 name: monad-chronicle -version: 1.1 +version: 1.1.0.1 synopsis: These as a transformer, ChronicleT homepage: https://github.com/haskellari/these license: BSD3 @@ -25,7 +25,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 @@ -47,14 +48,11 @@ library -- ghc boot libs build-depends: - base >=4.12.0.0 && <4.22 + base >=4.12.0.0 && <4.23 , mtl >=2.2.2 && <2.4 , transformers >=0.5.6.2 && <0.7 build-depends: these >=1.2.1 && <1.3 - -- other dependencies - build-depends: transformers-compat >=0.6.5 && <0.8 - if flag(semigroupoids) build-depends: semigroupoids >=6.0.1 && <6.1 diff --git a/semialign/semialign.cabal b/semialign/semialign.cabal index 9b80cb6..01a765f 100644 --- a/semialign/semialign.cabal +++ b/semialign/semialign.cabal @@ -1,7 +1,6 @@ cabal-version: >=1.10 name: semialign -version: 1.3.1 -x-revision: 1 +version: 1.3.1.1 synopsis: Align and Zip type-classes from the common Semialign ancestor. @@ -31,7 +30,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 @@ -62,9 +62,8 @@ library -- ghc boot libs build-depends: - base >=4.12.0.0 && <4.22 - , containers >=0.6.0.1 && <0.8 - , transformers >=0.5.6.2 && <0.7 + base >=4.12.0.0 && <4.23 + , containers >=0.6.0.1 && <0.9 -- These build-depends: these >=1.2.1 && <1.3 diff --git a/these-lens/these-lens.cabal b/these-lens/these-lens.cabal index 72e8ebf..0497577 100644 --- a/these-lens/these-lens.cabal +++ b/these-lens/these-lens.cabal @@ -1,7 +1,7 @@ cabal-version: >=1.10 name: these-lens version: 1.0.2 -x-revision: 1 +x-revision: 2 synopsis: Lenses for These homepage: https://github.com/haskellari/these license: BSD3 @@ -22,7 +22,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 @@ -36,7 +37,7 @@ library exposed-modules: Data.These.Lens -- ghc boot libs - build-depends: base >=4.12.0.0 && <4.22 + build-depends: base >=4.12.0.0 && <4.23 build-depends: these >=1.2.1 && <1.3 -- other dependencies diff --git a/these-optics/these-optics.cabal b/these-optics/these-optics.cabal index ac110b9..6a56cb1 100644 --- a/these-optics/these-optics.cabal +++ b/these-optics/these-optics.cabal @@ -22,7 +22,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 @@ -36,7 +37,7 @@ library exposed-modules: Data.These.Optics -- ghc boot libs - build-depends: base >=4.12 && <4.22 + build-depends: base >=4.12 && <4.23 -- these build-depends: these >=1.2.1 && <1.3 diff --git a/these-tests/these-tests.cabal b/these-tests/these-tests.cabal index f742143..be53e3d 100644 --- a/these-tests/these-tests.cabal +++ b/these-tests/these-tests.cabal @@ -22,7 +22,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 @@ -54,7 +55,6 @@ test-suite test , base <5 , binary , containers - , hashable , indexed-traversable , lens , QuickCheck @@ -62,14 +62,13 @@ test-suite test , tagged , these , these-lens - , transformers , unordered-containers , vector -- additional dependencies build-depends: lattices >=2.2.1 && <2.3 - , quickcheck-instances >=0.3.23 && <0.4 + , quickcheck-instances >=0.3.23 && <0.5 , tasty >=1.2 && <1.6 , tasty-quickcheck >=0.11 && <0.12 - , transformers-compat >=0.6.5 && <0.8 + , transformers-compat >=0.6.5 && <0.9 diff --git a/these/these.cabal b/these/these.cabal index aeed723..7d04470 100644 --- a/these/these.cabal +++ b/these/these.cabal @@ -1,7 +1,7 @@ cabal-version: >=1.10 name: these version: 1.2.1 -x-revision: 2 +x-revision: 3 synopsis: An either-or-both data type. homepage: https://github.com/haskellari/these license: BSD3 @@ -41,7 +41,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 @@ -59,7 +60,7 @@ library -- ghc boot libs build-depends: - base >=4.12.0.0 && <4.22 + base >=4.12.0.0 && <4.23 , binary >=0.8.6.0 && <0.10 , deepseq >=1.4.4.0 && <1.6