From c9e9a11423f2c7950f6a9d8e9029dd10c59051f8 Mon Sep 17 00:00:00 2001 From: WANG Xu Date: Tue, 11 Mar 2025 14:26:33 +0800 Subject: [PATCH 1/3] ci: add 3.3.6 branch --- .github/workflows/taosd-ci-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/taosd-ci-build.yml b/.github/workflows/taosd-ci-build.yml index 0f65684027..2179200bb3 100644 --- a/.github/workflows/taosd-ci-build.yml +++ b/.github/workflows/taosd-ci-build.yml @@ -6,6 +6,7 @@ on: - 'main' - '3.0' - '3.1' + - '3.3.6' - 'enh/cmake-TD-33848' paths-ignore: From a77bc3c3756a5e40e112309627ec4e30eade2dec Mon Sep 17 00:00:00 2001 From: haoranchen Date: Tue, 11 Mar 2025 20:01:12 +0800 Subject: [PATCH 2/3] fix: delete taos-tools repo in Jenkinsfile2 --- Jenkinsfile2 | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 3135b7b683..8853d068cb 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -112,16 +112,6 @@ def build_pre_docs(){ git fetch origin +refs/pull/${CHANGE_ID}/merge git checkout -qf FETCH_HEAD ''' - - sh ''' - cd ${DOC_WKC}/${tools_repo} - git reset --hard - git clean -f - git fetch - git remote prune origin - git checkout ''' + env.CHANGE_TARGET + ''' - git pull >/dev/null - ''' } } From 9cce52f57753b11185d774e8a129030470b582ca Mon Sep 17 00:00:00 2001 From: haoranchen Date: Wed, 12 Mar 2025 14:17:49 +0800 Subject: [PATCH 3/3] ci:add 3.3.6 branch to taosd-ci.yml --- .github/workflows/taosd-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/taosd-ci.yml b/.github/workflows/taosd-ci.yml index 31eda597ad..c0eeecd8ea 100644 --- a/.github/workflows/taosd-ci.yml +++ b/.github/workflows/taosd-ci.yml @@ -6,6 +6,7 @@ on: - 'main' - '3.0' - '3.1' + - '3.3.6' paths-ignore: - 'packaging/**' - 'docs/**'