diff --git a/Jenkinsfile b/Jenkinsfile index 35a2bf82606313fe015457cda3a6a57c23e2ef4d..03af9ba24408deb9bfa1a5baa1e924b262ccbd77 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -367,6 +367,7 @@ pipeline { else{ sh''' cd ${WKC} + git reset --hard HEAD~10 git fetch git checkout ${CHANGE_BRANCH} git pull diff --git a/cmake/define.inc b/cmake/define.inc index 9e39dc9463f63c935ec67dbb712377dc3d0ac96f..00fd015b4ccfc5e06e40f963d8f19598b071a74e 100755 --- a/cmake/define.inc +++ b/cmake/define.inc @@ -136,7 +136,6 @@ IF (TD_ALPINE) MESSAGE(STATUS "aplhine is defined") ENDIF () - IF ("${BUILD_HTTP}" STREQUAL "") IF (TD_LINUX) IF (TD_ARM_32) @@ -153,6 +152,9 @@ ELSEIF (${BUILD_HTTP} MATCHES "false") SET(TD_BUILD_HTTP FALSE) ELSEIF (${BUILD_HTTP} MATCHES "true") SET(TD_BUILD_HTTP TRUE) +ELSEIF (${BUILD_HTTP} MATCHES "internal") + SET(TD_BUILD_HTTP FALSE) + SET(TD_BUILD_TAOSA_INTERNAL TRUE) ELSE () SET(TD_BUILD_HTTP TRUE) ENDIF () diff --git a/packaging/release.sh b/packaging/release.sh index 866a21e552909ca9ad8e6083f4e571f5da91cc91..38e5dd929e78ce1a167464892089c42a044d94f6 100755 --- a/packaging/release.sh +++ b/packaging/release.sh @@ -418,6 +418,10 @@ else BUILD_HTTP=false fi +if [[ "$verMode" == "cluster" ]]; then + BUILD_HTTP=internal +fi + if [[ "$pagMode" == "full" ]]; then BUILD_TOOLS=true else diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index c7221a6d301ae09e47bd68c76a90599fd85dff2a..765c7195cb4ef2fd7e2a87a1a95cff725d8b0c90 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -8,6 +8,8 @@ IF (TD_BUILD_HTTP) MESSAGE("${Yellow} use original embedded httpd ${ColourReset}") MESSAGE("") ADD_SUBDIRECTORY(http) +ELSEIF(TD_BUILD_TAOSA_INTERNAL) + MESSAGE("${Yellow} use taosa internal as httpd ${ColourReset}") ELSE () MESSAGE("") MESSAGE("${Green} use taosadapter as httpd ${ColourReset}") diff --git a/src/plugins/taosadapter b/src/plugins/taosadapter index 11d1e02255edfeeaa8d5b1f45abfa9637332ce65..273b5219f8bcc604e43beebc6f1f95abed85170a 160000 --- a/src/plugins/taosadapter +++ b/src/plugins/taosadapter @@ -1 +1 @@ -Subproject commit 11d1e02255edfeeaa8d5b1f45abfa9637332ce65 +Subproject commit 273b5219f8bcc604e43beebc6f1f95abed85170a