Skip to content

Commit 206a30f

Browse files
ncooke3themiswang
authored andcommitted
[Infra] Install visionOS sims to workflows that couldn't find it (#14543)
1 parent 8ee1e96 commit 206a30f

File tree

10 files changed

+24
-30
lines changed

10 files changed

+24
-30
lines changed

.github/workflows/abtesting.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ jobs:
120120
key: ${{needs.spm-package-resolved.outputs.cache_key}}
121121
- name: Xcode
122122
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
123+
- name: Install visionOS, if needed.
124+
if: matrix.target == 'visionOS'
125+
run: xcodebuild -downloadPlatform visionOS
123126
- name: Initialize xcodebuild
124127
run: scripts/setup_spm_tests.sh
125128
- uses: nick-fields/retry@v3

.github/workflows/auth.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@ jobs:
141141
key: ${{needs.spm-package-resolved.outputs.cache_key}}
142142
- name: Xcode
143143
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
144+
- name: Install visionOS, if needed.
145+
if: matrix.target == 'visionOS spm'
146+
run: xcodebuild -downloadPlatform visionOS
144147
- name: Initialize xcodebuild
145148
run: scripts/setup_spm_tests.sh
146149
- uses: nick-fields/retry@v3

.github/workflows/core.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ jobs:
101101
key: ${{needs.spm-package-resolved.outputs.cache_key}}
102102
- name: Xcode
103103
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
104+
- name: Install visionOS, if needed.
105+
if: matrix.target == 'visionOS'
106+
run: xcodebuild -downloadPlatform visionOS
104107
- name: Initialize xcodebuild
105108
run: scripts/setup_spm_tests.sh
106109
- name: Unit Tests

.github/workflows/crashlytics.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@ jobs:
116116
key: ${{needs.spm-package-resolved.outputs.cache_key}}
117117
- name: Xcode
118118
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
119+
- name: Install visionOS, if needed.
120+
if: matrix.target == 'visionOS'
121+
run: xcodebuild -downloadPlatform visionOS
119122
- name: Initialize xcodebuild
120123
run: scripts/setup_spm_tests.sh
121124
- uses: nick-fields/retry@v3

.github/workflows/mlmodeldownloader.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@ jobs:
131131
key: ${{needs.spm-package-resolved.outputs.cache_key}}
132132
- name: Xcode
133133
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
134+
- name: Install visionOS, if needed.
135+
if: matrix.target == 'visionOS'
136+
run: xcodebuild -downloadPlatform visionOS
134137
- name: Initialize xcodebuild
135138
run: scripts/setup_spm_tests.sh
136139
- name: Unit Tests

.github/workflows/remoteconfig.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ jobs:
155155
key: ${{needs.spm-package-resolved.outputs.cache_key}}
156156
- name: Xcode
157157
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
158+
- name: Install visionOS, if needed.
159+
if: matrix.target == 'visionOS'
160+
run: xcodebuild -downloadPlatform visionOS
158161
- name: Initialize xcodebuild
159162
run: scripts/setup_spm_tests.sh
160163
- name: Unit Tests

.github/workflows/sessions.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ jobs:
111111
key: ${{needs.spm-package-resolved.outputs.cache_key}}
112112
- name: Xcode
113113
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
114+
- name: Install visionOS, if needed.
115+
if: matrix.target == 'visionOS'
116+
run: xcodebuild -downloadPlatform visionOS
114117
- name: Initialize xcodebuild
115118
run: scripts/setup_spm_tests.sh
116119
- uses: nick-fields/retry@v3

.github/workflows/vertexai.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ jobs:
8181
run: scripts/update_vertexai_responses.sh
8282
- name: Xcode
8383
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
84+
- name: Install visionOS, if needed.
85+
if: matrix.target == 'visionOS'
86+
run: xcodebuild -downloadPlatform visionOS
8487
- name: Initialize xcodebuild
8588
run: scripts/setup_spm_tests.sh
8689
- uses: nick-fields/retry@v3

Crashlytics/Crashlytics/Components/FIRCLSApplication.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ UIApplication* FIRCLSApplicationSharedInstance(void);
8383
id FIRCLSApplicationSharedInstance(void);
8484
#endif
8585

86-
void FIRCLSApplicationOpenURL(NSURL* url,
87-
NSExtensionContext* extensionContext,
88-
void (^completionBlock)(BOOL success));
89-
9086
id<NSObject> FIRCLSApplicationBeginActivity(NSActivityOptions options, NSString* reason);
9187
void FIRCLSApplicationEndActivity(id<NSObject> activity);
9288

Crashlytics/Crashlytics/Components/FIRCLSApplication.m

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -155,32 +155,6 @@ id FIRCLSApplicationSharedInstance(void) {
155155
}
156156
#endif
157157

158-
void FIRCLSApplicationOpenURL(NSURL* url,
159-
NSExtensionContext* extensionContext,
160-
void (^completionBlock)(BOOL success)) {
161-
if (extensionContext) {
162-
[extensionContext openURL:url completionHandler:completionBlock];
163-
return;
164-
}
165-
166-
BOOL result = NO;
167-
168-
#if TARGET_OS_IOS
169-
// What's going on here is the value returned is a scalar, but we really need an object to
170-
// call this dynamically. Hoops must be jumped.
171-
NSInvocationOperation* op =
172-
[[NSInvocationOperation alloc] initWithTarget:FIRCLSApplicationSharedInstance()
173-
selector:@selector(openURL:)
174-
object:url];
175-
[op start];
176-
[op.result getValue:&result];
177-
#elif CLS_TARGET_OS_OSX
178-
result = [[NSClassFromString(@"NSWorkspace") sharedWorkspace] openURL:url];
179-
#endif
180-
181-
completionBlock(result);
182-
}
183-
184158
id<NSObject> FIRCLSApplicationBeginActivity(NSActivityOptions options, NSString* reason) {
185159
if ([[NSProcessInfo processInfo] respondsToSelector:@selector(beginActivityWithOptions:
186160
reason:)]) {

0 commit comments

Comments
 (0)