ci: Only use Cirrus Runners on UI Tests (#6776)

* ci: Use Cirrus Runners only on UI Tests

* Bump xcode 26.1 to 26.1.1

Author: itaybre

.github/workflows/ui-tests.yml

@@ -48,7 +48,6 @@ jobs:
       fail-fast: false
       matrix:
         runner:
-          - GitHub
           - Cirrus Labs
         job_id:
           - ios_objc
@@ -68,15 +67,12 @@ jobs:
       fastlane_command: ui_tests_${{matrix.target}}
       xcode_version: 16.4
       build_with_make: true
-      macos_version: ${{ matrix.runner == 'Cirrus Labs' && 'sequoia' || 'macos-15' }}
-      run_on_cirrus_labs: ${{ matrix.runner == 'Cirrus Labs' }}
+      macos_version: "sequoia"
+      run_on_cirrus_labs: true
       codecov_test_analytics: true
       test-destination-os: ${{matrix.test_destination_os}}
       device: ${{matrix.device}}
       files_suffix: _${{matrix.target}}_${{matrix.runner}}
-      # Github doesn't allow using matrix variables in if conditions, so we pass it to the common workflow and skip there.
-      # This lets us skip the job if it's a push to the main branch and the runner is Cirrus Labs.
-      should_skip: ${{ ( github.event_name != 'push' || github.ref != 'refs/heads/main' ) && matrix.runner == 'Cirrus Labs' }}
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
@@ -90,22 +86,19 @@ jobs:
       build_with_make: true
       codecov_test_analytics: true
       xcode_version: 16.4
-      macos_version: ${{ matrix.runner == 'Cirrus Labs' && 'sequoia' || 'macos-15' }}
-      run_on_cirrus_labs: ${{ matrix.runner == 'Cirrus Labs' }}
+      macos_version: "sequoia"
+      run_on_cirrus_labs: true
       test-destination-os: "18.6"
       device: iPhone 16 Pro
       files_suffix: _swiftui_-${{matrix.runner}}
-      # Github doesn't allow using matrix variables in if conditions, so we pass it to the common workflow and skip there.
-      # This lets us skip the job if it's a push to the main branch and the runner is Cirrus Labs.
-      should_skip: ${{ ( github.event_name != 'push' || github.ref != 'refs/heads/main' ) && matrix.runner == 'Cirrus Labs' }}
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
     strategy:
       fail-fast: false
       matrix:
         runner:
-          - GitHub
           - Cirrus Labs
+
   ui-tests-swift:
     if: github.event_name != 'pull_request' || needs.files-changed.outputs.run_ui_tests_for_prs == 'true'
     needs: files-changed
@@ -115,7 +108,6 @@ jobs:
       fail-fast: false
       matrix:
         runner:
-          - GitHub
           - Cirrus Labs
         job_id:
           - ios_17
@@ -125,55 +117,40 @@ jobs:
           # iOS 17 - Use iOS 17.5 runtime on macOS-15 with Xcode 16.4
           - job_id: ios_17
             name: iOS 17
-            runs_on: macos-14
-            runs_on_cirrus: sequoia
-            xcode: "16.2"
-            xcode_cirrus: "16.4"
+            runs_on: sequoia
+            xcode: "16.4"
             test_destination_os: "17.5"
             platform: "iOS"
-            install_platforms: false
-            create_device: true
             device: iPhone 15 Pro
 
           # iOS 18 - Use pre-installed iOS 18.4 runtime on macOS-15
           - job_id: ios_18
             name: iOS 18
-            runs_on: macos-15
-            runs_on_cirrus: sequoia
+            runs_on: sequoia
             xcode: "16.4"
             test_destination_os: "18.4"
             platform: "iOS"
             device: iPhone 16 Pro
-            install_platforms: false
-            create_device: false
 
           # iOS 26 - Download iOS 26.1 beta runtime on macOS-26
           - job_id: ios_26
             name: iOS 26
-            runs_on: macos-26
-            runs_on_cirrus: tahoe
-            xcode: "26.1"
+            runs_on: tahoe
+            xcode: "26.1.1"
             test_destination_os: "26.1"
-            install_platforms: true
             platform: "iOS"
-            create_device: true
             device: iPhone 17 Pro
     with:
       fastlane_command: ui_tests_ios_swift
       files_suffix: _xcode_${{matrix.xcode}}-${{matrix.device}}-${{matrix.runner}}
       build_with_make: true
-      macos_version: ${{matrix.runner == 'Cirrus Labs' && matrix.runs_on_cirrus || matrix.runs_on}}
-      run_on_cirrus_labs: ${{ matrix.runner == 'Cirrus Labs' }}
+      macos_version: ${{matrix.runs_on}}
+      run_on_cirrus_labs: true
       codecov_test_analytics: true
-      xcode_version: ${{ matrix.runner == 'Cirrus Labs' && matrix.xcode_cirrus || matrix.xcode}}
+      xcode_version: ${{ matrix.xcode}}
       test-destination-os: ${{matrix.test_destination_os}}
-      install_platforms: ${{matrix.install_platforms}}
       platform: ${{matrix.platform}}
-      create_device: ${{matrix.create_device}}
       device: ${{matrix.device}}
-      # Github doesn't allow using matrix variables in if conditions, so we pass it to the common workflow and skip there.
-      # This lets us skip the job if it's a push to the main branch and the runner is Cirrus Labs.
-      should_skip: ${{ ( github.event_name != 'push' || github.ref != 'refs/heads/main' ) && matrix.runner == 'Cirrus Labs' }}
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
@@ -186,21 +163,17 @@ jobs:
       fail-fast: false
       matrix:
         runner:
-          - GitHub
           - Cirrus Labs
     with:
       fastlane_command: ui_tests_ios_swift6
       xcode_version: 16.4
       build_with_make: true
-      macos_version: ${{matrix.runner == 'Cirrus Labs' && 'sequoia' || 'macos-15'}}
-      run_on_cirrus_labs: ${{matrix.runner == 'Cirrus Labs'}}
+      macos_version: "sequoia"
+      run_on_cirrus_labs: true
       codecov_test_analytics: true
       device: iPhone 16 Pro
       test-destination-os: "18.4"
       files_suffix: _swift6_-${{matrix.runner}}
-      # Github doesn't allow using matrix variables in if conditions, so we pass it to the common workflow and skip there.
-      # This lets us skip the job if it's a push to the main branch and the runner is Cirrus Labs.
-      should_skip: ${{ ( github.event_name != 'push' || github.ref != 'refs/heads/main' ) && matrix.runner == 'Cirrus Labs' }}
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}