Merge pull request #74 from stelligent/develop

Bug with stack params
stelligent · Feb 1, 2017 · f556e1d · f556e1d
2 parents 37555ee + 9893b82
commit f556e1d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -26,7 +26,7 @@ deps:
 	glide install
 	go generate $(SRC_FILES)
 
-lint:
+lint: fmt
 	@echo "=== linting ==="
 	go vet $(SRC_FILES)
 	glide novendor | xargs -n1 golint -set_exit_status
@@ -85,7 +85,7 @@ clean:
 all: clean deps test build
 
 fmt:
-	@echo "=== cleaning ==="
+	@echo "=== formatting ==="
 	go fmt $(SRC_FILES)
 
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.5
+0.1.6
diff --git a/templates/assets.go b/templates/assets.go
diff --git a/workflows/pipeline_upsert.go b/workflows/pipeline_upsert.go
@@ -60,11 +60,18 @@ func (workflow *pipelineWorkflow) pipelineUpserter(tokenProvider func(bool) stri
 		}
 		pipelineParams["GitHubUser"] = sourceRepo[0]
 		pipelineParams["GitHubRepo"] = sourceRepo[1]
-		pipelineParams["GitHubBranch"] = workflow.pipelineConfig.Source.Branch
 		pipelineParams["GitHubToken"] = tokenProvider(pipelineStack == nil)
 
-		pipelineParams["BuildType"] = workflow.pipelineConfig.Build.Type
-		pipelineParams["BuildComputeType"] = workflow.pipelineConfig.Build.ComputeType
+		if workflow.pipelineConfig.Source.Branch != "" {
+			pipelineParams["GitHubBranch"] = workflow.pipelineConfig.Source.Branch
+		}
+
+		if workflow.pipelineConfig.Build.Type != "" {
+			pipelineParams["BuildType"] = workflow.pipelineConfig.Build.Type
+		}
+		if workflow.pipelineConfig.Build.ComputeType != "" {
+			pipelineParams["BuildComputeType"] = workflow.pipelineConfig.Build.ComputeType
+		}
 
 		if workflow.pipelineConfig.Build.Image != "" {
 			pipelineParams["BuildImage"] = workflow.pipelineConfig.Build.Image