Skip to content

Commit

Permalink
Merge pull request #11 from haskell-works/no-servant
Browse files Browse the repository at this point in the history
Get rid of Servant
  • Loading branch information
AlexeyRaga authored Jun 15, 2018
2 parents 41f0697 + af345fe commit b4529ae
Show file tree
Hide file tree
Showing 8 changed files with 430 additions and 256 deletions.
101 changes: 101 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
defaults: &defaults
working_directory: ~/build
docker:
- image: quay.io/haskell_works/stack-build-cabal

# - image: confluentinc/cp-zookeeper:3.1.2
# environment:
# ZOOKEEPER_CLIENT_PORT: 2181

# - image: confluentinc/cp-kafka:3.1.2
# environment:
# KAFKA_ZOOKEEPER_CONNECT: "localhost:2181"
# KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://localhost:9092"
# KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1

steps:
- checkout

- restore_cache:
keys:
- dot-stack-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.yaml" }}
- dot-stack-{{ arch }}-{{ .Environment.CIRCLE_JOB }}

- restore_cache:
key: stack-work-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.yaml" }}

- run: stack setup --resolver ${LTS} ${STACK_ARGS}
- run: stack build --test --no-run-tests --haddock --no-haddock-deps --resolver ${LTS} ${STACK_ARGS}

- save_cache:
key: dot-stack-{{ arch }}-{{ .Environment.CIRCLE_JOB }}
paths:
- ~/.stack

- run:
name: Running unit tests
command: stack test --resolver ${LTS} ${STACK_ARGS}

- save_cache:
key: dot-stack-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.yaml" }}
paths:
- ~/.stack

- save_cache:
key: stack-work-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.yaml" }}
paths: ~/build/.stack-work

version: 2.0
jobs:
lts-7:
environment:
- LTS: "lts-7"
<<: *defaults

lts-9:
environment:
- LTS: "lts-9"
<<: *defaults

lts-11:
environment:
- LTS: "lts-11"
<<: *defaults

nightly:
environment:
- LTS: "nightly"
- STACK_ARGS: "--stack-yaml=stack-nightly.yaml"
<<: *defaults

release:
working_directory: ~/build
docker:
- image: quay.io/haskell_works/stack-build-cabal

steps:
- checkout

- run:
name: Making a release
command: ./scripts/release


workflows:
version: 2
multiple-ghcs:
jobs:
# - lts-7
- lts-9
- lts-11
# - nightly
- release:
requires:
# - lts-7
- lts-9
- lts-11
# - nightly
filters:
branches:
only: master

41 changes: 0 additions & 41 deletions circle.yml

This file was deleted.

214 changes: 114 additions & 100 deletions hw-kafka-avro.cabal
Original file line number Diff line number Diff line change
@@ -1,110 +1,124 @@
name: hw-kafka-avro
version: 1.4.0
synopsis: Avro support for Kafka infrastructure
description: Please see README.md
homepage: https://github.com/haskell-works/hw-kafka-avro#readme
license: BSD3
license-file: LICENSE
author: Alexey Raga
maintainer: [email protected]
copyright: Alexey Raga
category: Services
build-type: Simple
extra-source-files: README.md
cabal-version: >=1.10
-- This file has been generated from package.yaml by hpack version 0.28.2.
--
-- see: https://github.com/sol/hpack
--
-- hash: e442bc6ecb172ea8efb783fc5347cf3ce958eda0767303228d49c435cf8d5100

name: hw-kafka-avro
version: 1.4.0
synopsis: Avro support for Kafka infrastructure
description: Please see README.md
category: Services
homepage: https://github.com/haskell-works/hw-kafka-avro#readme
bug-reports: https://github.com/haskell-works/hw-kafka-avro/issues
author: Alexey Raga
maintainer: [email protected]
copyright: Alexey Raga
license: BSD3
license-file: LICENSE
build-type: Simple
cabal-version: >= 1.10
extra-source-files:
README.md

source-repository head
type: git
location: https://github.com/haskell-works/hw-kafka-avro

flag examples
default: False
manual: True
description: Also compile examples
manual: True
default: False

library
hs-source-dirs: src
exposed-modules: Kafka.Avro,
Kafka.Avro.Decode,
Kafka.Avro.Encode,
Kafka.Avro.SchemaRegistry

build-depends: aeson,
avro >= 0.2,
base >= 4.7 && < 5,
binary,
bytestring,
cache,
containers,
errors,
hashable,
http-client,
http-types,
mtl,
pure-zlib >= 0.6,
semigroups,
servant,
servant-client,
tagged,
text,
transformers,
unordered-containers
default-language: Haskell2010
exposed-modules:
Kafka.Avro
Kafka.Avro.Decode
Kafka.Avro.Encode
Kafka.Avro.SchemaRegistry
other-modules:
Paths_hw_kafka_avro
hs-source-dirs:
src
build-depends:
aeson
, avro >=0.2
, base >=4.7 && <5
, binary
, bytestring
, cache
, containers
, errors
, hashable
, http-client
, http-types
, lens
, mtl
, pure-zlib >=0.6
, semigroups
, tagged
, text
, transformers
, unordered-containers
, wreq
default-language: Haskell2010

executable kafka-avro-example
hs-source-dirs: example
main-is: Main.hs
other-modules: Message
ghc-options: -threaded -rtsopts -with-rtsopts=-N
build-depends: aeson
, avro
, base
, binary
, bytestring
, cache
, containers
, errors
, hashable
, hw-kafka-avro
, http-client
, mtl
, pure-zlib >= 0.6
, semigroups
, servant
, servant-client
, text
, transformers
, unordered-containers
default-language: Haskell2010
if flag(examples)
buildable: True
else
main-is: Main.hs
other-modules:
Message
Paths_hw_kafka_avro
hs-source-dirs:
example
ghc-options: -threaded -rtsopts -with-rtsopts=-N
build-depends:
aeson
, avro
, base
, binary
, bytestring
, cache
, containers
, errors
, hashable
, http-client
, hw-kafka-avro
, mtl
, pure-zlib >=0.6
, semigroups
, text
, transformers
, unordered-containers
if !(flag(examples))
buildable: False
default-language: Haskell2010

test-suite kafka-avro-test
type: exitcode-stdio-1.0
hs-source-dirs: test
main-is: Spec.hs
build-depends: QuickCheck
, aeson
, avro
, base
, binary
, bytestring
, cache
, containers
, errors
, hashable
, hw-kafka-avro
, hspec
, http-client
, mtl
, pure-zlib >= 0.6
, semigroups
, servant
, servant-client
, text
, transformers
, unordered-containers
ghc-options: -threaded -rtsopts -with-rtsopts=-N
default-language: Haskell2010

source-repository head
type: git
location: https://github.com/haskell-works/hw-kafka-avro
type: exitcode-stdio-1.0
main-is: Spec.hs
other-modules:
Paths_hw_kafka_avro
hs-source-dirs:
test
ghc-options: -threaded -rtsopts -with-rtsopts=-N
build-depends:
QuickCheck
, aeson
, avro
, base
, binary
, bytestring
, cache
, containers
, errors
, hashable
, hspec
, http-client
, hw-kafka-avro
, mtl
, pure-zlib >=0.6
, semigroups
, text
, transformers
, unordered-containers
default-language: Haskell2010
Loading

0 comments on commit b4529ae

Please sign in to comment.