Skip to content

Commit

Permalink
Merge branch 'main' into NewAddonForEasyCurl
Browse files Browse the repository at this point in the history
  • Loading branch information
kenneth-jia authored May 6, 2024
2 parents f11fff6 + a146d10 commit 2b5c01b
Show file tree
Hide file tree
Showing 62 changed files with 2,553 additions and 1,986 deletions.
2 changes: 2 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ Checks: "*,\
-cppcoreguidelines-macro-usage,\
-cppcoreguidelines-avoid-magic-numbers,\
-cppcoreguidelines-avoid-non-const-global-variables,\
-cppcoreguidelines-avoid-const-or-ref-data-members,\
-cppcoreguidelines-avoid-do-while,\
-cppcoreguidelines-pro-type-vararg,\
-cppcoreguidelines-pro-bounds-array-to-pointer-decay,\
-cppcoreguidelines-pro-bounds-pointer-arithmetic,\
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/kafka_api_bazel_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ on:
- main

env:
KAFKA_SRC_LINK: https://downloads.apache.org/kafka/3.3.1/kafka_2.13-3.3.1.tgz
KAFKA_SRC_LINK: https://archive.apache.org/dist/kafka/3.3.1/kafka_2.13-3.3.1.tgz
CPU_CORE_NUM: 2
LIBRDKAFKA_TAG: v1.9.2
LIBRDKAFKA_TAG: v2.0.2

jobs:
kafka-api-bazel-build:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/kafka_api_ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ on:
- main

env:
KAFKA_SRC_LINK: https://downloads.apache.org/kafka/3.3.1/kafka_2.13-3.3.1.tgz
KAFKA_SRC_LINK: https://archive.apache.org/dist/kafka/3.3.1/kafka_2.13-3.3.1.tgz
CPU_CORE_NUM: 2
LIBRDKAFKA_TAG: v1.9.2
LIBRDKAFKA_TAG: v2.0.2
BUILD_SUB_DIR: builds/sub-build

jobs:
Expand Down
28 changes: 6 additions & 22 deletions .github/workflows/kafka_api_demo_conan_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Prepare (non-windows)
if: ${{!contains(matrix.os, 'windows')}}
run: |
if [[ ${OS_VERSION} == 'macos'* ]]; then
brew install conan
else
pip3 install conan
fi
- name: Prepare (windows)
if: ${{contains(matrix.os, 'windows')}}
- name: Prepare
run: |
pip3 install conan
pip3 install conan==1.59.0
- name: Build (non-windows)
if: ${{!contains(matrix.os, 'windows')}}
Expand All @@ -52,11 +42,8 @@ jobs:
cmake .. -G "Unix Makefiles"
cmake --build .
bin/kafka_sync_producer
bin/kafka_async_producer_copy_payload
bin/kafka_async_producer_not_copy_payload
bin/kafka_auto_commit_consumer
bin/kafka_manual_commit_consumer
bin/kafka_producer
bin/kafka_consumer
- name: Build (windows)
if: contains(matrix.os, 'windows')
Expand All @@ -70,9 +57,6 @@ jobs:
cmake ..
cmake --build .
bin/kafka_sync_producer.exe
bin/kafka_async_producer_copy_payload.exe
bin/kafka_async_producer_not_copy_payload.exe
bin/kafka_auto_commit_consumer.exe
bin/kafka_manual_commit_consumer.exe
bin/kafka_producer.exe
bin/kafka_consumer.exe
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION "3.8")
cmake_minimum_required(VERSION "3.20")

project("Modern C++ Kafka API" VERSION 1.0.0)

Expand Down
Loading

0 comments on commit 2b5c01b

Please sign in to comment.