From c6bc20dca73a1eb2267e032bd44c16365c173f3c Mon Sep 17 00:00:00 2001 From: Ke Zhu Date: Sun, 7 Dec 2014 11:26:43 -0500 Subject: [PATCH] parse build file with params injection --- cli/build.go | 2 +- shared/build/script/script.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/build.go b/cli/build.go index 0c5a3e1b..933b2547 100644 --- a/cli/build.go +++ b/cli/build.go @@ -115,7 +115,7 @@ func run(path, identity, dockerhost, dockercert, dockerkey string, publish, depl envs := getParamMap("DRONE_ENV_") // parse the Drone yml file - s, err := script.ParseBuildFile(script.Inject(path, envs)) + s, err := script.ParseBuildFile(path, envs) if err != nil { log.Err(err.Error()) return EXIT_STATUS, err diff --git a/shared/build/script/script.go b/shared/build/script/script.go index 62fa8e7e..1ee26161 100644 --- a/shared/build/script/script.go +++ b/shared/build/script/script.go @@ -22,13 +22,13 @@ func ParseBuild(data string) (*Build, error) { return &build, err } -func ParseBuildFile(filename string) (*Build, error) { +func ParseBuildFile(filename string, params map[string]string) (*Build, error) { data, err := ioutil.ReadFile(filename) if err != nil { return nil, err } - return ParseBuild(string(data)) + return ParseBuild(Inject(string(data), params)) } // Build stores the configuration details for