Merge remote-tracking branch 'origin/main' into philprime/disable-live-activity-widgets

Author: philprime

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

@@ -428,6 +428,7 @@ run_version_bump_util_for_prs: &run_version_bump_util_for_prs
   - "Sources/Configuration/SDK.xcconfig"
   - "Sources/Configuration/Versioning.xcconfig"
   - "Sources/Configuration/SentrySwiftUI.xcconfig"
+  - "Sources/Configuration/SentrySwiftLog.xcconfig"
 
 run_ui_tests_for_prs: &run_ui_tests_for_prs
   - "Sources/**"

.github/file-filters.yml

@@ -7,6 +7,7 @@ on:
       - release/**
 
   pull_request:
+    types: [opened, synchronize, reopened, labeled]
 
 # Concurrency configuration:
 # - We use workflow-specific concurrency groups to prevent multiple build runs of the same code,
@@ -20,9 +21,17 @@ concurrency:
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
+  ready-to-merge-gate:
+    name: Ready-to-merge gate
+    uses: ./.github/workflows/ready-to-merge-workflow.yml
+    with:
+      is-pr: ${{ github.event_name == 'pull_request' }}
+      labels: ${{ toJson(github.event.pull_request.labels) }}
+
   files-changed:
     name: Detect File Changes
     runs-on: ubuntu-latest
+    needs: ready-to-merge-gate
     outputs:
       run_build_for_prs: ${{ steps.changes.outputs.run_build_for_prs }}
     steps:
@@ -39,11 +48,23 @@ jobs:
   ios-swift-release:
     name: Release Build of iOS Swift
     # Run the job only for PRs with related changes or non-PR events.
-    if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_build_for_prs == 'true'
+    # Don't run this on release branches, cause the SPM Package.swift points to the unreleased versions.
+    if: startsWith(github.ref, 'refs/heads/release/') == false && (github.event_name != 'pull_request' || needs.files-changed.outputs.run_build_for_prs == 'true')
     needs: files-changed
     runs-on: macos-15
     steps:
       - uses: actions/checkout@v5
+
+      # As the DistributionSample project uses local SPM, xcodebuild resolves SPM dependencies for all
+      # sample projects. The Package.swift references binary targets, which in release branch commits points
+      # to non-existent download URLs. This creates chicken-egg failures when building these sample apps for
+      # a release commit build. When building these sample apps for a release commit, xcodebuild tries to
+      # resolve all SPM dependencies, including the binary targets pointing to these non-existent URLs.  The
+      # sample projects don't use SPM for including Sentry. Only the DistributionSample uses local SPM.
+      # Therefore, we only keep the local DistributionSample reference in the Package.swift as a workaround.
+      - name: Only keep distribution lib and target in Package.swift
+        run: ./scripts/prepare-package.sh --only-keep-distribution true
+
       - run: ./scripts/ci-select-xcode.sh 16.4
       - uses: ruby/setup-ruby@v1
         with:
@@ -98,6 +119,17 @@ jobs:
 
     steps:
       - uses: actions/checkout@v5
+
+      # As the DistributionSample project uses local SPM, xcodebuild resolves SPM dependencies for all
+      # sample projects. The Package.swift references binary targets, which in release branch commits points
+      # to non-existent download URLs. This creates chicken-egg failures when building these sample apps for
+      # a release commit build. When building these sample apps for a release commit, xcodebuild tries to
+      # resolve all SPM dependencies, including the binary targets pointing to these non-existent URLs.  The
+      # sample projects don't use SPM for including Sentry. Only the DistributionSample uses local SPM.
+      # Therefore, we only keep the local DistributionSample reference in the Package.swift as a workaround.
+      - name: Only keep distribution lib and target in Package.swift
+        run: ./scripts/prepare-package.sh --only-keep-distribution true
+
       - run: ./scripts/ci-select-xcode.sh 16.4
       - run: make init-ci-build
       - run: make xcode-ci
@@ -129,12 +161,15 @@ jobs:
   build-distribution:
     name: Build the distribution framework
     runs-on: macos-15
+    # Don't run this on release branches, cause the SPM Package.swift points to the unreleased versions.
+    if: startsWith(github.ref, 'refs/heads/release/') == false && (github.event_name != 'pull_request' || needs.files-changed.outputs.run_build_for_prs == 'true')
     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

.github/workflows/build.yml

@@ -0,0 +1,41 @@
+name: Ready to Merge Workflow
+on:
+  workflow_call:
+    inputs:
+      labels:
+        description: The GitHub event's labels
+        required: true
+        type: string
+      is-pr:
+        description: Whether the workflow is running on a PR
+        required: true
+        type: boolean
+
+jobs:
+  ready-to-merge-gate:
+    name: 'Missing "ready-to-merge" label'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check for exact 'ready-to-merge' label
+        if: ${{ inputs.is-pr }}
+        id: check-label
+        run: |
+          # Use jq to check for exact label match (avoids substring matching issues with contains())
+          if echo '${{ inputs.labels }}' | jq -e '.[] | select(.name == "ready-to-merge")' > /dev/null; then
+            echo "label_found=true" >> $GITHUB_OUTPUT
+          else
+            echo "label_found=false" >> $GITHUB_OUTPUT
+          fi
+      # Since Github also accepts `skipped` results for Required Workflows, we need
+      # to fail the job to ensure that the downstream jobs don't just skip.
+      - name: Fail until the 'ready-to-merge' label is present
+        if: ${{ inputs.is-pr && steps.check-label.outputs.label_found == 'false' }}
+        run: |
+          echo "Add the 'ready-to-merge' label to run CI."
+          exit 1
+      - name: Gate passed
+        if: ${{ inputs.is-pr && steps.check-label.outputs.label_found == 'true' }}
+        run: echo "Label present. Proceeding with CI."
+      - name: Gate passed
+        if: ${{ !inputs.is-pr }}
+        run: echo "Not a PR. Proceeding with CI."

.github/workflows/ready-to-merge-workflow.yml

@@ -8,6 +8,7 @@ on:
       - v8.x
 
   pull_request:
+    types: [opened, synchronize, reopened, labeled]
 
   workflow_dispatch:
     inputs:
@@ -33,9 +34,17 @@ concurrency:
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
+  ready-to-merge-gate:
+    name: Ready-to-merge gate
+    uses: ./.github/workflows/ready-to-merge-workflow.yml
+    with:
+      is-pr: ${{ github.event_name == 'pull_request' }}
+      labels: ${{ toJson(github.event.pull_request.labels) }}
+
   files-changed:
     name: Detect File Changes
     runs-on: ubuntu-latest
+    needs: ready-to-merge-gate
     outputs:
       run_release_for_prs: ${{ steps.changes.outputs.run_release_for_prs }}
     steps:
@@ -142,9 +151,12 @@ jobs:
           pattern: xcframework-${{github.sha}}-*
           merge-multiple: true
       - name: Prepare Package.swift
-        uses: ./.github/actions/prepare-package.swift
-        with:
-          is-pr: ${{ github.event_name == 'pull_request' }}
+        shell: bash
+        run: |
+          ./scripts/prepare-package.sh \
+            --package-file Package.swift \
+            --is-pr "${{ github.event_name == 'pull_request' }}" \
+            --change-path true
       - run: ./scripts/ci-select-xcode.sh 16.4
       - run: swift build
         working-directory: Samples/macOS-SPM-CommandLine
@@ -165,9 +177,12 @@ jobs:
           pattern: xcframework-${{github.sha}}-*
           merge-multiple: true
       - name: Prepare Package.swift
-        uses: ./.github/actions/prepare-package.swift
-        with:
-          is-pr: ${{ github.event_name == 'pull_request' }}
+        shell: bash
+        run: |
+          ./scripts/prepare-package.sh \
+            --package-file Package.swift \
+            --is-pr "${{ github.event_name == 'pull_request' }}" \
+            --change-path true
       - run: ./scripts/ci-select-xcode.sh 16.4
       - run: swift build
         working-directory: Samples/SPM-Dynamic
@@ -188,9 +203,12 @@ jobs:
           pattern: xcframework-${{github.sha}}-*
           merge-multiple: true
       - name: Prepare Package.swift
-        uses: ./.github/actions/prepare-package.swift
-        with:
-          is-pr: ${{ github.event_name == 'pull_request' }}
+        shell: bash
+        run: |
+          ./scripts/prepare-package.sh \
+            --package-file Package.swift \
+            --is-pr "${{ github.event_name == 'pull_request' }}" \
+            --change-path true
       - run: ./scripts/ci-select-xcode.sh 16.4
       - run: swift build
       - name: Run CI Diagnostics
@@ -210,9 +228,12 @@ jobs:
           pattern: xcframework-${{github.sha}}-*
           merge-multiple: true
       - name: Prepare Package.swift
-        uses: ./.github/actions/prepare-package.swift
-        with:
-          is-pr: ${{ github.event_name == 'pull_request' }}
+        shell: bash
+        run: |
+          ./scripts/prepare-package.sh \
+            --package-file Package.swift \
+            --is-pr "${{ github.event_name == 'pull_request' }}" \
+            --change-path true
       - run: ./scripts/ci-select-xcode.sh 16.4
       - run: set -o pipefail &&xcodebuild build -scheme visionOS-SPM -sdk xros -destination 'generic/platform=xros' | tee raw-build-output-spm-visionOS.log | xcbeautify
         working-directory: Samples/visionOS-SPM

.github/workflows/release.yml

@@ -7,6 +7,7 @@ on:
       - release/**
 
   pull_request:
+    types: [opened, synchronize, reopened, labeled]
 
 # Concurrency configuration:
 # - We use workflow-specific concurrency groups to allow independent test runs across different workflows
@@ -20,6 +21,13 @@ concurrency:
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
+  ready-to-merge-gate:
+    name: Ready-to-merge gate
+    uses: ./.github/workflows/ready-to-merge-workflow.yml
+    with:
+      is-pr: ${{ github.event_name == 'pull_request' }}
+      labels: ${{ toJson(github.event.pull_request.labels) }}
+
   # This job detects if the PR contains changes that require running unit tests.
   # If yes, the job will output a flag that will be used by the next job to run the unit tests.
   # If no, the job will output a flag that will be used by the next job to skip running the unit tests.
@@ -28,6 +36,7 @@ jobs:
   files-changed:
     name: Detect File Changes
     runs-on: ubuntu-latest
+    needs: ready-to-merge-gate
     # Map a step output to a job output
     outputs:
       run_unit_tests_for_prs: ${{ steps.changes.outputs.run_unit_tests_for_prs }}
@@ -96,15 +105,20 @@ jobs:
   distribution-tests:
     name: Distribution Tests
     runs-on: macos-15
+    # Don't run this on release branches, cause the SPM Package.swift points to the unreleased versions.
+    # Also, skip when PR changes don't require running tests to save CI time.
+    if: startsWith(github.ref, 'refs/heads/release/') == false && (github.event_name != 'pull_request' || needs.files-changed.outputs.run_unit_tests_for_prs == 'true')
     needs: files-changed
     steps:
       - uses: actions/checkout@v5
       - name: Prepare Package.swift
-        uses: ./.github/actions/prepare-package.swift
-        with:
-          is-pr: ${{ github.event_name == 'pull_request' }}
-          change-path: false
-          remove-duplicate: true
+        shell: bash
+        run: |
+          ./scripts/prepare-package.sh \
+            --package-file Package.swift \
+            --is-pr "${{ github.event_name == 'pull_request' }}" \
+            --remove-duplicate true \
+            --change-path false
       - run: rm -r Sentry.xcodeproj && rm -r Sentry.xcworkspace
       - run: set -o pipefail && NSUnbufferedIO=YES SKIP_BINARIES=1 xcodebuild test -scheme Sentry-Package -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=18.4,name=iPhone 16 Pro' | tee raw-test-output-distribution.log | xcbeautify --preserve-unbeautified
         shell: sh

.github/workflows/test.yml

@@ -4,7 +4,6 @@ on:
     branches:
       - main
       - v8.x
-      - release/**
 
   pull_request:
   workflow_dispatch:

.github/workflows/testflight.yml

@@ -6,6 +6,7 @@ on:
       - v8.x
 
   pull_request:
+    types: [opened, synchronize, reopened, labeled]
 
 # Concurrency configuration:
 # - We use workflow-specific concurrency groups to prevent multiple critical UI test runs,
@@ -19,9 +20,17 @@ concurrency:
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
+  ready-to-merge-gate:
+    name: Ready-to-merge gate
+    uses: ./.github/workflows/ready-to-merge-workflow.yml
+    with:
+      is-pr: ${{ github.event_name == 'pull_request' }}
+      labels: ${{ toJson(github.event.pull_request.labels) }}
+
   files-changed:
     name: Detect File Changes
     runs-on: ubuntu-latest
+    needs: ready-to-merge-gate
     outputs:
       run_ui_tests_critical_for_prs: ${{ steps.changes.outputs.run_ui_tests_critical_for_prs }}
     steps:

.github/workflows/ui-tests-critical.yml

@@ -6,6 +6,7 @@ on:
       - v8.x
 
   pull_request:
+    types: [opened, synchronize, reopened, labeled]
 
 # Concurrency configuration:
 # - We use workflow-specific concurrency groups to prevent multiple UI test runs on the same code,
@@ -19,9 +20,17 @@ concurrency:
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
+  ready-to-merge-gate:
+    name: Ready-to-merge gate
+    uses: ./.github/workflows/ready-to-merge-workflow.yml
+    with:
+      is-pr: ${{ github.event_name == 'pull_request' }}
+      labels: ${{ toJson(github.event.pull_request.labels) }}
+
   files-changed:
     name: Detect File Changes
     runs-on: ubuntu-latest
+    needs: ready-to-merge-gate
     outputs:
       run_ui_tests_for_prs: ${{ steps.changes.outputs.run_ui_tests_for_prs }}
     steps: