From e90aa2f6315c588504ad1e4e620e23de35457752 Mon Sep 17 00:00:00 2001 From: Ji Bin Date: Tue, 16 Jan 2024 07:12:44 +0800 Subject: [PATCH] ci: some updates for ci (#251) Signed-off-by: Ji Bin --- .github/mergify.yml | 12 ++++++++++++ .github/workflows/main.yaml | 12 ++++++------ DEVELOPMENT.md | 13 +++++++------ README.md | 4 ++-- src/include/milvus/types/CalcDistanceArguments.h | 1 + src/include/milvus/types/CollectionDesc.h | 1 + src/include/milvus/types/CollectionInfo.h | 1 + src/include/milvus/types/CollectionSchema.h | 1 + src/include/milvus/types/CollectionStat.h | 1 + src/include/milvus/types/ConnectParam.h | 1 + src/include/milvus/types/Constants.h | 1 + src/include/milvus/types/FieldSchema.h | 1 + src/include/milvus/types/HybridTimestamp.h | 1 + src/include/milvus/types/IDArray.h | 1 + src/include/milvus/types/IndexDesc.h | 1 + src/include/milvus/types/IndexState.h | 1 + src/include/milvus/types/PartitionInfo.h | 1 + src/include/milvus/types/QueryArguments.h | 1 + src/include/milvus/types/SegmentInfo.h | 1 + 19 files changed, 42 insertions(+), 14 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index d5b2057..e09cc2b 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -3,7 +3,12 @@ pull_request_rules: conditions: - base=master - "status-success=Build and test AMD64 Ubuntu 18.04" + - "status-success=Build and test AMD64 Ubuntu 22.04" - "status-success=Build and test AMD64 CentOS 7" + - "status-success=Build and test AMD64 Fedora 38" + - "status-success=Build and test AMD64 Fedora 39" + - "status-success=Build and test macOS 11" + - "status-success=Build and test windows" actions: label: add: @@ -15,6 +20,13 @@ pull_request_rules: - or: - "check-failure=Build and test AMD64 Ubuntu 18.04" - "check-failure=Build and test AMD64 CentOS 7" + - "check-failure=Build and test AMD64 Ubuntu 18.04" + - "check-failure=Build and test AMD64 Ubuntu 22.04" + - "check-failure=Build and test AMD64 CentOS 7" + - "check-failure=Build and test AMD64 Fedora 38" + - "check-failure=Build and test AMD64 Fedora 39" + - "check-failure=Build and test macOS 11" + - "check-failure=Build and test windows" actions: label: remove: diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index c5ee480..721a2c2 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -50,13 +50,13 @@ jobs: image: centos:7 key: c7 - distro: Fedora - version: 36 - image: fedora:36 - key: fc36 + version: 38 + image: fedora:38 + key: fc38 - distro: Fedora - version: 37 - image: fedora:37 - key: fc37 + version: 39 + image: fedora:39 + key: fc39 env: CCACHE_DIR: ${{ github.workspace }}/.ccache CCACHE_COMPILERCHECK: content diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 30ba5b8..c1af369 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -5,18 +5,19 @@ Please file an [issue](https://github.com/milvus-io/milvus-sdk-cpp/issues/new) i # Supported Platforms - Linux - macOS +- Windows # Build C++ SDK with your Linux ## Setup development environment Currently, we tested the below platform and compilers for developing Milvus C++ SDK. -| Platform | Version | Compiler Tested | Support | -| -------- | ------------ | --------------- | ----------------------------- | -| Linux | Ubuntu 18.04 | GCC 7.0.0 | Full (Compile, Lint, Testing) | -| Linux | Ubuntu 20.04 | GCC 9.3.0 | Full (Compile, Lint, Testing) | -| Linux | Fedora 34/35 | GCC 11.2 | Compile, Testing | -| Linux | CentOS 7 | GCC 4.8.5 | Compile, Testing | +| Platform | Version | Compiler Tested | Support | +| -------- | ------------ | -------------------- | ----------------------------- | +| Linux | Ubuntu 18.04 | GCC 7.0.0 | Full (Compile, Lint, Testing) | +| Linux | Ubuntu 20.04 | GCC 9.3.0 | Full (Compile, Lint, Testing) | +| Linux | Fedora 38/39 | GCC 11.2 | Compile, Testing | +| Linux | CentOS 7 | GCC7 (devtoolset-7) | Compile, Testing | ### Clone the code diff --git a/README.md b/README.md index 636738f..f833b89 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,9 @@ To contribute to this project, please read our [contribution guidelines](https:/ The following collection shows Milvus versions and recommended milvus-cpp-sdk versions: -|Milvus version| Recommended SDK version | +| Milvus version | Recommended SDK branch | |:-----:|:-----:| -| 2.0.x | 2.0.0 | +| 2.3.x | main | ## Installation diff --git a/src/include/milvus/types/CalcDistanceArguments.h b/src/include/milvus/types/CalcDistanceArguments.h index b672ce0..2b3d5e2 100644 --- a/src/include/milvus/types/CalcDistanceArguments.h +++ b/src/include/milvus/types/CalcDistanceArguments.h @@ -16,6 +16,7 @@ #pragma once +#include #include #include diff --git a/src/include/milvus/types/CollectionDesc.h b/src/include/milvus/types/CollectionDesc.h index fdc02a7..94f2821 100644 --- a/src/include/milvus/types/CollectionDesc.h +++ b/src/include/milvus/types/CollectionDesc.h @@ -16,6 +16,7 @@ #pragma once +#include #include #include diff --git a/src/include/milvus/types/CollectionInfo.h b/src/include/milvus/types/CollectionInfo.h index 82d4c69..293077a 100644 --- a/src/include/milvus/types/CollectionInfo.h +++ b/src/include/milvus/types/CollectionInfo.h @@ -16,6 +16,7 @@ #pragma once +#include #include #include diff --git a/src/include/milvus/types/CollectionSchema.h b/src/include/milvus/types/CollectionSchema.h index ae0ebd5..7facf12 100644 --- a/src/include/milvus/types/CollectionSchema.h +++ b/src/include/milvus/types/CollectionSchema.h @@ -16,6 +16,7 @@ #pragma once +#include #include #include #include diff --git a/src/include/milvus/types/CollectionStat.h b/src/include/milvus/types/CollectionStat.h index e92ef3e..21aad49 100644 --- a/src/include/milvus/types/CollectionStat.h +++ b/src/include/milvus/types/CollectionStat.h @@ -16,6 +16,7 @@ #pragma once +#include #include #include diff --git a/src/include/milvus/types/ConnectParam.h b/src/include/milvus/types/ConnectParam.h index 730a9da..e03d8cf 100644 --- a/src/include/milvus/types/ConnectParam.h +++ b/src/include/milvus/types/ConnectParam.h @@ -16,6 +16,7 @@ #pragma once +#include #include namespace milvus { diff --git a/src/include/milvus/types/Constants.h b/src/include/milvus/types/Constants.h index 216a165..6af76d7 100644 --- a/src/include/milvus/types/Constants.h +++ b/src/include/milvus/types/Constants.h @@ -15,6 +15,7 @@ // limitations under the License. #pragma once +#include #include namespace milvus { diff --git a/src/include/milvus/types/FieldSchema.h b/src/include/milvus/types/FieldSchema.h index 91edec1..546463e 100644 --- a/src/include/milvus/types/FieldSchema.h +++ b/src/include/milvus/types/FieldSchema.h @@ -16,6 +16,7 @@ #pragma once +#include #include #include diff --git a/src/include/milvus/types/HybridTimestamp.h b/src/include/milvus/types/HybridTimestamp.h index 26be4c8..da32f88 100644 --- a/src/include/milvus/types/HybridTimestamp.h +++ b/src/include/milvus/types/HybridTimestamp.h @@ -16,6 +16,7 @@ #pragma once #include +#include #include "Constants.h" diff --git a/src/include/milvus/types/IDArray.h b/src/include/milvus/types/IDArray.h index 38bc066..38429ba 100644 --- a/src/include/milvus/types/IDArray.h +++ b/src/include/milvus/types/IDArray.h @@ -16,6 +16,7 @@ #pragma once +#include #include #include diff --git a/src/include/milvus/types/IndexDesc.h b/src/include/milvus/types/IndexDesc.h index 18594d4..4202469 100644 --- a/src/include/milvus/types/IndexDesc.h +++ b/src/include/milvus/types/IndexDesc.h @@ -16,6 +16,7 @@ #pragma once +#include #include #include #include diff --git a/src/include/milvus/types/IndexState.h b/src/include/milvus/types/IndexState.h index b7f04b5..adf823b 100644 --- a/src/include/milvus/types/IndexState.h +++ b/src/include/milvus/types/IndexState.h @@ -16,6 +16,7 @@ #pragma once +#include #include namespace milvus { diff --git a/src/include/milvus/types/PartitionInfo.h b/src/include/milvus/types/PartitionInfo.h index f0467c2..48b5968 100644 --- a/src/include/milvus/types/PartitionInfo.h +++ b/src/include/milvus/types/PartitionInfo.h @@ -16,6 +16,7 @@ #pragma once +#include #include #include diff --git a/src/include/milvus/types/QueryArguments.h b/src/include/milvus/types/QueryArguments.h index cb1984c..9ae8105 100644 --- a/src/include/milvus/types/QueryArguments.h +++ b/src/include/milvus/types/QueryArguments.h @@ -16,6 +16,7 @@ #pragma once +#include #include #include diff --git a/src/include/milvus/types/SegmentInfo.h b/src/include/milvus/types/SegmentInfo.h index c80b751..2b57b20 100644 --- a/src/include/milvus/types/SegmentInfo.h +++ b/src/include/milvus/types/SegmentInfo.h @@ -16,6 +16,7 @@ #pragma once +#include #include #include