Skip to content

Commit 47286f3

Browse files
newhoggynewhoggy
authored
Merge pull request #88 from haskell-works/add-ghc-8.8.1-to-ci
Add ghc 8.8.1 to ci
2 parents e21832d + 6b8b635 commit 47286f3

File tree

8 files changed

+133
-139
lines changed

8 files changed

+133
-139
lines changed

‎.circleci/config.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ orbs:
88
workflows:
99
multiple-ghc-build:
1010
jobs:
11-
- haskell/build-with-binary-cache:
12-
name: GHC 8.2.2
13-
executor: haskell/ghc-8_2_2
14-
context: haskell-ci
15-
binary-cache-uri: ${BINARY_CACHE_URI-"http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive"}
16-
1711
- haskell/build-with-binary-cache:
1812
name: GHC 8.4.4
1913
executor: haskell/ghc-8_4_4
@@ -26,13 +20,19 @@ workflows:
2620
context: haskell-ci
2721
binary-cache-uri: ${BINARY_CACHE_URI-"http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive"}
2822

23+
- haskell/build-with-binary-cache:
24+
name: GHC 8.8.1
25+
executor: haskell/ghc-8_8_1
26+
context: haskell-ci
27+
binary-cache-uri: ${BINARY_CACHE_URI-"http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive"}
28+
2929
- github/release-cabal:
3030
name: GitHub Release
3131
context: haskell-ci
3232
requires:
33-
- GHC 8.2.2
3433
- GHC 8.4.4
3534
- GHC 8.6.5
35+
- GHC 8.8.1
3636
checkout: true
3737
filters:
3838
branches:

‎app/App/Commands/Demo.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ module App.Commands.Demo
1212

1313
import Data.Foldable
1414
import Data.Maybe
15-
import Data.Semigroup ((<>))
1615
import HaskellWorks.Data.TreeCursor
1716
import HaskellWorks.Data.Xml.Decode
1817
import HaskellWorks.Data.Xml.DecodeResult

‎hw-xml.cabal

Lines changed: 122 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
cabal-version: 2.2
1+
cabal-version: 2.2
22

3-
name: hw-xml
4-
version: 0.4.0.1
5-
synopsis: XML parser based on succinct data structures.
6-
description: XML parser based on succinct data structures. Please see README.md
7-
category: Data, XML, Succinct Data Structures, Data Structures
8-
homepage: http://github.com/haskell-works/hw-xml#readme
9-
bug-reports: https://github.com/haskell-works/hw-xml/issues
10-
author: John Ky,
11-
Alexey Raga
12-
maintainer: [email protected]
13-
copyright: 2016-2019 John Ky
14-
, 2016-2019 Alexey Raga
15-
license: BSD-3-Clause
16-
license-file: LICENSE
17-
build-type: Simple
18-
extra-source-files: README.md
19-
data-files:
20-
data/catalog.xml
3+
name: hw-xml
4+
version: 0.4.0.1
5+
synopsis: XML parser based on succinct data structures.
6+
description: XML parser based on succinct data structures. Please see README.md
7+
category: Data, XML, Succinct Data Structures, Data Structures
8+
homepage: http://github.com/haskell-works/hw-xml#readme
9+
bug-reports: https://github.com/haskell-works/hw-xml/issues
10+
author: John Ky,
11+
Alexey Raga
12+
maintainer: [email protected]
13+
copyright: 2016-2019 John Ky
14+
, 2016-2019 Alexey Raga
15+
license: BSD-3-Clause
16+
license-file: LICENSE
17+
tested-with: GHC == 8.8.1, GHC == 8.6.5, GHC == 8.4.4
18+
build-type: Simple
19+
extra-source-files: README.md
20+
data-files: data/catalog.xml
2121

2222
source-repository head
2323
type: git
2424
location: https://github.com/haskell-works/hw-xml
2525

26-
common base { build-depends: base >= 4.7 && < 5 }
26+
common base { build-depends: base >= 4.11 && < 5 }
2727

2828
common ansi-wl-pprint { build-depends: ansi-wl-pprint >= 0.6.9 && < 0.7 }
2929
common array { build-depends: array >= 0.5.2.0 && < 0.6 }
@@ -33,7 +33,7 @@ common cereal { build-depends: cereal >=
3333
common containers { build-depends: containers >= 0.6.2.1 && < 0.7 }
3434
common criterion { build-depends: criterion >= 1.5.5.0 && < 1.6 }
3535
common deepseq { build-depends: deepseq >= 1.4.3.0 && < 1.5 }
36-
common generic-lens { build-depends: generic-lens >= 1.1.0.0 && < 1.3 }
36+
common generic-lens { build-depends: generic-lens >= 1.2.0.1 && < 1.3 }
3737
common ghc-prim { build-depends: ghc-prim >= 0.5 && < 0.6 }
3838
common hedgehog { build-depends: hedgehog >= 1.0 && < 1.1 }
3939
common hspec { build-depends: hspec >= 2.5 && < 3.0 }
@@ -55,68 +55,70 @@ common vector { build-depends: vector >=
5555
common word8 { build-depends: word8 >= 0.1.3 && < 0.2 }
5656

5757
common config
58-
default-language: Haskell2010
58+
default-language: Haskell2010
59+
60+
common hw-xml
61+
build-depends: hw-xml
5962

6063
library
61-
import: base, config
62-
, ansi-wl-pprint
63-
, array
64-
, attoparsec
65-
, base
66-
, bytestring
67-
, cereal
68-
, containers
69-
, deepseq
70-
, ghc-prim
71-
, hw-balancedparens
72-
, hw-bits
73-
, hw-parser
74-
, hw-prim
75-
, hw-rankselect
76-
, hw-rankselect-base
77-
, lens
78-
, mmap
79-
, mtl
80-
, resourcet
81-
, transformers
82-
, vector
83-
, word8
84-
exposed-modules:
85-
HaskellWorks.Data.Xml
86-
HaskellWorks.Data.Xml.Blank
87-
HaskellWorks.Data.Xml.CharLike
88-
HaskellWorks.Data.Xml.Decode
89-
HaskellWorks.Data.Xml.DecodeError
90-
HaskellWorks.Data.Xml.DecodeResult
91-
HaskellWorks.Data.Xml.Grammar
92-
HaskellWorks.Data.Xml.Index
93-
HaskellWorks.Data.Xml.Internal.BalancedParens
94-
HaskellWorks.Data.Xml.Internal.ByteString
95-
HaskellWorks.Data.Xml.Internal.Blank
96-
HaskellWorks.Data.Xml.Internal.List
97-
HaskellWorks.Data.Xml.Internal.Tables
98-
HaskellWorks.Data.Xml.Internal.ToIbBp64
99-
HaskellWorks.Data.Xml.Internal.Words
100-
HaskellWorks.Data.Xml.Lens
101-
HaskellWorks.Data.Xml.Succinct
102-
HaskellWorks.Data.Xml.Succinct.Cursor
103-
HaskellWorks.Data.Xml.Succinct.Cursor.BalancedParens
104-
HaskellWorks.Data.Xml.Succinct.Cursor.BlankedXml
105-
HaskellWorks.Data.Xml.Succinct.Cursor.Create
106-
HaskellWorks.Data.Xml.Succinct.Cursor.InterestBits
107-
HaskellWorks.Data.Xml.Succinct.Cursor.Internal
108-
HaskellWorks.Data.Xml.Succinct.Cursor.Load
109-
HaskellWorks.Data.Xml.Succinct.Cursor.Types
110-
HaskellWorks.Data.Xml.Succinct.Cursor.MMap
111-
HaskellWorks.Data.Xml.Succinct.Cursor.Token
112-
HaskellWorks.Data.Xml.Succinct.Index
113-
HaskellWorks.Data.Xml.RawDecode
114-
HaskellWorks.Data.Xml.RawValue
115-
HaskellWorks.Data.Xml.Token.Tokenize
116-
HaskellWorks.Data.Xml.Token.Types
117-
HaskellWorks.Data.Xml.Token
118-
HaskellWorks.Data.Xml.Type
119-
HaskellWorks.Data.Xml.Value
64+
import: base, config
65+
, ansi-wl-pprint
66+
, array
67+
, attoparsec
68+
, base
69+
, bytestring
70+
, cereal
71+
, containers
72+
, deepseq
73+
, ghc-prim
74+
, hw-balancedparens
75+
, hw-bits
76+
, hw-parser
77+
, hw-prim
78+
, hw-rankselect
79+
, hw-rankselect-base
80+
, lens
81+
, mmap
82+
, mtl
83+
, resourcet
84+
, transformers
85+
, vector
86+
, word8
87+
exposed-modules: HaskellWorks.Data.Xml
88+
HaskellWorks.Data.Xml.Blank
89+
HaskellWorks.Data.Xml.CharLike
90+
HaskellWorks.Data.Xml.Decode
91+
HaskellWorks.Data.Xml.DecodeError
92+
HaskellWorks.Data.Xml.DecodeResult
93+
HaskellWorks.Data.Xml.Grammar
94+
HaskellWorks.Data.Xml.Index
95+
HaskellWorks.Data.Xml.Internal.BalancedParens
96+
HaskellWorks.Data.Xml.Internal.ByteString
97+
HaskellWorks.Data.Xml.Internal.Blank
98+
HaskellWorks.Data.Xml.Internal.List
99+
HaskellWorks.Data.Xml.Internal.Tables
100+
HaskellWorks.Data.Xml.Internal.ToIbBp64
101+
HaskellWorks.Data.Xml.Internal.Words
102+
HaskellWorks.Data.Xml.Lens
103+
HaskellWorks.Data.Xml.Succinct
104+
HaskellWorks.Data.Xml.Succinct.Cursor
105+
HaskellWorks.Data.Xml.Succinct.Cursor.BalancedParens
106+
HaskellWorks.Data.Xml.Succinct.Cursor.BlankedXml
107+
HaskellWorks.Data.Xml.Succinct.Cursor.Create
108+
HaskellWorks.Data.Xml.Succinct.Cursor.InterestBits
109+
HaskellWorks.Data.Xml.Succinct.Cursor.Internal
110+
HaskellWorks.Data.Xml.Succinct.Cursor.Load
111+
HaskellWorks.Data.Xml.Succinct.Cursor.Types
112+
HaskellWorks.Data.Xml.Succinct.Cursor.MMap
113+
HaskellWorks.Data.Xml.Succinct.Cursor.Token
114+
HaskellWorks.Data.Xml.Succinct.Index
115+
HaskellWorks.Data.Xml.RawDecode
116+
HaskellWorks.Data.Xml.RawValue
117+
HaskellWorks.Data.Xml.Token.Tokenize
118+
HaskellWorks.Data.Xml.Token.Types
119+
HaskellWorks.Data.Xml.Token
120+
HaskellWorks.Data.Xml.Type
121+
HaskellWorks.Data.Xml.Value
120122
other-modules: Paths_hw_xml
121123
autogen-modules: Paths_hw_xml
122124
hs-source-dirs: src
@@ -131,6 +133,7 @@ executable hw-xml
131133
, hw-bits
132134
, hw-prim
133135
, hw-rankselect
136+
, hw-xml
134137
, lens
135138
, mmap
136139
, mtl
@@ -154,57 +157,54 @@ executable hw-xml
154157
App.Show
155158
App.Naive
156159
autogen-modules: Paths_hw_xml
157-
build-depends: hw-xml
158160
hs-source-dirs: app
159161
ghc-options: -threaded -rtsopts -with-rtsopts=-N -O2 -Wall -msse4.2
160162

161163
test-suite hw-xml-test
162-
import: base, config
163-
, attoparsec
164-
, base
165-
, bytestring
166-
, hedgehog
167-
, hspec
168-
, hw-balancedparens
169-
, hw-bits
170-
, hw-hspec-hedgehog
171-
, hw-prim
172-
, hw-rankselect
173-
, hw-rankselect-base
174-
, vector
164+
import: base, config
165+
, attoparsec
166+
, base
167+
, bytestring
168+
, hedgehog
169+
, hspec
170+
, hw-balancedparens
171+
, hw-bits
172+
, hw-hspec-hedgehog
173+
, hw-prim
174+
, hw-xml
175+
, hw-rankselect
176+
, hw-rankselect-base
177+
, vector
175178
type: exitcode-stdio-1.0
176179
main-is: Spec.hs
177180
hs-source-dirs: test
178-
build-depends: hw-xml
179181
ghc-options: -threaded -rtsopts -with-rtsopts=-N
180182
default-language: Haskell2010
181183
build-tool-depends: hspec-discover:hspec-discover
182184
autogen-modules: Paths_hw_xml
183-
other-modules:
184-
HaskellWorks.Data.Xml.Internal.BlankSpec
185-
HaskellWorks.Data.Xml.RawValueSpec
186-
HaskellWorks.Data.Xml.Succinct.Cursor.BalancedParensSpec
187-
HaskellWorks.Data.Xml.Succinct.Cursor.InterestBitsSpec
188-
HaskellWorks.Data.Xml.Succinct.CursorSpec
189-
HaskellWorks.Data.Xml.Token.TokenizeSpec
190-
HaskellWorks.Data.Xml.TypeSpec
191-
Paths_hw_xml
185+
other-modules: HaskellWorks.Data.Xml.Internal.BlankSpec
186+
HaskellWorks.Data.Xml.RawValueSpec
187+
HaskellWorks.Data.Xml.Succinct.Cursor.BalancedParensSpec
188+
HaskellWorks.Data.Xml.Succinct.Cursor.InterestBitsSpec
189+
HaskellWorks.Data.Xml.Succinct.CursorSpec
190+
HaskellWorks.Data.Xml.Token.TokenizeSpec
191+
HaskellWorks.Data.Xml.TypeSpec
192+
Paths_hw_xml
192193

193194
benchmark bench
194-
import: base, config
195-
, bytestring
196-
, criterion
197-
, hw-balancedparens
198-
, hw-bits
199-
, hw-prim
200-
, mmap
201-
, resourcet
202-
, vector
203-
type: exitcode-stdio-1.0
204-
main-is: Main.hs
205-
other-modules: Paths_hw_xml
206-
build-depends: hw-xml
207-
autogen-modules: Paths_hw_xml
208-
hs-source-dirs: bench
209-
ghc-options: -O2 -Wall -msse4.2
210-
195+
import: base, config
196+
, bytestring
197+
, criterion
198+
, hw-balancedparens
199+
, hw-bits
200+
, hw-prim
201+
, mmap
202+
, resourcet
203+
, vector
204+
type: exitcode-stdio-1.0
205+
main-is: Main.hs
206+
other-modules: Paths_hw_xml
207+
build-depends: hw-xml
208+
autogen-modules: Paths_hw_xml
209+
hs-source-dirs: bench
210+
ghc-options: -O2 -Wall -msse4.2

‎src/HaskellWorks/Data/Xml/Decode.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import Control.Applicative
44
import Control.Lens
55
import Control.Monad
66
import Data.Foldable
7-
import Data.Monoid ((<>))
87
import HaskellWorks.Data.Xml.DecodeError
98
import HaskellWorks.Data.Xml.DecodeResult
109
import HaskellWorks.Data.Xml.Value

‎src/HaskellWorks/Data/Xml/Internal/Blank.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ module HaskellWorks.Data.Xml.Internal.Blank
88
) where
99

1010
import Data.ByteString (ByteString)
11-
import Data.Monoid ((<>))
1211
import Data.Word
1312
import Data.Word8
1413
import HaskellWorks.Data.Xml.Internal.Words

‎src/HaskellWorks/Data/Xml/Internal/ToIbBp64.hs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ module HaskellWorks.Data.Xml.Internal.ToIbBp64
99
, toIbBp64
1010
) where
1111

