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
commit fa9a2f911852425f05508859414158d8fa62da9d Author: Michele Sciabarra <[email protected]> AuthorDate: Mon Jul 22 13:39:55 2024 +0200 retagging everything --- .gitmodules | 3 +++ _patches/_sh.hash | 1 + _patches/_wsk.hash | 1 + _patches/patch-sh.sh | 2 +- _patches/patch-task.sh | 6 ++++-- _patches/patch-wsk.sh | 6 ++++-- _patches/patch-wskdeploy.sh | 6 ++++-- _patches/sh | 2 +- _patches/task | Bin 0 -> 16907614 bytes _patches/taskfile | 1 - _patches/wsk | 2 +- _patches/wskdeploy | 2 +- 12 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.gitmodules b/.gitmodules index b7b49a9..02ff1cc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,3 +28,6 @@ [submodule "tools/wskdeploy"] path = _patches/wskdeploy url = https://github.com/sciabarracom/openwhisk-wskdeploy +[submodule "_patches/sh"] + path = _patches/sh + url = https://github.com/sciabarracom/sh diff --git a/_patches/_sh.hash b/_patches/_sh.hash new file mode 100644 index 0000000..c0d81e7 --- /dev/null +++ b/_patches/_sh.hash @@ -0,0 +1 @@ +8b997d445efad982d2b023d3d62d891ef80ba1d5 diff --git a/_patches/_wsk.hash b/_patches/_wsk.hash new file mode 100644 index 0000000..c0d81e7 --- /dev/null +++ b/_patches/_wsk.hash @@ -0,0 +1 @@ +8b997d445efad982d2b023d3d62d891ef80ba1d5 diff --git a/_patches/patch-sh.sh b/_patches/patch-sh.sh index 3b9ff7c..26aa544 100644 --- a/_patches/patch-sh.sh +++ b/_patches/patch-sh.sh @@ -5,7 +5,7 @@ go clean -cache -modcache -testcache HERE=$PWD STAG="v3.8.0" DTAG="v3.8.1" -cd ../tools/sh +cd sh git checkout "$STAG" -B openserverless cp $HERE/builtin_extra.go interp/builtin_extra.go git add interp/builtin_extra.go diff --git a/_patches/patch-task.sh b/_patches/patch-task.sh index 6a1c1f5..4f117db 100644 --- a/_patches/patch-task.sh +++ b/_patches/patch-task.sh @@ -4,7 +4,8 @@ cd "$(dirname $0)" HERE=$PWD SHVER=$(git ls-remote https://github.com/sciabarracom/sh | awk '/refs\/heads\/openserverless/{print $1}') STAG="v3.38.0" -cd ../tools/task +DTAG="v3.38.1" +cd taskfile git checkout "$STAG" -B openserverless mkdir -p cmd/taskmain cat cmd/task/task.go \ @@ -25,7 +26,8 @@ sed -i -e '/mvdan.cc/g' go.mod go get github.com/sciabarracom/sh/v3@$SHVER go mod tidy git commit -m "patching sh for ops" -a -git push origin-auth openserverless -f +git tag $DTAG +git push origin-auth openserverless -f --tags VER=$(git rev-parse HEAD) GOBIN=$HERE go install github.com/sciabarracom/task/v3/cmd/task@$VER diff --git a/_patches/patch-wsk.sh b/_patches/patch-wsk.sh index 52d9fc4..2e5fe76 100644 --- a/_patches/patch-wsk.sh +++ b/_patches/patch-wsk.sh @@ -3,7 +3,8 @@ 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" -cd ../tools/wsk +DTAG="v1.2.1" +cd wsk #git reset --hard git checkout "$STAG" -B openserverless cp $HERE/i18n_resources.go wski18n/i18n_resources.go @@ -23,7 +24,8 @@ DEPLOYVER=$(git ls-remote https://github.com/sciabarracom/openwhisk-wskdeploy | 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 +git tag $DTAG +git push origin-auth openserverless -f --tags go clean -modcache -cache -testcache -fuzzcache VER=$(git rev-parse HEAD) GOBIN=$HERE go install github.com/sciabarracom/openwhisk-cli@$VER diff --git a/_patches/patch-wskdeploy.sh b/_patches/patch-wskdeploy.sh index 9138a77..643adb0 100644 --- a/_patches/patch-wskdeploy.sh +++ b/_patches/patch-wskdeploy.sh @@ -3,7 +3,8 @@ 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" -cd ../tools/wskdeploy +DTAG="v1.2.1" +cd wskdeploy git checkout "$STAG" -B openserverless cp $HERE/runtimes_extra.go runtimes/runtimes_extra.go git add runtimes/runtimes_extra.go @@ -16,7 +17,8 @@ done 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 $DTAG +git push origin-auth openserverless -f --tags VER=$(git rev-parse HEAD) GOBIN=$HERE go install github.com/sciabarracom/openwhisk-wskdeploy@$VER diff --git a/_patches/sh b/_patches/sh index 8b997d4..da753fd 160000 --- a/_patches/sh +++ b/_patches/sh @@ -1 +1 @@ -Subproject commit 8b997d445efad982d2b023d3d62d891ef80ba1d5 +Subproject commit da753fd27b1ff147f5c8f1dae46676ad5a062ee2 diff --git a/_patches/task b/_patches/task new file mode 100755 index 0000000..84708dd Binary files /dev/null and b/_patches/task differ diff --git a/_patches/taskfile b/_patches/taskfile deleted file mode 160000 index 9f75ee2..0000000 --- a/_patches/taskfile +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9f75ee2eb9d96798ff6fdc05535400343cdabb31 diff --git a/_patches/wsk b/_patches/wsk index 4c0fb99..39db77e 160000 --- a/_patches/wsk +++ b/_patches/wsk @@ -1 +1 @@ -Subproject commit 4c0fb99f0355006951312368c2c2a3133ccbcd17 +Subproject commit 39db77e21ff61258d72baa48e4ccbb66005cf44b diff --git a/_patches/wskdeploy b/_patches/wskdeploy index 60e821c..67c642d 160000 --- a/_patches/wskdeploy +++ b/_patches/wskdeploy @@ -1 +1 @@ -Subproject commit 60e821cec51fd0661af33b48097489c924c1ffdc +Subproject commit 67c642d0ac144727e9cd80efdea1d73cea04dce2
