Skip to content

Commit b28d37a

Browse files
phadejphadej
committed
Re-enable some recipes (servant-0.16)
1 parent b17c8bb commit b28d37a

File tree

2 files changed

+24
-48
lines changed

2 files changed

+24
-48
lines changed

‎.travis.yml

Lines changed: 18 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,23 @@ before_cache:
3333
matrix:
3434
include:
3535
- compiler: "ghc-8.6.3"
36-
# env: FOO=bar
3736
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}}
3837
- compiler: "ghc-8.4.4"
39-
# env: FOO=bar
4038
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
4139
- compiler: "ghc-8.2.2"
42-
# env: FOO=bar
4340
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
4441
- compiler: "ghc-8.0.2"
45-
# env: FOO=bar
4642
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}}
4743

4844
before_install:
4945
- HC=/opt/ghc/bin/${CC}
46+
- HCVER=$(echo "$TRAVIS_COMPILER" | sed 's/ghc-//')
47+
- echo $HCVER
5048
- HCPKG=${HC/ghc/ghc-pkg}
5149
- unset CC
5250
- CABAL=/opt/ghc/bin/cabal
5351
- CABALHOME=$HOME/.cabal
54-
- "export PATH=\"$CABALHOME/bin:$PATH\""
52+
- export PATH="$CABALHOME/bin:$PATH"
5553
- ROOTDIR=$(pwd)
5654
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
5755
- echo $HCNUMVER
@@ -63,7 +61,7 @@ install:
6361
- BENCH=--enable-benchmarks
6462
- GHCHEAD=${GHCHEAD-false}
6563
- travis_retry ${CABAL} update -v
66-
- "sed -i.bak 's/^jobs:/-- jobs:/' $CABALHOME/config"
64+
- sed -i.bak 's/^jobs:/-- jobs:/' $CABALHOME/config
6765
- rm -fv cabal.project cabal.project.local
6866
- "sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' $CABALHOME/config"
6967
- grep -Ev -- '^\s*--' $CABALHOME/config | grep -Ev '^\s*$'
@@ -88,32 +86,22 @@ install:
8886
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/file-upload\"\\n' >> cabal.project ; fi"
8987
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/generic\"\\n' >> cabal.project ; fi"
9088
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/https\"\\n' >> cabal.project ; fi"
89+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/pagination\"\\n' >> cabal.project ; fi"
9190
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/testing\"\\n' >> cabal.project ; fi"
9291
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/structuring-apis\"\\n' >> cabal.project ; fi"
9392
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/using-custom-monad\"\\n' >> cabal.project ; fi"
9493
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/using-free-client\"\\n' >> cabal.project ; fi"
9594
- "echo 'constraints: foundation >=0.0.14' >> cabal.project"
9695
- "echo 'constraints: memory <0.14.12 || >0.14.12' >> cabal.project"
97-
- "echo 'allow-newer: servant-js:base' >> cabal.project"
98-
- "echo 'allow-newer: servant-pagination:servant' >> cabal.project"
99-
- "echo 'allow-newer: servant-pagination:servant-server' >> cabal.project"
100-
- "echo 'allow-newer: servant-multipart:servant' >> cabal.project"
101-
- "echo 'allow-newer: servant-multipart:servant-server' >> cabal.project"
102-
- "echo 'allow-newer: servant-auth-server:servant' >> cabal.project"
103-
- "echo 'allow-newer: servant-auth-server:servant-server' >> cabal.project"
104-
- "echo 'allow-newer: servant-auth-server:http-api-data' >> cabal.project"
105-
- "echo 'allow-newer: servant-js:servant' >> cabal.project"
106-
- "echo 'allow-newer: servant-js:servant-foreign' >> cabal.project"
10796
- "echo 'allow-newer: servant-quickcheck:servant' >> cabal.project"
10897
- "echo 'allow-newer: servant-quickcheck:servant-client' >> cabal.project"
10998
- "echo 'allow-newer: servant-quickcheck:servant-server' >> cabal.project"
11099
- "echo 'allow-newer: servant-quickcheck:hspec' >> cabal.project"
111100
- "echo 'allow-newer: servant-quickcheck:http-client' >> cabal.project"
112-
- "echo 'reorder-goals: True' >> cabal.project"
113101
- "echo 'optimization: False' >> cabal.project "
114102
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
115103
- touch cabal.project.local
116-
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-db-sqlite-simple|cookbook-file-upload|cookbook-generic|cookbook-https|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-machines|servant-pipes|servant-server|tutorial)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
104+
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-db-sqlite-simple|cookbook-file-upload|cookbook-generic|cookbook-https|cookbook-pagination|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-machines|servant-pipes|servant-server|tutorial)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
117105
- cat cabal.project || true
118106
- cat cabal.project.local || true
119107
- if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi
@@ -135,22 +123,23 @@ install:
135123
- if [ -f "doc/cookbook/file-upload/configure.ac" ]; then (cd "doc/cookbook/file-upload" && autoreconf -i); fi
136124
- if [ -f "doc/cookbook/generic/configure.ac" ]; then (cd "doc/cookbook/generic" && autoreconf -i); fi
137125
- if [ -f "doc/cookbook/https/configure.ac" ]; then (cd "doc/cookbook/https" && autoreconf -i); fi
126+
- if [ -f "doc/cookbook/pagination/configure.ac" ]; then (cd "doc/cookbook/pagination" && autoreconf -i); fi
138127
- if [ -f "doc/cookbook/testing/configure.ac" ]; then (cd "doc/cookbook/testing" && autoreconf -i); fi
139128
- if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then (cd "doc/cookbook/structuring-apis" && autoreconf -i); fi
140129
- if [ -f "doc/cookbook/using-custom-monad/configure.ac" ]; then (cd "doc/cookbook/using-custom-monad" && autoreconf -i); fi
141130
- if [ -f "doc/cookbook/using-free-client/configure.ac" ]; then (cd "doc/cookbook/using-free-client" && autoreconf -i); fi
142131
- rm -f cabal.project.freeze
143-
- rm -rf .ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-http-streams"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist "servant-machines"/dist "servant-conduit"/dist "servant-pipes"/dist "doc/cookbook/basic-auth"/dist "doc/cookbook/curl-mock"/dist "doc/cookbook/basic-streaming"/dist "doc/cookbook/db-postgres-pool"/dist "doc/cookbook/db-sqlite-simple"/dist "doc/cookbook/file-upload"/dist "doc/cookbook/generic"/dist "doc/cookbook/https"/dist "doc/cookbook/testing"/dist "doc/cookbook/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist "doc/cookbook/using-free-client"/dist
132+
- rm -rf .ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-http-streams"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist "servant-machines"/dist "servant-conduit"/dist "servant-pipes"/dist "doc/cookbook/basic-auth"/dist "doc/cookbook/curl-mock"/dist "doc/cookbook/basic-streaming"/dist "doc/cookbook/db-postgres-pool"/dist "doc/cookbook/db-sqlite-simple"/dist "doc/cookbook/file-upload"/dist "doc/cookbook/generic"/dist "doc/cookbook/https"/dist "doc/cookbook/pagination"/dist "doc/cookbook/testing"/dist "doc/cookbook/structuring-apis"/dist "doc/cookbook/using-custom-monad"/dist "doc/cookbook/using-free-client"/dist
144133
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
145134

