Merge remote-tracking branch 'origin/main' into cursor/implement-required-checks-for-lint-dprint-c1d3

Author: philprime

.github/file-filters.yml

@@ -65,7 +65,74 @@ run_api_stability_for_prs: &run_api_stability_for_prs # API-related code
   - "sdk_api.json"
   - "sdk_api_v9.json"
 
-run_lint_dprint_for_prs: &run_lint_dprint_for_prs
+run_lint_cocoapods_specs_for_prs: &run_lint_cocoapods_specs_for_prs # CocoaPods specs linting
+  - "Sources/**"
+  - "Tests/**"
+  - "test-server/**"
+  - "Samples/**"
+
+  # GH Actions
+  - ".github/workflows/lint-cocoapods-specs.yml"
+  - ".github/file-filters.yml"
+
+  # Scripts
+  - "scripts/ci-select-xcode.sh"
+  - "scripts/ci-diagnostics.sh"
+
+  # Project files
+  - "Sentry.xcodeproj/**"
+  - "*.podspec"
+  - "Gemfile.lock"
+
+  # Other
+  - "Makefile" # Make commands used for linting setup
+  - "Brewfile*" # Tools installation affects linting environment
+  - ".swiftlint.yml"
+
+run_release_for_prs: &run_release_for_prs # Release-related code
+  - "Sources/**"
+
+  # Scripts
+  - "scripts/ci-select-xcode.sh"
+  - "scripts/ci-diagnostics.sh"
+  - "scripts/build-xcframework-slice.sh"
+  - "scripts/assemble-xcframework.sh"
+
+  # Project files
+  - "Sentry.xcworkspace/**"
+  - "Sentry.xcodeproj/**"
+  - "Package*.swift"
+
+  # GH Actions
+  - ".github/workflows/build-xcframework.yml"
+  - ".github/workflows/release.yml"
+  - ".github/workflows/build-xcframework-variant-slices.yml"
+  - ".github/workflows/assemble-xcframework-variant.yml"
+  - ".github/workflows/ui-tests-common.yml"
+  - ".github/file-filters.yml"
+
+  # Samples
+  - "Samples/macOS-SPM-CommandLine/**"
+  - "Samples/SPM-Dynamic/**"
+
+run_lint_swift_formatting_for_prs: &run_lint_swift_formatting_for_prs # Swift formatting
+  - "**/*.swift"
+
+  # GH Actions
+  - ".github/workflows/lint-swift-formatting.yml"
+  - ".github/file-filters.yml"
+
+  # Formatting
+  - ".swiftlint.yml"
+
+  # Other
+  - "Makefile" # Make commands used for formatting setup
+  - "Brewfile*" # Tools installation affects formatting environment
+
+  # Scripts
+  - "scripts/ci-diagnostics.sh"
+
+run_lint_dprint_for_prs: &run_lint_dprint_for_prs # dprint formatting
   - "**/*.yml"
   - "**/*.yaml"
   - "**/*.json"

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

@@ -17,20 +17,6 @@ on:
       - ".swiftlint.yml"
 
   pull_request:
-    paths:
-      - "Sources/**"
-      - "Tests/**"
-      - "test-server/**"
-      - "Samples/**"
-      - ".github/workflows/lint-cocoapods-specs.yml"
-      - "scripts/ci-select-xcode.sh"
-      - "scripts/ci-diagnostics.sh"
-      - "Sentry.xcodeproj/**"
-      - "*.podspec"
-      - "Gemfile.lock"
-      - "Makefile" # Make commands used for linting setup
-      - "Brewfile*" # Tools installation affects linting environment
-      - ".swiftlint.yml"
 
 # Concurrency configuration:
 # - We use workflow-specific concurrency groups to prevent multiple lint runs on the same code,
@@ -44,8 +30,25 @@ concurrency:
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
+  files-changed:
+    name: Detect File Changes
+    runs-on: ubuntu-latest
+    outputs:
+      run_lint_cocoapods_specs_for_prs: ${{ steps.changes.outputs.run_lint_cocoapods_specs_for_prs }}
+    steps:
+      - uses: actions/checkout@v5
+      - name: Get changed files
+        id: changes
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+        with:
+          token: ${{ github.token }}
+          filters: .github/file-filters.yml
+
   lint-podspec:
     name: ${{ matrix.podspec}} ${{ matrix.library_type }} ${{ matrix.platform}}
+    # Run the job only for PRs with related changes or non-PR events.
+    if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_lint_cocoapods_specs_for_prs == 'true'
+    needs: files-changed
     runs-on: macos-14
     strategy:
       fail-fast: false
@@ -67,6 +70,9 @@ jobs:
 
   lint-hybrid-sdk-podspec:
     name: Sentry/HybridSDK
+    # Run the job only for PRs with related changes or non-PR events.
+    if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_lint_cocoapods_specs_for_prs == 'true'
+    needs: files-changed
     runs-on: macos-14
 
     steps:
