Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use clash 1.8.2 #34

Merged
merged 3 commits into from
Jan 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 28 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Haskell
uses: haskell/actions/setup@v2
uses: haskell-actions/setup@v2
id: setup-haskell
with:
enable-stack: true
Expand All @@ -39,16 +39,16 @@ jobs:
fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Haskell
uses: haskell/actions/setup@v2
uses: haskell-actions/setup@v2
id: setup-haskell
with:
enable-stack: true

- name: Cache dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.setup-haskell.outputs.stack-root }}/snapshots
key:
Expand All @@ -66,29 +66,37 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2"]
ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.6", "9.8.4", "9.10.1"]

# Windows missing; no cross-platform CI scripts available yet.
os: ["ubuntu-latest", "macos-latest"]

# Unsupported by Clash:
exclude:
# Unsupported by Clash:
- os: macos-latest
ghc: 8.10.7
# Unsupported on ARM64
- os: macos-latest
ghc: 8.6.5
- os: macos-latest
ghc: 8.8.4
- os: macos-latest
ghc: 9.0.2

fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Haskell
uses: haskell/actions/setup@v2
uses: haskell-actions/setup@v2
id: setup-haskell
with:
ghc-version: ${{ matrix.ghc }}
enable-stack: true

- name: Cache dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.setup-haskell.outputs.cabal-store }}
key:
Expand All @@ -107,11 +115,11 @@ jobs:
strategy:
matrix:
tools:
- {ghc: "9.4.7", cabal: "3.8.1.0", hls: "2.4.0.0", ghcup: "0.1.20.0"}
- {ghc: "9.4.8", cabal: "3.12.1.0", hls: "2.9.0.1", ghcup: "0.1.40.0"}
fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Haskell
run: |
Expand All @@ -129,7 +137,7 @@ jobs:
echo "${HOME}/.ghcup/bin/" >> $GITHUB_PATH
ls "${HOME}/.ghcup/bin/"
- name: Cache dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cabal/store
key: ${{ runner.os }}-cachebust1-hls-${{ matrix.tools.ghc }}-${{ matrix.tools.cabal }}-${{ matrix.tools.hls }}-${{ matrix.tools.ghcup }}-${{ hashFiles('**/*.cabal', '**/stack.yaml') }}
Expand All @@ -146,13 +154,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v23
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v30
with:
nix_path: nixpkgs=channel:nixos-23.05

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Enable cachix
run: |
Expand Down Expand Up @@ -192,7 +200,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Publish
run: |
Expand All @@ -213,13 +221,13 @@ jobs:
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}

steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v23
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v30
with:
nix_path: nixpkgs=channel:nixos-23.05

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Enable cachix
run: |
Expand Down
17 changes: 8 additions & 9 deletions deca.hsfiles
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ test-suite test-library
{{name}},
QuickCheck,
hedgehog,
tasty >= 1.2 && < 1.5,
tasty >= 1.2 && < 1.6,
tasty-hedgehog,
tasty-th
```
Expand Down Expand Up @@ -599,14 +599,13 @@ blinkerT (leds, mode, cntr) key1R = ((leds', mode', cntr'), complement leds)
| otherwise = leds

{-# START_FILE stack.yaml #-}
resolver: lts-21.20
resolver: lts-23.2

extra-deps:
- clash-ghc-1.8.1@sha256:3bab304fa5584f3541650bddd01160f2710b9ced52e52c06481a91ac73d71bb8,9753
- clash-lib-1.8.1@sha256:17d78e786dedf16a76394cd5813372870a3d70a1a4c7f964309f126b800e90f6,15693
- clash-prelude-1.8.1@sha256:c3fbb9f6b8e74140fb3d5c4d59ec84cfe4a53e9f8520e606c187cfc04b149065,17626
- clash-prelude-hedgehog-1.8.1@sha256:9ec3aa3f8195481f5ce4942b34a49c97dd132dd1c8f1fa58aeecbd82c2602e86,1410
- concurrent-supply-0.1.8@sha256:80b658533141660818d0781b8c8fb9a8cf69b987fcfbab782dc788bfc7df4846,1627
- clash-ghc-1.8.2@sha256:a5e5fe902fbc02f2fc825e13855b9e57bbc782928bc1820c29d3faabaa8457bb,9802
- clash-lib-1.8.2@sha256:bf494184c73cdb27016ce61d471a2ba3d3959703e576dda3181d85431fba47e2,15721
- clash-prelude-1.8.2@sha256:a9409f93aa7806a4fb4d39efc7fae78f638cfd0e9bd57140adf04e0f2fcc27bf,17871
- clash-prelude-hedgehog-1.8.2@sha256:4ffc0a4897a60cfae1bee5feaa946be652942bcdd624b3bf153b4596754ddd0b,1410
- prettyprinter-interp-0.2.0.0@sha256:69c339a95b265dab9b3478ca19ec96952b6b472bd0ff6e2127112a9562362c1d,2086

{-# START_FILE syn/addclashsources.tcl #-}
Expand Down Expand Up @@ -843,7 +842,7 @@ common common-options
Cabal,

-- clash-prelude will set suitable version bounds for the plugins
clash-prelude >= 1.8.1 && < 1.10,
clash-prelude >= 1.8.2 && < 1.10,
ghc-typelits-natnormalise,
ghc-typelits-extra,
ghc-typelits-knownnat
Expand Down Expand Up @@ -895,7 +894,7 @@ test-suite test-library
{{name}},
QuickCheck,
hedgehog,
tasty >= 1.2 && < 1.5,
tasty >= 1.2 && < 1.6,
tasty-hedgehog,
tasty-th

2 changes: 1 addition & 1 deletion projects/deca/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ test-suite test-library
{{name}},
QuickCheck,
hedgehog,
tasty >= 1.2 && < 1.5,
tasty >= 1.2 && < 1.6,
tasty-hedgehog,
tasty-th
```
Expand Down
4 changes: 2 additions & 2 deletions projects/deca/{{name}}.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ common common-options
Cabal,

