Merge pull request #115 from input-output-hk/fix-build

Fix build

Author: jagajaga

.travis.yml

@@ -14,7 +14,7 @@ cache:
   - "$HOME/build/input-output-hk/pos-haskell-prototype/.stack-work"
   # TODO: https://github.com/npm/fs-write-stream-atomic/pull/14
   #- daedalus/node_modules
-  - daedalus/bower_components
+  #- daedalus/bower_components
 
 before_install:
 - export CSL_SYSTEM_TAG=$TRAVIS_OS_NAME
@@ -26,18 +26,18 @@ before_install:
   xz --strip-components=1 -C ~/.local/bin
 - mkdir s3
 script:
+- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export EXTRA_STACK="--test --haddock"; else export EXTRA_STACK="--no-haddock-deps"; fi
 - stack --nix --no-terminal --local-bin-path s3/ install --fast --ghc-options="-j +RTS -A128m -n2m -RTS"
-  --no-haddock-deps --jobs=4
+  $EXTRA_STACK --jobs=4
   --flag cardano-sl:-asserts
   --flag cardano-sl-core:-dev-mode
-  --test
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./update_haddock.sh; fi
 - stack exec --nix -- cardano-wallet-hs2purs
 - stack exec --nix -- cardano-wallet-web-docs
 - cd daedalus
 - nix-shell -p nodejs --run "npm install && npm run build:prod"
 - cd ..
-- XZ_OPT=-1 tar Jcvf s3/daedalus-bridge.tar.xz daedalus/ > /dev/null
+- XZ_OPT=-1 tar Jcvf s3/daedalus-bridge.tar.xz daedalus/ 2> /dev/null
 - echo $TRAVIS_BUILD_NUMBER > s3/build-id
 deploy:
   provider: s3

appveyor.yml

@@ -7,7 +7,7 @@ environment:
   global:
     # Avoid long paths on Windows
     STACK_ROOT: "c:\\sr"
-    STACK_WORK: ".stack-work"
+    STACK_WORK: ".w"
     CSL_SYSTEM_TAG: "win64"
     CACHE_DIR: "c:\\cache"
 
@@ -46,7 +46,7 @@ before_test:
 - IF EXIST %CACHED_STACK_ROOT% xcopy /q /s /e /r /k /i /v /h /y %CACHED_STACK_ROOT% %STACK_ROOT%
 - IF EXIST %CACHED_STACK_WORK% xcopy /q /s /e /r /k /i /v /h /y %CACHED_STACK_WORK% %STACK_WORK%
 # Install stack
-- curl -sSL -o stack.zip --insecure http://www.stackage.org/stack/windows-x86_64
+- curl -sSL -o stack.zip http://www.stackage.org/stack/windows-x86_64
 - 7z x stack.zip stack.exe
 
 
@@ -60,6 +60,7 @@ test_script:
   # Retry transient failures due to https://github.com/haskell/cabal/issues/4005
   - scripts\appveyor-retry call stack --no-terminal --local-bin-path daedalus
       install -j 2 --test --no-haddock-deps --bench --no-run-benchmarks
+      --work-dir %STACK_WORK%
       --flag cardano-sl:with-web
       --flag cardano-sl:with-wallet
       --flag cardano-sl:-asserts
@@ -68,7 +69,7 @@ test_script:
       --extra-lib-dirs="C:\OpenSSL-Win64"
       --extra-include-dirs="C:\projects\pos-haskell-prototype\rocksdb\include"
       --extra-lib-dirs="C:\projects\pos-haskell-prototype"
-  - stack exec -- cardano-wallet-hs2purs
+  - stack exec --work-dir %STACK_WORK% -- cardano-wallet-hs2purs
   - copy log-config-prod.yaml daedalus\log-config-prod.yaml
   - cd daedalus
   - Echo %APPVEYOR_BUILD_VERSION% > build-id

update_haddock.sh

@@ -3,9 +3,6 @@ set -euo pipefail
 
 echo "Haddock updating"
 
-echo "**** 1. Rebuild documentation ****"
-stack --nix --no-terminal haddock --fast
-
 readonly PROJECT_NAME=$(cat ./*.cabal | grep "name:" | awk '{ print $2 }')
 readonly PROJECT_VERSION=$(cat ./*.cabal | grep "version:" | grep -v "cabal" | awk '{ print $2 }')
 readonly PROJECT_FULL_NAME="${PROJECT_NAME}"-"${PROJECT_VERSION}"