getsentry · armcknight · Apr 26, 2025 · Apr 26, 2025 · Apr 26, 2025 · Apr 30, 2025
diff --git a/.github/workflows/benchmarking.yml b/.github/workflows/benchmarking.yml
@@ -11,7 +11,6 @@ on:
 
       # test changes to benchmarking implementation
       - "Samples/iOS-Swift/**"
-      - "Samples/iOS-Swift/PerformanceBenchmarks/**"
       - ".github/workflows/benchmarking.yml"
       - ".sauce/benchmarking-config.yml"
       - "fastlane/**"
@@ -33,6 +32,8 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
+      - run: make init-ci-build
+      - run: make xcode
       - name: Install SentryCli
         run: brew install getsentry/tools/sentry-cli
       - name: Cache iOS-Swift App and dSYM build products
@@ -42,14 +43,14 @@ jobs:
           path: |
             DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app.dSYM
             DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app
-          key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/iOS-Swift/**') }}-${{ hashFiles('Sources/Sentry/**') }}
+          key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/**') }}-${{ hashFiles('Sources/Sentry/**') }}
       - name: Cache iOS-Swift UI Test Runner App build product
         id: ios-swift-benchmark-runner-cache
         uses: actions/cache@v4
         with:
           path: |
-            DerivedData/Build/Products/Debug-iphoneos/PerformanceBenchmarks-Runner.app
-          key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/PerformanceBenchmarks/**') }}
+            DerivedData/Build/Products/Debug-iphoneos/iOS-Benchmarking-Runner.app
+          key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Benchmarking/**') }}
       - run: bundle exec fastlane build_ios_swift_for_tests
         env:
           APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
@@ -77,7 +78,7 @@ jobs:
           name: DerivedData-Xcode
           path: |
             **/Debug-iphoneos/iOS-Swift.app
-            **/Debug-iphoneos/PerformanceBenchmarks-Runner.app
+            **/Debug-iphoneos/iOS-Benchmarking-Runner.app
 
   run-ui-tests-with-sauce:
     name: Run benchmarks on Sauce Labs

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -36,6 +36,8 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
+      - run: make init-ci-build
+      - run: make xcode
       - name: Run Fastlane
         env:
           APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
@@ -66,6 +68,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: ./scripts/ci-select-xcode.sh 16.3
+      - run: make init-ci-build
+      - run: make xcode
 
       # Note: Due to complexity in implementing the CODE_SIGNING_ALLOWED flag in the sentry-xcodebuild.sh script,
       #       we did not yet migrate this step to use the script yet.

diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
@@ -114,11 +114,9 @@ jobs:
           - runs-on: macos-13
             xcode: "14.3.1"
             device: "iPhone 14 (16.4)"
-
           - runs-on: macos-14
             xcode: "15.4"
             device: "iPhone 15 (17.5)"
-
           - runs-on: macos-15
             xcode: "16.3"
             device: "iPhone 15 (18.4)"
@@ -131,6 +129,10 @@ jobs:
 
       - run: ./scripts/ci-select-xcode.sh ${{matrix.xcode}}
 
+      - run: make init-ci-build
+      - run: make xcode
+        name: XcodeGen iOS-Swift project
+
       - name: Run Fastlane
         run: bundle exec fastlane ui_tests_ios_swift device:"${{matrix.device}}"
 
@@ -170,6 +172,12 @@ jobs:
 
       - run: ./scripts/ci-select-xcode.sh "16.2"
 
+      - run: make init-ci-build
+      - run: make xcode
+        name: XcodeGen iOS-Swift project
+
+      - run: make xcode
+
       - name: Run Fastlane
         run: bundle exec fastlane ui_tests_ios_swift6
 

@@ -224,3 +224,8 @@ dist
 .yarn/build-state.yml
 .yarn/install-state.gz
 .pnp.*
+
+Samples/SessionReplay-CameraTest/SessionReplay-CameraTest.xcodeproj
+Samples/iOS-Swift/iOS-Swift.xcodeproj
+Samples/iOS-Swift6/iOS-Swift6.xcodeproj
+Samples/iOS13-Swift/iOS13-Swift.xcodeproj
diff --git a/.sauce/benchmarking-config.yml b/.sauce/benchmarking-config.yml
@@ -9,7 +9,7 @@ defaults:
 
 xcuitest:
   app: ./DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app
-  testApp: ./DerivedData/Build/Products/Debug-iphoneos/PerformanceBenchmarks-Runner.app
+  testApp: ./DerivedData/Build/Products/Debug-iphoneos/iOS-Benchmarking-Runner.app
 
 suites:
   - name: "High-end device"

@@ -4,3 +4,4 @@ brew 'pre-commit'
 brew 'python3'
 brew 'xcbeautify'
 brew 'rbenv'
+brew 'xcodegen'
diff --git a/Brewfile-ci-build b/Brewfile-ci-build
@@ -0,0 +1 @@
+brew 'xcodegen'
@@ -8,8 +8,11 @@ init:
 	rbenv exec bundle install
 	./scripts/update-tooling-versions.sh
 	yarn install
-
-# installs the tools needed to run CI test tasks locally
+
+.PHONY: init-ci-build
+init-ci-build:
+	brew bundle --file Brewfile-ci-build
+
 .PHONY: init-ci-test
 init-ci-test:
 	brew bundle --file Brewfile-ci-test
@@ -140,3 +143,10 @@ release-pod:
 	pod trunk push SentryPrivate.podspec
 	pod trunk push Sentry.podspec
 	pod trunk push SentrySwiftUI.podspec
+
+xcode:
+	xcodegen --spec Samples/SessionReplay-CameraTest/SessionReplay-CameraTest.yml
+	xcodegen --spec Samples/iOS-Swift/iOS-Swift.yml
+	xcodegen --spec Samples/iOS-Swift6/iOS-Swift6.yml
+	xcodegen --spec Samples/iOS13-Swift/iOS13-Swift.yml
+	open Sentry.xcworkspace
diff --git a/Package.swift b/Package.swift
@@ -12,12 +12,12 @@ let package = Package(
     targets: [
         .binaryTarget(
                     name: "Sentry",
-                    url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.49.2/Sentry.xcframework.zip",
+                    url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.49.3/Sentry.xcframework.zip",
                     checksum: "85cf16b4fa2dd0ae58b1e5c62fd8c829c94e5dc92251c3a1de8e71b3fed195ef" //Sentry-Static
                 ),
         .binaryTarget(
                     name: "Sentry-Dynamic",
-                    url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.49.2/Sentry-Dynamic.xcframework.zip",
+                    url: "https://github.com/getsentry/sentry-cocoa/releases/download/8.49.3/Sentry-Dynamic.xcframework.zip",
                     checksum: "a35caf34219721170f53a3a25281f9f06efd2aa36847d1b604d83ee6b9ae424d" //Sentry-Dynamic
                 ),
         .target ( name: "SentrySwiftUI",

diff --git a/Plans/iOS-Swift-Benchmarking_Base.xctestplan → Plans/iOS-Benchmarking_Base.xctestplan b/Plans/iOS-Swift-Benchmarking_Base.xctestplan → Plans/iOS-Benchmarking_Base.xctestplan
@@ -21,8 +21,8 @@
     {
       "target" : {
         "containerPath" : "container:iOS-Swift.xcodeproj",
-        "identifier" : "848A2560286E3351008A8858",
-        "name" : "PerformanceBenchmarks"
+        "identifier" : "E7C8F9BC5364F0980E0B827C",
+        "name" : "iOS-Benchmarking"
       }
     }
   ],

diff --git a/Plans/iOS-Swift6_Base.xctestplan b/Plans/iOS-Swift6_Base.xctestplan
@@ -14,9 +14,9 @@
   "testTargets" : [
     {
       "target" : {
-        "containerPath" : "container:iOS-Swift.xcodeproj",
-        "identifier" : "7B64386726A6C544000D0F65",
-        "name" : "iOS-Swift-UITests"
+        "containerPath" : "container:iOS-Swift6.xcodeproj",
+        "identifier" : "70F6260DD64A9D7AC4C7A53F",
+        "name" : "iOS-Swift6-UITests"
       }
     }
   ],