146135
# Here starts the actual work to be performed for the package under test;
147136
# any command which exits with a non-zero exit code causes the build to fail.
148137
script:
149138
# test that source-distributions can be generated
150-
- "echo Packaging... && echo -en 'travis_fold:start:sdist\\\\r'"
139+
- echo Packaging... && echo -en 'travis_fold:start:sdist\\r'
151140
- ${CABAL} new-sdist all
152-
- "echo -en 'travis_fold:end:sdist\\\\r'"
153-
- "echo Unpacking... && echo -en 'travis_fold:start:unpack\\\\r'"
141+
- echo -en 'travis_fold:end:sdist\\r'
142+
- echo Unpacking... && echo -en 'travis_fold:start:unpack\\r'
154143
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
155144
- cd ${DISTDIR} || false
156145
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
@@ -175,46 +164,36 @@ script:
175164
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-file-upload-*/*.cabal\"\\n' >> cabal.project ; fi"
176165
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-generic-*/*.cabal\"\\n' >> cabal.project ; fi"
177166
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-https-*/*.cabal\"\\n' >> cabal.project ; fi"
167+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-pagination-*/*.cabal\"\\n' >> cabal.project ; fi"
178168
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-testing-*/*.cabal\"\\n' >> cabal.project ; fi"
179169
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-structuring-apis-*/*.cabal\"\\n' >> cabal.project ; fi"
180170
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-using-custom-monad-*/*.cabal\"\\n' >> cabal.project ; fi"
181171
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-using-free-client-*/*.cabal\"\\n' >> cabal.project ; fi"
182172
- "echo 'constraints: foundation >=0.0.14' >> cabal.project"
183173
- "echo 'constraints: memory <0.14.12 || >0.14.12' >> cabal.project"
184-
- "echo 'allow-newer: servant-js:base' >> cabal.project"
185-
- "echo 'allow-newer: servant-pagination:servant' >> cabal.project"
186-
- "echo 'allow-newer: servant-pagination:servant-server' >> cabal.project"
187-
- "echo 'allow-newer: servant-multipart:servant' >> cabal.project"
188-
- "echo 'allow-newer: servant-multipart:servant-server' >> cabal.project"
189-
- "echo 'allow-newer: servant-auth-server:servant' >> cabal.project"
190-
- "echo 'allow-newer: servant-auth-server:servant-server' >> cabal.project"
191-
- "echo 'allow-newer: servant-auth-server:http-api-data' >> cabal.project"
192-
- "echo 'allow-newer: servant-js:servant' >> cabal.project"
193-
- "echo 'allow-newer: servant-js:servant-foreign' >> cabal.project"
194174
- "echo 'allow-newer: servant-quickcheck:servant' >> cabal.project"
195175
- "echo 'allow-newer: servant-quickcheck:servant-client' >> cabal.project"
196176
- "echo 'allow-newer: servant-quickcheck:servant-server' >> cabal.project"
197177
- "echo 'allow-newer: servant-quickcheck:hspec' >> cabal.project"
198178
- "echo 'allow-newer: servant-quickcheck:http-client' >> cabal.project"
199-
- "echo 'reorder-goals: True' >> cabal.project"
200179
- "echo 'optimization: False' >> cabal.project "
201180
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
202181
- touch cabal.project.local
203-
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-db-sqlite-simple|cookbook-file-upload|cookbook-generic|cookbook-https|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-machines|servant-pipes|servant-server|tutorial)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
182+
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-db-sqlite-simple|cookbook-file-upload|cookbook-generic|cookbook-https|cookbook-pagination|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-machines|servant-pipes|servant-server|tutorial)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
204183
- cat cabal.project || true
205184
- cat cabal.project.local || true
206-
- "echo -en 'travis_fold:end:unpack\\\\r'"
185+
- echo -en 'travis_fold:end:unpack\\r'
207186

