Merge remote-tracking branch 'origin/main' into cursor/implement-required-checks-for-benchmarking-923d

Author: philprime

.github/file-filters.yml

@@ -84,8 +84,110 @@ run_benchmarking_for_prs: &run_benchmarking_for_prs
   - "Samples/iOS-Swift/iOS-SwiftClip.xcconfig"
   - "Samples/iOS-Swift/iOS-Benchmarking.xcconfig"
 
+run_objc_conversion_analysis_for_prs: &run_objc_conversion_analysis_for_prs
+  - "SwiftConversion/**"
+
+  # GH Actions
+  - ".github/workflows/objc-conversion-analysis.yml"
+  - ".github/file-filters.yml"
+
+  # Scripts
+  - "scripts/ci-diagnostics.sh"
+
+run_auto_update_tools_for_prs: &run_auto_update_tools_for_prs # Auto-update tools workflow
+  # Formatting
+  - ".pre-commit-config.yaml"
+
+  # GH Actions
+  - ".github/workflows/auto-update-tools.yml"
+
+  # Scripts
+  - "scripts/.clang-format-version"
+  - "scripts/.swiftlint-version"
+  - "scripts/check-tooling-versions.sh"
+  - "scripts/ci-diagnostics.sh"
+  - "scripts/update-tooling-versions.sh"
+
+  # Other
+  - "Brewfile*"
+  - "Makefile"
+
+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"
+  - "**/*.md"
+
+  # Formatting
+  - "dprint.json"
+
+  # GH Actions
+  - ".github/workflows/lint-dprint-formatting.yml"
+  - ".github/file-filters.yml"

.github/workflows/auto-update-tools.yml

@@ -12,16 +12,6 @@ on:
     - cron: "0 0 * * *"
   workflow_dispatch:
   pull_request:
-    paths:
-      - ".github/workflows/auto-update-tools.yml"
-      - "Brewfile*"
-      - "Makefile"
-      - "scripts/.clang-format-version"
-      - "scripts/.swiftlint-version"
-      - ".pre-commit-config.yaml"
-      - "scripts/update-tooling-versions.sh"
-      - "scripts/check-tooling-versions.sh"
-      - "scripts/ci-diagnostics.sh"
 
 # Permissions configuration:
 # - 'contents: write' is required to allow the workflow to commit changes to the repository
@@ -46,7 +36,29 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  # This job detects if the PR contains changes that require running auto-update-tools.
+  # If yes, the job will output a flag that will be used by the next job to run the auto-update-tools.
+  # If no, the job will output a flag that will be used by the next job to skip running the auto-update-tools.
+  # At the end of this workflow, we run a check that validates that either auto_update_tools-required-check passed or were
+  # skipped, which is called auto_update_tools-required-check.
+  files-changed:
+    name: Detect File Changes
+    runs-on: ubuntu-latest
+    # Map a step output to a job output
+    outputs:
+      run_auto_update_tools_for_prs: ${{ steps.changes.outputs.run_auto_update_tools_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
+
   auto-update-tools:
+    if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_auto_update_tools_for_prs == 'true'
+    needs: files-changed
     runs-on: macos-15
     steps:
       - name: Checkout Repository
@@ -96,3 +108,24 @@ jobs:
       - name: Run CI Diagnostics
         if: failure()
         run: ./scripts/ci-diagnostics.sh
+
+  # This check validates that either auto-update-tools passed or was skipped, which allows us
+  # to make auto-update-tools a required check with only running the auto-update-tools when required.
+  # So, we don't have to run auto-update-tools, for example, for unrelated changes.
+  auto_update_tools-required-check:
+    needs:
+      [
+        files-changed,
+        auto-update-tools,
+      ]
+    name: Auto Update Tools
+    # 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 auto-update-tools jobs has failed." && exit 1

.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-dprint-formatting.yml

@@ -8,22 +8,8 @@ on:
   push:
     branches:
       - main
-    paths:
-      - "**/*.yml"
-      - "**/*.yaml"
-      - "**/*.json"
-      - "**/*.md"
-      - ".github/workflows/lint-dprint-formatting.yml"
-      - "dprint.json"
 
   pull_request:
-    paths:
-      - "**/*.yml"
-      - "**/*.yaml"
-      - "**/*.json"
-      - "**/*.md"
-      - ".github/workflows/lint-dprint-formatting.yml"
-      - "dprint.json"
 
 # Concurrency configuration:
 # - We use workflow-specific concurrency groups to prevent multiple lint runs on the same code,
@@ -37,9 +23,44 @@ concurrency:
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
+  files-changed:
+    name: Detect File Changes
+    runs-on: ubuntu-latest
+    outputs:
+      run_lint_dprint_for_prs: ${{ steps.changes.outputs.run_lint_dprint_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_dprint_for_prs == 'true'
+    needs: files-changed
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
       - uses: dprint/check@v2.3
+
+  lint-dprint-required-check:
+    needs:
+      [
+        files-changed,
+        lint,
+      ]
+    name: Lint dprint
+    # 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 lint dprint jobs has failed." && exit 1