@@ -78,3 +84,22 @@ jobs:
       - name: Run CI Diagnostics
         if: failure()
         run: ./scripts/ci-diagnostics.sh
+
+  lint_cocoapods_Specs-required-check:
+    needs:
+      [
+        files-changed,
+        lint-podspec,
+        lint-hybrid-sdk-podspec,
+      ]
+    name: Lint CocoaPods Specs
+    # This is necessary since a failed/skipped dependent job would cause this job to be skipped
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      # If any jobs we depend on fails gets cancelled or times out, this job will fail.
+      # Skipped jobs are not considered failures.
+      - name: Check for failures
+        if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
+        run: |
+          echo "One of the CocoaPods specs linting jobs has failed." && exit 1

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

@@ -4,22 +4,7 @@ on:
   push:
     branches:
       - main
-    paths:
-      - "**/*.swift"
-      - ".github/workflows/lint-swift-formatting.yml"
-      - ".swiftlint.yml"
-      - "Makefile" # Make commands used for formatting setup
-      - "Brewfile*" # Tools installation affects formatting environment
-      - "scripts/ci-diagnostics.sh"
-
   pull_request:
-    paths:
-      - "**/*.swift"
-      - ".github/workflows/lint-swift-formatting.yml"
-      - ".swiftlint.yml"
-      - "Makefile" # Make commands used for formatting setup
-      - "Brewfile*" # Tools installation affects formatting environment
-      - "scripts/ci-diagnostics.sh"
 
 # Concurrency configuration:
 # - We use workflow-specific concurrency groups to prevent multiple lint runs on the same code,
@@ -33,8 +18,25 @@ concurrency:
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
+  files-changed:
+    name: Detect File Changes
+    runs-on: ubuntu-latest
+    outputs:
+      run_lint_swift_formatting_for_prs: ${{ steps.changes.outputs.run_lint_swift_formatting_for_prs }}
+    steps:
+      - uses: actions/checkout@v5
+      - name: Get changed files
+        id: changes
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+        with:
+          token: ${{ github.token }}
+          filters: .github/file-filters.yml
+
   lint:
     name: Lint
+    # Run the job only for PRs with related changes or non-PR events.
+    if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_lint_swift_formatting_for_prs == 'true'
+    needs: files-changed
     runs-on: macos-15
     steps:
       - uses: actions/checkout@v5
@@ -58,3 +60,21 @@ jobs:
       - name: Run CI Diagnostics
         if: failure()
         run: ./scripts/ci-diagnostics.sh
+
+  lint_swift_formatting-required-check:
+    needs:
+      [
+        files-changed,
+        lint,
+      ]
+    name: Lint Swift Formatting
+    # This is necessary since a failed/skipped dependent job would cause this job to be skipped
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      # If any jobs we depend on fails gets cancelled or times out, this job will fail.
+      # Skipped jobs are not considered failures.
+      - name: Check for failures
+        if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
+        run: |
+          echo "One of the Swift formatting check jobs has failed." && exit 1

.github/workflows/release.yml

@@ -7,22 +7,6 @@ on:
       - main
 
   pull_request:
