From a7c52ce1bb8e4b5035c69b1c11529ce4cd3c71c3 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 3 Jul 2024 09:16:20 +1000 Subject: [PATCH 1/9] Add lane to fetch/update dev certificates --- fastlane/Fastfile | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index b9dcded..be40f3e 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -37,6 +37,8 @@ USER_ENV_FILE_PATH = File.join(Dir.home, '.a8c-apps', ENV_FILE_NAME) import 'lib/helpers.rb' before_all do + setup_ci if runner.current_platform == :ios + Dotenv.load(USER_ENV_FILE_PATH) end @@ -98,20 +100,31 @@ platform :ios do end desc 'Sets up code signing' - lane :set_up_code_signing do |options| - require_env_vars!(*ASC_API_KEY_ENV_VARS, *MATCH_ENV_VARS) + lane :set_up_code_signing_app_store do |readonly: true| + _set_up_code_signing(type: 'appstore', readonly: readonly) + end + + lane :set_up_code_signing_deveploment do |readonly: true| + _set_up_code_signing(type: 'development', readonly: readonly) + end + + def _set_up_code_signing(type:, readonly: true) + require_env_vars!(*MATCH_ENV_VARS) - setup_ci + unless readonly + require_env_vars!(*ASC_API_KEY_ENV_VARS) + api_key = app_store_connect_api_key + end shared_options = { - type: 'appstore', + type: type, app_identifier: BUNDLE_IDENTIFIER, team_id: 'PZYM8XX95Q', storage_mode: 's3', s3_region: 'us-east-2', s3_bucket: 'a8c-fastlane-match', - readonly: options.fetch(:readonly, true), - api_key: app_store_connect_api_key + readonly: readonly, + api_key: api_key } sync_code_signing( From 54db3f6b444b0c34d358d0772664e06bc742bf82 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 3 Jul 2024 09:23:24 +1000 Subject: [PATCH 2/9] Configure Debug build to use development provisioning profile --- ios/App/App.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 8b5672b..54bc3ec 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -363,8 +363,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = App/App.entitlements; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = ""; @@ -382,8 +382,8 @@ PRODUCT_BUNDLE_IDENTIFIER = com.ellavandurpe.blocknotes; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.ellavandurpe.blocknotes"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "match AppStore com.ellavandurpe.blocknotes catalyst"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.ellavandurpe.blocknotes"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "match Development com.ellavandurpe.blocknotes catalyst"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = YES; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; From c71c0841ddc0e5c45f078e43ddbf7e88662732e6 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 3 Jul 2024 09:29:22 +1000 Subject: [PATCH 3/9] Add `xcconfig` to iOS project and DRY `DEVELOPMENT_TEAM` in it --- ios/App/App.xcodeproj/project.pbxproj | 14 ++++++++------ ios/App/App/Base.xcconfig | 1 + ios/App/App/Debug.xcconfig | 3 +++ ios/App/App/Release.xcconfig | 3 +++ 4 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 ios/App/App/Base.xcconfig create mode 100644 ios/App/App/Debug.xcconfig create mode 100644 ios/App/App/Release.xcconfig diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 54bc3ec..c8847a9 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -20,6 +20,9 @@ /* Begin PBXFileReference section */ 04E5AB7A2A37305E0052580F /* App.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = App.entitlements; sourceTree = ""; }; 2FAD9762203C412B000D30F8 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = config.xml; sourceTree = ""; }; + 3F6C399A2C34C40900776C37 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = ""; }; + 3F6C399B2C34C46600776C37 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; + 3F6C399C2C34C46E00776C37 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; 4C8F509035A341B5689A8624 /* Pods-Blocknotes.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Blocknotes.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Blocknotes/Pods-Blocknotes.debug.xcconfig"; sourceTree = ""; }; 50379B222058CBB4000EE86E /* capacitor.config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = capacitor.config.json; sourceTree = ""; }; 504EC3041FED79650016851F /* Blocknotes.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Blocknotes.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -85,6 +88,9 @@ 504EC3131FED79650016851F /* Info.plist */, 2FAD9762203C412B000D30F8 /* config.xml */, 50B271D01FEDC1A000F3C39B /* public */, + 3F6C399A2C34C40900776C37 /* Base.xcconfig */, + 3F6C399B2C34C46600776C37 /* Debug.xcconfig */, + 3F6C399C2C34C46E00776C37 /* Release.xcconfig */, ); path = App; sourceTree = ""; @@ -245,6 +251,7 @@ /* Begin XCBuildConfiguration section */ 504EC3141FED79650016851F /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 3F6C399B2C34C46600776C37 /* Debug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -305,6 +312,7 @@ }; 504EC3151FED79650016851F /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 3F6C399C2C34C46E00776C37 /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -367,9 +375,6 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = PZYM8XX95Q; - "DEVELOPMENT_TEAM[sdk=macosx*]" = PZYM8XX95Q; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -403,9 +408,6 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Distribution"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = PZYM8XX95Q; - "DEVELOPMENT_TEAM[sdk=macosx*]" = PZYM8XX95Q; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = ( diff --git a/ios/App/App/Base.xcconfig b/ios/App/App/Base.xcconfig new file mode 100644 index 0000000..7b29190 --- /dev/null +++ b/ios/App/App/Base.xcconfig @@ -0,0 +1 @@ +DEVELOPMENT_TEAM = PZYM8XX95Q diff --git a/ios/App/App/Debug.xcconfig b/ios/App/App/Debug.xcconfig new file mode 100644 index 0000000..209006a --- /dev/null +++ b/ios/App/App/Debug.xcconfig @@ -0,0 +1,3 @@ +#include "Base.xcconfig" + +// Currently unused, we'll add Debug-specific settings soon diff --git a/ios/App/App/Release.xcconfig b/ios/App/App/Release.xcconfig new file mode 100644 index 0000000..5749a84 --- /dev/null +++ b/ios/App/App/Release.xcconfig @@ -0,0 +1,3 @@ +#include "Base.xcconfig" + +// Currently unused, we'll add Release-specific settings soon From 3250c730eb818e450f3bb9c023d9596aa8ed697e Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 3 Jul 2024 09:30:26 +1000 Subject: [PATCH 4/9] DRY `CODE_SIGN_STYLE` definition in `xcconfig` (`Manual`) --- ios/App/App.xcodeproj/project.pbxproj | 2 -- ios/App/App/Base.xcconfig | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index c8847a9..0893eed 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -373,7 +373,6 @@ CODE_SIGN_ENTITLEMENTS = App/App.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; - CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 17.0; @@ -406,7 +405,6 @@ CODE_SIGN_ENTITLEMENTS = App/App.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Distribution"; - CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 17.0; diff --git a/ios/App/App/Base.xcconfig b/ios/App/App/Base.xcconfig index 7b29190..ec91f64 100644 --- a/ios/App/App/Base.xcconfig +++ b/ios/App/App/Base.xcconfig @@ -1 +1,2 @@ DEVELOPMENT_TEAM = PZYM8XX95Q +CODE_SIGN_STYLE = Manual From 6aa0f21794065c5c69c63dc3c09f50222d0aa11b Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 3 Jul 2024 09:32:01 +1000 Subject: [PATCH 5/9] DRY `CODE_SIGN_IDENTITY` in `xcconfig` --- ios/App/App.xcodeproj/project.pbxproj | 6 ------ ios/App/App/Debug.xcconfig | 2 +- ios/App/App/Release.xcconfig | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 0893eed..f7e4092 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -282,7 +282,6 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -343,7 +342,6 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; @@ -371,8 +369,6 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = App/App.entitlements; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CURRENT_PROJECT_VERSION = 1; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 17.0; @@ -403,8 +399,6 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = App/App.entitlements; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Distribution"; CURRENT_PROJECT_VERSION = 1; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 17.0; diff --git a/ios/App/App/Debug.xcconfig b/ios/App/App/Debug.xcconfig index 209006a..f951a5c 100644 --- a/ios/App/App/Debug.xcconfig +++ b/ios/App/App/Debug.xcconfig @@ -1,3 +1,3 @@ #include "Base.xcconfig" -// Currently unused, we'll add Debug-specific settings soon +CODE_SIGN_IDENTITY = Apple Development diff --git a/ios/App/App/Release.xcconfig b/ios/App/App/Release.xcconfig index 5749a84..ffa53aa 100644 --- a/ios/App/App/Release.xcconfig +++ b/ios/App/App/Release.xcconfig @@ -1,3 +1,3 @@ #include "Base.xcconfig" -// Currently unused, we'll add Release-specific settings soon +CODE_SIGN_IDENTITY = Apple Distribution From f84d7879e664e2ef55bca2cfc44da9b9a5d6e565 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 3 Jul 2024 09:34:44 +1000 Subject: [PATCH 6/9] Move `PROVISIONING_PROFILE_SPECIFIER` to `xcconfig` --- ios/App/App.xcodeproj/project.pbxproj | 6 ------ ios/App/App/Debug.xcconfig | 3 +++ ios/App/App/Release.xcconfig | 3 +++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index f7e4092..9060ad6 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -381,9 +381,6 @@ OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = com.ellavandurpe.blocknotes; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.ellavandurpe.blocknotes"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "match Development com.ellavandurpe.blocknotes catalyst"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = YES; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; @@ -410,9 +407,6 @@ MARKETING_VERSION = 1.3; PRODUCT_BUNDLE_IDENTIFIER = com.ellavandurpe.blocknotes; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.ellavandurpe.blocknotes"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "match AppStore com.ellavandurpe.blocknotes catalyst"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = YES; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; diff --git a/ios/App/App/Debug.xcconfig b/ios/App/App/Debug.xcconfig index f951a5c..f52dbe0 100644 --- a/ios/App/App/Debug.xcconfig +++ b/ios/App/App/Debug.xcconfig @@ -1,3 +1,6 @@ #include "Base.xcconfig" CODE_SIGN_IDENTITY = Apple Development + +PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*] = match Development com.ellavandurpe.blocknotes +PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] = match Development com.ellavandurpe.blocknotes catalyst diff --git a/ios/App/App/Release.xcconfig b/ios/App/App/Release.xcconfig index ffa53aa..1f7d931 100644 --- a/ios/App/App/Release.xcconfig +++ b/ios/App/App/Release.xcconfig @@ -1,3 +1,6 @@ #include "Base.xcconfig" CODE_SIGN_IDENTITY = Apple Distribution + +PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*] = match AppStore com.ellavandurpe.blocknotes +PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] = match AppStore com.ellavandurpe.blocknotes catalyst From 68d5667167fe2a5dd20f922518638cb381646f38 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Thu, 4 Jul 2024 20:40:52 +1000 Subject: [PATCH 7/9] Move `_set_up_code_singing` out of `platform` block --- fastlane/Fastfile | 64 +++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index be40f3e..9dbd4a2 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -107,38 +107,6 @@ platform :ios do lane :set_up_code_signing_deveploment do |readonly: true| _set_up_code_signing(type: 'development', readonly: readonly) end - - def _set_up_code_signing(type:, readonly: true) - require_env_vars!(*MATCH_ENV_VARS) - - unless readonly - require_env_vars!(*ASC_API_KEY_ENV_VARS) - api_key = app_store_connect_api_key - end - - shared_options = { - type: type, - app_identifier: BUNDLE_IDENTIFIER, - team_id: 'PZYM8XX95Q', - storage_mode: 's3', - s3_region: 'us-east-2', - s3_bucket: 'a8c-fastlane-match', - readonly: readonly, - api_key: api_key - } - - sync_code_signing( - platform: 'ios', - **shared_options - ) - sync_code_signing( - platform: 'catalyst', - # Without this, we'll get: - # error: exportArchive: Provisioning profile "match AppStore com.ellavandurpe.blocknotes catalyst" doesn't include signing certificate "3rd Party Mac Developer Installer: Automattic, Inc. (PZYM8XX95Q)". - additional_cert_types: 'mac_installer_distribution', - **shared_options - ) - end end def bump_build_number @@ -152,3 +120,35 @@ def bump_build_number build_number: latest_build_number + 1 ) end + +def _set_up_code_signing(type:, readonly: true) + require_env_vars!(*MATCH_ENV_VARS) + + unless readonly + require_env_vars!(*ASC_API_KEY_ENV_VARS) + api_key = app_store_connect_api_key + end + + shared_options = { + type: type, + app_identifier: BUNDLE_IDENTIFIER, + team_id: 'PZYM8XX95Q', + storage_mode: 's3', + s3_region: 'us-east-2', + s3_bucket: 'a8c-fastlane-match', + readonly: readonly, + api_key: api_key + } + + sync_code_signing( + platform: 'ios', + **shared_options + ) + sync_code_signing( + platform: 'catalyst', + # Without this, we'll get: + # error: exportArchive: Provisioning profile "match AppStore com.ellavandurpe.blocknotes catalyst" doesn't include signing certificate "3rd Party Mac Developer Installer: Automattic, Inc. (PZYM8XX95Q)". + additional_cert_types: 'mac_installer_distribution', + **shared_options + ) +end From d4e9a84a3c3c6d1ca2a6481817aed1ad3f49edb6 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Thu, 4 Jul 2024 20:41:22 +1000 Subject: [PATCH 8/9] Remove odd `_` prefix from `set_up_code_signing` See @spencertransier's question at https://github.com/blocknotes-org/blocknotes/pull/16#discussion_r1664888499 --- fastlane/Fastfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 9dbd4a2..773f54a 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -101,11 +101,11 @@ platform :ios do desc 'Sets up code signing' lane :set_up_code_signing_app_store do |readonly: true| - _set_up_code_signing(type: 'appstore', readonly: readonly) + set_up_code_signing(type: 'appstore', readonly: readonly) end lane :set_up_code_signing_deveploment do |readonly: true| - _set_up_code_signing(type: 'development', readonly: readonly) + set_up_code_signing(type: 'development', readonly: readonly) end end @@ -121,7 +121,7 @@ def bump_build_number ) end -def _set_up_code_signing(type:, readonly: true) +def set_up_code_signing(type:, readonly: true) require_env_vars!(*MATCH_ENV_VARS) unless readonly From 2bfad908c41163a8d898ab58b9f6e6130d747ec5 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Thu, 4 Jul 2024 20:43:24 +1000 Subject: [PATCH 9/9] Add `set_up_code_singing` lane that runs both App Store and Dev --- fastlane/Fastfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 773f54a..9b2afde 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -66,7 +66,7 @@ platform :ios do desc 'Builds the app for iOS and Mac Catalyst App Store distribution' lane :build_for_app_store do |options| - set_up_code_signing unless options[:skip_code_signing_setup] + set_up_code_signing_app_store unless options[:skip_code_signing_setup] shared_options = { scheme: 'Blocknotes', @@ -99,7 +99,11 @@ platform :ios do ) end - desc 'Sets up code signing' + lane :set_up_code_signing do |readonly: true| + set_up_code_signing_app_store(readonly: readonly) + set_up_code_signing_deveploment(readonly: readonly) + end + lane :set_up_code_signing_app_store do |readonly: true| set_up_code_signing(type: 'appstore', readonly: readonly) end