Skip to content

Commit 07633d9

Browse files
committed
Update CI
1 parent 98400e8 commit 07633d9

File tree

2 files changed

+25
-20
lines changed

2 files changed

+25
-20
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/andreasabel/haskell-ci
1010
#
11-
# version: 0.19.20241021
11+
# version: 0.19.20241219
1212
#
13-
# REGENDATA ("0.19.20241021",["github","parallel.cabal"])
13+
# REGENDATA ("0.19.20241219",["github","parallel.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,19 +32,19 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.12.20241014
35+
- compiler: ghc-9.12.1
3636
compilerKind: ghc
37-
compilerVersion: 9.12.20241014
37+
compilerVersion: 9.12.1
3838
setup-method: ghcup
3939
allow-failure: false
4040
- compiler: ghc-9.10.1
4141
compilerKind: ghc
4242
compilerVersion: 9.10.1
4343
setup-method: ghcup
4444
allow-failure: false
45-
- compiler: ghc-9.8.2
45+
- compiler: ghc-9.8.4
4646
compilerKind: ghc
47-
compilerVersion: 9.8.2
47+
compilerVersion: 9.8.4
4848
setup-method: ghcup
4949
allow-failure: false
5050
- compiler: ghc-9.6.6
@@ -99,16 +99,30 @@ jobs:
9999
allow-failure: false
100100
fail-fast: false
101101
steps:
102-
- name: apt
102+
- name: apt-get install
103103
run: |
104104
apt-get update
105105
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
106+
- name: Install GHCup
107+
run: |
106108
mkdir -p "$HOME/.ghcup/bin"
107109
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
108110
chmod a+x "$HOME/.ghcup/bin/ghcup"
111+
- name: Install cabal-install (prerelease)
112+
run: |
109113
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
114+
"$HOME/.ghcup/bin/ghcup" install cabal 3.15.0.0.2024.10.3 || (cat "$HOME"/.ghcup/logs/*.* && false)
115+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.15.0.0.2024.10.3 -vnormal+nowrap" >> "$GITHUB_ENV"
116+
- name: Install GHC (GHCup)
117+
if: matrix.setup-method == 'ghcup'
118+
run: |
110119
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
111-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
120+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
121+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
122+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
123+
echo "HC=$HC" >> "$GITHUB_ENV"
124+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
125+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
112126
env:
113127
HCKIND: ${{ matrix.compilerKind }}
114128
HCNAME: ${{ matrix.compiler }}
@@ -119,21 +133,12 @@ jobs:
119133
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
120134
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
121135
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
122-
HCDIR=/opt/$HCKIND/$HCVER
123-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
124-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
125-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
126-
echo "HC=$HC" >> "$GITHUB_ENV"
127-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
128-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
129-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
130136
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
131137
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
132138
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
133139
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
134140
if [ $((HCNUMVER >= 91200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
135141
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
136-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
137142
env:
138143
HCKIND: ${{ matrix.compilerKind }}
139144
HCNAME: ${{ matrix.compiler }}
@@ -261,8 +266,8 @@ jobs:
261266
rm -f cabal.project.local
262267
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
263268
- name: save cache
264-
uses: actions/cache/save@v4
265269
if: always()
270+
uses: actions/cache/save@v4
266271
with:
267272
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
268273
path: ~/.cabal/store

parallel.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ category: Control, Parallelism
1212
build-type: Simple
1313

1414
tested-with:
15-
GHC == 9.12.0
15+
GHC == 9.12.1
1616
GHC == 9.10.1
17-
GHC == 9.8.2
17+
GHC == 9.8.4
1818
GHC == 9.6.6
1919
GHC == 9.4.8
2020
GHC == 9.2.8

0 commit comments

Comments
 (0)