FirebaseCore CI on Xcode 15 (#12032)

firebase · Oct 31, 2023 · 24be340 · 24be340
1 parent 822f547
commit 24be340
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
@@ -18,10 +18,17 @@ jobs:
   pod-lib-lint:
     # Don't run on private repo unless it is a PR.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
-    runs-on: macos-12
     strategy:
       matrix:
-        target: [ios, tvos, macos]
+        # TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
+        target: [ios, tvos, macos --skip-tests]
+        os: [macos-12, macos-13]
+        include:
+          - os: macos-12
+            xcode: Xcode_14.2
+          - os: macos-13
+            xcode: Xcode_15.0.1
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
@@ -33,10 +40,19 @@ jobs:
   spm:
     # Don't run on private repo unless it is a PR.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
-    runs-on: macos-12
     strategy:
       matrix:
-        target: [iOS, tvOS, macOS, catalyst, watchOS]
+        target: [iOS, tvOS, macOS, catalyst, watchOS, visionOS]
+        os: [macos-12, macos-13]
+        include:
+          - os: macos-12
+            xcode: Xcode_14.2
+          - os: macos-13
+            xcode: Xcode_15.0.1
+        exclude:
+          - os: macos-12
+            target: visionOS
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -51,7 +67,7 @@ jobs:
     # Don't run on private repo unless it is a PR.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
 
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
     - uses: actions/checkout@v3
     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -67,7 +83,7 @@ jobs:
     # Don't run on private repo.
     if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
 
-    runs-on: macos-12
+    runs-on: macos-13
     strategy:
       matrix:
         target: [ios, tvos, macos]

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -52,6 +52,7 @@ platform can be one of:
   tvOS
   watchOS
   catalyst
+  visionOS
 method can be one of:
   xcodebuild (default)
   cmake
@@ -170,6 +171,9 @@ tvos_flags=(
 watchos_flags=(
   -destination 'platform=watchOS Simulator,name=Apple Watch Series 7 (45mm)'
 )
+visionos_flags=(
+  -destination 'platform=visionOS Simulator'
+)
 catalyst_flags=(
   ARCHS=x86_64 VALID_ARCHS=x86_64 SUPPORTS_MACCATALYST=YES -sdk macosx
   -destination platform="macOS,variant=Mac Catalyst,arch=x86_64" TARGETED_DEVICE_FAMILY=2
@@ -206,6 +210,10 @@ case "$platform" in
     xcb_flags=("${watchos_flags[@]}")
     ;;
 
+  visionOS)
+    xcb_flags=("${visionos_flags[@]}")
+    ;;
+
   catalyst)
     xcb_flags=("${catalyst_flags[@]}")
     ;;