This is an automated email from the ASF dual-hosted git repository.
msciabarra pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openserverless-cli.git
The following commit(s) were added to refs/heads/main by this push:
new b98983c patches completed
b98983c is described below
commit b98983c4389c3aac6995be0f73907a27fcf3c8dd
Author: Michele Sciabarra <[email protected]>
AuthorDate: Fri Jul 19 16:36:09 2024 +0200
patches completed
---
patches/patch-wsk.sh | 26 ++++++--------------------
patches/patch-wskdeploy.sh | 9 +++------
patches/runtimes_extra.go | 2 ++
tools/wsk | 2 +-
tools/wskdeploy | 2 +-
5 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/patches/patch-wsk.sh b/patches/patch-wsk.sh
index d71215a..4523164 100644
--- a/patches/patch-wsk.sh
+++ b/patches/patch-wsk.sh
@@ -3,13 +3,13 @@ cd "$(dirname $0)"
# any suggestion how to avoid this rename and use just replaces in go.mod is
welcome
HERE=$PWD
STAG="1.2.0"
-DTAG="v$STAG-openserverless"
cd ../tools/wsk
-git reset --hard
+#git reset --hard
git checkout "$STAG" -B openserverless
cp $HERE/i18n_resources.go wski18n/i18n_resources.go
sed -i '/wski18n\/i18n_resources.go/d' .gitignore
git add wski18n/i18n_resources.go
+sed -i -e 's/"wsk"/"ops -wsk"/' commands/wsk.go
find . \( -name \*.go -o -name go.mod \) | while read file
do echo $file
sed -i 's!apache/openwhisk-cli/!sciabarracom/openwhisk-cli/!' $file
@@ -19,27 +19,13 @@ do echo $file
sed -i 's!apache/openwhisk-wskdeploy!sciabarracom/openwhisk-wskdeploy!'
$file
done
go clean -modcache -cache -testcache -fuzzcache
-
sed -i '/openwhisk-wskdeploy/d' go.mod
-sed -i '/openwhisk-client-go/d' go.mod
-
-go get github.com/sciabarracom/openwhisk-wskdeploy@$DTAG
-go get github.com/apache/openwhisk-client-go@$STAG
-
+DEPLOYVER=$(git ls-remote https://github.com/sciabarracom/openwhisk-wskdeploy
| awk '/refs\/heads\/openserverless/{print $1}')
+go get github.com/sciabarracom/openwhisk-wskdeploy@$DEPLOYVER
go mod tidy
git commit -m "patching sh for ops" -a
git push origin-auth openserverless -f
+VER=$(git rev-parse HEAD)
-git tag -d $DTAG
-git tag $DTAG
-git push origin-auth --delete $DTAG
-git push origin-auth $DTAG
-git push origin-auth openserverless
-
-
-# misterious bug here - it is building apache/openwhisk-cli instead
-#echo $CUR
-#go clean -modcache -cache -testcache -fuzzcache
-#CUR=$(git rev-parse $DTAG)
-#GOBIN=$HERE go install github.com/sciabarracom/openwhisk-cli@$DTAG
+GOBIN=$HERE go install github.com/sciabarracom/task/v3/cmd/task@$VER
diff --git a/patches/patch-wskdeploy.sh b/patches/patch-wskdeploy.sh
index 66bceba..9138a77 100644
--- a/patches/patch-wskdeploy.sh
+++ b/patches/patch-wskdeploy.sh
@@ -3,12 +3,12 @@ cd "$(dirname $0)"
# any suggestion how to avoid this rename and use just replaces in go.mod is
welcome
HERE=$PWD
STAG="1.2.0"
-DTAG="v$STAG-openserverless"
cd ../tools/wskdeploy
git checkout "$STAG" -B openserverless
cp $HERE/runtimes_extra.go runtimes/runtimes_extra.go
git add runtimes/runtimes_extra.go
sed -i -e 's/func ParseOpenWhisk/func _ParseOpenWhisk/' runtimes/runtimes.go
+sed -i -e 's/"unset"/"openserverless"/g' main.go
find . \( -name \*.go -o -name go.mod \) | while read file
do echo $file
sed -i 's!apache/openwhisk-wskdeploy!sciabarracom/openwhisk-wskdeploy!'
$file
@@ -17,9 +17,6 @@ go clean -modcache -cache -testcache -fuzzcache
go mod tidy
git commit -m "patching sh for ops" -a
git push origin-auth openserverless -f
-git tag -d $DTAG
-git tag $DTAG
-git push origin-auth --delete $DTAG
-git push origin-auth $DTAG
-GOBIN=$HERE go install github.com/sciabarracom/openwhisk-wskdeploy@$DTAG
+VER=$(git rev-parse HEAD)
+GOBIN=$HERE go install github.com/sciabarracom/openwhisk-wskdeploy@$VER
diff --git a/patches/runtimes_extra.go b/patches/runtimes_extra.go
index 3f376fe..d2a9530 100644
--- a/patches/runtimes_extra.go
+++ b/patches/runtimes_extra.go
@@ -34,6 +34,8 @@ import (
"github.com/apache/openwhisk-wskdeploy/wskprint"
)
+var Version = "openserverless"
+
func GetRuntimesByUrl(opURL string, pop *OpenWhiskInfo) error {
// configure transport
diff --git a/tools/wsk b/tools/wsk
index a732332..f5b08a1 160000
--- a/tools/wsk
+++ b/tools/wsk
@@ -1 +1 @@
-Subproject commit a732332d04d3cb75e8749042d4a753c4ceef90a4
+Subproject commit f5b08a1992ca3d1a286f22dc17199d0a22061018
diff --git a/tools/wskdeploy b/tools/wskdeploy
index 41b6c36..a8f57f1 160000
--- a/tools/wskdeploy
+++ b/tools/wskdeploy
@@ -1 +1 @@
-Subproject commit 41b6c36418c2fbb2127371b27a6abbb9ba730ebe
+Subproject commit a8f57f11e6b19f80afa66cd8c7693388ff22de14
