Update Fastlane config

horizontalsystems · Oct 18, 2023 · 7cf9a98 · 7cf9a98
1 parent 9e4e02e
commit 7cf9a98
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 45 deletions.
diff --git a/.github/workflows/deploy_appstore.yml b/.github/workflows/deploy_appstore.yml
@@ -11,10 +11,10 @@ jobs:
     runs-on: macos-12
 
     steps:
-      - name: Setup Xcode to 14.2
+      - name: Setup Xcode to 15.0
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: '14.2'
+          xcode-version: '15.0'
 
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -41,19 +41,12 @@ jobs:
           lane: release
         env:
           BUILD_NUMBER: ${{ github.run_number }}
-          APP_STORE_CONNECT_TEAM_ID: ${{ secrets.APP_STORE_CONNECT_TEAM_ID }}
           APP_ID: ${{ secrets.APP_ID }}
-          APP_IDENTIFIER_RELEASE: ${{ secrets.APP_IDENTIFIER_RELEASE }}
-          DEVELOPER_PORTAL_TEAM_ID: ${{ secrets.DEVELOPER_PORTAL_TEAM_ID }}
-          FASTLANE_APPLE_ID: ${{ secrets.FASTLANE_APPLE_ID }}
-          FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }}
-          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           GIT_AUTHORIZATION: ${{ secrets.GIT_AUTHORIZATION }}
-          PROVISIONING_PROFILE_SPECIFIER_APPSTORE: ${{ secrets.PROVISIONING_PROFILE_SPECIFIER_APPSTORE }}
-          TEMP_KEYCHAIN_PASSWORD: ${{ secrets.TEMP_KEYCHAIN_PASSWORD }}
           TEMP_KEYCHAIN_USER: ${{ secrets.TEMP_KEYCHAIN_USER }}
-          APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }}
+          TEMP_KEYCHAIN_PASSWORD: ${{ secrets.TEMP_KEYCHAIN_PASSWORD }}
           APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
+          APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }}
           APPLE_KEY_CONTENT: ${{ secrets.APPLE_KEY_CONTENT }}
 
           XCCONFIG_PROD_INFURA_PROJECT_ID: ${{ secrets.XCCONFIG_PROD_INFURA_PROJECT_ID }}

diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml
@@ -11,10 +11,10 @@ jobs:
     runs-on: macos-12
 
     steps:
-      - name: Setup Xcode to 14.2
+      - name: Setup Xcode to 15.0
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: '14.2'
+          xcode-version: '15.0'
 
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -41,19 +41,12 @@ jobs:
           lane: dev
         env:
           BUILD_NUMBER: ${{ github.run_number }}
-          APP_STORE_CONNECT_TEAM_ID: ${{ secrets.APP_STORE_CONNECT_TEAM_ID }}
           APP_ID: ${{ secrets.APP_ID }}
-          APP_IDENTIFIER_DEV: ${{ secrets.APP_IDENTIFIER_DEV }}
-          DEVELOPER_PORTAL_TEAM_ID: ${{ secrets.DEVELOPER_PORTAL_TEAM_ID }}
-          FASTLANE_APPLE_ID: ${{ secrets.FASTLANE_APPLE_ID }}
-          FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }}
-          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           GIT_AUTHORIZATION: ${{ secrets.GIT_AUTHORIZATION }}
-          PROVISIONING_PROFILE_SPECIFIER_DEV: ${{ secrets.PROVISIONING_PROFILE_SPECIFIER_DEV }}
-          TEMP_KEYCHAIN_PASSWORD: ${{ secrets.TEMP_KEYCHAIN_PASSWORD }}
           TEMP_KEYCHAIN_USER: ${{ secrets.TEMP_KEYCHAIN_USER }}
-          APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }}
+          TEMP_KEYCHAIN_PASSWORD: ${{ secrets.TEMP_KEYCHAIN_PASSWORD }}
           APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
