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 9440589e9905ae0cfea404d40be577ffed716bf1 Author: Michele Sciabarra <[email protected]> AuthorDate: Wed Jul 17 11:53:20 2024 +0200 patching sh for ops --- .gitmodules | 14 ++++++-------- TODO.txt | 29 +++++++++++++++++++++++++++++ shell.nix | 22 +++++++++++++++++++++- tools/sh | 2 +- tools/task | 2 +- 5 files changed, 58 insertions(+), 11 deletions(-) diff --git a/.gitmodules b/.gitmodules index 84babfb..3ebbcc1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,9 @@ +[submodule "tools/task"] + path = tools/task + url = https://github.com/sciabarracom/task +[submodule "tools/sh"] + path = tools/sh + url = https://github.com/sciabarracom/sh [submodule "openserverless-task"] path = openserverless-task url = https://github.com/apache/openserverless-task @@ -10,14 +16,6 @@ path = tools/openwhisk-wskdeploy url = https://github.com/nuvolaris/openwhisk-cli branch = openserverless -[submodule "tools/task"] - path = tools/task - url = https://github.com/nuvolaris/task - branch = openserverless -[submodule "tools/sh"] - path = tools/sh - url = https://github.com/nuvolaris/sh - branch = openserverless [submodule "tools/goawk"] path = tools/goawk url = https://github.com/nuvolaris/goawk diff --git a/TODO.txt b/TODO.txt index e69de29..0a4850d 100644 --- a/TODO.txt +++ b/TODO.txt @@ -0,0 +1,29 @@ +- recompile + +- upgrade task and sh + +rm -Rvf sh task +git submodule update --init --recursive +cd task +git remote add upstream https://github.com/go-task/task +git fetch --all +git rebase v3.38.0 + + +- apply diff one by one to sh and task + +- use coreutils and remove someutils +- run tests and subtests + +- move everything in the ops package and add cmd/ops/main.go +- rename all nuv in ops + +- move the documentation in place + +- implement the retriever +- use the plugins fro aws/azure/etc + + + + + diff --git a/shell.nix b/shell.nix index 3e8ef9d..9daf56f 100644 --- a/shell.nix +++ b/shell.nix @@ -23,6 +23,26 @@ in pkgs.mkShellNoCC { packages = with pkgs; [ - go + go + gotools + gopls + go-outline + gocode + gopkgs + gocode-gomod + godef + golint + silver-searcher + jq ]; + buildInputs = [ + pkgs.uutils-coreutils + (pkgs.writeShellScriptBin "coreutils" '' + #!/bin/bash + exec ${pkgs.uutils-coreutils}/bin/uutils-coreutils "$@" + '') + ]; + shellHook = '' + cat cli.code-workspace | jq '.settings."go.goroot" = "'$(go env GOROOT)'"' >cli.code-workspace + ''; } diff --git a/tools/sh b/tools/sh index d765928..84baa08 160000 --- a/tools/sh +++ b/tools/sh @@ -1 +1 @@ -Subproject commit d7659289f18c4920c4e5f6f823f251813ad220a7 +Subproject commit 84baa08f139fb171b86ff7f25b834d4a3ef19c6f diff --git a/tools/task b/tools/task index 92f33e0..88b0950 160000 --- a/tools/task +++ b/tools/task @@ -1 +1 @@ -Subproject commit 92f33e09542abaf8cdbe76bb1c7615a49c529c24 +Subproject commit 88b095020e14defcce4645e72f503eb5d880f78d
