From 70bd98209b75ace8f216ca80f8c46f93d91ffd02 Mon Sep 17 00:00:00 2001
From: Remy Moll <me@moll.re>
Date: Mon, 28 Apr 2025 12:56:08 +0200
Subject: [PATCH] try android instead

---
 .gitea/workflows/frontend_deploy-beta.yaml    | 46 +++++++++----------
 .gitea/workflows/frontend_deploy-release.yaml |  3 --
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/.gitea/workflows/frontend_deploy-beta.yaml b/.gitea/workflows/frontend_deploy-beta.yaml
index cd941c4..5bb3576 100644
--- a/.gitea/workflows/frontend_deploy-beta.yaml
+++ b/.gitea/workflows/frontend_deploy-beta.yaml
@@ -30,33 +30,31 @@ jobs:
     outputs:
       build_name: ${{ steps.version.outputs.BUILD_NAME }}
 
-
-  # build-android:
-  #   name: Build and upload android app
-  #   uses: ./.gitea/workflows/workflow_build-app-android.yaml
-  #   with:
-  #     build_type: release # for current testing
-  #     build_name: ${{ needs.get-version.outputs.build_name }}
-  #   secrets:
-  #     ANDROID_SECRET_PROPERTIES_BASE64: ${{ secrets.ANDROID_SECRET_PROPERTIES_BASE64 }}
-  #     ANDROID_GOOGLE_PLAY_JSON_BASE64: ${{ secrets.ANDROID_GOOGLE_PLAY_JSON_BASE64 }}
-  #     ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
-  #     ANDROID_GOOGLE_MAPS_API_KEY: ${{ secrets.ANDROID_GOOGLE_MAPS_API_KEY }}
-  #   needs: get-version
-
-  build-ios:
-    name: Build and upload ios app
-    uses: ./.gitea/workflows/workflow_build-app-ios.yaml
+  build-android:
+    name: Build and upload android app
+    uses: ./.gitea/workflows/workflow_build-app-android.yaml
     with:
       build_type: release # for current testing
       build_name: ${{ needs.get-version.outputs.build_name }}
     secrets:
-      IOS_ASC_KEY_ID: ${{ secrets.IOS_ASC_KEY_ID }}
-      IOS_ASC_ISSUER_ID: ${{ secrets.IOS_ASC_ISSUER_ID }}
-      IOS_ASC_KEY: ${{ secrets.IOS_ASC_KEY }}
-      IOS_MATCH_REPO_SSH_KEY_BASE64: ${{ secrets.IOS_MATCH_REPO_SSH_KEY_BASE64 }}
-      IOS_MATCH_PASSWORD: ${{ secrets.IOS_MATCH_PASSWORD }}
-      IOS_GOOGLE_MAPS_API_KEY: ${{ secrets.IOS_GOOGLE_MAPS_API_KEY }}
+      ANDROID_SECRET_PROPERTIES_BASE64: ${{ secrets.ANDROID_SECRET_PROPERTIES_BASE64 }}
+      ANDROID_GOOGLE_PLAY_JSON_BASE64: ${{ secrets.ANDROID_GOOGLE_PLAY_JSON_BASE64 }}
+      ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
+      ANDROID_GOOGLE_MAPS_API_KEY: ${{ secrets.ANDROID_GOOGLE_MAPS_API_KEY }}
     needs: get-version
 
-    # needs: build-android # technically not needed, but this prevents the builds from running in parallel
+  # build-ios:
+  #   name: Build and upload ios app
+  #   uses: ./.gitea/workflows/workflow_build-app-ios.yaml
+  #   with:
+  #     build_type: release # for current testing
+  #     build_name: ${{ needs.get-version.outputs.build_name }}
+  #   secrets:
+  #     IOS_ASC_KEY_ID: ${{ secrets.IOS_ASC_KEY_ID }}
+  #     IOS_ASC_ISSUER_ID: ${{ secrets.IOS_ASC_ISSUER_ID }}
+  #     IOS_ASC_KEY: ${{ secrets.IOS_ASC_KEY }}
+  #     IOS_MATCH_REPO_SSH_KEY_BASE64: ${{ secrets.IOS_MATCH_REPO_SSH_KEY_BASE64 }}
+  #     IOS_MATCH_PASSWORD: ${{ secrets.IOS_MATCH_PASSWORD }}
+  #     IOS_GOOGLE_MAPS_API_KEY: ${{ secrets.IOS_GOOGLE_MAPS_API_KEY }}
+  #   needs: get-version
+  #   # needs: build-android # technically not needed, but this prevents the builds from running in parallel
diff --git a/.gitea/workflows/frontend_deploy-release.yaml b/.gitea/workflows/frontend_deploy-release.yaml
index c15ea7f..71c8060 100644
--- a/.gitea/workflows/frontend_deploy-release.yaml
+++ b/.gitea/workflows/frontend_deploy-release.yaml
@@ -27,9 +27,6 @@ jobs:
     outputs:
       build_name: ${{ steps.version.outputs.BUILD_NAME }}
 
-
-
-
   build-android:
     name: Build and upload android app
     uses: ./.gitea/workflows/workflow_build-app-android.yaml