From 672ea31ab9bfe351204ab3c1ae803b70633c758c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= <berykubik@gmail.com>
Date: Sat, 30 May 2026 20:33:14 +0200
Subject: [PATCH] Re-enable CI cache

---
 .github/workflows/ci.yaml       | 28 +++++++++++++++-------------
 .github/workflows/coverage.yaml |  5 +++++
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b9427e1927f6..de1a3be8aa79 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -5,6 +5,9 @@ name: CI
 on:
   pull_request:
   merge_group:
+  push:
+    branches:
+      - master
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -105,12 +108,13 @@ jobs:
         if: matrix.os == 'macos-latest'
         run: echo "::add-matcher::.github/rust.json"
 
-      # - name: Cache Dependencies
-      #   uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
-      #   with:
-      #     workspaces: |
-      #       . -> target
-      #       ./crates/proc-macro-srv/proc-macro-test/imp -> target
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
+        with:
+          cache-workspace-crates: true
+          workspaces: |
+            . -> target
+            ./crates/proc-macro-srv/proc-macro-test/imp -> target
 
       - name: Install nextest
         uses: taiki-e/install-action@nextest
@@ -144,8 +148,11 @@ jobs:
           rustup default stable
           rustup component add rustfmt
 
-      # - name: Cache Dependencies
-      #   uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
+        with:
+          cache-workspace-crates: "true"
+          key: wip2
 
       - name: Bump opt-level
         run: sed -i '/\[profile.dev]/a opt-level=1' Cargo.toml
@@ -213,9 +220,6 @@ jobs:
           rustup default nightly-2026-02-10
           rustup component add miri
 
-      # - name: Cache Dependencies
-      #   uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
-
       - run: cargo miri test -p intern
 
   # Weird targets to catch non-portable code
@@ -242,8 +246,6 @@ jobs:
           rustup update --no-self-update stable
           rustup target add ${{ matrix.target }}
 
-      # - name: Cache Dependencies
-      #   uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
 
       - run: cargo check --target=${{ matrix.target }} --all-targets -p ide
         if: ${{ matrix.ide-only }}
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
index 55edbbefbaa1..2802517d8006 100644
--- a/.github/workflows/coverage.yaml
+++ b/.github/workflows/coverage.yaml
@@ -30,6 +30,11 @@ jobs:
       - name: Install nextest
         uses: taiki-e/install-action@nextest
 
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
+        with:
+          cache-workspace-crates: true
+
       - name: Generate code coverage
         run: cargo llvm-cov --workspace --lcov --output-path lcov.info