Skip to content

Commit 1a9764c

Browse files
andreasabelandreasabel
committed
Drop support for GHC 7, require base >= 4.9
1 parent 51cdec3 commit 1a9764c

File tree

16 files changed

+45
-95
lines changed

16 files changed

+45
-95
lines changed

‎.github/workflows/haskell-ci.yml

Lines changed: 14 additions & 38 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.20231112
11+
# version: 0.17.20240106
1212
#
13-
# REGENDATA ("0.17.20231112",["github","cabal.project"])
13+
# REGENDATA ("0.17.20240106",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -87,32 +87,17 @@ jobs:
8787
compilerVersion: 8.0.2
8888
setup-method: ghcup
8989
allow-failure: false
90-
- compiler: ghc-7.10.3
91-
compilerKind: ghc
92-
compilerVersion: 7.10.3
93-
setup-method: hvr-ppa
94-
allow-failure: false
9590
fail-fast: false
9691
steps:
9792
- name: apt
9893
run: |
9994
apt-get update
10095
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
101-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
102-
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"
104-
chmod a+x "$HOME/.ghcup/bin/ghcup"
105-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
106-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
107-
else
108-
apt-add-repository -y 'ppa:hvr/ghc'
109-
apt-get update
110-
apt-get install -y "$HCNAME"
111-
mkdir -p "$HOME/.ghcup/bin"
112-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
113-
chmod a+x "$HOME/.ghcup/bin/ghcup"
114-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
115-
fi
96+
mkdir -p "$HOME/.ghcup/bin"
97+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
98+
chmod a+x "$HOME/.ghcup/bin/ghcup"
99+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
100+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
116101
env:
117102
HCKIND: ${{ matrix.compilerKind }}
118103
HCNAME: ${{ matrix.compiler }}
@@ -124,22 +109,13 @@ jobs:
124109
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
125110
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
126111
HCDIR=/opt/$HCKIND/$HCVER
127-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
128-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
129-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
130-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
131-
echo "HC=$HC" >> "$GITHUB_ENV"
132-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
133-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
134-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
135-
else
136-
HC=$HCDIR/bin/$HCKIND
137-
echo "HC=$HC" >> "$GITHUB_ENV"
138-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
139-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
140-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
141-
fi
142-
112+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
113+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
114+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
115+
echo "HC=$HC" >> "$GITHUB_ENV"
116+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
117+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
118+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
143119
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
144120
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
145121
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

‎example-client/example-client.cabal

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ tested-with:
2323
GHC == 8.4.4
2424
GHC == 8.2.2
2525
GHC == 8.0.2
26-
GHC == 7.10.3
2726

2827
flag use-network-uri
2928
description: Are we using network-uri?
@@ -38,7 +37,7 @@ executable example-client
3837
main-is: Main.hs
3938
other-modules: ExampleClient.Options
4039

41-
build-depends: base >= 4.8 && < 4.20,
40+
build-depends: base >= 4.9 && < 4.20,
4241
bytestring >= 0.9,
4342
directory >= 1.2,
4443
filepath >= 1.2,

‎hackage-repo-tool/ChangeLog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Unreleased
2+
----------
3+
* Drop support for GHC 7.
4+
15
0.1.1.3
26
-------
37
* Compat release for `Cabal-syntax-3.8.1.0`

‎hackage-repo-tool/hackage-repo-tool.cabal

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ tested-with:
3535
GHC == 8.4.4
3636
GHC == 8.2.2
3737
GHC == 8.0.2
38-
GHC == 7.10.3
3938

4039
extra-source-files:
4140
ChangeLog.md README.md
@@ -64,7 +63,7 @@ executable hackage-repo-tool
6463

6564
-- For boot libraries we try to accomodate the versions bundled with
6665
-- the respective GHC release
67-
build-depends: base >= 4.8 && < 4.20,
66+
build-depends: base >= 4.9 && < 4.20,
6867
bytestring >= 0.9 && < 0.13,
6968
directory >= 1.2 && < 1.4,
7069
filepath >= 1.3 && < 1.5,

‎hackage-root-tool/hackage-root-tool.cabal

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ tested-with:
2727
GHC == 8.4.4
2828
GHC == 8.2.2
2929
GHC == 8.0.2
30-
GHC == 7.10.3
3130

3231
extra-source-files:
3332
ChangeLog.md
@@ -39,7 +38,7 @@ source-repository head
3938

4039
executable hackage-root-tool
4140
main-is: Main.hs
42-
build-depends: base >= 4.8 && < 5,
41+
build-depends: base >= 4.9 && < 5,
4342
filepath >= 1.2 && < 1.5,
4443
optparse-applicative >= 0.11 && < 0.18,
4544
hackage-security >= 0.5 && < 0.7

‎hackage-security-HTTP/ChangeLog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Unreleased
2+
----------
3+
* Drop support for GHC 7.
4+
5+
16
0.1.1.1
27
-------
38
* Add support for hackage-security-0.6

‎hackage-security-HTTP/hackage-security-HTTP.cabal

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ tested-with:
2929
GHC == 8.4.4
3030
GHC == 8.2.2
3131
GHC == 8.0.2
32-
GHC == 7.10.3
3332

3433
extra-source-files:
3534
ChangeLog.md
@@ -44,7 +43,7 @@ flag use-network-uri
4443

4544
library
4645
exposed-modules: Hackage.Security.Client.Repository.HttpLib.HTTP
47-
build-depends: base >= 4.8 && < 4.20,
46+
build-depends: base >= 4.9 && < 4.20,
4847
bytestring >= 0.9 && < 0.13,
4948
HTTP >= 4000.2.19 && < 4000.5,
5049
mtl >= 2.1 && < 2.4,

‎hackage-security-curl/hackage-security-curl.cabal

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,14 @@ tested-with:
2727
GHC == 8.4.4
2828
GHC == 8.2.2
2929
GHC == 8.0.2
30-
GHC == 7.10.3
3130

3231
flag use-network-uri
3332
description: Are we using network-uri?
3433
manual: False
3534

3635
library
3736
exposed-modules: Hackage.Security.Client.Repository.HttpLib.Curl
38-
build-depends: base >= 4.8 && < 4.20,
37+
build-depends: base >= 4.9 && < 4.20,
3938
bytestring >= 0.9,
4039
process >= 1.1,
4140
hackage-security

‎hackage-security-http-client/ChangeLog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Unreleased
2+
----------
3+
* Drop support for GHC 7.
4+
15
0.1.1
26
-----
37
* Implement updated HttpLib API from hackage-security 0.5

‎hackage-security-http-client/hackage-security-http-client.cabal

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,14 @@ tested-with:
2626
GHC == 8.4.4
2727
GHC == 8.2.2
2828
GHC == 8.0.2
29-
GHC == 7.10.3
3029

3130
flag use-network-uri
3231
description: Are we using network-uri?
3332
manual: False
3433

3534
library
3635
exposed-modules: Hackage.Security.Client.Repository.HttpLib.HttpClient
37-
build-depends: base >= 4.8 && < 4.20,
36+
build-depends: base >= 4.9 && < 4.20,
3837
bytestring >= 0.9,
3938
http-client >= 0.4 && < 0.8,
4039
http-types >= 0.8,

0 commit comments

Comments
 (0)