From 1fced50c7b5170b720973655e0c11a49a82e79b9 Mon Sep 17 00:00:00 2001
From: Rain <rain1@fb.com>
Date: Sat, 26 Feb 2022 11:20:45 -0800
Subject: [PATCH] [ci] add extra cache keys to prevent trampling over caches

---
 .github/workflows/ci.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5ab18c899c7..c83adf259c9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,6 +25,8 @@ jobs:
           toolchain: stable
           components: rustfmt, clippy
       - uses: Swatinem/rust-cache@c5ed9ba6b7e1bb8aff90d43acd2f0af4990fa57c
+        with:
+          key: "lint"
       - name: Lint (clippy)
         uses: actions-rs/cargo@v1
         with:
@@ -69,6 +71,8 @@ jobs:
           toolchain: ${{ matrix.rust-version }}
           override: true
       - uses: Swatinem/rust-cache@c5ed9ba6b7e1bb8aff90d43acd2f0af4990fa57c
+        with:
+          key: "core"
 
       # Build all packages we care about one by one to ensure feature unification
       # doesn't happen.
@@ -133,6 +137,8 @@ jobs:
           toolchain: ${{ matrix.rust-version }}
           override: true
       - uses: Swatinem/rust-cache@c5ed9ba6b7e1bb8aff90d43acd2f0af4990fa57c
+        with:
+          key: "all-features"
       - name: Build
         uses: actions-rs/cargo@v1
         with:
@@ -173,6 +179,8 @@ jobs:
         with:
           toolchain: stable
       - uses: Swatinem/rust-cache@c5ed9ba6b7e1bb8aff90d43acd2f0af4990fa57c
+        with:
+          key: "build-rustdoc"
       - name: Build rustdoc
         uses: actions-rs/cargo@v1
         with:
@@ -203,6 +211,8 @@ jobs:
           toolchain: 1.58
           override: true
       - uses: Swatinem/rust-cache@c5ed9ba6b7e1bb8aff90d43acd2f0af4990fa57c
+        with:
+          key: "extended"
       - name: Build and test
         uses: actions-rs/cargo@v1
         with:
@@ -224,6 +234,8 @@ jobs:
           target: aarch64-unknown-linux-gnu
           override: true
       - uses: Swatinem/rust-cache@c5ed9ba6b7e1bb8aff90d43acd2f0af4990fa57c
+        with:
+          key: "aarch64-build"
       - name: Build
         uses: actions-rs/cargo@v1
         with: