Merge branch 'main' into dependabot/github_actions/actions/checkout-4

erikeelde · Jan 12, 2024 · 4f79310 · 4f79310
2 parents 84a8b4e + cec504e
commit 4f79310
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/.github/version_information/action.yml → ...ub/actions/version_information/action.yml b/.github/version_information/action.yml → ...ub/actions/version_information/action.yml
diff --git a/.github/workflows/app-release.yml b/.github/workflows/app-release.yml
@@ -28,17 +28,16 @@ jobs:
           echo "${{ secrets.SERVICE_ACCOUNT }}" > service_account.json.asc
           gpg -d --passphrase "${{ secrets.GPG_ENCRYPTION_KEY }}" --batch service_account.json.asc > service_account.json
 
+      - name: "Calculate build number"
+        id: version_information
+        uses: ./.github/actions/version_information
 
       - name: Check out java
         uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: 17
 
-      - name: "Calculate build number"
-        id: version_information
-        uses: ./.github/actions/version_information
-
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
@@ -51,3 +50,10 @@ jobs:
       - name: Publish application
         if: github.repository == 'erikeelde/toggles'
         run: ./gradlew :toggles-app:publishReleaseBundle
+
+      - name: Upload binaries
+        uses: actions/upload-artifact@v4
+        with:
+          name: Apks
+          path: '**/build/outputs/*'
+          retention-days: 14
diff --git a/scripts/generate_versions.sh b/scripts/generate_versions.sh
@@ -29,7 +29,7 @@ for prefix in "${prefixes[@]}"; do
     patch="${version_parts[2]}"
 
     # Calculate the version code using arithmetic expansion
-    version_code=$((major * 100000 + minor * 1000 + patch * 10))
+    version_code=$((major * 1000000 + minor * 1000 + patch * 10))
 
     # Get the number of commits since the tag
     commit_count=$(git rev-list --count "${tag}"..HEAD)