You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/10/25 00:51:19 UTC
[GitHub] csantanapr closed pull request #56: use compiler image for
golang-main-package devel target
csantanapr closed pull request #56: use compiler image for golang-main-package devel target
URL: https://github.com/apache/incubator-openwhisk-runtime-go/pull/56
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/examples/bash-hello/Makefile b/examples/bash-hello/Makefile
index 8fa3945..f0e4914 100644
--- a/examples/bash-hello/Makefile
+++ b/examples/bash-hello/Makefile
@@ -16,6 +16,7 @@ test: test.json
clean:
-$(WSK) action delete $(PACKAGE)/$(NAME)
+ -rm package.done test.json
package.done:
$(WSK) package update $(PACKAGE)
diff --git a/examples/golang-hello-single/Makefile b/examples/golang-hello-single/Makefile
index e02f3dd..c88906a 100644
--- a/examples/golang-hello-single/Makefile
+++ b/examples/golang-hello-single/Makefile
@@ -19,7 +19,7 @@ $(ZIP): $(SRC)
clean:
-$(WSK) action delete $(PACKAGE)/$(NAME)
- -rm $(ZIP) package.done
+ -rm $(ZIP) package.done test.json
test: test.json
$(WSK) action invoke test/$(NAME) -r
diff --git a/examples/golang-hello-vendor/Makefile b/examples/golang-hello-vendor/Makefile
index 8d76f26..89f434d 100644
--- a/examples/golang-hello-vendor/Makefile
+++ b/examples/golang-hello-vendor/Makefile
@@ -17,7 +17,7 @@ devel: package.done $(SRCZIP)
$(WSK) action update $(PACKAGE)/$(NAME) $(SRCZIP) --main $(MAIN) --docker $(OW_COMPILER)
src/%/vendor:
- cd $(@D) ; GOPATH=$$PWD/../.. dep ensure
+ cd $(@D) ; GOPATH=$$(realpath $$PWD/../..) dep ensure
$(BINZIP): $(SRCS) $(VENDORS)
cd src ; zip - -r * | docker run -i $(OW_COMPILER) -compile $(MAIN) >../$(BINZIP)
@@ -26,8 +26,11 @@ $(SRCZIP): $(SRCS) $(VENDORS)
cd src ; zip ../$(SRCZIP) -r *
clean:
- -$(WSK)action delete $(PACKAGE)/$(NAME)
- -rm $(BINZIP) $(SRCZIP) package.done
+ -$(WSK) action delete $(PACKAGE)/$(NAME)
+ -rm $(BINZIP) $(SRCZIP) package.done test.json
+
+clean_vendor:
+ -rm -r $(VENDORS)
test: test.json
$(WSK) action invoke test/$(NAME) -r
diff --git a/examples/golang-hello-vendor/src/hello/Gopkg.lock b/examples/golang-hello-vendor/src/hello/Gopkg.lock
index e516dc9..055cdac 100644
--- a/examples/golang-hello-vendor/src/hello/Gopkg.lock
+++ b/examples/golang-hello-vendor/src/hello/Gopkg.lock
@@ -2,43 +2,35 @@
[[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
- input-imports = ["github.com/sirupsen/logrus"]
+ inputs-digest = "f066f174040634f336e9e5268754cff73bbe30be2842a358b92c3d3d969d1ab8"
solver-name = "gps-cdcl"
solver-version = 1
diff --git a/examples/golang-main-package/Makefile b/examples/golang-main-package/Makefile
index 7677d2e..c097852 100644
--- a/examples/golang-main-package/Makefile
+++ b/examples/golang-main-package/Makefile
@@ -13,7 +13,7 @@ deploy: package.done $(BINZIP)
$(WSK) action update $(PACKAGE)/$(NAME) $(BINZIP) --main $(MAIN) --docker $(OW_RUNTIME)
devel: package.done $(SRCZIP)
- $(WSK) action update $(PACKAGE)/$(NAME) $(SRCZIP) --main $(MAIN) --docker $(OW_RUNTIME)
+ $(WSK) action update $(PACKAGE)/$(NAME) $(SRCZIP) --main $(MAIN) --docker $(OW_COMPILER)
$(BINZIP): $(SRCS)
cd src ; zip - -r * | docker run -i $(OW_COMPILER) -compile $(MAIN) >../$(BINZIP)
@@ -23,7 +23,7 @@ $(SRCZIP): $(SRCS)
clean:
-$(WSK) action delete $(PACKAGE)/$(NAME)
- -rm $(BINZIP) $(SRCZIP) package.done
+ -rm $(BINZIP) $(SRCZIP) package.done test.json
test: test.json
$(WSK) action invoke test/$(NAME) -r
diff --git a/examples/golang-main-single/Makefile b/examples/golang-main-single/Makefile
index 8d49674..64e2415 100644
--- a/examples/golang-main-single/Makefile
+++ b/examples/golang-main-single/Makefile
@@ -19,7 +19,7 @@ $(ZIP): $(SRC)
clean:
-$(WSK) action delete $(PACKAGE)/$(NAME)
- -rm $(ZIP) package.done
+ -rm $(ZIP) package.done test.json
test: test.json
$(WSK) action invoke test/$(NAME) -r
diff --git a/examples/golang-main-standalone/Makefile b/examples/golang-main-standalone/Makefile
index 42f41fa..f7a8ec4 100644
--- a/examples/golang-main-standalone/Makefile
+++ b/examples/golang-main-standalone/Makefile
@@ -19,7 +19,7 @@ $(ZIP): $(SRC)
clean:
-$(WSK) action delete $(PACKAGE)/$(NAME)
- -rm $(ZIP) package.done
+ -rm $(ZIP) package.done test.json
test: test.json
$(WSK) action invoke test/$(NAME) -r
diff --git a/examples/golang-main-vendor/Makefile b/examples/golang-main-vendor/Makefile
index 98a0931..f794bc4 100644
--- a/examples/golang-main-vendor/Makefile
+++ b/examples/golang-main-vendor/Makefile
@@ -4,7 +4,7 @@ OW_COMPILER?=$(OW_USER)/actionloop-golang-v1.11
WSK?=wsk
MAIN=main
PACKAGE=test
-SRCS=src/main/main.go
+SRCS=src/main/main.go
VENDORS=src/main/vendor
NAME=golang-$(MAIN)-vendor
BINZIP=$(MAIN)-bin.zip
@@ -17,7 +17,7 @@ devel: package.done $(SRCZIP)
$(WSK) action update $(PACKAGE)/$(NAME) $(SRCZIP) --main $(MAIN) --docker $(OW_COMPILER)
src/%/vendor:
- cd $(@D) ; GOPATH=$$PWD/../.. dep ensure
+ cd $(@D) ; GOPATH=$$(realpath $$PWD/../..) dep ensure
$(BINZIP): $(SRCS) $(VENDORS)
cd src ; zip - -r * | docker run -i $(OW_COMPILER) -compile $(MAIN) >../$(BINZIP)
@@ -27,7 +27,10 @@ $(SRCZIP): $(SRCS) $(VENDORS)
clean:
-$(WSK) action delete $(PACKAGE)/$(NAME)
- -rm $(BINZIP) $(SRCZIP) package.done
+ -rm $(BINZIP) $(SRCZIP) package.done test.json
+
+clean_vendor:
+ -rm -r $(VENDORS)
test: test.json
$(WSK) action invoke test/$(NAME) -r
diff --git a/examples/golang-main-vendor/src/main/Gopkg.lock b/examples/golang-main-vendor/src/main/Gopkg.lock
index 4e31c6b..dc881e4 100644
--- a/examples/golang-main-vendor/src/main/Gopkg.lock
+++ b/examples/golang-main-vendor/src/main/Gopkg.lock
@@ -2,24 +2,19 @@
[[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
- input-imports = [
- "github.com/rs/zerolog",
- "github.com/rs/zerolog/log",
- ]
+ inputs-digest = "387058207cd8ac87a2fcfa76447d8bf15f9d64fbcf0b3c7b5f4cb1ced4a753cc"
solver-name = "gps-cdcl"
solver-version = 1
----------------------------------------------------------------
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