Skip to content
Snippets Groups Projects
Commit 34f9e98c authored by Herbert Valerio Riedel's avatar Herbert Valerio Riedel 🕺
Browse files

Fixup for GHC 8.6.1 release 

...and update Travis CI
parent 610d7aa5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.travis.yml
+ 80
− 59
View file @ 34f9e98c
# This Travis job script has been generated by a script via # This Travis job script has been generated by a script via
# #
# make_travis_yml_2.hs 'parsec.cabal' # runghc make_travis_yml_2.hs 'parsec.cabal' '-o' '.travis.yml'
# #
# For more information, see https://github.com/hvr/multi-ghc-travis # For more information, see https://github.com/haskell-CI/haskell-ci
# #
language: c language: c
sudo: false sudo: false
...@@ -24,83 +24,104 @@ before_cache: ...@@ -24,83 +24,104 @@ before_cache:
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
- rm -rfv $HOME/.cabal/packages/head.hackage
matrix: matrix:
include: include:
- compiler: "ghc-7.4.1" - compiler: "ghc-8.6.1"
# env: TEST=--disable-tests BENCH=--disable-benchmarks # env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.4.1], sources: [hvr-ghc]}} addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
- compiler: "ghc-7.4.2" - compiler: "ghc-8.4.3"
# env: TEST=--disable-tests BENCH=--disable-benchmarks # env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.4.2], sources: [hvr-ghc]}} addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.3], sources: [hvr-ghc]}}
- compiler: "ghc-7.6.3" - compiler: "ghc-8.2.2"
# env: TEST=--disable-tests BENCH=--disable-benchmarks # env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.6.3], sources: [hvr-ghc]}} addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
- compiler: "ghc-7.8.4" - compiler: "ghc-8.0.2"
# env: TEST=--disable-tests BENCH=--disable-benchmarks # env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.8.4], sources: [hvr-ghc]}} addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}}
- compiler: "ghc-7.10.3" - compiler: "ghc-7.10.3"
# env: TEST=--disable-tests BENCH=--disable-benchmarks # env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}} addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.10.3], sources: [hvr-ghc]}}
- compiler: "ghc-8.0.2" - compiler: "ghc-7.8.4"
# env: TEST=--disable-tests BENCH=--disable-benchmarks # env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}} addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.8.4], sources: [hvr-ghc]}}
- compiler: "ghc-8.2.2" - compiler: "ghc-7.6.3"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.6.3], sources: [hvr-ghc]}}
- compiler: "ghc-7.4.2"
# env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.4.2], sources: [hvr-ghc]}}
- compiler: "ghc-7.4.1"
# env: TEST=--disable-tests BENCH=--disable-benchmarks # env: TEST=--disable-tests BENCH=--disable-benchmarks
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}} addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.4.1], sources: [hvr-ghc]}}
before_install: before_install:
- HC=${CC} - HC=${CC}
- HCPKG=${HC/ghc/ghc-pkg} - HCPKG=${HC/ghc/ghc-pkg}
- unset CC - unset CC
- PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH - ROOTDIR=$(pwd)
- PKGNAME='parsec' - mkdir -p $HOME/.local/bin
- "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
- echo $HCNUMVER
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 '?')]"
- BENCH=${BENCH---enable-benchmarks} - BENCH=${BENCH---enable-benchmarks}
- TEST=${TEST---enable-tests} - TEST=${TEST---enable-tests}
- HADDOCK=${HADDOCK-true} - HADDOCK=${HADDOCK-true}
- INSTALLED=${INSTALLED-true} - UNCONSTRAINED=${UNCONSTRAINED-true}
- travis_retry cabal update -v - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
- sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config - GHCHEAD=${GHCHEAD-false}
- rm -fv cabal.project.local - travis_retry cabal update -v
- "echo 'packages: .' > cabal.project" - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
- rm -f cabal.project.freeze - rm -fv cabal.project cabal.project.local
- cabal new-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all - "printf 'packages: \".\"\\n' > cabal.project"
- touch cabal.project.local
- "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- parsec | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
- cat cabal.project || true
- cat cabal.project.local || true
- if [ -f "./configure.ac" ]; then
(cd "." && autoreconf -i);
fi
- rm -f cabal.project.freeze
- cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
- 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; # 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. # any command which exits with a non-zero exit code causes the build to fail.
script: script:
- if [ -f configure.ac ]; then autoreconf -i; fi # test that source-distributions can be generated
- rm -rf .ghc.environment.* dist/ - (cd "." && cabal sdist)
- cabal sdist # test that a source-distribution can be generated - mv "."/dist/parsec-*.tar.gz ${DISTDIR}/
- cd dist/ - cd ${DISTDIR} || false
- SRCTAR=(${PKGNAME}-*.tar.gz) - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
- SRC_BASENAME="${SRCTAR/%.tar.gz}" - "printf 'packages: parsec-*/*.cabal\\n' > cabal.project"
- tar -xvf "./$SRC_BASENAME.tar.gz" - touch cabal.project.local
- cd "$SRC_BASENAME/" - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- parsec | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
## from here on, CWD is inside the extracted source-tarball - cat cabal.project || true
- rm -fv cabal.project.local - cat cabal.project.local || true
- "echo 'packages: .' > cabal.project" # 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
- rm -f cabal.project.freeze
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks all # build & run tests, build benchmarks
# this builds all libraries and executables (including tests/benchmarks) - cabal new-build -w ${HC} ${TEST} ${BENCH} all
# - rm -rf ./dist-newstyle - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi
# Build with installed constraints for packages in global-db # cabal check
- if $INSTALLED; then - (cd parsec-* && cabal check)
${HCPKG} list --global --simple-output --names-only | sed -r 's/([a-zA-Z0-9-]+*) */--constraint=\1 installed;/g' | sed 's/;$/;all/' | xargs -d ';' cabal new-build -w ${HC} --disable-tests --disable-benchmarks;
else echo "Not building with installed constraints"; fi
# build & run tests, build benchmarks # haddock
- cabal new-build -w ${HC} ${TEST} ${BENCH} all - rm -rf ./dist-newstyle
- if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} all; fi - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
# haddock # Build without installed constraints for packages in global-db
- rm -rf ./dist-newstyle - if $UNCONSTRAINED; then rm -f cabal.project.local; echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks all; else echo "Not building without installed constraints"; fi
- if $HADDOCK; then cabal new-haddock -w ${HC} --disable-tests --disable-benchmarks all; else echo "Skipping haddock generation";fi
# REGENDATA ["parsec.cabal","-o",".travis.yml"]
# EOF # EOF
parsec.cabal
+ 2
− 4
View file @ 34f9e98c
cabal-version: 1.12 cabal-version: 1.12
name: parsec name: parsec
-- FIXME: This is an ugly hack to mark this commit as a transient unofficial one version: 3.1.13.0
version: 3.1.13.0.0.0.0.0
synopsis: Monadic parser combinators synopsis: Monadic parser combinators
description: Parsec is designed from scratch as an industrial-strength parser description: Parsec is designed from scratch as an industrial-strength parser
...@@ -27,7 +26,7 @@ bug-reports: https://github.com/haskell/parsec/issues ...@@ -27,7 +26,7 @@ bug-reports: https://github.com/haskell/parsec/issues
category: Parsing category: Parsing
build-type: Simple build-type: Simple
tested-with: GHC ==8.4.1 || ==8.2.2 || ==8.0.2 || ==7.10.3 || ==7.8.4 || ==7.6.3 || ==7.4.2 || ==7.4.1 tested-with: GHC ==8.6.1 || ==8.4.3 || ==8.2.2 || ==8.0.2 || ==7.10.3 || ==7.8.4 || ==7.6.3 || ==7.4.2 || ==7.4.1
extra-source-files: ChangeLog.md, README.md extra-source-files: ChangeLog.md, README.md
...@@ -65,7 +64,6 @@ library ...@@ -65,7 +64,6 @@ library
Text.ParserCombinators.Parsec.Token Text.ParserCombinators.Parsec.Token
build-depends: build-depends:
-- FIXME
base >= 4.5.0 && < 4.13, base >= 4.5.0 && < 4.13,
mtl >= 1.1.1 && < 2.3, mtl >= 1.1.1 && < 2.3,
bytestring >= 0.9.2.1 && < 0.11, bytestring >= 0.9.2.1 && < 0.11,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment