From b01839d76118ea5d3956004cb07b009d6ef81414 Mon Sep 17 00:00:00 2001
From: Sanju S <spikeysanju98@gmail.com>
Date: Sat, 6 Nov 2021 01:22:25 +0530
Subject: [PATCH] Update `CI Workflow`

Signed-off-by: Sanju S <spikeysanju98@gmail.com>
---
 .github/workflows/android_build.yml | 33 ++++++++++++++++++++++-------
 .github/workflows/lint.yml          | 20 -----------------
 2 files changed, 25 insertions(+), 28 deletions(-)
 delete mode 100644 .github/workflows/lint.yml

diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml
index be2253f..3953911 100644
--- a/.github/workflows/android_build.yml
+++ b/.github/workflows/android_build.yml
@@ -1,6 +1,11 @@
-name: Android Build
+name: Android CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
 
-on: pull_request
 
 jobs:
   build:
@@ -10,14 +15,26 @@ jobs:
     steps:
       - uses: actions/checkout@v1
 
-      - name: Set Up JDK
+      - name: 🧱 Set Up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
-          
+          java-version: 11
 
-      - name: Run Tests
+      - name: 🧪 Run Tests
         run: ./gradlew test
 
-      - name: Build Project
-        run: ./gradlew assemble
+      - name: 🛠 Build Project with Spotless Check
+        run: ./gradlew spotlessCheck assemble lintDebug --stacktrace
+
+      - name: ⏳ Build with Gradle
+        run: ./gradlew build
+
+      - name: 🏗 Build APK
+        run: bash ./gradlew assembleDebug --stacktrace
+
+      - name: 🚀 Upload APK 📱
+        uses: actions/upload-artifact@v2
+        with:
+          name: app
+          path: app/build/outputs/apk/debug/app-debug.apk
+          retention-days: 3
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
deleted file mode 100644
index 64dad7a..0000000
--- a/.github/workflows/lint.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: KT Lint
-
-on: pull_request
-
-jobs:
-  lint:
-    name: Lint Check 🕵🏻‍♂️
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout Code 👨🏻‍💻
-        uses: actions/checkout@v2
-
-      - name: Lint Code Base 🧪
-        uses: docker://github/super-linter:v2.2.0
-        env:
-          VALIDATE_ALL_CODEBASE: true
-          VALIDATE_MD: false
-          VALIDATE_XML: true
-          VALIDATE_KOTLIN: true