Skip to content

Commit 2caabc9

Browse files
committed
Drop GHC 8.8 and fix ghc to installed version on CI
1 parent 32505ed commit 2caabc9

File tree

3 files changed

+17
-38
lines changed

3 files changed

+17
-38
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 15 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -54,34 +54,19 @@ jobs:
5454
compilerVersion: 8.10.7
5555
setup-method: ghcup
5656
allow-failure: false
57-
- compiler: ghc-8.8.4
58-
compilerKind: ghc
59-
compilerVersion: 8.8.4
60-
setup-method: hvr-ppa
61-
allow-failure: false
6257
fail-fast: false
6358
steps:
6459
- name: apt
6560
run: |
6661
apt-get update
6762
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
68-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
69-
mkdir -p "$HOME/.ghcup/bin"
70-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
71-
chmod a+x "$HOME/.ghcup/bin/ghcup"
72-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
73-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
74-
apt-get update
75-
apt-get install -y libbrotli-dev
76-
else
77-
apt-add-repository -y 'ppa:hvr/ghc'
78-
apt-get update
79-
apt-get install -y "$HCNAME" libbrotli-dev
80-
mkdir -p "$HOME/.ghcup/bin"
81-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
82-
chmod a+x "$HOME/.ghcup/bin/ghcup"
83-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
84-
fi
63+
mkdir -p "$HOME/.ghcup/bin"
64+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
65+
chmod a+x "$HOME/.ghcup/bin/ghcup"
66+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
67+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
68+
apt-get update
69+
apt-get install -y libbrotli-dev
8570
env:
8671
HCKIND: ${{ matrix.compilerKind }}
8772
HCNAME: ${{ matrix.compiler }}
@@ -93,20 +78,11 @@ jobs:
9378
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
9479
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
9580
HCDIR=/opt/$HCKIND/$HCVER
96-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
97-
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
98-
echo "HC=$HC" >> "$GITHUB_ENV"
99-
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
100-
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
101-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
102-
else
103-
HC=$HCDIR/bin/$HCKIND
104-
echo "HC=$HC" >> "$GITHUB_ENV"
105-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
106-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
107-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
108-
fi
109-
81+
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
82+
echo "HC=$HC" >> "$GITHUB_ENV"
83+
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
84+
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
85+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
11086
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
11187
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
11288
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -191,6 +167,9 @@ jobs:
191167
echo " ghc-options: -Werror=missing-methods" >> cabal.project
192168
cat >> cabal.project <<EOF
193169
EOF
170+
cat >> cabal.project.local <<EOF
171+
constraints: ghc installed
172+
EOF
194173
cat cabal.project
195174
cat cabal.project.local
196175
- name: dump install plan

cabal.haskell-ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
branches: master ci*
22

3-
installed: -all
3+
installed: -all +ghc
44
-- installed: +all -Cabal -text -parsec
55

66
-- -- irc-channels works with GHA, but why send to a channel

hackage-server.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ copyright: 2008-2015 Duncan Coutts,
2727
license: BSD-3-Clause
2828
license-file: LICENSE
2929

30-
tested-with: GHC == { 9.4.2, 9.2.4, 9.0.2, 8.10.7, 8.8.4 }
30+
tested-with: GHC == { 9.4.2, 9.2.4, 9.0.2, 8.10.7 }
3131

3232
data-dir: datafiles
3333
data-files:

0 commit comments

Comments
 (0)