From 788efd083bd617feb612df026c460f3ca5e24422 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <87148630+Jean-BaptisteC@users.noreply.github.com>
Date: Thu, 9 May 2024 23:37:21 +0200
Subject: [PATCH 1/2] Implement artifacts action in tests workflow

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

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f0c40d476..ec9395d43 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -34,3 +34,13 @@ jobs:
         run: ./gradlew test${{ matrix.buildvariant }}DebugUnitTest --no-daemon
       - name: Run Android Lint
         run: ./gradlew lint${{ matrix.buildvariant }}Debug --no-daemon
+      - name: Upload GoogleNormal artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: GoogleNormal_debug
+          path: app/build/outputs/apk/googleNormal/debug/app-google-normal-debug.apk
+      - name: Upload GoogleAutomotive artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: GoogleAutomotive_debug
+          path: app/build/outputs/apk/googleAutomotive/debug/app-google-automotive-debug.apk

From 07e0d55a98643be80e2690e77efe4a9e9ca1e1f3 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <87148630+Jean-BaptisteC@users.noreply.github.com>
Date: Thu, 9 May 2024 23:43:33 +0200
Subject: [PATCH 2/2] Use buildvariant

---
 .github/workflows/tests.yml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ec9395d43..68ea50ae6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -34,13 +34,8 @@ jobs:
         run: ./gradlew test${{ matrix.buildvariant }}DebugUnitTest --no-daemon
       - name: Run Android Lint
         run: ./gradlew lint${{ matrix.buildvariant }}Debug --no-daemon
-      - name: Upload GoogleNormal artifact
+      - name: Upload {{ matrix.buildvariant }} artifact
         uses: actions/upload-artifact@v4
         with:
-          name: GoogleNormal_debug
-          path: app/build/outputs/apk/googleNormal/debug/app-google-normal-debug.apk
-      - name: Upload GoogleAutomotive artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: GoogleAutomotive_debug
-          path: app/build/outputs/apk/googleAutomotive/debug/app-google-automotive-debug.apk
+          name: ${{ matrix.buildvariant }}_debug
+          path: app/build/outputs/apk/${{ matrix.buildvariant }}/debug/*