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 1517e81e878 Fix python ci security warning and update c++ ci commands
(#12583)
1517e81e878 is described below
commit 1517e81e87807a210fc3dacdb6c3a4f6bf215cc4
Author: Haonan <[email protected]>
AuthorDate: Fri May 24 17:36:07 2024 +0800
Fix python ci security warning and update c++ ci commands (#12583)
---
.github/workflows/client-cpp.yml | 44 ++++++++---------------------
.github/workflows/client-go.yml | 5 +---
.github/workflows/client-python.yml | 2 +-
.mvn/wrapper/maven-wrapper.properties | 4 +--
iotdb-client/client-py/requirements_dev.txt | 1 -
5 files changed, 16 insertions(+), 40 deletions(-)
diff --git a/.github/workflows/client-cpp.yml b/.github/workflows/client-cpp.yml
index a213aeb5f5e..39dddba8bb7 100644
--- a/.github/workflows/client-cpp.yml
+++ b/.github/workflows/client-cpp.yml
@@ -31,12 +31,12 @@ 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-unix:
+ Test:
strategy:
fail-fast: false
max-parallel: 20
matrix:
- os: [ubuntu-latest, macos-latest]
+ os: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.os}}
steps:
@@ -53,49 +53,28 @@ jobs:
brew install bison
echo 'export PATH="/opt/homebrew/opt/bison/bin:$PATH"' >>
~/.bash_profile
source ~/.bash_profile && export
LDFLAGS="-L/opt/homebrew/opt/bison/lib"
+ - name: Install CPP Dependencies (Windows)
+ if: matrix.os == 'windows-latest'
+ run: |
+ choco install winflexbison3
+ choco install boost-msvc-14.3 --version=1.84.0.1
+ echo C:\\local\\boost_1_84_0 >> $env:GITHUB_PATH
- name: Cache Maven packages
uses: actions/cache@v4
with:
path: ~/.m2
key: client-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2-
- - name: Build IoTDB server
- # 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,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
- - name: Show test result
- if: failure()
- run: cat
iotdb-client/client-cpp/target/build/test/Testing/Temporary/LastTest_*.log
-
- build-win:
- runs-on: windows-latest
-
- steps:
- - uses: actions/checkout@v4
- - name: Cache Maven packages
- uses: actions/cache@v4
- with:
- path: ~/.m2
- key: client-${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
- restore-keys: ${{ runner.os }}-m2-
- - name: Install Win_Flex_Bison
- run: choco install winflexbison3
- - name: Download Boost
- run: choco install boost-msvc-14.3 --version=1.84.0.1
- - name: Build IoTDB server
+ - name: Build IoTDB server and client
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,example/client-cpp-example -am -DskipTests
-D"boost.include.dir"="C:\local\boost_1_84_0"
-D"boost.library.dir"="C:\local\boost_1_84_0\stage\lib"
+ 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
- run: ./mvnw clean verify -P with-cpp -pl iotdb-client/client-cpp -am
-D"boost.include.dir"="C:\local\boost_1_84_0"
-D"boost.library.dir"="C:\local\boost_1_84_0\stage\lib"
+ run: ./mvnw clean verify -P with-cpp -pl iotdb-client/client-cpp -am
- name: Upload Artifact
if: failure()
uses: actions/upload-artifact@v4
@@ -103,3 +82,4 @@ jobs:
name: cpp-IT-${{ runner.os }}
path: iotdb-client/client-cpp/target/build/test/Testing
retention-days: 1
+
diff --git a/.github/workflows/client-go.yml b/.github/workflows/client-go.yml
index d4743f8434f..e84014dc97a 100644
--- a/.github/workflows/client-go.yml
+++ b/.github/workflows/client-go.yml
@@ -31,10 +31,7 @@ env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
jobs:
- unix:
- strategy:
- fail-fast: false
- max-parallel: 20
+ Test:
runs-on: ubuntu-latest
steps:
diff --git a/.github/workflows/client-python.yml
b/.github/workflows/client-python.yml
index 3f8c9832f22..6f95496236f 100644
--- a/.github/workflows/client-python.yml
+++ b/.github/workflows/client-python.yml
@@ -30,7 +30,7 @@ env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
jobs:
- unix:
+ Test:
runs-on: ubuntu-latest
steps:
diff --git a/.mvn/wrapper/maven-wrapper.properties
b/.mvn/wrapper/maven-wrapper.properties
index a5d2bffb942..75d1aa4d811 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
diff --git a/iotdb-client/client-py/requirements_dev.txt
b/iotdb-client/client-py/requirements_dev.txt
index 8068e8c747f..3fc588338b8 100644
--- a/iotdb-client/client-py/requirements_dev.txt
+++ b/iotdb-client/client-py/requirements_dev.txt
@@ -23,7 +23,6 @@ flake8==3.9.0
black==24.3.0
# Testcontainer
testcontainers==3.4.2
-requests<2.32.0
# For releases
twine==3.4.1
wheel==0.38.1
