Skip to content

Commit 7b2bd22

Browse files
phadejphadej
committed
Regenerate .travis.yml, bump version to 1.2.4.1
- There is no public API changes, only adopting to changes in dependencies - Use `else` in `text.cabal`
1 parent 80cb9ee commit 7b2bd22

File tree

3 files changed

+74
-58
lines changed

3 files changed

+74
-58
lines changed

‎.travis.yml

Lines changed: 67 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,17 @@
22
#
33
# haskell-ci 'text.cabal'
44
#
5+
# To regenerate the script (for example after adjusting tested-with) run
6+
#
7+
# haskell-ci regenerate
8+
#
59
# For more information, see https://github.com/haskell-CI/haskell-ci
610
#
7-
# version: 0.3.20190521
11+
# version: 0.10.1
812
#
13+
version: ~> 1.0
914
language: c
15+
os: linux
1016
dist: xenial
1117
git:
1218
# whether to recursively clone submodules
@@ -15,6 +21,7 @@ cache:
1521
directories:
1622
- $HOME/.cabal/packages
1723
- $HOME/.cabal/store
24+
- $HOME/.hlint
1825
before_cache:
1926
- rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
2027
# remove files that are regenerated by 'cabal update'
@@ -24,68 +31,66 @@ before_cache:
2431
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
2532
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
2633
- rm -rfv $CABALHOME/packages/head.hackage
27-
matrix:
34+
jobs:
2835
include:
36+
- compiler: ghc-8.10.1
37+
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.10.1","cabal-install-3.2"]}}
38+
os: linux
39+
- compiler: ghc-8.8.3
40+
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.3","cabal-install-3.2"]}}
41+
os: linux
2942
- compiler: ghc-8.6.5
30-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}
43+
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.2"]}}
44+
os: linux
3145
- compiler: ghc-8.4.4
32-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}
46+
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.2"]}}
47+
os: linux
3348
- compiler: ghc-8.2.2
34-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}
49+
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.2"]}}
50+
os: linux
3551
- compiler: ghc-8.0.2
36-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}
52+
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.2"]}}
53+
os: linux
3754
- compiler: ghc-7.10.3
38-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-2.4"]}}
55+
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.10.3","cabal-install-3.2"]}}
56+
os: linux
3957
- compiler: ghc-7.8.4
40-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-2.4"]}}
58+
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.8.4","cabal-install-3.2"]}}
59+
os: linux
4160
- compiler: ghc-7.6.3
42-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.6.3","cabal-install-2.4"]}}
61+
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.6.3","cabal-install-3.2"]}}
62+
os: linux
4363
- compiler: ghc-7.4.2
44-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.4.2","cabal-install-2.4"]}}
64+
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.4.2","cabal-install-3.2"]}}
65+
os: linux
4566
- compiler: ghc-7.2.2
46-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.2.2","cabal-install-2.4"]}}
67+
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.2.2","cabal-install-3.2"]}}
68+
os: linux
4769
- compiler: ghc-7.0.4
48-
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.0.4","cabal-install-2.4"]}}
70+
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.0.4","cabal-install-3.2"]}}
71+
os: linux
4972
before_install:
5073
- HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
74+
- WITHCOMPILER="-w $HC"
75+
- HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
5176
- HCPKG="$HC-pkg"
5277
- unset CC
5378
- CABAL=/opt/ghc/bin/cabal
5479
- CABALHOME=$HOME/.cabal
5580
- export PATH="$CABALHOME/bin:$PATH"
5681
- TOP=$(pwd)
57-
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
82+
- "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
5883
- echo $HCNUMVER
59-
- CABAL="$CABAL -vnormal+nowrap+markoutput"
84+
- CABAL="$CABAL -vnormal+nowrap"
6085
- set -o pipefail
61-
- |
62-
echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
63-
echo 'BEGIN { state = "output"; }' >> .colorful.awk
64-
echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
65-
echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
66-
echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
67-
echo ' if (state == "cabal") {' >> .colorful.awk
68-
echo ' print blue($0)' >> .colorful.awk
69-
echo ' } else {' >> .colorful.awk
70-
echo ' print $0' >> .colorful.awk
71-
echo ' }' >> .colorful.awk
72-
echo '}' >> .colorful.awk
73-
- cat .colorful.awk
74-
- |
75-
color_cabal_output () {
76-
awk -f $TOP/.colorful.awk
77-
}
78-
- echo text | color_cabal_output
79-
install:
80-
- ${CABAL} --version
81-
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
8286
- TEST=--enable-tests
8387
- BENCH=--enable-benchmarks
84-
- GHCHEAD=${GHCHEAD-false}
88+
- HEADHACKAGE=false
8589
- rm -f $CABALHOME/config
8690
- |
8791
echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
8892
echo "remote-build-reporting: anonymous" >> $CABALHOME/config
93+
echo "write-ghc-environment-files: always" >> $CABALHOME/config
8994
echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
9095
echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
9196
echo "world-file: $CABALHOME/world" >> $CABALHOME/config
@@ -98,61 +103,68 @@ install:
98103
echo " prefix: $CABALHOME" >> $CABALHOME/config
99104
echo "repository hackage.haskell.org" >> $CABALHOME/config
100105
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
106+
install:
107+
- ${CABAL} --version
108+
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
109+
- |
110+
echo "program-default-options" >> $CABALHOME/config
111+
echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
101112
- cat $CABALHOME/config
102113
- rm -fv cabal.project cabal.project.local cabal.project.freeze
103114
- travis_retry ${CABAL} v2-update -v
104115
# Generate cabal.project
105116
- rm -rf cabal.project cabal.project.local cabal.project.freeze
106117
- touch cabal.project
107118
- |
108-
echo 'packages: "."' >> cabal.project
119+
echo "packages: ." >> cabal.project
120+
- if [ $HCNUMVER -ge 80200 ] ; then echo 'package text' >> cabal.project ; fi
121+
- "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
109122
- |
110-
echo "write-ghc-environment-files: always" >> cabal.project
111123
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(text)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
112124
- cat cabal.project || true
113125
- cat cabal.project.local || true
114126
- if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
115-
- ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output
127+
- ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
116128
- "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
117129
- rm cabal.project.freeze
118-
- ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
119-
- ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
130+
- travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
131+
- travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
120132
script:
121133
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
122134
# Packaging...
123-
- ${CABAL} v2-sdist all | color_cabal_output
135+
- ${CABAL} v2-sdist all
124136
# Unpacking...
125137
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
126-
- cp -av th-tests ${DISTDIR}/th-tests.src
127138
- cd ${DISTDIR} || false
128-
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
139+
- find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
140+
- find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
141+
- PKGDIR_text="$(find . -maxdepth 1 -type d -regex '.*/text-[0-9.]*')"
129142
# Generate cabal.project
130143
- rm -rf cabal.project cabal.project.local cabal.project.freeze
131144
- touch cabal.project
132145
- |
133-
echo 'packages: "text-*/*.cabal"' >> cabal.project
134-
- |
135-
echo 'packages: ./th-tests.src/' >> cabal.project
146+
echo "packages: ${PKGDIR_text}" >> cabal.project
147+
- if [ $HCNUMVER -ge 80200 ] ; then echo 'package text' >> cabal.project ; fi
148+
- "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
136149
- |
137-
echo "write-ghc-environment-files: always" >> cabal.project
138150
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(text)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
139151
- cat cabal.project || true
140152
- cat cabal.project.local || true
141153
# Building...
142154
# this builds all libraries and executables (without tests/benchmarks)
143-
- ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
155+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
144156
# Building with tests and benchmarks...
145157
# build & run tests, build benchmarks
146-
- ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
158+
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all
147159
# Testing...
148-
- ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
160+
- ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all
149161
# cabal check...
150-
- (cd text-* && ${CABAL} -vnormal check)
162+
- (cd ${PKGDIR_text} && ${CABAL} -vnormal check)
151163
# haddock...
152-
- ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
164+
- ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
153165
# Building without installed constraints for packages in global-db...
154166
- rm -f cabal.project.local
155-
- ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
167+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
156168

