Skip to content

Commit 340d9a3

Browse files
committed
Bump CI to GHC 9.12.1, allow newer containers
1 parent 0dc4ccb commit 340d9a3

File tree

3 files changed

+35
-11
lines changed

3 files changed

+35
-11
lines changed

.github/workflows/haskell-ci.yml

+23-9
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,22 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20250104
11+
# version: 0.19.20250216
1212
#
13-
# REGENDATA ("0.19.20250104",["github","visualize-cbn.cabal"])
13+
# REGENDATA ("0.19.20250216",["github","visualize-cbn.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
17-
- push
18-
- pull_request
17+
push:
18+
branches:
19+
- master
20+
pull_request:
21+
branches:
22+
- master
1923
jobs:
2024
linux:
2125
name: Haskell-CI - Linux - ${{ matrix.compiler }}
22-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-24.04
2327
timeout-minutes:
2428
60
2529
container:
@@ -38,9 +42,9 @@ jobs:
3842
compilerVersion: 9.10.1
3943
setup-method: ghcup
4044
allow-failure: false
41-
- compiler: ghc-9.8.2
45+
- compiler: ghc-9.8.4
4246
compilerKind: ghc
43-
compilerVersion: 9.8.2
47+
compilerVersion: 9.8.4
4448
setup-method: ghcup
4549
allow-failure: false
4650
- compiler: ghc-9.6.6
@@ -81,8 +85,8 @@ jobs:
8185
chmod a+x "$HOME/.ghcup/bin/ghcup"
8286
- name: Install cabal-install
8387
run: |
84-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1 || (cat "$HOME"/.ghcup/logs/*.* && false)
85-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1 -vnormal+nowrap" >> "$GITHUB_ENV"
88+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
89+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
8690
- name: Install GHC (GHCup)
8791
if: matrix.setup-method == 'ghcup'
8892
run: |
@@ -185,6 +189,7 @@ jobs:
185189
echo "package visualize-cbn" >> cabal.project
186190
echo " ghc-options: -Werror=missing-methods" >> cabal.project
187191
cat >> cabal.project <<EOF
192+
allow-newer: containers
188193
EOF
189194
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(visualize-cbn)$/; }' >> cabal.project.local
190195
cat cabal.project
@@ -220,6 +225,15 @@ jobs:
220225
run: |
221226
rm -f cabal.project.local
222227
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
228+
- name: prepare for constraint sets
229+
run: |
230+
rm -f cabal.project.local
231+
- name: constraint set containers-0.8
232+
run: |
233+
$CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>=0.8' all --dry-run
234+
cabal-plan topo | sort
235+
$CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>=0.8' --dependencies-only -j2 all
236+
$CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers ^>=0.8' all
223237
- name: save cache
224238
if: always()
225239
uses: actions/cache/save@v4

cabal.haskell-ci

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
branches: master
2+
3+
constraint-set containers-0.8
4+
ghc: >= 8.2
5+
constraints: containers ^>=0.8
6+
tests: True
7+
run-tests: True
8+
9+
raw-project
10+
allow-newer: containers

visualize-cbn.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ extra-source-files: ChangeLog.md README.md CONTRIBUTORS
1616
tested-with:
1717
GHC == 9.12.1
1818
GHC == 9.10.1
19-
GHC == 9.8.2
19+
GHC == 9.8.4
2020
GHC == 9.6.6
2121
GHC == 9.4.8
2222
GHC == 9.2.8
@@ -58,7 +58,7 @@ executable visualize-cbn
5858
, ansi-terminal >= 1.0 && < 1.2
5959
, blaze-html >= 0.9 && < 0.10
6060
, blaze-markup >= 0.8 && < 0.9
61-
, containers >= 0.6 && < 0.8
61+
, containers >= 0.6 && < 1
6262
, data-default >= 0.7 && < 0.9
6363
, mtl >= 2.2 && < 2.4
6464
, optparse-applicative >= 0.18 && < 0.19

0 commit comments

Comments
 (0)