git.iko.soy/typeable/servant
on master help sign in
Fix travis: remove open-id-connect cookbook, it's bitrotted
cd42676Oleg Grenrus
.travis.yml+4−6
@@ -4,7 +4,7 @@
4#
4#
5# For more information, see https://github.com/haskell-CI/haskell-ci
5# For more information, see https://github.com/haskell-CI/haskell-ci
6#
6#
7−# version: 0.3.20190413
7+# version: 0.3.20190521
8#
8#
9language: c
9language: c
10dist: xenial
10dist: xenial
@@ -82,6 +82,7 @@ install:
82 echo "world-file: $CABALHOME/world" >> $CABALHOME/config
82 echo "world-file: $CABALHOME/world" >> $CABALHOME/config
83 echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
83 echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
84 echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
84 echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
85+ echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
85 echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
86 echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
86 echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
87 echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
87 echo "install-dirs user" >> $CABALHOME/config
88 echo "install-dirs user" >> $CABALHOME/config
@@ -122,7 +123,6 @@ install:
122 if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/structuring-apis"' >> cabal.project ; fi
123 if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/structuring-apis"' >> cabal.project ; fi
123 if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/using-custom-monad"' >> cabal.project ; fi
124 if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "doc/cookbook/using-custom-monad"' >> cabal.project ; fi
124 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/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
126 - |
126 - |
127 echo "constraints: foundation >=0.0.14" >> cabal.project
127 echo "constraints: foundation >=0.0.14" >> cabal.project
128 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
128 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
@@ -133,7 +133,7 @@ install:
133 echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
133 echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
134 echo "optimization: False" >> cabal.project
134 echo "optimization: False" >> cabal.project
135 echo "write-ghc-environment-files: always" >> cabal.project
135 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"
137 - cat cabal.project || true
137 - cat cabal.project || true
138 - cat cabal.project.local || true
138 - cat cabal.project.local || true
139 - if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi
139 - if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi
@@ -160,7 +160,6 @@ install:
160 - if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then (cd "doc/cookbook/structuring-apis" && autoreconf -i); fi
160 - if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then (cd "doc/cookbook/structuring-apis" && autoreconf -i); fi
161 - if [ -f "doc/cookbook/using-custom-monad/configure.ac" ]; then (cd "doc/cookbook/using-custom-monad" && autoreconf -i); fi
161 - if [ -f "doc/cookbook/using-custom-monad/configure.ac" ]; then (cd "doc/cookbook/using-custom-monad" && autoreconf -i); fi
162 - if [ -f "doc/cookbook/using-free-client/configure.ac" ]; then (cd "doc/cookbook/using-free-client" && autoreconf -i); fi
162 - 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
164 - ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output
163 - ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output
165 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
164 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
166 - rm cabal.project.freeze
165 - rm cabal.project.freeze
@@ -203,7 +202,6 @@ script:
203 if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-structuring-apis-*/*.cabal"' >> cabal.project ; fi
202 if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-structuring-apis-*/*.cabal"' >> cabal.project ; fi
204 if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-using-custom-monad-*/*.cabal"' >> cabal.project ; fi
203 if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-using-custom-monad-*/*.cabal"' >> cabal.project ; fi
205 if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then echo 'packages: "cookbook-using-free-client-*/*.cabal"' >> cabal.project ; fi
204 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
207 - |
205 - |
208 echo "constraints: foundation >=0.0.14" >> cabal.project
206 echo "constraints: foundation >=0.0.14" >> cabal.project
209 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
207 echo "constraints: memory <0.14.12 || >0.14.12" >> cabal.project
@@ -214,7 +212,7 @@ script:
214 echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
212 echo "allow-newer: servant-quickcheck:http-client" >> cabal.project
215 echo "optimization: False" >> cabal.project
213 echo "optimization: False" >> cabal.project
216 echo "write-ghc-environment-files: always" >> cabal.project
214 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"
218 - cat cabal.project || true
216 - cat cabal.project || true
219 - cat cabal.project.local || true
217 - cat cabal.project.local || true
220 - echo -en 'travis_fold:end:unpack\\r'
218 - echo -en 'travis_fold:end:unpack\\r'
cabal.project+1−1
@@ -30,7 +30,7 @@ packages:
30 doc/cookbook/structuring-apis
30 doc/cookbook/structuring-apis
31 doc/cookbook/using-custom-monad
31 doc/cookbook/using-custom-monad
32 doc/cookbook/using-free-client
32 doc/cookbook/using-free-client
33− doc/cookbook/open-id-connect
33+ -- doc/cookbook/open-id-connect
34
34
35tests: True
35tests: True
36optimization: False
36optimization: False