Skip to content

Commit 789b603

Browse files
authored
Merge pull request #31 from haskell-works/cabal-build
Cabal build
2 parents b379c4a + b225e63 commit 789b603

File tree

15 files changed

+273
-437
lines changed

15 files changed

+273
-437
lines changed

.circleci/config.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
version: 2.1
2+
3+
orbs:
4+
haskell: haskell-works/[email protected]
5+
github: haskell-works/[email protected]
6+
7+
workflows:
8+
multiple-ghc-build:
9+
jobs:
10+
- haskell/build:
11+
name: Build with GHC 8.4.4
12+
cabal-file: hw-xml.cabal
13+
executor: haskell/ghc-8_4_4
14+
write-result-workspace: false
15+
cache-version: ${CACHE_VERSION}
16+
17+
- haskell/build:
18+
name: Build with GHC 8.6.3
19+
cabal-file: hw-xml.cabal
20+
executor: haskell/ghc-8_6_3
21+
write-result-workspace: false
22+
cache-version: ${CACHE_VERSION}
23+
24+
- github/release-cabal:
25+
requires:
26+
- Build with GHC 8.4.4
27+
- Build with GHC 8.6.3
28+
checkout: true
29+
cabal-file: hw-xml.cabal
30+
filters:
31+
branches:
32+
only: master

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
dist
22
dist-newstyle
33
cabal-dev
4+
data/bench/
45
*.o
56
*.hi
67
*.chi
@@ -14,7 +15,7 @@ cabal.sandbox.config
1415
*.prof
1516
*.aux
1617
*.hp
17-
*.cabal
18+
.ghc.environment*
1819

1920
/*.submodules
2021
/.stack-work/

.travis.yml

Lines changed: 0 additions & 98 deletions
This file was deleted.

bench/Main.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ loadXml :: BS.ByteString -> XmlCursor BS.ByteString (BitShown (DVS.Vector Word64
3131
loadXml bs = fromByteString bs :: XmlCursor BS.ByteString (BitShown (DVS.Vector Word64)) (SimpleBalancedParens (DVS.Vector Word64))
3232

3333
xmlToInterestBits3 :: MonadThrow m => Conduit BS.ByteString m BS.ByteString
34-
xmlToInterestBits3 = blankXml =$= blankedXmlToInterestBits
34+
xmlToInterestBits3 = blankXml .| blankedXmlToInterestBits
3535

3636
runCon :: Conduit i [] BS.ByteString -> i -> BS.ByteString
3737
runCon con bs = BS.concat $ runListConduit con [bs]

cabal.project

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
with-compiler: ghc-8.6.3
2+
3+
packages: .

circle.yml

Lines changed: 0 additions & 114 deletions
This file was deleted.

0 commit comments

Comments
 (0)