Skip to content

Commit d06b22a

Browse files
paulb777schmidt-sebastian
authored andcommitted
Update Firestore macOS build for Xcode 12 (#6859)
1 parent dce55c4 commit d06b22a

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.github/workflows/firestore.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ jobs:
196196
# Don't run on private repo unless it is a PR.
197197
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
198198
runs-on: macOS-latest
199+
needs: check
199200
steps:
200201
- uses: actions/checkout@v2
201202
- name: Xcode 12

Firestore/core/test/unit/FSTGoogleTestTests.mm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,8 @@ void XCTestMethod(XCTestCase* self, SEL _cmd) {
224224
const char* path = part.file_name() ? part.file_name() : "";
225225
int line = part.line_number() > 0 ? part.line_number() : 0;
226226

227-
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 140000
227+
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 140000 || \
228+
__MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
228229
// Xcode 12
229230
auto* location = [[XCTSourceCodeLocation alloc] initWithFilePath:@(path)
230231
lineNumber:line];

0 commit comments

Comments
 (0)