feat(ci): refactor dependency fetching and update arguments for improved flexibility

Author: jihuayu

.github/workflows/kvrocks.yaml

@@ -68,40 +68,25 @@ jobs:
         with:
           config: .github/config/licenserc.yml
 
-  prepare-deps-cache:
-    name: Prepare dependency cache
-    needs: [precondition]
-    if: ${{ needs.precondition.outputs.docs_only != 'true' }}
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v6
-      - name: Cache Kvrocks dependencies
-        id: cache-kvrocks-deps
-        uses: actions/cache@v5
-        with:
-          path: ${{ env.KVROCKS_DEPS_CACHE_DIR }}
-          key: kvrocks-full-deps-${{ hashFiles('x.py', 'CMakeLists.txt', 'cmake/**/*.cmake') }}
-          enableCrossOsArchive: true
-      - name: Warm Kvrocks dependency cache
-        if: ${{ steps.cache-kvrocks-deps.outputs.cache-hit != 'true' }}
-        run: |
-          ./x.py build .github/ci-cache-default --skip-build --dep-dir ${{ env.KVROCKS_DEPS_CACHE_DIR }}
-          ./x.py build .github/ci-cache-lua --skip-build --dep-dir ${{ env.KVROCKS_DEPS_CACHE_DIR }} -D ENABLE_LUAJIT=OFF
-          rm -rf .github/ci-cache-default .github/ci-cache-lua
-
   check-and-lint:
     name: Lint and check code
-    needs: [precondition, check-typos, prepare-deps-cache]
+    needs: [precondition, check-typos]
     if: ${{ needs.precondition.outputs.docs_only != 'true' }}
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v6
       - name: Restore Kvrocks dependency cache
+        id: cache-kvrocks-deps
         uses: actions/cache@v5
         with:
           path: ${{ env.KVROCKS_DEPS_CACHE_DIR }}
           key: kvrocks-full-deps-${{ hashFiles('x.py', 'CMakeLists.txt', 'cmake/**/*.cmake') }}
           enableCrossOsArchive: true
+      - name: Fetch Kvrocks dependencies
+        if: ${{ steps.cache-kvrocks-deps.outputs.cache-hit != 'true' }}
+        run: |
+          ./x.py fetch-deps ${{ env.KVROCKS_DEPS_CACHE_DIR }}
+          ./x.py fetch-deps ${{ env.KVROCKS_DEPS_CACHE_DIR }} -D ENABLE_LUAJIT=OFF
       - uses: actions/setup-go@v6
         with:
           go-version-file: 'tests/gocase/go.mod'
@@ -135,7 +120,7 @@ jobs:
 
   build-and-test:
     name: Build and test
-    needs: [precondition, check-typos, prepare-deps-cache]
+    needs: [precondition, check-typos]
     if: ${{ needs.precondition.outputs.docs_only != 'true' }}
     strategy:
       fail-fast: false
@@ -528,7 +513,7 @@ jobs:
 
   build-and-test-in-container:
     name: Build and test in container
-    needs: [precondition, check-typos, prepare-deps-cache]
+    needs: [precondition, check-typos]
     if: ${{ needs.precondition.outputs.docs_only != 'true' }}
     strategy:
       fail-fast: false

x.py

@@ -162,10 +162,10 @@ def build(dir: str, jobs: Optional[int] = None, ninja: bool = False, unittest: b
     run(cmake, *options, verbose=True, cwd=dir)
 
 
-def fetch_deps(dir: str) -> None:
+def fetch_deps(dir: str, D: List[str] = []) -> None:
     dir = os.path.abspath(dir)
     with TemporaryDirectory(prefix="kvrocks-fetch-deps-") as build_dir:
-        build(build_dir, dep_dir=dir, skip_build=True)
+        build(build_dir, D=D, dep_dir=dir, skip_build=True)
 
 
 def get_source_files(dir: Path) -> List[str]:
@@ -418,6 +418,8 @@ def test_go(dir: str, cli_path: str, rest: List[str]) -> None:
     )
     parser_fetch_deps.add_argument('dir', metavar='DEP_DIR', nargs='?', default='build-deps',
                               help="directory to store fetched archives of dependencies")
+    parser_fetch_deps.add_argument('-D', action='append', metavar='key=value',
+                              help='extra CMake definitions used to determine fetched dependencies')
     parser_fetch_deps.set_defaults(func=fetch_deps)
 
     parser_package = subparsers.add_parser(