Use fastlane match for signing CI test builds

duckduckgo · Sep 10, 2024 · 520ded0 · 520ded0
1 parent b4bb64e
commit 520ded0
Show file tree

Hide file tree

Showing 16 changed files with 39 additions and 19 deletions.
diff --git a/Configuration/App/DBP/DuckDuckGoDBPAgent.xcconfig b/Configuration/App/DBP/DuckDuckGoDBPAgent.xcconfig
@@ -40,7 +40,7 @@ PRODUCT_NAME = $(DBP_BACKGROUND_AGENT_PRODUCT_NAME)
 PRODUCT_NAME[config=Review][arch=*][sdk=*] = $(DBP_BACKGROUND_AGENT_PRODUCT_NAME)
 
 PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] =
-PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = macOS DBP Agent - CI
+PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = match Direct com.duckduckgo.macos.DBP.backgroundAgent.debug macos
 PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = match Direct com.duckduckgo.macos.DBP.backgroundAgent.review macos
 PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = match Direct com.duckduckgo.macos.DBP.backgroundAgent macos
 

diff --git a/Configuration/App/DBP/DuckDuckGoDBPAgentAppStore.xcconfig b/Configuration/App/DBP/DuckDuckGoDBPAgentAppStore.xcconfig
@@ -43,7 +43,7 @@ PRODUCT_NAME[config=Review][arch=*][sdk=*] = $(DBP_BACKGROUND_AGENT_PRODUCT_NAME
 PRODUCT_NAME[config=Release][arch=*][sdk=*] = $(DBP_BACKGROUND_AGENT_RELEASE_PRODUCT_NAME)
 
 PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] =
-PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = macOS DBP Agent App Store - CI
+PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = match Direct com.duckduckgo.mobile.ios.DBP.backgroundAgent.debug macos
 PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = match AppStore com.duckduckgo.mobile.ios.DBP.backgroundAgent.review macos
 PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = match AppStore com.duckduckgo.mobile.ios.DBP.backgroundAgent macos
 

diff --git a/Configuration/App/DuckDuckGo.xcconfig b/Configuration/App/DuckDuckGo.xcconfig
@@ -29,7 +29,7 @@ FEATURE_FLAGS = FEEDBACK SPARKLE STRIPE
 PRODUCT_NAME_PREFIX = DuckDuckGo
 
 PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] =
-PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = MacOS Browser CI
+PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = match Direct com.duckduckgo.macos.browser.debug macos
 PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = match Direct com.duckduckgo.macos.browser macos
 PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = match Direct com.duckduckgo.macos.browser.review macos
 

diff --git a/Configuration/App/DuckDuckGoAppStore.xcconfig b/Configuration/App/DuckDuckGoAppStore.xcconfig
@@ -36,7 +36,7 @@ PRODUCT_NAME_PREFIX = DuckDuckGo App Store
 PRODUCT_NAME[config=Release][arch=*][sdk=*] = $(RELEASE_PRODUCT_NAME_OVERRIDE:default=$(PRODUCT_NAME_PREFIX))
 
 PROVISIONING_PROFILE_SPECIFIER[config=Debug][sdk=macosx*] =
-PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = MacOS Browser App Store CI
+PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = match Direct com.duckduckgo.mobile.ios.debug macos
 PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = match AppStore com.duckduckgo.mobile.ios macos
 PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = match AppStore com.duckduckgo.mobile.ios.review macos
 

diff --git a/Configuration/App/NetworkProtection/DuckDuckGoNotifications.xcconfig b/Configuration/App/NetworkProtection/DuckDuckGoNotifications.xcconfig
@@ -35,7 +35,7 @@ PRODUCT_NAME_PREFIX = $(NOTIFICATIONS_AGENT_PRODUCT_NAME)
 PRODUCT_NAME[config=Review][arch=*][sdk=*] = $(NOTIFICATIONS_AGENT_PRODUCT_NAME)
 
 PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] =
-PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = Mac Browser NetP Developer ID Not. (CI)
+PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = match Direct HKE973VLUW.com.duckduckgo.macos.browser.network-protection.notifications.debug macos
 PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = match Direct HKE973VLUW.com.duckduckgo.macos.browser.network-protection.notifications.review macos
 PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = match Direct HKE973VLUW.com.duckduckgo.macos.browser.network-protection.notifications macos
 

