Kaynağa Gözat

Fix: Match OnePlus cache key pattern with detailed keys and progressive fallbacks

- Use full cache_key with kernel_version, android_version, variant, and feature_set
- Provide two progressive restore_key prefixes instead of generic version numbers
- Matches OnePlus pattern for better cache hit rates across build variations
TheWildJames 4 ay önce
ebeveyn
işleme
7f8cfa589f
1 değiştirilmiş dosya ile 12 ekleme ve 14 silme
  1. 12 14
      .github/workflows/build.yml

+ 12 - 14
.github/workflows/build.yml

@@ -216,15 +216,15 @@ jobs:
           /home/runner/.ccache
           /home/runner/.ld_cache
         cache_keys: |
-          ${{ inputs.kernel_version }}
-          ${{ inputs.kernel_version }}
+          ${{ inputs.kernel_version }}-${{ inputs.android_version }}-${{ inputs.variant }}-${{ inputs.feature_set }}
+          ${{ inputs.kernel_version }}-${{ inputs.android_version }}-${{ inputs.variant }}-${{ inputs.feature_set }}
         cache_buckets: |
           ccache-cache
           lto-cache
         compression_level: 9
         restore_keys: |
-          5.10
-          5.15
+          ${{ inputs.kernel_version }}-${{ inputs.android_version }}-${{ inputs.variant }}-
+          ${{ inputs.kernel_version }}-${{ inputs.android_version }}-
 
     - name: Restore build caches (bazel, lto)
       id: restore-caches-bazel
@@ -239,17 +239,15 @@ jobs:
           /home/runner/.cache/bazel
           /home/runner/.ld_cache
         cache_keys: |
-          ${{ inputs.kernel_version }}
-          ${{ inputs.kernel_version }}
+          ${{ inputs.kernel_version }}-${{ inputs.android_version }}-${{ inputs.variant }}-${{ inputs.feature_set }}
+          ${{ inputs.kernel_version }}-${{ inputs.android_version }}-${{ inputs.variant }}-${{ inputs.feature_set }}
         cache_buckets: |
           bazel-cache
           lto-cache
         compression_level: 9
         restore_keys: |
-          5.15
-          6.1
-          6.6
-          6.12
+          ${{ inputs.kernel_version }}-${{ inputs.android_version }}-${{ inputs.variant }}-
+          ${{ inputs.kernel_version }}-${{ inputs.android_version }}-
 
     - name: Check cache hit
       run: |
@@ -295,8 +293,8 @@ jobs:
           /home/runner/.ccache
           /home/runner/.ld_cache
         cache_keys: |
-          ${{ inputs.kernel_version }}
-          ${{ inputs.kernel_version }}
+          ${{ inputs.kernel_version }}-${{ inputs.android_version }}-${{ inputs.variant }}-${{ inputs.feature_set }}
+          ${{ inputs.kernel_version }}-${{ inputs.android_version }}-${{ inputs.variant }}-${{ inputs.feature_set }}
         cache_buckets: |
           ccache-cache
           lto-cache
@@ -315,8 +313,8 @@ jobs:
           /home/runner/.cache/bazel
           /home/runner/.ld_cache
         cache_keys: |
-          ${{ inputs.kernel_version }}
-          ${{ inputs.kernel_version }}
+          ${{ inputs.kernel_version }}-${{ inputs.android_version }}-${{ inputs.variant }}-${{ inputs.feature_set }}
+          ${{ inputs.kernel_version }}-${{ inputs.android_version }}-${{ inputs.variant }}-${{ inputs.feature_set }}
         cache_buckets: |
           bazel-cache
           lto-cache