Skip to content

Commit

Permalink
[INT-224] Make weeder work for GHC 9.6
Browse files Browse the repository at this point in the history
  • Loading branch information
lierdakil committed Dec 30, 2023
1 parent 859b002 commit 6767d2c
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 18 deletions.
15 changes: 7 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,11 @@ jobs:
stack-version: ${{ matrix.stack }}

- uses: actions/cache@v3
name: Cache ~/.stack
name: Cache ~/.stack and cabal store
with:
path: ~/.stack
path: |
~/.stack
${{ steps.setup-haskell.outputs.cabal-store }}
key: ${{ runner.os }}-${{ steps.ghcver.outputs.ghcver }}-stack

- name: Set stack config
Expand All @@ -201,7 +203,6 @@ jobs:
stack config set resolver ${{ matrix.resolver }}
- name: Configure for Weeder
if: ${{ steps.ghcver.outputs.ghcver == '9.4.5' }}
run: |
echo 'ghc-options: { "$locals": -fwrite-ide-info }' >> stack.yaml
Expand All @@ -212,12 +213,10 @@ jobs:
--ghc-options '-Werror' \
--haddock --no-haddock-deps
- name: Weeder
if: ${{ steps.ghcver.outputs.ghcver == '9.4.5' }}
- name: Weeder for GHC 9.6
if: ${{ startsWith(steps.ghcver.outputs.ghcver, '9.6') }}
run: |
wget https://github.com/lierdakil/weeder2-static/releases/download/v2.5.0-1/weeder.gz
gunzip weeder.gz
chmod +x weeder
cabal install --installdir "$PWD" weeder
./weeder
- name: Stack test
Expand Down
10 changes: 0 additions & 10 deletions weeder.dhall

This file was deleted.

10 changes: 10 additions & 0 deletions weeder.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# SPDX-FileCopyrightText: 2023 Serokell <https://serokell.io>
# SPDX-License-Identifier: MPL-2.0

root-instances = [{ class = "\\.TestGroup$" }]
roots = [
"^Main\\.main$",
"^Crypto\\.BLST\\..*$",
"^Paths_.*",
]
unused-types = true

0 comments on commit 6767d2c

Please sign in to comment.