Skip to content

Commit 5f8b8a2

Browse files
committed
Try to fix CI
1 parent fc3a61a commit 5f8b8a2

File tree

1 file changed

+12
-34
lines changed

1 file changed

+12
-34
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 12 additions & 34 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.17.20240109
11+
# version: 0.16.3
1212
#
13-
# REGENDATA ("0.17.20240109",["github","--config=cabal.haskell-ci","--ghc-head","cabal.project"])
13+
# REGENDATA ("0.16.3",["github","--config=cabal.haskell-ci","--ghc-head","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,26 +32,6 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.8.1
36-
compilerKind: ghc
37-
compilerVersion: 9.8.1
38-
setup-method: ghcup
39-
allow-failure: false
40-
- compiler: ghc-9.6.4
41-
compilerKind: ghc
42-
compilerVersion: 9.6.4
43-
setup-method: ghcup
44-
allow-failure: false
45-
- compiler: ghc-9.4.8
46-
compilerKind: ghc
47-
compilerVersion: 9.4.8
48-
setup-method: ghcup
49-
allow-failure: false
50-
- compiler: ghc-9.2.8
51-
compilerKind: ghc
52-
compilerVersion: 9.2.8
53-
setup-method: ghcup
54-
allow-failure: false
5535
- compiler: ghc-9.0.2
5636
compilerKind: ghc
5737
compilerVersion: 9.0.2
@@ -90,20 +70,20 @@ jobs:
9070
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
9171
if [ "${{ matrix.setup-method }}" = ghcup ]; then
9272
mkdir -p "$HOME/.ghcup/bin"
93-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
73+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
9474
chmod a+x "$HOME/.ghcup/bin/ghcup"
9575
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
9676
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
97-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
77+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
9878
else
9979
apt-add-repository -y 'ppa:hvr/ghc'
10080
apt-get update
10181
apt-get install -y "$HCNAME"
10282
mkdir -p "$HOME/.ghcup/bin"
103-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
83+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
10484
chmod a+x "$HOME/.ghcup/bin/ghcup"
10585
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
106-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
86+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
10787
fi
10888
env:
10989
HCKIND: ${{ matrix.compilerKind }}
@@ -117,26 +97,24 @@ jobs:
11797
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
11898
HCDIR=/opt/$HCKIND/$HCVER
11999
if [ "${{ matrix.setup-method }}" = ghcup ]; then
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#')
100+
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
123101
echo "HC=$HC" >> "$GITHUB_ENV"
124-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
125-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
126-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
102+
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
103+
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
104+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
127105
else
128106
HC=$HCDIR/bin/$HCKIND
129107
echo "HC=$HC" >> "$GITHUB_ENV"
130108
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
131109
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
132-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
110+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
133111
fi
134112
135113
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
136114
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
137115
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
138116
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
139-
if [ $((HCNUMVER > 90801)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
117+
if [ $((HCNUMVER > 90002)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
140118
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
141119
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
142120
env:

0 commit comments

Comments
 (0)