From ed9c207af3acfb990bb10eb153b65e28e4e24f37 Mon Sep 17 00:00:00 2001
From: Austin Benoit <austinbenoit@google.com>
Date: Thu, 8 Jan 2026 16:21:45 -0500
Subject: [PATCH 1/4] chore: update actions cache to none depricated version

---
 .github/workflows/android.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index e086d3f9..d37c88aa 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -85,7 +85,7 @@ jobs:
 
       - name: Cache NDK
         id: cache_ndk
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: /tmp/android-ndk-r21e
           key: android-ndk-${{ matrix.os }}-r21e
@@ -146,7 +146,7 @@ jobs:
 
       - name: Cache ccache files
         id: cache_ccache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ccache_dir
           key: dev-test-ccache-${{ env.MATRIX_UNIQUE_NAME }}

From 2090084dc367ead003905bc132f2be9c6e4c0cf4 Mon Sep 17 00:00:00 2001
From: Austin Benoit <austinbenoit@google.com>
Date: Thu, 8 Jan 2026 16:30:10 -0500
Subject: [PATCH 2/4] Update download-artifact and upload-artifact to v4

---
 .github/workflows/android.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index d37c88aa..35a6d067 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -177,7 +177,7 @@ jobs:
           fi
 
       - name: Upload Android integration tests artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}
         with:
           name: testapps-android-${{ matrix.os }}
@@ -185,19 +185,20 @@ jobs:
           retention-days: ${{ env.artifactRetentionDays }}
 
       - name: Upload Android build results artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}
         with:
-          name: log-artifact
+          name: log-artifact-${{ matrix.os }}
           path: build-results-android-${{ matrix.os }}*
           retention-days: ${{ env.artifactRetentionDays }}
 
       - name: Download log artifacts
         if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: test_results
-          name: log-artifact
+          pattern: log-artifact-*
+          merge-multiple: true
 
       - name: Summarize build results
         if: ${{ !cancelled() }}

From 394d64fcaf828cd659355e0c07c2341e42f9f0ee Mon Sep 17 00:00:00 2001
From: Austin Benoit <austinbenoit@google.com>
Date: Thu, 8 Jan 2026 16:33:00 -0500
Subject: [PATCH 3/4] Update deprecated actions to newer versions

---
 .github/workflows/android.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 35a6d067..535b869c 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -63,7 +63,7 @@ jobs:
         if: runner.os == 'Windows'
         run: git config --system core.longpaths true
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
@@ -74,14 +74,14 @@ jobs:
           echo "GHA_INSTALL_CCACHE=1" >> $GITHUB_ENV
 
       - name: Setup python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python_version }}
           architecture: ${{ matrix.architecture }}
 
       - name: Add msbuild to PATH
         if: startsWith(matrix.os, 'windows')
-        uses: microsoft/setup-msbuild@v1.0.2
+        uses: microsoft/setup-msbuild@v2
 
       - name: Cache NDK
         id: cache_ndk
@@ -102,7 +102,7 @@ jobs:
           fi
 
       - name: Update homebrew (avoid bintray errors)
-        uses: nick-invision/retry@v2
+        uses: nick-invision/retry@v3
         if: startsWith(matrix.os, 'macos')
         with:
           timeout_minutes: 10
@@ -114,7 +114,7 @@ jobs:
             brew update
 
       - name: Install prerequisites
-        uses: nick-invision/retry@v2
+        uses: nick-invision/retry@v3
         with:
           timeout_minutes: 10
           max_attempts: 3

From 6b7aa0cba8aef0719ff737a3b74f7761f0d76e48 Mon Sep 17 00:00:00 2001
From: Austin Benoit <austinbenoit@google.com>
Date: Thu, 8 Jan 2026 16:35:55 -0500
Subject: [PATCH 4/4] Update python version to 3.9 in android workflow

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

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 535b869c..98b8c400 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -46,7 +46,7 @@ jobs:
       matrix:
         os: [macos-12, ubuntu-latest, windows-latest]
         architecture: [x64]
-        python_version: [3.7]
+        python_version: [3.9]
     steps:
       - name: setup Xcode version (macos)
         if: runner.os == 'macOS'