[GitHub] dubee closed pull request #251: Add the support to specify the version of the binaries

[GitBox <gi...@apache.org>]

dubee closed pull request #251: Add the support to specify the version of the binaries
URL: https://github.com/apache/incubator-openwhisk-cli/pull/251
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/.travis.yml b/.travis.yml
index 7ecf33c4..7e848131 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,7 +55,7 @@ script:
   - cd $TRAVIS_BUILD_DIR/../incubator-openwhisk
   - ./gradlew install
   - cd $TRAVIS_BUILD_DIR
-  - ./gradlew --console=plain release
+  - ./gradlew --console=plain releaseBinaries
   - ./tools/travis/test_openwhisk.sh
 
 after_success:
diff --git a/build.gradle b/build.gradle
index 2f46836c..1ea0fd53 100644
--- a/build.gradle
+++ b/build.gradle
@@ -121,6 +121,9 @@ OpenWhiskPlatform.zipFileName =
     System.env['zip_file_name'] ?:
         (rootProject.findProperty('zipFileName') ?: 'OpenWhisk_CLI')
 
+project.ext.packageVersion =
+        rootProject.findProperty('packageVersion') ?: 'latest'
+
 String buildFileName = System.env['build_file_name'] ?:
         (rootProject.findProperty('buildFileName') ?: 'wsk')
 
@@ -214,7 +217,7 @@ task individualArchives(
             type: (p.goOs == 'linux') ? Tar : Zip, dependsOn: compile) {
                 if (p.goOs == 'linux') { compression = Compression.GZIP }
                 destinationDir = file('./release')
-                baseName = "${p.zipFileName}-latest-${p.owOs}-${p.goArch}"
+                baseName = "${p.zipFileName}-${packageVersion}-${p.owOs}-${p.goArch}"
                 from "./build/${p.goOs}-${p.goArch}/"
                 include "${buildFileName}*"
             }
@@ -243,14 +246,14 @@ task index() {
     }
 }
 
-task release(type: Tar, dependsOn: [individualArchives, index]) {
+task releaseBinaries(type: Tar, dependsOn: [individualArchives, index]) {
     compression = Compression.GZIP
     destinationDir = file('./release')
-    baseName = "${OpenWhiskPlatform.zipFileName}-latest-all"
+    baseName = "${OpenWhiskPlatform.zipFileName}-${packageVersion}-all"
     from('./build/content.json') { into('.') }
     rootProject.platforms.each() { p ->
         from('./release/') {
-            include("${p.zipFileName}-latest-${p.owOs}-${p.goArch}.*")
+            include("${p.zipFileName}-${packageVersion}-${p.owOs}-${p.goArch}.*")
             into p.archiveDirName
             rename { p.archiveFileName }
         }
diff --git a/tools/travis/test_openwhisk.sh b/tools/travis/test_openwhisk.sh
index 8d2453ee..78b3b78c 100755
--- a/tools/travis/test_openwhisk.sh
+++ b/tools/travis/test_openwhisk.sh
@@ -7,7 +7,7 @@ set -e
 #  the release.  If you're running manually, this command should get you to
 #  the same place:
 #
-#    ./gradlew release
+#    ./gradlew releaseBinaries
 #
 #  Also at this point, you should already have incubator-openwhisk pulled down
 #  from gradle in the parent directory, using a command such as:


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services