12-
import Data.ByteString (ByteString)
12+
import Data.ByteString (ByteString)
1313
import HaskellWorks.Data.Xml.Internal.BalancedParens
1414
import HaskellWorks.Data.Xml.Internal.List
15-
import HaskellWorks.Data.Xml.Succinct.Cursor.BlankedXml (BlankedXml (..))
16-
import HaskellWorks.Data.Xml.Succinct.Cursor.InterestBits (blankedXmlToInterestBits)
15+
import HaskellWorks.Data.Xml.Succinct.Cursor.BlankedXml (BlankedXml (..))
1716

1817
toBalancedParens64 :: BlankedXml -> [ByteString]
1918
toBalancedParens64 (BlankedXml bj) = compressWordAsBit (blankedXmlToBalancedParens bj)

‎src/HaskellWorks/Data/Xml/RawValue.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ module HaskellWorks.Data.Xml.RawValue
1010
) where
1111

1212
import Data.List
13-
import Data.Semigroup ((<>))
1413
import HaskellWorks.Data.Xml.Grammar
1514
import HaskellWorks.Data.Xml.Succinct.Index
1615
import Text.PrettyPrint.ANSI.Leijen hiding ((<$>), (<>))

‎src/HaskellWorks/Data/Xml/Value.hs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ module HaskellWorks.Data.Xml.Value
1919
) where
2020

2121
import Control.Lens
22-
import Data.Monoid ((<>))
2322
import HaskellWorks.Data.Xml.RawDecode
2423
import HaskellWorks.Data.Xml.RawValue
2524

@@ -66,8 +65,8 @@ instance RawDecode Value where
6665
rawDecode (RawError msg ) = XmlError msg
6766

6867
mkXmlElement :: String -> [RawValue] -> Value
69-
mkXmlElement n (RawAttrList as:cs) = XmlElement n (mkAttrs as) (rawDecode <$> cs)
70-
mkXmlElement n cs = XmlElement n [] (rawDecode <$> cs)
68+
mkXmlElement n (RawAttrList as:cs) = XmlElement n (mkAttrs as) (rawDecode <$> cs)
69+
mkXmlElement n cs = XmlElement n [] (rawDecode <$> cs)
7170

7271
mkAttrs :: [RawValue] -> [(String, String)]
7372
mkAttrs (RawAttrName n:RawAttrValue v:cs) = (n, v):mkAttrs cs

0 commit comments

Comments
 (0)