build: refactoring

.circleci/config.yml

@@ -342,7 +342,7 @@ jobs:
           name: Deploy to grafana.com
           name: Deploy to grafana.com
           command: |
           command: |
             cd enterprise-dist
             cd enterprise-dist
-            ../scripts/build/release_publisher/release_publisher -apikey ${GRAFANA_COM_API_KEY} -enterprise -version "$(cat grafana.version)"' --nightly
+            ../scripts/build/release_publisher/release_publisher -apikey ${GRAFANA_COM_API_KEY} -enterprise -version "$(cat grafana.version)" --nightly
 
 
 
 
   deploy-enterprise-release:
   deploy-enterprise-release:

build.go

@@ -421,13 +421,17 @@ func grunt(params ...string) {
 	}
 	}
 }
 }
 
 
-func gruntBuildArg(task string) []string {
-	args := []string{task}
+func genPackageVersion() string {
 	if includeBuildId {
 	if includeBuildId {
-		args = append(args, fmt.Sprintf("--pkgVer=%v-%v", linuxPackageVersion, linuxPackageIteration))
+		return fmt.Sprintf("%v-%v", linuxPackageVersion, linuxPackageIteration)
 	} else {
 	} else {
-		args = append(args, fmt.Sprintf("--pkgVer=%v", version))
+		return version
 	}
 	}
+}
+
+func gruntBuildArg(task string) []string {
+	args := []string{task}
+	args = append(args, fmt.Sprintf("--pkgVer=%v", genPackageVersion()))
 	if pkgArch != "" {
 	if pkgArch != "" {
 		args = append(args, fmt.Sprintf("--arch=%v", pkgArch))
 		args = append(args, fmt.Sprintf("--arch=%v", pkgArch))
 	}
 	}
@@ -449,13 +453,7 @@ func setup() {
 }
 }
 
 
 func printGeneratedVersion() {
 func printGeneratedVersion() {
-	var genVersion string
-	if includeBuildId {
-		genVersion = fmt.Sprintf("%v-%v", linuxPackageVersion, linuxPackageIteration)
-	} else {
-		genVersion = version
-	}
-	fmt.Print(genVersion)
+	fmt.Print(genPackageVersion())
 }
 }
 
 
 func test(pkg string) {
 func test(pkg string) {