opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 02:02:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Build: Let building of Go code work even if $GOPATH isn't set (#25805)

Browse Source 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen
2020-06-25 08:38:17 +02:00
committed by GitHub
parent 6e3e9b7c39
commit 935d6b0ce1
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
build.go
View File

@ -9,6 +9,7 @@ import (
"encoding/json" "encoding/json"
"flag" "flag"
"fmt" "fmt"
"go/build"
"io" "io"
"io/ioutil" "io/ioutil"
"log" "log"
@ -57,8 +58,6 @@ func main() {
log.SetOutput(os.Stdout) log.SetOutput(os.Stdout)
log.SetFlags(0) log.SetFlags(0)
ensureGoPath()
var buildIdRaw string var buildIdRaw string
flag.StringVar(&goarch, "goarch", runtime.GOARCH, "GOARCH") flag.StringVar(&goarch, "goarch", runtime.GOARCH, "GOARCH")
@ -106,16 +105,16 @@ func main() {
case "build-srv", "build-server": case "build-srv", "build-server":
clean() clean()
build("grafana-server", "./pkg/cmd/grafana-server", []string{}) doBuild("grafana-server", "./pkg/cmd/grafana-server", []string{})
case "build-cli": case "build-cli":
clean() clean()
build("grafana-cli", "./pkg/cmd/grafana-cli", []string{}) doBuild("grafana-cli", "./pkg/cmd/grafana-cli", []string{})
case "build": case "build":
//clean() //clean()
for _, binary := range binaries { for _, binary := range binaries {
build(binary, "./pkg/cmd/"+binary, []string{}) doBuild(binary, "./pkg/cmd/"+binary, []string{})
} }
case "build-frontend": case "build-frontend":
@ -417,18 +416,6 @@ func createPackage(options linuxPackageOptions) {
runPrint("fpm", append([]string{"-t", options.packageType}, args...)...) runPrint("fpm", append([]string{"-t", options.packageType}, args...)...)
} }
func ensureGoPath() {
if os.Getenv("GOPATH") == "" {
cwd, err := os.Getwd()
if err != nil {
log.Fatal(err)
}
gopath := filepath.Clean(filepath.Join(cwd, "../../../../"))
log.Println("GOPATH is", gopath)
os.Setenv("GOPATH", gopath)
}
}
func grunt(params ...string) { func grunt(params ...string) {
if runtime.GOOS == windows { if runtime.GOOS == windows {
runPrint(`.\node_modules\.bin\grunt`, params...) runPrint(`.\node_modules\.bin\grunt`, params...)
@ -476,7 +463,7 @@ func test(pkg string) {
runPrint("go", "test", "-short", "-timeout", "60s", pkg) runPrint("go", "test", "-short", "-timeout", "60s", pkg)
} }
func build(binaryName, pkg string, tags []string) { func doBuild(binaryName, pkg string, tags []string) {
libcPart := "" libcPart := ""
if libc != "" { if libc != "" {
libcPart = fmt.Sprintf("-%s", libc) libcPart = fmt.Sprintf("-%s", libc)
@ -554,7 +541,7 @@ func clean() {
rmr("dist") rmr("dist")
rmr("tmp") rmr("tmp")
rmr(filepath.Join(os.Getenv("GOPATH"), fmt.Sprintf("pkg/%s_%s/github.com/grafana", goos, goarch))) rmr(filepath.Join(build.Default.GOPATH, fmt.Sprintf("pkg/%s_%s/github.com/grafana", goos, goarch)))
} }
func setBuildEnv() { func setBuildEnv() {