Skip to content

Commit f63f92c

Browse files
andreasabelandreasabel
committed
Bump hspec to allow 2.11
1 parent 9944c53 commit f63f92c

File tree

3 files changed

+24
-41
lines changed

3 files changed

+24
-41
lines changed

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

Lines changed: 16 additions & 33 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.20230217
11+
# version: 0.16
1212
#
13-
# REGENDATA ("0.15.20230217",["--config=cabal.haskell-ci","github","cabal.project"])
13+
# REGENDATA ("0.16",["--config=cabal.haskell-ci","github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -34,19 +34,19 @@ jobs:
3434
strategy:
3535
matrix:
3636
include:
37-
- compiler: ghc-9.6.0.20230210
37+
- compiler: ghc-9.6.1
3838
compilerKind: ghc
39-
compilerVersion: 9.6.0.20230210
39+
compilerVersion: 9.6.1
4040
setup-method: ghcup
41-
allow-failure: true
41+
allow-failure: false
4242
- compiler: ghc-9.4.4
4343
compilerKind: ghc
4444
compilerVersion: 9.4.4
4545
setup-method: ghcup
4646
allow-failure: false
47-
- compiler: ghc-9.2.6
47+
- compiler: ghc-9.2.7
4848
compilerKind: ghc
49-
compilerVersion: 9.2.6
49+
compilerVersion: 9.2.7
5050
setup-method: ghcup
5151
allow-failure: false
5252
- compiler: ghc-9.0.2
@@ -102,20 +102,18 @@ jobs:
102102
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
103103
if [ "${{ matrix.setup-method }}" = ghcup ]; then
104104
mkdir -p "$HOME/.ghcup/bin"
105-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
105+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
106106
chmod a+x "$HOME/.ghcup/bin/ghcup"
107-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
108107
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
109-
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
108+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
110109
else
111110
apt-add-repository -y 'ppa:hvr/ghc'
112111
apt-get update
113112
apt-get install -y "$HCNAME"
114113
mkdir -p "$HOME/.ghcup/bin"
115-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
114+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
116115
chmod a+x "$HOME/.ghcup/bin/ghcup"
117-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
118-
"$HOME/.ghcup/bin/ghcup" install cabal 3.9.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
116+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
119117
fi
120118
env:
121119
HCKIND: ${{ matrix.compilerKind }}
@@ -133,20 +131,20 @@ jobs:
133131
echo "HC=$HC" >> "$GITHUB_ENV"
134132
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
135133
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
136-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
134+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
137135
else
138136
HC=$HCDIR/bin/$HCKIND
139137
echo "HC=$HC" >> "$GITHUB_ENV"
140138
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
141139
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
142-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.9.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
140+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
143141
fi
144142
145143
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
146144
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
147145
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
148146
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
149-
if [ $((HCNUMVER >= 90600)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
147+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
150148
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
151149
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
152150
env:
@@ -175,18 +173,6 @@ jobs:
175173
repository hackage.haskell.org
176174
url: http://hackage.haskell.org/
177175
EOF
178-
if $HEADHACKAGE; then
179-
cat >> $CABAL_CONFIG <<EOF
180-
repository head.hackage.ghc.haskell.org
181-
url: https://ghc.gitlab.haskell.org/head.hackage/
182-
secure: True
183-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
184-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
185-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
186-
key-threshold: 3
187-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
188-
EOF
189-
fi
190176
cat >> $CABAL_CONFIG <<EOF
191177
program-default-options
192178
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -203,8 +189,8 @@ jobs:
203189
- name: install cabal-plan
204190
run: |
205191
mkdir -p $HOME/.cabal/bin
206-
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
207-
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
192+
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz
193+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
208194
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
209195
rm -f cabal-plan.xz
210196
chmod a+x $HOME/.cabal/bin/cabal-plan
@@ -248,9 +234,6 @@ jobs:
248234
constraints: operational -buildExamples
249235
optimization: False
250236
EOF
251-
if $HEADHACKAGE; then
252-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
253-
fi
254237
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(github|github-samples)$/; }' >> cabal.project.local
255238
cat cabal.project
256239
cat cabal.project.local

‎github.cabal‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: >=1.10
22
name: github
33
version: 0.28.0.1
4-
x-revision: 1
4+
x-revision: 2
55
synopsis: Access to the GitHub API, v3.
66
category: Network
77
description:
@@ -31,9 +31,9 @@ copyright:
3131
Copyright 2012-2013 Mike Burns, Copyright 2013-2015 John Wiegley, Copyright 2016-2021 Oleg Grenrus
3232

3333
tested-with:
34-
GHC == 9.6.0
34+
GHC == 9.6.1
3535
GHC == 9.4.4
36-
GHC == 9.2.6
36+
GHC == 9.2.7
3737
GHC == 9.0.2
3838
GHC == 8.10.7
3939
GHC == 8.8.4
@@ -51,7 +51,7 @@ extra-source-files:
5151

5252
source-repository head
5353
type: git
54-
location: git://github.com/haskell-github/github.git
54+
location: https://github.com/haskell-github/github.git
5555

5656
flag openssl
5757
description: "Use http-client-openssl"
@@ -219,7 +219,7 @@ test-suite github-test
219219
hs-source-dirs: spec
220220
main-is: Spec.hs
221221
ghc-options: -Wall -threaded
222-
build-tool-depends: hspec-discover:hspec-discover >=2.7.1 && <2.11
222+
build-tool-depends: hspec-discover:hspec-discover >=2.7.1 && <2.12
223223
other-extensions: TemplateHaskell
224224
other-modules:
225225
GitHub.ActivitySpec
@@ -244,7 +244,7 @@ test-suite github-test
244244
, bytestring
245245
, file-embed
246246
, github
247-
, hspec >=2.6.1 && <2.11
247+
, hspec >=2.6.1 && <2.12
248248
, tagged
249249
, text
250250
, unordered-containers

‎samples/github-samples.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ description: Various samples of github package
1010
build-type: Simple
1111

1212
tested-with:
13-
GHC == 9.6.0
13+
GHC == 9.6.1
1414
GHC == 9.4.4
15-
GHC == 9.2.6
15+
GHC == 9.2.7
1616
GHC == 9.0.2
1717
GHC == 8.10.7
1818
GHC == 8.8.4

0 commit comments

Comments
 (0)