From 3292e80e2bc7d41299c3126a1222857ad0e33db4 Mon Sep 17 00:00:00 2001
From: ThePieMonster <zacbraasch@gmail.com>
Date: Thu, 17 Mar 2022 12:56:24 -0500
Subject: [PATCH 1/2] Update gradle-build.yml

---
 .github/workflows/gradle-build.yml | 66 ++++++++++++++++--------------
 1 file changed, 36 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
index 3b15fd5..9c60fc6 100644
--- a/.github/workflows/gradle-build.yml
+++ b/.github/workflows/gradle-build.yml
@@ -52,6 +52,12 @@ jobs:
         echo "$LATESTRELEASETAG"
         echo "LATESTRELEASETAG=$LATESTRELEASETAG" >> $GITHUB_ENV
     
+    - name: Create Latest Release TXT File
+      working-directory : ${{ github.workspace }}/app
+      run : |
+        echo "Create Latest Release TXT File"
+        echo "${{ env.LATESTRELEASETAG }}" > LatestReleaseTag.txt
+    
     - name: Get Gradle VersionName
       working-directory : ${{ github.workspace }}/app
       run : |
@@ -66,7 +72,7 @@ jobs:
         echo "Create Gradle VersionName TXT File"
         echo "${{ env.VERSIONNAME }}" > VersionName.txt
 
-    - name: Check If Current Tag Equals Latest Release
+    - name: Check If Gradle Version Equals Latest Release Tag
       working-directory : ${{ github.workspace }}/app
       run : |
         VERSIONNAME=${{ env.VERSIONNAME }}
@@ -75,30 +81,30 @@ jobs:
         echo "Latest Release Tag: $LATESTRELEASETAG"
         if [ "$VERSIONNAME" = "$LATESTRELEASETAG" ]; then echo "Current Gradle Version is the same as GitHubs latest Release tag. This is a tagging conflict and can be resolved by updating the build.gradle file."; exit 1; else echo "All clear!"; fi
       
-    - name: Check If Current Tag Already Exists 
-      uses: mukunku/tag-exists-action@v1.0.0
-      id: checkTag
-      with: 
-        tag: ${{ env.VERSIONNAME }}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Output Tag Check 
-      run: |
-        echo "Tag Check: ${{ steps.checkTag.outputs.exists }}"
-        echo "TAGCHECK=${{ steps.checkTag.outputs.exists }}" >> $GITHUB_ENV
-
-    - name: Create Tag
-      if: env.TAGCHECK == format('false')
-      uses: actions/github-script@v5
-      with:
-        script: |
-          github.rest.git.createRef({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            ref: 'refs/tags/${{ env.VERSIONNAME }}',
-            sha: context.sha
-          })
+#    - name: Check If Current Tag Already Exists 
+#      uses: mukunku/tag-exists-action@v1.0.0
+#      id: checkTag
+#      with: 
+#        tag: ${{ env.VERSIONNAME }}
+#      env:
+#        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#
+#    - name: Output Tag Check 
+#      run: |
+#        echo "Tag Check: ${{ steps.checkTag.outputs.exists }}"
+#        echo "TAGCHECK=${{ steps.checkTag.outputs.exists }}" >> $GITHUB_ENV
+#
+#    - name: Create Tag
+#      if: env.TAGCHECK == format('false')
+#      uses: actions/github-script@v5
+#      with:
+#        script: |
+#          github.rest.git.createRef({
+#            owner: context.repo.owner,
+#            repo: context.repo.repo,
+#            ref: 'refs/tags/${{ env.VERSIONNAME }}',
+#            sha: context.sha
+#          })
       
     - name: Decode Keystore
       id: decode_keystore
@@ -153,11 +159,11 @@ jobs:
         name: VersionName.txt
         path: ${{ github.workspace }}/app/VersionName.txt
 
-    - name: Upload Artifact Changelog
-      uses: actions/upload-artifact@v2
-      with:
-        name: Changelog.txt
-        path: ${{ github.workspace }}/app/Changelog.txt
+#    - name: Upload Artifact Changelog
+#      uses: actions/upload-artifact@v2
+#      with:
+#        name: Changelog.txt
+#        path: ${{ github.workspace }}/app/Changelog.txt
 
   merge_completed:
     needs: build

From 3eba13cc1ac251d0e63b1d3adda8b838728078b4 Mon Sep 17 00:00:00 2001
From: ThePieMonster <zacbraasch@gmail.com>
Date: Thu, 17 Mar 2022 13:01:46 -0500
Subject: [PATCH 2/2] Update gradle-build.yml

---
 .github/workflows/gradle-build.yml | 33 +++++++++++++-----------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
index 9c60fc6..e957cf0 100644
--- a/.github/workflows/gradle-build.yml
+++ b/.github/workflows/gradle-build.yml
@@ -200,27 +200,22 @@ jobs:
         echo "Read Gradle VersionName"
         echo "VERSIONNAME=$(cat VersionName.txt)" >> $GITHUB_ENV
 
-    - name: Output Gradle VersionName
-      run : |
-        echo "Output Gradle VersionName"
-        echo "${{ env.VERSIONNAME }}"
-
-    - name: Download Artifact Changelog
-      uses: actions/download-artifact@v3.0.0
-      with:
-        name: Changelog.txt
-        path: ${{ github.workspace }}/artifact
+#    - name: Download Artifact Changelog
+#      uses: actions/download-artifact@v3.0.0
+#      with:
+#        name: Changelog.txt
+#        path: ${{ github.workspace }}/artifact
 
-    - name: Read Changelog
-      working-directory : ${{ github.workspace }}/artifact
-      run : |
-        echo "Read Changelog"
-        echo "CHANGELOG=$(cat Changelog.txt)" >> $GITHUB_ENV
+#    - name: Read Changelog
+#      working-directory : ${{ github.workspace }}/artifact
+#      run : |
+#        echo "Read Changelog"
+#        echo "CHANGELOG=$(cat Changelog.txt)" >> $GITHUB_ENV
 
-    - name: Output Changelog
-      run : |
-        echo "Output Changelog"
-        echo "${{ env.CHANGELOG }}"
+#    - name: Output Changelog
+#      run : |
+#        echo "Output Changelog"
+#        echo "${{ env.CHANGELOG }}"
 
     - name: Download Artifact APK
       uses: actions/download-artifact@v3.0.0