From 7f54b38ae25e401e1195d2367a5619709322d3ee Mon Sep 17 00:00:00 2001 From: Noah Martin Date: Wed, 10 Sep 2025 11:35:32 -0400 Subject: [PATCH] ci: Test with static lib --- Sources/Configuration/SDK.xcconfig | 4 +++- TestSamples/SwiftUICrashTest/test-crash-and-relaunch.sh | 1 + fastlane/Fastfile | 8 +++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Sources/Configuration/SDK.xcconfig b/Sources/Configuration/SDK.xcconfig index 5016ff25399..a5788b28df1 100644 --- a/Sources/Configuration/SDK.xcconfig +++ b/Sources/Configuration/SDK.xcconfig @@ -7,7 +7,9 @@ DEFINES_MODULE = YES DYLIB_COMPATIBILITY_VERSION = 1 DYLIB_CURRENT_VERSION = 1 DYLIB_INSTALL_NAME_BASE = @rpath -MACH_O_TYPE = mh_dylib +MACH_O_TYPE_YES = staticlib +MACH_O_TYPE_ = mh_dylib +MACH_O_TYPE = $(MACH_O_TYPE_$(USE_STATIC)) FRAMEWORK_VERSION = A CURRENT_PROJECT_VERSION = 8.56.0 diff --git a/TestSamples/SwiftUICrashTest/test-crash-and-relaunch.sh b/TestSamples/SwiftUICrashTest/test-crash-and-relaunch.sh index 40008b2448e..78768cb0b8c 100755 --- a/TestSamples/SwiftUICrashTest/test-crash-and-relaunch.sh +++ b/TestSamples/SwiftUICrashTest/test-crash-and-relaunch.sh @@ -123,6 +123,7 @@ xcodebuild -workspace Sentry.xcworkspace \ -derivedDataPath DerivedData \ -configuration Debug \ CODE_SIGNING_REQUIRED=NO \ + USE_STATIC=YES \ build 2>&1 | tee raw-build.log | xcbeautify xcrun simctl runtime dyld_shared_cache update iOS18.4 diff --git a/fastlane/Fastfile b/fastlane/Fastfile index b815a915e28..938c583f15e 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -10,7 +10,7 @@ platform :ios do ios_swift_share_extension_infoplist_path = "./Samples/iOS-Swift/iOS-Swift-ShareExtension/Info.plist" # Helper method to run tests with common configuration - def run_ui_tests(scheme:, result_bundle_name:, device: nil, address_sanitizer: false) + def run_ui_tests(scheme:, result_bundle_name:, device: nil, address_sanitizer: false, xcargs: nil) configuration = if is_ci then 'TestCI' else 'Test' end result_bundle_path = "test_results/#{result_bundle_name}.xcresult" FileUtils.rm_r(result_bundle_path) if File.exist?(result_bundle_path) @@ -23,7 +23,8 @@ platform :ios do result_bundle: true, result_bundle_path: "fastlane/#{result_bundle_path}", device: device, - address_sanitizer: address_sanitizer + address_sanitizer: address_sanitizer, + xcargs: xcargs ) end @@ -222,7 +223,8 @@ platform :ios do lane :ui_critical_tests_ios_swiftui_all do run_ui_tests( scheme: "SwiftUITestSampleAll", - result_bundle_name: "ui_critical_tests_ios_swiftui_all" + result_bundle_name: "ui_critical_tests_ios_swiftui_all", + xcargs: "USE_STATIC='YES'" ) end