-- clash-prelude will set suitable version bounds for the plugins
clash-prelude >= 1.8.1 && < 1.10,
clash-prelude >= 1.8.2 && < 1.10,
ghc-typelits-natnormalise,
ghc-typelits-extra,
ghc-typelits-knownnat
Expand Down Expand Up @@ -124,6 +124,6 @@ test-suite test-library
{{name}},
QuickCheck,
hedgehog,
tasty >= 1.2 && < 1.5,
tasty >= 1.2 && < 1.6,
tasty-hedgehog,
tasty-th
8 changes: 4 additions & 4 deletions projects/simple-nix/nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"homepage": "https://clash-lang.org/",
"owner": "clash-lang",
"repo": "clash-compiler",
"rev": "3f5dc67c0e526e43a4dd88eb3902e39ed512c166",
"sha256": "022rwif8xkaabw0j3arhyj0hswmh3vq2nx1bbz8rbkp05jm4psgg",
"rev": "49f33ea971eb52b1dbdb7b11dafe0849408001f6",
"sha256": "102l671jr1jxvs8qmqxxrq5fdf254pcmjv9z1dwc7sbfbzy9jxqb",
"type": "tarball",
"url": "https://github.com/clash-lang/clash-compiler/archive/3f5dc67c0e526e43a4dd88eb3902e39ed512c166.tar.gz",
"url": "https://github.com/clash-lang/clash-compiler/archive/49f33ea971eb52b1dbdb7b11dafe0849408001f6.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
"version": "1.8.1"
"version": "1.8.2"
},
"doctest-parallel": {
"branch": "main",
Expand Down
4 changes: 2 additions & 2 deletions projects/simple-nix/{{name}}.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ common common-options
Cabal,

-- clash-prelude will set suitable version bounds for the plugins
clash-prelude >= 1.8.1 && < 1.10,
clash-prelude >= 1.8.2 && < 1.10,
ghc-typelits-natnormalise,
ghc-typelits-extra,
ghc-typelits-knownnat
Expand Down Expand Up @@ -125,6 +125,6 @@ test-suite test-library
QuickCheck,
clash-prelude-hedgehog,
hedgehog,
tasty >= 1.2 && < 1.5,
tasty >= 1.2 && < 1.6,
tasty-hedgehog,
tasty-th
4 changes: 2 additions & 2 deletions projects/simple/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ Note that this whole section is a `common` "stanza". We'll use it as a template
Cabal,

-- clash-prelude will set suitable version bounds for the plugins
clash-prelude >= 1.8.1 && < 1.10,
clash-prelude >= 1.8.2 && < 1.10,
ghc-typelits-natnormalise,
ghc-typelits-extra,
ghc-typelits-knownnat
Expand Down Expand Up @@ -200,7 +200,7 @@ test-suite test-library
{{name}},
QuickCheck,
hedgehog,
tasty >= 1.2 && < 1.5,
tasty >= 1.2 && < 1.6,
tasty-hedgehog,
tasty-th
```
Expand Down
11 changes: 5 additions & 6 deletions projects/simple/stack.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
resolver: lts-21.20
resolver: lts-23.2

extra-deps:
- clash-ghc-1.8.1@sha256:3bab304fa5584f3541650bddd01160f2710b9ced52e52c06481a91ac73d71bb8,9753
- clash-lib-1.8.1@sha256:17d78e786dedf16a76394cd5813372870a3d70a1a4c7f964309f126b800e90f6,15693
- clash-prelude-1.8.1@sha256:c3fbb9f6b8e74140fb3d5c4d59ec84cfe4a53e9f8520e606c187cfc04b149065,17626
- clash-prelude-hedgehog-1.8.1@sha256:9ec3aa3f8195481f5ce4942b34a49c97dd132dd1c8f1fa58aeecbd82c2602e86,1410
- concurrent-supply-0.1.8@sha256:80b658533141660818d0781b8c8fb9a8cf69b987fcfbab782dc788bfc7df4846,1627
- clash-ghc-1.8.2@sha256:a5e5fe902fbc02f2fc825e13855b9e57bbc782928bc1820c29d3faabaa8457bb,9802
- clash-lib-1.8.2@sha256:bf494184c73cdb27016ce61d471a2ba3d3959703e576dda3181d85431fba47e2,15721
- clash-prelude-1.8.2@sha256:a9409f93aa7806a4fb4d39efc7fae78f638cfd0e9bd57140adf04e0f2fcc27bf,17871
- clash-prelude-hedgehog-1.8.2@sha256:4ffc0a4897a60cfae1bee5feaa946be652942bcdd624b3bf153b4596754ddd0b,1410
- prettyprinter-interp-0.2.0.0@sha256:69c339a95b265dab9b3478ca19ec96952b6b472bd0ff6e2127112a9562362c1d,2086
4 changes: 2 additions & 2 deletions projects/simple/{{name}}.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ common common-options
Cabal,

-- clash-prelude will set suitable version bounds for the plugins
clash-prelude >= 1.8.1 && < 1.10,
clash-prelude >= 1.8.2 && < 1.10,
ghc-typelits-natnormalise,
ghc-typelits-extra,
ghc-typelits-knownnat
Expand Down Expand Up @@ -129,6 +129,6 @@ test-suite test-library
QuickCheck,
clash-prelude-hedgehog,
hedgehog,
tasty >= 1.2 && < 1.5,
tasty >= 1.2 && < 1.6,
tasty-hedgehog,
tasty-th
23 changes: 11 additions & 12 deletions simple-nix.hsfiles
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,12 @@ in import sources.nixpkgs { overlays = [ overlay ]; }
"homepage": "https://clash-lang.org/",
"owner": "clash-lang",
"repo": "clash-compiler",
"rev": "3f5dc67c0e526e43a4dd88eb3902e39ed512c166",
"sha256": "022rwif8xkaabw0j3arhyj0hswmh3vq2nx1bbz8rbkp05jm4psgg",
"rev": "49f33ea971eb52b1dbdb7b11dafe0849408001f6",
"sha256": "102l671jr1jxvs8qmqxxrq5fdf254pcmjv9z1dwc7sbfbzy9jxqb",
"type": "tarball",
"url": "https://github.com/clash-lang/clash-compiler/archive/3f5dc67c0e526e43a4dd88eb3902e39ed512c166.tar.gz",
"url": "https://github.com/clash-lang/clash-compiler/archive/49f33ea971eb52b1dbdb7b11dafe0849408001f6.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
"version": "1.8.1"
"version": "1.8.2"
},
"doctest-parallel": {
"branch": "main",
Expand Down Expand Up @@ -550,14 +550,13 @@ accum = mealy accumT 0
accumT s i = (s + i, s)

{-# START_FILE stack.yaml #-}
resolver: lts-21.20
resolver: lts-23.2

extra-deps:
- clash-ghc-1.8.1@sha256:3bab304fa5584f3541650bddd01160f2710b9ced52e52c06481a91ac73d71bb8,9753
- clash-lib-1.8.1@sha256:17d78e786dedf16a76394cd5813372870a3d70a1a4c7f964309f126b800e90f6,15693
- clash-prelude-1.8.1@sha256:c3fbb9f6b8e74140fb3d5c4d59ec84cfe4a53e9f8520e606c187cfc04b149065,17626
- clash-prelude-hedgehog-1.8.1@sha256:9ec3aa3f8195481f5ce4942b34a49c97dd132dd1c8f1fa58aeecbd82c2602e86,1410
- concurrent-supply-0.1.8@sha256:80b658533141660818d0781b8c8fb9a8cf69b987fcfbab782dc788bfc7df4846,1627
- clash-ghc-1.8.2@sha256:a5e5fe902fbc02f2fc825e13855b9e57bbc782928bc1820c29d3faabaa8457bb,9802
- clash-lib-1.8.2@sha256:bf494184c73cdb27016ce61d471a2ba3d3959703e576dda3181d85431fba47e2,15721
- clash-prelude-1.8.2@sha256:a9409f93aa7806a4fb4d39efc7fae78f638cfd0e9bd57140adf04e0f2fcc27bf,17871
- clash-prelude-hedgehog-1.8.2@sha256:4ffc0a4897a60cfae1bee5feaa946be652942bcdd624b3bf153b4596754ddd0b,1410
- prettyprinter-interp-0.2.0.0@sha256:69c339a95b265dab9b3478ca19ec96952b6b472bd0ff6e2127112a9562362c1d,2086

{-# START_FILE tests/Tests/Example/Project.hs #-}
Expand Down Expand Up @@ -712,7 +711,7 @@ common common-options
Cabal,

-- clash-prelude will set suitable version bounds for the plugins
clash-prelude >= 1.8.1 && < 1.10,
clash-prelude >= 1.8.2 && < 1.10,
ghc-typelits-natnormalise,
ghc-typelits-extra,
ghc-typelits-knownnat
Expand Down Expand Up @@ -762,7 +761,7 @@ test-suite test-library
QuickCheck,
clash-prelude-hedgehog,
hedgehog,
tasty >= 1.2 && < 1.5,
tasty >= 1.2 && < 1.6,
tasty-hedgehog,
tasty-th

Loading
Loading