From cdf82c0af9d91b10d17780af222e3eceacda0366 Mon Sep 17 00:00:00 2001
From: Brord van Wierst <brord@brord.net>
Date: Tue, 24 Dec 2024 03:57:42 +0100
Subject: [PATCH] fixed yml

---
 .github/workflows/manual.yml | 123 ++++++++++++++++++-----------------
 1 file changed, 62 insertions(+), 61 deletions(-)

diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
index b3d8927a1..13c89a4fc 100644
--- a/.github/workflows/manual.yml
+++ b/.github/workflows/manual.yml
@@ -6,64 +6,65 @@ on:
         type: environment
         description: Select the environment
 
-deploy_playstore_internal:
-  environment: 
-    name: ${{ inputs.environment }}
-  runs-on: ubuntu-latest
-  steps:
-    - uses: actions/checkout@v4
-    - run: cat .github/workflows/versions.env >> $GITHUB_ENV
-    - uses: actions/setup-java@v4
-      with:
-        java-version: ${{ env.JAVA_VERSION }}
-        distribution: 'zulu'
-    - uses: subosito/flutter-action@v2
-      with:
-        flutter-version: ${{ env.FLUTTER_VERSION }}
-        cache: true
-    - name: Set up Android SDK
-      if: ${{ env.ACT }} # Only run on local act setups, as GitHub Actions provides the Android SDK on Ubuntu
-      uses: android-actions/setup-android@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: '3.3'
-    - name: Update env files to selected environment
-      run: |
-        rm .env
-        rm assets/.env
-        echo "$WEB_APP_ENV" >> .env
-        cp .env assets/.env
-    - name: Apply .env patch
-      run: git apply ./scripts/enable_mobile_env.patch
-    - name: Install Fastlane
-      run: gem install fastlane -NV
-    - name: Remove Emoji Font
-      run: |
-        rm -rf fonts/NotoEmoji
-        yq -i 'del( .flutter.fonts[] | select(.family == "NotoEmoji") )' pubspec.yaml
-    - run: flutter pub get
-    - name: Prepare Android Release Build
-      env:
-        PLAY_STORE_UPLOAD_KEY: ${{ secrets.PLAY_STORE_UPLOAD_KEY }}
-        PLAY_STORE_KEYSTORE_KEY_ALIAS: ${{ secrets.PLAY_STORE_KEYSTORE_KEY_ALIAS }}
-        PLAY_STORE_KEYSTORE_STORE_PASSWORD: ${{ secrets.PLAY_STORE_KEYSTORE_STORE_PASSWORD }}
-        PLAY_STORE_KEYSTORE_KEY_PASSWORD: ${{ secrets.PLAY_STORE_KEYSTORE_KEY_PASSWORD }}
-        PLAY_STORE_CONFIG_JSON: ${{ secrets.PLAY_STORE_CONFIG_JSON }}
-      run: ./scripts/prepare-android-release.sh
-    - name: Build Android Release
-      run: flutter build appbundle --target-platform android-arm,android-arm64,android-x64
-    - name: Deploy Android Release
-      run: |
-        mkdir -p build/android
-        cp build/app/outputs/bundle/release/app-release.aab build/android/
-        cd android
-        bundle install
-        bundle update fastlane
-        bundle exec fastlane deploy_internal_test
-        if [[ $GITHUB_REF_NAME == rc* ]]; then
-            bundle exec fastlane deploy_candidate
-        else
-            bundle exec fastlane deploy_release
-        fi
-        cd ..
\ No newline at end of file
+jobs:
+  deploy_playstore_internal:
+    environment: 
+      name: ${{ inputs.environment }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: cat .github/workflows/versions.env >> $GITHUB_ENV
+      - uses: actions/setup-java@v4
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
+          distribution: 'zulu'
+      - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+          cache: true
+      - name: Set up Android SDK
+        if: ${{ env.ACT }} # Only run on local act setups, as GitHub Actions provides the Android SDK on Ubuntu
+        uses: android-actions/setup-android@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.3'
+      - name: Update env files to selected environment
+        run: |
+          rm .env
+          rm assets/.env
+          echo "$WEB_APP_ENV" >> .env
+          cp .env assets/.env
+      - name: Apply .env patch
+        run: git apply ./scripts/enable_mobile_env.patch
+      - name: Install Fastlane
+        run: gem install fastlane -NV
+      - name: Remove Emoji Font
+        run: |
+          rm -rf fonts/NotoEmoji
+          yq -i 'del( .flutter.fonts[] | select(.family == "NotoEmoji") )' pubspec.yaml
+      - run: flutter pub get
+      - name: Prepare Android Release Build
+        env:
+          PLAY_STORE_UPLOAD_KEY: ${{ secrets.PLAY_STORE_UPLOAD_KEY }}
+          PLAY_STORE_KEYSTORE_KEY_ALIAS: ${{ secrets.PLAY_STORE_KEYSTORE_KEY_ALIAS }}
+          PLAY_STORE_KEYSTORE_STORE_PASSWORD: ${{ secrets.PLAY_STORE_KEYSTORE_STORE_PASSWORD }}
+          PLAY_STORE_KEYSTORE_KEY_PASSWORD: ${{ secrets.PLAY_STORE_KEYSTORE_KEY_PASSWORD }}
+          PLAY_STORE_CONFIG_JSON: ${{ secrets.PLAY_STORE_CONFIG_JSON }}
+        run: ./scripts/prepare-android-release.sh
+      - name: Build Android Release
+        run: flutter build appbundle --target-platform android-arm,android-arm64,android-x64
+      - name: Deploy Android Release
+        run: |
+          mkdir -p build/android
+          cp build/app/outputs/bundle/release/app-release.aab build/android/
+          cd android
+          bundle install
+          bundle update fastlane
+          bundle exec fastlane deploy_internal_test
+          if [[ $GITHUB_REF_NAME == rc* ]]; then
+              bundle exec fastlane deploy_candidate
+          else
+              bundle exec fastlane deploy_release
+          fi
+          cd ..
\ No newline at end of file