WIP

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ name: CI
 on:
  pull_request:
  push:
- branches: [master]
+ # branches: [master]
 
 concurrency:
  group: ${{ github.head_ref || github.run_id }}
@@ -18,7 +18,7 @@ jobs:
  container:
  image: 'nixos/nix:2.3.6'
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
 
  - name: Build
  run: |
@@ -36,12 +36,13 @@ jobs:
  - "8.6.5"
  - "8.10.7"
  - "9.0.2"
+ - "9.2.8"
 
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  # if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'
 
- - uses: haskell/actions/setup@v1
+ - uses: haskell/actions/setup@v2
  id: setup-haskell-cabal
  name: Setup Haskell
  with:
@@ -50,13 +51,14 @@ jobs:
 
  - name: Freeze
  run: |
+ cabal update
  cabal freeze
 
  - uses: actions/cache@v1
  name: Cache ~/.cabal/store
  with:
  path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
- key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
+ key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze', 'cabal.project') }}
  restore-keys: |
  ${{ runner.os }}-${{ matrix.ghc }}-
 

cabal.project

@@ -1 +1,7 @@
 packages: .
+
+source-repository-package
+ type: git
+ location: https://github.com/clash-lang/clash-compiler.git
+ tag: 5b055fb3fcdaf6e2b89cb86486d7280fc781fa84
+ subdir: clash-prelude

circuit-notation.cabal

@@ -21,14 +21,15 @@ library
  , clash-prelude >= 1.0
  , containers
  , data-default
- , ghc (>=8.6 && <8.8) || (>=8.10 && < 9.2)
- , syb
+ , ghc (>=8.6 && <8.8) || (>=8.10 && < 9.4)
  , lens
  , mtl
- , pretty
  , parsec
+ , pretty
  , pretty-show
+ , syb
  , template-haskell
+ , unordered-containers
  hs-source-dirs: src
  default-language: Haskell2010
  ghc-options: -Wall