chore: push to beta channel

fossasia · Jul 4, 2024 · 8c2c637 · 8c2c637
1 parent 6007613
commit 8c2c637
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 14 deletions.
diff --git a/.github/workflows/branch-push.yml b/.github/workflows/branch-push.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ development ]
   pull_request:
-    branches: [ master, development ]
+    branches: [ development ]
 
 jobs:
   build-android:
@@ -23,21 +23,52 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - uses: actions/cache@v3
-        if: ${{ github.event_name != 'pull_request' && github.repository == 'fossasia/badgemagic-android' && github.ref == 'refs/heads/master' }}
+      - name: Setup Ruby
+        if: ${{ github.event_name != 'pull_request' && github.repository == 'fossasia/badgemagic-android' }}
+        uses: ruby/setup-ruby@v1
         with:
-          path: |
-            vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
-
+          ruby-version: '3.3'
+          bundler-cache: true
+
       - name: Prepare Bundler
-        if: ${{ github.event_name != 'pull_request' && github.repository == 'fossasia/badgemagic-android' && github.ref == 'refs/heads/master' }}
+        if: ${{ github.event_name != 'pull_request' && github.repository == 'fossasia/badgemagic-android' }}
         run: |
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
 
+      - name: Hydrate and Update Version
+        id: android-version
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          
+          git clone --branch=version --depth=1 https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} version
+          cd version
+
+          # Read and increment version name
+          IFS='.' read -r major minor patch < versionName.txt
+          current_patch_version_name="$major.$minor.$patch"
+          echo "VERSION_NAME=$current_patch_version_name" >> $GITHUB_OUTPUT
+          
+          next_patch=$((patch + 1))
+          next_patch_version_name="$major.$minor.$next_patch"
+          echo "$next_patch_version_name" > versionName.txt
+
+          # Read and increment version code
+          read -r version_code < versionCode.txt
+          echo "VERSION_CODE=$version_code" >> $GITHUB_OUTPUT
+          
+          new_version_code=$((version_code + 1))
+          echo "$new_version_code" > versionCode.txt
+
+          # Force push to version branch
+          git checkout --orphan temporary
+          git add --all .
+          git commit -am "[Auto] Update versionName: $next_patch_version_name & versionCode: $new_version_code ($(date +%Y-%m-%d.%H:%M:%S))"
+          git branch -D version
+          git branch -m version
+          git push --force origin version
+
       - name: Pre Checks
         run: |
           bash scripts/check-screenshots.sh
@@ -61,6 +92,8 @@ jobs:
           STORE_PASS: ${{ secrets.STORE_PASS }}
           ALIAS: ${{ secrets.ALIAS }}
           KEY_PASS: ${{ secrets.KEY_PASS }}
+          VERSION_CODE: ${{ steps.android-version.outputs.VERSION_CODE }}
+          VERSION_NAME: ${{ steps.android-version.outputs.VERSION_NAME }}
         run: |
           ./gradlew build  --no-daemon --stacktrace
           ./gradlew bundleRelease
@@ -116,7 +149,7 @@ jobs:
           git push --force origin apk
 
       - name: Upload alpha version to playstore
-        if: ${{ github.event_name != 'pull_request' && github.repository == 'fossasia/badgemagic-android' && github.ref == 'refs/heads/master' }}
+        if: ${{ github.event_name != 'pull_request' && github.repository == 'fossasia/badgemagic-android' }}
         run: |
           bundle exec fastlane uploadToPlaystore
           if [[ $? -ne 0 ]]; then

diff --git a/android/build.gradle b/android/build.gradle
@@ -19,8 +19,8 @@ android {
         applicationId 'org.fossasia.badgemagic'
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 20
-        versionName '1.8.10'
+        versionCode (System.getenv("VERSION_CODE") != null ? System.getenv("VERSION_CODE").toInteger() : 1)
+        versionName (System.getenv("VERSION_NAME") != null ? System.getenv("VERSION_NAME") : "1.0.0")
         vectorDrawables.useSupportLibrary = true
     }
 

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -4,6 +4,6 @@ platform :android do
         gradle(task: "bundle",build_type: "Release")
     end
     lane :uploadToPlaystore do
-        upload_to_play_store(track: "alpha",aab:"apk/badge-magic-master-release.aab")
+        upload_to_play_store(track: "beta",aab:"apk/badge-magic-development-release.aab")
     end
 end