File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -36,8 +36,7 @@ tests/prereq/olaris/bin
3636tests /coreutils *
3737tests /7z *
3838! _patch
39- _patch /task
40- _patch /gosh
41- _patch /wsk
42- _patch /openwhisk-wskdeploy
43- _patch /openwhisk-cli
39+ _patch /bin /task
40+ _patch /bin /gosh
41+ _patch /bin /wsk
42+ _patch /bin /openwhisk-wskdeploy
Original file line number Diff line number Diff line change @@ -39,11 +39,12 @@ This is the procedure we followed to build the patched versions of:
3939 bash patch-wsk.sh
4040
41414 . regenerate the go.mod/go.sum in top level (using the latest versions if you changed them!)
42+
4243cd ..
4344rm go.mod go.sum
4445go mod init github.com/apache/openserverless-cli
4546go get github.com/sciabarracom/openwhisk-cli@v1.2.1
46- go get github.com/sciabarracom/task/v3/cmd/taskmain@v3.38.9
47+ go get github.com/sciabarracom/task/v3/cmd/taskmain@v3.38.10
4748go mod tidy
4849go build
4950
Original file line number Diff line number Diff line change @@ -45,5 +45,7 @@ git commit -m "patching sh for ops" -a
4545git tag $DTAG
4646git push -f origin-auth openserverless --tags
4747VER=$( git rev-parse --short HEAD)
48- GOBIN=$HERE go install github.com/sciabarracom/sh/v3/cmd/gosh@$VER
48+ cd ..
49+ mkdir -p bin
50+ GOBIN=$HERE /bin go install github.com/sciabarracom/sh/v3/cmd/gosh@$VER
4951OPS_CMD=$( which ops) OPS_TOOLS=" jq awk" OPS_COREUTILS=" ls cp mv" TRACE=1 ./gosh
Original file line number Diff line number Diff line change @@ -22,7 +22,8 @@ HERE=$PWD
2222SHVER=$( git ls-remote https://github.com/sciabarracom/sh | awk ' /refs\/heads\/openserverless/{print $1}' )
2323STAG=" v3.38.0"
2424DTAG=" v3.38.10"
25- cd taskfile
25+ cd task
26+ git reset --hard
2627go clean -cache -modcache
2728git checkout " $STAG " -B openserverless
2829mkdir -p cmd/taskmain
@@ -80,5 +81,7 @@ go build
8081git tag $DTAG
8182git push origin-auth openserverless -f --tags
8283VER=$( git rev-parse HEAD)
83- GOBIN=$HERE go install github.com/sciabarracom/task/v3/cmd/task@$VER
84+ cd ..
85+ mkdir -p bin
86+ GOBIN=$HERE /bin go install github.com/sciabarracom/task/v3/cmd/task@$VER
8487
Original file line number Diff line number Diff line change @@ -45,5 +45,7 @@ git tag $DTAG
4545git push origin-auth openserverless -f --tags
4646go clean -modcache -cache -testcache -fuzzcache
4747VER=$( git rev-parse HEAD)
48- GOBIN=$HERE go install github.com/sciabarracom/openwhisk-cli@$VER
48+ cd ..
49+ mkdir -p bin
50+ GOBIN=$HERE /bin go install github.com/sciabarracom/openwhisk-cli@$VER
4951
Original file line number Diff line number Diff line change @@ -39,5 +39,7 @@ git commit -m "patching sh for ops" -a
3939git tag $DTAG
4040git push origin-auth openserverless -f --tags
4141VER=$( git rev-parse HEAD)
42- GOBIN=$HERE go install github.com/sciabarracom/openwhisk-wskdeploy@$VER
42+ cd ..
43+ mkdir -p bin
44+ GOBIN=$HERE /bin go install github.com/sciabarracom/openwhisk-wskdeploy@$VER
4345
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ require (
2121 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
2222 github.com/sciabarracom/openwhisk-cli v1.2.1
2323 github.com/sciabarracom/sh/v3 v3.8.3
24- github.com/sciabarracom/task/v3 v3.38.9
24+ github.com/sciabarracom/task/v3 v3.38.10
2525 github.com/stretchr/testify v1.9.0
2626 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8
2727 github.com/zalando/go-keyring v0.2.5
Original file line number Diff line number Diff line change @@ -345,8 +345,8 @@ github.com/sciabarracom/openwhisk-wskdeploy v1.2.1 h1:t5hgca9OFEO39t4OqIxcWybYRj
345345github.com/sciabarracom/openwhisk-wskdeploy v1.2.1 /go.mod h1:bWjrIOIAzt8AcPqiJ0mWEecUxXbT4bY4ysMlJO6/q78 =
346346github.com/sciabarracom/sh/v3 v3.8.3 h1:5afHdZzNkW5vgUMP7gHUpBYHezn3BoQsyNgKXKdTpkM =
347347github.com/sciabarracom/sh/v3 v3.8.3 /go.mod h1:CeMVr3PRLhlUrS+VPLTp8dS5/6xNzmmX0h/WVHRR6DA =
348- github.com/sciabarracom/task/v3 v3.38.9 h1:LozhBEsGQGYKJCAhOE+0s22IF92DATMNDU/RMzpbSCw =
349- github.com/sciabarracom/task/v3 v3.38.9 /go.mod h1:V88FdSzukQ90H9nzqexBsmBRXpoEpJGsVPMoOnkAsWc =
348+ github.com/sciabarracom/task/v3 v3.38.10 h1:KSu6B2CuHWail7rlTx5W72qM1klJbED3z2k7RzBvMkE =
349+ github.com/sciabarracom/task/v3 v3.38.10 /go.mod h1:EMjHs6YrTofApnomes/CNiGQ1odZUZF6PTqmYW9EBic =
350350github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 /go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc =
351351github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8 =
352352github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 /go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4 =
You can’t perform that action at this time.
0 commit comments