Merge tag 'v0.86.8' into ci

v0.86.8

- backups: Support pinned messages

Author: tulir

.clippy.toml

@@ -7,5 +7,5 @@ disallowed-methods = [
     { path = "jni::JNIEnv::call_static_method_unchecked", reason = "use helper method instead" },
     { path = "jni::JNIEnv::new_object", reason = "use helper method instead" },
     { path = "jni::JNIEnv::new_object_unchecked", reason = "use helper method instead" },
-    ".." # keep any defaults
-]
+]
+allow-unwrap-in-tests = true

.github/actions/restore-cargo-cache/action.yml

@@ -20,7 +20,7 @@ outputs:
     value: ${{ steps.calculate.outputs['cache-key-current'] }}
   cache-key:
     description: 'Full cache key used for cargo artifacts'
-    value: ${{ steps.cache.outputs['cache-primary-key'] }}
+    value: ${{ steps.calculate-primary-cache-key.outputs['cache-primary-key'] }}
 runs:
   using: 'composite'
   steps:
@@ -29,8 +29,14 @@ runs:
       shell: bash
       run: python3 "${{ github.action_path }}/calculate_cache_keys.py" --toolchain "${{ inputs.toolchain }}" >> "$GITHUB_OUTPUT"
 
+    - name: Calculate primary cache key
+      id: calculate-primary-cache-key
+      shell: bash
+      run: echo "cache-primary-key=${{ inputs['job-name'] }}-${{ runner.os }}-${{ steps.calculate.outputs['rustc-version'] }}-${{ steps.calculate.outputs['cache-key-merge-base'] }}-${{ steps.calculate.outputs['cache-key-current'] }}" >> "$GITHUB_OUTPUT"
+
     - name: Restore cargo cache
       id: cache
+      if: ${{ env.DO_CLEAN_BUILD_AND_POPULATE_CACHE != 'true' }}
       uses: runs-on/cache/restore@3a15256b3556fbc5ae15f7f04598e4c7680e9c25 # v4
       with:
         # The special handling for the Windows target path comes because we overwrite
@@ -49,12 +55,16 @@ runs:
         # - We use the working tree hash as the final key component to ensure uniqueness per commit.
         # - On cache miss, we fall back, in order, to:
         #   1. Most recent cache from the last common ancestor with main.
+        #   1.1. Most recent cache from the last common ancestor with main's parent.
+        #   1.2. Most recent cache from the last common ancestor with main's grandparent.
         #   2. Most recent cache for this job/OS/rustc combination.
         #   3. Most recent cache for this job/OS combination.
         # This yields perfect hits on reruns while still warming cold builds with close matches.
         # See: https://docs.github.com/en/actions/reference/workflows-and-actions/dependency-caching#cache-key-matching
         key: ${{ inputs['job-name'] }}-${{ runner.os }}-${{ steps.calculate.outputs['rustc-version'] }}-${{ steps.calculate.outputs['cache-key-merge-base'] }}-${{ steps.calculate.outputs['cache-key-current'] }}
         restore-keys: |
           ${{ inputs['job-name'] }}-${{ runner.os }}-${{ steps.calculate.outputs['rustc-version'] }}-${{ steps.calculate.outputs['cache-key-merge-base'] }}-
+          ${{ inputs['job-name'] }}-${{ runner.os }}-${{ steps.calculate.outputs['rustc-version'] }}-${{ steps.calculate.outputs['cache-key-merge-base-parent'] }}-
+          ${{ inputs['job-name'] }}-${{ runner.os }}-${{ steps.calculate.outputs['rustc-version'] }}-${{ steps.calculate.outputs['cache-key-merge-base-grandparent'] }}-
           ${{ inputs['job-name'] }}-${{ runner.os }}-${{ steps.calculate.outputs['rustc-version'] }}-
           ${{ inputs['job-name'] }}-${{ runner.os }}-

.github/actions/restore-cargo-cache/calculate_cache_keys.py

@@ -42,6 +42,17 @@ def get_merge_base() -> str:
     return output
 
 
+def get_merge_base_parent(commit: str) -> str:
+    """Get the parent commit of the given commit."""
+    returncode, output, _ = run_command(
+        ['git', 'rev-parse', f'{commit}^'],
+        check=False,
+    )
+    if returncode != 0 or not output:
+        return 'none'
+    return output
+
+
 def get_working_tree_hash() -> str:
     """Get a hash representing the current working tree state."""
     returncode, working_tree_hash, _ = run_command(
@@ -109,16 +120,22 @@ def main() -> None:
     rustc_version_hash = hashlib.sha256(rustc_version.encode()).hexdigest()[:32]
 
     lca = get_merge_base()
+    lca_parent = get_merge_base_parent(lca)
+    lca_grandparent = get_merge_base_parent(lca_parent)
     current = get_working_tree_hash()
 
     print(f'rustc-version={rustc_version_hash}')
     print(f'cache-key-merge-base={lca}')
+    print(f'cache-key-merge-base-parent={lca_parent}')
+    print(f'cache-key-merge-base-grandparent={lca_grandparent}')
     print(f'cache-key-current={current}')
 
     debug_parts = [
         f'Toolchain={toolchain}',
         f'RustcVersion={rustc_version}',
         f'LCA={lca}',
+        f'LCAParent={lca_parent}',
+        f'LCAGrandparent={lca_grandparent}',
         f'Current={current}',
     ]
     print('Debug: ' + '; '.join(debug_parts), file=sys.stderr)

.github/actions/save-cargo-cache/action.yml

@@ -8,7 +8,7 @@ runs:
   using: 'composite'
   steps:
     - name: Save cargo cache
-      if: ${{ github.ref == 'refs/heads/main' }}
+      if: ${{ env.DO_CLEAN_BUILD_AND_POPULATE_CACHE == 'true' }}
       uses: runs-on/cache/save@3a15256b3556fbc5ae15f7f04598e4c7680e9c25 # v4
       with:
         # Keep this path list in sync with restore-cargo-cache/action.yml.