Merge branch 'beta'

.github/workflows/release-beta.yaml

@@ -4,9 +4,13 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: "Version (beta)"
+        description: "Version"
         required: true
-        default: "1.0.0-beta.1"
+        default: "1.0.0"
+      beta-number:
+        description: "Beta number"
+        required: true
+        default: "1"
       number:
         description: "Build number"
         required: true
@@ -18,8 +22,11 @@ jobs:
     env:
       ANDROID_AAB_RELEASE_PATH: build/app/outputs/bundle/release
       ANDROID_APK_RELEASE_PATH: build/app/outputs/apk/release
+      VERSION_NAME: ${{ github.event.inputs.version }}-beta.${{ github.event.inputs.beta-number }}
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: beta
       - name: Decode android/app/keystore.jks
         run: echo "${{ secrets.KEYSTORE_JKS }}" | base64 --decode > android/app/keystore.jks
       - name: Decode android/key.properties
@@ -27,7 +34,7 @@ jobs:
       - name: Decode .env
         run: echo "${{ secrets.ENV }}" | base64 --decode > .env
       - name: Update version in YAML
-        run: sed -i 's/99.99.99+99/${{ github.event.inputs.version }}+${{ github.event.inputs.number }}/g' pubspec.yaml
+        run: sed -i 's/99.99.99+99/${{ env.VERSION_NAME }}+${{ github.event.inputs.number }}/g' pubspec.yaml
       - name: Update KeyStore password in gradle properties
         run: sed -i 's/#{KEYSTORE_PASS}#/${{ secrets.KEYSTORE_PASS }}/g' android/key.properties
       - name: Update KeyStore key password in gradle properties
@@ -44,26 +51,30 @@ jobs:
       - run: flutter build apk --release
       - run: flutter build appbundle --release
       - name: Rename apk 
-        run: mv $ANDROID_APK_RELEASE_PATH/app-release.apk $ANDROID_APK_RELEASE_PATH/AdGuardHomeManager_${{ github.event.inputs.version }}_Android.apk
+        run: mv $ANDROID_APK_RELEASE_PATH/app-release.apk $ANDROID_APK_RELEASE_PATH/AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.apk
       - name: Rename aab 
-        run: mv $ANDROID_AAB_RELEASE_PATH/app-release.aab $ANDROID_AAB_RELEASE_PATH/AdGuardHomeManager_${{ github.event.inputs.version }}_Android.aab
+        run: mv $ANDROID_AAB_RELEASE_PATH/app-release.aab $ANDROID_AAB_RELEASE_PATH/AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.aab
       - name: Copy apk to project root
-        run: cp $ANDROID_APK_RELEASE_PATH/AdGuardHomeManager_${{ github.event.inputs.version }}_Android.apk AdGuardHomeManager_${{ github.event.inputs.version }}_Android.apk
+        run: cp $ANDROID_APK_RELEASE_PATH/AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.apk AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.apk
       - name: Copy aab to project root
-        run: cp $ANDROID_AAB_RELEASE_PATH/AdGuardHomeManager_${{ github.event.inputs.version }}_Android.aab AdGuardHomeManager_${{ github.event.inputs.version }}_Android.aab
+        run: cp $ANDROID_AAB_RELEASE_PATH/AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.aab AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.aab
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
           name: android
           path: |
-            AdGuardHomeManager_${{ github.event.inputs.version }}_Android.aab
-            AdGuardHomeManager_${{ github.event.inputs.version }}_Android.apk
+            AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.aab
+            AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.apk
   release-builds-github:
     name: Release beta build to GitHub
     runs-on: ubuntu-latest
     needs: [build-android]
+    env:
+      VERSION_NAME: ${{ github.event.inputs.version }}-beta.${{ github.event.inputs.beta-number }}
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: beta
       - name: Create builds directory
         run: mkdir releases
       - name: Download Android artifacts
@@ -76,8 +87,8 @@ jobs:
         with:
           artifacts: "releases/*"
           token: ${{ secrets.GH_TOKEN }}
-          tag: '${{ github.event.inputs.version }}_(${{ github.event.inputs.number }})'
-          name: v${{ github.event.inputs.version }}
+          tag: '${{ env.VERSION_NAME }}_(${{ github.event.inputs.number }})'
+          name: v${{ env.VERSION_NAME }}
           draft: true
           prerelease: true
           commit: ${{ github.sha }}
@@ -85,8 +96,12 @@ jobs:
     name: Release Android beta build to the Google Play Store
     runs-on: ubuntu-latest
     needs: [build-android]
+    env:
+      VERSION_NAME: ${{ github.event.inputs.version }}-beta.${{ github.event.inputs.beta-number }}
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: beta
       - name: Download Android artifacts
         uses: actions/download-artifact@v3
         with:
@@ -96,7 +111,7 @@ jobs:
         with:
           serviceAccountJsonPlainText: ${{ secrets.PLAYSTORE_ACCOUNT_KEY }}
           packageName: com.jgeek00.adguard_home_manager
-          releaseFiles: AdGuardHomeManager_${{ github.event.inputs.version }}_Android.aab
+          releaseFiles: AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.aab
           track: beta
           status: draft
-          releaseName: ${{ github.event.inputs.version }}
+          releaseName: ${{ env.VERSION_NAME }}