Skip to content

Commit a206401

Browse files
newhoggynewhoggy
authored
Merge pull request #160 from haskell-works/add-ghc-8.8.1-to-ci
Add ghc-8.8.1 to CI
2 parents ee757b7 + 57feb32 commit a206401

File tree

2 files changed

+132
-128
lines changed

2 files changed

+132
-128
lines changed

‎.circleci/config.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,20 @@ workflows:
2626
context: haskell-ci
2727
binary-cache-uri: ${BINARY_CACHE_URI-"http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive"}
2828

29+
- haskell/build-with-binary-cache:
30+
name: GHC 8.8.1
31+
executor: haskell/ghc-8_8_1
32+
context: haskell-ci
33+
binary-cache-uri: ${BINARY_CACHE_URI-"http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive"}
34+
2935
- github/release-cabal:
3036
name: GitHub Release
3137
context: haskell-ci
3238
requires:
3339
- GHC 8.2.2
3440
- GHC 8.4.4
3541
- GHC 8.6.5
42+
- GHC 8.8.1
3643
checkout: true
3744
filters:
3845
branches:

‎hw-json.cabal

Lines changed: 125 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
cabal-version: 2.2
22

3-
name: hw-json
4-
version: 1.3.1.0
5-
synopsis: Memory efficient JSON parser
6-
description: Memory efficient JSON parser. Please see README.md
7-
category: Data
8-
homepage: http://github.com/haskell-works/hw-json#readme
9-
bug-reports: https://github.com/haskell-works/hw-json/issues
10-
author: John Ky
11-
maintainer: [email protected]
12-
copyright: 2016-2019 John Ky
13-
license: BSD-3-Clause
14-
license-file: LICENSE
15-
build-type: Simple
16-
extra-source-files:
17-
README.md
18-
corpus/5000B.json
19-
corpus/5000B.json.bp.idx
20-
corpus/5000B.json.ib.idx
21-
corpus/issue-0001.json
22-
corpus/issue-0001.json.bp.idx
23-
corpus/issue-0001.json.ib.idx
24-
corpus/issue-0001.md
3+
name: hw-json
4+
version: 1.3.1.0
5+
synopsis: Memory efficient JSON parser
6+
description: Memory efficient JSON parser. Please see README.md
7+
category: Data
8+
homepage: http://github.com/haskell-works/hw-json#readme
9+
bug-reports: https://github.com/haskell-works/hw-json/issues
10+
author: John Ky
11+
maintainer: [email protected]
12+
copyright: 2016-2019 John Ky
13+
license: BSD-3-Clause
14+
license-file: LICENSE
15+
tested-with: GHC == 8.8.1, GHC == 8.6.5, GHC == 8.4.4, GHC == 8.2.2
16+
build-type: Simple
17+
extra-source-files: README.md
18+
corpus/5000B.json
19+
corpus/5000B.json.bp.idx
20+
corpus/5000B.json.ib.idx
21+
corpus/issue-0001.json
22+
corpus/issue-0001.json.bp.idx
23+
corpus/issue-0001.json.ib.idx
24+
corpus/issue-0001.md
2525

2626
source-repository head
2727
type: git
@@ -48,15 +48,15 @@ common bytestring { build-depends: bytestring >= 0.1
4848
common criterion { build-depends: criterion >= 1.4 && < 1.6 }
4949
common directory { build-depends: directory >= 1.3 && < 1.4 }
5050
common dlist { build-depends: dlist >= 0.8 && < 0.9 }
51-
common generic-lens { build-depends: generic-lens >= 1.1.0.0 && < 1.3 }
51+
common generic-lens { build-depends: generic-lens >= 1.2.0.1 && < 1.3 }
5252
common hedgehog { build-depends: hedgehog >= 0.6 && < 1.1 }
5353
common hspec { build-depends: hspec >= 2.4 && < 3 }
5454
common hw-balancedparens { build-depends: hw-balancedparens >= 0.3.0.0 && < 0.4 }
5555
common hw-bits { build-depends: hw-bits >= 0.7.0.5 && < 0.8 }
5656
common hw-hspec-hedgehog { build-depends: hw-hspec-hedgehog >= 0.1.0.4 && < 0.2 }
5757
common hw-json-simd { build-depends: hw-json-simd >= 0.1.0.2 && < 0.2 }
5858
common hw-json-simple-cursor { build-depends: hw-json-simple-cursor >= 0.1.0.1 && < 0.2 }
59-
common hw-json-standard-cursor { build-depends: hw-json-standard-cursor >= 0.2.1.0 && < 0.3 }
59+
common hw-json-standard-cursor { build-depends: hw-json-standard-cursor >= 0.2.0.1 && < 0.3 }
6060
common hw-mquery { build-depends: hw-mquery >= 0.2.0.0 && < 0.3 }
6161
common hw-parser { build-depends: hw-parser >= 0.1 && < 0.2 }
6262
common hw-prim { build-depends: hw-prim >= 0.6.2.32 && < 0.7 }
@@ -78,132 +78,129 @@ common config
7878
default-language: Haskell2010
7979
ghc-options: -Wall -O2 -msse4.2
8080
if flag(sse42)
81-
ghc-options: -msse4.2
81+
ghc-options: -msse4.2
8282
if flag(bmi2) && impl(ghc >= 8.4.1)
83-
ghc-options: -mbmi2 -msse4.2
84-
cpp-options: -DBMI2_ENABLED
83+
ghc-options: -mbmi2 -msse4.2
84+
cpp-options: -DBMI2_ENABLED
8585

8686
library
87-
import: base, config
88-
, aeson
89-
, ansi-wl-pprint
90-
, attoparsec
91-
, bits-extra
92-
, bytestring
93-
, dlist
94-
, hw-balancedparens
95-
, hw-bits
96-
, hw-json-simple-cursor
97-
, hw-json-standard-cursor
98-
, hw-mquery
99-
, hw-parser
100-
, hw-prim
101-
, hw-rankselect
102-
, hw-rankselect-base
103-
, hw-simd
104-
, mmap
105-
, semigroups
106-
, text
107-
, vector
108-
, word8
87+
import: base, config
88+
, aeson
89+
, ansi-wl-pprint
90+
, attoparsec
91+
, bits-extra
92+
, bytestring
93+
, dlist
94+
, hw-balancedparens
95+
, hw-bits
96+
, hw-json-simple-cursor
97+
, hw-json-standard-cursor
98+
, hw-mquery
99+
, hw-parser
100+
, hw-prim
101+
, hw-rankselect
102+
, hw-rankselect-base
103+
, hw-simd
104+
, mmap
105+
, semigroups
106+
, text
107+
, vector
108+
, word8
109109
hs-source-dirs: src
110110
other-modules: Paths_hw_json
111111
autogen-modules: Paths_hw_json
112-
exposed-modules:
113-
HaskellWorks.Data.Json.DecodeError
114-
HaskellWorks.Data.Json.FromValue
115-
HaskellWorks.Data.Json.Internal.Standard.Cursor.Token
116-
HaskellWorks.Data.Json.Internal.Standard.Token.Tokenize
117-
HaskellWorks.Data.Json.Internal.CharLike
118-
HaskellWorks.Data.Json.Internal.Doc
119-
HaskellWorks.Data.Json.Internal.Index
120-
HaskellWorks.Data.Json.Internal.Orphans
121-
HaskellWorks.Data.Json.Internal.PartialIndex
122-
HaskellWorks.Data.Json.Internal.Slurp
123-
HaskellWorks.Data.Json.Internal.Token
124-
HaskellWorks.Data.Json.Internal.Token.Types
125-
HaskellWorks.Data.Json.Internal.Value
126-
HaskellWorks.Data.Json.Internal.Word64
127-
HaskellWorks.Data.Json.LightJson
128-
HaskellWorks.Data.Json.PartialValue
129-
HaskellWorks.Data.Json.Query
130-
HaskellWorks.Data.Json.Simple.Value
131-
HaskellWorks.Data.Json.Standard.Load.Partial
132-
HaskellWorks.Data.Json.Value
112+
exposed-modules: HaskellWorks.Data.Json.DecodeError
113+
HaskellWorks.Data.Json.FromValue
114+
HaskellWorks.Data.Json.Internal.Standard.Cursor.Token
115+
HaskellWorks.Data.Json.Internal.Standard.Token.Tokenize
116+
HaskellWorks.Data.Json.Internal.CharLike
117+
HaskellWorks.Data.Json.Internal.Doc
118+
HaskellWorks.Data.Json.Internal.Index
119+
HaskellWorks.Data.Json.Internal.Orphans
120+
HaskellWorks.Data.Json.Internal.PartialIndex
121+
HaskellWorks.Data.Json.Internal.Slurp
122+
HaskellWorks.Data.Json.Internal.Token
123+
HaskellWorks.Data.Json.Internal.Token.Types
124+
HaskellWorks.Data.Json.Internal.Value
125+
HaskellWorks.Data.Json.Internal.Word64
126+
HaskellWorks.Data.Json.LightJson
127+
HaskellWorks.Data.Json.PartialValue
128+
HaskellWorks.Data.Json.Query
129+
HaskellWorks.Data.Json.Simple.Value
130+
HaskellWorks.Data.Json.Standard.Load.Partial
131+
HaskellWorks.Data.Json.Value
133132

134133
executable hw-json
135-
import: base, config
136-
, bytestring
137-
, dlist
138-
, generic-lens
139-
, hw-balancedparens
140-
, hw-json-simd
141-
, hw-json-simple-cursor
142-
, hw-json-standard-cursor
143-
, hw-mquery
144-
, hw-prim
145-
, hw-rankselect
146-
, hw-rankselect-base
147-
, lens
148-
, mmap
149-
, optparse-applicative
150-
, semigroups
151-
, text
152-
, vector
134+
import: base, config
135+
, bytestring
136+
, dlist
137+
, generic-lens
138+
, hw-balancedparens
139+
, hw-json-simd
140+
, hw-json-simple-cursor
141+
, hw-json-standard-cursor
142+
, hw-mquery
143+
, hw-prim
144+
, hw-rankselect
145+
, hw-rankselect-base
146+
, lens
147+
, mmap
148+
, optparse-applicative
149+
, semigroups
150+
, text
151+
, vector
153152
main-is: Main.hs
154153
hs-source-dirs: app
155154
ghc-options: -threaded -rtsopts -with-rtsopts=-N
156155
build-depends: hw-json
157-
other-modules:
158-
App.Commands
159-
App.Commands.CreateIndex
160-
App.Commands.Count
161-
App.Commands.Demo
162-
App.Commands.Types
156+
other-modules: App.Commands
157+
App.Commands.CreateIndex
158+
App.Commands.Count
159+
App.Commands.Demo
160+
App.Commands.Types
163161

164162
test-suite hw-json-test
165-
import: base, config
166-
, aeson
167-
, attoparsec
168-
, bytestring
169-
, hedgehog
170-
, hspec
171-
, hw-balancedparens
172-
, hw-bits
173-
, hw-hspec-hedgehog
174-
, hw-json-simple-cursor
175-
, hw-json-standard-cursor
176-
, hw-prim
177-
, hw-rankselect
178-
, hw-rankselect-base
179-
, scientific
180-
, text
181-
, transformers
182-
, vector
163+
import: base, config
164+
, aeson
165+
, attoparsec
166+
, bytestring
167+
, hedgehog
168+
, hspec
169+
, hw-balancedparens
170+
, hw-bits
171+
, hw-hspec-hedgehog
172+
, hw-json-simple-cursor
173+
, hw-json-standard-cursor
174+
, hw-prim
175+
, hw-rankselect
176+
, hw-rankselect-base
177+
, scientific
178+
, text
179+
, transformers
180+
, vector
183181
type: exitcode-stdio-1.0
184182
main-is: Spec.hs
185183
build-depends: hw-json
186184
hs-source-dirs: test
187185
ghc-options: -threaded -rtsopts -with-rtsopts=-N
188186
build-tool-depends: hspec-discover:hspec-discover
189-
other-modules:
190-
HaskellWorks.Data.Json.LightJsonSpec
191-
HaskellWorks.Data.Json.Simple.CursorSpec
192-
HaskellWorks.Data.Json.Standard.CursorSpec
193-
HaskellWorks.Data.Json.Standard.GenCursorTest
194-
HaskellWorks.Data.Json.Token.TokenizeSpec
195-
HaskellWorks.Data.Json.TypeSpec
196-
HaskellWorks.Data.Json.ValueSpec
197-
Paths_hw_json
187+
other-modules: HaskellWorks.Data.Json.LightJsonSpec
188+
HaskellWorks.Data.Json.Simple.CursorSpec
189+
HaskellWorks.Data.Json.Standard.CursorSpec
190+
HaskellWorks.Data.Json.Standard.GenCursorTest
191+
HaskellWorks.Data.Json.Token.TokenizeSpec
192+
HaskellWorks.Data.Json.TypeSpec
193+
HaskellWorks.Data.Json.ValueSpec
194+
Paths_hw_json
198195

199196
benchmark bench
200-
import: base, config
201-
, bytestring
202-
, criterion
203-
, directory
204-
, hw-json-standard-cursor
205-
, mmap
206-
, semigroups
197+
import: base, config
198+
, bytestring
199+
, criterion
200+
, directory
201+
, hw-json-standard-cursor
202+
, mmap
203+
, semigroups
207204
type: exitcode-stdio-1.0
208205
main-is: Main.hs
209206
hs-source-dirs: bench

0 commit comments

Comments
 (0)