Skip to content

Commit 98e6fa0

Browse files
.github: test with GHC 9.6.7 and 9.8.4
1 parent dbddea0 commit 98e6fa0

File tree

5 files changed

+9
-23
lines changed

5 files changed

+9
-23
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ jobs:
3737
compilerVersion: 9.10.1
3838
setup-method: ghcup
3939
allow-failure: false
40-
- compiler: ghc-9.8.3
40+
- compiler: ghc-9.8.4
4141
compilerKind: ghc
42-
compilerVersion: 9.8.3
43-
setup-method: ghcup-vanilla
42+
compilerVersion: 9.8.4
43+
setup-method: ghcup
4444
allow-failure: false
45-
- compiler: ghc-9.6.6
45+
- compiler: ghc-9.6.7
4646
compilerKind: ghc
47-
compilerVersion: 9.6.6
47+
compilerVersion: 9.6.7
4848
setup-method: ghcup
4949
allow-failure: false
5050
- compiler: ghc-9.4.8
@@ -96,20 +96,6 @@ jobs:
9696
HCKIND: ${{ matrix.compilerKind }}
9797
HCNAME: ${{ matrix.compiler }}
9898
HCVER: ${{ matrix.compilerVersion }}
99-
- name: Install GHC (GHCup vanilla)
100-
if: matrix.setup-method == 'ghcup-vanilla'
101-
run: |
102-
"$HOME/.ghcup/bin/ghcup" -s https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-vanilla-0.0.8.yaml install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
103-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
104-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
105-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
106-
echo "HC=$HC" >> "$GITHUB_ENV"
107-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
108-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
109-
env:
110-
HCKIND: ${{ matrix.compilerKind }}
111-
HCNAME: ${{ matrix.compiler }}
112-
HCVER: ${{ matrix.compilerVersion }}
11399
- name: Set PATH and environment variables
114100
run: |
115101
echo "$HOME/.cabal/bin" >> $GITHUB_PATH

cabal2nix/cabal2nix.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ author: Peter Simons <[email protected]>
1212
-- list all contributors: git log --pretty='%an' | sort | uniq
1313
maintainer: sternenseemann <[email protected]>
1414
stability: stable
15-
tested-with: GHC == 8.10.7 || == 9.0.2 || == 9.2.8 || == 9.4.8 || == 9.6.6 || == 9.8.3 || == 9.10.1
15+
tested-with: GHC == 8.10.7 || == 9.0.2 || == 9.2.8 || == 9.4.8 || == 9.6.7 || == 9.8.4 || == 9.10.1
1616
category: Distribution, Nix
1717
homepage: https://github.com/nixos/cabal2nix#readme
1818
bug-reports: https://github.com/nixos/cabal2nix/issues

distribution-nixpkgs/distribution-nixpkgs.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ license: BSD3
66
license-file: LICENSE
77
author: Peter Simons <[email protected]>
88
maintainer: sternenseemann <[email protected]>
9-
tested-with: GHC == 8.10.7 || == 9.0.2 || == 9.2.8 || == 9.4.8 || == 9.6.6 || == 9.8.3 || == 9.10.1
9+
tested-with: GHC == 8.10.7 || == 9.0.2 || == 9.2.8 || == 9.4.8 || == 9.6.7 || == 9.8.4 || == 9.10.1
1010
category: Distribution, Nix
1111
homepage: https://github.com/NixOS/cabal2nix/tree/master/distribution-nixpkgs#readme
1212
bug-reports: https://github.com/NixOS/cabal2nix/issues

hackage-db/hackage-db.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license: BSD3
99
license-file: LICENSE
1010
author: Peter Simons, Alexander Altman, Ben James, Kevin Quick
1111
maintainer: sternenseemann <[email protected]>
12-
tested-with: GHC == 8.10.7 || == 9.0.2 || == 9.2.8 || == 9.4.8 || == 9.6.6 || == 9.8.3 || == 9.10.1
12+
tested-with: GHC == 8.10.7 || == 9.0.2 || == 9.2.8 || == 9.4.8 || == 9.6.7 || == 9.8.4 || == 9.10.1
1313
category: Distribution
1414
homepage: https://github.com/NixOS/cabal2nix/tree/master/hackage-db#readme
1515
bug-reports: https://github.com/NixOS/cabal2nix/issues

language-nix/language-nix.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ license: BSD3
77
license-file: LICENSE
88
author: Peter Simons
99
maintainer: [email protected]
10-
tested-with: GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.8, GHC == 9.4.8, GHC == 9.6.6 || == 9.8.3 || == 9.10.1
10+
tested-with: GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.8, GHC == 9.4.8, GHC == 9.6.7 || == 9.8.4 || == 9.10.1
1111
category: Distribution, Language, Nix
1212
homepage: https://github.com/NixOS/cabal2nix/tree/master/language-nix#readme
1313
bug-reports: https://github.com/NixOS/cabal2nix/issues

0 commit comments

Comments
 (0)