diff --git a/.travis.yml b/.travis.yml index ca5eecc95..462596fb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,9 @@ env: before_install: - echo -e "machine github.com\n login $CI_USER_TOKEN" > ~/.netrc - nvm install 12 -- travis_retry yarn --cwd ui/v2.5 install --frozen-lockfile +- travis_retry make pre-ui - make generate -- CI=false yarn --cwd ui/v2.5 build-ci +- CI=false make ui-only #- go get -v github.com/mgechev/revive script: # left lint off to avoid getting extra dependency diff --git a/Makefile b/Makefile index 7eae695c1..a8ee2f177 100644 --- a/Makefile +++ b/Makefile @@ -71,20 +71,25 @@ it: pre-ui: cd ui/v2.5 && yarn install --frozen-lockfile -.PHONY: ui -ui: pre-build +.PHONY: ui-only +ui-only: pre-build $(SET) REACT_APP_DATE="$(DATE)" $(SEPARATOR) \ $(SET) REACT_APP_GITHASH=$(GITHASH) $(SEPARATOR) \ $(SET) REACT_APP_STASH_VERSION=$(STASH_VERSION) $(SEPARATOR) \ cd ui/v2.5 && yarn build + +.PHONY: ui +ui: ui-only packr2 +.PHONY: ui-start ui-start: pre-build $(SET) REACT_APP_DATE="$(DATE)" $(SEPARATOR) \ $(SET) REACT_APP_GITHASH=$(GITHASH) $(SEPARATOR) \ $(SET) REACT_APP_STASH_VERSION=$(STASH_VERSION) $(SEPARATOR) \ cd ui/v2.5 && yarn start +.PHONY: fmt-ui fmt-ui: cd ui/v2.5 && yarn format