From eaff59e6fc3017bd6375e7b81be2be7f6bf2ddc3 Mon Sep 17 00:00:00 2001
From: deniscerri <64997243+deniscerri@users.noreply.github.com>
Date: Sat, 15 Apr 2023 15:37:49 +0200
Subject: [PATCH 1/5] Update android.yml

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

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index fb0985f0..f648e072 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -12,16 +12,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: set up JDK 11
-      uses: actions/setup-java@v3
-      with:
-        java-version: '11'
-        distribution: 'temurin'
-        cache: gradle
     - name: Create Properties File
       run: touch local.properties
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Build with Gradle
-      run: ./gradlew build
+    - name: Build Android App
+      uses: sparkfabrik/android-build-action@v1.3.4
+

From c0da816952dac10d87f936fc8f78b99a6bca50d6 Mon Sep 17 00:00:00 2001
From: deniscerri <64997243+deniscerri@users.noreply.github.com>
Date: Sat, 15 Apr 2023 15:40:34 +0200
Subject: [PATCH 2/5] Update android.yml

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

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index f648e072..52955024 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,8 +1,6 @@
 name: Android CI
 
 on:
-  push:
-    branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
 
@@ -12,8 +10,20 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    - uses: actions/checkout@v3
+    - name: set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        cache: gradle
+
+    - uses: gradle/gradle-build-action@v2
+      with:
+        gradle-version: 7.5
     - name: Create Properties File
       run: touch local.properties
-    - name: Build Android App
-      uses: sparkfabrik/android-build-action@v1.3.4
-
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew build

From 83ca51643bbe029028d7b29abb248d1b91ebd752 Mon Sep 17 00:00:00 2001
From: deniscerri <64997243+deniscerri@users.noreply.github.com>
Date: Sat, 15 Apr 2023 15:44:12 +0200
Subject: [PATCH 3/5] Update android.yml

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

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 52955024..eff237df 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -23,7 +23,10 @@ jobs:
         gradle-version: 7.5
     - name: Create Properties File
       run: touch local.properties
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Build with Gradle
-      run: ./gradlew build
+    - name: Build Android App
+      uses: sparkfabrik/android-build-action@v1.3.4
+      with:
+        project-path: android
+        ruby-version: "2.7.5"
+        bundler-version: "2.3.26"
+        fastlane-env: "debug"

From dfa778b389a9c36583161af49305cf990bc35771 Mon Sep 17 00:00:00 2001
From: deniscerri <64997243+deniscerri@users.noreply.github.com>
Date: Sat, 15 Apr 2023 15:45:17 +0200
Subject: [PATCH 4/5] Update android.yml

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

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index eff237df..3bce16ba 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,9 +1,12 @@
 name: Android CI
 
 on:
+  push:
+    branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
 
+
 jobs:
   build:
 

From 96cc901e8995dcebfdc9ebbe9d187ebdf8b614db Mon Sep 17 00:00:00 2001
From: deniscerri <64997243+deniscerri@users.noreply.github.com>
Date: Sat, 15 Apr 2023 15:48:50 +0200
Subject: [PATCH 5/5] Update android.yml

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

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 3bce16ba..5934dfb4 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -6,7 +6,6 @@ on:
   pull_request:
     branches: [ "main" ]
 
-
 jobs:
   build:
 
@@ -26,10 +25,7 @@ jobs:
         gradle-version: 7.5
     - name: Create Properties File
       run: touch local.properties
-    - name: Build Android App
-      uses: sparkfabrik/android-build-action@v1.3.4
-      with:
-        project-path: android
-        ruby-version: "2.7.5"
-        bundler-version: "2.3.26"
-        fastlane-env: "debug"
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew build