Skip to content

Commit 26bddc5

Browse files
authored
Merge pull request #3 from phadej/update
Update aeson, tagsoup, optparse-applicative
2 parents 454e8ad + 4b9e9e7 commit 26bddc5

File tree

2 files changed

+70
-3
lines changed

2 files changed

+70
-3
lines changed

.travis.yml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# This file has been generated by `make_travis_yml_2.hs`
2+
# see https://github.com/hvr/multi-ghc-travis for more information
3+
language: c
4+
sudo: false
5+
6+
git:
7+
submodules: false # whether to recursively clone submodules
8+
9+
cache:
10+
directories:
11+
- $HOME/.cabal/packages
12+
- $HOME/.cabal/store
13+
14+
before_cache:
15+
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
16+
# remove files that are regenerated by 'cabal update'
17+
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
18+
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
19+
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
20+
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
21+
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
22+
23+
matrix:
24+
include:
25+
- env: CABALVER=head GHCVER=8.0.1
26+
compiler: ": #GHC 8.0.1"
27+
addons: {apt: {packages: [cabal-install-head,ghc-8.0.1,libssl-dev], sources: [hvr-ghc]}}
28+
29+
before_install:
30+
- unset CC
31+
- export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
32+
33+
install:
34+
- cabal --version
35+
- BENCH=${BENCH---enable-benchmarks}
36+
- TEST=${TEST---enable-tests}
37+
- echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
38+
- travis_retry cabal update -v
39+
- sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
40+
- cabal new-build ${TEST} ${BENCH} --dep -j2
41+
42+
# Here starts the actual work to be performed for the package under test;
43+
# any command which exits with a non-zero exit code causes the build to fail.
44+
script:
45+
- if [ -f configure.ac ]; then autoreconf -i; fi
46+
# this builds all libraries and executables (including tests/benchmarks)
47+
- cabal new-build ${TEST} ${BENCH}
48+
49+
# there's no 'cabal new-test' yet, so let's emulate for now
50+
- SRC_BASENAME=$(cabal info . | awk '{print $2;exit}')
51+
- TESTS=( $(awk 'tolower($0) ~ /^test-suite / { print $2 }' *.cabal) );
52+
shopt -s globstar;
53+
RC=true; for T in ${TESTS[@]}; do echo "== $T ==";
54+
if dist-newstyle/build/**/$SRC_BASENAME/**/build/$T/$T; then echo "= $T OK =";
55+
else echo "= $T FAILED ="; RC=false; fi; done; $RC
56+
- cabal sdist # test that a source-distribution can be generated
57+
58+
# Check that the resulting source distribution can be built w/o and w tests
59+
- tar -C dist/ -xf dist/$SRC_BASENAME.tar.gz
60+
- "echo 'packages: .' > dist/$SRC_BASENAME/cabal.project"
61+
- cd dist/$SRC_BASENAME/
62+
- cabal new-build --disable-tests --disable-benchmarks
63+
- rm -rf ./dist-newstyle
64+
- cabal new-build ${TEST} ${BENCH}
65+
66+
# EOF

hackage-cli.cabal

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ maintainer: [email protected]
99
category: Development
1010
build-type: Simple
1111
cabal-version: >=1.10
12+
tested-with: GHC==8.0.1
1213

1314
source-repository head
1415
Type: git
@@ -33,7 +34,7 @@ executable hackage-cli
3334
build-depends:
3435
Cabal >=1.24 && <1.25,
3536
HsOpenSSL >=0.11 && <0.12,
36-
aeson >=0.11 && <0.12,
37+
aeson >=1.0 && <1.1,
3738
base >=4.8 && <4.10,
3839
blaze-builder >=0.3 && <0.5,
3940
bytestring >=0.10.4 && <0.11,
@@ -46,11 +47,11 @@ executable hackage-cli
4647
lens >=4.9 && <4.15,
4748
mtl >=2.2 && <2.3,
4849
netrc >=0.2 && <0.3,
49-
optparse-applicative >=0.12 && <0.13,
50+
optparse-applicative >=0.13 && <0.14,
5051
pretty >=1.1.2 && <1.2,
5152
split >=0.2 && <0.3,
5253
stringsearch >=0.3.6 && <0.4,
53-
tagsoup >=0.13 && <0.14,
54+
tagsoup >=0.14 && <0.15,
5455
tar >=0.5 && <0.6,
5556
text >=1.2 && <1.3,
5657
time >=1.5 && <1.7,

0 commit comments

Comments
 (0)