diff --git a/.travis.yml b/.travis.yml index c6dcc83c7e..6fbfc591e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,45 +2,53 @@ jobs: include: - os: linux language: nix - nix: 2.1.3 - env: STACK_YAML=pkg/hs/stack.yaml + nix: 2.3.6 before_install: - git lfs pull - - sh/travis-install-stack - install: - nix-env -iA cachix -f https://cachix.org/api/v1/install - - stack --no-terminal --install-ghc build urbit-king --only-dependencies - script: - cachix use urbit2 - ./sh/cachix - make build - make release - - sh/release-king-linux64-dynamic - sh/ci-tests + - os: linux + language: generic + env: STACK_YAML=pkg/hs/stack.yaml + cache: + directories: + - $HOME/.ghc + - $HOME/.cabal + - $HOME/.stack + - $TRAVIS_BUILD_DIR/.stack-work + before_install: + - sh/travis-install-stack + install: + - stack --no-terminal --install-ghc build urbit-king --only-dependencies + script: + - stack test + - sh/release-king-linux64-dynamic + - os: osx language: generic sudo: required env: STACK_YAML=pkg/hs/stack.yaml - + cache: + directories: + - $HOME/.ghc + - $HOME/.cabal + - $HOME/.stack + - $TRAVIS_BUILD_DIR/.stack-work before_install: - sh/travis-install-stack - install: - stack --no-terminal --install-ghc build urbit-king --only-dependencies - script: + - stack test - sh/release-king-darwin-dynamic -cache: - directories: - - $HOME/.ghc - - $HOME/.cabal - - $HOME/.stack - - $TRAVIS_BUILD_DIR/.stack-work - deploy: - skip_cleanup: true provider: gcs diff --git a/sh/ci-tests b/sh/ci-tests index 1ca8f1b3ca..3a53726535 100755 --- a/sh/ci-tests +++ b/sh/ci-tests @@ -2,10 +2,6 @@ set -ex -export STACK_YAML="`pwd`/pkg/hs/stack.yaml" - -stack test urbit-king - if [ "$TRAVIS_PULL_REQUEST" = false ] then diff --git a/sh/test b/sh/test index dac77b5a8a..c3b7f37081 100755 --- a/sh/test +++ b/sh/test @@ -2,8 +2,6 @@ set -e -stack test urbit-king --fast - pkg=$(nix-build nix/ops -A test --no-out-link "$@") hdr () {