From 40c13150972c047daaac889498b1806dda56ac50 Mon Sep 17 00:00:00 2001 From: Alp Mestanogullari Date: Tue, 12 Dec 2017 19:57:21 +0100 Subject: [PATCH] elide some of the servant README in file upload example output --- doc/cookbook/file-upload/FileUpload.lhs | 51 +------------------------ 1 file changed, 2 insertions(+), 49 deletions(-) diff --git a/doc/cookbook/file-upload/FileUpload.lhs b/doc/cookbook/file-upload/FileUpload.lhs index 13bf7f4b..2dbd5832 100644 --- a/doc/cookbook/file-upload/FileUpload.lhs +++ b/doc/cookbook/file-upload/FileUpload.lhs @@ -112,7 +112,7 @@ main = withSocketsDo . bracket (forkIO startServer) killThread $ \_threadid -> d If you run this, you should get: -``` +``` bash $ cabal new-build cookbook-file-upload [...] $ dist-newstyle/build/x86_64-linux/ghc-8.2.1/cookbook-file-upload-0.1/x/cookbook-file-upload/build/cookbook-file-upload/cookbook-file-upload @@ -131,55 +131,8 @@ introduces the core features of servant. After this article, you should be able to write your first servant webservices, learning the rest from the haddocks' examples. -The central documentation can be found [here](http://haskell-servant.readthedocs.org/). -Other blog posts, videos and slides can be found on the -[website](http://haskell-servant.github.io/). +[...] -If you need help, drop by the IRC channel (#servant on freenode) or [mailing -list](https://groups.google.com/forum/#!forum/haskell-servant). - -## Version history - -This table lists the versions of some `servant-` libraries at the point of -release of `servant` package. - -| | **0.10** | **0.11** | **0.12** | -| ------------------- | -------- |----------|----------| -| servant | 0.10 | 0.11 | 0.12 | -| servant-blaze | 0.7.1 | ? | ? | -| servant-cassava | 0.7 | ? | ? | -| servant-client | 0.10 | 0.11 | 0.12 | -| servant-docs | 0.10 | 0.11 | 0.11.1 | -| servant-foreign | 0.10 | 0.10.0.1 | 0.10.2 | -| servant-js | 0.9.1 | ? | ? | -| servant-lucid | 0.7.1 | ? | ? | -| servant-mock | 0.8.1.1 | ? | ? | -| servant-server | 0.10 | 0.11 | 0.12 | -| servant-swagger | 1.1.2.1 | ? | ? | - -## Contributing - -See `CONTRIBUTING.md` - -## Release process outline (by phadej) - -- Update changelog and bump versions in `master` - - `git log --oneline v0.12.. | grep 'Merge pull request'` is a good starting point (use correct previous release tag) -- Create a release branch, e.g. `release-0.13`, and *protect it* from accidental force pushes. - - Release branch is useful for backporting fixes from `master` -- Smoke test in [`servant-universe`](https://github.com/phadej/servant-universe) - - `git submodule foreach git checkout master` and `git submodule foreach git pull` to get newest of everything. - - `cabal new-build --enable-tests all` to verify that everything builds, and `cabal new-test all` to run tests - - It's a good idea to separate these steps, as tests often pass, if they compile :) - - See `cabal.project` to selectively `allow-newer` - - If some packages are broken, on your discretisation there are two options: - - Fix them and make PRs: it's good idea to test against older `servant` version too. - - Temporarily comment out broken package - - If you make a commit for `servant-universe`, you can use it as submodule in private projects to test even more -- When ripples are cleared out: - - `git tag -s` the release - - `git push --tags` - - `cabal sdist` and `cabal upload` Response {responseStatus = Status {statusCode = 200, statusMessage = "OK"}, responseVersion = HTTP/1.1, responseHeaders = [("Transfer-Encoding","chunked"),("Date","Fri, 08 Dec 2017 16:50:14 GMT"),("Server","Warp/3.2.13"),("Content-Type","application/json;charset=utf-8")], responseBody = "0", responseCookieJar = CJ {expose = []}, responseClose' = ResponseClose} ```