From 0ddaef7c45272bc3d4e34ea6bbed066443839f71 Mon Sep 17 00:00:00 2001 From: Karl Ostmo Date: Thu, 18 Jul 2024 11:31:22 -0700 Subject: [PATCH] auto-gen weeder config --- .github/workflows/cabal.haskell-ci | 2 ++ .github/workflows/haskell-ci.yml | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cabal.haskell-ci b/.github/workflows/cabal.haskell-ci index a04890362..10934e3c8 100644 --- a/.github/workflows/cabal.haskell-ci +++ b/.github/workflows/cabal.haskell-ci @@ -13,6 +13,8 @@ docspec: True -- Build haddocks. Accepts booleans or version range. haddock: True +weeder: < 9.8 + -- Build benchmarks. There are no way to run benchmarks. Accepts booleans or version range. -- Swarm has benchmarks so at least build them :) benchmarks: True diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 5abfdadef..ac9f63f2b 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -221,13 +221,6 @@ jobs: - name: build run: | $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always - - name: weeder - if: matrix.compilerVersion == '9.6.5' - uses: freckle/weeder-action@v2 - with: - ghc-version: ${{ matrix.compilerVersion }} - weeder-arguments: --config $GITHUB_WORKSPACE/source/weeder.toml - working-directory: ${{ env.PKGDIR_swarm }} - name: tests run: | $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct @@ -242,6 +235,13 @@ jobs: - name: haddock run: | $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all + - name: weeder + uses: freckle/weeder-action@v2 + if: $((HCNUMVER < 90800)) + with: + ghc-version: ${{ matrix.compilerVersion }} + weeder-arguments: --config $GITHUB_WORKSPACE/source/weeder.toml + working-directory: ${PKGDIR_swarm} - name: save cache uses: actions/cache/save@v4 if: always()