Skip to content

Commit ecc09e4

Browse files
committed
Fix CI
1 parent c245f9d commit ecc09e4

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -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-18.04
2323
timeout-minutes:
2424
60
2525
container:
@@ -116,21 +116,21 @@ jobs:
116116
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
117117
if [ "${{ matrix.setup-method }}" = ghcup ]; then
118118
mkdir -p "$HOME/.ghcup/bin"
119-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
119+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.0/x86_64-linux-ghcup-0.1.19.0 > "$HOME/.ghcup/bin/ghcup"
120120
chmod a+x "$HOME/.ghcup/bin/ghcup"
121121
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
122122
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
123-
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
123+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
124124
apt-get update
125125
apt-get install -y zlib1g-dev
126126
else
127127
apt-add-repository -y 'ppa:hvr/ghc'
128128
apt-get update
129129
apt-get install -y "$HCNAME" zlib1g-dev
130130
mkdir -p "$HOME/.ghcup/bin"
131-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
131+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.0/x86_64-linux-ghcup-0.1.19.0 > "$HOME/.ghcup/bin/ghcup"
132132
chmod a+x "$HOME/.ghcup/bin/ghcup"
133-
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
133+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
134134
fi
135135
env:
136136
HCKIND: ${{ matrix.compilerKind }}
@@ -148,13 +148,13 @@ jobs:
148148
echo "HC=$HC" >> "$GITHUB_ENV"
149149
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
150150
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
151-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
151+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
152152
else
153153
HC=$HCDIR/bin/$HCKIND
154154
echo "HC=$HC" >> "$GITHUB_ENV"
155155
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
156156
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
157-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
157+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
158158
fi
159159
160160
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')

0 commit comments

Comments
 (0)