Skip to content

Commit 32b798d

Browse files
authored
Update CI (#78)
1 parent 55dfd04 commit 32b798d

File tree

2 files changed

+10
-25
lines changed

2 files changed

+10
-25
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 9 additions & 24 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.20241219
11+
# version: 0.19.20250216
1212
#
13-
# REGENDATA ("0.19.20241219",["github","--config=cabal.haskell-ci","cabal.project"])
13+
# REGENDATA ("0.19.20250216",["github","--config=cabal.haskell-ci","cabal.project"])
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:
@@ -48,10 +48,10 @@ jobs:
4848
compilerVersion: 9.10.1
4949
setup-method: ghcup
5050
allow-failure: false
51-
- compiler: ghc-9.8.3
51+
- compiler: ghc-9.8.4
5252
compilerKind: ghc
53-
compilerVersion: 9.8.3
54-
setup-method: ghcup-vanilla
53+
compilerVersion: 9.8.4
54+
setup-method: ghcup
5555
allow-failure: false
5656
- compiler: ghc-9.6.6
5757
compilerKind: ghc
@@ -89,11 +89,10 @@ jobs:
8989
mkdir -p "$HOME/.ghcup/bin"
9090
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
9191
chmod a+x "$HOME/.ghcup/bin/ghcup"
92-
- name: Install cabal-install (prerelease)
92+
- name: Install cabal-install
9393
run: |
94-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
95-
"$HOME/.ghcup/bin/ghcup" install cabal 3.15.0.0.2024.10.3 || (cat "$HOME"/.ghcup/logs/*.* && false)
96-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.15.0.0.2024.10.3 -vnormal+nowrap" >> "$GITHUB_ENV"
94+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
95+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
9796
- name: Install GHC (GHCup)
9897
if: matrix.setup-method == 'ghcup'
9998
run: |
@@ -108,20 +107,6 @@ jobs:
108107
HCKIND: ${{ matrix.compilerKind }}
109108
HCNAME: ${{ matrix.compiler }}
110109
HCVER: ${{ matrix.compilerVersion }}
111-
- name: Install GHC (GHCup vanilla)
112-
if: matrix.setup-method == 'ghcup-vanilla'
113-
run: |
114-
"$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)
115-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
116-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
117-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
118-
echo "HC=$HC" >> "$GITHUB_ENV"
119-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
120-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
121-
env:
122-
HCKIND: ${{ matrix.compilerKind }}
123-
HCNAME: ${{ matrix.compiler }}
124-
HCVER: ${{ matrix.compilerVersion }}
125110
- name: Set PATH and environment variables
126111
run: |
127112
echo "$HOME/.cabal/bin" >> $GITHUB_PATH

hpqtypes.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ author: Scrive AB
2121
maintainer: Andrzej Rybczak <andrzej@rybczak.net>
2222
copyright: Scrive AB
2323
category: Database
24-
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.12.1 }
24+
tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.6, 9.8.4, 9.10.1, 9.12.1 }
2525

2626
extra-source-files: README.md
2727
, CHANGELOG.md

0 commit comments

Comments
 (0)