Skip to content

Commit 1701cc6

Browse files
andreasabelandreasabel
committed
4000.4.1 revision 4: Bump base, network, time and CI for GHC 9.10
1 parent 20f93da commit 1701cc6

File tree

2 files changed

+46
-64
lines changed

2 files changed

+46
-64
lines changed

‎.github/workflows/haskell-ci.yml‎

Lines changed: 36 additions & 56 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.20231002
11+
# version: 0.19.20240403
1212
#
13-
# REGENDATA ("0.17.20231002",["github","HTTP.cabal"])
13+
# REGENDATA ("0.19.20240403",["github","HTTP.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,19 +32,24 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.8.0.20230929
35+
- compiler: ghc-9.10.0.20240328
3636
compilerKind: ghc
37-
compilerVersion: 9.8.0.20230929
37+
compilerVersion: 9.10.0.20240328
3838
setup-method: ghcup
39-
allow-failure: true
40-
- compiler: ghc-9.6.3
39+
allow-failure: false
40+
- compiler: ghc-9.8.2
41+
compilerKind: ghc
42+
compilerVersion: 9.8.2
43+
setup-method: ghcup
44+
allow-failure: false
45+
- compiler: ghc-9.6.4
4146
compilerKind: ghc
42-
compilerVersion: 9.6.3
47+
compilerVersion: 9.6.4
4348
setup-method: ghcup
4449
allow-failure: false
45-
- compiler: ghc-9.4.7
50+
- compiler: ghc-9.4.8
4651
compilerKind: ghc
47-
compilerVersion: 9.4.7
52+
compilerVersion: 9.4.8
4853
setup-method: ghcup
4954
allow-failure: false
5055
- compiler: ghc-9.2.8
@@ -65,56 +70,40 @@ jobs:
6570
- compiler: ghc-8.8.4
6671
compilerKind: ghc
6772
compilerVersion: 8.8.4
68-
setup-method: hvr-ppa
73+
setup-method: ghcup
6974
allow-failure: false
7075
- compiler: ghc-8.6.5
7176
compilerKind: ghc
7277
compilerVersion: 8.6.5
73-
setup-method: hvr-ppa
78+
setup-method: ghcup
7479
allow-failure: false
7580
- compiler: ghc-8.4.4
7681
compilerKind: ghc
7782
compilerVersion: 8.4.4
78-
setup-method: hvr-ppa
83+
setup-method: ghcup
7984
allow-failure: false
8085
- compiler: ghc-8.2.2
8186
compilerKind: ghc
8287
compilerVersion: 8.2.2
83-
setup-method: hvr-ppa
88+
setup-method: ghcup
8489
allow-failure: false
8590
- compiler: ghc-8.0.2
8691
compilerKind: ghc
8792
compilerVersion: 8.0.2
88-
setup-method: hvr-ppa
89-
allow-failure: false
90-
- compiler: ghc-7.10.3
91-
compilerKind: ghc
92-
compilerVersion: 7.10.3
93-
setup-method: hvr-ppa
93+
setup-method: ghcup
9494
allow-failure: false
9595
fail-fast: false
9696
steps:
9797
- name: apt
9898
run: |
9999
apt-get update
100-
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
101-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
102-
mkdir -p "$HOME/.ghcup/bin"
103-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
104-
chmod a+x "$HOME/.ghcup/bin/ghcup"
105-
"$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 ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
107-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
108-
else
109-
apt-add-repository -y 'ppa:hvr/ghc'
110-
apt-get update
111-
apt-get install -y "$HCNAME"
112-
mkdir -p "$HOME/.ghcup/bin"
113-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
114-
chmod a+x "$HOME/.ghcup/bin/ghcup"
115-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
116-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
117-
fi
100+
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
101+
mkdir -p "$HOME/.ghcup/bin"
102+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
103+
chmod a+x "$HOME/.ghcup/bin/ghcup"
104+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
105+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
106+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.3.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
118107
env:
119108
HCKIND: ${{ matrix.compilerKind }}
120109
HCNAME: ${{ matrix.compiler }}
@@ -126,27 +115,18 @@ jobs:
126115
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
127116
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
128117
HCDIR=/opt/$HCKIND/$HCVER
129-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
130-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
131-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
132-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
133-
echo "HC=$HC" >> "$GITHUB_ENV"
134-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
135-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
136-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
137-
else
138-
HC=$HCDIR/bin/$HCKIND
139-
echo "HC=$HC" >> "$GITHUB_ENV"
140-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
141-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
142-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
143-
fi
144-
118+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
119+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
120+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
121+
echo "HC=$HC" >> "$GITHUB_ENV"
122+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
123+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
124+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.3.0 -vnormal+nowrap" >> "$GITHUB_ENV"
145125
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
146126
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
147127
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
148128
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
149-
if [ $((HCNUMVER >= 90800)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
129+
if [ $((HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
150130
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
151131
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
152132
env:
@@ -249,7 +229,7 @@ jobs:
249229
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
250230
cabal-plan
251231
- name: restore cache
252-
uses: actions/cache/restore@v3
232+
uses: actions/cache/restore@v4
253233
with:
254234
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
255235
path: ~/.cabal/store
@@ -279,7 +259,7 @@ jobs:
279259
rm -f cabal.project.local
280260
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
281261
- name: save cache
282-
uses: actions/cache/save@v3
262+
uses: actions/cache/save@v4
283263
if: always()
284264
with:
285265
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

‎HTTP.cabal‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Cabal-Version: >= 1.10
22
Name: HTTP
33
Version: 4000.4.1
4-
x-revision: 3
4+
x-revision: 4
55
Build-type: Simple
66
License: BSD3
77
License-file: LICENSE
@@ -58,9 +58,10 @@ Description:
5858
Extra-Source-Files: CHANGES
5959

6060
tested-with:
61-
GHC == 9.8.0
62-
GHC == 9.6.3
63-
GHC == 9.4.7
61+
GHC == 9.10.0
62+
GHC == 9.8.2
63+
GHC == 9.6.4
64+
GHC == 9.4.8
6465
GHC == 9.2.8
6566
GHC == 9.0.2
6667
GHC == 8.10.7
@@ -69,7 +70,8 @@ tested-with:
6970
GHC == 8.4.4
7071
GHC == 8.2.2
7172
GHC == 8.0.2
72-
GHC == 7.10.3
73+
-- 2024-04-15: Dropping GHC 7.10 from CI because it does not install with ghcup on ubuntu-22.04
74+
-- GHC == 7.10.3
7375
-- 2023-10-04: Dropping GHC < 7.10 from CI
7476
-- because they need the ubuntu-18.04 image incompatible with latest 'node'
7577
-- GHC == 7.8.4
@@ -123,17 +125,17 @@ Library
123125
-- note the test harness constraints should be kept in sync with these
124126
-- where dependencies are shared
125127
build-depends:
126-
base >= 4.6.0.0 && < 4.20
128+
base >= 4.6.0.0 && < 4.21
127129
, array >= 0.3.0.2 && < 0.6
128130
, bytestring >= 0.9.1.5 && < 0.13
129131
, parsec >= 2.0 && < 3.2
130-
, time >= 1.1.2.3 && < 1.13
132+
, time >= 1.1.2.3 && < 1.15
131133
, transformers >= 0.2.0.0 && < 0.7
132134
-- transformers-0.2.0.0 is the first to have Control.Monad.IO.Class
133135
-- The following dependencies are refined by flags, but they should
134136
-- still be mentioned here on the top-level.
135137
, mtl >= 2.0.0.0 && < 2.4
136-
, network >= 2.4 && < 3.2
138+
, network >= 2.4 && < 3.3
137139

138140
default-language: Haskell98
139141
default-extensions: FlexibleInstances

0 commit comments

Comments
 (0)