Skip to content

Commit 4c138e6

Browse files
authored
Initial CI for visionOS (#12578)
1 parent 3512301 commit 4c138e6

File tree

3 files changed

+17
-29
lines changed

3 files changed

+17
-29
lines changed

.github/workflows/spm.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ jobs:
3636
- os: macos-13
3737
xcode: Xcode_15.2
3838
test: spmbuildonly
39+
- os: macos-14
40+
xcode: Xcode_15.2
41+
test: spmbuildonly
3942
runs-on: ${{ matrix.os }}
4043
steps:
4144
- uses: actions/checkout@v4
@@ -84,12 +87,17 @@ jobs:
8487
matrix:
8588
# Full set of Firebase-Package tests only run on iOS. Run subset on other platforms.
8689
target: [tvOS, macOS, catalyst]
87-
os: [macos-12, macos-13]
90+
os: [macos-12, macos-13, macos-14]
8891
include:
8992
- os: macos-12
9093
xcode: Xcode_14.2
9194
- os: macos-13
9295
xcode: Xcode_15.2
96+
- os: macos-14
97+
xcode: Xcode_15.2
98+
- os: macos-14
99+
target: visionOS
100+
xcode: Xcode_15.2
93101
runs-on: ${{ matrix.os }}
94102
steps:
95103
- uses: actions/checkout@v4

.github/workflows/storage.yml

+6-27
Original file line numberDiff line numberDiff line change
@@ -64,36 +64,18 @@ jobs:
6464
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
6565
strategy:
6666
matrix:
67+
target: [iOS, tvOS, macOS, catalyst, watchOS]
68+
os: [macos-12, macos-13, macos-14]
6769
include:
6870
- os: macos-12
6971
xcode: Xcode_14.2
7072
- os: macos-13
7173
xcode: Xcode_15.2
72-
runs-on: ${{ matrix.os }}
73-
steps:
74-
- uses: actions/checkout@v4
75-
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
76-
with:
77-
cache_key: ${{ matrix.os }}
78-
- name: Xcode
79-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
80-
- name: Initialize xcodebuild
81-
run: scripts/setup_spm_tests.sh
82-
- name: Swift Unit Tests
83-
run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseStorageUnit iOS spm
84-
85-
spm-cron:
86-
# Don't run on private repo.
87-
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
88-
strategy:
89-
matrix:
90-
target: [tvOS, macOS, catalyst, watchOS]
91-
os: [macos-12, macos-13]
92-
include:
93-
- os: macos-12
94-
xcode: Xcode_14.2
95-
- os: macos-13
74+
- os: macos-14
75+
xcode: Xcode_15.2
76+
- os: macos-14
9677
xcode: Xcode_15.2
78+
target: visionOS
9779
runs-on: ${{ matrix.os }}
9880
steps:
9981
- uses: actions/checkout@v4
@@ -121,9 +103,6 @@ jobs:
121103
- swift: swift
122104
os: macos-13
123105
xcode: Xcode_15.2
124-
- swift: swift
125-
os: macos-13
126-
xcode: Xcode_15.2
127106
env:
128107
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
129108
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}

SwiftPMTests/swift-test/all-imports.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ class importTest: XCTestCase {
7070
#else
7171
// Device model should show up as x86_64 for iOS, tvOS, and watchOS
7272
// simulators.
73-
XCTAssertEqual(GULAppEnvironmentUtil.deviceModel(), "x86_64")
73+
let model = GULAppEnvironmentUtil.deviceModel()
74+
XCTAssertTrue(model == "x86_64" || model == "arm64")
7475
#endif
7576

7677
let versionParts = FirebaseVersion().split(separator: ".")

0 commit comments

Comments
 (0)