From 83ce791d01d606e4d07ffb38d4184f11d3a730d2 Mon Sep 17 00:00:00 2001 From: Hunter Long Date: Fri, 17 Aug 2018 01:59:01 -0700 Subject: [PATCH] travis --- .travis.yml | 4 +--- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7996d649..0bb12081 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,7 +65,7 @@ before_script: - make install script: - - make test + - make test-all - if [[ "$TRAVIS_BRANCH" == "master" ]]; then make coverage; fi after_success: @@ -74,6 +74,4 @@ after_success: - if [[ "$TRAVIS_BRANCH" == "master" ]]; then make release; fi after_deploy: - - if [[ "$TRAVIS_BRANCH" == "master" ]]; then make travis-crypress; fi - - if [[ "$TRAVIS_BRANCH" == "master" ]]; then make travis-docker-test; fi - if [[ "$TRAVIS_BRANCH" == "master" ]]; then make publish-dev; fi diff --git a/Makefile b/Makefile index b0677d15..d45c8eab 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ all: dev-deps compile install test-all release: dev-deps build-all compress -test-all: dev-deps test docker-test docker-test cypress-test coverage +test-all: dev-deps test docker-test cypress-test coverage travis-test: dev-deps cypress-install test docker-test cypress-test coverage @@ -149,7 +149,7 @@ publish-homebrew: cypress-install: cd .dev/test && npm install -cypress-test: clean +cypress-test: clean cypress-install cd .dev/test && npm test .PHONY: build build-all build-alpine \ No newline at end of file