Skip to content

Commit cd42676

Browse files
committed
Fix travis: remove open-id-connect cookbook, it's bitrotted
1 parent 48df410 commit cd42676

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.travis.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# For more information, see https://github.com/haskell-CI/haskell-ci
66
#
7-
# version: 0.3.20190413
7+
# version: 0.3.20190521
88
#
99
language: c
1010
dist: xenial
@@ -82,6 +82,7 @@ install:
8282
echo "world-file: $CABALHOME/world" >> $CABALHOME/config
8383
echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
8484
echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
85+
echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
8586
echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
8687
echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
8788
echo "install-dirs user" >> $CABALHOME/config
@@ -122,7 +123,6 @@ install:
122123
if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/structuring-apis"' >> cabal.project ; fi
123124
if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/using-custom-monad"' >> cabal.project ; fi
124125
if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/using-free-client"' >> cabal.project ; fi
125-
if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/open-id-connect"' >> cabal.project ; fi
126126
- |
127127
echo "constraints: foundation >=0.0.14" >> cabal.project
128128
echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
@@ -133,7 +133,7 @@ install:
133133
echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
134134
echo "optimization: False" >> cabal.project
135135
echo "write-ghc-environment-files: always" >> cabal.project
136-
- "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|open-id-connect|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"
136+
- "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)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
137137
- cat cabal.project || true
138138
- cat cabal.project.local || true
139139
- if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi
@@ -160,7 +160,6 @@ install:
160160
- if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then (cd "doc/cookbook/structuring-apis" && autoreconf -i); fi
161161
- if [ -f "doc/cookbook/using-custom-monad/configure.ac" ]; then (cd "doc/cookbook/using-custom-monad" && autoreconf -i); fi
162162
- if [ -f "doc/cookbook/using-free-client/configure.ac" ]; then (cd "doc/cookbook/using-free-client" && autoreconf -i); fi
163-
- if [ -f "doc/cookbook/open-id-connect/configure.ac" ]; then (cd "doc/cookbook/open-id-connect" && autoreconf -i); fi
164163
- ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output
165164
- "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
166165
- rm cabal.project.freeze
@@ -203,7 +202,6 @@ script:
203202
if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-structuring-apis-*/*.cabal"' >> cabal.project ; fi
204203
if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-using-custom-monad-*/*.cabal"' >> cabal.project ; fi
205204
if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-using-free-client-*/*.cabal"' >> cabal.project ; fi
206-
if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "open-id-connect-*/*.cabal"' >> cabal.project ; fi
207205
- |
208206
echo "constraints: foundation >=0.0.14" >> cabal.project
209207
echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
@@ -214,7 +212,7 @@ script:
214212
echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
215213
echo "optimization: False" >> cabal.project
216214
echo "write-ghc-environment-files: always" >> cabal.project
217-
- "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|open-id-connect|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"
215+
- "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)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
218216
- cat cabal.project || true
219217
- cat cabal.project.local || true
220218
- echo -en 'travis_fold:end:unpack\\r'

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ packages:
3030
doc/cookbook/structuring-apis
3131
doc/cookbook/using-custom-monad
3232
doc/cookbook/using-free-client
33-
doc/cookbook/open-id-connect
33+
-- doc/cookbook/open-id-connect
3434

3535
tests: True
3636
optimization: False

0 commit comments

Comments
 (0)