Skip to content

Commit 59cc0c6

Browse files
committed
Release 5.1.1
1 parent 03b401c commit 59cc0c6

File tree

5 files changed

+17
-23
lines changed

5 files changed

+17
-23
lines changed

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.1.0
1+
5.1.1

client/package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "client",
3-
"version": "5.1.0",
3+
"version": "5.1.1",
44
"private": true,
55
"scripts": {
66
"serve": "vue-cli-service serve",

metadata/changes/5.1.1.txt

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2019-12-24 - 5.1.1
2+
- Add workspace
3+
- Fix workspace
4+
- Improve linting
5+
- Fix npm issues
6+
- Implement merging of movie watched dates

server/Makefile

+8-20
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#
22
# Makefile to perform "live code reloading" after changes to .go files.
33
#
4-
# n.b. you must install fswatch (OS X: `brew install fswatch`)
5-
#
64
# To start live reloading run the following command:
75
# $ make serve
86
#
@@ -15,14 +13,10 @@ mb_hash := $(shell git rev-parse --short HEAD)
1513
PROG = mediagui
1614

1715
# targets not associated with files
18-
.PHONY: dependencies default build test coverage clean kill restart serve
19-
20-
# check we have a couple of dependencies
21-
dependencies:
22-
@command -v fswatch --version >/dev/null 2>&1 || { printf >&2 "fswatch is not installed, please run: brew install fswatch\n"; exit 1; }
16+
.PHONY: default build test coverage clean kill restart serve
2317

2418
# default targets to run when only running `make`
25-
default: dependencies test
19+
default: test
2620

2721
# clean up
2822
clean:
@@ -32,27 +26,27 @@ protobuf:
3226
protoc -I mediaagent/ mediaagent/agent.proto --go_out=plugins=grpc:mediaagent
3327

3428
# run formatting tool and build
35-
build: dependencies clean
29+
build: clean
3630
go build fmt
3731
go build -ldflags "-X main.Version=$(mb_version)-$(mb_count).$(mb_hash)" -v -o ${PROG}
3832

39-
buildx: dependencies clean
33+
buildx: clean
4034
go build fmt
4135
env GOOS=linux GOARCH=amd64 go build -ldflags "-X main.Version=$(mb_version)-$(mb_count).$(mb_hash)" -v -o ${PROG}
4236

43-
agentx: dependencies clean
37+
agentx: clean
4438
env GOOS=linux GOARCH=amd64 go build -tags agent -ldflags "-X main.Version=$(mb_version)-$(mb_count).$(mb_hash)" -v -o agentx agent.go
4539

46-
agent: dependencies clean
40+
agent: clean
4741
go build -tags agent -ldflags "-X main.Version=$(mb_version)-$(mb_count).$(mb_hash)" -v -o agentx agent.go
4842

49-
release: dependencies clean
43+
release: clean
5044
go build fmt
5145
go build -ldflags "-X main.Version=$(mb_version)-$(mb_count).$(mb_hash)" -v -o ${PROG}
5246
env GOOS=linux GOARCH=amd64 go build -tags agent -ldflags "-X main.Version=$(mb_version)-$(mb_count).$(mb_hash)" -v -o agentx agent.go
5347

5448
# run unit tests with code coverage
55-
test: dependencies
49+
test:
5650
go test -v
5751

5852
# generate code coverage report
@@ -68,12 +62,6 @@ kill:
6862
restart:
6963
@make kill
7064
@make build; (if [ "$$?" -eq 0 ]; then (env GIN_MODE=debug ./${PROG} &); fi)
71-
72-
# watch .go files for changes then recompile & try to start server
73-
# will also kill server after ctrl+c
74-
serve: dependencies
75-
@make restart
76-
@fswatch -o ./*.go ./services/*.go ./lib/*.go ./dto/*.go | xargs -n1 -I{} make restart || make kill
7765

7866
publish: build
7967
cp ./${PROG} ~/bin

0 commit comments

Comments
 (0)