colin
/
sharded-gotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move to yarn

This commit is contained in:
Jannis Mattheis 2019-09-28 16:40:20 +02:00
parent 15096a98bb
commit f92f5e6f4c
4 changed files with 11318 additions and 14438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -15,13 +15,14 @@ cache:
- $HOME/gopath/pkg/mod - $HOME/gopath/pkg/mod
before_install: before_install:
- nvm install 12.10.0
- export GIMME_GO=$(< GO_VERSION) - export GIMME_GO=$(< GO_VERSION)
- eval "$(gimme ${GIMME_GO%.0})"; - eval "$(gimme ${GIMME_GO%.0})";
- make download-tools - make download-tools
install: install:
- go get - go get
- (cd ui && npm install) - (cd ui && yarn)
script: script:
# packr builds a go file for all packr "boxes", this would be f.ex. the spec.json file. # packr builds a go file for all packr "boxes", this would be f.ex. the spec.json file.

8
Makefile
View File

@ -26,7 +26,7 @@ format:
test-js: test-js:
go build -ldflags="-s -w -X main.Mode=prod" -o removeme/gotify app.go go build -ldflags="-s -w -X main.Mode=prod" -o removeme/gotify app.go
(cd ui && CI=true GOTIFY_EXE=../removeme/gotify npm test) (cd ui && CI=true GOTIFY_EXE=../removeme/gotify yarn test)
rm -rf removeme rm -rf removeme
check-go: check-go:
@ -36,8 +36,8 @@ check-go:
goimports -l $(shell find . -type f -name '*.go' -not -path "./vendor/*") goimports -l $(shell find . -type f -name '*.go' -not -path "./vendor/*")
check-js: check-js:
(cd ui && npm run lint) (cd ui && yarn lint)
(cd ui && npm run testformat) (cd ui && yarn testformat)
download-tools: download-tools:
GO111MODULE=off go get -u golang.org/x/lint/golint GO111MODULE=off go get -u golang.org/x/lint/golint
@ -77,7 +77,7 @@ build-docker: require-version
rm ${DOCKER_DIR}gotify-app rm ${DOCKER_DIR}gotify-app
build-js: build-js:
(cd ui && npm run build) (cd ui && yarn build)
build-linux-amd64: build-linux-amd64:
${DOCKER_RUN} ${DOCKER_BUILD_IMAGE}:$(GO_VERSION)-linux-amd64 ${DOCKER_GO_BUILD} -o ${BUILD_DIR}/gotify-linux-amd64 ${DOCKER_WORKDIR} ${DOCKER_RUN} ${DOCKER_BUILD_IMAGE}:$(GO_VERSION)-linux-amd64 ${DOCKER_GO_BUILD} -o ${BUILD_DIR}/gotify-linux-amd64 ${DOCKER_WORKDIR}

14433
ui/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

11312
ui/yarn.lock Normal file
View File

File diff suppressed because it is too large Load Diff