208-
- "echo Building with tests and benchmarks... && echo -en 'travis_fold:start:build-everything\\\\r'"
187+
- echo Building with tests and benchmarks... && echo -en 'travis_fold:start:build-everything\\r'
209188
# build & run tests, build benchmarks
210189
- ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} all
211-
- "echo -en 'travis_fold:end:build-everything\\\\r'"
190+
- echo -en 'travis_fold:end:build-everything\\r'
212191
- if [ "x$TEST" = "x--enable-tests" ]; then ${CABAL} new-test -w ${HC} ${TEST} ${BENCH} all; fi
213192

214-
- "echo Haddock... && echo -en 'travis_fold:start:haddock\\\\r'"
193+
- echo Haddock... && echo -en 'travis_fold:start:haddock\\r'
215194
# haddock
216195
- ${CABAL} new-haddock -w ${HC} ${TEST} ${BENCH} all
217196

218-
- "echo -en 'travis_fold:end:haddock\\\\r'"
197+
- echo -en 'travis_fold:end:haddock\\r'
219198
# REGENDATA ["--config=cabal.haskell-ci","--output=.travis.yml","cabal.project"]
220199
# EOF

‎cabal.project

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ packages:
2424
-- doc/cookbook/hoist-server-with-context
2525
doc/cookbook/https
2626
-- doc/cookbook/jwt-and-basic-auth/
27-
-- doc/cookbook/pagination
27+
doc/cookbook/pagination
2828
-- doc/cookbook/sentry
2929
doc/cookbook/testing
3030
doc/cookbook/structuring-apis
@@ -33,21 +33,18 @@ packages:
3333

3434
tests: True
3535
optimization: False
36-
reorder-goals: True
37-
38-
allow-newer:
39-
servant-js:base
36+
-- reorder-goals: True
4037

4138
constraints:
4239
-- see https://github.com/haskell-infra/hackage-trustees/issues/119
4340
foundation >=0.0.14,
4441
memory <0.14.12 || >0.14.12
4542

4643
allow-newer:
47-
servant-pagination:servant, servant-pagination:servant-server,
48-
servant-multipart:servant, servant-multipart:servant-server,
49-
servant-auth-server:servant, servant-auth-server:servant-server, servant-auth-server:http-api-data,
50-
servant-js:servant, servant-js:servant-foreign
44+
-- servant-pagination:servant, servant-pagination:servant-server,
45+
-- servant-multipart:servant, servant-multipart:servant-server,
46+
-- servant-auth-server:servant, servant-auth-server:servant-server,
47+
-- servant-js:servant, servant-js:servant-foreign
5148

5249
-- servant-quickcheck
5350
allow-newer:

0 commit comments

Comments
 (0)