Merge branch 'unstable' into twa_agg

Author: aleksraiden

.github/workflows/kvrocks.yaml

@@ -329,8 +329,8 @@ jobs:
         run: pip install gcovr==5.0 # 5.1 is not supported
         if: ${{ matrix.sonarcloud }}
 
-      - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@v3
+      - name: Install Build Wrapper
+        uses: SonarSource/sonarqube-scan-action/install-build-wrapper@v6.0.0
         if: ${{ matrix.sonarcloud }}
 
       - name: Build Kvrocks

.github/workflows/sonar.yaml

@@ -33,8 +33,8 @@ jobs:
           repository: ${{ github.event.workflow_run.head_repository.full_name }}
           ref: ${{ github.event.workflow_run.head_sha }}
           fetch-depth: 0
-      - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@v3
+      - name: Install Build Wrapper
+        uses: SonarSource/sonarqube-scan-action/install-build-wrapper@v6.0.0
       - name: 'Download code coverage'
         uses: actions/github-script@v7
         with:
@@ -66,18 +66,22 @@ jobs:
         with:
           python-version: 3.x
 
-      - name: Run sonar-scanner
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
+      - name: Extract PR number
         run: |
           PR_NUMBER=$(jq -r '.number | select (.!=null)' sonarcloud-data/github-event.json)
-          echo "The PR number is $PR_NUMBER"
+          echo "PR_NUMBER=$PR_NUMBER" >> "$GITHUB_ENV"
+          echo "The PR number is ${PR_NUMBER:-<none>}"
 
-          sonar-scanner \
-            --define sonar.cfamily.build-wrapper-output="sonarcloud-data" \
-            --define sonar.coverageReportPaths=sonarcloud-data/coverage.xml \
-            --define sonar.projectKey=apache_kvrocks \
-            --define sonar.organization=apache \
-            --define sonar.scm.revision=${{ github.event.workflow_run.head_sha }} \
-            --define sonar.pullrequest.key=$PR_NUMBER
+      - name: SonarQube Scan
+        uses: SonarSource/sonarqube-scan-action@v6.0.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
+        with:
+          args: >
+            -Dsonar.cfamily.build-wrapper-output=sonarcloud-data
+            -Dsonar.coverageReportPaths=sonarcloud-data/coverage.xml
+            -Dsonar.projectKey=apache_kvrocks
+            -Dsonar.organization=apache
+            -Dsonar.scm.revision=${{ github.event.workflow_run.head_sha }}
+            -Dsonar.pullrequest.key=${{ env.PR_NUMBER }}

cmake/jsoncons.cmake

@@ -20,8 +20,8 @@ include_guard()
 include(cmake/utils.cmake)
 
 FetchContent_DeclareGitHubWithMirror(jsoncons
-  danielaparker/jsoncons v1.4.3
-  MD5=62dad69488c5618f56283ef14d6c1e16
+  danielaparker/jsoncons v1.5.0
+  MD5=34fabe18f29c4e5c514eaefb5bb50d09
 )
 
 FetchContent_MakeAvailableWithArgs(jsoncons

cmake/modules/FindZLIB.cmake

@@ -22,7 +22,7 @@ if(zlib_SOURCE_DIR)
 
   add_library(zlib_with_headers INTERFACE) # rocksdb use it
   target_include_directories(zlib_with_headers INTERFACE $<BUILD_INTERFACE:${zlib_SOURCE_DIR}> $<BUILD_INTERFACE:${zlib_BINARY_DIR}>)
-  target_link_libraries(zlib_with_headers INTERFACE zlib)
+  target_link_libraries(zlib_with_headers INTERFACE zlib-ng)
   add_library(ZLIB::ZLIB ALIAS zlib_with_headers)
-  install(TARGETS zlib zlib_with_headers EXPORT RocksDBTargets) # export for install(...)
+  install(TARGETS zlib-ng zlib_with_headers EXPORT RocksDBTargets) # export for install(...)
 endif()

cmake/zlib.cmake

@@ -20,8 +20,8 @@ include_guard()
 include(cmake/utils.cmake)
 
 FetchContent_DeclareGitHubWithMirror(zlib
-  zlib-ng/zlib-ng 2.2.4
-  MD5=9fbaac3919af8d5a0ad5726ef9c7c30b
+  zlib-ng/zlib-ng 2.3.2
+  MD5=7818ea3f3ad80873674faf500fd12a0d
 )
 
 FetchContent_MakeAvailableWithArgs(zlib

x.py

@@ -32,7 +32,7 @@
 CMAKE_REQUIRE_VERSION = (3, 16, 0)
 CLANG_FORMAT_REQUIRED_VERSION = (18, 0, 0)
 CLANG_TIDY_REQUIRED_VERSION = (18, 0, 0)
-GOLANGCI_LINT_REQUIRED_VERSION = (2, 6, 0)
+GOLANGCI_LINT_REQUIRED_VERSION = (2, 7, 0)
 
 SEMVER_REGEX = re.compile(
     r"""