From d67d118a3051dd1256a8c08b12de77a48b5aef9a Mon Sep 17 00:00:00 2001
From: json <jason@skedgo.com>
Date: Wed, 6 Nov 2024 19:43:16 +0800
Subject: [PATCH] [22321] Updated github action workflow to support archiving
 of test results, included tripkit-android module

---
 .github/workflows/android_ci.yml | 16 +---------------
 tripkit-android                  |  2 +-
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml
index da348530..4ebc1e45 100644
--- a/.github/workflows/android_ci.yml
+++ b/.github/workflows/android_ci.yml
@@ -36,20 +36,6 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Create dummy keystore
-        run: |
-          keytool -genkeypair -alias mrwa -keyalg RSA -keystore /home/runner/work/traffic-wa-android/traffic-wa-android/mrwa.jks -keysize 2048 -validity 10000 -storepass dummypass -keypass dummypass -dname "CN=Dummy, OU=Dummy, O=Dummy, L=Dummy, S=Dummy, C=US"
-
-      - name: Create local.properties
-        run: |
-          echo "keystorePassword=dummypass" >> /home/runner/work/traffic-wa-android/traffic-wa-android/local.properties
-          echo "keystoreFile=/home/runner/work/traffic-wa-android/traffic-wa-android/mrwa.jks" >> /home/runner/work/traffic-wa-android/traffic-wa-android/local.properties
-          echo "googleMapsApiKey=dummyGoogleMapsApiKey" >> /home/runner/work/traffic-wa-android/traffic-wa-android/local.properties
-          echo "telemetryDeckAnalyticsKey=dummyTelemetryDeckKey" >> /home/runner/work/traffic-wa-android/traffic-wa-android/local.properties
-
-      - name: Build with Gradle
-        run: ./gradlew build
-
       - name: Run unit tests
         id: unit_tests
         run: ./gradlew test
@@ -59,7 +45,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: test-results
-          path: build/test-results/test
+          path: ./*/build/test-results/**/test*UnitTest
 
       - name: Comment on Pull Request for Unit Test Failures
         if: failure() && github.event_name == 'pull_request' && steps.unit_tests.outcome == 'failure'
diff --git a/tripkit-android b/tripkit-android
index 9a28c20f..d4c89296 160000
--- a/tripkit-android
+++ b/tripkit-android
@@ -1 +1 @@
-Subproject commit 9a28c20fc24e2509d2f420a3b8cc373b617ba8c5
+Subproject commit d4c892969a7e1913fb6847d6ef587a9ed67dfcb3