From fad4be21d055d1ff4001af4b60ddb6c6656c9e85 Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Wed, 30 Apr 2025 12:36:27 +0200 Subject: [PATCH] at last --- .gitea/workflows/frontend_deploy-beta.yaml | 29 +++++++++++----------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/.gitea/workflows/frontend_deploy-beta.yaml b/.gitea/workflows/frontend_deploy-beta.yaml index 5444e1e..800480a 100644 --- a/.gitea/workflows/frontend_deploy-beta.yaml +++ b/.gitea/workflows/frontend_deploy-beta.yaml @@ -30,24 +30,24 @@ 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-android: + name: Build and upload android app + uses: ./.gitea/workflows/workflow_build-app-android.yaml + with: + build_type: beta + 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 with: - build_type: release # for current testing + build_type: beta build_name: ${{ needs.get-version.outputs.build_name }} secrets: IOS_ASC_KEY_ID: ${{ secrets.IOS_ASC_KEY_ID }} @@ -56,5 +56,4 @@ jobs: 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 + needs: build-android # technically not needed, but this prevents the builds from running in parallel