Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use yarn instead of npm run for consistency

Browse Source
This commit is contained in:
Alexander Zobnin
2019-12-12 11:36:19 +03:00
parent 6097e81a2c
commit a37d1be3e0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -10,13 +10,13 @@ install:
build: build-frontend build-backend build: build-frontend build-backend
build-frontend: build-frontend:
npm run dev-build yarn dev-build
build-backend: build-backend:
env GOOS=linux go build -mod=vendor -o ./dist/zabbix-plugin_linux_amd64 ./pkg env GOOS=linux go build -mod=vendor -o ./dist/zabbix-plugin_linux_amd64 ./pkg
dist: dist-frontend dist-backend dist: dist-frontend dist-backend
dist-frontend: dist-frontend:
npm run build yarn build
dist-backend: dist-backend-linux dist-backend-darwin dist-backend-windows dist-backend: dist-backend-linux dist-backend-darwin dist-backend-windows
dist-backend-windows: extension = .exe dist-backend-windows: extension = .exe
dist-backend-%: dist-backend-%:
@@ -26,11 +26,11 @@ dist-backend-%:
.PHONY: test .PHONY: test
test: test-frontend test-backend test: test-frontend test-backend
test-frontend: test-frontend:
npm run test yarn test
test-backend: test-backend:
go test -v -mod=vendor ./pkg/... go test -v -mod=vendor ./pkg/...
test-ci: test-ci:
npm run ci-test yarn ci-test
mkdir -p tmp/coverage/golang/ mkdir -p tmp/coverage/golang/
go test -race -coverprofile=tmp/coverage/golang/coverage.txt -covermode=atomic -mod=vendor ./pkg/... go test -race -coverprofile=tmp/coverage/golang/coverage.txt -covermode=atomic -mod=vendor ./pkg/...
@@ -40,5 +40,5 @@ clean:
.PHONY: lint .PHONY: lint
lint: lint:
npm run lint yarn lint
golint -set_exit_status pkg/... golint -set_exit_status pkg/...