auto-gen weeder config

swarm-game · Jul 18, 2024 · 0ddaef7 · 0ddaef7
1 parent 614a8e8
commit 0ddaef7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git 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
@@ -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()