Fastlane fixes working up to a full release (#68)

Reviewed-on: #68

.gitea/workflows/frontend_deploy-beta.yaml

@@ -5,7 +5,7 @@ on:
     paths:
       - frontend/**
 
-name: Build and release release apps to production track
+name: Build and release apps to beta track
 
 jobs:
   get-version:
@@ -13,6 +13,7 @@ jobs:
     runs-on: macos
     steps:
       - uses: https://gitea.com/actions/checkout@v4
+
       - name: Fetch tags from main branch
         # since this workflow is triggered by a pull request, we want to match the latest tag of the main branch
         id: version
@@ -20,14 +21,21 @@ jobs:
           git fetch origin main --tags
           LATEST_TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
           # remove the 'v' prefix from the tag name
-          echo "BUILD_NAME=${LATEST_TAG//v}" >> $GITHUB_ENV
+          echo "BUILD_NAME=${LATEST_TAG//v}" >> $GITHUB_OUTPUT
+
+      - name: Output the version that is being used
+        run: |
+          echo "Building for version ${{ steps.version.outputs.BUILD_NAME }}"
+
+    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: beta
-      build_name: ${{ env.BUILD_NAME }}
+      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 }}
@@ -40,7 +48,7 @@ jobs:
     uses: ./.gitea/workflows/workflow_build-app-ios.yaml
     with:
       build_type: beta
-      build_name: ${{ env.BUILD_NAME }}
+      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 }}
@@ -48,4 +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

.gitea/workflows/frontend_deploy-release.yaml

@@ -3,7 +3,7 @@ on:
     tags:
       - v*
 
-name: Build and release release apps to production track
+name: Build and release apps to production track
 
 jobs:
   get-version:
@@ -11,21 +11,28 @@ jobs:
     runs-on: macos
     steps:
       - uses: https://gitea.com/actions/checkout@v4
+
       - name: Get version from git tag
         id: version
         env: 
           REF_NAME: ${{ gitea.ref_name }}
         # remove the 'v' prefix from the tag name
         run: |
-          echo "BUILD_NAME=${REF_NAME//v}" >> $GITHUB_ENV
+          echo "BUILD_NAME=${REF_NAME//v}" >> $GITHUB_OUTPUT
 
+      - name: Output the version that is being used
+        run: |
+          echo "Building for version ${{ steps.version.outputs.BUILD_NAME }}"
+
+    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
-      build_name: ${{ env.BUILD_NAME }}
+      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 }}
@@ -38,12 +45,12 @@ jobs:
     uses: ./.gitea/workflows/workflow_build-app-ios.yaml
     with:
       build_type: release
-      build_name: ${{ env.BUILD_NAME }}
+      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_PASSWORD: ${{ secrets.IOS_MATCH_PASSWORD }}
       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

.gitea/workflows/workflow_build-app-android.yaml

@@ -27,7 +27,7 @@ defaults:
 
 jobs:
   build:
-    runs-on: macos
+    runs-on: macos-14
     env:
       # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ gitea.workspace }}/frontend/android/Gemfile

.gitea/workflows/workflow_build-app-ios.yaml

@@ -31,7 +31,7 @@ defaults:
 
 jobs:
   build:
-    runs-on: macos
+    runs-on: macos-14
     env:
       # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ gitea.workspace }}/frontend/ios/Gemfile
@@ -53,9 +53,13 @@ jobs:
           ruby-version: 3.3
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
+      - uses: GuillaumeFalourd/setup-rsync@v1.2
+        # rsync is required by the google maps ios tools
+
       - name: Install dependencies and clean up
         run: |
           flutter pub get
+          flutter precache --ios
           bundle exec pod install --allow-root
           flutter clean
           bundle exec pod cache clean --all --allow-root
@@ -69,6 +73,11 @@ jobs:
         env:
           MATCH_REPO_SSH_KEY: ${{ secrets.IOS_MATCH_REPO_SSH_KEY_BASE64 }}
 
+      - name: Replace API Key from secret
+        # on a macOS runner, sed requires a replacement suffix after the -i flag
+        run: |
+          sed -i '' -e "s/IOS_GOOGLE_MAPS_API_KEY/${{ secrets.IOS_GOOGLE_MAPS_API_KEY }}/g" Runner/AppDelegate.swift
+
       - name: Run fastlane lane
         run: bundle exec fastlane deploy_${{ inputs.build_type }}
         env: