git.iko.soy/typeable/servant-reflex
on master help sign in
Build testserver w/ reflex platform and start servers early
commit28d0c3332863fef4c1ea0a86d32dfef38e08605c authorGreg Hale <imalsogreg@gmail.com> dateTue 20 Sep 2016, 09:33 (10 years ago) parent9a8a6aa
5 files changed+28−13
compare with master
unifiedsplit
.gitmodules+3 .travis.yml+11−11 build.sh+1−1 deps/servant+1 overrides-ghc.nix+12−1
.gitmodules+3
@@ -16,3 +16,6 @@
1616[submodule "deps/http-api-data"]
1717 path = deps/http-api-data
1818 url = https://github.com/fizruk/http-api-data
19+[submodule "deps/servant"]
20+ path = deps/servant
21+ url = https://github.com/haskell-servant/servant
.travis.yml+11−11
@@ -23,6 +23,7 @@ before_install:
2323 - openssl aes-256-cbc -K $encrypted_3c89d919c82e_key -iv $encrypted_3c89d919c82e_iv -in deploy_key.enc -out deploy_key -d
2424 - unset CC
2525 - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
26+ - git submodule update --init --recursive
2627
2728install:
2829 - cabal --version
@@ -36,19 +37,18 @@ install:
3637 fi
3738 - travis_retry cabal update -v
3839 - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
40+ - deps/reflex-platform/work-on ./overrides-ghc.nix ./testserver --command "cd testserver && cabal configure && cabal build"
41+ - cd testserver && dist/build/back/back -p 8000 &
42+ - sleep 3
43+ - phantomjs --webdriver=127.0.0.1:4444 &
44+ - sleep 3
3945
4046script:
41−- git config --global user.email "travis-ci@example.com"
42−- git config --global user.name "Travis-CI"
43−- git submodule update --init --recursive
44−- ./build.sh
45−- deps/reflex-platform/work-on ./overrides-ghc.nix ./. --command "cabal configure --enable-tests && cabal build"
46−- bash ./deploy.sh
47−- ./init-sandbox.sh
48−- cd testserver
49−- cabal install --only-dep
50−- cabal build
51−- run-wd-tests.sh
47+ - git config --global user.email "travis-ci@example.com"
48+ - git config --global user.name "Travis-CI"
49+ - ./build.sh
50+ - deps/reflex-platform/work-on ./overrides-ghc.nix ./. --command "cabal configure --enable-tests && cabal build"
51+ - dist/build/spec/spec
5252
5353cache:
5454 directories:
build.sh+1−1
@@ -1,3 +1,3 @@
11#!/bin/sh
22
3−deps/reflex-platform/work-on ./overrides.nix ./. --run "cabal configure --ghcjs && cabal build"
3+deps/reflex-platform/work-on ./overrides.nix ./. --run "cabal configure --ghcjs && cabal build && ./toSite.sh"
deps/servantnew file+1

Submodule changed.

overrides-ghc.nix+12−1
@@ -2,8 +2,19 @@
22let
33 pkgs = import <nixpkgs> {};
44 reflex-platform = import deps/reflex-platform {};
5+ c2n = reflex-platform.cabal2nixResult;
56in reflex-platform.ghc.override {
67 overrides = self: super: {
7− reflex-dom = pkgs.haskell.lib.dontCheck (self.callPackage deps/reflex-dom {});
8+ reflex-dom = pkgs.haskell.lib.dontCheck (self.callPackage deps/reflex-dom {});
9+ servant-snap = pkgs.haskell.lib.dontCheck (self.callPackage (c2n deps/servant-snap) {});
10+ snap = pkgs.haskell.lib.dontCheck (self.callPackage (c2n deps/servant-snap/deps/snap) {});
11+ snap-server = pkgs.haskell.lib.dontCheck (self.callPackage (c2n deps/servant-snap/deps/snap/deps/snap-server) {});
12+ io-streams = pkgs.haskell.lib.dontCheck (self.callPackage (c2n deps/servant-snap/deps/snap/deps/io-streams) {});
13+ io-streams-haproxy = pkgs.haskell.lib.dontCheck (self.callPackage (c2n deps/servant-snap/deps/snap/deps/io-streams-haproxy) {});
14+ heist = pkgs.haskell.lib.dontCheck (self.callPackage (c2n deps/servant-snap/deps/snap/deps/heist) {});
15+ xmlhtml = pkgs.haskell.lib.dontCheck (self.callPackage (c2n deps/servant-snap/deps/snap/deps/xmlhtml) {});
16+ snap-core = pkgs.haskell.lib.dontCheck (self.callPackage (c2n deps/servant-snap/deps/snap/deps/snap-core) {});
17+ servant = pkgs.haskell.lib.dontCheck (self.callPackage (c2n deps/servant/servant) {});
18+ http-api-data = pkgs.haskell.lib.dontCheck (self.callPackage (c2n deps/http-api-data) {});
819 };
920}