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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix burning in the commit ID into the binary #960

Merged
merged 3 commits into from
Apr 7, 2022
Merged

Fix burning in the commit ID into the binary #960

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
fd9bb6e
Fix burning in the commit ID into the binary
mcamou Apr 7, 2022
6c04ab0
PR comments
mcamou Apr 7, 2022
5b26be0
One missed PR comment
mcamou Apr 7, 2022
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
3 changes: 3 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
.PHONY: test test-unit test-integration demo deploy-local linter install build client drand relay-http relay-gossip relay-s3

VER_PACKAGE=github.com/drand/drand/common
CLI_PACKAGE=github.com/drand/drand/cmd/drand-cli

GIT_REVISION := $(shell git rev-parse --short HEAD)
BUILD_DATE := $(shell date -u +%d/%m/%Y@%H:%M:%S)

Expand Down
4 changes: 2 additions & 2 deletions core/drand_daemon_interceptors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func (dd *DrandDaemon) NodeVersionValidator(ctx context.Context, req interface{}
}
if !dd.version.IsCompatible(rcvVer) {
dd.log.Warnw("", "node_version_interceptor", "node version rcv is no compatible --> rejecting message", "version", rcvVer)
msg := fmt.Sprintf("Incompatible node version. Current: %s, received: %s", dd.version, rcvVer)
msg := fmt.Sprintf("Incompatible node version. Current: %v, received: %v", dd.version, rcvVer)
return nil, status.Error(codes.PermissionDenied, msg)
}

Expand Down Expand Up @@ -77,7 +77,7 @@ func (dd *DrandDaemon) NodeVersionStreamValidator(srv interface{}, ss grpc.Serve
rcvVer := commonutils.Version{Major: v.Major, Minor: v.Minor, Patch: v.Patch, Prerelease: prerelease}
if !dd.version.IsCompatible(rcvVer) {
dd.log.Warnw("", "node_version_interceptor", "node version rcv is no compatible --> rejecting message", "version", rcvVer)
msg := fmt.Sprintf("Incompatible node version. Current: %s, received: %s", dd.version, rcvVer)
msg := fmt.Sprintf("Incompatible node version. Current: %v, received: %v", dd.version, rcvVer)
return status.Error(codes.PermissionDenied, msg)
}

Expand Down