From a97628b8857005edd0c858c4a5142d9fcba1aa57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ali=20B=C3=BCy=C3=BCkkakac?= Date: Fri, 31 Oct 2025 22:25:21 +0100 Subject: [PATCH 1/9] Reenable fulltextsearch apps --- .gitmodules | 9 +++++++++ IONOS | 2 +- apps-external/files_fulltextsearch | 1 + apps-external/fulltextsearch | 1 + apps-external/fulltextsearch_elasticsearch | 1 + 5 files changed, 13 insertions(+), 1 deletion(-) create mode 160000 apps-external/files_fulltextsearch create mode 160000 apps-external/fulltextsearch create mode 160000 apps-external/fulltextsearch_elasticsearch diff --git a/.gitmodules b/.gitmodules index cb26b7c31205b..4d155766c09af 100644 --- a/.gitmodules +++ b/.gitmodules @@ -85,3 +85,12 @@ [submodule "apps-external/twofactor_totp"] path = apps-external/twofactor_totp url = git@github.com:nextcloud/twofactor_totp.git +[submodule "apps-external/files_fulltextsearch"] + path = apps-external/files_fulltextsearch + url = git@github.com:nextcloud/files_fulltextsearch.git +[submodule "apps-external/fulltextsearch"] + path = apps-external/fulltextsearch + url = git@github.com:nextcloud/fulltextsearch.git +[submodule "apps-external/fulltextsearch_elasticsearch"] + path = apps-external/fulltextsearch_elasticsearch + url = git@github.com:alikakac/fulltextsearch_elasticsearch.git diff --git a/IONOS b/IONOS index 9a24a361a4e6d..58bf58ce5fe03 160000 --- a/IONOS +++ b/IONOS @@ -1 +1 @@ -Subproject commit 9a24a361a4e6dbd2188b1e3d5d3407e8d02c2ba4 +Subproject commit 58bf58ce5fe0389e19528507c795a74de59ba624 diff --git a/apps-external/files_fulltextsearch b/apps-external/files_fulltextsearch new file mode 160000 index 0000000000000..bae6748272e7c --- /dev/null +++ b/apps-external/files_fulltextsearch @@ -0,0 +1 @@ +Subproject commit bae6748272e7cdc6433a46213c2572f32717d868 diff --git a/apps-external/fulltextsearch b/apps-external/fulltextsearch new file mode 160000 index 0000000000000..89b028457a548 --- /dev/null +++ b/apps-external/fulltextsearch @@ -0,0 +1 @@ +Subproject commit 89b028457a54879a797c5a2be09a1d8a7ec72a1d diff --git a/apps-external/fulltextsearch_elasticsearch b/apps-external/fulltextsearch_elasticsearch new file mode 160000 index 0000000000000..781b0cbc78fb4 --- /dev/null +++ b/apps-external/fulltextsearch_elasticsearch @@ -0,0 +1 @@ +Subproject commit 781b0cbc78fb47729c94a736463f25ff48682154 From a9625d623d05419ae2c86f3f52eda3e160855808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ali=20B=C3=BCy=C3=BCkkakac?= Date: Tue, 4 Nov 2025 12:07:26 +0100 Subject: [PATCH 2/9] add missing build artifacts --- .github/workflows/build-artifact.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/build-artifact.yml b/.github/workflows/build-artifact.yml index fe513c501edae..256ac60233664 100644 --- a/.github/workflows/build-artifact.yml +++ b/.github/workflows/build-artifact.yml @@ -229,6 +229,27 @@ jobs: "has_npm": true, "has_composer": true, "makefile_target": "build_integration_openai_app" + }, + { + "name": "fulltextsearch", + "path": "apps-external/fulltextsearch", + "has_npm": false, + "has_composer": true, + "makefile_target": "build_fulltextsearch_app" + }, + { + "name": "files_fulltextsearch", + "path": "apps-external/files_fulltextsearch", + "has_npm": false, + "has_composer": true, + "makefile_target": "build_files_fulltextsearch_app" + }, + { + "name": "fulltextsearch_elasticsearch", + "path": "apps-external/fulltextsearch_elasticsearch", + "has_npm": false, + "has_composer": true, + "makefile_target": "build_fulltextsearch_elasticsearch_app" } ]' From a76eb4232691cccdbc23d73970b0f3dbf3853d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ali=20B=C3=BCy=C3=BCkkakac?= Date: Wed, 5 Nov 2025 14:52:20 +0100 Subject: [PATCH 3/9] move fulltextsearch_elasticsearch to stable31 --- apps-external/fulltextsearch_elasticsearch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps-external/fulltextsearch_elasticsearch b/apps-external/fulltextsearch_elasticsearch index 781b0cbc78fb4..f57d90af6c03f 160000 --- a/apps-external/fulltextsearch_elasticsearch +++ b/apps-external/fulltextsearch_elasticsearch @@ -1 +1 @@ -Subproject commit 781b0cbc78fb47729c94a736463f25ff48682154 +Subproject commit f57d90af6c03fb46d9a5c0e0f8139da24a1fbb06 From 113e03b350d9c9fa26d4e6e76f90dc431df2edde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ali=20B=C3=BCy=C3=BCkkakac?= Date: Tue, 25 Nov 2025 23:30:08 +0100 Subject: [PATCH 4/9] fulltextsearch_elasticsearch: pr version --- apps-external/fulltextsearch_elasticsearch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps-external/fulltextsearch_elasticsearch b/apps-external/fulltextsearch_elasticsearch index f57d90af6c03f..4bebeb9f67ec3 160000 --- a/apps-external/fulltextsearch_elasticsearch +++ b/apps-external/fulltextsearch_elasticsearch @@ -1 +1 @@ -Subproject commit f57d90af6c03fb46d9a5c0e0f8139da24a1fbb06 +Subproject commit 4bebeb9f67ec30fc074ed1f2959898835910d20b From 02762a73c22435772de03bb4dd7ce7f25c7f1e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ali=20B=C3=BCy=C3=BCkkakac?= Date: Tue, 25 Nov 2025 23:49:53 +0100 Subject: [PATCH 5/9] fix matrix --- .github/workflows/build-artifact.yml | 42 ++++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-artifact.yml b/.github/workflows/build-artifact.yml index 2ad326d317182..debc5956433a3 100644 --- a/.github/workflows/build-artifact.yml +++ b/.github/workflows/build-artifact.yml @@ -127,6 +127,27 @@ jobs: "has_composer": true, "makefile_target": "build_forms_app" }, + { + "name": "fulltextsearch", + "path": "apps-external/fulltextsearch", + "has_npm": false, + "has_composer": true, + "makefile_target": "build_fulltextsearch_app" + }, + { + "name": "files_fulltextsearch", + "path": "apps-external/files_fulltextsearch", + "has_npm": false, + "has_composer": true, + "makefile_target": "build_files_fulltextsearch_app" + }, + { + "name": "fulltextsearch_elasticsearch", + "path": "apps-external/fulltextsearch_elasticsearch", + "has_npm": false, + "has_composer": true, + "makefile_target": "build_fulltextsearch_elasticsearch_app" + }, { "name": "groupfolders", "path": "apps-external/groupfolders", @@ -252,27 +273,6 @@ jobs: "has_npm": true, "has_composer": true, "makefile_target": "build_whiteboard_app" - }, - { - "name": "fulltextsearch", - "path": "apps-external/fulltextsearch", - "has_npm": false, - "has_composer": true, - "makefile_target": "build_fulltextsearch_app" - }, - { - "name": "files_fulltextsearch", - "path": "apps-external/files_fulltextsearch", - "has_npm": false, - "has_composer": true, - "makefile_target": "build_files_fulltextsearch_app" - }, - { - "name": "fulltextsearch_elasticsearch", - "path": "apps-external/fulltextsearch_elasticsearch", - "has_npm": false, - "has_composer": true, - "makefile_target": "build_fulltextsearch_elasticsearch_app" } ]' From 45efbfb4afe6be34f621f31b2bebc27b9354539d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ali=20B=C3=BCy=C3=BCkkakac?= Date: Wed, 26 Nov 2025 00:00:00 +0100 Subject: [PATCH 6/9] align matrix files --- .github/workflows/build-artifact.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-artifact.yml b/.github/workflows/build-artifact.yml index debc5956433a3..dfec70a140fab 100644 --- a/.github/workflows/build-artifact.yml +++ b/.github/workflows/build-artifact.yml @@ -120,6 +120,13 @@ jobs: "has_composer": true, "makefile_target": "build_end_to_end_encryption_app" }, + { + "name": "files_fulltextsearch", + "path": "apps-external/files_fulltextsearch", + "has_npm": false, + "has_composer": true, + "makefile_target": "build_files_fulltextsearch_app" + }, { "name": "forms", "path": "apps-external/forms", @@ -134,13 +141,6 @@ jobs: "has_composer": true, "makefile_target": "build_fulltextsearch_app" }, - { - "name": "files_fulltextsearch", - "path": "apps-external/files_fulltextsearch", - "has_npm": false, - "has_composer": true, - "makefile_target": "build_files_fulltextsearch_app" - }, { "name": "fulltextsearch_elasticsearch", "path": "apps-external/fulltextsearch_elasticsearch", From 8bb9a195e5ce26c5f95ee439b16c889ea1e08218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ali=20B=C3=BCy=C3=BCkkakac?= Date: Thu, 27 Nov 2025 14:56:32 +0100 Subject: [PATCH 7/9] update fulltextsearch_elasticsearch plugin --- apps-external/fulltextsearch_elasticsearch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps-external/fulltextsearch_elasticsearch b/apps-external/fulltextsearch_elasticsearch index 4bebeb9f67ec3..d7c230f466aad 160000 --- a/apps-external/fulltextsearch_elasticsearch +++ b/apps-external/fulltextsearch_elasticsearch @@ -1 +1 @@ -Subproject commit 4bebeb9f67ec30fc074ed1f2959898835910d20b +Subproject commit d7c230f466aad1a1877e592024174fc083767d17 From 41c3b24b36e1a03b89108e441d489d72a2789c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ali=20B=C3=BCy=C3=BCkkakac?= Date: Thu, 27 Nov 2025 15:55:41 +0100 Subject: [PATCH 8/9] update fulltext_elasticsearch plugin --- apps-external/fulltextsearch_elasticsearch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps-external/fulltextsearch_elasticsearch b/apps-external/fulltextsearch_elasticsearch index d7c230f466aad..fb957c83a4d6b 160000 --- a/apps-external/fulltextsearch_elasticsearch +++ b/apps-external/fulltextsearch_elasticsearch @@ -1 +1 @@ -Subproject commit d7c230f466aad1a1877e592024174fc083767d17 +Subproject commit fb957c83a4d6b7c08421b189b723026b40e906d5 From 7f38b8d4cacaf8b8c0bb7c41227774936c4b5db7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ali=20B=C3=BCy=C3=BCkkakac?= Date: Fri, 28 Nov 2025 14:35:08 +0100 Subject: [PATCH 9/9] update fulltextsearch_elasticsearch plugin --- apps-external/fulltextsearch_elasticsearch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps-external/fulltextsearch_elasticsearch b/apps-external/fulltextsearch_elasticsearch index fb957c83a4d6b..340bed6357f55 160000 --- a/apps-external/fulltextsearch_elasticsearch +++ b/apps-external/fulltextsearch_elasticsearch @@ -1 +1 @@ -Subproject commit fb957c83a4d6b7c08421b189b723026b40e906d5 +Subproject commit 340bed6357f550e2a7ed593247a1d2a4a386c00e