diff --git a/Configuration/App/NetworkProtection/DuckDuckGoVPN.xcconfig b/Configuration/App/NetworkProtection/DuckDuckGoVPN.xcconfig
@@ -45,7 +45,7 @@ PRODUCT_NAME = $(AGENT_PRODUCT_NAME)
 PRODUCT_NAME[config=Review][arch=*][sdk=*] = $(AGENT_PRODUCT_NAME)
 
 PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] =
-PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = macOS NetP VPN App - CI (XPC)
+PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = match Direct com.duckduckgo.macos.vpn.debug macos
 PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = match Direct com.duckduckgo.macos.vpn.review macos
 PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = match Direct com.duckduckgo.macos.vpn macos
 

diff --git a/Configuration/App/NetworkProtection/DuckDuckGoVPNAppStore.xcconfig b/Configuration/App/NetworkProtection/DuckDuckGoVPNAppStore.xcconfig
@@ -47,7 +47,7 @@ PRODUCT_NAME[config=Review][arch=*][sdk=*] = $(AGENT_PRODUCT_NAME)
 PRODUCT_NAME[config=Release][arch=*][sdk=*] = $(AGENT_PRODUCT_NAME)
 
 PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] =
-PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = macOS NetP VPN App App Store - CI (XPC)
+PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = match Direct com.duckduckgo.mobile.ios.vpn.agent.debug macos
 PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = match AppStore com.duckduckgo.mobile.ios.vpn.agent macos
 PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = match AppStore com.duckduckgo.mobile.ios.vpn.agent.review macos
 

diff --git a/Configuration/Extensions/NetworkProtection/NetworkProtectionAppExtension.xcconfig b/Configuration/Extensions/NetworkProtection/NetworkProtectionAppExtension.xcconfig
@@ -43,7 +43,7 @@ PRODUCT_BUNDLE_IDENTIFIER[config=Debug][sdk=*] = $(TUNNEL_EXTENSION_BUNDLE_ID)
 PRODUCT_BUNDLE_IDENTIFIER[config=Release][sdk=*] = $(TUNNEL_EXTENSION_BUNDLE_ID)
 PRODUCT_BUNDLE_IDENTIFIER[config=Review][sdk=*] = $(TUNNEL_EXTENSION_BUNDLE_ID)
 
-PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = macOS NetP VPN App XPC App Store - CI
+PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = match Direct com.duckduckgo.mobile.ios.vpn.agent.debug.network-protection-extension macos
 PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = match AppStore com.duckduckgo.mobile.ios.vpn.agent.network-protection-extension macos
 PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = match AppStore com.duckduckgo.mobile.ios.vpn.agent.review.network-protection-extension macos
 

diff --git a/Configuration/Extensions/NetworkProtection/VPNProxyExtension.xcconfig b/Configuration/Extensions/NetworkProtection/VPNProxyExtension.xcconfig
@@ -41,7 +41,7 @@ PRODUCT_BUNDLE_IDENTIFIER[config=Debug][sdk=*] = $(PROXY_EXTENSION_BUNDLE_ID)
 PRODUCT_BUNDLE_IDENTIFIER[config=Release][sdk=*] = $(PROXY_EXTENSION_BUNDLE_ID)
 PRODUCT_BUNDLE_IDENTIFIER[config=Review][sdk=*] = $(PROXY_EXTENSION_BUNDLE_ID)
 
-PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = macOS VPN Proxy Extension App Store - CI
+PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = match Direct com.duckduckgo.mobile.ios.vpn.agent.debug.proxy macos
 PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = match AppStore $(AGENT_BUNDLE_ID).proxy macos
 PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = match AppStore $(AGENT_BUNDLE_ID).proxy macos
 

diff --git a/Configuration/Tests/IntegrationTests.xcconfig b/Configuration/Tests/IntegrationTests.xcconfig
@@ -24,7 +24,7 @@ FEATURE_FLAGS = FEEDBACK
 
 INFOPLIST_FILE = IntegrationTests/Info.plist
 PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.Integration-Tests
-PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = MacOS Integration Tests CI
+PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = match Direct com.duckduckgo.Integration-Tests macos
 
 SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/IntegrationTests/Common/IntegrationTestsBridging.h
 GCC_PREPROCESSOR_DEFINITIONS[arch=*][sdk=*] = uint64_t="unsigned long long" _UINT64_T=1 $(inherited)

diff --git a/Configuration/Tests/IntegrationTestsAppStore.xcconfig b/Configuration/Tests/IntegrationTestsAppStore.xcconfig
@@ -17,6 +17,6 @@
 #include "../AppStore.xcconfig"
 
 PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.mobile.ios.Integration-Tests
-PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = MacOS Integration Tests App Store CI
+PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = match Direct com.duckduckgo.mobile.ios.Integration-Tests macos
 
 TEST_HOST=$(BUILT_PRODUCTS_DIR)/DuckDuckGo App Store.app/Contents/MacOS/DuckDuckGo App Store
diff --git a/Configuration/Tests/UnitTests.xcconfig b/Configuration/Tests/UnitTests.xcconfig
@@ -24,7 +24,7 @@ FEATURE_FLAGS = FEEDBACK
 
 INFOPLIST_FILE = UnitTests/Info.plist
 PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.macos.browser.DuckDuckGoTests
-PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = MacOS Unit Tests CI
+PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = match Direct com.duckduckgo.macos.browser.DuckDuckGoTests macos
 
 SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/UnitTests/Common/TestsBridging.h
 GCC_PREPROCESSOR_DEFINITIONS[arch=*][sdk=*] = uint64_t="unsigned long long" _UINT64_T=1 $(inherited)

diff --git a/Configuration/Tests/UnitTestsAppStore.xcconfig b/Configuration/Tests/UnitTestsAppStore.xcconfig
@@ -19,6 +19,6 @@
 FEATURE_FLAGS = FEEDBACK
 
 PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.mobile.ios.DuckDuckGoTests
-PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = MacOS Unit Tests App Store CI
+PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = match Direct com.duckduckgo.mobile.ios.DuckDuckGoTests macos
 
 TEST_HOST=$(BUILT_PRODUCTS_DIR)/DuckDuckGo App Store.app/Contents/MacOS/DuckDuckGo App Store
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -65,13 +65,13 @@ platform :mac do
     do_sync_signing(options)
   end
 
-  # Fetches and updates certificates and provisioning profiles for DMG CI builds
+  # Fetches and updates certificates and provisioning profiles for CI builds
   #
   # @option [String] username (default: nil) Your DDG Apple ID. Pass it to not be asked
   #         for it a couple of times during the process.
   #
-  desc 'Fetches and updates certificates and provisioning profiles for DMG CI builds'
-  lane :sync_signing_dmg_ci do |options|
+  desc 'Fetches and updates certificates and provisioning profiles for CI builds'
+  lane :sync_signing_ci do |options|
     do_sync_signing(options)
   end
 

diff --git a/fastlane/Matchfile b/fastlane/Matchfile
@@ -44,4 +44,24 @@ for_lane :sync_signing_dmg_review do
     ]
 end
 
+
+for_lane :sync_signing_ci do
+    type "developer_id"
+    app_identifier [
+        "com.duckduckgo.macos.browser.debug",
+        "com.duckduckgo.mobile.ios.debug",
+        "com.duckduckgo.macos.browser.DuckDuckGoTests",
+        "com.duckduckgo.Integration-Tests",
+        "com.duckduckgo.mobile.ios.DuckDuckGoTests",
+        "com.duckduckgo.mobile.ios.Integration-Tests",
+        "com.duckduckgo.mobile.ios.vpn.agent.debug.network-protection-extension",
+        "com.duckduckgo.mobile.ios.vpn.agent.debug.proxy",
+        "HKE973VLUW.com.duckduckgo.macos.browser.network-protection.notifications.debug",
+        "com.duckduckgo.macos.vpn.debug",
+        "com.duckduckgo.mobile.ios.vpn.agent.debug",
+        "com.duckduckgo.macos.DBP.backgroundAgent.debug",
+        "com.duckduckgo.mobile.ios.DBP.backgroundAgent.debug"
+    ]
+end
+
 # The docs are available on https://docs.fastlane.tools/actions/match
diff --git a/fastlane/README.md b/fastlane/README.md
@@ -39,13 +39,13 @@ Fetches and updates certificates and provisioning profiles for DMG distribution
 
 Fetches and updates certificates and provisioning profiles for DMG Review builds
 
-### mac sync_signing_dmg_ci
+### mac sync_signing_ci
 
 ```sh
-[bundle exec] fastlane mac sync_signing_dmg_ci
+[bundle exec] fastlane mac sync_signing_ci
 ```
 
-Fetches and updates certificates and provisioning profiles for DMG CI builds
+Fetches and updates certificates and provisioning profiles for CI builds
 
 ### mac release_testflight