Skip to content

Commit bad04ae

Browse files
ci: add ghc-9.12 to matrix
1 parent cbda840 commit bad04ae

File tree

2 files changed

+33
-23
lines changed

2 files changed

+33
-23
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 32 additions & 22 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.20250506
1212
#
13-
# REGENDATA ("0.19.20240708",["github","jose.cabal","--haddock"])
13+
# REGENDATA ("0.19.20250506",["github","jose.cabal","--haddock"])
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,19 +28,24 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.10.1
31+
- compiler: ghc-9.12.2
3232
compilerKind: ghc
33-
compilerVersion: 9.10.1
33+
compilerVersion: 9.12.2
3434
setup-method: ghcup
3535
allow-failure: false
36-
- compiler: ghc-9.8.2
36+
- compiler: ghc-9.10.2
3737
compilerKind: ghc
38-
compilerVersion: 9.8.2
38+
compilerVersion: 9.10.2
3939
setup-method: ghcup
4040
allow-failure: false
41-
- compiler: ghc-9.6.6
41+
- compiler: ghc-9.8.4
4242
compilerKind: ghc
43-
compilerVersion: 9.6.6
43+
compilerVersion: 9.8.4
44+
setup-method: ghcup
45+
allow-failure: false
46+
- compiler: ghc-9.6.7
47+
compilerKind: ghc
48+
compilerVersion: 9.6.7
4449
setup-method: ghcup
4550
allow-failure: false
4651
- compiler: ghc-9.4.8
@@ -70,15 +75,29 @@ jobs:
7075
allow-failure: false
7176
fail-fast: false
7277
steps:
73-
- name: apt
78+
- name: apt-get install
7479
run: |
7580
apt-get update
7681
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
82+
- name: Install GHCup
83+
run: |
7784
mkdir -p "$HOME/.ghcup/bin"
78-
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
85+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
7986
chmod a+x "$HOME/.ghcup/bin/ghcup"
87+
- name: Install cabal-install
88+
run: |
89+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
90+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
91+
- name: Install GHC (GHCup)
92+
if: matrix.setup-method == 'ghcup'
93+
run: |
8094
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
81-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
95+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
96+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
97+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
98+
echo "HC=$HC" >> "$GITHUB_ENV"
99+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
100+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
82101
env:
83102
HCKIND: ${{ matrix.compilerKind }}
84103
HCNAME: ${{ matrix.compiler }}
@@ -89,21 +108,12 @@ jobs:
89108
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
90109
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
91110
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
92-
HCDIR=/opt/$HCKIND/$HCVER
93-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
94-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
95-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
96-
echo "HC=$HC" >> "$GITHUB_ENV"
97-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
98-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
99-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
100111
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
101112
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
102113
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
103114
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
104115
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
105116
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
106-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
107117
env:
108118
HCKIND: ${{ matrix.compilerKind }}
109119
HCNAME: ${{ matrix.compiler }}
@@ -219,8 +229,8 @@ jobs:
219229
rm -f cabal.project.local
220230
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
221231
- name: save cache
222-
uses: actions/cache/save@v4
223232
if: always()
233+
uses: actions/cache/save@v4
224234
with:
225235
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
226236
path: ~/.cabal/store

jose.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ copyright: Copyright (C) 2013-2021 Fraser Tweedale
3333
category: Cryptography
3434
build-type: Simple
3535
tested-with:
36-
GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.6 || ==9.8.2 || ==9.10.1
36+
GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.7 || ==9.8.4 || ==9.10.2 || ==9.12.2
3737

3838
flag demos
3939
description: Build demonstration programs

0 commit comments

Comments
 (0)