Skip to content

Commit

Permalink
Drop ghc-9.2 CI and change ghc-9.4.8 to ghc-9.4.7
Browse files Browse the repository at this point in the history
`9.2` barely works with clash
 `9.4.8` has the slow start problem
  • Loading branch information
lmbollen committed Jan 10, 2025
1 parent 5123912 commit 7a48ba2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/docker/build-and-publish-docker-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ elif [[ "$1" != "" ]]; then
fi

UBUNTU_VERSION=jammy-20240125
GHC_VERSIONS=( "9.10.1" "9.8.4" "9.6.6" "9.4.8" "9.2.8" "9.0.2")
GHC_VERSIONS=( "9.10.1" "9.8.4" "9.6.6" "9.4.7" "9.0.2")
CABAL_VERSION="3.12.1.0"

for i in "${!GHC_VERSIONS[@]}"
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,11 @@ jobs:
matrix:
ghc:
- "9.0.2"
- "9.2.8"
- "9.4.8"
- "9.4.7"
- "9.6.6"

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

steps:
- name: Checkout
Expand Down
14 changes: 10 additions & 4 deletions shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ pkgs.mkShell {

# Haskell toolchain
pkgs.cabal-install
# pkgs.haskell.compiler.ghc90
# pkgs.haskell.compiler.ghc92
pkgs.haskell.compiler.ghc94
# pkgs.haskell.compiler.ghc96

pkgs.haskell.compiler.ghc90

# Clash throws a slow start warning / error on 9.4.8, so we use 9.4.7
pkgs.haskell.compiler.ghc947
pkgs.haskell.compiler.ghc96

(pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml)

Expand Down Expand Up @@ -50,5 +52,9 @@ pkgs.mkShell {
# Mixing Nix Cabal and non-Nix Cabal yields some weird linking errors.
export CABAL_DIR="$HOME/.cabal-nix";
# Add nix bin executables to PATH
export PATH="$(git rev-parse --show-toplevel)/nix/bin:$PATH";
'';
}

0 comments on commit 7a48ba2

Please sign in to comment.