Rooba
/
stash
mirror of https://github.com/stashapp/stash.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix UI not showing version (#631)

This commit is contained in:
WithoutPants 2020-06-24 15:46:37 +10:00 committed by GitHub
parent 455e16ece9
commit 883a0e785a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -14,9 +14,9 @@ env:
before_install: before_install:
- echo -e "machine github.com\n login $CI_USER_TOKEN" > ~/.netrc - echo -e "machine github.com\n login $CI_USER_TOKEN" > ~/.netrc
- nvm install 12 - nvm install 12
- travis_retry yarn --cwd ui/v2.5 install --frozen-lockfile - travis_retry make pre-ui
- make generate - make generate
- CI=false yarn --cwd ui/v2.5 build-ci - CI=false make ui-only
#- go get -v github.com/mgechev/revive #- go get -v github.com/mgechev/revive
script: script:
# left lint off to avoid getting extra dependency # left lint off to avoid getting extra dependency

9
Makefile
View File

@ -71,20 +71,25 @@ it:
pre-ui: pre-ui:
cd ui/v2.5 && yarn install --frozen-lockfile cd ui/v2.5 && yarn install --frozen-lockfile
.PHONY: ui .PHONY: ui-only
ui: pre-build ui-only: pre-build
$(SET) REACT_APP_DATE="$(DATE)" $(SEPARATOR) \ $(SET) REACT_APP_DATE="$(DATE)" $(SEPARATOR) \
$(SET) REACT_APP_GITHASH=$(GITHASH) $(SEPARATOR) \ $(SET) REACT_APP_GITHASH=$(GITHASH) $(SEPARATOR) \
$(SET) REACT_APP_STASH_VERSION=$(STASH_VERSION) $(SEPARATOR) \ $(SET) REACT_APP_STASH_VERSION=$(STASH_VERSION) $(SEPARATOR) \
cd ui/v2.5 && yarn build cd ui/v2.5 && yarn build
.PHONY: ui
ui: ui-only
packr2 packr2
.PHONY: ui-start
ui-start: pre-build ui-start: pre-build
$(SET) REACT_APP_DATE="$(DATE)" $(SEPARATOR) \ $(SET) REACT_APP_DATE="$(DATE)" $(SEPARATOR) \
$(SET) REACT_APP_GITHASH=$(GITHASH) $(SEPARATOR) \ $(SET) REACT_APP_GITHASH=$(GITHASH) $(SEPARATOR) \
$(SET) REACT_APP_STASH_VERSION=$(STASH_VERSION) $(SEPARATOR) \ $(SET) REACT_APP_STASH_VERSION=$(STASH_VERSION) $(SEPARATOR) \
cd ui/v2.5 && yarn start cd ui/v2.5 && yarn start
.PHONY: fmt-ui
fmt-ui: fmt-ui:
cd ui/v2.5 && yarn format cd ui/v2.5 && yarn format