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 85d9ea68f72cdfac24b3c0e33277d8bfa071291b Author: Michele Sciabarra <[email protected]> AuthorDate: Mon Jul 22 13:18:56 2024 +0200 patching sh for ops --- .gitmodules | 14 ++++++------ {patches => _patches}/.gitignore | 0 {patches => _patches}/README.md | 0 {patches => _patches}/builtin_extra.go | 0 {tools => _patches}/envsubst | 0 {tools => _patches}/goawk | 0 {tools => _patches}/gojq | 0 {patches => _patches}/i18n_resources.go | 0 {patches => _patches}/opsfile.yml | 0 {patches => _patches}/patch-sh.sh | 4 +++- {patches => _patches}/patch-task.sh | 0 {patches => _patches}/patch-wsk.sh | 0 {patches => _patches}/patch-wskdeploy.sh | 0 {patches => _patches}/runtimes.go | 10 ++++----- {patches => _patches}/runtimes_extra.go | 0 {tools => _patches}/sh | 0 tools/task => _patches/taskfile | 0 _patches/update-gomod.sh | 23 ++++++++++++++++++++ {tools => _patches}/wsk | 0 {tools => _patches}/wskdeploy | 0 go.mod | 37 +++++++++++++++----------------- patches/update-gomod.sh | 7 ------ 22 files changed, 55 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index f6f96cf..b7b49a9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "tools/task"] - path = tools/task + path = _patches/taskfile url = https://github.com/sciabarracom/task branch = openserverless [submodule "tools/sh"] - path = tools/sh + path = _patches/sh url = https://github.com/sciabarracom/sh branch = openserverless [submodule "openserverless-task"] @@ -11,20 +11,20 @@ url = https://github.com/apache/openserverless-task branch = main [submodule "tools/goawk"] - path = tools/goawk + path = _patches/goawk url = https://github.com/nuvolaris/goawk branch = openserverless [submodule "tools/gojq"] - path = tools/gojq + path = _patches/gojq url = https://github.com/nuvolaris/gojq branch = openserverless [submodule "tools/envsubst"] - path = tools/envsubst + path = _patches/envsubst url = https://github.com/nuvolaris/envsubst branch = openserverless [submodule "tools/wsk"] - path = tools/wsk + path = _patches/wsk url = https://github.com/sciabarracom/openwhisk-cli [submodule "tools/wskdeploy"] - path = tools/wskdeploy + path = _patches/wskdeploy url = https://github.com/sciabarracom/openwhisk-wskdeploy diff --git a/patches/.gitignore b/_patches/.gitignore similarity index 100% rename from patches/.gitignore rename to _patches/.gitignore diff --git a/patches/README.md b/_patches/README.md similarity index 100% rename from patches/README.md rename to _patches/README.md diff --git a/patches/builtin_extra.go b/_patches/builtin_extra.go similarity index 100% rename from patches/builtin_extra.go rename to _patches/builtin_extra.go diff --git a/tools/envsubst b/_patches/envsubst similarity index 100% rename from tools/envsubst rename to _patches/envsubst diff --git a/tools/goawk b/_patches/goawk similarity index 100% rename from tools/goawk rename to _patches/goawk diff --git a/tools/gojq b/_patches/gojq similarity index 100% rename from tools/gojq rename to _patches/gojq diff --git a/patches/i18n_resources.go b/_patches/i18n_resources.go similarity index 100% rename from patches/i18n_resources.go rename to _patches/i18n_resources.go diff --git a/patches/opsfile.yml b/_patches/opsfile.yml similarity index 100% rename from patches/opsfile.yml rename to _patches/opsfile.yml diff --git a/patches/patch-sh.sh b/_patches/patch-sh.sh similarity index 91% rename from patches/patch-sh.sh rename to _patches/patch-sh.sh index 7684079..3b9ff7c 100644 --- a/patches/patch-sh.sh +++ b/_patches/patch-sh.sh @@ -4,6 +4,7 @@ cd "$(dirname $0)" go clean -cache -modcache -testcache HERE=$PWD STAG="v3.8.0" +DTAG="v3.8.1" cd ../tools/sh git checkout "$STAG" -B openserverless cp $HERE/builtin_extra.go interp/builtin_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 -f origin-auth openserverless +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 diff --git a/patches/patch-task.sh b/_patches/patch-task.sh similarity index 100% rename from patches/patch-task.sh rename to _patches/patch-task.sh diff --git a/patches/patch-wsk.sh b/_patches/patch-wsk.sh similarity index 100% rename from patches/patch-wsk.sh rename to _patches/patch-wsk.sh diff --git a/patches/patch-wskdeploy.sh b/_patches/patch-wskdeploy.sh similarity index 100% rename from patches/patch-wskdeploy.sh rename to _patches/patch-wskdeploy.sh diff --git a/patches/runtimes.go b/_patches/runtimes.go similarity index 96% rename from patches/runtimes.go rename to _patches/runtimes.go index 90f927e..63088a4 100644 --- a/patches/runtimes.go +++ b/_patches/runtimes.go @@ -28,11 +28,11 @@ import ( "strings" "time" - "github.com/apache/openwhisk-client-go/whisk" - "github.com/apache/openwhisk-wskdeploy/utils" - "github.com/apache/openwhisk-wskdeploy/wskderrors" - "github.com/apache/openwhisk-wskdeploy/wski18n" - "github.com/apache/openwhisk-wskdeploy/wskprint" + "github.com/sciabarracom/openwhisk-client-go/whisk" + "github.com/sciabarracom/openwhisk-wskdeploy/utils" + "github.com/sciabarracom/openwhisk-wskdeploy/wskderrors" + "github.com/sciabarracom/openwhisk-wskdeploy/wski18n" + "github.com/sciabarracom/openwhisk-wskdeploy/wskprint" ) const ( diff --git a/patches/runtimes_extra.go b/_patches/runtimes_extra.go similarity index 100% rename from patches/runtimes_extra.go rename to _patches/runtimes_extra.go diff --git a/tools/sh b/_patches/sh similarity index 100% rename from tools/sh rename to _patches/sh diff --git a/tools/task b/_patches/taskfile similarity index 100% rename from tools/task rename to _patches/taskfile diff --git a/_patches/update-gomod.sh b/_patches/update-gomod.sh new file mode 100644 index 0000000..3f9d7d2 --- /dev/null +++ b/_patches/update-gomod.sh @@ -0,0 +1,23 @@ +cd "$(dirname $0)"/.. +#git ls-remote https://github.com/sciabarracom/task | awk '/refs\/heads\/openserverless/{print $1}' >_task.hash +#git ls-remote https://github.com/sciabarracom/openwhisk-cli | awk '/refs\/heads\/openserverless/{print $1}' >_wsk.hash +#go get github.com/sciabarracom/task/v3@$(cat _task.hash) +#go get github.com/sciabarracom/openwhisk-cli@$(cat _wsk.hash) +#go mod tidy + + +go clean -cache -modcache +git ls-remote https://github.com/sciabarracom/sh | awk '/refs\/heads\/openserverless/{print $1}' | tee _sh.hash +go get github.com/sciabarracom/sh/v3@$(cat _sh.hash) + +git ls-remote https://github.com/sciabarracom/task | awk '/refs\/heads\/openserverless/{print $1}' | tee _task.hash +go get github.com/sciabarracom/task/v3@$(cat _task.hash) + +git ls-remote https://github.com/sciabarracom/openwhisk-wskdeploy | awk '/refs\/heads\/openserverless/{print $1}' | tee _wskdeploy.hash +go get github.com/sciabarracom/openwhisk-wskdeploy@$(cat _wskdeploy.hash) + +git ls-remote https://github.com/sciabarracom/openwhisk-cli | awk '/refs\/heads\/openserverless/{print $1}' | tee _wsk.hash + +go get github.com/sciabarracom/openwhisk-cli@$(cat _wsk.hash) + +go mod tidy diff --git a/tools/wsk b/_patches/wsk similarity index 100% rename from tools/wsk rename to _patches/wsk diff --git a/tools/wskdeploy b/_patches/wskdeploy similarity index 100% rename from tools/wskdeploy rename to _patches/wskdeploy diff --git a/go.mod b/go.mod index b6d7f84..6729da3 100644 --- a/go.mod +++ b/go.mod @@ -1,29 +1,26 @@ module github.com/apache/openserverless-cli -go 1.21.0 - -toolchain go1.21.11 +go 1.21.11 require ( github.com/Masterminds/semver v1.5.0 - github.com/apache/openwhisk-client-go v0.0.0-20220811044404-a6921af2f086 + github.com/apache/openwhisk-client-go v0.0.0-20230421081559-13fc65f65684 github.com/cenkalti/backoff/v4 v4.3.0 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 - github.com/go-git/go-git/v5 v5.9.0 + github.com/go-git/go-git/v5 v5.12.0 github.com/google/uuid v1.6.0 github.com/h2non/filetype v1.1.3 - github.com/itchyny/gojq v0.12.13 + github.com/itchyny/gojq v0.12.16 github.com/mitchellh/go-homedir v1.1.0 - github.com/nicksnyder/go-i18n v1.10.1 + github.com/nicksnyder/go-i18n v1.10.3 github.com/nuvolaris/envsubst/cmd/envsubstmain v0.0.0-20230603163828-10ca029cdb58 github.com/nuvolaris/go-replace v0.0.0-20230515190028-12766da1824c - github.com/nuvolaris/goawk v1.21.1-0.20230314201833-d0931fd55c2c + github.com/nuvolaris/goawk v1.21.1 github.com/nuvolaris/gron v0.0.0-20231020134423-84e679ea6aad github.com/nuvolaris/jj v0.0.0-20231020143327-10b90948a5d2 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c - github.com/sciabarracom/openwhisk-cli v0.0.0-20240722090924-4c0fb99f0355 - github.com/sciabarracom/sh/v3 v3.8.1-0.20240719132627-8b997d445efa - github.com/sciabarracom/task/v3 v3.38.1-0.20240719132837-9f75ee2eb9d9 + github.com/sciabarracom/openwhisk-cli v1.2.1-openserverless + github.com/sciabarracom/task/v3 v3.38.1 github.com/stretchr/testify v1.9.0 github.com/zalando/go-keyring v0.2.5 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 @@ -38,12 +35,11 @@ require ( github.com/Masterminds/semver/v3 v3.2.1 // indirect github.com/Masterminds/sprig v2.22.0+incompatible // indirect github.com/Microsoft/go-winio v0.6.1 // indirect - github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect + github.com/ProtonMail/go-crypto v1.0.0 // indirect github.com/a8m/envsubst v1.4.2 // indirect - github.com/acomagu/bufpipe v1.0.4 // indirect github.com/alecthomas/chroma/v2 v2.14.0 // indirect github.com/alessio/shellescape v1.4.1 // indirect - github.com/cloudflare/circl v1.3.3 // indirect + github.com/cloudflare/circl v1.3.7 // indirect github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 // indirect github.com/cyphar/filepath-securejoin v0.2.4 // indirect github.com/danieljoos/wincred v1.2.0 // indirect @@ -64,7 +60,7 @@ require ( github.com/huandu/xstrings v1.3.2 // indirect github.com/imdario/mergo v0.3.13 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect - github.com/itchyny/timefmt-go v0.1.5 // indirect + github.com/itchyny/timefmt-go v0.1.6 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/jessevdk/go-flags v1.5.0 // indirect github.com/joho/godotenv v1.5.1 // indirect @@ -72,7 +68,7 @@ require ( github.com/klauspost/cpuid/v2 v2.0.9 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/mattn/go-runewidth v0.0.14 // indirect + github.com/mattn/go-runewidth v0.0.15 // indirect github.com/mattn/go-zglob v0.0.4 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect @@ -84,11 +80,12 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/radovskyb/watcher v1.0.7 // indirect github.com/remeh/sizedwaitgroup v1.0.0 // indirect - github.com/rivo/uniseg v0.4.4 // indirect + github.com/rivo/uniseg v0.4.7 // indirect github.com/sajari/fuzzy v1.0.0 // indirect - github.com/sciabarracom/openwhisk-wskdeploy v0.0.0-20240722090825-60e821cec51f // indirect - github.com/sergi/go-diff v1.1.0 // indirect - github.com/skeema/knownhosts v1.2.0 // indirect + github.com/sciabarracom/openwhisk-wskdeploy v1.2.0-openserverless // indirect + github.com/sciabarracom/sh/v3 v3.8.1-0.20240719132627-8b997d445efa // indirect + github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect + github.com/skeema/knownhosts v1.2.2 // indirect github.com/spf13/cobra v1.1.3 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/tidwall/gjson v1.14.0 // indirect diff --git a/patches/update-gomod.sh b/patches/update-gomod.sh deleted file mode 100644 index 5e47c69..0000000 --- a/patches/update-gomod.sh +++ /dev/null @@ -1,7 +0,0 @@ -cd "$(dirname $0)"/.. -git ls-remote https://github.com/sciabarracom/task | awk '/refs\/heads\/openserverless/{print $1}' >_task.hash -git ls-remote https://github.com/sciabarracom/openwhisk-cli | awk '/refs\/heads\/openserverless/{print $1}' >_wsk.hash -go get github.com/sciabarracom/task/v3@$(cat _task.hash) -go get github.com/sciabarracom/openwhisk-cli@$(cat _wsk.hash) -go mod tidy -
