Skip to content

Commit

Permalink
fix makefile, adjust verbosity
Browse files Browse the repository at this point in the history
  • Loading branch information
taigrr committed Dec 29, 2021
1 parent 9812ef8 commit b0f5dbb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ endif
export GitCommit=`git rev-parse HEAD | cut -c -7`;\
export BuildTime=`date -u +%Y%m%d.%H%M%S`;\
export Authors=`git log --format='%aN' | sort -u | sed "s@root@@" | tr '\n' ';' | sed "s@;;@;@g" | sed "s@;@; @g" | sed "s@\(.* \); @\1@" | sed "s@[[:blank:]]@SpAcE@g"`;\
export GitTag=$$(TAG=`git tag --contains $$(git rev-parse HEAD) | sort -R | tr '\n' ' '`; if [ "$$(printf "$$TAG")" ]; then prin tf "$$TAG"; else printf "undefined"; fi);\
export GitTag=$$(TAG=`git tag --contains $$(git rev-parse HEAD) | sort -R | tr '\n' ' '`; if [ "$$(printf "$$TAG")" ]; then printf "$$TAG"; else printf "undefined"; fi);\
go build -ldflags "-X main.BuildNo=$$BITBUCKET_BUILD_NUMBER -X main.GitCommit=$$GitCommit -X main.Tag=$$GitTag -X main.BuildTime=$$BuildTime -X main.Authors=$$Authors" -o "bin/sprout" ./sprout/*.go
@printf "\e[32mSuccess!\e[39m\n"

Expand All @@ -44,7 +44,7 @@ endif
export GitCommit=`git rev-parse HEAD | cut -c -7`;\
export BuildTime=`date -u +%Y%m%d.%H%M%S`;\
export Authors=`git log --format='%aN' | sort -u | sed "s@root@@" | tr '\n' ';' | sed "s@;;@;@g" | sed "s@;@; @g" | sed "s@\(.* \); @\1@" | sed "s@[[:blank:]]@SpAcE@g"`;\
export GitTag=$$(TAG=`git tag --contains $$(git rev-parse HEAD) | sort -R | tr '\n' ' '`; if [ "$$(printf "$$TAG")" ]; then prin tf "$$TAG"; else printf "undefined"; fi);\
export GitTag=$$(TAG=`git tag --contains $$(git rev-parse HEAD) | sort -R | tr '\n' ' '`; if [ "$$(printf "$$TAG")" ]; then printf "$$TAG"; else printf "undefined"; fi);\
go build -ldflags "-X main.BuildNo=$$BITBUCKET_BUILD_NUMBER -X main.GitCommit=$$GitCommit -X main.Tag=$$GitTag -X main.BuildTime=$$BuildTime -X main.Authors=$$Authors" -o "bin/grlx" ./grlx/main.go
@printf "\e[32mSuccess!\e[39m\n"

Expand All @@ -63,7 +63,7 @@ endif
export GitCommit=`git rev-parse HEAD | cut -c -7`;\
export BuildTime=`date -u +%Y%m%d.%H%M%S`;\
export Authors=`git log --format='%aN' | sort -u | sed "s@root@@" | tr '\n' ';' | sed "s@;;@;@g" | sed "s@;@; @g" | sed "s@\(.* \); @\1@" | sed "s@[[:blank:]]@SpAcE@g"`;\
export GitTag=$$(TAG=`git tag --contains $$(git rev-parse HEAD) | sort -R | tr '\n' ' '`; if [ "$$(printf "$$TAG")" ]; then prin tf "$$TAG"; else printf "undefined"; fi);\
export GitTag=$$(TAG=`git tag --contains $$(git rev-parse HEAD) | sort -R | tr '\n' ' '`; if [ "$$(printf "$$TAG")" ]; then printf "$$TAG"; else printf "undefined"; fi);\
go build -ldflags "-X main.BuildNo=$$BITBUCKET_BUILD_NUMBER -X main.GitCommit=$$GitCommit -X main.Tag=$$GitTag -X main.BuildTime=$$BuildTime -X main.Authors=$$Authors" -o "bin/farmer" ./farmer/main.go
@printf "\e[32mSuccess!\e[39m\n"

Expand Down
2 changes: 1 addition & 1 deletion farmer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (

func init() {
config.LoadConfig("farmer")
log.SetLogLevel(log.LTrace)
log.SetLogLevel(log.LDebug)
}

var s *nats_server.Server
Expand Down

0 comments on commit b0f5dbb

Please sign in to comment.