diff --git a/plugins/fastlane-plugin-ios_cd/ios_crendentials.json b/plugins/fastlane-plugin-ios_cd/ios_crendentials.json deleted file mode 100644 index 909147c..0000000 --- a/plugins/fastlane-plugin-ios_cd/ios_crendentials.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "developer_app_id":"1624036332", - "developer_app_identifier":"com.jaggerlewis.jl3", - "app_identifier_extensions":[ - "com.jaggerlewis.jl3", - "com.jaggerlewis.jl3.OneSignalNotificationServiceExtension" - - ], - "apple_issuer_id":"69a6de90-9fe1-47e3-e053-5b8c7c11a4d1", - "apple_key_id":"VBRDBQM7SJ", - "apple_key_content":"-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgxLuVvuI7DafrGHTz\nATTtdB1TgIFkb12qFVyNSj4kuE+gCgYIKoZIzj0DAQehRANCAAQl7PyxfJR2QoKC\nmpqvjG4mQxMIzehm9TsLAjwLrPya4LWRyxrEEvPG/N5L06udHtv26gLDMR5gY6uO\nY1pVJX28\n-----END PRIVATE KEY-----", - "provisioning_profiles":{ - "1624036332": "match AppStore com.jaggerlewis.jl3", - "com.jaggerlewis.jl3.OneSignalNotificationServiceExtension": "match AppStore com.jaggerlewis.jl3.OneSignalNotificationServiceExtension" - }, - "temp_keychain_user":"root", - "temp_keychain_password":"toto1234" -} \ No newline at end of file diff --git a/plugins/fastlane-plugin-ios_cd/ios_keys.zip b/plugins/fastlane-plugin-ios_cd/ios_keys.zip deleted file mode 100644 index be63ca3..0000000 Binary files a/plugins/fastlane-plugin-ios_cd/ios_keys.zip and /dev/null differ diff --git a/plugins/fastlane-plugin-ios_cd/ios_keys.zip.gpg b/plugins/fastlane-plugin-ios_cd/ios_keys.zip.gpg deleted file mode 100644 index 19cdb2c..0000000 Binary files a/plugins/fastlane-plugin-ios_cd/ios_keys.zip.gpg and /dev/null differ diff --git a/plugins/fastlane-plugin-ios_cd/lib/fastlane/plugin/ios_cd/actions/build_and_deploy_action.rb b/plugins/fastlane-plugin-ios_cd/lib/fastlane/plugin/ios_cd/actions/build_and_deploy_action.rb index 85ab9a6..4a3d2cd 100644 --- a/plugins/fastlane-plugin-ios_cd/lib/fastlane/plugin/ios_cd/actions/build_and_deploy_action.rb +++ b/plugins/fastlane-plugin-ios_cd/lib/fastlane/plugin/ios_cd/actions/build_and_deploy_action.rb @@ -15,12 +15,15 @@ module Fastlane # Decrypt the keys archive and Extract the keys archive Helper::IosCdHelper.decrypt_ios_keys('.') + UI.message("👉🏼 Credentials decrypted.") # Retrieve credentials creds = Helper::IosCdHelper.parseIosCredentials('.') + UI.message("👉🏼 Credentials parsed.") # Ensure temporary keychain exists Helper::IosCdHelper.ensure_temp_keychain(creds['temp_keychain_user'], creds['temp_keychain_password']) + UI.message("👉🏼 New keychain created") # Obtain App Store Connect API key api_key = Actions::AppStoreConnectApiKeyAction.run( @@ -30,6 +33,7 @@ module Fastlane duration: 1200, in_house: false ) + UI.message("👉🏼 API Key formated") last_testflight_build_number = Actions::LatestTestflightBuildNumberAction.run( @@ -46,6 +50,7 @@ module Fastlane build_number: last_testflight_build_number + 1, xcodeproj: "Runner.xcodeproj" ) + UI.message("👉🏼 Build number incremented") # Install Cocoapods Actions::CocoapodsAction.run( @@ -54,6 +59,7 @@ module Fastlane integrate: true, podfile: "./Podfile" ) + UI.message("👉🏼 Pod got") # Set up code signing using match # Configures and runs `match` which manages code signing certificates and provisioning profiles for the project. @@ -61,13 +67,20 @@ module Fastlane # It uses the App Store Connect API key to access the App Store and increment the build number. # It then runs `gym` to build and sign the app using the selected provisioning profile, and finally, uses `pilot` to upload the app to TestFlight for beta testing. Actions::MatchAction.run( + api_key: api_key type: 'appstore', app_identifier: creds['app_identifier_extensions'], git_basic_authorization: Base64.strict_encode64(ENV["GIT_AUTHORIZATION"]), keychain_name: creds['temp_keychain_user'], keychain_password: creds['temp_keychain_password'], - api_key: api_key + git_url: creds['git_url'], + username: "leonmalo@sfr.fr", + team_id: "118579280", + team_name: "Jagger & Lewis", + team_name: "https://github.com/JaggerLewis/jl2022_cert.git", + storage_mode: "git", ) + UI.message("👉🏼 App signed") # Build and export app using Gym # Builds and packages an iOS app or framework for distribution to the App Store, TestFlight, or Enterprise distribution. @@ -80,6 +93,7 @@ module Fastlane provisioningProfiles: creds['provisioning_profiles'] } ) + UI.message("👉🏼 App built") # Upload build to App Store Connect using Pilot Actions::PilotAction.run( @@ -91,6 +105,7 @@ module Fastlane notify_external_testers: false, ipa: "./Runner.ipa" ) + UI.message("👉🏼 App uploaded") Actions::DeleteTempKeychainAction.run end