LBRYCommunity/herald.go
1
0
Fork 0
Code Issues 16 Pull requests Projects Releases 14 Packages Wiki Activity

Fix versioning

Browse source
This commit is contained in:
Jeffrey Picard 2021-09-24 16:24:22 -04:00
parent bdcb15b7c5
commit d99f993c21
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
build_and_push.sh
View file

@ -1,18 +1,28 @@
#!/bin/bash #!/bin/bash
IMPORT_PATH="github.com/lbryio/hub/app"
function print_and_die() {
echo "$1"
exit 1
}
# Get new tags from remote # Get new tags from remote
git fetch --tags git fetch --tags
# Get latest tag name # Get latest tag name
latestTag=$(git describe --tags `git rev-list --tags --max-count=1`) LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`)
# Make sure it match the format vX.XXXX.XX.XX # Make sure it match the format vX.XXXX.XX.XX
[[ $latestTag =~ ^v[0-9]+\.[0-9]{4}\.[0-9]{2}\.[0-9]{2}.*$ ]] || exit 1 [[ $LATEST_TAG =~ ^v[0-9]+\.[0-9]{4}\.[0-9]{2}\.[0-9]{2}.*$ ]] || print_and_die "bad version ${LATEST_TAG}"
VERSION=$LATEST_TAG
echo "using tag $LATEST_TAG"
# Checkout latest tag # Checkout latest tag
git checkout $latestTag git checkout "$LATEST_TAG"
go build . CGO_ENABLED=0 go build -v -ldflags "-X ${IMPORT_PATH}/meta.version=${VERSION}"
docker build . -t lbry/hub:latest docker build . -t lbry/hub:latest
docker tag lbry/hub:latest lbry/hub:$latestTag docker tag lbry/hub:latest lbry/hub:"$LATEST_TAG"
docker push lbry/hub:latest docker push lbry/hub:latest
docker push lbry/hub:$latestTag docker push lbry/hub:"$LATEST_TAG"

14
server/server.go
View file

@ -10,6 +10,7 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/lbryio/hub/meta"
pb "github.com/lbryio/hub/protobuf/go" pb "github.com/lbryio/hub/protobuf/go"
"github.com/olivere/elastic/v7" "github.com/olivere/elastic/v7"
"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/promhttp"
@ -33,8 +34,6 @@ type FederatedServer struct {
Ping int //? Ping int //?
} }
const majorVersion = 0
const ( const (
ServeCmd = iota ServeCmd = iota
SearchCmd = iota SearchCmd = iota
@ -51,13 +50,8 @@ type Args struct {
Debug bool Debug bool
} }
func getVersion(alphaBeta string) string { func getVersion() string {
strPortion := time.Now().Format("2006.01.02") return meta.Version
majorVersionDate := fmt.Sprintf("v%d.%s", majorVersion, strPortion)
if len(alphaBeta) > 0 {
return fmt.Sprintf("%s-%s", majorVersionDate, alphaBeta)
}
return majorVersionDate
} }
/* /*
@ -162,5 +156,5 @@ func (s *Server) Ping(context context.Context, args *pb.EmptyMessage) (*pb.Strin
} }
func (s *Server) Version(context context.Context, args *pb.EmptyMessage) (*pb.StringValue, error) { func (s *Server) Version(context context.Context, args *pb.EmptyMessage) (*pb.StringValue, error) {
return &pb.StringValue{Value: getVersion("beta")}, nil return &pb.StringValue{Value: getVersion()}, nil
} }