Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use new wrstat-server repo in place on in-repo server code. #86

Closed
wants to merge 3 commits into from
Closed

Use new wrstat-server repo in place on in-repo server code. #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c4d647
Use new wrstat-server repo in place on in-repo server code.
mjkw31 Aug 22, 2024
46aa7d5
Remove JS test and linting from Makefile.
mjkw31 Aug 22, 2024
45f9da3
Remove NPM reference from README.
mjkw31 Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,17 @@ default: install

build: export CGO_ENABLED = 1
build:
@cd server/static/wrstat; npm install && npm run build:prod
go build -tags netgo ${LDFLAGS}

buildnonpm: export CGO_ENABLED = 1
buildnonpm:
go build -tags netgo ${LDFLAGS}

install: export CGO_ENABLED = 1
install:
@rm -f ${GOPATH}/bin/wrstat
@cd server/static/wrstat; npm install && npm run build:prod
@echo Starting go install
@go install -tags netgo ${LDFLAGS}
@echo Installed to ${GOPATH}/bin/wrstat

installnonpm: export CGO_ENABLED = 1
installnonpm:
@rm -f ${GOPATH}/bin/wrstat
@go install -tags netgo ${LDFLAGS}
@echo installed to ${GOPATH}/bin/wrstat

test: export CGO_ENABLED = 1
test:
@cd server/static/wrstat; npm install && CI= npm run build:prod
@go test -tags netgo --count 1 ./...
@cd server/static/wrstat; CI=1 npm test

race: export CGO_ENABLED = 1
race:
Expand All @@ -51,7 +36,6 @@ bench:
# curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.59.1
lint: export CGO_ENABLED = 1
lint:
@cd server/static/wrstat; npm install && CI= npm run lint || true
@golangci-lint run --timeout 2m
# remove the || true when you get round to removing all anys

Expand Down
2 changes: 0 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ of its work.

## Build

[NPM](https://www.npmjs.com/) is required to build this project.

```
git clone https://github.com/wtsi-ssg/wrstat/
cd wrstat
Expand Down
2 changes: 1 addition & 1 deletion cmd/dbinfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import (
"log/slog"

"github.com/spf13/cobra"
"github.com/wtsi-hgi/wrstat-server/v4/server"
"github.com/wtsi-ssg/wrstat/v4/basedirs"
"github.com/wtsi-ssg/wrstat/v4/dgut"
"github.com/wtsi-ssg/wrstat/v4/server"
)

// dbinfoCmd represents the server command.
Expand Down
Loading
Loading