From 8a29940850fe335fe91fd085835c039bd6c745a1 Mon Sep 17 00:00:00 2001 From: Hao Chen Date: Tue, 25 Oct 2022 07:46:08 +0800 Subject: [PATCH] Embed git tags as Version into go binary, remove the channnel field for Slack (#238) --- .goreleaser.yaml | 1 + Makefile | 7 +++++-- global/global.go | 11 +++++++---- report/result.go | 1 - report/sla.go | 1 - 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index bf13990c..fc1f1a7f 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -28,6 +28,7 @@ builds: - arm64 ldflags: - -s -w + - -X github.com/megaease/easeprobe/global.Ver={{ .Tag }} - -X github.com/megaease/easeprobe/pkg/version.RELEASE={{ .Tag }} - -X github.com/megaease/easeprobe/pkg/version.COMMIT={{.Commit}} - -X github.com/megaease/easeprobe/pkg/version.REPO=megaease/easeprobe diff --git a/Makefile b/Makefile index 257d5087..a4a83756 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,10 @@ MKFILE_DIR := $(dir $(MKFILE_PATH)) RELEASE_DIR := ${MKFILE_DIR}/build/bin # Version -RELEASE?=v0.1.0 +RELEASE_VER := $(shell git describe --tag --abbrev=0) + +# Go MOD +GO_MOD := $(shell go list -m) # Git Related GIT_REPO_INFO=$(shell cd ${MKFILE_DIR} && git config --get remote.origin.url) @@ -27,7 +30,7 @@ all: ${TARGET} ${TARGET}: ${SOURCE} mkdir -p ${RELEASE_DIR} go mod tidy - CGO_ENABLED=0 go build -a -ldflags '-s -w -extldflags "-static"' -o ${TARGET} github.com/megaease/easeprobe/cmd/easeprobe + CGO_ENABLED=0 go build -a -ldflags "-s -w -extldflags -static -X ${GO_MOD}/global.Ver=${RELEASE_VER}" -o ${TARGET} ${GO_MOD}/cmd/easeprobe build: all diff --git a/global/global.go b/global/global.go index bbfabc0b..ecfe1656 100644 --- a/global/global.go +++ b/global/global.go @@ -37,16 +37,19 @@ const ( Org = "MegaEase" // DefaultProg is the program name DefaultProg = "EaseProbe" + // DefaultIconURL is the default icon which used in Slack or Discord + DefaultIconURL = "https://megaease.com/favicon.png" +) + +var ( // Ver is the program version + // It will be set by the build script + // go build -ldflags "-X github.com/megaease/easegress/pkg/global.Ver=1.0.0" Ver = "v1.7.0" - //OrgProg combine organization and program OrgProg = Org + " " + DefaultProg //OrgProgVer combine organization and program and version OrgProgVer = Org + " " + DefaultProg + "/" + Ver - - // DefaultIconURL is the default icon which used in Slack or Discord - DefaultIconURL = "https://megaease.com/favicon.png" ) const ( diff --git a/report/result.go b/report/result.go index 016ebbb1..77408a0a 100644 --- a/report/result.go +++ b/report/result.go @@ -162,7 +162,6 @@ func ToSlack(r probe.Result) string { json := ` { - "channel": "Alert", "text": "%s", "blocks": [ { diff --git a/report/sla.go b/report/sla.go index be165661..de87ab8c 100644 --- a/report/sla.go +++ b/report/sla.go @@ -277,7 +277,6 @@ func SLASlackSection(r *probe.Result) string { func SLASlack(probers []probe.Prober) string { summary := SLASummary(probers) json := `{ - "channel": "Report", "text": "Overall SLA Report - ` + summary + ` ", "blocks": [ {