Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[build] Update CircleCI jobs to Xcode 10.0 #13184

Merged
merged 3 commits into from
Nov 2, 2018
Merged

[build] Update CircleCI jobs to Xcode 10.0 #13184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b690974
[ios, tests] Bump integration tests timeout to 10s
friedbunny Oct 24, 2018
1c14043
[build] Update CircleCI jobs to Xcode 10.0
friedbunny Oct 24, 2018
947af30
[ios, build] Stop running Integration Tests target on CircleCI
friedbunny Oct 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 8 additions & 17 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,7 @@ workflows:
- linux-gcc49-debug:
name: linux-gcc4.9-debug
- linux-gcc5-debug-coverage
- ios-debug-template:
name: ios-debug
xcode: "9.4.1"
- ios-debug-template:
name: ios-debug-xcode10
xcode: "10.0.0"
- ios-debug
- ios-release-template:
name: ios-release
- ios-release-tag:
Expand Down Expand Up @@ -673,7 +668,7 @@ jobs:
# ------------------------------------------------------------------------------
node-macos-release:
macos:
xcode: "9.4.1"
xcode: "10.0.0"
environment:
BUILDTYPE: RelWithDebInfo
HOMEBREW_NO_AUTO_UPDATE: 1
Expand Down Expand Up @@ -829,20 +824,16 @@ jobs:
platform/linux/scripts/coveralls.sh

# ------------------------------------------------------------------------------
ios-debug-template:
parameters:
xcode:
type: string
ios-debug:
macos:
xcode: << parameters.xcode >>
xcode: "10.0.0"
environment:
BUILDTYPE: Debug
HOMEBREW_NO_AUTO_UPDATE: 1
steps:
- install-macos-dependencies
- install-dependencies
- build-ios-test
- build-ios-integration-test
- check-public-symbols
- run:
name: Check symbol namespacing for mapbox-events-ios
Expand All @@ -860,7 +851,7 @@ jobs:
# ------------------------------------------------------------------------------
ios-sanitize-nightly:
macos:
xcode: "9.4.1"
xcode: "10.0.0"
environment:
BUILDTYPE: Debug
HOMEBREW_NO_AUTO_UPDATE: 1
Expand All @@ -879,7 +870,7 @@ jobs:
# ------------------------------------------------------------------------------
ios-sanitize-address-nightly:
macos:
xcode: "9.4.1"
xcode: "10.0.0"
environment:
BUILDTYPE: Debug
HOMEBREW_NO_AUTO_UPDATE: 1
Expand All @@ -898,7 +889,7 @@ jobs:
# ------------------------------------------------------------------------------
ios-static-analyzer-nightly:
macos:
xcode: "9.4.1"
xcode: "10.0.0"
environment:
BUILDTYPE: Debug
HOMEBREW_NO_AUTO_UPDATE: 1
Expand Down Expand Up @@ -989,7 +980,7 @@ jobs:
# ------------------------------------------------------------------------------
macos-debug:
macos:
xcode: "9.4.1"
xcode: "10.0.0"
environment:
BUILDTYPE: Debug
HOMEBREW_NO_AUTO_UPDATE: 1
Expand Down
2 changes: 1 addition & 1 deletion platform/ios/Integration Tests/MBGLIntegrationTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ @implementation MBGLIntegrationTests
#pragma mark - Tests

- (void)waitForMapViewToBeRendered {
[self waitForMapViewToBeRenderedWithTimeout:5];
[self waitForMapViewToBeRenderedWithTimeout:10];
}

// This test does not strictly need to be in this test file/target. Including here for convenience.
Expand Down
14 changes: 7 additions & 7 deletions platform/ios/Integration Tests/MGLCameraTransitionTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ - (void)testSetAndResetNorthWithDispatchAsyncInDelegateMethod {
[self.mapView setDirection:90 animated:YES];

// loop, render, and wait
[self waitForExpectations:@[expectation] timeout:5];
[self waitForExpectations:@[expectation] timeout:10];
}


Expand Down Expand Up @@ -62,7 +62,7 @@ - (void)testSetAndResetNorthInDelegateMethod {
};

[self.mapView setDirection:90 animated:YES];
[self waitForExpectations:@[expectation] timeout:5];
[self waitForExpectations:@[expectation] timeout:10];
}

- (void)testInterruptingAndResetNorthOnlyOnceInIsChanging {
Expand Down Expand Up @@ -106,7 +106,7 @@ - (void)testInterruptingAndResetNorthOnlyOnceInIsChanging {
};

[self.mapView setDirection:90 animated:YES];
[self waitForExpectations:@[expectation] timeout:5];
[self waitForExpectations:@[expectation] timeout:10];

XCTAssertEqualWithAccuracy(self.mapView.direction, 0.0, 0.001, @"Camera should have reset to north. %0.3f", self.mapView.direction);
}
Expand Down Expand Up @@ -222,7 +222,7 @@ - (void)testSetCenterCoordinateInDelegateMethod {

// Should take MGLAnimationDuration seconds (0.3)
[self.mapView setCenterCoordinate:target zoomLevel:15.0 animated:YES];
[self waitForExpectations:@[expectation] timeout:5];
[self waitForExpectations:@[expectation] timeout:10];
}

