Skip to content

Commit 21caa90

Browse files
authored
Merge pull request #155 from ghcjs/hkm/update-bounds
Update containers upper bound, nix and CI
2 parents 473790f + d651a71 commit 21caa90

File tree

9 files changed

+120
-281
lines changed

9 files changed

+120
-281
lines changed

.github/workflows/Cabal.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

.github/workflows/haskell-ci.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20250216
11+
# version: 0.19.20250330
1212
#
13-
# REGENDATA ("0.19.20250216",["github","cabal.project","--apt","libwebkit2gtk-4.0-dev","--apt","libgirepository1.0-dev","--apt","nodejs","--jobs-selection","any","--error-missing-methods","none","--no-install-dependencies","--installed","-Cabal"])
13+
# REGENDATA ("0.19.20250330",["github","cabal.project","--apt","libwebkit2gtk-4.0-dev","--apt","libgirepository1.0-dev","--apt","nodejs","--jobs-selection","any","--error-missing-methods","none","--no-install-dependencies","--installed","-Cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,6 +32,11 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35+
- compiler: ghc-9.12.2
36+
compilerKind: ghc
37+
compilerVersion: 9.12.2
38+
setup-method: ghcup
39+
allow-failure: false
3540
- compiler: ghc-9.10.1
3641
compilerKind: ghc
3742
compilerVersion: 9.10.1
@@ -42,9 +47,9 @@ jobs:
4247
compilerVersion: 9.8.4
4348
setup-method: ghcup
4449
allow-failure: false
45-
- compiler: ghc-9.6.6
50+
- compiler: ghc-9.6.7
4651
compilerKind: ghc
47-
compilerVersion: 9.6.6
52+
compilerVersion: 9.6.7
4853
setup-method: ghcup
4954
allow-failure: false
5055
- compiler: ghc-9.4.8
@@ -92,12 +97,12 @@ jobs:
9297
- name: Install GHCup
9398
run: |
9499
mkdir -p "$HOME/.ghcup/bin"
95-
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
100+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
96101
chmod a+x "$HOME/.ghcup/bin/ghcup"
97102
- name: Install cabal-install
98103
run: |
99-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
100-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
104+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
105+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
101106
- name: Install GHC (GHCup)
102107
if: matrix.setup-method == 'ghcup'
103108
run: |

0 commit comments

Comments
 (0)