Skip to content

Commit 528a2af

Browse files
committed
Bump bounds and regenerate CI config for GHC 9.12
1 parent 3070c18 commit 528a2af

File tree

2 files changed

+29
-19
lines changed

2 files changed

+29
-19
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 26 additions & 16 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.20240708
11+
# version: 0.19.20250315
1212
#
13-
# REGENDATA ("0.19.20240708",["github","named.cabal"])
13+
# REGENDATA ("0.19.20250315",["github","named.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -19,7 +19,7 @@ on:
1919
jobs:
2020
linux:
2121
name: Haskell-CI - Linux - ${{ matrix.compiler }}
22-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-24.04
2323
timeout-minutes:
2424
60
2525
container:
@@ -28,6 +28,11 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31+
- compiler: ghc-9.12.1
32+
compilerKind: ghc
33+
compilerVersion: 9.12.1
34+
setup-method: ghcup
35+
allow-failure: false
3136
- compiler: ghc-9.10.1
3237
compilerKind: ghc
3338
compilerVersion: 9.10.1
@@ -45,15 +50,29 @@ jobs:
4550
allow-failure: false
4651
fail-fast: false
4752
steps:
48-
- name: apt
53+
- name: apt-get install
4954
run: |
5055
apt-get update
5156
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
57+
- name: Install GHCup
58+
run: |
5259
mkdir -p "$HOME/.ghcup/bin"
53-
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
60+
curl -sL https://downloads.haskell.org/ghcup/0.1.40.0/x86_64-linux-ghcup-0.1.40.0 > "$HOME/.ghcup/bin/ghcup"
5461
chmod a+x "$HOME/.ghcup/bin/ghcup"
55-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
62+
- name: Install cabal-install
63+
run: |
5664
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
65+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
66+
- name: Install GHC (GHCup)
67+
if: matrix.setup-method == 'ghcup'
68+
run: |
69+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
70+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
71+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
72+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
73+
echo "HC=$HC" >> "$GITHUB_ENV"
74+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
75+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
5776
env:
5877
HCKIND: ${{ matrix.compilerKind }}
5978
HCNAME: ${{ matrix.compiler }}
@@ -64,21 +83,12 @@ jobs:
6483
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
6584
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
6685
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
67-
HCDIR=/opt/$HCKIND/$HCVER
68-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
69-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
70-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
71-
echo "HC=$HC" >> "$GITHUB_ENV"
72-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
73-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
74-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
7586
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
7687
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
7788
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
7889
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
7990
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
8091
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
81-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
8292
env:
8393
HCKIND: ${{ matrix.compilerKind }}
8494
HCNAME: ${{ matrix.compiler }}
@@ -194,8 +204,8 @@ jobs:
194204
rm -f cabal.project.local
195205
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
196206
- name: save cache
197-
uses: actions/cache/save@v4
198207
if: always()
208+
uses: actions/cache/save@v4
199209
with:
200210
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
201211
path: ~/.cabal/store

named.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ bug-reports: https://github.com/monadfix/named/issues
3838
category: Control
3939
build-type: Simple
4040
extra-source-files: ChangeLog.md
41-
tested-with: GHC ==9.4.8, GHC ==9.6.6, GHC ==9.10.1
41+
tested-with: GHC ==9.4.8, GHC ==9.6.6, GHC ==9.10.1, GHC ==9.12.1
4242

4343
source-repository head
4444
type: git
4545
location: [email protected]:monadfix/named.git
4646

4747
library
4848
exposed-modules: Named, Named.Internal
49-
build-depends: base >=4.16 && <4.21
49+
build-depends: base >=4.16 && <4.22
5050
hs-source-dirs: src
5151
default-language: GHC2021
5252
ghc-options: -Wall
@@ -56,7 +56,7 @@ test-suite regression
5656
type: exitcode-stdio-1.0
5757
main-is: Test.hs
5858
other-modules: TestImport
59-
build-depends: base >=4.16 && <4.21,
59+
build-depends: base >=4.16 && <4.22,
6060
named
6161
hs-source-dirs: test
6262
default-language: GHC2021

0 commit comments

Comments
 (0)