You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2023/08/25 07:38:13 UTC
[iotdb] branch test_win_cpp_example updated (4f31b876037 -> ed5d4136627)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch test_win_cpp_example
in repository https://gitbox.apache.org/repos/asf/iotdb.git
discard 4f31b876037 test build win cpp example
discard bcbb70a021c test build win cpp example
discard 5cc4605f8ff test build win cpp example
new ed5d4136627 Fix client-cpp-example build error
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (4f31b876037)
\
N -- N -- N refs/heads/test_win_cpp_example (ed5d4136627)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/client-cpp.yml | 62 ++++++++++++++++++++++++++++++++++++----
README.md | 3 +-
2 files changed, 57 insertions(+), 8 deletions(-)
[iotdb] 01/01: Fix client-cpp-example build error
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch test_win_cpp_example
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ed5d4136627407ffc3986b10cab0b5b1a6bd4717
Author: HTHou <hh...@outlook.com>
AuthorDate: Fri Aug 25 15:37:36 2023 +0800
Fix client-cpp-example build error
---
.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
-[](https://github.com/apache/iotdb/actions/workflows/main-unix.yml)
-[](https://github.com/apache/iotdb/actions/workflows/main-win.yml)<!--[](https://coveralls.io/repos/github/apache/iotdb/badge.svg?branch=master)-->
+[](https://github.com/apache/iotdb/actions/workflows/unit-test.yml)<!--[](https://coveralls.io/repos/github/apache/iotdb/badge.svg?branch=master)-->
[](https://github.com/apache/iotdb/releases)
[](https://www.apache.org/licenses/LICENSE-2.0.html)
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)