Skip to content

fix: Fixed version information for Pika, Pika_exporter, Codis #3054

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

Merged
wangshao1 merged 2 commits into from
Mar 20, 2025
Merged

fix: Fixed version information for Pika, Pika_exporter, Codis #3054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a97400
Fixed version information for Pika, Pika_exporter, Codis
Mar 20, 2025
4cb5469
Delete redundant logic
Mar 20, 2025
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ aux_source_directory(src DIR_SRCS)

# # generate version
string(TIMESTAMP TS "%Y-%m-%d %H:%M:%S" UTC)
set(PIKA_BUILD_DATE "${TS}" CACHE STRING "the time we first built pika")
set(PIKA_BUILD_DATE "${TS}")

find_package(Git)

Expand Down
7 changes: 5 additions & 2 deletions codis/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@

export GO111MODULE=on

build-all: codis-dashboard codis-proxy codis-admin codis-ha codis-fe
build-all: codis-dashboard codis-proxy codis-admin codis-ha codis-fe generate-version

PRJ_ROOT=${CURDIR}


codis-deps:
@mkdir -p ./bin && go version

codis-dashboard: codis-deps
$(info build codis-dashboard)
@cd ${PRJ_ROOT}/cmd/dashboard && go mod tidy && go build -buildvcs=false -o ${PRJ_ROOT}/bin/codis-dashboard .
Expand All @@ -33,6 +32,10 @@ codis-fe: codis-deps
@cd ${PRJ_ROOT}/cmd/fe && go mod tidy && go build -buildvcs=false -o ${PRJ_ROOT}/bin/codis-fe .
@rm -rf ${PRJ_ROOT}/bin/assets && cp -rf ${PRJ_ROOT}/cmd/fe/assets ./bin/

generate-version:
$(info generate version)
@./version

clean:
$(info ...Clean Start!)
@rm -rf bin
6 changes: 1 addition & 5 deletions tools/pika_exporter/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@

# export PATH := $(PATH):$(GOPATH)/bin

# for mac
BRANCH := $(shell git branch | sed 's/* \(.*\)/\1/p')
# for Linux
# BRANCH := $(shell git branch | sed --quiet 's/* \(.*\)/\1/p')
GITREV := $(shell git rev-parse --short HEAD)
GITREV := $(shell git rev-parse HEAD)
BUILDTIME := $(shell date '+%F %T %Z')
COMPILERVERSION := $(subst go version ,,$(shell go version))
PROJNAME := pika_exporter
Expand Down
5 changes: 4 additions & 1 deletion tools/pika_exporter/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@ func getEnvInt(key string, defaultVal int) int {
func main() {
flag.Parse()

log.Println("Pika Metrics Exporter ", BuildVersion, "build date:", BuildDate, "sha:", BuildCommitSha, "go version:", GoVersion)
log.Println("Pika Metrics Exporter")
log.Println("Build Date: ", BuildDate)
log.Println("Commit SHA: ", BuildCommitSha)
log.Println("Go Version: ", GoVersion)
if *showVersion {
return
}
Expand Down
Loading