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-runtime-go.git
The following commit(s) were added to refs/heads/master by this push:
new d698e7f Multi arch test (#57)
d698e7f is described below
commit d698e7f89a8cf0f560fc7aa6321db59bcefd9b72
Author: Sciabarra.com ltd <[email protected]>
AuthorDate: Fri Oct 26 15:47:42 2018 +0200
Multi arch test (#57)
---
examples/EXAMPLES.md | 13 +++++++++++++
examples/golang-hello-vendor/Makefile | 10 +++++-----
examples/golang-hello-vendor/src/hello/Gopkg.lock | 12 ++++++++++--
examples/golang-main-vendor/Makefile | 10 +++++-----
examples/golang-main-vendor/src/main/Gopkg.lock | 9 +++++++--
5 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/examples/EXAMPLES.md b/examples/EXAMPLES.md
index 2515dac..90a02e1 100644
--- a/examples/EXAMPLES.md
+++ b/examples/EXAMPLES.md
@@ -18,7 +18,17 @@
-->
# Examples
+
This is a collection of examples.
+Tested on:
+
+- dep version 0.5.0 (check the version `dep version`)
+- Go version 1.11.1
+- GNU Make 3.81
+- Linux Ubuntu 14.04
+- Mac OSX 10.13
+- Windows, with Git Bash, Docker for Windows, make from ezwinports, zip.exe
+
Each examples has a Makefile with 4 targets:
- `make deploy` (or just make) deploys the action, precompiling it
@@ -35,3 +45,6 @@ Available examples:
- [Golang action with a subpackage and vendor folder](golang-hello-vendor)
main is `main.Hello` invoking a `hello.Hello` using a dependency
`github.com/sirupsen/logrus`
- [Standalone Golang Action](golang-main-standalone) main is `main.main`,
implements the ActionLoop directly
- [Simple Bash action](bash-hello) a simple bash script action implementing
the ActionLoop directly
+
+
+
diff --git a/examples/golang-hello-vendor/Makefile
b/examples/golang-hello-vendor/Makefile
index 89f434d..120dcd9 100644
--- a/examples/golang-hello-vendor/Makefile
+++ b/examples/golang-hello-vendor/Makefile
@@ -4,8 +4,8 @@ OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11
WSK?=wsk
MAIN=hello
PACKAGE=test
-SRCS=src/$(MAIN).go src/hello/hello.go
-VENDORS=src/hello/vendor
+SRCS=src/$(MAIN).go src/$(MAIN)/$(MAIN).go
+VENDORS=src/$(MAIN)/vendor
NAME=golang-$(MAIN)-vendor
BINZIP=$(MAIN)-bin.zip
SRCZIP=$(MAIN)-src.zip
@@ -17,10 +17,10 @@ devel: package.done $(SRCZIP)
$(WSK) action update $(PACKAGE)/$(NAME) $(SRCZIP) --main $(MAIN)
--docker $(OW_COMPILER)
src/%/vendor:
- cd $(@D) ; GOPATH=$$(realpath $$PWD/../..) dep ensure
+ cd $(@D) ; DEPPROJECTROOT=$(realpath $(@D)/../..) dep ensure
-$(BINZIP): $(SRCS) $(VENDORS)
- cd src ; zip - -r * | docker run -i $(OW_COMPILER) -compile $(MAIN)
>../$(BINZIP)
+$(BINZIP): $(SRCS) $(VENDORS) $(SRCZIP)
+ docker run -i $(OW_COMPILER) -compile $(MAIN) <$(SRCZIP) >$(BINZIP)
$(SRCZIP): $(SRCS) $(VENDORS)
cd src ; zip ../$(SRCZIP) -r *
diff --git a/examples/golang-hello-vendor/src/hello/Gopkg.lock
b/examples/golang-hello-vendor/src/hello/Gopkg.lock
index 055cdac..e516dc9 100644
--- a/examples/golang-hello-vendor/src/hello/Gopkg.lock
+++ b/examples/golang-hello-vendor/src/hello/Gopkg.lock
@@ -2,35 +2,43 @@
[[projects]]
+ digest = "1:0a69a1c0db3591fcefb47f115b224592c8dfa4368b7ba9fae509d5e16cdc95c8"
name = "github.com/konsorten/go-windows-terminal-sequences"
packages = ["."]
+ pruneopts = "UT"
revision = "5c8c8bd35d3832f5d134ae1e1e375b69a4d25242"
version = "v1.0.1"
[[projects]]
+ digest = "1:3f53e9e4dfbb664cd62940c9c4b65a2171c66acd0b7621a1a6b8e78513525a52"
name = "github.com/sirupsen/logrus"
packages = ["."]
+ pruneopts = "UT"
revision = "ad15b42461921f1fb3529b058c6786c6a45d5162"
version = "v1.1.1"
[[projects]]
branch = "master"
+ digest = "1:3f3a05ae0b95893d90b9b3b5afdb79a9b3d96e4e36e099d841ae602e4aca0da8"
name = "golang.org/x/crypto"
packages = ["ssh/terminal"]
+ pruneopts = "UT"
revision = "a92615f3c49003920a58dedcf32cf55022cefb8d"
[[projects]]
branch = "master"
+ digest = "1:f5aa274a0377f85735edc7fedfb0811d3cbc20af91633797cb359e29c3272271"
name = "golang.org/x/sys"
packages = [
"unix",
- "windows"
+ "windows",
]
+ pruneopts = "UT"
revision = "fa43e7bc11baaae89f3f902b2b4d832b68234844"
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
- inputs-digest =
"f066f174040634f336e9e5268754cff73bbe30be2842a358b92c3d3d969d1ab8"
+ input-imports = ["github.com/sirupsen/logrus"]
solver-name = "gps-cdcl"
solver-version = 1
diff --git a/examples/golang-main-vendor/Makefile
b/examples/golang-main-vendor/Makefile
index f794bc4..06ea478 100644
--- a/examples/golang-main-vendor/Makefile
+++ b/examples/golang-main-vendor/Makefile
@@ -4,8 +4,8 @@ OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11
WSK?=wsk
MAIN=main
PACKAGE=test
-SRCS=src/main/main.go
-VENDORS=src/main/vendor
+SRCS=src/$(MAIN)/$(MAIN).go
+VENDORS=src/$(MAIN)/vendor
NAME=golang-$(MAIN)-vendor
BINZIP=$(MAIN)-bin.zip
SRCZIP=$(MAIN)-src.zip
@@ -17,10 +17,10 @@ devel: package.done $(SRCZIP)
$(WSK) action update $(PACKAGE)/$(NAME) $(SRCZIP) --main $(MAIN)
--docker $(OW_COMPILER)
src/%/vendor:
- cd $(@D) ; GOPATH=$$(realpath $$PWD/../..) dep ensure
+ cd $(@D) ; DEPPROJECTROOT=$(realpath $(@D)/../..) dep ensure
-$(BINZIP): $(SRCS) $(VENDORS)
- cd src ; zip - -r * | docker run -i $(OW_COMPILER) -compile $(MAIN)
>../$(BINZIP)
+$(BINZIP): $(SRCS) $(VENDORS) $(SRCZIP)
+ docker run -i $(OW_COMPILER) -compile $(MAIN) <$(SRCZIP) >$(BINZIP)
$(SRCZIP): $(SRCS) $(VENDORS)
cd src ; zip ../$(SRCZIP) -r *
diff --git a/examples/golang-main-vendor/src/main/Gopkg.lock
b/examples/golang-main-vendor/src/main/Gopkg.lock
index dc881e4..4e31c6b 100644
--- a/examples/golang-main-vendor/src/main/Gopkg.lock
+++ b/examples/golang-main-vendor/src/main/Gopkg.lock
@@ -2,19 +2,24 @@
[[projects]]
+ digest = "1:6342a41a66687c0d0eb1f4d946447bfb808c5136adeb92903ed07972071e19ac"
name = "github.com/rs/zerolog"
packages = [
".",
"internal/cbor",
"internal/json",
- "log"
+ "log",
]
+ pruneopts = "UT"
revision = "338f9bc14084d22cb8eeacd6492861f8449d715c"
version = "v1.9.1"
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
- inputs-digest =
"387058207cd8ac87a2fcfa76447d8bf15f9d64fbcf0b3c7b5f4cb1ced4a753cc"
+ input-imports = [
+ "github.com/rs/zerolog",
+ "github.com/rs/zerolog/log",
+ ]
solver-name = "gps-cdcl"
solver-version = 1
