Skip to content

A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.

fix(plugin): fix incorrect build version info package name

LinkinStarb4ae37330976
diff --git a/Makefile b/Makefile
index 1decc473..3b80f900 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ DOCKER_CMD=docker
GO_ENV=CGO_ENABLED=0 GO111MODULE=on
Revision=$(shell git rev-parse --short HEAD)
-GO_FLAGS=-ldflags="-X answercmd.Version=$(VERSION) -X 'answercmd.Revision=$(Revision)' -X 'answercmd.Time=`date`' -extldflags -static"
+GO_FLAGS=-ldflags="-X github.com/answerdev/answer/cmd.Version=$(VERSION) -X 'github.com/answerdev/answer/cmd.Revision=$(Revision)' -X 'github.com/answerdev/answer/cmd.Time=`date`' -extldflags -static"
GO=$(GO_ENV) $(shell which go)
build: generate
diff --git a/cmd/main.go b/cmd/main.go
index 75bcea7f..fe378b42 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -16,7 +16,7 @@ import (
"github.com/segmentfault/pacman/log"
)
-// go build -ldflags "-X answercmd.Version=x.y.z"
+// go build -ldflags "-X github.com/answerdev/answer/cmd.Version=x.y.z"
var (
// Name is the name of the project
Name = "answer"
diff --git a/internal/cli/build.go b/internal/cli/build.go
index 2f6f02fb..0a6d3129 100644
--- a/internal/cli/build.go
+++ b/internal/cli/build.go
@@ -191,9 +191,11 @@ func copyDirEntries(sourceFs embed.FS, sourceDir string, targetDir string) (err
func buildBinary(b *buildingMaterial) (err error) {
versionInfo := b.originalAnswerInfo
- ldflags := fmt.Sprintf(`-ldflags="-X answercmd.Version=%s -X answercmd.Revision=%s -X answercmd.Time=%s`,
- versionInfo.Version, versionInfo.Revision, versionInfo.Time)
- err = b.newExecCmd("go", "build", ldflags, "-o", b.outputPath, ".").Run()
+ cmdPkg := "github.com/answerdev/answer/cmd"
+ ldflags := fmt.Sprintf("-X %s.Version='%s' -X %s.Revision='%s' -X %s.Time='%s'",
+ cmdPkg, versionInfo.Version, cmdPkg, versionInfo.Revision, cmdPkg, versionInfo.Time)
+ err = b.newExecCmd("go", "build",
+ "-ldflags", ldflags, "-o", b.outputPath, ".").Run()
if err != nil {
return err
}
@@ -201,8 +203,7 @@ func buildBinary(b *buildingMaterial) (err error) {
}
func cleanByproduct(b *buildingMaterial) (err error) {
- //return os.RemoveAll(b.tmpDir)
- return nil
+ return os.RemoveAll(b.tmpDir)
}
func (b *buildingMaterial) newExecCmd(command string, args ...string) *exec.Cmd {
@@ -238,6 +239,6 @@ func main() {
go 1.19
-replace github.com/answerdev/answer latest => replace github.com/answerdev/answer feature-plugin
+replace github.com/answerdev/answer latest => github.com/answerdev/answer feature-plugin
`
)