[#3654] Upload both configurations of iOS app to Firebase app distrib…

…ution
Oztechan · Jul 2, 2024 · 4a2ec96 · 4a2ec96
1 parent 2faf85e
commit 4a2ec96
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -46,7 +46,8 @@ env:
   APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
   APP_STORE_CONNECT_KEY_CONTENT: ${{ secrets.APP_STORE_CONNECT_KEY_CONTENT }}
   APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
-  IOS_GOOGLE_FIREBASE_APP_ID: ${{ secrets.IOS_GOOGLE_FIREBASE_APP_ID }}
+  IOS_RELEASE_FIREBASE_APP_ID: ${{ secrets.IOS_RELEASE_FIREBASE_APP_ID }}
+  IOS_DEBUG_FIREBASE_APP_ID: ${{ secrets.IOS_DEBUG_FIREBASE_APP_ID }}
   FIREBASE_CLI_TOKEN: ${{ secrets.FIREBASE_CLI_TOKEN }}
   GIT_AUTHORIZATION: ${{ secrets.GIT_AUTHORIZATION }}
   SECRET_PASSWORD: ${{ secrets.SECRET_PASSWORD }}
@@ -187,11 +188,12 @@ jobs:
 
       - name: Upload iOS Artifacts
         uses: actions/upload-artifact@v4.3.3
-        if: github.event_name == 'push'
+        # if: github.event_name == 'push'
         with:
           name: iOSArtifacts
           path: |
             ios/CCC.ipa
+            ios/CCC_I.ipa
             ios/CCC.app.dSYM.zip
 
       - name: Cancel other jobs if this fails
@@ -205,7 +207,7 @@ jobs:
   DistributeIOS:
     runs-on: ubuntu-22.04
     needs: [ XCodeBuild ]
-    if: github.event_name == 'push'
+    # if: github.event_name == 'push'
     outputs:
       status: ${{ steps.status.outputs.status }}
     steps:
@@ -223,7 +225,7 @@ jobs:
         working-directory: ios
         run: |
           sudo chown -R $(whoami) /var/lib/gems/3.0.0
-          fastlane distribute
+          fastlane distributeAll
 
       - name: Delete iOS IPA
         uses: geekyeggo/delete-artifact@v5.0.0

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -41,7 +41,8 @@ env:
   APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
   APP_STORE_CONNECT_KEY_CONTENT: ${{ secrets.APP_STORE_CONNECT_KEY_CONTENT }}
   APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
-  IOS_GOOGLE_FIREBASE_APP_ID: ${{ secrets.IOS_GOOGLE_FIREBASE_APP_ID }}
+  IOS_RELEASE_FIREBASE_APP_ID: ${{ secrets.IOS_RELEASE_FIREBASE_APP_ID }}
+  IOS_DEBUG_FIREBASE_APP_ID: ${{ secrets.IOS_DEBUG_FIREBASE_APP_ID }}
   FIREBASE_CLI_TOKEN: ${{ secrets.FIREBASE_CLI_TOKEN }}
   GIT_AUTHORIZATION: ${{ secrets.GIT_AUTHORIZATION }}
   SECRET_PASSWORD: ${{ secrets.SECRET_PASSWORD }}

diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile
@@ -45,16 +45,6 @@ end
 platform :ios do
     desc "iOS Lanes"
 
-        lane :build do
-            install_certificate_and_profile(match_type: "adhoc")
-            add_test_devices
-            build_project(
-                match_type: "adhoc",
-                profile: "match AdHoc com.oztechan.ccc",
-                configuration: "Release"
-            )
-        end
-
         lane :buildAll do
             install_certificate_and_profile(match_type: "adhoc")
             add_test_devices
@@ -84,7 +74,14 @@ platform :ios do
 
         lane :distribute do
             firebase_app_distribution(
-                app: ENV["IOS_GOOGLE_FIREBASE_APP_ID"],
+                app: ENV["IOS_RELEASE_FIREBASE_APP_ID"],
+                groups: "QA",
+                release_notes: changelog_from_git_commits(commits_count: 1),
+                firebase_cli_token: ENV["FIREBASE_CLI_TOKEN"],
+                ipa_path: "../ios/CCC.ipa"
+            )
+            firebase_app_distribution(
+                app: ENV["IOS_DEBUG_FIREBASE_APP_ID"],
                 groups: "QA",
                 release_notes: changelog_from_git_commits(commits_count: 1),
                 firebase_cli_token: ENV["FIREBASE_CLI_TOKEN"],