You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2021/03/10 10:04:24 UTC
[iotdb] branch master updated (6832eee -> bfa529b)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 6832eee [ISSUE-2661] SyncClientPool And AsyncClientPool have concurrency problem (#2791)
new 0198f5c Add generated-sources as source folder
new bfa529b (Fix Github Action)Update apt source before installing libboost
The 2 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.yml | 30 +++++++++++++++---------------
antlr/pom.xml | 19 +++++++++++++++++++
thrift/pom.xml | 19 +++++++++++++++++++
3 files changed, 53 insertions(+), 15 deletions(-)
[iotdb] 02/02: (Fix Github Action)Update apt source before
installing libboost
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit bfa529b8ef1da359443d86379ce6118159907f38
Author: baijian <ba...@p1.com>
AuthorDate: Wed Mar 10 14:31:56 2021 +0800
(Fix Github Action)Update apt source before installing libboost
---
.github/workflows/client.yml | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml
index e685c6a..492bf0a 100644
--- a/.github/workflows/client.yml
+++ b/.github/workflows/client.yml
@@ -3,27 +3,27 @@
# CPP compiling is too slow, so let's do it in parallel with testing other modules.
# As there is no Java client, we just use one JDK.
-name: Clients_except_Java CI with Maven
+name: Clients_except_Java CI with Maven
on:
push:
branches:
- master
- - 'rel/*'
+ - "rel/*"
paths:
- - 'client-*/**'
- - 'compile-tools/**'
- - 'thrift/**'
- - 'service-rpc/**'
+ - "client-*/**"
+ - "compile-tools/**"
+ - "thrift/**"
+ - "service-rpc/**"
pull_request:
branches:
- master
- - 'rel/*'
+ - "rel/*"
paths:
- - 'client-*/**'
- - 'compile-tools/**'
- - 'thrift/**'
- - 'service-rpc/**'
+ - "client-*/**"
+ - "compile-tools/**"
+ - "thrift/**"
+ - "service-rpc/**"
# allow manually run the action:
workflow_dispatch:
@@ -45,8 +45,8 @@ jobs:
- name: Install CPP Dependencies (Ubuntu)
if: matrix.os == 'ubuntu-latest'
shell: bash
- run: sudo apt-get install libboost-all-dev
- - name: Install CPP Dependencies (Mac)
+ run: sudo apt-get update && sudo apt-get install libboost-all-dev
+ - name: Install CPP Dependencies (Mac)`
if: matrix.os == 'macos-latest'
shell: bash
run: |
@@ -61,7 +61,7 @@ jobs:
key: client-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2-
- name: Test with Maven
- run: mvn -B clean integration-test -P compile-cpp -Dtsfile.test.skip=true -Djdbc.test.skip=true -Diotdb.test.skip=true -Dtest.port.closed=true -pl server,client-cpp,example/client-cpp-example -am
+ run: mvn -B clean integration-test -P compile-cpp -Dtsfile.test.skip=true -Djdbc.test.skip=true -Diotdb.test.skip=true -Dtest.port.closed=true -pl server,client-cpp,example/client-cpp-example -am
build-win:
strategy:
@@ -97,4 +97,4 @@ jobs:
run: cd /d/a/cpp && unzip win_flex_bison.zip && mv win_flex.exe flex.exe && mv win_bison.exe bison.exe && echo 'export PATH=/d/a/cpp:$PATH' >> ~/.bash_profile && source ~/.bash_profile
- name: Test with Maven
shell: bash
- run: source ~/.bash_profile && mvn -B clean integration-test -P compile-cpp -Dboost.include.dir=/d/a/cpp/boost_1_72_0 -Dboost.library.dir=/d/a/cpp/boost_1_72_0/stage/lib -Dtsfile.test.skip=true -Djdbc.test.skip=true -Diotdb.test.skip=true -Dtest.port.closed=true -Denforcer.skip=true -pl server,client-cpp,example/client-cpp-example -am
\ No newline at end of file
+ run: source ~/.bash_profile && mvn -B clean integration-test -P compile-cpp -Dboost.include.dir=/d/a/cpp/boost_1_72_0 -Dboost.library.dir=/d/a/cpp/boost_1_72_0/stage/lib -Dtsfile.test.skip=true -Djdbc.test.skip=true -Diotdb.test.skip=true -Dtest.port.closed=true -Denforcer.skip=true -pl server,client-cpp,example/client-cpp-example -am
[iotdb] 01/02: Add generated-sources as source folder
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 0198f5c34a95ee8cffad2df68ca78073eb1fd05b
Author: Eric Pai <er...@hotmail.com>
AuthorDate: Tue Mar 9 19:00:51 2021 +0800
Add generated-sources as source folder
---
antlr/pom.xml | 19 +++++++++++++++++++
thrift/pom.xml | 19 +++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/antlr/pom.xml b/antlr/pom.xml
index 8ecdb6e..3f1cd44 100644
--- a/antlr/pom.xml
+++ b/antlr/pom.xml
@@ -54,6 +54,25 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.2.0</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/generated-sources/antlr4</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/thrift/pom.xml b/thrift/pom.xml
index 989bf85..7a0e2c6 100644
--- a/thrift/pom.xml
+++ b/thrift/pom.xml
@@ -74,6 +74,25 @@
</archive>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.2.0</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/generated-sources/thrift</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>