Skip to content

Commit cec74ab

Browse files
committed
Haskell-CI: use preinstalled packages
1 parent 3f0535b commit cec74ab

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 12 additions & 11 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.17.20240127
11+
# version: 0.18.1.20240316
1212
#
13-
# REGENDATA ("0.17.20240127",["github","cabal.project"])
13+
# REGENDATA ("0.18.1.20240316",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -37,9 +37,9 @@ jobs:
3737
compilerVersion: 9.8.1
3838
setup-method: ghcup
3939
allow-failure: false
40-
- compiler: ghc-9.6.3
40+
- compiler: ghc-9.6.4
4141
compilerKind: ghc
42-
compilerVersion: 9.6.3
42+
compilerVersion: 9.6.4
4343
setup-method: ghcup
4444
allow-failure: false
4545
- compiler: ghc-9.4.8
@@ -96,8 +96,9 @@ jobs:
9696
mkdir -p "$HOME/.ghcup/bin"
9797
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
9898
chmod a+x "$HOME/.ghcup/bin/ghcup"
99+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
99100
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
100-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
101+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.1 || (cat "$HOME"/.ghcup/logs/*.* && false)
101102
env:
102103
HCKIND: ${{ matrix.compilerKind }}
103104
HCNAME: ${{ matrix.compiler }}
@@ -115,7 +116,7 @@ jobs:
115116
echo "HC=$HC" >> "$GITHUB_ENV"
116117
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
117118
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
118-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
119+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.1 -vnormal+nowrap" >> "$GITHUB_ENV"
119120
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
120121
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
121122
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -292,11 +293,11 @@ jobs:
292293
rm -f cabal.project.local
293294
- name: constraint set containers-0.7
294295
run: |
295-
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' all --dry-run ; fi
296-
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then cabal-plan topo | sort ; fi
297-
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' --dependencies-only -j2 all ; fi
298-
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' all ; fi
299-
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' all ; fi
296+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' all --dry-run ; fi
297+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then cabal-plan topo | sort ; fi
298+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' --dependencies-only -j2 all ; fi
299+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' all ; fi
300+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='containers >= 0.7' all ; fi
300301
- name: constraint set no-lukko
301302
run: |
302303
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='hackage-security -lukko' all --dry-run ; fi

cabal.haskell-ci

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
branches: master
2+
installed: +all
23

34
-- Andreas, 2023-07-01: We use some haddock features that are new in 8.6.
45
haddock: >= 8.6
@@ -19,7 +20,7 @@ constraint-set no-lukko
1920
constraints: hackage-security -lukko
2021

2122
constraint-set containers-0.7
22-
ghc: >= 8.2 && < 9.8
23+
ghc: >= 8.2 && < 9.10
2324
constraints: containers >= 0.7
2425
tests: True
2526
run-tests: True

0 commit comments

Comments
 (0)