Initial CI for visionOS (#12578)

firebase · Mar 20, 2024 · 4c138e6 · 4c138e6
1 parent 3512301
commit 4c138e6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 29 deletions.
diff --git a/.github/workflows/spm.yml b/.github/workflows/spm.yml
@@ -36,6 +36,9 @@ jobs:
           - os: macos-13
             xcode: Xcode_15.2
             test: spmbuildonly
+          - os: macos-14
+            xcode: Xcode_15.2
+            test: spmbuildonly
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -84,12 +87,17 @@ jobs:
       matrix:
         # Full set of Firebase-Package tests only run on iOS. Run subset on other platforms.
         target: [tvOS, macOS, catalyst]
-        os: [macos-12, macos-13]
+        os: [macos-12, macos-13, macos-14]
         include:
           - os: macos-12
             xcode: Xcode_14.2
           - os: macos-13
             xcode: Xcode_15.2
+          - os: macos-14
+            xcode: Xcode_15.2
+          - os: macos-14
+            target: visionOS
+            xcode: Xcode_15.2
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4

diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml
@@ -64,36 +64,18 @@ jobs:
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
     strategy:
       matrix:
+        target: [iOS, tvOS, macOS, catalyst, watchOS]
+        os: [macos-12, macos-13, macos-14]
         include:
           - os: macos-12
             xcode: Xcode_14.2
           - os: macos-13
             xcode: Xcode_15.2
-    runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v4
-    - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
-      with:
-        cache_key: ${{ matrix.os }}
-    - name: Xcode
-      run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
-    - name: Initialize xcodebuild
-      run: scripts/setup_spm_tests.sh
-    - name: Swift Unit Tests
-      run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseStorageUnit iOS spm
-
-  spm-cron:
-    # Don't run on private repo.
-    if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
-    strategy:
-      matrix:
-        target: [tvOS, macOS, catalyst, watchOS]
-        os: [macos-12, macos-13]
-        include:
-          - os: macos-12
-            xcode: Xcode_14.2
-          - os: macos-13
+          - os: macos-14
+            xcode: Xcode_15.2
+          - os: macos-14
             xcode: Xcode_15.2
+            target: visionOS
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -121,9 +103,6 @@ jobs:
           - swift: swift
             os: macos-13
             xcode: Xcode_15.2
-          - swift: swift
-            os: macos-13
-            xcode: Xcode_15.2
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
       signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}

diff --git a/SwiftPMTests/swift-test/all-imports.swift b/SwiftPMTests/swift-test/all-imports.swift
@@ -70,7 +70,8 @@ class importTest: XCTestCase {
     #else
       // Device model should show up as x86_64 for iOS, tvOS, and watchOS
       // simulators.
-      XCTAssertEqual(GULAppEnvironmentUtil.deviceModel(), "x86_64")
+      let model = GULAppEnvironmentUtil.deviceModel()
+      XCTAssertTrue(model == "x86_64" || model == "arm64")
     #endif
 
     let versionParts = FirebaseVersion().split(separator: ".")