Skip to content

Commit 5e893c9

Browse files
andreasabelandreasabel
committed
Haskell CI: bump to Ubuntu-22.04, GHC 9.2.5 and 9.4.4
1 parent 0632086 commit 5e893c9

File tree

3 files changed

+26
-45
lines changed

3 files changed

+26
-45
lines changed

‎.github/workflows/haskell-ci.yml

Lines changed: 22 additions & 41 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.15.20221009
11+
# version: 0.15.20221225
1212
#
13-
# REGENDATA ("0.15.20221009",["github","hackage-server.cabal"])
13+
# REGENDATA ("0.15.20221225",["github","hackage-server.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -29,19 +29,19 @@ jobs:
2929
timeout-minutes:
3030
60
3131
container:
32-
image: buildpack-deps:focal
32+
image: buildpack-deps:jammy
3333
continue-on-error: ${{ matrix.allow-failure }}
3434
strategy:
3535
matrix:
3636
include:
37-
- compiler: ghc-9.4.2
37+
- compiler: ghc-9.4.4
3838
compilerKind: ghc
39-
compilerVersion: 9.4.2
39+
compilerVersion: 9.4.4
4040
setup-method: ghcup
4141
allow-failure: false
42-
- compiler: ghc-9.2.4
42+
- compiler: ghc-9.2.5
4343
compilerKind: ghc
44-
compilerVersion: 9.2.4
44+
compilerVersion: 9.2.5
4545
setup-method: ghcup
4646
allow-failure: false
4747
- compiler: ghc-9.0.2
@@ -57,31 +57,21 @@ jobs:
5757
- compiler: ghc-8.8.4
5858
compilerKind: ghc
5959
compilerVersion: 8.8.4
60-
setup-method: hvr-ppa
60+
setup-method: ghcup
6161
allow-failure: false
6262
fail-fast: false
6363
steps:
6464
- name: apt
6565
run: |
6666
apt-get update
6767
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
68+
mkdir -p "$HOME/.ghcup/bin"
69+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
70+
chmod a+x "$HOME/.ghcup/bin/ghcup"
71+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
72+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
73+
apt-get update
74+
apt-get install -y libbrotli-dev
8575
env:
8676
HCKIND: ${{ matrix.compilerKind }}
8777
HCNAME: ${{ matrix.compiler }}
@@ -93,20 +83,11 @@ jobs:
9383
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
9484
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
9585
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-
86+
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
87+
echo "HC=$HC" >> "$GITHUB_ENV"
88+
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
89+
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
90+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
11091
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
11192
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
11293
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" ; else echo "ARG_TESTS=--disable-tests" >> "$GITHUB_ENV" ; fi
@@ -163,7 +144,7 @@ jobs:
163144
chmod a+x $HOME/.cabal/bin/cabal-plan
164145
cabal-plan --version
165146
- name: checkout
166-
uses: actions/checkout@v3.1.0
147+
uses: actions/checkout@v3
167148
with:
168149
path: source
169150
- name: initial cabal.project for sdist
@@ -199,7 +180,7 @@ jobs:
199180
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
200181
cabal-plan
201182
- name: cache
202-
uses: actions/cache@v2
183+
uses: actions/cache@v3
203184
with:
204185
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
205186
path: ~/.cabal/store

‎cabal.haskell-ci

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ installed: +all -Cabal -text -parsec -process
1010
-- -- allow failures with ghc-7.6 and ghc-7.8
1111
-- allow-failures: <7.9
1212

13-
-- Use Ubuntu 20.04
14-
distribution: focal
13+
-- Use Ubuntu 22.04
14+
distribution: jammy
1515

1616
apt: libbrotli-dev
1717

‎hackage-server.cabal

Lines changed: 2 additions & 2 deletions
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.4, 9.2.5, 9.0.2, 8.10.7, 8.8.4 }
3131

3232
data-dir: datafiles
3333
data-files:
@@ -123,7 +123,7 @@ common defaults
123123
-- see https://github.com/haskell/hackage-server/issues/1130
124124
, fail ^>= 4.9.0
125125
-- we use Control.Monad.Except, introduced in mtl-2.2.1
126-
, network >= 3 && < 3.2
126+
, network >= 3 && < 3.2
127127
, network-bsd ^>= 2.8
128128
, network-uri ^>= 2.6
129129
, parsec ^>= 3.1.13

0 commit comments

Comments
 (0)