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.

Sign up for GitHub

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

Add GHC 9.6.6 to CI #35

Merged
merged 1 commit into from
Aug 23, 2024
Merged

Add GHC 9.6.6 to CI #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions .github/docker/build-and-publish-docker-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@ elif [[ "$1" != "" ]]; then
fi

UBUNTU_VERSION=jammy-20240125
GHC_VERSIONS=( "9.4.8" "9.2.8" "9.0.2")
CABAL_VERSIONS=("3.10.2.0" "3.10.2.0" "3.10.2.0")
GHC_VERSIONS=( "9.6.6" "9.4.8" "9.2.8" "9.0.2")
CABAL_VERSION="3.10.2.0"

for i in "${!GHC_VERSIONS[@]}"
do
GHC_VERSION="${GHC_VERSIONS[i]}"
CABAL_VERSION="${CABAL_VERSIONS[i]}"

docker buildx build \
--build-arg UBUNTU_VERSION=${UBUNTU_VERSION} \
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,10 @@ jobs:
- "9.0.2"
- "9.2.8"
- "9.4.8"
- "9.6.6"

container:
image: ghcr.io/clash-lang/clash-vexriscv-ci:${{ matrix.ghc }}-20240329
image: ghcr.io/clash-lang/clash-vexriscv-ci:${{ matrix.ghc }}-20240823

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion clash-vexriscv/clash-vexriscv.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ common common-options
-fno-worker-wrapper
-- clash-prelude will set suitable version bounds for the plugins
build-depends:
base >= 4.14 && < 4.18,
base >= 4.14 && < 4.19,
clash-prelude >= 1.6 && < 1.10,
containers >= 0.6 && < 0.8,
ghc-typelits-natnormalise,
Expand Down
10 changes: 8 additions & 2 deletions clash-vexriscv/src/VexRiscv/VecToTuple.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ import Clash.Prelude

import Data.Tagged (Tagged(..))

#if MIN_VERSION_base(4,16,0)
#if MIN_VERSION_base(4,18,0)
import Data.Tuple (Solo(MkSolo))
#elif MIN_VERSION_base(4,16,0)
import Data.Tuple (Solo(Solo))
#endif

Expand All @@ -28,7 +30,11 @@ instance VecToTuple (Vec 0 a) where
type TupType (Vec 0 a) = Tagged a ()
vecToTuple Nil = Tagged ()

#if MIN_VERSION_base(4,16,0)
#if MIN_VERSION_base(4,18,0)
instance VecToTuple (Vec 1 a) where
type TupType (Vec 1 a) = Solo a
vecToTuple (a0 :> Nil) = MkSolo a0
#elif MIN_VERSION_base(4,16,0)
instance VecToTuple (Vec 1 a) where
type TupType (Vec 1 a) = Solo a
vecToTuple (a0 :> Nil) = Solo a0
Expand Down
Loading