Merge remote-tracking branch 'origin/v8.x' into philprime/hotfix/disable-session-replay-ios26

Author: philprime

.github/actions/prepare-package.swift/action.yml

@@ -5,6 +5,12 @@ inputs:
     description: "Whether the build is a PR"
     required: true
     default: "false"
+  remove-duplicate:
+    description: "Whether to remove targets that produce duplicate files. These targets cause SPM validation errors."
+    default: "false"
+  change-path:
+    description: "Whether to change the path of the framework"
+    default: "true"
   package-file:
     description: "The package file to prepare"
     required: true
@@ -22,7 +28,17 @@ runs:
         sed -i '' '/Sentry-Dynamic-WithARM64e/d' $PACKAGE_FILE
         sed -i '' '/Sentry-WithoutUIKitOrAppKit-WithARM64e/d' $PACKAGE_FILE
         sed -i '' '/^[[:space:]]*\.binaryTarget($/{N;/\n[[:space:]]*),\{0,1\}$/d;}' $PACKAGE_FILE
+    - name: Remove duplicate target
+      if: ${{ inputs.remove-duplicate == 'true' }}
+      shell: bash
+      env:
+        PACKAGE_FILE: ${{ inputs.package-file }}
+      run: |
+        sed -i '' '/Sentry-Dynamic/d' $PACKAGE_FILE
+        sed -i '' '/Sentry-WithoutUIKitOrAppKit/d' $PACKAGE_FILE
+        sed -i '' '/^[[:space:]]*\.binaryTarget($/{N;/\n[[:space:]]*),\{0,1\}$/d;}' $PACKAGE_FILE
     - name: Change path of the framework
+      if: ${{ inputs.change-path == 'true' }}
       shell: bash
       env:
         PACKAGE_FILE: ${{ inputs.package-file }}

.github/workflows/benchmarking.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - v8.x
 
   pull_request:
 

.github/workflows/build.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - v8.x
       - release/**
 
   pull_request:
@@ -98,6 +99,8 @@ jobs:
             config: DebugV9
           - scheme: iOS-ObjectiveC
             config: DebugV9
+          - scheme: DistributionSample
+            config: Debug
 
     steps:
       - uses: actions/checkout@v5
@@ -129,6 +132,26 @@ jobs:
         if: ${{ failure() || cancelled() }}
         run: ./scripts/ci-diagnostics.sh
 
+  build-distribution:
+    name: Build the distribution framework
+    runs-on: macos-15
+    needs: files-changed
+    steps:
+      - uses: actions/checkout@v5
+
+      - run: ./scripts/ci-select-xcode.sh 16.4
+        shell: sh
+      - run: rm -r Sentry.xcodeproj && rm -r Sentry.xcworkspace
+      - run: set -o pipefail && NSUnbufferedIO=YES xcodebuild build -scheme SentryDistribution -sdk iphoneos -destination 'generic/platform=iphoneos' | tee raw-build-output-spm.log | xcbeautify
+        shell: sh
+      - name: Upload SPM Build Logs
+        uses: actions/upload-artifact@v4
+        if: ${{ failure() || cancelled() }}
+        with:
+          name: raw-build-output-spm
+          path: |
+            raw-build-output-spm.log
+
   build-spm:
     name: Build with SPM
     runs-on: macos-15
@@ -340,6 +363,7 @@ jobs:
         files-changed,
         ios-swift-release,
         build-sample,
+        build-distribution,
         build-spm,
         build-v9,
         check-debug-without-UIKit,

.github/workflows/codeql-analysis.yml

@@ -2,10 +2,15 @@ name: CodeQL
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - v8.x
+
   pull_request:
     branches:
       - main
+      - v8.x
+
   schedule:
     - cron: "40 4 * * 6" # Weekly scheduled run to catch issues regardless of changes
 

.github/workflows/integration-test.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - v8.x
 
   pull_request:
 

.github/workflows/lint-clang-formatting.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - v8.x
 
   pull_request:
 

.github/workflows/lint-cocoapods-specs.yml

@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - main
+      - v8.x
+
   pull_request:
 
 # Concurrency configuration:

.github/workflows/lint-dprint-formatting.yml

@@ -8,6 +8,7 @@ on:
   push:
     branches:
       - main
+      - v8.x
 
   pull_request:
 

.github/workflows/lint-shellcheck-formatting.yml

@@ -8,6 +8,7 @@ on:
   push:
     branches:
       - main
+      - v8.x
 
   pull_request:
 

.github/workflows/lint-swift-formatting.yml

@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - main
+      - v8.x
+
   pull_request:
 
 # Concurrency configuration: