This is an automated email from the ASF dual-hosted git repository.
mrutkowski pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-openwhisk-wskdeploy.git
The following commit(s) were added to refs/heads/master by this push:
new 9165b88 Add the 32-bit binaries build for each operating system (#543)
9165b88 is described below
commit 9165b88ef4179f4611dbcfe2d4495a31989e198e
Author: Vincent <[email protected]>
AuthorDate: Fri Sep 22 16:38:00 2017 -0400
Add the 32-bit binaries build for each operating system (#543)
---
.travis.yml | 5 +++--
Godeps/Godeps.json | 4 ++--
README.md | 2 +-
tools/travis/build_tag_releases.sh | 31 +++++++++++++++++++++----------
4 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 61cb686..4514204 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ before_deploy:
- export build_file_name=wskdeploy
- go get github.com/inconshreveable/mousetrap
- ./tools/travis/build_tag_releases.sh $build_file_name
- - export RELEASE_PKG_FILE=$(ls $build_file_name-*.zip)
+ - export RELEASE_PKG_FILE=$(ls $build_file_name-*.*)
- echo "Deploying $RELEASE_PKG_FILE to GitHub releases."
deploy:
@@ -45,7 +45,8 @@ deploy:
api_key:
secure:
aQGcP7XKlgZEFZ57y4RzYRHfQAM5HEdaa7Y/vTxNepIsE7zY2945qT99UJnU1hfhSjP9jO5eNlHzo+AqJoUx70+iUIhMTyOp39Qp7wb74OKolkXwcntufzP7Ocron5IYUE311tf/kic3vRb5cwoaE2lGfx5PdCuozVjgpsDbIRvV5quQzNr68Toqe+yegKwAhprYRWHPnuIqGbkfa83csqFv6m0viC/gvtFOCB9/4zGCqk/K3CKrcr/5GvnFPxJoaJNfFA6umSZ9VaJjbIJmcXGD3nU+rWP0uEpvzGKIMYhmQq/0JuUTgvh4jnnT4OVZeTh6pMaUqtWH+3HDrOiLAiLjcfeT91j7ZXPnx8LvM6SuoRlvRCuXA2FYx9mz2Vx0TWV5TMqhj3okVO/CvvnMMWwKWOUDD/nSMLy93BM40NjD7zimGjocPsGAjTT9H1PSfau3fiiMjg6iMRWjUTfNY5ra5Wgb7W5G
[...]
file_glob: true
- file: ${build_file_name}-*.zip
+ file: ${build_file_name}-*.*
+ overwrite: true
skip_cleanup: true
on:
repo: apache/incubator-openwhisk-wskdeploy
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 62c977b..4fad9ca 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -105,11 +105,11 @@
},
{
"ImportPath":
"github.com/apache/incubator-openwhisk-client-go/whisk",
- "Rev": "00db68b4507d77e3202295ba2e3f86eab2598909"
+ "Rev": "c6e512b136e8c27bb144c0f8b625e833fbae878a"
},
{
"ImportPath":
"github.com/apache/incubator-openwhisk-client-go/wski18n",
- "Rev": "00db68b4507d77e3202295ba2e3f86eab2598909"
+ "Rev": "c6e512b136e8c27bb144c0f8b625e833fbae878a"
},
{
"ImportPath": "github.com/pelletier/go-buffruneio",
diff --git a/README.md b/README.md
index 38c7f47..df60ed3 100644
--- a/README.md
+++ b/README.md
@@ -147,7 +147,7 @@ commands will start the wskdeploy cross compile for your
specific OS platform in
If you would like to build the binaries available for all the operating
systems and architectures, run the following command:
```sh
-$ ./gradlew distDocker -PcrossCompileCLI=true
+$ ./gradlew distDocker -PcrossCompileWSKDEPLOY=true
```
Then, you will find the binaries and their compressed packages generated under
the folder ```bin/<os>/<arch>/``` for each supported Operating System and CPU
Architecture pair.
diff --git a/tools/travis/build_tag_releases.sh
b/tools/travis/build_tag_releases.sh
index e1d674b..bfb46df 100755
--- a/tools/travis/build_tag_releases.sh
+++ b/tools/travis/build_tag_releases.sh
@@ -1,17 +1,28 @@
#!/usr/bin/env bash
declare -a os_list=("linux" "darwin" "windows")
-arc=amd64
+declare -a arc_list=("amd64" "386")
build_file_name=${1:-"wskdeploy"}
for os in "${os_list[@]}"
do
- wskdeploy=$build_file_name
- if [ "$os" == "windows" ]; then
- wskdeploy="$wskdeploy.exe"
- fi
- cd $TRAVIS_BUILD_DIR
- GOOS=$os GOARCH=$arc go build -o build/$os/$wskdeploy
- cd build/$os
- zip -r "$TRAVIS_BUILD_DIR/$build_file_name-$TRAVIS_TAG-$os-$arc.zip"
$wskdeploy
-done
\ No newline at end of file
+ for arc in "${arc_list[@]}"
+ do
+ wskdeploy=$build_file_name
+ os_name=$os
+ if [ "$os" == "windows" ]; then
+ wskdeploy="$wskdeploy.exe"
+ fi
+ if [ "$os" == "darwin" ]; then
+ os_name="mac"
+ fi
+ cd $TRAVIS_BUILD_DIR
+ GOOS=$os GOARCH=$arc go build -o build/$os/$wskdeploy
+ cd build/$os
+ if [[ "$os" == "linux" ]]; then
+ tar -czvf
"$TRAVIS_BUILD_DIR/$build_file_name-$TRAVIS_TAG-$os_name-$arc.tgz" $wskdeploy
+ else
+ zip -r
"$TRAVIS_BUILD_DIR/$build_file_name-$TRAVIS_TAG-$os_name-$arc.zip" $wskdeploy
+ fi
+ done
+done
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
