diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index f40471b..7f305f8 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,14 +8,15 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20250216 +# version: 0.19.20251118 # -# REGENDATA ("0.19.20250216",["github","th-deepstrict.cabal"]) +# REGENDATA ("0.19.20251118",["github","th-deepstrict.cabal"]) # name: Haskell-CI on: - push - pull_request + - merge_group jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} @@ -28,9 +29,19 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.12.1 + - compiler: ghc-9.14.0.20251104 compilerKind: ghc - compilerVersion: 9.12.1 + compilerVersion: 9.14.0.20251104 + setup-method: ghcup-prerelease + allow-failure: false + - compiler: ghc-9.12.2 + compilerKind: ghc + compilerVersion: 9.12.2 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.10.3 + compilerKind: ghc + compilerVersion: 9.10.3 setup-method: ghcup allow-failure: false - compiler: ghc-9.8.4 @@ -38,9 +49,9 @@ jobs: compilerVersion: 9.8.4 setup-method: ghcup allow-failure: false - - compiler: ghc-9.6.4 + - compiler: ghc-9.6.7 compilerKind: ghc - compilerVersion: 9.6.4 + compilerVersion: 9.6.7 setup-method: ghcup allow-failure: false - compiler: ghc-9.4.8 @@ -62,7 +73,7 @@ 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: | @@ -82,6 +93,21 @@ jobs: HCKIND: ${{ matrix.compilerKind }} HCNAME: ${{ matrix.compiler }} HCVER: ${{ matrix.compilerVersion }} + - name: Install GHC (GHCup prerelease) + if: matrix.setup-method == 'ghcup-prerelease' + run: | + "$HOME/.ghcup/bin/ghcup" config add-release-channel prereleases + "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) + HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER") + HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#') + HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#') + echo "HC=$HC" >> "$GITHUB_ENV" + echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" + echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" + env: + HCKIND: ${{ matrix.compilerKind }} + HCNAME: ${{ matrix.compiler }} + HCVER: ${{ matrix.compilerVersion }} - name: Set PATH and environment variables run: | echo "$HOME/.cabal/bin" >> $GITHUB_PATH @@ -92,7 +118,7 @@ jobs: echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV" - echo "HEADHACKAGE=false" >> "$GITHUB_ENV" + if [ $((HCNUMVER >= 91400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV" env: HCKIND: ${{ matrix.compilerKind }} @@ -120,6 +146,18 @@ jobs: repository hackage.haskell.org url: http://hackage.haskell.org/ EOF + if $HEADHACKAGE; then + cat >> $CABAL_CONFIG <> $CABAL_CONFIG <> cabal.project echo "package th-deepstrict" >> 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 th-deepstrict" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + echo "package th-deepstrict" >> cabal.project + echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project cat >> cabal.project <> cabal.project + fi $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(th-deepstrict)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local diff --git a/th-deepstrict.cabal b/th-deepstrict.cabal index a677cb2..e8a6f3a 100644 --- a/th-deepstrict.cabal +++ b/th-deepstrict.cabal @@ -24,10 +24,11 @@ extra-doc-files: tested-with: GHC ==9.2.8 || ==9.4.8 - || ==9.6.4 + || ==9.6.7 || ==9.8.4 - || ==9.10.2 - || ==9.12.1 + || ==9.10.3 + || ==9.12.2 + || ==9.14.1 library default-language: Haskell2010 @@ -36,10 +37,10 @@ library exposed-modules: Language.Haskell.TH.DeepStrict ghc-options: -Wall -Wunused-packages build-depends: - , base >=4.16.0 && <4.22 + , base >=4.16.0 && <4.23 , containers >=0.6.0 && <0.9 , mtl >=2.2 && <2.4 - , template-haskell >=2.18.0 && <2.24 + , template-haskell >=2.18.0 && <2.25 , th-abstraction >=0.7.0 && <0.8 , th-orphans >=0.13.14 && <0.14