From 89095cb71d73d099cec0e259626349dc421a195b Mon Sep 17 00:00:00 2001 From: cabrinha Date: Thu, 4 Apr 2024 08:47:16 -0700 Subject: [PATCH 01/10] Helm: Adding new extension --- .gitmodules | 4 ++++ extensions.toml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.gitmodules b/.gitmodules index 1d57cbfac3..919a420a76 100644 --- a/.gitmodules +++ b/.gitmodules @@ -106,6 +106,10 @@ path = extensions/graphql url = https://github.com/11bit/zed-extension-graphql.git +[submodule "extensions/helm"] + path = extensions/helm + url = https://github.com/hjoshi123/helm.zed.git + [submodule "extensions/horizon"] path = extensions/horizon url = https://github.com/ayn2op/zed-horizon.git diff --git a/extensions.toml b/extensions.toml index 511769768b..3e6c70dd62 100644 --- a/extensions.toml +++ b/extensions.toml @@ -141,6 +141,10 @@ submodule = "extensions/zed" path = "extensions/haskell" version = "0.0.1" +[helm] +path = "extensions/helm" +version = "0.0.1" + [horizon] submodule = "extensions/horizon" version = "0.0.1" From 5dd0e849245bdc6f051082443bd1cff231dfbecc Mon Sep 17 00:00:00 2001 From: cabrinha Date: Thu, 4 Apr 2024 08:58:47 -0700 Subject: [PATCH 02/10] submodule add --- .gitmodules | 2 +- extensions/helm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 160000 extensions/helm diff --git a/.gitmodules b/.gitmodules index 919a420a76..6c3252718f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -106,7 +106,7 @@ path = extensions/graphql url = https://github.com/11bit/zed-extension-graphql.git -[submodule "extensions/helm"] +[submodule "helm"] path = extensions/helm url = https://github.com/hjoshi123/helm.zed.git diff --git a/extensions/helm b/extensions/helm new file mode 160000 index 0000000000..b3f0758c50 --- /dev/null +++ b/extensions/helm @@ -0,0 +1 @@ +Subproject commit b3f0758c50f31a44ee13d6fbfa45dff0ef28cf5a From 8e6948990e891dddddd0acc248b86886480c86d2 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Sun, 7 Apr 2024 08:08:32 -0400 Subject: [PATCH 03/10] Update `extensions.toml` to new format --- extensions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions.toml b/extensions.toml index 3e6c70dd62..2690964e49 100644 --- a/extensions.toml +++ b/extensions.toml @@ -142,7 +142,7 @@ path = "extensions/haskell" version = "0.0.1" [helm] -path = "extensions/helm" +submodule = "extensions/helm" version = "0.0.1" [horizon] From 203df1cc818f286ffb8040f67ba2944e643e6d32 Mon Sep 17 00:00:00 2001 From: cabrinha Date: Mon, 8 Apr 2024 21:29:28 -0700 Subject: [PATCH 04/10] modules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 5d40a4e2de..7e50b8c061 100644 --- a/.gitmodules +++ b/.gitmodules @@ -110,7 +110,7 @@ path = extensions/graphql url = https://github.com/11bit/zed-extension-graphql.git -[submodule "helm"] +[submodule "extensions/helm"] path = extensions/helm url = https://github.com/hjoshi123/helm.zed.git From 98e1b50a9826be9d380226a2b45ad582a1093ec0 Mon Sep 17 00:00:00 2001 From: cabrinha Date: Tue, 9 Apr 2024 08:12:37 -0700 Subject: [PATCH 05/10] dupe --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 7e50b8c061..5c5da53f4f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -112,7 +112,7 @@ [submodule "extensions/helm"] path = extensions/helm - url = https://github.com/hjoshi123/helm.zed.git + url = https://github.com/cabrinha/helm.zed.git [submodule "extensions/horizon"] path = extensions/horizon From 0c04df3934cab06ce2074275c8d69149e1ca0dd1 Mon Sep 17 00:00:00 2001 From: cabrinha Date: Tue, 9 Apr 2024 09:13:22 -0700 Subject: [PATCH 06/10] module --- .gitmodules | 4 ---- extensions/helm | 1 - 2 files changed, 5 deletions(-) delete mode 160000 extensions/helm diff --git a/.gitmodules b/.gitmodules index 5c5da53f4f..b6ecb4d1b0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -110,10 +110,6 @@ path = extensions/graphql url = https://github.com/11bit/zed-extension-graphql.git -[submodule "extensions/helm"] - path = extensions/helm - url = https://github.com/cabrinha/helm.zed.git - [submodule "extensions/horizon"] path = extensions/horizon url = https://github.com/ayn2op/zed-horizon.git diff --git a/extensions/helm b/extensions/helm deleted file mode 160000 index b3f0758c50..0000000000 --- a/extensions/helm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b3f0758c50f31a44ee13d6fbfa45dff0ef28cf5a From 10680397421393e0e74af21dd0bbce75f3a8a679 Mon Sep 17 00:00:00 2001 From: cabrinha Date: Tue, 9 Apr 2024 09:16:34 -0700 Subject: [PATCH 07/10] update submodule --- .gitmodules | 4 ++++ extensions/helm | 1 + 2 files changed, 5 insertions(+) create mode 160000 extensions/helm diff --git a/.gitmodules b/.gitmodules index b6ecb4d1b0..5c5da53f4f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -110,6 +110,10 @@ path = extensions/graphql url = https://github.com/11bit/zed-extension-graphql.git +[submodule "extensions/helm"] + path = extensions/helm + url = https://github.com/cabrinha/helm.zed.git + [submodule "extensions/horizon"] path = extensions/horizon url = https://github.com/ayn2op/zed-horizon.git diff --git a/extensions/helm b/extensions/helm new file mode 160000 index 0000000000..afba5cd22a --- /dev/null +++ b/extensions/helm @@ -0,0 +1 @@ +Subproject commit afba5cd22ab3a4520d8c987324315bd44424753e From c626ac87779c8b9608a0fd09a068cbc77814b72d Mon Sep 17 00:00:00 2001 From: cabrinha Date: Mon, 15 Apr 2024 17:20:54 -0700 Subject: [PATCH 08/10] gotmpl --- extensions/helm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/helm b/extensions/helm index afba5cd22a..35115b6e68 160000 --- a/extensions/helm +++ b/extensions/helm @@ -1 +1 @@ -Subproject commit afba5cd22ab3a4520d8c987324315bd44424753e +Subproject commit 35115b6e685cd0861800ef979d4c7f598825f2c2 From 30c8db0f98e42c0d336c21ffbdd6cdf92d8698ff Mon Sep 17 00:00:00 2001 From: cabrinha Date: Thu, 16 May 2024 13:18:40 -0700 Subject: [PATCH 09/10] update submodule with text keyword --- .gitmodules | 7 +++---- extensions/helm | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5c5da53f4f..aef095687e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -110,10 +110,6 @@ path = extensions/graphql url = https://github.com/11bit/zed-extension-graphql.git -[submodule "extensions/helm"] - path = extensions/helm - url = https://github.com/cabrinha/helm.zed.git - [submodule "extensions/horizon"] path = extensions/horizon url = https://github.com/ayn2op/zed-horizon.git @@ -381,3 +377,6 @@ [submodule "extensions/zedspace"] path = extensions/zedspace url = https://github.com/Brunowilliang/zedspace.git +[submodule "helm"] + path = extensions/helm + url = https://github.com/cabrinha/helm.zed.git diff --git a/extensions/helm b/extensions/helm index 35115b6e68..26cf00a319 160000 --- a/extensions/helm +++ b/extensions/helm @@ -1 +1 @@ -Subproject commit 35115b6e685cd0861800ef979d4c7f598825f2c2 +Subproject commit 26cf00a3193348dde3267ae700eedfac730ba176 From ac925e7dce758ef8e2fbf9aa0ebbf793ebe235eb Mon Sep 17 00:00:00 2001 From: cabrinha Date: Thu, 16 May 2024 13:54:30 -0700 Subject: [PATCH 10/10] extensions/helm --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 2fdbb0f3c0..f1b93ed9e3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -178,7 +178,7 @@ path = extensions/gruber-darker url = https://github.com/th0jensen/gruber-darker.zed.git -[submodule "helm"] +[submodule "extensions/helm"] path = extensions/helm url = https://github.com/cabrinha/helm.zed.git