git.iko.soy/typeable/servant-reflex
on master help sign in
submodule reflex-platform
commite056ab8cc08c5b711a50c4bab6a3fc1ef3a61fec authorGreg Hale <imalsogreg@gmail.com> dateSun 23 Apr 2017, 15:59 (9 years ago) parent8a3cb9d
7 files changed+7−13
compare with master
unifiedsplit
.gitignore−1 .gitmodules+3−6 .travis.yml+2−3 build.sh+1−1 deps/reflex−1 deps/reflex-dom−1 deps/reflex-platform+1
.gitignore−1
@@ -6,5 +6,4 @@ log
66*.webapp
77*.stats
88out
9−reflex-platform
109/.stack-work/
.gitmodules+3−6
@@ -1,9 +1,3 @@
1−[submodule "deps/reflex-dom"]
2− path = deps/reflex-dom
3− url = https://github.com/reflex-frp/reflex-dom.git
4−[submodule "deps/reflex"]
5− path = deps/reflex
6− url = https://github.com/reflex-frp/reflex.git
71[submodule "deps/http-api-data"]
82 path = deps/http-api-data
93 url = https://github.com/fizruk/http-api-data
@@ -13,3 +7,6 @@
137[submodule "deps/servant-snap"]
148 path = deps/servant-snap
159 url = https://github.com/haskell-servant/servant-snap
10+[submodule "deps/reflex-platform"]
11+ path = deps/reflex-platform
12+ url = https://github.com/reflex-frp/reflex-platform
.travis.yml+2−3
@@ -35,10 +35,9 @@ install:
3535 $HOME/.cabal/packages/hackage.haskell.org/00-index.tar;
3636 fi
3737 - travis_retry cabal update -v
38− - git clone https://github.com/reflex-frp/reflex-platform
3938 - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
40− - reflex-platform/work-on ./overrides-ghc.nix ./testserver --command "cd testserver && cabal configure -fExample && cabal build"
41− - reflex-platform/work-on ghc ./testdriver --command "cd testdriver && cabal configure && cabal build"
39+ - deps/reflex-platform/work-on ./overrides-ghc.nix ./testserver --command "cd testserver && cabal configure -fExample && cabal build"
40+ - deps/reflex-platform/work-on ghc ./testdriver --command "cd testdriver && cabal configure && cabal build"
4241 - cd testserver && dist/build/back/back -p 8000 &
4342 - sleep 3
4443 - phantomjs --webdriver=127.0.0.1:4444 &
build.sh+1−1
@@ -1,3 +1,3 @@
11#!/usr/bin/env bash
22
3−reflex-platform/work-on ./overrides.nix ./. --run "cabal configure --ghcjs && cabal build && exec/toSite.sh"
3+deps/reflex-platform/work-on ./overrides.nix ./. --run "cabal configure --ghcjs && cabal build && exec/toSite.sh"
deps/reflexdeleted−1

Submodule changed.

deps/reflex-domdeleted−1

Submodule changed.

deps/reflex-platformnew file+1

Submodule changed.