Skip to content

Commit 6d516a7

Browse files
committed
CI: add GHC 9.12.1 job
1 parent bd8cae7 commit 6d516a7

File tree

3 files changed

+59
-17
lines changed

3 files changed

+59
-17
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 55 additions & 15 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.20240608
11+
# version: 0.19.20241121
1212
#
13-
# REGENDATA ("0.19.20240608",["github","cabal.project"])
13+
# REGENDATA ("0.19.20241121",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -28,6 +28,11 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31+
- compiler: ghc-9.12.0.20241114
32+
compilerKind: ghc
33+
compilerVersion: 9.12.0.20241114
34+
setup-method: ghcup-prerelease
35+
allow-failure: false
3136
- compiler: ghc-9.10.1
3237
compilerKind: ghc
3338
compilerVersion: 9.10.1
@@ -80,40 +85,60 @@ jobs:
8085
allow-failure: false
8186
fail-fast: false
8287
steps:
83-
- name: apt
88+
- name: apt-get install
8489
run: |
8590
apt-get update
8691
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
92+
- name: Install GHCup
93+
run: |
8794
mkdir -p "$HOME/.ghcup/bin"
88-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
95+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
8996
chmod a+x "$HOME/.ghcup/bin/ghcup"
97+
- name: Install cabal-install
98+
run: |
99+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
100+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
101+
- name: Install GHC (GHCup)
102+
if: matrix.setup-method == 'ghcup'
103+
run: |
90104
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
91-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
105+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
106+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
107+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
108+
echo "HC=$HC" >> "$GITHUB_ENV"
109+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
110+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
92111
env:
93112
HCKIND: ${{ matrix.compilerKind }}
94113
HCNAME: ${{ matrix.compiler }}
95114
HCVER: ${{ matrix.compilerVersion }}
96-
- name: Set PATH and environment variables
115+
- name: Install GHC (GHCup prerelease)
116+
if: matrix.setup-method == 'ghcup-prerelease'
97117
run: |
98-
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
99-
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
100-
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
101-
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
102-
HCDIR=/opt/$HCKIND/$HCVER
118+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
119+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
103120
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
104121
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
105122
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
106123
echo "HC=$HC" >> "$GITHUB_ENV"
107124
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
108125
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
109-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
126+
env:
127+
HCKIND: ${{ matrix.compilerKind }}
128+
HCNAME: ${{ matrix.compiler }}
129+
HCVER: ${{ matrix.compilerVersion }}
130+
- name: Set PATH and environment variables
131+
run: |
132+
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
133+
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
134+
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
135+
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
110136
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
111137
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
112138
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
113139
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
114-
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
140+
if [ $((HCNUMVER >= 91200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
115141
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
116-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
117142
env:
118143
HCKIND: ${{ matrix.compilerKind }}
119144
HCNAME: ${{ matrix.compiler }}
@@ -140,6 +165,18 @@ jobs:
140165
repository hackage.haskell.org
141166
url: http://hackage.haskell.org/
142167
EOF
168+
if $HEADHACKAGE; then
169+
cat >> $CABAL_CONFIG <<EOF
170+
repository head.hackage.ghc.haskell.org
171+
url: https://ghc.gitlab.haskell.org/head.hackage/
172+
secure: True
173+
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
174+
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
175+
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
176+
key-threshold: 3
177+
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
178+
EOF
179+
fi
143180
cat >> $CABAL_CONFIG <<EOF
144181
program-default-options
145182
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -197,6 +234,9 @@ jobs:
197234
echo " ghc-options: -Werror=missing-methods" >> cabal.project
198235
cat >> cabal.project <<EOF
199236
EOF
237+
if $HEADHACKAGE; then
238+
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
239+
fi
200240
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(bytestring|directory|filepath|htar|tar|unix)$/; }' >> cabal.project.local
201241
cat cabal.project
202242
cat cabal.project.local
@@ -237,8 +277,8 @@ jobs:
237277
rm -f cabal.project.local
238278
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
239279
- name: save cache
240-
uses: actions/cache/save@v4
241280
if: always()
281+
uses: actions/cache/save@v4
242282
with:
243283
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
244284
path: ~/.cabal/store

htar/htar.cabal

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ description: A Command-line utility to create, extract and list the
1818
like Windows that do not come with it as standard.
1919
build-type: Simple
2020
cabal-version: 2.0
21-
tested-with: GHC==9.10.1, GHC==9.8.2, GHC==9.6.5, GHC==9.4.8, GHC==9.2.8, GHC==9.0.2,
21+
tested-with: GHC==9.12.1, GHC==9.10.1, GHC==9.8.2,
22+
GHC==9.6.5, GHC==9.4.8, GHC==9.2.8, GHC==9.0.2,
2223
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4
2324

2425
executable htar

tar.cabal

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ extra-source-files:
2929
test/data/symlink.tar
3030
extra-doc-files: changelog.md
3131
README.md
32-
tested-with: GHC==9.10.1, GHC==9.8.2, GHC==9.6.5, GHC==9.4.8, GHC==9.2.8, GHC==9.0.2,
32+
tested-with: GHC==9.12.1, GHC==9.10.1, GHC==9.8.2,
33+
GHC==9.6.5, GHC==9.4.8, GHC==9.2.8, GHC==9.0.2,
3334
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4
3435

3536
source-repository head

0 commit comments

Comments
 (0)