[incubator-openwhisk] branch master updated: Ensure Proper Order of CLI Build Tasks (#2479)

[csantanapr]

This is an automated email from the ASF dual-hosted git repository.

csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new 1a97cc0  Ensure Proper Order of CLI Build Tasks (#2479)
1a97cc0 is described below

commit 1a97cc0e218ed42ae15af1c534fb71b7aed49972
Author: James Dubee <jwdu...@us.ibm.com>
AuthorDate: Tue Oct 31 12:48:03 2017 -0400

    Ensure Proper Order of CLI Build Tasks (#2479)
    
    * Ensure Proper Order of CLI Build Tasks
    
    * Remove OS Dump
    
    * Review updates
---
 tools/cli/build.gradle | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/tools/cli/build.gradle b/tools/cli/build.gradle
index deda2a6..02b22d4 100644
--- a/tools/cli/build.gradle
+++ b/tools/cli/build.gradle
@@ -11,39 +11,27 @@ task removeBinary(type: Delete) {
     delete "${projectDir}/../../bin/windows"
 }
 
-task distBinary(dependsOn: [removeBinary, distDocker]) {
+task distBinary(dependsOn: [removeBinary]) {
     doLast {
-        run(dockerBinary + ["rm", "-f", dockerContainerName], true)
-        run(dockerBinary + ["run", "--name", dockerContainerName, 
dockerTaggedImageName])
+        String go_osname = mapOsNameToGoName(getOsName())
+        String go_osarch = mapOsArchToGoArch(getOsArch())
+        String from_path_wsk = 
"${projectDir}/../../bin/${go_osname}/${go_osarch}/wsk"
+        String to_path_dir = "${projectDir}/../../bin"
 
         // Copy all Go binaries from Docker into openwhisk/bin folder
-        run(dockerBinary + ["cp", dockerContainerName +
-                ":/src/github.com/go-whisk-cli/build/.", 
"${projectDir}/../../bin"])
-
+        run(dockerBinary + ["rm", "-f", dockerContainerName], true)
+        run(dockerBinary + ["run", "--name", dockerContainerName, 
dockerTaggedImageName])
+        run(dockerBinary + ["cp", dockerContainerName + 
":/src/github.com/go-whisk-cli/build/.", "${projectDir}/../../bin"])
         run(dockerBinary + ["rm", "-f", dockerContainerName])
-    }
-}
 
-task dumpOSInfo {
-    doLast {
-        println "os.name = "+getOsName()
-        println "os.arch = "+getOsArch()
-        println "go.name = "+mapOsNameToGoName(getOsName())
-        println "go.arch = "+mapOsArchToGoArch(getOsArch())
+        exec {
+            executable "cp"
+            args "${from_path_wsk}", "${to_path_dir}"
+        }
     }
 }
 
-task copyCLIShortcut(type: Copy, dependsOn: [distBinary, dumpOSInfo]) {
-    String go_osname     = mapOsNameToGoName(getOsName())
-    String go_osarch     = mapOsArchToGoArch(getOsArch())
-    String from_path_wsk = 
"${projectDir}/../../bin/${go_osname}/${go_osarch}/wsk"
-    String to_path_dir   = "${projectDir}/../../bin"
-
-    from from_path_wsk
-    into to_path_dir
-}
-
-pushImage.finalizedBy copyCLIShortcut
+pushImage.finalizedBy distBinary
 
 // Returns the Go CLI docker build args
 def getDockerBuildArgs() {

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <commits@openwhisk.apache.org>'].