mirror of
				https://github.com/grafana/grafana.git
				synced 2025-02-25 18:55:37 -06:00 
			
		
		
		
	build: fixes broken path for bra run
removes os and arch from binary path when building in dev mode
This commit is contained in:
		
							
								
								
									
										10
									
								
								build.go
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								build.go
									
									
									
									
									
								
							| @@ -256,8 +256,10 @@ func createDebPackages() { | ||||
| func createRpmPackages() { | ||||
| 	previousPkgArch := pkgArch | ||||
| 	switch { | ||||
| 		case pkgArch == "armv7" : pkgArch = "armhfp" | ||||
| 		case pkgArch == "arm64" : pkgArch = "aarch64" | ||||
| 	case pkgArch == "armv7": | ||||
| 		pkgArch = "armhfp" | ||||
| 	case pkgArch == "arm64": | ||||
| 		pkgArch = "aarch64" | ||||
| 	} | ||||
| 	createPackage(linuxPackageOptions{ | ||||
| 		packageType:            "rpm", | ||||
| @@ -416,6 +418,10 @@ func test(pkg string) { | ||||
|  | ||||
| func build(binaryName, pkg string, tags []string) { | ||||
| 	binary := fmt.Sprintf("./bin/%s-%s/%s", goos, goarch, binaryName) | ||||
| 	if isDev { | ||||
| 		//dont include os and arch in output path in dev environment | ||||
| 		binary = fmt.Sprintf("./bin/%s", binaryName) | ||||
| 	} | ||||
|  | ||||
| 	if goos == "windows" { | ||||
| 		binary += ".exe" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user