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 2063e68eea7c539480e1dca1c03eb124a8a16fac Author: Michele Sciabarra <[email protected]> AuthorDate: Mon Aug 5 12:31:38 2024 +0200 fix: subshell no more exiting when using utils and tools --- .gitignore | 9 ++++----- _patches/README.md | 3 ++- _patches/patch-sh.sh | 4 +++- _patches/patch-task.sh | 7 +++++-- _patches/patch-wsk.sh | 4 +++- _patches/patch-wskdeploy.sh | 4 +++- _patches/task | 2 +- go.mod | 2 +- go.sum | 4 ++-- 9 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index aa81092..5c05e02 100644 --- a/.gitignore +++ b/.gitignore @@ -36,8 +36,7 @@ tests/prereq/olaris/bin tests/coreutils* tests/7z* !_patch -_patch/task -_patch/gosh -_patch/wsk -_patch/openwhisk-wskdeploy -_patch/openwhisk-cli +_patch/bin/task +_patch/bin/gosh +_patch/bin/wsk +_patch/bin/openwhisk-wskdeploy diff --git a/_patches/README.md b/_patches/README.md index db944d7..465772d 100644 --- a/_patches/README.md +++ b/_patches/README.md @@ -39,11 +39,12 @@ This is the procedure we followed to build the patched versions of: bash patch-wsk.sh 4. regenerate the go.mod/go.sum in top level (using the latest versions if you changed them!) + cd .. rm go.mod go.sum go mod init github.com/apache/openserverless-cli go get github.com/sciabarracom/[email protected] -go get github.com/sciabarracom/task/v3/cmd/[email protected] +go get github.com/sciabarracom/task/v3/cmd/[email protected] go mod tidy go build diff --git a/_patches/patch-sh.sh b/_patches/patch-sh.sh index 76b6040..dc065bc 100644 --- a/_patches/patch-sh.sh +++ b/_patches/patch-sh.sh @@ -45,5 +45,7 @@ git commit -m "patching sh for ops" -a git tag $DTAG git push -f origin-auth openserverless --tags VER=$(git rev-parse --short HEAD) -GOBIN=$HERE go install github.com/sciabarracom/sh/v3/cmd/gosh@$VER +cd .. +mkdir -p bin +GOBIN=$HERE/bin go install github.com/sciabarracom/sh/v3/cmd/gosh@$VER OPS_CMD=$(which ops) OPS_TOOLS="jq awk" OPS_COREUTILS="ls cp mv" TRACE=1 ./gosh diff --git a/_patches/patch-task.sh b/_patches/patch-task.sh index ba78c5c..b6b1b4a 100644 --- a/_patches/patch-task.sh +++ b/_patches/patch-task.sh @@ -22,7 +22,8 @@ HERE=$PWD SHVER=$(git ls-remote https://github.com/sciabarracom/sh | awk '/refs\/heads\/openserverless/{print $1}') STAG="v3.38.0" DTAG="v3.38.10" -cd taskfile +cd task +git reset --hard go clean -cache -modcache git checkout "$STAG" -B openserverless mkdir -p cmd/taskmain @@ -80,5 +81,7 @@ go build 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 +cd .. +mkdir -p bin +GOBIN=$HERE/bin go install github.com/sciabarracom/task/v3/cmd/task@$VER diff --git a/_patches/patch-wsk.sh b/_patches/patch-wsk.sh index 7ae7817..dbee25d 100644 --- a/_patches/patch-wsk.sh +++ b/_patches/patch-wsk.sh @@ -45,5 +45,7 @@ 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 +cd .. +mkdir -p bin +GOBIN=$HERE/bin go install github.com/sciabarracom/openwhisk-cli@$VER diff --git a/_patches/patch-wskdeploy.sh b/_patches/patch-wskdeploy.sh index 2b5cc8b..15a9033 100644 --- a/_patches/patch-wskdeploy.sh +++ b/_patches/patch-wskdeploy.sh @@ -39,5 +39,7 @@ git commit -m "patching sh for ops" -a 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 +cd .. +mkdir -p bin +GOBIN=$HERE/bin go install github.com/sciabarracom/openwhisk-wskdeploy@$VER diff --git a/_patches/task b/_patches/task index 781bf85..2c3fdce 160000 --- a/_patches/task +++ b/_patches/task @@ -1 +1 @@ -Subproject commit 781bf859e75a764fc76f59f76f830ec8e7d7003d +Subproject commit 2c3fdcebad1da59613ec3e30d6fb96fac35e167c diff --git a/go.mod b/go.mod index b9f5af0..0a81b76 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/sciabarracom/openwhisk-cli v1.2.1 github.com/sciabarracom/sh/v3 v3.8.3 - github.com/sciabarracom/task/v3 v3.38.9 + github.com/sciabarracom/task/v3 v3.38.10 github.com/stretchr/testify v1.9.0 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 github.com/zalando/go-keyring v0.2.5 diff --git a/go.sum b/go.sum index 7c90fc2..6f1a296 100644 --- a/go.sum +++ b/go.sum @@ -345,8 +345,8 @@ github.com/sciabarracom/openwhisk-wskdeploy v1.2.1 h1:t5hgca9OFEO39t4OqIxcWybYRj github.com/sciabarracom/openwhisk-wskdeploy v1.2.1/go.mod h1:bWjrIOIAzt8AcPqiJ0mWEecUxXbT4bY4ysMlJO6/q78= github.com/sciabarracom/sh/v3 v3.8.3 h1:5afHdZzNkW5vgUMP7gHUpBYHezn3BoQsyNgKXKdTpkM= github.com/sciabarracom/sh/v3 v3.8.3/go.mod h1:CeMVr3PRLhlUrS+VPLTp8dS5/6xNzmmX0h/WVHRR6DA= -github.com/sciabarracom/task/v3 v3.38.9 h1:LozhBEsGQGYKJCAhOE+0s22IF92DATMNDU/RMzpbSCw= -github.com/sciabarracom/task/v3 v3.38.9/go.mod h1:V88FdSzukQ90H9nzqexBsmBRXpoEpJGsVPMoOnkAsWc= +github.com/sciabarracom/task/v3 v3.38.10 h1:KSu6B2CuHWail7rlTx5W72qM1klJbED3z2k7RzBvMkE= +github.com/sciabarracom/task/v3 v3.38.10/go.mod h1:EMjHs6YrTofApnomes/CNiGQ1odZUZF6PTqmYW9EBic= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
