Skip to content

Commit baadb83

Browse files
committed
v0.0.1.3: drop support for GHC 7
1 parent f6039aa commit baadb83

File tree

3 files changed

+20
-40
lines changed

3 files changed

+20
-40
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 6 additions & 22 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.19.20240422
11+
# version: 0.19.20240517
1212
#
13-
# REGENDATA ("0.19.20240422",["github","xor.cabal"])
13+
# REGENDATA ("0.19.20240517",["github","xor.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,9 +32,9 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.10.0.20240413
35+
- compiler: ghc-9.10.1
3636
compilerKind: ghc
37-
compilerVersion: 9.10.0.20240413
37+
compilerVersion: 9.10.1
3838
setup-method: ghcup
3939
allow-failure: false
4040
- compiler: ghc-9.8.2
@@ -101,7 +101,6 @@ jobs:
101101
mkdir -p "$HOME/.ghcup/bin"
102102
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
103103
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;
105104
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
106105
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.3.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
107106
env:
@@ -126,7 +125,7 @@ jobs:
126125
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
127126
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
128127
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
129-
if [ $((HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
128+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
130129
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
131130
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
132131
env:
@@ -155,18 +154,6 @@ jobs:
155154
repository hackage.haskell.org
156155
url: http://hackage.haskell.org/
157156
EOF
158-
if $HEADHACKAGE; then
159-
cat >> $CABAL_CONFIG <<EOF
160-
repository head.hackage.ghc.haskell.org
161-
url: https://ghc.gitlab.haskell.org/head.hackage/
162-
secure: True
163-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
164-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
165-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
166-
key-threshold: 3
167-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
168-
EOF
169-
fi
170157
cat >> $CABAL_CONFIG <<EOF
171158
program-default-options
172159
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -218,10 +205,7 @@ jobs:
218205
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
219206
cat >> cabal.project <<EOF
220207
EOF
221-
if $HEADHACKAGE; then
222-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
223-
fi
224-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(xor)$/; }' >> cabal.project.local
208+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(xor)$/; }' >> cabal.project.local
225209
cat cabal.project
226210
cat cabal.project.local
227211
- name: dump install plan

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11

2+
## 0.0.1.3
3+
4+
_Andreas Abel, 2024-06-25_
5+
6+
- Drop support for GHC 7.
7+
- Tested with GHC 8.0 - 9.10.
8+
29
## 0.0.1.2
310

411
_Andreas Abel, 2023-07-19_

xor.cabal

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
cabal-version: 2.2
22
name: xor
3-
version: 0.0.1.2
4-
x-revision: 3
3+
version: 0.0.1.3
54

65
category: Data, Codec
76
author: Herbert Valerio Riedel
@@ -31,7 +30,7 @@ description:
3130
The performance is comparable to portable ISO C99 implementations but this library is implemented as pure Haskell and is thereby compatible with compile targets such as <https://github.com/ghcjs/ghcjs GHCJS>.
3231

3332
tested-with:
34-
GHC == 9.10.0
33+
GHC == 9.10.1
3534
GHC == 9.8.2
3635
GHC == 9.6.5
3736
GHC == 9.4.8
@@ -43,7 +42,6 @@ tested-with:
4342
GHC == 8.4.4
4443
GHC == 8.2.2
4544
GHC == 8.0.2
46-
-- GHC == 7.10.3
4745

4846
extra-doc-files:
4947
CHANGELOG.md
@@ -60,22 +58,13 @@ common defaults
6058
MagicHash
6159

6260
build-depends:
63-
, base >= 4.5 && < 5
61+
, base >= 4.9 && < 5
6462
, bytestring >= 0.10.4 && < 0.13
6563
, ghc-byteorder ^>= 4.11.0.0
6664

67-
-- Andreas Abel, 2022-02-16:
68-
-- There are build failures with bytestring-0.11 and GHC 7
69-
-- because the PS constructor was removed and retained as PatternSynonym
70-
-- (for GHC 8 only, according to the release notes).
71-
-- The following dependency rectifies this:
72-
if !impl(ghc >= 8.0)
73-
build-depends:
74-
bytestring < 0.11
75-
76-
ghc-options: -Wall
77-
if impl(ghc >= 8.0)
78-
ghc-options: -Wcompat
65+
ghc-options:
66+
-Wall
67+
-Wcompat
7968

8069
library
8170
import: defaults
@@ -115,5 +104,5 @@ test-suite test
115104
-- dependencies specific to this component
116105
, tasty >= 1.2.3 && < 1.6
117106
, tasty-hunit ^>= 0.10
118-
, tasty-quickcheck ^>= 0.10
107+
, tasty-quickcheck >= 0.10 && < 1
119108
, QuickCheck >= 2.14 && < 2.16

0 commit comments

Comments
 (0)