Skip to content

Commit 8af3374

Browse files
committed
Prepare for 0.19 release [wip]
1 parent e4bab2e commit 8af3374

File tree

3 files changed

+34
-21
lines changed

3 files changed

+34
-21
lines changed

.travis.yml

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This Travis job script has been generated by a script via
22
#
3-
# make_travis_yml_2.hs '--branch' 'master' '-o' '.travis.yml' 'github.cabal'
3+
# runghc make_travis_yml_2.hs '--branch' 'master' '-o' '.travis.yml' 'github.cabal'
44
#
55
# For more information, see https://github.com/hvr/multi-ghc-travis
66
#
@@ -28,6 +28,8 @@ before_cache:
2828
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
2929
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
3030

31+
- rm -rfv $HOME/.cabal/packages/head.hackage
32+
3133
matrix:
3234
include:
3335
- compiler: "ghc-7.8.4"
@@ -39,15 +41,19 @@ matrix:
3941
- compiler: "ghc-8.0.2"
4042
# env: TEST=--disable-tests BENCH=--disable-benchmarks
4143
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
42-
- compiler: "ghc-8.2.1"
44+
- compiler: "ghc-8.2.2"
4345
# env: TEST=--disable-tests BENCH=--disable-benchmarks
44-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.1], sources: [hvr-ghc]}}
46+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
4547

4648
before_install:
4749
- HC=${CC}
4850
- HCPKG=${HC/ghc/ghc-pkg}
4951
- unset CC
50-
- PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH
52+
- ROOTDIR=$(pwd)
53+
- mkdir -p $HOME/.local/bin
54+
- "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
55+
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
56+
- echo $HCNUMVER
5157

5258
install:
5359
- cabal --version
@@ -56,12 +62,15 @@ install:
5662
- TEST=${TEST---enable-tests}
5763
- HADDOCK=${HADDOCK-true}
5864
- INSTALLED=${INSTALLED-true}
65+
- GHCHEAD=${GHCHEAD-false}
5966
- travis_retry cabal update -v
60-
- sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
61-
- rm -fv cabal.project.local
62-
- "echo 'packages: .' > cabal.project"
67+
- "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
68+
- rm -fv cabal.project cabal.project.local
69+
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
70+
- "printf 'packages: \".\"\\n' > cabal.project"
71+
- cat cabal.project
6372
- if [ -f "./configure.ac" ]; then
64-
(cd "."; autoreconf -i);
73+
(cd "." && autoreconf -i);
6574
fi
6675
- rm -f cabal.project.freeze
6776
- cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
@@ -73,26 +82,28 @@ install:
7382
# any command which exits with a non-zero exit code causes the build to fail.
7483
script:
7584
# test that source-distributions can be generated
76-
- (cd "."; cabal sdist)
85+
- (cd "." && cabal sdist)
7786
- mv "."/dist/github-*.tar.gz ${DISTDIR}/
78-
- cd ${DISTDIR}
87+
- cd ${DISTDIR} || false
7988
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
80-
- "printf 'packages: github-*/*.cabal\n' > cabal.project"
89+
- "printf 'packages: github-*/*.cabal\\n' > cabal.project"
90+
- cat cabal.project
8191
# this builds all libraries and executables (without tests/benchmarks)
8292
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
8393

8494
# Build with installed constraints for packages in global-db
85-
- if $INSTALLED; then
86-
echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh;
87-
else echo "Not building with installed constraints"; fi
95+
- if $INSTALLED; then echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh; else echo "Not building with installed constraints"; fi
8896

8997
# build & run tests, build benchmarks
9098
- cabal new-build -w ${HC} ${TEST} ${BENCH} all
91-
- if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} all; fi
99+
- if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi
100+
101+
# cabal check
102+
- (cd github-* && cabal check)
92103

93104
# haddock
94105
- rm -rf ./dist-newstyle
95-
- if $HADDOCK; then cabal new-haddock -w ${HC} --disable-tests --disable-benchmarks all; else echo "Skipping haddock generation";fi
106+
- if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
96107

97108
# REGENDATA ["--branch","master","-o",".travis.yml","github.cabal"]
98109
# EOF

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
Changes for 0.19
2+
- TBW
3+
14
Changes for 0.18
25
- Endpoints for deleting issue comments.
36
[#294](https://github.com/phadej/github/pull/294)

github.cabal

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
name: github
2-
version: 0.18
3-
x-revision: 1
2+
version: 0.19
43
synopsis: Access to the GitHub API, v3.
54
description:
65
The GitHub API provides programmatic access to the full
@@ -26,7 +25,7 @@ homepage: https://github.com/phadej/github
2625
copyright: Copyright 2012-2013 Mike Burns, Copyright 2013-2015 John Wiegley, Copyright 2016 Oleg Grenrus
2726
category: Network
2827
build-type: Simple
29-
tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.1
28+
tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2
3029
cabal-version: >=1.10
3130
extra-source-files:
3231
README.md,
@@ -149,13 +148,13 @@ Library
149148
http-client >=0.4.8.1 && <0.6,
150149
http-client-tls >=0.2.2 && <0.4,
151150
http-link-header >=1.0.1 && <1.1,
152-
http-types >=0.8.6 && <0.12,
151+
http-types >=0.12 && <0.13,
153152
iso8601-time >=0.1.4 && <0.2,
154153
mtl >=2.1.3.1 && <2.3,
155154
network-uri >=2.6.0.3 && <2.7,
156155
semigroups >=0.16.2.2 && <0.19,
157156
text >=1.2.0.6 && <1.3,
158-
time >=1.4 && <1.9,
157+
time >=1.4 && <1.10,
159158
transformers >=0.3.0.0 && <0.6,
160159
transformers-compat >=0.4.0.3 && <0.6,
161160
unordered-containers >=0.2 && <0.3,

0 commit comments

Comments
 (0)