Skip to content

Commit 5aba6c3

Browse files
committed
Update Haskell-CI
1 parent 0cb5685 commit 5aba6c3

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 11 additions & 11 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.18.1
11+
# version: 0.19.20240702
1212
#
13-
# REGENDATA ("0.18.1",["github","smtp-mail.cabal"])
13+
# REGENDATA ("0.19.20240702",["github","smtp-mail.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -23,14 +23,14 @@ jobs:
2323
timeout-minutes:
2424
60
2525
container:
26-
image: buildpack-deps:bionic
26+
image: buildpack-deps:jammy
2727
continue-on-error: ${{ matrix.allow-failure }}
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.6.4
31+
- compiler: ghc-9.6.6
3232
compilerKind: ghc
33-
compilerVersion: 9.6.4
33+
compilerVersion: 9.6.6
3434
setup-method: ghcup
3535
allow-failure: false
3636
fail-fast: false
@@ -43,7 +43,7 @@ jobs:
4343
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
4444
chmod a+x "$HOME/.ghcup/bin/ghcup"
4545
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
46-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
46+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
4747
env:
4848
HCKIND: ${{ matrix.compilerKind }}
4949
HCNAME: ${{ matrix.compiler }}
@@ -61,7 +61,7 @@ jobs:
6161
echo "HC=$HC" >> "$GITHUB_ENV"
6262
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
6363
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
64-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
64+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
6565
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
6666
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
6767
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -118,7 +118,7 @@ jobs:
118118
chmod a+x $HOME/.cabal/bin/cabal-plan
119119
cabal-plan --version
120120
- name: checkout
121-
uses: actions/checkout@v3
121+
uses: actions/checkout@v4
122122
with:
123123
path: source
124124
- name: initial cabal.project for sdist
@@ -146,15 +146,15 @@ jobs:
146146
echo " ghc-options: -Werror=missing-methods" >> cabal.project
147147
cat >> cabal.project <<EOF
148148
EOF
149-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(smtp-mail)$/; }' >> cabal.project.local
149+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(smtp-mail)$/; }' >> cabal.project.local
150150
cat cabal.project
151151
cat cabal.project.local
152152
- name: dump install plan
153153
run: |
154154
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
155155
cabal-plan
156156
- name: restore cache
157-
uses: actions/cache/restore@v3
157+
uses: actions/cache/restore@v4
158158
with:
159159
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
160160
path: ~/.cabal/store
@@ -181,7 +181,7 @@ jobs:
181181
rm -f cabal.project.local
182182
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
183183
- name: save cache
184-
uses: actions/cache/save@v3
184+
uses: actions/cache/save@v4
185185
if: always()
186186
with:
187187
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

smtp-mail.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ maintainer: spencerjanssen@gmail.com
1111
category: Network
1212
build-type: Simple
1313
cabal-version: 2.0
14-
tested-with: GHC ==9.6.4
14+
tested-with: GHC ==9.6.6
1515

1616
extra-source-files:
1717
README.md

0 commit comments

Comments
 (0)