Skip to content

Commit 5da64ae

Browse files
newhoggynewhoggy
authored
Merge pull request #59 from haskell-works/add-ghc-8.8.1-to-ci
Add ghc-8.8.1 to CI
2 parents 2ba0b84 + a3b6dd1 commit 5da64ae

File tree

2 files changed

+77
-74
lines changed

2 files changed

+77
-74
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-simd.cabal‎

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

3-
name: hw-json-simd
4-
version: 0.1.0.3
5-
synopsis: SIMD-based JSON semi-indexer
6-
description: Please see the README on GitHub at <https://github.com/haskell-works/hw-json-simd#readme>
7-
category: Data
8-
homepage: https://github.com/haskell-works/hw-json-simd#readme
9-
bug-reports: https://github.com/haskell-works/hw-json-simd/issues
10-
author: John Ky
11-
maintainer: [email protected]
12-
copyright: 2018-2019 John Ky
13-
license: BSD-3-Clause
14-
license-file: LICENSE
15-
build-type: Simple
16-
tested-with: GHC == 8.6.3, GHC == 8.4.4, GHC == 8.2.2
17-
extra-source-files:
18-
cbits/debug.h
19-
cbits/simd.h
20-
cbits/intrinsics.h
21-
cbits/simd.c
22-
cbits/simd-spliced.c
23-
cbits/simd-state.c
24-
cbits/simd-phi-table-32.c
25-
cbits/simd-transition-table-32.c
26-
README.md
27-
ChangeLog.md
3+
name: hw-json-simd
4+
version: 0.1.0.3
5+
synopsis: SIMD-based JSON semi-indexer
6+
description: Please see the README on GitHub at <https://github.com/haskell-works/hw-json-simd#readme>
7+
category: Data
8+
homepage: https://github.com/haskell-works/hw-json-simd#readme
9+
bug-reports: https://github.com/haskell-works/hw-json-simd/issues
10+
author: John Ky
11+
maintainer: [email protected]
12+
copyright: 2018-2019 John Ky
13+
license: BSD-3-Clause
14+
license-file: LICENSE
15+
build-type: Simple
16+
tested-with: GHC == 8.8.1, GHC == 8.6.3, GHC == 8.4.4, GHC == 8.2.2
17+
extra-source-files: cbits/debug.h
18+
cbits/simd.h
19+
cbits/intrinsics.h
20+
cbits/simd.c
21+
cbits/simd-spliced.c
22+
cbits/simd-state.c
23+
cbits/simd-phi-table-32.c
24+
cbits/simd-transition-table-32.c
25+
README.md
26+
ChangeLog.md
2827

2928
source-repository head
3029
type: git
@@ -56,77 +55,74 @@ common semigroups { if (!impl(ghc >= 8.0.1)) { build-depends: { semigroups
5655
common transformers { if (!impl(ghc >= 8.0.1)) { build-depends: { transformers >= 0.4 && < 0.6 } } }
5756

5857
common config
59-
ghc-options: -Wall
60-
default-language: Haskell2010
58+
ghc-options: -Wall
59+
default-language: Haskell2010
6160
if impl(ghc >= 8.0.1)
62-
ghc-options: -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints
61+
ghc-options: -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints
6362
if flag(sse42)
64-
ghc-options: -msse4.2
65-
cc-options: -msse4.2
63+
ghc-options: -msse4.2
64+
cc-options: -msse4.2
6665
if flag(bmi2)
67-
cc-options: -mbmi2
66+
cc-options: -mbmi2
6867
if impl(ghc >= 8.4.1)
69-
ghc-options: -mbmi2
68+
ghc-options: -mbmi2
7069
if flag(avx2)
71-
cc-options: -mavx2
70+
cc-options: -mavx2
7271

7372
library
74-
import: base, config
75-
, bytestring
76-
, hw-prim
77-
, lens
78-
, vector
73+
import: base, config
74+
, bytestring
75+
, hw-prim
76+
, lens
77+
, vector
7978
autogen-modules: Paths_hw_json_simd
8079
other-modules: Paths_hw_json_simd
8180
hs-source-dirs: src
8281
cc-options: -mssse3 -mlzcnt -mbmi2 -mavx2
8382
include-dirs: cbits
8483
build-tool-depends: c2hs:c2hs
85-
exposed-modules:
86-
HaskellWorks.Data.Json.Simd.Capabilities
87-
HaskellWorks.Data.Json.Simd.Index.Simple
88-
HaskellWorks.Data.Json.Simd.Index.Standard
89-
HaskellWorks.Data.Json.Simd.Internal.Foreign
90-
HaskellWorks.Data.Json.Simd.Internal.Index.Simple
91-
HaskellWorks.Data.Json.Simd.Internal.Index.Standard
92-
HaskellWorks.Data.Json.Simd.Internal.List
93-
c-sources:
94-
cbits/debug.c
95-
cbits/simd.c
96-
cbits/simd-spliced.c
97-
cbits/simd-state.c
98-
cbits/simd-phi-table-32.c
99-
cbits/simd-transition-table-32.c
84+
exposed-modules: HaskellWorks.Data.Json.Simd.Capabilities
85+
HaskellWorks.Data.Json.Simd.Index.Simple
86+
HaskellWorks.Data.Json.Simd.Index.Standard
87+
HaskellWorks.Data.Json.Simd.Internal.Foreign
88+
HaskellWorks.Data.Json.Simd.Internal.Index.Simple
89+
HaskellWorks.Data.Json.Simd.Internal.Index.Standard
90+
HaskellWorks.Data.Json.Simd.Internal.List
91+
c-sources: cbits/debug.c
92+
cbits/simd.c
93+
cbits/simd-spliced.c
94+
cbits/simd-state.c
95+
cbits/simd-phi-table-32.c
96+
cbits/simd-transition-table-32.c
10097

10198
executable hw-json-simd
102-
import: base, config
103-
, bytestring
104-
, hw-prim
105-
, lens
106-
, optparse-applicative
107-
, semigroups
108-
, vector
99+
import: base, config
100+
, bytestring
101+
, hw-prim
102+
, lens
103+
, optparse-applicative
104+
, semigroups
105+
, vector
109106
main-is: Main.hs
110107
autogen-modules: Paths_hw_json_simd
111108
hs-source-dirs: app
112109
build-depends: hw-json-simd
113110
ghc-options: -threaded -rtsopts -with-rtsopts=-N
114-
other-modules:
115-
App.Commands
116-
App.Commands.Capabilities
117-
App.Commands.CreateIndex
118-
App.Commands.Types
119-
App.Lens
120-
Paths_hw_json_simd
111+
other-modules: App.Commands
112+
App.Commands.Capabilities
113+
App.Commands.CreateIndex
114+
App.Commands.Types
115+
App.Lens
116+
Paths_hw_json_simd
121117

122118
test-suite hw-json-simd-test
123-
import: base, config
124-
, bytestring
125-
, hw-prim
126-
, lens
127-
, semigroups
128-
, transformers
129-
, vector
119+
import: base, config
120+
, bytestring
121+
, hw-prim
122+
, lens
123+
, semigroups
124+
, transformers
125+
, vector
130126
type: exitcode-stdio-1.0
131127
main-is: Spec.hs
132128
autogen-modules: Paths_hw_json_simd

0 commit comments

Comments
 (0)