Skip to content

Commit bb563c8

Browse files
paulb777paulb777
authored
Migrate travis to Xcode 10.3 and single platform builds (#3714)
1 parent 5da6b69 commit bb563c8

File tree

8 files changed

+268
-384
lines changed

8 files changed

+268
-384
lines changed

‎.travis.yml

Lines changed: 213 additions & 122 deletions
Large diffs are not rendered by default.

‎Example/CoreDiagnostics/Tests/FIRCoreDiagnosticsTest.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ - (void)tearDown {
153153
}
154154

155155
/** Tests populating the proto correctly. */
156-
- (void)testProtoPopulation {
156+
// https://github.com/firebase/firebase-ios-sdk/issues/3711
157+
- (void)SKIPtestProtoPopulation {
157158
logs_proto_mobilesdk_ios_ICoreConfiguration icoreConfiguration =
158159
logs_proto_mobilesdk_ios_ICoreConfiguration_init_default;
159160
FIRPopulateProtoWithCommonInfoFromApp(&icoreConfiguration, @{

‎Example/Podfile

Lines changed: 0 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -148,131 +148,3 @@ target 'Auth_Sample' do
148148
pod 'EarlGrey'
149149
end
150150
end
151-
152-
target 'Core_Example_macOS' do
153-
platform :osx, '10.11'
154-
155-
pod 'FirebaseCore', :path => '../'
156-
pod 'FirebaseCoreDiagnostics', :path => '../'
157-
pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
158-
pod 'GoogleDataTransport', :path => '../'
159-
pod 'GoogleDataTransportCCTSupport', :path => '../'
160-
161-
target 'Core_Tests_macOS' do
162-
inherit! :search_paths
163-
pod 'OCMock'
164-
end
165-
end
166-
167-
target 'Auth_Example_macOS' do
168-
platform :osx, '10.11'
169-
170-
pod 'FirebaseAuth', :path => '../'
171-
172-
target 'Auth_Tests_macOS' do
173-
inherit! :search_paths
174-
pod 'OCMock'
175-
end
176-
end
177-
178-
target 'Database_Example_macOS' do
179-
platform :osx, '10.11'
180-
181-
pod 'FirebaseDatabase', :path => '../'
182-
183-
target 'Database_Tests_macOS' do
184-
inherit! :search_paths
185-
end
186-
187-
target 'Database_IntegrationTests_macOS' do
188-
inherit! :search_paths
189-
end
190-
end
191-
192-
target 'Storage_Example_macOS' do
193-
platform :osx, '10.11'
194-
195-
pod 'FirebaseStorage', :path => '../'
196-
197-
target 'Storage_Tests_macOS' do
198-
inherit! :search_paths
199-
pod 'OCMock'
200-
end
201-
202-
target 'Storage_IntegrationTests_macOS' do
203-
inherit! :search_paths
204-
end
205-
end
206-
207-
target 'Core_Example_tvOS' do
208-
platform :tvos, '10.0'
209-
210-
target 'Core_Tests_tvOS' do
211-
inherit! :search_paths
212-
pod 'OCMock'
213-
end
214-
end
215-
216-
target 'Auth_Example_tvOS' do
217-
platform :tvos, '10.0'
218-
219-
pod 'FirebaseAuth', :path => '../'
220-
221-
target 'Auth_Tests_tvOS' do
222-
inherit! :search_paths
223-
pod 'OCMock'
224-
end
225-
end
226-
227-
target 'Database_Example_tvOS' do
228-
platform :tvos, '10.0'
229-
230-
pod 'FirebaseDatabase', :path => '../'
231-
232-
target 'Database_Tests_tvOS' do
233-
inherit! :search_paths
234-
end
235-
236-
# TODO
237-
# target 'Database_IntegrationTests_tvOS' do
238-
# inherit! :search_paths
239-
# end
240-
end
241-
242-
target 'Storage_Example_tvOS' do
243-
platform :tvos, '10.0'
244-
245-
pod 'FirebaseStorage', :path => '../'
246-
247-
target 'Storage_Tests_tvOS' do
248-
inherit! :search_paths
249-
pod 'OCMock'
250-
end
251-
252-
#TODO Storage_IntegrationTests_tvOS
253-
# target 'Storage_IntegrationTests_tvOS' do
254-
# inherit! :search_paths
255-
# end
256-
end
257-
258-
target 'Messaging_Example_tvOS' do
259-
platform :tvos, '10.0'
260-
261-
pod 'FirebaseMessaging', :path => '../'
262-
263-
target 'Messaging_Tests_tvOS' do
264-
inherit! :search_paths
265-
pod 'OCMock'
266-
end
267-
end
268-
269-
target 'InstanceID_Example_tvOS' do
270-
platform :tvos, '10.0'
271-
272-
pod 'FirebaseInstanceID', :path => '../'
273-
274-
target 'InstanceID_Tests_tvOS' do
275-
inherit! :search_paths
276-
pod 'OCMock'
277-
end
278-
end

‎Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
source 'https://rubygems.org'
44

55
gem 'cocoapods', "1.7.5"
6-
gem 'cocoapods-generate', "1.5.0"
6+
# TODO(paulb777): The GitHub install is needed for the --platforms feature.
7+
# Change it back to a version specification when the 1.6.0 gem publishes.
8+
gem 'cocoapods-generate', :git => 'https://github.com/square/cocoapods-generate.git', :ref => 'ada3b8f'

‎Gemfile.lock

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
GIT
2+
remote: https://github.com/square/cocoapods-generate.git
3+
revision: ada3b8f1b76248ed4b3ac9cd3a4d8b0e281f2b7a
4+
ref: ada3b8f
5+
specs:
6+
cocoapods-generate (1.5.0)
7+
cocoapods-disable-podfile-validations (~> 0.1.1)
8+
19
GEM
210
remote: https://rubygems.org/
311
specs:
@@ -35,8 +43,6 @@ GEM
3543
cocoapods-deintegrate (1.0.4)
3644
cocoapods-disable-podfile-validations (0.1.1)
3745
cocoapods-downloader (1.2.2)
38-
cocoapods-generate (1.5.0)
39-
cocoapods-disable-podfile-validations (~> 0.1.1)
4046
cocoapods-plugins (1.0.0)
4147
nap
4248
cocoapods-search (1.0.0)
@@ -74,7 +80,7 @@ PLATFORMS
7480

7581
DEPENDENCIES
7682
cocoapods (= 1.7.5)
77-
cocoapods-generate (= 1.5.0)
83+
cocoapods-generate!
7884

7985
BUNDLED WITH
8086
1.17.3

‎scripts/build.sh

Lines changed: 36 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818
#
1919
# Builds the given product for the given platform using the given build method
2020

21+
function pod_gen() {
22+
# Call pod gen with a podspec and additional optional arguments.
23+
bundle exec pod gen --local-sources=./ --sources=https://cdn.cocoapods.org/ "$@"
24+
}
25+
2126
set -euo pipefail
2227

2328
if [[ $# -lt 1 ]]; then
@@ -193,13 +198,6 @@ case "$product-$method-$platform" in
193198
build \
194199
test
195200

196-
RunXcodebuild \
197-
-workspace 'GoogleUtilities/Example/GoogleUtilities.xcworkspace' \
198-
-scheme "Example_$platform" \
199-
"${xcb_flags[@]}" \
200-
build \
201-
test
202-
203201
if [[ $platform == 'iOS' ]]; then
204202
# Code Coverage collection is only working on iOS currently.
205203
./scripts/collect_metrics.sh 'Example/Firebase.xcworkspace' "AllUnitTests_$platform"
@@ -332,134 +330,86 @@ case "$product-$method-$platform" in
332330
build
333331
;;
334332

335-
GoogleDataTransport-xcodebuild-*)
336-
RunXcodebuild \
337-
-workspace 'gen/GoogleDataTransport/GoogleDataTransport.xcworkspace' \
338-
-scheme "GoogleDataTransport-$platform-Unit-Tests-Unit" \
339-
"${xcb_flags[@]}" \
340-
build \
341-
test
342-
343-
RunXcodebuild \
344-
-workspace 'gen/GoogleDataTransport/GoogleDataTransport.xcworkspace' \
345-
-scheme "GoogleDataTransport-$platform-Unit-Tests-Lifecycle" \
346-
"${xcb_flags[@]}" \
347-
build \
348-
test
349-
;;
350-
351-
GoogleDataTransportIntegrationTest-xcodebuild-*)
352-
RunXcodebuild \
353-
-workspace 'gen/GoogleDataTransport/GoogleDataTransport.xcworkspace' \
354-
-scheme "GoogleDataTransport-$platform-Unit-Tests-Integration" \
355-
"${xcb_flags[@]}" \
356-
build \
357-
test
358-
;;
359-
360-
GoogleDataTransportCCTSupport-xcodebuild-*)
361-
RunXcodebuild \
362-
-workspace 'gen/GoogleDataTransportCCTSupport/GoogleDataTransportCCTSupport.xcworkspace' \
363-
-scheme "GoogleDataTransportCCTSupport-$platform-Unit-Tests-Unit" \
364-
"${xcb_flags[@]}" \
365-
build \
366-
test
367-
368-
RunXcodebuild \
369-
-workspace 'gen/GoogleDataTransportCCTSupport/GoogleDataTransportCCTSupport.xcworkspace' \
370-
-scheme "GoogleDataTransportCCTSupport-$platform-Unit-Tests-Integration" \
371-
"${xcb_flags[@]}" \
372-
build \
373-
test
374-
;;
375-
376333
Database-xcodebuild-*)
334+
pod_gen FirebaseDatabase.podspec --platforms=ios
377335
RunXcodebuild \
378336
-workspace 'gen/FirebaseDatabase/FirebaseDatabase.xcworkspace' \
379-
-scheme "FirebaseDatabase-iOS-Unit-unit" \
337+
-scheme "FirebaseDatabase-Unit-unit" \
380338
"${ios_flags[@]}" \
381339
"${xcb_flags[@]}" \
382340
build \
383341
test
384-
RunXcodebuild \
385-
-workspace 'gen/FirebaseDatabase/FirebaseDatabase.xcworkspace' \
386-
-scheme "FirebaseDatabase-macOS-Unit-unit" \
387-
"${macos_flags[@]}" \
388-
"${xcb_flags[@]}" \
389-
build \
390-
test
391-
RunXcodebuild \
392-
-workspace 'gen/FirebaseDatabase/FirebaseDatabase.xcworkspace' \
393-
-scheme "FirebaseDatabase-tvOS-Unit-unit" \
394-
"${tvos_flags[@]}" \
395-
"${xcb_flags[@]}" \
396-
build \
397-
test
398342

399343
if [[ "$TRAVIS_PULL_REQUEST" == "false" ||
400344
"$TRAVIS_PULL_REQUEST_SLUG" == "$TRAVIS_REPO_SLUG" ]]; then
401345
# Integration tests are only run on iOS to minimize flake failures.
402346
RunXcodebuild \
403347
-workspace 'gen/FirebaseDatabase/FirebaseDatabase.xcworkspace' \
404-
-scheme "FirebaseDatabase-iOS-Unit-integration" \
348+
-scheme "FirebaseDatabase-Unit-integration" \
405349
"${ios_flags[@]}" \
406350
"${xcb_flags[@]}" \
407351
build \
408352
test
409353
fi
410-
;;
411354

412-
Messaging-xcodebuild-*)
355+
pod_gen FirebaseDatabase.podspec --platforms=macos --clean
413356
RunXcodebuild \
414-
-workspace 'gen/FirebaseMessaging/FirebaseMessaging.xcworkspace' \
415-
-scheme "FirebaseMessaging-iOS-Unit-unit" \
416-
"${ios_flags[@]}" \
357+
-workspace 'gen/FirebaseDatabase/FirebaseDatabase.xcworkspace' \
358+
-scheme "FirebaseDatabase-Unit-unit" \
359+
"${macos_flags[@]}" \
417360
"${xcb_flags[@]}" \
418361
build \
419362
test
363+
364+
pod_gen FirebaseDatabase.podspec --platforms=tvos --clean
420365
RunXcodebuild \
421-
-workspace 'gen/FirebaseMessaging/FirebaseMessaging.xcworkspace' \
422-
-scheme "FirebaseMessaging-tvOS-Unit-unit" \
366+
-workspace 'gen/FirebaseDatabase/FirebaseDatabase.xcworkspace' \
367+
-scheme "FirebaseDatabase-Unit-unit" \
423368
"${tvos_flags[@]}" \
424369
"${xcb_flags[@]}" \
425370
build \
426371
test
427372
;;
428373

429374
Storage-xcodebuild-*)
375+
pod_gen FirebaseStorage.podspec --platforms=ios
430376
RunXcodebuild \
431377
-workspace 'gen/FirebaseStorage/FirebaseStorage.xcworkspace' \
432-
-scheme "FirebaseStorage-iOS-Unit-unit" \
378+
-scheme "FirebaseStorage-Unit-unit" \
433379
"${ios_flags[@]}" \
434380
"${xcb_flags[@]}" \
435381
build \
436382
test
383+
384+
if [[ "$TRAVIS_PULL_REQUEST" == "false" ||
385+
"$TRAVIS_PULL_REQUEST_SLUG" == "$TRAVIS_REPO_SLUG" ]]; then
386+
# Integration tests are only run on iOS to minimize flake failures.
387+
RunXcodebuild \
388+
-workspace 'gen/FirebaseStorage/FirebaseStorage.xcworkspace' \
389+
-scheme "FirebaseStorage-Unit-integration" \
390+
"${ios_flags[@]}" \
391+
"${xcb_flags[@]}" \
392+
build \
393+
test
394+
fi
395+
396+
pod_gen FirebaseStorage.podspec --platforms=macos --clean
437397
RunXcodebuild \
438398
-workspace 'gen/FirebaseStorage/FirebaseStorage.xcworkspace' \
439-
-scheme "FirebaseStorage-macOS-Unit-unit" \
399+
-scheme "FirebaseStorage-Unit-unit" \
440400
"${macos_flags[@]}" \
441401
"${xcb_flags[@]}" \
442402
build \
443403
test
404+
405+
pod_gen FirebaseStorage.podspec --platforms=tvos --clean
444406
RunXcodebuild \
445407
-workspace 'gen/FirebaseStorage/FirebaseStorage.xcworkspace' \
446-
-scheme "FirebaseStorage-tvOS-Unit-unit" \
408+
-scheme "FirebaseStorage-Unit-unit" \
447409
"${tvos_flags[@]}" \
448410
"${xcb_flags[@]}" \
449411
build \
450412
test
451-
452-
if [[ "$TRAVIS_PULL_REQUEST" == "false" ||
453-
"$TRAVIS_PULL_REQUEST_SLUG" == "$TRAVIS_REPO_SLUG" ]]; then
454-
# Integration tests are only run on iOS to minimize flake failures.
455-
RunXcodebuild \
456-
-workspace 'gen/FirebaseStorage/FirebaseStorage.xcworkspace' \
457-
-scheme "FirebaseStorage-iOS-Unit-integration" \
458-
"${ios_flags[@]}" \
459-
"${xcb_flags[@]}" \
460-
build \
461-
test
462-
fi
463413
;;
464414
*)
465415
echo "Don't know how to build this product-platform-method combination" 1>&2

