From 84844ab7d99118069222e6620f08edc64709af5f Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cecile.tonglet@cecton.com>
Date: Mon, 6 Nov 2023 09:08:36 +0100
Subject: [PATCH 1/2] Fix incorrect use of Swatinem/rust-cache

---
 .github/workflows/clippy.yml      | 4 ++++
 .github/workflows/main-checks.yml | 6 ++++++
 .github/workflows/size-cmp.yml    | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
index f8abed21053..f80428a277d 100644
--- a/.github/workflows/clippy.yml
+++ b/.github/workflows/clippy.yml
@@ -32,6 +32,8 @@ jobs:
           components: clippy
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          key: profile-${{ matrix.profile }}
 
       - name: Lint feature soundness
         if: matrix.profile == 'dev'
@@ -73,6 +75,8 @@ jobs:
           components: clippy
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          key: toolchain-${{ matrix.toolchain }}
 
       - name: Run clippy
         run: |
diff --git a/.github/workflows/main-checks.yml b/.github/workflows/main-checks.yml
index e0bb2ba7e81..7c47dd10ab7 100644
--- a/.github/workflows/main-checks.yml
+++ b/.github/workflows/main-checks.yml
@@ -74,6 +74,8 @@ jobs:
       - uses: actions/checkout@v4
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          key: toolchain-${{ matrix.toolchain }}
 
       # for wasm-bindgen-cli, always use stable rust
       - name: Setup toolchain
@@ -131,6 +133,8 @@ jobs:
           toolchain: ${{ matrix.toolchain }}
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          key: toolchain-${{ matrix.toolchain }}
 
       - name: Run native tests
         env:
@@ -159,6 +163,8 @@ jobs:
           toolchain: nightly
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          key: toolchain-${{ matrix.toolchain }}
 
       - name: Run tests
         env:
diff --git a/.github/workflows/size-cmp.yml b/.github/workflows/size-cmp.yml
index 066dbb287c0..11b32aa7b33 100644
--- a/.github/workflows/size-cmp.yml
+++ b/.github/workflows/size-cmp.yml
@@ -46,6 +46,8 @@ jobs:
 
       - name: Restore Rust cache for master
         uses: Swatinem/rust-cache@v2
+        with:
+          key: target-${{ matrix.target }}
 
       - name: Setup Trunk
         uses: jetli/trunk-action@v0.4.0

From 1a1743b6c8e2761a611cf4305d81ce85a40c2f79 Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cecile.tonglet@cecton.com>
Date: Mon, 6 Nov 2023 09:32:47 +0100
Subject: [PATCH 2/2] Trigger CI