From b4df1c05ef5aa5c7f5465c4a617de45ef89e7833 Mon Sep 17 00:00:00 2001 From: npub12wpjffj7q5qjsky5jvk4ldwlxmse5xll3d8gytk4wqd0c5y7jvwspg37n6 <538324a65e0501285894932d5fb5df36e19a1bff8b4e822ed5701afc509e931d@buzz.block.builderlab.xyz> Date: Fri, 31 Jul 2026 17:44:39 -0700 Subject: [PATCH] test(mobile/ios): resolve signing config references Co-authored-by: Tom Brow Signed-off-by: Tom Brow --- scripts/test-mobile-worktree-overrides.sh | 26 ++++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/scripts/test-mobile-worktree-overrides.sh b/scripts/test-mobile-worktree-overrides.sh index 730e16a54b..c23ebee4a0 100755 --- a/scripts/test-mobile-worktree-overrides.sh +++ b/scripts/test-mobile-worktree-overrides.sh @@ -172,6 +172,13 @@ else fi signing_map=$(awk ' NR == FNR { + if (/isa = PBXFileReference/ && /\.xcconfig/) { + xcconfig_path = $0 + sub(/^.*path = /, "", xcconfig_path) + sub(/;.*$/, "", xcconfig_path) + xcconfig_paths[$1] = xcconfig_path + next + } if (/Build configuration list for PBXNativeTarget "/) { split($0, fields, "\"") target = fields[2] @@ -188,7 +195,8 @@ signing_map=$(awk ' next } if (in_configurations && /\/\* (Debug|Release|Profile) \*\//) { - targets[$1] = target + if ($1 in targets) targets[$1] = "DUPLICATE:" targets[$1] "+" target + else targets[$1] = target } next } @@ -205,9 +213,7 @@ signing_map=$(awk ' in_build_configuration { if (/baseConfigurationReference =/) { - base_configuration = $0 - sub(/^.*\/\* /, "", base_configuration) - sub(/ \*\/.*$/, "", base_configuration) + base_configuration = $3 in xcconfig_paths ? xcconfig_paths[$3] : "UNRESOLVED:" $3 } if (/DEVELOPMENT_TEAM =/) { team = $0 @@ -231,12 +237,12 @@ signing_map=$(awk ' } ' "$pbxproj" "$pbxproj" | sort) expected_signing_map=$(printf '%s\n' \ - 'NotificationService Debug Debug.xcconfig JMTDPW9CG3 NotificationService/NotificationService.entitlements' \ - 'NotificationService Profile Release.xcconfig EYF346PHUG NotificationService/NotificationService.entitlements' \ - 'NotificationService Release Release.xcconfig EYF346PHUG NotificationService/NotificationService.entitlements' \ - 'Runner Debug Debug.xcconfig JMTDPW9CG3 Runner/Runner.entitlements' \ - 'Runner Profile Release.xcconfig EYF346PHUG Runner/Runner.entitlements' \ - 'Runner Release Release.xcconfig EYF346PHUG Runner/Runner.entitlements') + 'NotificationService Debug Flutter/Debug.xcconfig JMTDPW9CG3 NotificationService/NotificationService.entitlements' \ + 'NotificationService Profile Flutter/Release.xcconfig EYF346PHUG NotificationService/NotificationService.entitlements' \ + 'NotificationService Release Flutter/Release.xcconfig EYF346PHUG NotificationService/NotificationService.entitlements' \ + 'Runner Debug Flutter/Debug.xcconfig JMTDPW9CG3 Runner/Runner.entitlements' \ + 'Runner Profile Flutter/Release.xcconfig EYF346PHUG Runner/Runner.entitlements' \ + 'Runner Release Flutter/Release.xcconfig EYF346PHUG Runner/Runner.entitlements') if [[ "$signing_map" == "$expected_signing_map" ]]; then pass "Runner and NotificationService signing settings match each build configuration" else