eeva/servant-ekg
1
0
Fork 0
mirror of https://github.com/haskell-servant/servant-ekg.git synced 2024-11-23 03:29:43 +01:00
Code Issues Projects Releases Wiki Activity

Allow hashable-1.4

Browse source
This commit is contained in:
Oleg Grenrus 2019-05-30 13:24:52 +03:00
parent 9f610bbe88
commit bd510846ff
2 changed files with 95 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

161
.travis.yml
View file

@ -4,21 +4,20 @@
# #
# For more information, see https://github.com/haskell-CI/haskell-ci # For more information, see https://github.com/haskell-CI/haskell-ci
# #
# version: 0.3.20190521
#
language: c language: c
dist: xenial dist: xenial
git: git:
submodules: false # whether to recursively clone submodules # whether to recursively clone submodules
submodules: false
branches: branches:
only: only:
- master - master
cache: cache:
directories: directories:
- $HOME/.cabal/packages - $HOME/.cabal/packages
- $HOME/.cabal/store - $HOME/.cabal/store
before_cache: before_cache:
- rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
# remove files that are regenerated by 'cabal update' # remove files that are regenerated by 'cabal update'
@ -27,103 +26,127 @@ before_cache:
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
- rm -rfv $CABALHOME/packages/head.hackage - rm -rfv $CABALHOME/packages/head.hackage
matrix: matrix:
include: include:
- compiler: "ghc-8.6.3" - compiler: ghc-8.6.5
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}} addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}
- compiler: "ghc-8.4.4" - compiler: ghc-8.4.4
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}} addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}
- compiler: "ghc-8.2.2" - compiler: ghc-8.2.2
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}} addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}
- compiler: "ghc-8.0.2" - compiler: ghc-8.0.2
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}} addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}
before_install: before_install:
- HC=/opt/ghc/bin/${CC} - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
- HCVER=$(echo "$TRAVIS_COMPILER" | sed 's/ghc-//') - HCPKG="$HC-pkg"
- echo $HCVER
- HCPKG=${HC/ghc/ghc-pkg}
- unset CC - unset CC
- CABAL=/opt/ghc/bin/cabal - CABAL=/opt/ghc/bin/cabal
- CABALHOME=$HOME/.cabal - CABALHOME=$HOME/.cabal
- export PATH="$CABALHOME/bin:$PATH" - export PATH="$CABALHOME/bin:$PATH"
- ROOTDIR=$(pwd) - TOP=$(pwd)
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') )) - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
- echo $HCNUMVER - echo $HCNUMVER
- CABAL="$CABAL -vnormal+nowrap+markoutput"
- set -o pipefail
- |
echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
echo 'BEGIN { state = "output"; }' >> .colorful.awk
echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
echo ' if (state == "cabal") {' >> .colorful.awk
echo ' print blue($0)' >> .colorful.awk
echo ' } else {' >> .colorful.awk
echo ' print $0' >> .colorful.awk
echo ' }' >> .colorful.awk
echo '}' >> .colorful.awk
- cat .colorful.awk
- |
color_cabal_output () {
awk -f $TOP/.colorful.awk
}
- echo text | color_cabal_output
install: install:
- ${CABAL} --version - ${CABAL} --version
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]" - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
- TEST=--enable-tests - TEST=--enable-tests
- BENCH=--enable-benchmarks - BENCH=--enable-benchmarks
- GHCHEAD=${GHCHEAD-false} - GHCHEAD=${GHCHEAD-false}
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CABALHOME=$APPDATA/cabal; else export CABALHOME=$HOME/.cabal; fi - rm -f $CABALHOME/config
- travis_retry ${CABAL} update -v - |
- sed -i.bak 's/^jobs:/-- jobs:/' $CABALHOME/config echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
- rm -fv cabal.project cabal.project.local echo "remote-build-reporting: anonymous" >> $CABALHOME/config
- grep -Ev -- '^\s*--' $CABALHOME/config | grep -Ev '^\s*$' echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
- rm -f cabal.project echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
echo "world-file: $CABALHOME/world" >> $CABALHOME/config
echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
echo "install-dirs user" >> $CABALHOME/config
echo " prefix: $CABALHOME" >> $CABALHOME/config
echo "repository hackage.haskell.org" >> $CABALHOME/config
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
- cat $CABALHOME/config
- rm -fv cabal.project cabal.project.local cabal.project.freeze
- travis_retry ${CABAL} v2-update -v
# Generate cabal.project
- rm -rf cabal.project cabal.project.local cabal.project.freeze
- touch cabal.project - touch cabal.project
- "printf 'packages: \".\"\\n' >> cabal.project" - |
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project" echo 'packages: "."' >> cabal.project
- touch cabal.project.local - |
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(servant-ekg)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" echo "write-ghc-environment-files: always" >> cabal.project
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(servant-ekg)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
- cat cabal.project || true - cat cabal.project || true
- cat cabal.project.local || true - cat cabal.project.local || true
- if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
- rm -f cabal.project.freeze - ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output
- ${CABAL} new-freeze -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dry - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
- "cat \"cabal.project.freeze\" | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'" - rm cabal.project.freeze
- rm "cabal.project.freeze" - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
- ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
- ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
- rm -rf .ghc.environment.* "."/dist
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
# Here starts the actual work to be performed for the package under test;
# any command which exits with a non-zero exit code causes the build to fail.
script: script:
# test that source-distributions can be generated - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
- ${CABAL} new-sdist all # Packaging...
- ${CABAL} v2-sdist all | color_cabal_output
# Unpacking...
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/ - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
- cd ${DISTDIR} || false - cd ${DISTDIR} || false
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \; - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
- rm -f cabal.project # Generate cabal.project
- rm -rf cabal.project cabal.project.local cabal.project.freeze
- touch cabal.project - touch cabal.project
- "printf 'packages: \"servant-ekg-*/*.cabal\"\\n' >> cabal.project" - |
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project" echo 'packages: "servant-ekg-*/*.cabal"' >> cabal.project
- touch cabal.project.local - |
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(servant-ekg)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" echo "write-ghc-environment-files: always" >> cabal.project
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(servant-ekg)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
- cat cabal.project || true - cat cabal.project || true
- cat cabal.project.local || true - cat cabal.project.local || true
# Building...
# this builds all libraries and executables (without tests/benchmarks) # this builds all libraries and executables (without tests/benchmarks)
- ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks all - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
# Building with tests and benchmarks...
# build & run tests, build benchmarks # build & run tests, build benchmarks
- ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} all - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
- if [ "x$TEST" = "x--enable-tests" ]; then ${CABAL} new-test -w ${HC} ${TEST} ${BENCH} all; fi # Testing...
- ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
# cabal check # cabal check...
- (cd servant-ekg-* && ${CABAL} check) - (cd servant-ekg-* && ${CABAL} -vnormal check)
# haddock...
# haddock - ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
- ${CABAL} new-haddock -w ${HC} ${TEST} ${BENCH} all # Building without installed constraints for packages in global-db...
- rm -f cabal.project.local
# Build without installed constraints for packages in global-db - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
- rm -f cabal.project.local; ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks all;
# Constraint sets # Constraint sets
- rm -rf cabal.project.local - rm -rf cabal.project.local
# Constraint set servant-0.15 # Constraint set servant-0.15
- ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.15.*' all - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.15.*' all | color_cabal_output
# Constraint set servant-0.16 # Constraint set servant-0.16
- ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all | color_cabal_output
# REGENDATA ["--output=.travis.yml","--config=cabal.haskell-ci","cabal.project"] # REGENDATA ["--output=.travis.yml","--config=cabal.haskell-ci","cabal.project"]
# EOF # EOF

5
servant-ekg.cabal
View file

@ -1,6 +1,7 @@
cabal-version: >=1.10 cabal-version: >=1.10
name: servant-ekg name: servant-ekg
version: 0.3 version: 0.3
x-revision: 1
synopsis: Helpers for using ekg with servant synopsis: Helpers for using ekg with servant
description: Helpers for using ekg with servant, e.g.. counters per endpoint. description: Helpers for using ekg with servant, e.g.. counters per endpoint.
license: BSD3 license: BSD3
@ -13,7 +14,7 @@ maintainer:
category: Servant, Web, System category: Servant, Web, System
build-type: Simple build-type: Simple
tested-with: ghc ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.3 tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5
extra-source-files: README.md CHANGELOG.md extra-source-files: README.md CHANGELOG.md
source-repository HEAD source-repository HEAD
@ -28,7 +29,7 @@ library
base >=4.9 && <4.13 base >=4.9 && <4.13
, ekg-core >=0.1.1.4 && <0.2 , ekg-core >=0.1.1.4 && <0.2
, http-types >=0.12.2 && <0.13 , http-types >=0.12.2 && <0.13
, hashable >=1.2.7.0 && <1.3 , hashable >=1.2.7.0 && <1.4
, servant >=0.14 && <0.17 , servant >=0.14 && <0.17
, text >=1.2.3.0 && <1.3 , text >=1.2.3.0 && <1.3
, time >=1.6.0.1 && <1.9 , time >=1.6.0.1 && <1.9