From b35eb08bcd68f55fb8ccd025bfbfbdb935a010ab Mon Sep 17 00:00:00 2001
From: Ghulam Nasir <nasirky@gmail.com>
Date: Wed, 19 Apr 2023 13:47:15 +0200
Subject: [PATCH] Add support for flutter/ios and working directory

---
 .github/workflows/flutter-release.yml    | 10 +++++-----
 .github/workflows/ios-manage-signing.yml | 13 +++++++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/flutter-release.yml b/.github/workflows/flutter-release.yml
index 8708c65..c57afcd 100644
--- a/.github/workflows/flutter-release.yml
+++ b/.github/workflows/flutter-release.yml
@@ -67,13 +67,13 @@ jobs:
       - run: flutter test --dart-define STAGE=mock
       
   android-publish:
-    runs-on: [self-hosted, Linux]
+    runs-on: [self-hosted, Linux, android]
     needs: [generate-build-number, lint, test]
     steps:
       - uses: QuickBirdEng/actions/checkout-ssh@main
         with:
           ssh-private-key: ${{ secrets.CI_SSH_PRIVATE_KEY_FOR_GITHUB_PRIVATE_REPOS }}
-      - uses: QuickBirdEng/actions/publish-android@main
+      - uses: QuickBirdEng/actions/publish-android@feature/legacy-flutter-support
         with:
           clean: true
           build-number: ${{ needs.generate-build-number.outputs.build-number }}
@@ -88,7 +88,7 @@ jobs:
           upload-key: ${{ secrets.UPLOAD_KEY }}
   
   ios-publish:
-      runs-on: [self-hosted, macOS]
+      runs-on: [self-hosted, macOS, legacy-flutter]
       needs: [generate-build-number, lint, test]
       steps:
         - uses: QuickBirdEng/actions/checkout-ssh@main
@@ -100,7 +100,7 @@ jobs:
           with:
             build-type: ipa
             build-number: ${{ needs.generate-build-number.outputs.build-number }}
-            build-arguments: --no-codesign ${{ inputs.ios-build-arguments }}
+            build-arguments: ${{ inputs.ios-build-arguments }}
             clean: true
             working-directory: ${{ inputs.working-directory }}
         - uses: QuickBirdEng/actions/publish-ios@main
@@ -134,7 +134,7 @@ jobs:
         - uses: QuickBirdEng/actions/checkout-ssh@main
           with:
             ssh-private-key: ${{ secrets.CI_SSH_PRIVATE_KEY_FOR_GITHUB_PRIVATE_REPOS }}
-        - uses: QuickBirdEng/actions/setup-android@main
+        - uses: QuickBirdEng/actions/setup-android@feature/legacy-flutter-support
           with:
             key-store-file-content: ${{ secrets.ANDROID_KEYSTORE_FILE_CONTENT }}
             key-store-password: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
diff --git a/.github/workflows/ios-manage-signing.yml b/.github/workflows/ios-manage-signing.yml
index 8f0a363..364b9ba 100644
--- a/.github/workflows/ios-manage-signing.yml
+++ b/.github/workflows/ios-manage-signing.yml
@@ -5,6 +5,12 @@ env:
 on:
   workflow_call:
     inputs:
+      platform: 
+        description: 'flutter or ios?'
+        default: ios
+      working-directory:
+        description: 'Provide working directory (if you aren't using default directory structure)'
+        default: '.'
       certificate-type:
         description: 'Possible values are development and distribution'
         type: string
@@ -16,6 +22,8 @@ on:
 jobs:
   renew:
     runs-on: [self-hosted, macOS]
+    defaults:
+      run: working-directory: ${{ inputs.working-directry }}
     if: contains('["nasirky","acpoppe","grafele"]', github.triggering_actor)
     steps:
       - uses: QuickBirdEng/actions/checkout-ssh@main
@@ -46,6 +54,9 @@ jobs:
           git remote add match ${{ secrets.MATCH_REPO }}
           git add . && git commit -m "Remove ${{ inputs.certificate-type }} profiles and (optionally) certificates for ${{ env.BUNDLE_ID }}" && git push match || true
       - uses: QuickBirdEng/actions/setup-fastlane@main
+        with: 
+          platform: ${{ inputs.platform }}
+          working-directory: ${{ inputs.working-directory }}
       - uses: QuickBirdEng/actions/setup-fastlane-environment@main
         with:
           match-repository: ${{ secrets.MATCH_REPO }}
@@ -59,6 +70,8 @@ jobs:
       - name: Generate/Download provisioning profiles & (maybe) certificates
         shell: bash -l {0}
         run: |
+            [[ "${{ inputs.platform }}" == "flutter" ]] && cd ios
+
             if [[ '${{ inputs.certificate-type }}' == 'distribution' ]]; then
               fastlane match_for_signing type:appstore refresh_certificates:true
               fastlane match_for_signing type:adhoc refresh_certificates:true