Update codemagic.yaml

Author: martenrebane

codemagic.yaml

@@ -110,12 +110,20 @@ workflows:
           else
             ./gradlew clean --no-daemon fetchAndPackageDefaultConfiguration --args="${{ inputs.defaultCentralConfigurationUrl_input }} ${{ inputs.defaultCentralConfigurationUpdateInterval_input }}" -PappVersionName=$APP_VERSION_NAME.$PROJECT_BUILD_NUMBER assemble --debug
           fi
+      - name: Align APK
+        script: |
+          zipalign -v -p 4 app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/apk/release/app-release-unsigned-aligned.apk
+      - name: Sign APK
+        script: |
+          apksigner sign --ks $CM_KEYSTORE_PATH --ks-pass pass:$CM_KEYSTORE_PASSWORD --out app/build/outputs/apk/release/app-release_$APP_VERSION.apk app/build/outputs/apk/release/app-release-unsigned-aligned.apk
       - name: Rename and move APK
         script: |
-          mkdir app/build/outputs/apk/debug/artifact/
-          mv app/build/outputs/apk/debug/app-debug.apk app/build/outputs/apk/debug/artifact/"RIA_DigiDoc_dev_$APP_VERSION_NAME.$PROJECT_BUILD_NUMBER.apk"
+          mkdir -p app/build/outputs/apk/release/signed/
+          mv app/build/outputs/apk/release/app-release_$APP_VERSION.apk app/build/outputs/apk/release/signed/RIA_DigiDoc_dev_$APP_VERSION.apk
+
+          aapt dump badging app/build/outputs/apk/release/signed/RIA_DigiDoc_$APP_VERSION.apk | grep versionCode
     artifacts:
-      - app/build/outputs/apk/debug/artifact/*.apk
+      - app/build/outputs/apk/release/signed/*.apk
     publishing:
       email:
         recipients:
@@ -136,7 +144,6 @@ workflows:
         - "google_services"
       vars:
         PACKAGE_NAME: "ee.ria.DigiDoc"
-        RELEASE_NAME: "RIA DigiDoc"
       android_signing:
         - RIA DigiDoc (MOPP)
     scripts:
@@ -148,42 +155,47 @@ workflows:
           ./gradlew clean test --no-daemon
       - name: Setup Gradle and Build RIA DigiDoc
         script: |
-          LATEST_GOOGLE_PLAY_BUILD_NUMBER=$(google-play get-latest-build-number --package-name "$PACKAGE_NAME" --tracks internal)
-          if [ -z $LATEST_GOOGLE_PLAY_BUILD_NUMBER ]
-            then
-              LATEST_BUILD_NUMBER="$APP_VERSION_NAME.$PROJECT_BUILD_NUMBER"
+          LATEST_GOOGLE_PLAY_INTERNAL_BUILD_NUMBER=$(google-play get-latest-build-number --package-name "$PACKAGE_NAME" --tracks internal)
+          LATEST_GOOGLE_PLAY_RELEASE_BUILD_NUMBER=$(google-play get-latest-build-number --package-name "$PACKAGE_NAME" --tracks release)
+          
+          echo "Internal Build Number: $INTERNAL_BUILD_NUMBER"
+          echo "Release Build Number: $RELEASE_BUILD_NUMBER"
+          
+          # Check that both tracks have valid build numbers (over 0) and select the highest.
+          # Add +1 to the highest build number to submit to Google Play
+          if [ "$LATEST_GOOGLE_PLAY_INTERNAL_BUILD_NUMBER" -gt 0 ] && [ "$LATEST_GOOGLE_PLAY_RELEASE_BUILD_NUMBER" -gt 0 ]; then
+            if [ "$LATEST_GOOGLE_PLAY_INTERNAL_BUILD_NUMBER" -gt "$LATEST_GOOGLE_PLAY_RELEASE_BUILD_NUMBER" ]; then
+              LATEST_BUILD_NUMBER=$(($LATEST_GOOGLE_PLAY_INTERNAL_BUILD_NUMBER + 1))
+              echo "Internal build number is highest, new build number for this build: $LATEST_BUILD_NUMBER"
               echo LATEST_BUILD_NUMBER=$LATEST_BUILD_NUMBER >> $CM_ENV
             else
-              LATEST_BUILD_NUMBER=$(($LATEST_GOOGLE_PLAY_BUILD_NUMBER + 1))
+              LATEST_BUILD_NUMBER=$(($LATEST_GOOGLE_PLAY_RELEASE_BUILD_NUMBER + 1))
+              echo "Release build number is highest, new build number for this build: $LATEST_BUILD_NUMBER"
               echo LATEST_BUILD_NUMBER=$LATEST_BUILD_NUMBER >> $CM_ENV
+            fi
+            else
+              echo "One or both build numbers are 0, using build number"
+              LATEST_BUILD_NUMBER="$APP_VERSION_NAME.$PROJECT_BUILD_NUMBER"
           fi
 
           # Make latest build number be available in all build steps
-          echo APP_NAME=$APP_VERSION_NAME.$PROJECT_BUILD_NUMBER >> $CM_ENV
-
-          APP_NAME=$APP_VERSION_NAME.$PROJECT_BUILD_NUMBER
-          echo $APP_NAME >> $CM_ENV
-          
-          export RELEASE_NAME="$LATEST_BUILD_NUMBER ($APP_NAME)"
-          echo $RELEASE_NAME >> $CM_ENV
-          
-          echo "RELEASE NAME: "
-          echo $RELEASE_NAME
+          echo APP_VERSION=$APP_VERSION_NAME.$LATEST_BUILD_NUMBER >> $CM_ENV
+          echo $APP_VERSION
 
           # Build app
-          ./gradlew clean --no-daemon fetchAndPackageDefaultConfiguration -PappVersionName=$APP_NAME -PappVersionCode=$LATEST_BUILD_NUMBER assembleRelease
+          ./gradlew clean --no-daemon fetchAndPackageDefaultConfiguration -PappVersionName=$APP_VERSION -PappVersionCode=$LATEST_BUILD_NUMBER assembleRelease
       - name: Align APK
         script: |
           zipalign -v -p 4 app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/apk/release/app-release-unsigned-aligned.apk
       - name: Sign APK
         script: |
-          apksigner sign --ks $CM_KEYSTORE_PATH --ks-pass pass:$CM_KEYSTORE_PASSWORD --out app/build/outputs/apk/release/app-release_$APP_NAME.apk app/build/outputs/apk/release/app-release-unsigned-aligned.apk
+          apksigner sign --ks $CM_KEYSTORE_PATH --ks-pass pass:$CM_KEYSTORE_PASSWORD --out app/build/outputs/apk/release/app-release_$APP_VERSION.apk app/build/outputs/apk/release/app-release-unsigned-aligned.apk
       - name: Rename and move APK
         script: |
           mkdir -p app/build/outputs/apk/release/signed/
-          mv app/build/outputs/apk/release/app-release_$APP_NAME.apk app/build/outputs/apk/release/signed/RIA_DigiDoc_$APP_NAME.apk
+          mv app/build/outputs/apk/release/app-release_$APP_VERSION.apk app/build/outputs/apk/release/signed/RIA_DigiDoc_$APP_VERSION.apk
 
-          aapt dump badging app/build/outputs/apk/release/signed/RIA_DigiDoc_$APP_NAME.apk | grep versionCode
+          aapt dump badging app/build/outputs/apk/release/signed/RIA_DigiDoc_$APP_VERSION.apk | grep versionCode
     artifacts:
       - app/build/outputs/apk/release/signed/*.apk
     publishing: