Merge branch 'main' into other/test_ios_900_pods

Author: jonsimantov

.github/workflows/ios.yml

@@ -35,13 +35,14 @@ jobs:
           echo "::set-output name=matrix_xcode_version::$( python scripts/gha/print_matrix_configuration.py -w ios -k xcode_version ${EXPANDED_MATRIX_PARAM} )"
 
   build:
-    name: ios-macos-latest
-    runs-on: macos-12
+    name: ios-${{ matrix.os }}-${{ matrix.xcode_version }}
+    runs-on: ${{ matrix.os }}
     needs: prepare_matrix
     strategy:
       fail-fast: false
       matrix:
-        xcode_verison: ${{ fromJson(needs.prepare_matrix.outputs.matrix_xcode_version) }}
+        os: [ 'macos-12' ]
+        xcode_version: ${{ fromJson(needs.prepare_matrix.outputs.matrix_xcode_version) }}
     steps:
       - name: Store git credentials for all git commands
         # Forces all git commands to use authenticated https, to prevent throttling.
@@ -52,7 +53,7 @@ jobs:
 
       - name: setup Xcode version (macos)
         if: runner.os == 'macOS'
-        run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_verison }}.app/Contents/Developer
+        run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_version }}.app/Contents/Developer
 
       - uses: actions/checkout@v2
         with:

scripts/gha/print_matrix_configuration.py

@@ -170,9 +170,9 @@
   "ios_min": {"type": "real", "model":"iphone8", "version":"11.4"},
   "ios_target": {"type": "real", "model":"iphone8plus", "version":"12.0"},
   "ios_latest": {"type": "real", "model":"iphone11pro", "version":"14.7"},
-  "simulator_min": {"type": "virtual", "name":"iPhone 8", "version":"13.7"},
-  "simulator_target": {"type": "virtual", "name":"iPhone 11", "version":"14.5"},
-  "simulator_latest": {"type": "virtual", "name":"iPhone 13", "version":"15.0"},
+  "simulator_min": {"type": "virtual", "name":"iPhone 6", "version":"12.4"},
+  "simulator_target": {"type": "virtual", "name":"iPhone 8", "version":"14.5"},
+  "simulator_latest": {"type": "virtual", "name":"iPhone 11", "version":"15.4"},
   "tvos_simulator": {"type": "virtual", "name":"Apple TV", "version":"14.3"},
 }