- (void)testFlyToCameraInDelegateMethod {
Expand Down Expand Up @@ -323,7 +323,7 @@ - (void)testFlyToCameraInDelegateMethod {
// Should take MGLAnimationDuration
[self.mapView setCenterCoordinate:target zoomLevel:zoomLevel animated:YES];

[self waitForExpectations:@[expectation] timeout:5];
[self waitForExpectations:@[expectation] timeout:10];

NSLog(@"setCenterCoordinate: %0.4fs", stop1 - stop0);
NSLog(@"flyToCamera: %0.4fs", stop2 - stop1);
Expand Down Expand Up @@ -360,7 +360,7 @@ - (void)testContinuallyResettingNorthInIsChangingPENDING {
};

[self.mapView setDirection:90 animated:YES];
[self waitForExpectations:@[expectation] timeout:5];
[self waitForExpectations:@[expectation] timeout:10];

XCTAssertEqualWithAccuracy(self.mapView.direction, 0.0, 0.001, @"Camera should have reset to north. %0.3f", self.mapView.direction);
}
Expand All @@ -386,7 +386,7 @@ - (void)testContinuallySettingCoordinateInIsChangingPENDING {
};

[self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(40.0, 40.0) animated:YES];
[self waitForExpectations:@[expectation] timeout:5];
[self waitForExpectations:@[expectation] timeout:10];

XCTAssertEqualWithAccuracy(self.mapView.direction, 0.0, 0.001, @"Camera should have reset to north. %0.3f", self.mapView.direction);
}
Expand Down
4 changes: 2 additions & 2 deletions platform/ios/Integration Tests/MGLStyleLayerIntegrationTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ - (void)testForInterpolatingExpressionRenderCrashWithEmptyStops {
XCTAssertThrowsSpecificNamed((layer.circleColor = interpExpression), NSException, NSInvalidArgumentException);

[self.mapView.style addLayer:layer];
[self waitForMapViewToBeRenderedWithTimeout:5];
[self waitForMapViewToBeRenderedWithTimeout:10];
}

- (void)testForSteppingExpressionRenderCrashWithEmptyStops {
Expand All @@ -55,7 +55,7 @@ - (void)testForSteppingExpressionRenderCrashWithEmptyStops {
XCTAssertThrowsSpecificNamed((layer.circleColor = steppingExpression), NSException, NSInvalidArgumentException);

[self.mapView.style addLayer:layer];
[self waitForMapViewToBeRenderedWithTimeout:5];
[self waitForMapViewToBeRenderedWithTimeout:10];
}

@end
2 changes: 1 addition & 1 deletion platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterSwiftTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class MGLMapSnapshotterSwiftTests: MGLMapViewIntegrationTest {
return
}

let timeout: TimeInterval = 5.0
let timeout: TimeInterval = 10.0
let expectation = self.expectation(description: "snapshot")

let options = MGLMapSnapshotterSwiftTests.snapshotterOptions(size: mapView.bounds.size)
Expand Down
10 changes: 5 additions & 5 deletions platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ - (void)testDeallocatingSnapshotterDuringSnapshot {
return;
}

NSTimeInterval timeout = 5.0;
NSTimeInterval timeout = 10.0;
XCTestExpectation *expectation = [self expectationWithDescription:@"snapshot"];
CGSize size = self.mapView.bounds.size;
CLLocationCoordinate2D coord = CLLocationCoordinate2DMake(30.0, 30.0);
Expand Down Expand Up @@ -118,7 +118,7 @@ - (void)testSnapshotterUsingNestedDispatchQueues {
return;
}

NSTimeInterval timeout = 5.0;
NSTimeInterval timeout = 10.0;
XCTestExpectation *expectation = [self expectationWithDescription:@"snapshot"];
CGSize size = self.mapView.bounds.size;
CLLocationCoordinate2D coord = CLLocationCoordinate2DMake(30.0, 30.0);
Expand Down Expand Up @@ -186,7 +186,7 @@ - (void)testCancellingSnapshot {

[snapshotter cancel];

[self waitForExpectations:@[expectation] timeout:0.5];
[self waitForExpectations:@[expectation] timeout:5.0];
}

- (void)testAllocatingSnapshotOnBackgroundQueue {
Expand Down Expand Up @@ -379,7 +379,7 @@ - (void)testSnapshotPointConversion {
[expectation fulfill];
}];

[self waitForExpectations:@[expectation] timeout:5.0];
[self waitForExpectations:@[expectation] timeout:10.0];
}

- (void)testSnapshotPointConversionCoordinateOrdering {
Expand Down Expand Up @@ -426,7 +426,7 @@ - (void)testSnapshotPointConversionCoordinateOrdering {
[expectation fulfill];
}];

[self waitForExpectations:@[expectation] timeout:5.0];
[self waitForExpectations:@[expectation] timeout:10.0];
}


Expand Down