‎scripts/if_changed.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@ else
7878
check_changes '^(Firebase/Core|Firebase/Auth|Example/Auth|GoogleUtilities|FirebaseAuth.podspec)'
7979
;;
8080

81+
CoreDiagnostics-*)
82+
check_changes '^(Firebase/CoreDiagnostics|Example/CoreDiagnostics/Tests|FirebaseCoreDiagnostics.podspec|'\
83+
'FirebaseCoreDiagnosticsInterop|FirebaseCoreDiagnosticsInterop.podspec)'
84+
;;
85+
8186
Database-*)
8287
check_changes '^(Firebase/Core|Firebase/Database|Example/Database|GoogleUtilities|FirebaseDatabase.podspec)'
8388
;;
@@ -113,11 +118,6 @@ else
113118
check_changes '^(Firestore/(core|third_party)|cmake|GoogleUtilities)'
114119
;;
115120

116-
FirebaseCoreDiagnostics-*)
117-
check_changes '^(Firebase/CoreDiagnostics|FirebaseCoreDiagnosticsInterop|'\
118-
'FirebaseCoreDiagnostics.podspec|FirebaseCoreDiagnosticsInterop.podspec)'
119-
;;
120-
121121
GoogleDataTransport-*)
122122
check_changes '^(GoogleDataTransport|GoogleDataTransport.podspec)'
123123
;;

0 commit comments

Comments
 (0)