From cd4fe994bf8456576a3d28ac0b93f59c8acc74a8 Mon Sep 17 00:00:00 2001
From: Ray Ryan <ray@squareup.com>
Date: Mon, 5 Feb 2024 16:36:56 -0800
Subject: [PATCH] Upgrades `actions/cache` to v4

Also deletes redundant `push` trigger from `kotlin.yml.
---
 .github/actions/gradle-task/action.yml                | 6 +++---
 .github/actions/gradle-tasks-with-emulator/action.yml | 4 ++--
 .github/workflows/kotlin.yml                          | 3 ---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/actions/gradle-task/action.yml b/.github/actions/gradle-task/action.yml
index b3b9efcee..fa768a71b 100644
--- a/.github/actions/gradle-task/action.yml
+++ b/.github/actions/gradle-task/action.yml
@@ -59,7 +59,7 @@ runs :
     - name : restore cache for ${{inputs.write-cache-key}}
       id : restore-write-cache
       if : inputs.write-cache-key != 'null'
-      uses : actions/cache/restore@v3
+      uses : actions/cache/restore@v4
       with :
         path : |
           ~/.gradle/caches/build-cache-1
@@ -77,7 +77,7 @@ runs :
     # Skipped if the restore-cache-key wasn't set, or if the write-cache-key restore had an exact match.
     - name : restore cache for ${{inputs.restore-cache-key}}
       if : inputs.restore-cache-key != 'null' && steps.restore-write-cache.outputs.cache-hit != 'true'
-      uses : actions/cache/restore@v3
+      uses : actions/cache/restore@v4
       with :
         path : |
           ~/.gradle/caches/build-cache-1
@@ -110,7 +110,7 @@ runs :
     # Windows runners are welcome to *read* the cross-OS cache, but the directories get weird if
     # they try to write to it.
     - name : save the '${{inputs.write-cache-key}}' cache
-      uses : actions/cache/save@v3
+      uses : actions/cache/save@v4
       id : save-write-cache-key
       if : inputs.write-cache-key != 'null' && steps.restore-write-cache.outputs.cache-hit != 'true'
       with :
diff --git a/.github/actions/gradle-tasks-with-emulator/action.yml b/.github/actions/gradle-tasks-with-emulator/action.yml
index c7ff99fbe..2849a9df4 100644
--- a/.github/actions/gradle-tasks-with-emulator/action.yml
+++ b/.github/actions/gradle-tasks-with-emulator/action.yml
@@ -53,7 +53,7 @@ runs :
 
     # Get the AVD if it's already cached.
     - name : AVD cache
-      uses : actions/cache/restore@v3
+      uses : actions/cache/restore@v4
       id : restore-avd-cache
       with :
         path : |
@@ -80,7 +80,7 @@ runs :
     - name : cache new AVD before tests
       if : steps.restore-avd-cache.outputs.cache-hit != 'true'
       id : save-avd-cache
-      uses : actions/cache/save@v3
+      uses : actions/cache/save@v4
       with :
         path : |
           ~/.android/avd/*
diff --git a/.github/workflows/kotlin.yml b/.github/workflows/kotlin.yml
index 37e1ae5a5..e486a4c62 100644
--- a/.github/workflows/kotlin.yml
+++ b/.github/workflows/kotlin.yml
@@ -1,9 +1,6 @@
 name : Kotlin CI
 
 on :
-  push :
-    branches :
-      - main
   # Use pull_request_target so we can lock the runner down to run only on the main branch.
   # When we want to test changes to this workflow, then we can use:
   # pull_request :