Skip to content

Commit 7f79dd5

Browse files
authored
Allow containers-0.8 and regen CI config (#46)
1 parent 1c37cba commit 7f79dd5

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/haskell-ci.yml

+5-5
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.20241223
11+
# version: 0.19.20250216
1212
#
13-
# REGENDATA ("0.19.20241223",["github","parser-regex.cabal","--branches","master","--installed","-text"])
13+
# REGENDATA ("0.19.20250216",["github","parser-regex.cabal","--branches","master","--installed","-text"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -23,7 +23,7 @@ on:
2323
jobs:
2424
linux:
2525
name: Haskell-CI - Linux - ${{ matrix.compiler }}
26-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-24.04
2727
timeout-minutes:
2828
60
2929
container:
@@ -80,8 +80,8 @@ jobs:
8080
chmod a+x "$HOME/.ghcup/bin/ghcup"
8181
- name: Install cabal-install
8282
run: |
83-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
84-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
83+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
84+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
8585
- name: Install GHC (GHCup)
8686
if: matrix.setup-method == 'ghcup'
8787
run: |

parser-regex.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ library
6363

6464
build-depends:
6565
base >= 4.15 && < 5.0
66-
, containers >= 0.6.4 && < 0.8
66+
, containers >= 0.6.4 && < 0.9
6767
, deepseq >= 1.4.5 && < 1.6
6868
, ghc-bignum >= 1.1 && < 1.4
6969
, primitive >= 0.7.3 && < 0.10

0 commit comments

Comments
 (0)