From 401e2c795a5d5cce1c213990a5df06fee3e43ae4 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Thu, 2 Dec 2021 23:24:12 +0800
Subject: [PATCH] [TD-11699]<feature>: taosadapter support gzip (#8906)

* [TD-11699]<feature>: taosadapter support gzip

* add goproxy for mac
---
 Jenkinsfile                | 2 ++
 src/plugins/CMakeLists.txt | 2 +-
 src/plugins/taosadapter    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 466c083353..e9e9b52c70 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -211,6 +211,8 @@ def pre_test_mac(){
     mkdir debug
     cd debug
     cmake .. > /dev/null
+    go env -w GOPROXY=https://goproxy.cn,direct
+    go env -w GO111MODULE=on
     cmake --build .
     '''
     return 1
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 9e0de204d7..c7221a6d30 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -43,7 +43,7 @@ ELSE ()
           COMMAND     git clean -f -d
           BUILD_COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../inc CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -ldflags "-s -w -X github.com/taosdata/taosadapter/version.CommitID=${taosadapter_commit_sha1}"
           INSTALL_COMMAND
-          COMMAND curl -sL https://github.com/upx/upx/releases/download/v3.96/upx-3.96-amd64_linux.tar.xz -o upx.tar.xz && tar xvJf upx.tar.xz --strip-components 1 > /dev/null && ./upx taosadapter || :
+          COMMAND curl -sL https://github.com/upx/upx/releases/download/v3.96/upx-3.96-amd64_linux.tar.xz -o upx.tar.xz && tar -xvJf upx.tar.xz -C ${CMAKE_BINARY_DIR} --strip-components 1 > /dev/null && ${CMAKE_BINARY_DIR}/upx taosadapter || :
           COMMAND cmake -E copy taosadapter ${CMAKE_BINARY_DIR}/build/bin
           COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/
           COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/
diff --git a/src/plugins/taosadapter b/src/plugins/taosadapter
index 6397bf5963..88346a2e4e 160000
--- a/src/plugins/taosadapter
+++ b/src/plugins/taosadapter
@@ -1 +1 @@
-Subproject commit 6397bf5963f62f0aa5c4b9b961b16ed5c62579f1
+Subproject commit 88346a2e4e2e9282d2ec8b8c5264ca1ec23698a1
-- 
GitLab