From 7c76514f1e412d49dbde7070841de1a68400ccde Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Thu, 11 May 2023 19:24:32 +0100
Subject: [PATCH] Deal with more GHA deprecations (#15576)

* Bump netlify PR

* Manually cache mypy cache dir

cache cache cache cache cache cache cache cache cache cache

* Changelog
---
 .github/workflows/docs-pr-netlify.yaml |  2 +-
 .github/workflows/tests.yml            | 15 ++++++++-------
 changelog.d/15576.misc                 |  1 +
 3 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 changelog.d/15576.misc

diff --git a/.github/workflows/docs-pr-netlify.yaml b/.github/workflows/docs-pr-netlify.yaml
index d613dd9e26..928bcae8cf 100644
--- a/.github/workflows/docs-pr-netlify.yaml
+++ b/.github/workflows/docs-pr-netlify.yaml
@@ -22,7 +22,7 @@ jobs:
           path: book
 
       - name: 📤 Deploy to Netlify
-        uses: matrix-org/netlify-pr-preview@v1
+        uses: matrix-org/netlify-pr-preview@v2
         with:
           path: book
           owner: ${{ github.event.workflow_run.head_repository.owner.login }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4333f55a53..e128fd54f7 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -107,14 +107,15 @@ jobs:
         uses: dtolnay/rust-toolchain@1.58.1
       - uses: Swatinem/rust-cache@v2
 
-      # NB: I have two concerns with this action:
-      # 1. We occasionally see odd mypy problems that aren't reproducible
-      #    locally with clean caches. I suspect some dodgy caching behaviour.
-      # 2. The action uses GHA machinery that's deprecated
-      #    (https://github.com/AustinScola/mypy-cache-github-action/issues/277)
-      # It may be simpler to use actions/cache ourselves to restore .mypy_cache.
+      # Cribbed from
+      # https://github.com/AustinScola/mypy-cache-github-action/blob/85ea4f2972abed39b33bd02c36e341b28ca59213/src/restore.ts#L10-L17
       - name: Restore/persist mypy's cache
-        uses: AustinScola/mypy-cache-github-action@df56268388422ee282636ee2c7a9cc55ec644a41
+        uses: actions/cache@v3
+        with:
+          path: |
+            .mypy_cache
+          key: mypy-cache-${{ github.context.sha }}
+          restore-keys: mypy-cache-
 
       - name: Run mypy
         run: poetry run mypy
diff --git a/changelog.d/15576.misc b/changelog.d/15576.misc
new file mode 100644
index 0000000000..9df71999d9
--- /dev/null
+++ b/changelog.d/15576.misc
@@ -0,0 +1 @@
+Deal with upcoming Github Actions deprecations.