From 20143545540bf2acc968bded931648215fa45972 Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Tue, 4 Feb 2025 09:40:51 -0500
Subject: [PATCH 1/5] dataconnect.yml: append the run_id to the saved cache
 keys

---
 .github/workflows/dataconnect.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dataconnect.yml b/.github/workflows/dataconnect.yml
index 1049d031209..2148cc17b12 100644
--- a/.github/workflows/dataconnect.yml
+++ b/.github/workflows/dataconnect.yml
@@ -111,12 +111,12 @@ jobs:
 
       - name: Save Gradle cache
         uses: actions/cache/save@v4
-        if: github.event_name == 'schedule'
+        #if: github.event_name == 'schedule'
         with:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
-          key: gradle-cache-jqnvfzw6w7
+          key: gradle-cache-jqnvfzw6w7-${{ github.run_id }}
 
       - name: Enable KVM group permissions for Android Emulator
         run: |
@@ -155,7 +155,7 @@ jobs:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd-cache-zhdsn586je-api${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}
+          key: avd-cache-zhdsn586je-api${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}-${{ github.run_id }}
 
       - name: Data Connect Emulator
         run: |
@@ -186,7 +186,6 @@ jobs:
             set -eux && ./gradlew ${{ (inputs.gradleInfoLog && '--info') || '' }} :firebase-dataconnect:connectedCheck :firebase-dataconnect:connectors:connectedCheck
 
       - uses: actions/upload-artifact@v4
-        if: true
         with:
           name: logs
           path: "**/*.log"

From 93e655e2c46bbf0919afc52f9578b16d7abfefab Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Tue, 4 Feb 2025 09:42:59 -0500
Subject: [PATCH 2/5] dataconnect.yml: temporarily comment out scheduling
 filter

---
 .github/workflows/dataconnect.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dataconnect.yml b/.github/workflows/dataconnect.yml
index 2148cc17b12..2ed11777797 100644
--- a/.github/workflows/dataconnect.yml
+++ b/.github/workflows/dataconnect.yml
@@ -138,7 +138,7 @@ jobs:
       - run: echo "github.event_name == '${{ github.event_name }}' steps.avd-cache.outputs.cache-hit == '${{ steps.avd-cache.outputs.cache-hit }}'"
 
       - name: Create AVD
-        if: github.event_name == 'schedule' || steps.avd-cache.outputs.cache-hit != 'true'
+        #if: github.event_name == 'schedule' || steps.avd-cache.outputs.cache-hit != 'true'
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}

From 1a91c2982b76b7935c6b5715fee793ed1a57baf3 Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Tue, 4 Feb 2025 10:00:13 -0500
Subject: [PATCH 3/5] empty commit to trigger workflows


From a483fd3a7fcfd2254926c144c4a2dbad5b61042e Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Tue, 4 Feb 2025 10:45:05 -0500
Subject: [PATCH 4/5] dataconnect.yml: unconditionally save and cache too

---
 .github/workflows/dataconnect.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dataconnect.yml b/.github/workflows/dataconnect.yml
index 2ed11777797..c6a98e10189 100644
--- a/.github/workflows/dataconnect.yml
+++ b/.github/workflows/dataconnect.yml
@@ -150,7 +150,7 @@ jobs:
 
       - name: Save AVD cache
         uses: actions/cache/save@v4
-        if: github.event_name == 'schedule'
+        #if: github.event_name == 'schedule'
         with:
           path: |
             ~/.android/avd/*

From c6583dd765fbe057efd7cae73e63b4bf1a79cb3c Mon Sep 17 00:00:00 2001
From: Denver Coneybeare <dconeybe@google.com>
Date: Tue, 4 Feb 2025 19:07:56 +0000
Subject: [PATCH 5/5] dataconnect.yml: uncomment temporarily-commented code

---
 .github/workflows/dataconnect.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dataconnect.yml b/.github/workflows/dataconnect.yml
index c6a98e10189..16c43da7d63 100644
--- a/.github/workflows/dataconnect.yml
+++ b/.github/workflows/dataconnect.yml
@@ -111,7 +111,7 @@ jobs:
 
       - name: Save Gradle cache
         uses: actions/cache/save@v4
-        #if: github.event_name == 'schedule'
+        if: github.event_name == 'schedule'
         with:
           path: |
             ~/.gradle/caches
@@ -138,7 +138,7 @@ jobs:
       - run: echo "github.event_name == '${{ github.event_name }}' steps.avd-cache.outputs.cache-hit == '${{ steps.avd-cache.outputs.cache-hit }}'"
 
       - name: Create AVD
-        #if: github.event_name == 'schedule' || steps.avd-cache.outputs.cache-hit != 'true'
+        if: github.event_name == 'schedule' || steps.avd-cache.outputs.cache-hit != 'true'
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}
@@ -150,7 +150,7 @@ jobs:
 
       - name: Save AVD cache
         uses: actions/cache/save@v4
-        #if: github.event_name == 'schedule'
+        if: github.event_name == 'schedule'
         with:
           path: |
             ~/.android/avd/*