2
0
Эх сурвалжийг харах

Detail device combination

onevcat 1 сар өмнө
parent
commit
04482cd58e

+ 38 - 12
.github/workflows/build.yaml

@@ -20,18 +20,42 @@ jobs:
     runs-on: self-hosted
     runs-on: self-hosted
     strategy:
     strategy:
       matrix:
       matrix:
-        destination: [
-          'macOS', 
-          'iOS Simulator,name=iPhone 17,OS=26.0', 
-          'tvOS Simulator,name=Apple TV,OS=26.0', 
-          'watchOS Simulator,name=Apple Watch Series 9 (41mm),OS=26.0'
-        ]
-        xcode: [
-          '16.2',
-          '16.3',
-          '26.0',
-          '26.1.1',
-        ]
+        include:
+          - xcode: '16.2'
+            destination: 'macOS'
+          - xcode: '16.2'
+            destination: 'iOS Simulator,name=iPhone 16,OS=18.2'
+          - xcode: '16.2'
+            destination: 'tvOS Simulator,name=Apple TV 4K (3rd generation),OS=18.2'
+          - xcode: '16.2'
+            destination: 'watchOS Simulator,name=Apple Watch Series 10 (42mm),OS=11.2'
+
+          - xcode: '16.3'
+            destination: 'macOS'
+          - xcode: '16.3'
+            destination: 'iOS Simulator,name=iPhone 16,OS=18.4'
+          - xcode: '16.3'
+            destination: 'tvOS Simulator,name=Apple TV 4K (3rd generation),OS=18.4'
+          - xcode: '16.3'
+            destination: 'watchOS Simulator,name=Apple Watch Series 10 (42mm),OS=11.4'
+
+          - xcode: '26.0'
+            destination: 'macOS'
+          - xcode: '26.0'
+            destination: 'iOS Simulator,name=iPhone 17,OS=26.0'
+          - xcode: '26.0'
+            destination: 'tvOS Simulator,name=Apple TV 4K (3rd generation),OS=26.0'
+          - xcode: '26.0'
+            destination: 'watchOS Simulator,name=Apple Watch Series 11 (42mm),OS=26.0'
+
+          - xcode: '26.1.1'
+            destination: 'macOS'
+          - xcode: '26.1.1'
+            destination: 'iOS Simulator,name=iPhone 17,OS=26.1'
+          - xcode: '26.1.1'
+            destination: 'tvOS Simulator,name=Apple TV 4K (3rd generation),OS=26.1'
+          - xcode: '26.1.1'
+            destination: 'watchOS Simulator,name=Apple Watch Series 11 (42mm),OS=26.1'
     steps:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/checkout@v4
       - name: Install Gems
       - name: Install Gems
@@ -40,4 +64,6 @@ jobs:
         env:
         env:
           DESTINATION: platform=${{ matrix.destination }}
           DESTINATION: platform=${{ matrix.destination }}
           XCODE_VERSION: ${{ matrix.xcode }}
           XCODE_VERSION: ${{ matrix.xcode }}
+          FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: '60'
+          FASTLANE_XCODEBUILD_SETTINGS_RETRIES: '4'
         run: bundle exec fastlane build_ci
         run: bundle exec fastlane build_ci

+ 20 - 10
.github/workflows/test.yaml

@@ -20,16 +20,24 @@ jobs:
     runs-on: self-hosted
     runs-on: self-hosted
     strategy:
     strategy:
       matrix:
       matrix:
-        destination: [
-          'macOS', 
-          'iOS Simulator,name=iPhone 16,OS=26.0', 
-          'tvOS Simulator,name=Apple TV,OS=26.0', 
-          'watchOS Simulator,name=Apple Watch Series 10 (42mm),OS=26.0'
-        ]
-        xcode: [
-          '16.4',
-          '26.2',
-        ]
+        include:
+          - xcode: '16.4'
+            destination: 'macOS'
+          - xcode: '16.4'
+            destination: 'iOS Simulator,name=iPhone 16,OS=18.5'
+          - xcode: '16.4'
+            destination: 'tvOS Simulator,name=Apple TV 4K (3rd generation),OS=18.5'
+          - xcode: '16.4'
+            destination: 'watchOS Simulator,name=Apple Watch Series 10 (42mm),OS=11.5'
+
+          - xcode: '26.2'
+            destination: 'macOS'
+          - xcode: '26.2'
+            destination: 'iOS Simulator,name=iPhone 17,OS=26.2'
+          - xcode: '26.2'
+            destination: 'tvOS Simulator,name=Apple TV 4K (3rd generation),OS=26.2'
+          - xcode: '26.2'
+            destination: 'watchOS Simulator,name=Apple Watch Series 11 (42mm),OS=26.2'
     steps:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/checkout@v4
       - name: Install Gems
       - name: Install Gems
@@ -38,4 +46,6 @@ jobs:
         env:
         env:
           DESTINATION: platform=${{ matrix.destination }}
           DESTINATION: platform=${{ matrix.destination }}
           XCODE_VERSION: ${{ matrix.xcode }}
           XCODE_VERSION: ${{ matrix.xcode }}
+          FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: '60'
+          FASTLANE_XCODEBUILD_SETTINGS_RETRIES: '4'
         run: bundle exec fastlane test_ci
         run: bundle exec fastlane test_ci