From 8d59865551259c0bd515aef76d0a6a2b1d1edb76 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Wed, 27 Jul 2022 19:15:54 +0800
Subject: [PATCH] feat: de submodule (#15464)

* feat: use contrib instead of submodule for tools/taosws/taosa

* feat: de-submodule, remove taostools/taosws/taosadapter from .gitmodules

* ci: remove submodule taos-tools, taosadapter and taosws-rs from cache

Co-authored-by: tangfangzhi <fztang@taosdata.com>
---
 .gitignore   |  2 ++
 .gitmodules  |  9 ---------
 Jenkinsfile2 | 13 +++++++++++++
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index d7fcb019ae..80fd850cd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,8 @@ pysim/
 *.out
 *DS_Store
 tests/script/api/batchprepare
+taosadapter
+taosadapter-debug
 
 # Doxygen Generated files
 html/
diff --git a/.gitmodules b/.gitmodules
index 31c211bf89..07e4bb2b9c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,12 +13,3 @@
 [submodule "examples/rust"]
 	path = examples/rust
 	url = https://github.com/songtianyi/tdengine-rust-bindings.git
-[submodule "tools/taos-tools"]
-	path = tools/taos-tools
-	url = https://github.com/taosdata/taos-tools
-[submodule "tools/taosadapter"]
-	path = tools/taosadapter
-	url = https://github.com/taosdata/taosadapter.git
-[submodule "tools/taosws-rs"]
-	path = tools/taosws-rs
-	url = https://github.com/taosdata/taosws-rs
diff --git a/Jenkinsfile2 b/Jenkinsfile2
index 1b04e40f2a..83fa1479dc 100644
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -113,6 +113,12 @@ def pre_test(){
             echo "unmatched reposiotry ${CHANGE_URL}"
         '''
     }
+    sh '''
+        cd ${WKC}
+        git rm --cached tools/taos-tools 2>/dev/null || :
+        git rm --cached tools/taosadapter 2>/dev/null || :
+        git rm --cached tools/taosws-rs 2>/dev/null || :
+    '''
     sh '''
         cd ${WKC}
         git submodule update --init --recursive
@@ -258,6 +264,13 @@ def pre_test_win(){
         git branch
         git log -5
     '''
+    bat '''
+        cd %WIN_COMMUNITY_ROOT%
+        git rm --cached tools/taos-tools 2>nul
+        git rm --cached tools/taosadapter 2>nul
+        git rm --cached tools/taosws-rs 2>nul
+        exit 0
+    '''
     bat '''
         cd %WIN_COMMUNITY_ROOT%
         git submodule update --init --recursive
-- 
GitLab