157-
# REGENDATA ["text.cabal"]
169+
# REGENDATA ("0.10.1",["text.cabal"])
158170
# EOF

‎changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### 1.2.4.1
2+
3+
* Support `template-haskell-2.17.0.0`
4+
15
### 1.2.4.0
26

37
* Add TH `Lift` instances for `Data.Text.Text` and `Data.Text.Lazy.Text` (gh-232)

‎text.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: >= 1.10
22
name: text
3-
version: 1.2.4.0
3+
version: 1.2.4.1
44

55
homepage: https://github.com/haskell/text
66
bug-reports: https://github.com/haskell/text/issues
@@ -56,7 +56,7 @@ maintainer: Bryan O'Sullivan <[email protected]>, Herbert Valerio Riedel <h
5656
copyright: 2009-2011 Bryan O'Sullivan, 2008-2009 Tom Harper
5757
category: Data, Text
5858
build-type: Simple
59-
tested-with: GHC==8.6.5, GHC==8.4.4,
59+
tested-with: GHC==8.10.1, GHC==8.8.3, GHC==8.6.5, GHC==8.4.4,
6060
GHC==8.2.2, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4,
6161
GHC==7.6.3, GHC==7.4.2, GHC==7.2.2, GHC==7.0.4
6262
extra-source-files:
@@ -178,7 +178,7 @@ library
178178
if impl(ghc >= 8.11)
179179
build-depends: ghc-bignum
180180

181-
if impl(ghc < 8.11)
181+
else
182182
if flag(integer-simple)
183183
cpp-options: -DINTEGER_SIMPLE
184184
build-depends: integer-simple >= 0.1 && < 0.5

0 commit comments

Comments
 (0)