+          APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }}
           APPLE_KEY_CONTENT: ${{ secrets.APPLE_KEY_CONTENT }}
           APP_CENTER_API_TOKEN: ${{ secrets.APP_CENTER_API_TOKEN }}
 

diff --git a/fastlane/Appfile b/fastlane/Appfile
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -1,10 +1,6 @@
 default_platform(:ios)
 
 APP_ID = ENV["APP_ID"]
-APP_IDENTIFIER_DEV = ENV["APP_IDENTIFIER_DEV"]
-APP_IDENTIFIER_RELEASE = ENV["APP_IDENTIFIER_RELEASE"]
-PROVISIONING_PROFILE_SPECIFIER_DEV = ENV["PROVISIONING_PROFILE_SPECIFIER_DEV"]
-PROVISIONING_PROFILE_SPECIFIER_APPSTORE = ENV["PROVISIONING_PROFILE_SPECIFIER_APPSTORE"]
 TEMP_KEYCHAIN_USER = ENV["TEMP_KEYCHAIN_USER"]
 TEMP_KEYCHAIN_PASSWORD = ENV["TEMP_KEYCHAIN_PASSWORD"]
 APPLE_ISSUER_ID = ENV["APPLE_ISSUER_ID"]
@@ -159,7 +155,7 @@ platform :ios do
 
     match(
       type: 'adhoc',
-      app_identifier: "#{APP_IDENTIFIER_DEV}",
+      app_identifier: ["io.horizontalsystems.bank-wallet.dev", "io.horizontalsystems.bank-wallet.dev.widget", "io.horizontalsystems.bank-wallet.dev.intent"],
       git_basic_authorization: Base64.strict_encode64(GIT_AUTHORIZATION),
       readonly: true,
       keychain_name: keychain_name,
@@ -175,7 +171,9 @@ platform :ios do
       export_options: {
         compileBitcode: false,
         provisioningProfiles: {
-            APP_ID => PROVISIONING_PROFILE_SPECIFIER_DEV
+            "io.horizontalsystems.bank-wallet.dev" => "match AdHoc io.horizontalsystems.bank-wallet.dev",
+            "io.horizontalsystems.bank-wallet.dev.widget" => "match AdHoc io.horizontalsystems.bank-wallet.dev.widget",
+            "io.horizontalsystems.bank-wallet.dev.intent" => "match AdHoc io.horizontalsystems.bank-wallet.dev.intent"
         },
         iCloudContainerEnvironment: "Development"
       }
@@ -205,7 +203,7 @@ platform :ios do
 
     match(
       type: 'appstore',
-      app_identifier: "#{APP_IDENTIFIER_RELEASE}",
+      app_identifier: ["io.horizontalsystems.bank-wallet", "io.horizontalsystems.bank-wallet.widget", "io.horizontalsystems.bank-wallet.intent"],
       git_basic_authorization: Base64.strict_encode64(GIT_AUTHORIZATION),
       readonly: true,
       keychain_name: keychain_name,
@@ -221,15 +219,17 @@ platform :ios do
       export_options: {
         compileBitcode: false,
         provisioningProfiles: {
-            APP_ID => PROVISIONING_PROFILE_SPECIFIER_APPSTORE
+            "io.horizontalsystems.bank-wallet" => "match AppStore io.horizontalsystems.bank-wallet",
+            "io.horizontalsystems.bank-wallet.widget" => "match AppStore io.horizontalsystems.bank-wallet.widget",
+            "io.horizontalsystems.bank-wallet.intent" => "match AppStore io.horizontalsystems.bank-wallet.intent"
         },
         iCloudContainerEnvironment: "Production"
       }
     )
 
     pilot(
       apple_id: "#{APP_ID}",
-      app_identifier: "#{APP_IDENTIFIER_RELEASE}",
+      app_identifier: "io.horizontalsystems.bank-wallet",
       skip_waiting_for_build_processing: true,
       skip_submission: true,
       distribute_external: false,