-    paths:
-      - "Sources/**"
-      - "scripts/ci-select-xcode.sh"
-      - "scripts/ci-diagnostics.sh"
-      - Sentry.xcworkspace/**
-      - Sentry.xcodeproj/**
-      - "Package*.swift"
-      - ".github/workflows/build-xcframework.yml"
-      - "scripts/build-xcframework-slice.sh"
-      - "scripts/assemble-xcframework.sh"
-      - ".github/workflows/release.yml"
-      - ".github/workflows/build-xcframework-variant-slices.yml"
-      - ".github/workflows/assemble-xcframework-variant.yml"
-      - ".github/workflows/ui-tests-common.yml"
-      - Samples/macOS-SPM-CommandLine/**
-      - Samples/SPM-Dynamic/**
 
   workflow_dispatch:
     inputs:
@@ -48,8 +32,25 @@ concurrency:
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
+  files-changed:
+    name: Detect File Changes
+    runs-on: ubuntu-latest
+    outputs:
+      run_release_for_prs: ${{ steps.changes.outputs.run_release_for_prs }}
+    steps:
+      - uses: actions/checkout@v5
+      - name: Get changed files
+        id: changes
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+        with:
+          token: ${{ github.token }}
+          filters: .github/file-filters.yml
+
   build-xcframework-variant-slices:
     name: Build XCFramework Slices
+    # Run the job only for PRs with related changes or non-PR events.
+    if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_release_for_prs == 'true'
+    needs: files-changed
     uses: ./.github/workflows/build-xcframework-variant-slices.yml
     with:
       name: ${{matrix.variant.name}}
@@ -78,7 +79,9 @@ jobs:
             id: sentry-withoutuikit-dynamic
 
   assemble-xcframework-variant:
-    needs: build-xcframework-variant-slices
+    needs: [files-changed, build-xcframework-variant-slices]
+    # Run the job only for PRs with related changes or non-PR events.
+    if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_release_for_prs == 'true'
     name: Assemble XCFramework Variant
     uses: ./.github/workflows/assemble-xcframework-variant.yml
     secrets: inherit
@@ -126,7 +129,9 @@ jobs:
   validate-xcframework:
     name: Validate XCFramework
     runs-on: macos-14
-    needs: assemble-xcframework-variant
+    needs: [files-changed, assemble-xcframework-variant]
+    # Run the job only for PRs with related changes or non-PR events.
+    if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_release_for_prs == 'true'
     steps:
       - uses: actions/checkout@v5
       - uses: actions/download-artifact@v5
@@ -149,7 +154,9 @@ jobs:
   validate-spm:
     name: Validate SPM Static ${{matrix.package-file.name}}
     runs-on: macos-14
-    needs: assemble-xcframework-variant
+    needs: [files-changed, assemble-xcframework-variant]
+    # Run the job only for PRs with related changes or non-PR events.
+    if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_release_for_prs == 'true'
     steps:
       - uses: actions/checkout@v5
       - uses: actions/download-artifact@v5
@@ -180,7 +187,9 @@ jobs:
   validate-spm-dynamic:
     name: Validate SPM Dynamic ${{matrix.package-file.name}}
     runs-on: macos-14
-    needs: assemble-xcframework-variant
+    needs: [files-changed, assemble-xcframework-variant]
+    # Run the job only for PRs with related changes or non-PR events.
+    if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_release_for_prs == 'true'
     steps:
       - uses: actions/checkout@v5
       - uses: actions/download-artifact@v5
@@ -211,7 +220,9 @@ jobs:
   swift-build:
     name: Build Swift Static ${{matrix.package-file.name}}
     runs-on: macos-14
-    needs: assemble-xcframework-variant
+    needs: [files-changed, assemble-xcframework-variant]
+    # Run the job only for PRs with related changes or non-PR events.
+    if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_release_for_prs == 'true'
     steps:
       - uses: actions/checkout@v5
       - uses: actions/download-artifact@v5
@@ -241,7 +252,9 @@ jobs:
   duplication-tests:
     name: Test Sentry Duplication V4 # Up the version with every change to keep track of flaky tests
     uses: ./.github/workflows/ui-tests-common.yml
-    needs: assemble-xcframework-variant
+    needs: [files-changed, assemble-xcframework-variant]
+    # Run the job only for PRs with related changes or non-PR events.
+    if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_release_for_prs == 'true'
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
     with:
@@ -253,7 +266,9 @@ jobs:
   app-metrics:
     name: Collect App Metrics
     runs-on: macos-15
-    needs: assemble-xcframework-variant
+    needs: [files-changed, assemble-xcframework-variant]
+    # Run the job only for PRs with related changes or non-PR events.
+    if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_release_for_prs == 'true'
     timeout-minutes: 20
     steps:
       - name: Git checkout
@@ -307,6 +322,7 @@ jobs:
     runs-on: ubuntu-latest
     name: "Release New Version"
     needs: [
+      files-changed,
       validate-xcframework,
       validate-spm,
       validate-spm-dynamic,
@@ -361,3 +377,28 @@ jobs:
       - name: Run CI Diagnostics
         if: failure()
         run: ./scripts/ci-diagnostics.sh
+
+  release-required-check:
+    needs:
+      [
+        files-changed,
+        build-xcframework-variant-slices,
+        assemble-xcframework-variant,
+        validate-xcframework,
+        validate-spm,
+        validate-spm-dynamic,
+        swift-build,
+        duplication-tests,
+        app-metrics,
+      ]
+    name: Release
+    # This is necessary since a failed/skipped dependent job would cause this job to be skipped
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      # If any jobs we depend on fails gets cancelled or times out, this job will fail.
+      # Skipped jobs are not considered failures.
+      - name: Check for failures
+        if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
+        run: |
+          echo "One of the release check jobs has failed." && exit 1

CHANGELOG-v9.md

@@ -9,7 +9,7 @@ Removes deprecated useSpan function (#5591)
 Removes deprecated SentryDebugImageProvider class (#5598)
 Makes app hang tracking V2 the default and removes the option to enable/disable it (#5615)
 Removes segment property on SentryUser, SentryBaggage, and SentryTraceContext (#5638)
-Removes public SentrySerializable conformance from many public models (#5636, #5840)
+Removes public SentrySerializable conformance from many public models (#5636, #5840, #5982)
 Removes Decodable conformances from the public API of model classes (#5691)
 Removes enableTracing property from SentryOptions (#5694)
 Removes deprecated `setExtraValue` from SentrySpan (#5864)