From 82f8a07c4d7bf75529bf0822d17dc836afc8eb52 Mon Sep 17 00:00:00 2001
From: Tutu Moses <etu.moses@gmail.com>
Date: Sat, 29 Jun 2024 20:32:37 +0300
Subject: [PATCH] Update android.yml

---
 .github/workflows/android.yml | 134 +++++++++-------------------------
 1 file changed, 33 insertions(+), 101 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 51e03adca98..7877b57cbad 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,6 +1,9 @@
 name: Android Client CI
+
 on:
   push:
+    branches:
+      - master
   pull_request:
     branches:
       - master
@@ -9,122 +12,51 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout code
+        uses: actions/checkout@v2
 
-        # Set up JDK 17
       - name: Set up JDK 17
-        uses: actions/setup-java@v1
-        with:
-          java-version: 17
-
-        # Build with Gradle
-      - name: Build with Gradle
-        run: chmod +x gradlew && ./gradlew assembleDebug
-
-        # Upload APK
-      - name: Upload APK
-        uses: actions/upload-artifact@v2.2.0
-        with:
-          # Artifact name
-          name: android-client-app
-          # File path describing what artifact to upload
-          path: mifosng-android/build/outputs/apk/debug/mifosng-android-debug.apk
-
-  test:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-        # Set up JDK 17
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
-        with:
-          java-version: 17
-
-        # Test with Gradle
-      - name: Test App
-        run: ./gradlew test
-
-        # Upload test reports
-      - name: Upload Test Reports
-        uses: actions/upload-artifact@v2.2.0
+        uses: actions/setup-java@v2
         with:
-          # Artifact name
-          name: test-reports
-          # File path describing what artifact to upload
-          path: mifosng-android/build/reports/tests/**
-
-  lintCheck:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
+          distribution: 'zulu'
+          java-version: '17'
 
-        # Set up JDK 17
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
+      - name: Cache Gradle packages
+        uses: actions/cache@v2
         with:
-          java-version: 17
-
-        # Perform Lint Check
-      - name: Lint Check
-        run: ./gradlew lint
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            gradle-${{ runner.os }}-
 
-        # Upload reports
-      - name: Upload Lint Reports
-        uses: actions/upload-artifact@v2.2.0
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v2
         with:
-          # Artifact name
-          name: lint-reports
-          # File path describing what artifact to upload
-          path: mifosng-android/build/reports/lint-results**
+          api-level: 30
+          build-tools: 30.0.3
 
-  pmd:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
+      - name: Grant execute permission for gradlew
+        run: chmod +x ./gradlew
 
-        # Set up JDK 17
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
-        with:
-          java-version: 17
-
-        # Perform PMD Check
-      - name: PMD Check
-        run: ./gradlew pmd
+      - name: Build with Gradle
+        run: ./gradlew assembleDebug
 
-        # Upload reports
-      - name: Upload PMD Reports
-        uses: actions/upload-artifact@v2.2.0
+      - name: Upload APK
+        uses: actions/upload-artifact@v2
         with:
-          # Artifact name
-          name: pmd-reports
-          # File path describing what artifact to upload
-          path: mifosng-android/build/reports/pmd/**
+          name: android-client-app
+          path: app/build/outputs/apk/debug/app-debug.apk
 
-  checkstyle:
+  test:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout code
+        uses: actions/checkout@v2
 
-        # Set up JDK 17
       - name: Set up JDK 17
-        uses: actions/setup-java@v1
-        with:
-          java-version: 17
-        # Perform Checkstyle Check
-      - name: Checkstyle
-        run: ./gradlew checkstyle
-
-        # Upload reports
-      - name: Upload Checkstyle Reports
-        uses: actions/upload-artifact@v2.2.0
+        uses: actions/setup-java@v2
         with:
-          # Artifact name
-          name: checkstyle-reports
-          # File path describing what artifact to upload
-          path: mifosng-android/build/reports/checkstyle/**
\ No newline at end of file
+