pull/49/head
Hunter Long 2018-08-17 01:59:01 -07:00
parent caa7af5720
commit 83ce791d01
2 changed files with 3 additions and 5 deletions

View File

@ -65,7 +65,7 @@ before_script:
- make install - make install
script: script:
- make test - make test-all
- if [[ "$TRAVIS_BRANCH" == "master" ]]; then make coverage; fi - if [[ "$TRAVIS_BRANCH" == "master" ]]; then make coverage; fi
after_success: after_success:
@ -74,6 +74,4 @@ after_success:
- if [[ "$TRAVIS_BRANCH" == "master" ]]; then make release; fi - if [[ "$TRAVIS_BRANCH" == "master" ]]; then make release; fi
after_deploy: 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 - if [[ "$TRAVIS_BRANCH" == "master" ]]; then make publish-dev; fi

View File

@ -18,7 +18,7 @@ all: dev-deps compile install test-all
release: dev-deps build-all compress 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 travis-test: dev-deps cypress-install test docker-test cypress-test coverage
@ -149,7 +149,7 @@ publish-homebrew:
cypress-install: cypress-install:
cd .dev/test && npm install cd .dev/test && npm install
cypress-test: clean cypress-test: clean cypress-install
cd .dev/test && npm test cd .dev/test && npm test
.PHONY: build build-all build-alpine .PHONY: build build-all build-alpine