[iotdb] branch master updated: Fix client-cpp-example build error (#10956)

[haonan]

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new df262ee6c0d Fix client-cpp-example build error (#10956)
df262ee6c0d is described below

commit df262ee6c0d6892efd0ff9887f2dc96eec62c9ae
Author: Haonan <hhao...@outlook.com>
AuthorDate: Fri Aug 25 17:19:31 2023 +0800

    Fix client-cpp-example build error (#10956)
---
 .github/workflows/client-cpp.yml              | 12 ++++--------
 README.md                                     |  3 +--
 example/client-cpp-example/src/CMakeLists.txt |  4 ++--
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/client-cpp.yml b/.github/workflows/client-cpp.yml
index 17d7f97ce16..3d0b00e1584 100644
--- a/.github/workflows/client-cpp.yml
+++ b/.github/workflows/client-cpp.yml
@@ -10,7 +10,6 @@ on:
     branches:
       - master
       - "rel/*"
-      - "new_*"
     paths-ignore:
       - 'docs/**'
       - 'site/**'
@@ -18,7 +17,6 @@ on:
     branches:
       - master
       - "rel/*"
-      - "new_*"
     paths-ignore:
       - 'docs/**'
       - 'site/**'
@@ -33,7 +31,7 @@ env:
   MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false 
-Dmaven.wagon.http.retryHandler.class=standard 
-Dmaven.wagon.http.retryHandler.count=3
 
 jobs:
-  build:
+  build-unix:
     strategy:
       fail-fast: false
       max-parallel: 20
@@ -66,7 +64,7 @@ jobs:
         # Explicitly using mvnw here as the build requires maven 3.9 and the 
default installation is older
         # Explicitly using "install" instead of package in order to be sure 
we're using libs built on this machine
         # (was causing problems on windows, but could cause problem on linux, 
when updating the thrift module)
-        run: ./mvnw clean install -P with-cpp -pl distribution -am -DskipTests
+        run: ./mvnw clean install -P with-cpp -pl 
distribution,example/client-cpp-example -am -DskipTests
       - name: Test with Maven
         # Explicitly using mvnw here as the build requires maven 3.9 and the 
default installation is older
         run: ./mvnw clean verify -P with-cpp -pl iotdb-client/client-cpp -am
@@ -86,17 +84,15 @@ jobs:
           key: client-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2-
       - name: Install Win_Flex_Bison
-        run: choco install winflexbison
+        run: choco install winflexbison3
       - name: Download Boost
         run: choco install boost-msvc-14.3 --version=1.78.0
-      - name: Install OpenSSL
-        run:  choco install openssl
       - name: Build IoTDB server
         shell: bash
         # Explicitly using mvnw here as the build requires maven 3.9 and the 
default installation is older
         # Explicitly using "install" instead of package in order to be sure 
we're using libs built on this machine
         # (was causing problems on windows, but could cause problem on linux, 
when updating the thrift module)
-        run: ./mvnw clean install -P with-cpp -pl distribution -am -DskipTests
+        run: ./mvnw clean install -P with-cpp -pl 
distribution,example/client-cpp-example -am -DskipTests
       - name: Test with Maven
         shell: bash
         # Explicitly using mvnw here as the build requires maven 3.9 and the 
default installation is older
diff --git a/README.md b/README.md
index 161ebbeef76..03f8415cdd5 100644
--- a/README.md
+++ b/README.md
@@ -21,8 +21,7 @@
 [English](./README.md) | [中文](./README_ZH.md)
 
 # IoTDB
-[![Main Mac and 
Linux](https://github.com/apache/iotdb/actions/workflows/main-unix.yml/badge.svg)](https://github.com/apache/iotdb/actions/workflows/main-unix.yml)
-[![Main 
Win](https://github.com/apache/iotdb/actions/workflows/main-win.yml/badge.svg)](https://github.com/apache/iotdb/actions/workflows/main-win.yml)<!--[![coveralls](https://coveralls.io/repos/github/apache/iotdb/badge.svg?branch=master)](https://coveralls.io/repos/github/apache/iotdb/badge.svg?branch=master)-->
+[![Unit-Test](https://github.com/apache/iotdb/actions/workflows/unit-test.yml/badge.svg)](https://github.com/apache/iotdb/actions/workflows/unit-test.yml)<!--[![coveralls](https://coveralls.io/repos/github/apache/iotdb/badge.svg?branch=master)](https://coveralls.io/repos/github/apache/iotdb/badge.svg?branch=master)-->
 [![GitHub 
release](https://img.shields.io/github/release/apache/iotdb.svg)](https://github.com/apache/iotdb/releases)
 
[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
 ![](https://github-size-badge.herokuapp.com/apache/iotdb.svg)
diff --git a/example/client-cpp-example/src/CMakeLists.txt 
b/example/client-cpp-example/src/CMakeLists.txt
index b3b117c5dda..91d93193e38 100644
--- a/example/client-cpp-example/src/CMakeLists.txt
+++ b/example/client-cpp-example/src/CMakeLists.txt
@@ -40,8 +40,8 @@ ADD_EXECUTABLE(SessionExample SessionExample.cpp)
 ADD_EXECUTABLE(AlignedTimeseriesSessionExample 
AlignedTimeseriesSessionExample.cpp)
 
 IF(MSVC)
-    TARGET_LINK_LIBRARIES(SessionExample iotdb_session 
"${CMAKE_SOURCE_DIR}/thrift/lib/Release/thriftmd.lib)
-    TARGET_LINK_LIBRARIES(AlignedTimeseriesSessionExample iotdb_session 
"${CMAKE_SOURCE_DIR}/thrift/lib/Release/thriftmd.lib)
+    TARGET_LINK_LIBRARIES(SessionExample iotdb_session 
"${CMAKE_SOURCE_DIR}/thrift/lib/Release/thriftmd.lib")
+    TARGET_LINK_LIBRARIES(AlignedTimeseriesSessionExample iotdb_session 
"${CMAKE_SOURCE_DIR}/thrift/lib/Release/thriftmd.lib")
 ELSE()
     TARGET_LINK_LIBRARIES(SessionExample iotdb_session pthread)
     TARGET_LINK_LIBRARIES(AlignedTimeseriesSessionExample iotdb_session 
pthread)