From 22e3516862c3521d8ab9d98e4f2da9261ca8f7b6 Mon Sep 17 00:00:00 2001 From: Artem Kladov Date: Wed, 20 Mar 2024 18:12:42 +0300 Subject: [PATCH 1/3] Update documentation Signed-off-by: Artem Kladov --- modules/810-documentation/images/web/werf.inc.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/810-documentation/images/web/werf.inc.yaml b/modules/810-documentation/images/web/werf.inc.yaml index 19f3bc9d46..e2f3e642f2 100644 --- a/modules/810-documentation/images/web/werf.inc.yaml +++ b/modules/810-documentation/images/web/werf.inc.yaml @@ -231,5 +231,13 @@ git: setup: ['**/*'] includePaths: - modules/**/docs/README.md +- add: /{{ .ModulePath }}ee/se + to: /comparison/se + owner: jekyll + group: jekyll + stageDependencies: + setup: ['**/*'] + includePaths: + - modules/**/docs/README.md {{ tpl (.Files.Get (printf "%sdocs/documentation/werf-git-section.inc.yaml" .ModulePath)) . }} {{ tpl (.Files.Get (printf "%sdocs/site/werf-docs-builder.inc.yaml" .ModulePath)) (dict "ctx" . "mode" "module") }} From c5301dc2c214fe9e1b34b646e95168bee17befb7 Mon Sep 17 00:00:00 2001 From: Nikolay Gorbatov Date: Wed, 20 Mar 2024 17:13:54 +0300 Subject: [PATCH 2/3] exclude dashboard for se/ee Signed-off-by: Nikolay Gorbatov --- editions.yaml | 6 ++++++ tools/build_includes/modules-excluded-EE.yaml | 1 + tools/build_includes/modules-excluded-SE.yaml | 1 + 3 files changed, 8 insertions(+) diff --git a/editions.yaml b/editions.yaml index 57f7814eb9..06c80ccb83 100644 --- a/editions.yaml +++ b/editions.yaml @@ -46,12 +46,18 @@ editions: - name: SE modulesDir: "ee/se/modules" + excludeModules: + - dashboard + - name: EE modulesDir: "ee/modules" terraformProviders: - openstack - vsphere - vcd + + excludeModules: + - dashboard - name: FE modulesDir: "ee/fe/modules" diff --git a/tools/build_includes/modules-excluded-EE.yaml b/tools/build_includes/modules-excluded-EE.yaml index 53a3031820..298a61675c 100644 --- a/tools/build_includes/modules-excluded-EE.yaml +++ b/tools/build_includes/modules-excluded-EE.yaml @@ -1 +1,2 @@ # Code generated by tools/build.go; DO NOT EDIT. +- modules/500-dashboard/** \ No newline at end of file diff --git a/tools/build_includes/modules-excluded-SE.yaml b/tools/build_includes/modules-excluded-SE.yaml index 53a3031820..298a61675c 100644 --- a/tools/build_includes/modules-excluded-SE.yaml +++ b/tools/build_includes/modules-excluded-SE.yaml @@ -1 +1,2 @@ # Code generated by tools/build.go; DO NOT EDIT. +- modules/500-dashboard/** \ No newline at end of file From 5742a424923ea9db35a4d75c74ee749ef43c9237 Mon Sep 17 00:00:00 2001 From: Nikolay Gorbatov Date: Thu, 21 Mar 2024 13:22:55 +0300 Subject: [PATCH 3/3] enable dashboard for ee Signed-off-by: Nikolay Gorbatov --- editions.yaml | 3 --- tools/build_includes/modules-excluded-EE.yaml | 1 - 2 files changed, 4 deletions(-) diff --git a/editions.yaml b/editions.yaml index 06c80ccb83..07489670d8 100644 --- a/editions.yaml +++ b/editions.yaml @@ -55,9 +55,6 @@ editions: - openstack - vsphere - vcd - - excludeModules: - - dashboard - name: FE modulesDir: "ee/fe/modules" diff --git a/tools/build_includes/modules-excluded-EE.yaml b/tools/build_includes/modules-excluded-EE.yaml index 298a61675c..53a3031820 100644 --- a/tools/build_includes/modules-excluded-EE.yaml +++ b/tools/build_includes/modules-excluded-EE.yaml @@ -1,2 +1 @@ # Code generated by tools/build.go; DO NOT EDIT. -- modules/500-dashboard/** \ No newline at end of file