Skip to content

Commit c853ff4

Browse files
committed
auto-gen weeder config
1 parent 614a8e8 commit c853ff4

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/workflows/cabal.haskell-ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ unconstrained: False
1111
docspec: True
1212

1313
-- Build haddocks. Accepts booleans or version range.
14-
haddock: True
14+
weeder: < 9.8
1515

1616
-- Build benchmarks. There are no way to run benchmarks. Accepts booleans or version range.
1717
-- Swarm has benchmarks so at least build them :)

.github/workflows/haskell-ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,6 @@ jobs:
221221
- name: build
222222
run: |
223223
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always
224-
- name: weeder
225-
if: matrix.compilerVersion == '9.6.5'
226-
uses: freckle/weeder-action@v2
227-
with:
228-
ghc-version: ${{ matrix.compilerVersion }}
229-
weeder-arguments: --config $GITHUB_WORKSPACE/source/weeder.toml
230-
working-directory: ${{ env.PKGDIR_swarm }}
231224
- name: tests
232225
run: |
233226
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
@@ -242,6 +235,13 @@ jobs:
242235
- name: haddock
243236
run: |
244237
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
238+
- name: weeder
239+
uses: freckle/weeder-action@v2
240+
if: $((HCNUMVER < 90800))
241+
with:
242+
ghc-version: ${{ matrix.compilerVersion }}
243+
weeder-arguments: --config $GITHUB_WORKSPACE/source/weeder.toml
244+
working-directory: ${PKGDIR_swarm}
245245
- name: save cache
246246
uses: actions/cache/save@v4
247247
if: always()

0 commit comments

Comments
 (0)