From a9ff50f5284381f804aeddc92f134c894a012aac Mon Sep 17 00:00:00 2001
From: Yutatsu <126276749+Yutatsu1@users.noreply.github.com>
Date: Sun, 4 Feb 2024 12:14:19 +0600
Subject: [PATCH] resolve conflicts

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

diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index bd705855..2b5676c6 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -21,7 +21,7 @@ jobs:
       run: |
         VER=$(grep -E -o "versionName \".*\"" app/build.gradle | sed -e 's/versionName //g' | tr -d '"')
         SHA=${{ github.sha }}
-        VERSION="$VER.${SHA:0:7}"
+        VERSION="$VER+${SHA:0:7}"
         echo "Version $VERSION"
         echo "VERSION=$VERSION" >> $GITHUB_ENV
 
@@ -42,19 +42,19 @@ jobs:
       run: chmod +x ./gradlew
 
     - name: Build with Gradle
-      run: ./gradlew assembleDebug -Pandroid.injected.signing.store.file=$GITHUB_WORKSPACE/key.keystore -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }}
+      run: ./gradlew assembleAlpha -Pandroid.injected.signing.store.file=$GITHUB_WORKSPACE/key.keystore -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }}
       
     - name: Upload a Build Artifact
       uses: actions/upload-artifact@v3.0.0
       with:
           name: Dantotsu
-          path: "app/build/outputs/apk/debug/app-debug.apk"   
+          path: "app/build/outputs/apk/alpha/app-alpha.apk"
           
     - name: Upload APK to Discord
       shell: bash
       run: |
         contentbody=$( jq -Rsa . <<< "${{ github.event.head_commit.message }}" )
-        curl -F "payload_json={\"content\":\" Debug-Build: <@659107544597266465> **${{ env.VERSION }}**\n\n${contentbody:1:-1}\"}" -F "dantotsu_debug=@app/build/outputs/apk/debug/app-debug.apk" ${{ secrets.DISCORD_WEBHOOK }}
+        curl -F "payload_json={\"content\":\" Alpha-Build: <@659107544597266465> **${{ env.VERSION }}**\n\n${contentbody:1:-1}\"}" -F "dantotsu_debug=@app/build/outputs/apk/alpha/app-alpha.apk" ${{ secrets.DISCORD_WEBHOOK }}
 
     - name: Delete Old Pre-Releases
       id: delete-pre-releases