This is an automated email from the ASF dual-hosted git repository.
hulk pushed a commit to branch unstable
in repository https://gitbox.apache.org/repos/asf/kvrocks.git
The following commit(s) were added to refs/heads/unstable by this push:
new c7d91ed72 fix(ci): add check-and-lint success as a merge condition
(#3423)
c7d91ed72 is described below
commit c7d91ed722ec91299d8e2caf439f7ffcf5db4c35
Author: 纪华裕 <[email protected]>
AuthorDate: Mon Apr 6 09:35:51 2026 +0800
fix(ci): add check-and-lint success as a merge condition (#3423)
---
.github/workflows/kvrocks.yaml | 3 ++-
src/config/config.cc | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/kvrocks.yaml b/.github/workflows/kvrocks.yaml
index 3e7a8f0b3..3822618fd 100644
--- a/.github/workflows/kvrocks.yaml
+++ b/.github/workflows/kvrocks.yaml
@@ -678,7 +678,8 @@ jobs:
if: ${{ needs.precondition.outputs.docs_only != 'true' }}
run: |
if [[ ! ( \
- "${{ needs.build-and-test.result }}" == "success" \
+ "${{ needs.check-and-lint.result }}" == "success" \
+ && "${{ needs.build-and-test.result }}" == "success" \
&& "${{ needs.build-and-test-in-container.result }}" ==
"success" \
&& "${{ needs.check-docker.result }}" == "success" \
) ]]; then
diff --git a/src/config/config.cc b/src/config/config.cc
index 5abfa2bd0..e7bf980ce 100644
--- a/src/config/config.cc
+++ b/src/config/config.cc
@@ -239,7 +239,8 @@ Config::Config() {
{"resp3-enabled", false, new YesNoField(&resp3_enabled, true)},
{"repl-namespace-enabled", false, new
YesNoField(&repl_namespace_enabled, false)},
{"proto-max-bulk-len", false,
- new IntWithUnitField<uint64_t>(&proto_max_bulk_len, std::to_string(512
* MiB), 1 * MiB, 4ULL * 1024 * 1024 * 1024)},
+ new IntWithUnitField<uint64_t>(&proto_max_bulk_len, std::to_string(512
* MiB), 1 * MiB,
+ 4ULL * 1024 * 1024 * 1024)},
{"json-max-nesting-depth", false, new IntField(&json_max_nesting_depth,
1024, 0, INT_MAX)},
{"json-storage-format", false,
new EnumField<JsonStorageFormat>(&json_storage_format,
json_storage_formats, JsonStorageFormat::JSON)},