Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix v10 CI tests #3159

Merged
merged 62 commits into from
Oct 9, 2020
Merged
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
df0b69c
fix v10 RN tests
blagoev Aug 24, 2020
0f1d895
fix include dirs to be recursive
blagoev Aug 24, 2020
f21ea5a
add json dir to include dirs for project RealmJS in target GCDWebServers
blagoev Aug 24, 2020
ee1565e
Add push client
blagoev Aug 24, 2020
0eeb006
remove unused 'fs' import
blagoev Aug 24, 2020
b9b8d0a
fix app tests
blagoev Aug 25, 2020
75d403d
fix syntax error
blagoev Aug 25, 2020
a68292d
Disable MongoDB Realm tests on RN on Mac
blagoev Aug 25, 2020
b795fb1
hide require from RN
blagoev Aug 25, 2020
98030ea
fix node_require usage, use node_require in testConfig.js
blagoev Aug 25, 2020
cc1ba83
fix node tests
blagoev Aug 25, 2020
a528e9e
fix xcode error on CI
blagoev Aug 26, 2020
eae315a
fix tests deployment target
blagoev Aug 26, 2020
85483ee
Bumping realm-network-transport version
Aug 26, 2020
689ed8d
Adding a note in the changelog
Aug 26, 2020
64cb5db
Merge remote-tracking branch 'origin/kh/realm-network-transport-0.7.0…
blagoev Aug 27, 2020
8ec612c
fix build
blagoev Sep 29, 2020
b313718
revert some changes in test.sh and xcode project
blagoev Sep 29, 2020
1f178c4
fix class registration and pollyfill with empty AbortController for R…
blagoev Oct 2, 2020
1e68653
fix invalidateCache in RN debugger
blagoev Oct 2, 2020
5d04da8
fix RealmExample tests and better check for AbortController
blagoev Oct 2, 2020
57cc932
fix macOS Electron tests
blagoev Oct 2, 2020
c961209
fix RN Examples and MacOS Electron Chrome starting
blagoev Oct 3, 2020
6a137df
Fix Example
blagoev Oct 3, 2020
5c1cfab
even more Chrome options to fix RN Electron tests
blagoev Oct 3, 2020
ba2cc05
use latest electron and spectron
blagoev Oct 3, 2020
c92cc0f
revert some chrome args
blagoev Oct 3, 2020
b13e56b
Merge branch 'v10' into fix-RN-tests-v10
blagoev Oct 3, 2020
79e311f
disable failing test
blagoev Oct 5, 2020
2e8fd8d
fix Electron run
blagoev Oct 5, 2020
8fe6fa4
change order of arguments
blagoev Oct 5, 2020
8ffc59f
try different set of flags for Electron
blagoev Oct 5, 2020
84839de
try different set of flags for Electron v2
blagoev Oct 5, 2020
5c0b992
another try to run Electron in docker
blagoev Oct 5, 2020
9de5b52
try Electron 9 & Spectron 11
blagoev Oct 5, 2020
8a5fbec
try Electron 8 & Spectron 10
blagoev Oct 5, 2020
f45c6a4
reintroduce headless flag
blagoev Oct 6, 2020
c98f988
use electron 9
blagoev Oct 6, 2020
66bf1dc
Fix DevToolsActivePort file doesn't exist
blagoev Oct 6, 2020
6218ab6
add verbose output
blagoev Oct 6, 2020
cfa7700
more chrome arguments
blagoev Oct 6, 2020
4491cff
use electron cli for testing
blagoev Oct 6, 2020
1e2fddd
fix scripts for test start
blagoev Oct 6, 2020
04bd398
add no-sandbox
blagoev Oct 6, 2020
b43ff00
handle uncaught exceptions
blagoev Oct 6, 2020
5e40f0f
Merge branch 'v10' into fix-RN-tests-v10
blagoev Oct 6, 2020
418cc0d
fix Electron tests to use electron cli. (No more spectron)
blagoev Oct 7, 2020
fa048e2
forgotten files
blagoev Oct 7, 2020
c0311db
fix test completion in renderer. don't use xvfb-run
blagoev Oct 7, 2020
5e4fb79
fix only for electron tests
blagoev Oct 7, 2020
90ecea7
fix electron tests path to stitch.json
blagoev Oct 7, 2020
05fe2b2
forgoten file
blagoev Oct 7, 2020
f474a20
fix RN tests
blagoev Oct 7, 2020
0e37b5b
Merge branch 'v10' into fix-RN-tests-v10
blagoev Oct 7, 2020
d20082a
upgrade jest and forceExit after the test run
blagoev Oct 7, 2020
7a3f9b1
Merge branch 'fix-RN-tests-v10' of https://github.com/realm/realm-js …
blagoev Oct 7, 2020
b4a2bb8
fix tsling and typescript deps
blagoev Oct 7, 2020
0e773a4
fix tsc build in integration tests
blagoev Oct 7, 2020
2153376
Build and packing integration tests
kraenhansen Oct 8, 2020
343f6f3
remove dead file
blagoev Oct 8, 2020
5b6d847
Merge branch 'v10' into fix-RN-tests-v10
blagoev Oct 8, 2020
012b559
handle PR comments
blagoev Oct 8, 2020
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
Next Next commit
fix v10 RN tests
blagoev committed Aug 24, 2020
commit df0b69c1390a53c89368990470a74b5aea842382
53 changes: 0 additions & 53 deletions react-native/ios/RealmReact.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
5F1AAC93F04AC9E8BE7D14C8 /* libPods-RealmReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D7B24CBFE7BE8A12644DF9D2 /* libPods-RealmReact.a */; };
85CA5FE61F1536720038172D /* libRealmJS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F606902F1CA277CD0003FB26 /* libRealmJS.a */; };
F60690171CA2766F0003FB26 /* RealmReact.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = F60690161CA2766F0003FB26 /* RealmReact.h */; };
F60690191CA2766F0003FB26 /* RealmReact.mm in Sources */ = {isa = PBXBuildFile; fileRef = F60690181CA2766F0003FB26 /* RealmReact.mm */; };
@@ -68,9 +67,6 @@

/* Begin PBXFileReference section */
3F8D968A220CE21400327C8C /* RealmReact.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RealmReact.xcconfig; sourceTree = "<group>"; };
58168A50715950016E946BDC /* Pods-RealmReact.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RealmReact.debug.xcconfig"; path = "Target Support Files/Pods-RealmReact/Pods-RealmReact.debug.xcconfig"; sourceTree = "<group>"; };
8E22767C3537335E08B6F4B7 /* Pods-RealmReact.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RealmReact.release.xcconfig"; path = "Target Support Files/Pods-RealmReact/Pods-RealmReact.release.xcconfig"; sourceTree = "<group>"; };
D7B24CBFE7BE8A12644DF9D2 /* libPods-RealmReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RealmReact.a"; sourceTree = BUILT_PRODUCTS_DIR; };
F60690131CA2766F0003FB26 /* libRealmReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRealmReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
F60690161CA2766F0003FB26 /* RealmReact.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RealmReact.h; sourceTree = "<group>"; };
F60690181CA2766F0003FB26 /* RealmReact.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RealmReact.mm; sourceTree = "<group>"; };
@@ -85,39 +81,18 @@
buildActionMask = 2147483647;
files = (
85CA5FE61F1536720038172D /* libRealmJS.a in Frameworks */,
5F1AAC93F04AC9E8BE7D14C8 /* libPods-RealmReact.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
1DF0F2F45FC0C4D870C2DBA7 /* Pods */ = {
isa = PBXGroup;
children = (
58168A50715950016E946BDC /* Pods-RealmReact.debug.xcconfig */,
8E22767C3537335E08B6F4B7 /* Pods-RealmReact.release.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
2C99C41E2321448ED2F4A8A9 /* Frameworks */ = {
isa = PBXGroup;
children = (
D7B24CBFE7BE8A12644DF9D2 /* libPods-RealmReact.a */,
);
name = Frameworks;
sourceTree = "<group>";
};
F606900A1CA2766F0003FB26 = {
isa = PBXGroup;
children = (
F60690221CA277BE0003FB26 /* Libraries */,
F60690151CA2766F0003FB26 /* RealmReact */,
F60690141CA2766F0003FB26 /* Products */,
1DF0F2F45FC0C4D870C2DBA7 /* Pods */,
2C99C41E2321448ED2F4A8A9 /* Frameworks */,
);
sourceTree = "<group>";
};
@@ -166,7 +141,6 @@
isa = PBXNativeTarget;
buildConfigurationList = F606901C1CA2766F0003FB26 /* Build configuration list for PBXNativeTarget "RealmReact" */;
buildPhases = (
9217260C310374596E34AE2F /* [CP] Check Pods Manifest.lock */,
F606900F1CA2766F0003FB26 /* Sources */,
F60690111CA2766F0003FB26 /* Copy Headers */,
85CA5FE41F1536660038172D /* Frameworks */,
@@ -244,31 +218,6 @@
};
/* End PBXReferenceProxy section */

/* Begin PBXShellScriptBuildPhase section */
9217260C310374596E34AE2F /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-RealmReact-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
F606900F1CA2766F0003FB26 /* Sources */ = {
isa = PBXSourcesBuildPhase;
@@ -415,7 +364,6 @@
};
F606901D1CA2766F0003FB26 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 58168A50715950016E946BDC /* Pods-RealmReact.debug.xcconfig */;
buildSettings = {
HEADER_SEARCH_PATHS = (
"$(inherited)",
@@ -438,7 +386,6 @@
};
F606901E1CA2766F0003FB26 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 8E22767C3537335E08B6F4B7 /* Pods-RealmReact.release.xcconfig */;
buildSettings = {
HEADER_SEARCH_PATHS = (
"$(inherited)",
38 changes: 27 additions & 11 deletions src/RealmJS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -56,6 +56,7 @@
5D25F5A11D6284FD00EBBB30 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = F63FF3301C16434400B3B8E0 /* libz.tbd */; };
832C1D2F229D3035001A20C1 /* async_open_task.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832C1D2E229D3035001A20C1 /* async_open_task.cpp */; };
8507156E1E2CFCD000E548DB /* object_notifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8507156B1E2CFC0100E548DB /* object_notifier.cpp */; };
A4DD71E524F3D1CA00B77603 /* scheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F50A4462447C09D003A6F4C /* scheduler.cpp */; };
F61378791C18EAC5008BFC51 /* js in Resources */ = {isa = PBXBuildFile; fileRef = F61378781C18EAAC008BFC51 /* js */; };
F63FF2C61C12469E00B3B8E0 /* jsc_init.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 029048011C0428DF00ABDED4 /* jsc_init.cpp */; };
F63FF2C91C12469E00B3B8E0 /* js_realm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 029048071C0428DF00ABDED4 /* js_realm.cpp */; };
@@ -903,6 +904,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
A4DD71E524F3D1CA00B77603 /* scheduler.cpp in Sources */,
42D9B5F52465185C00AB3349 /* app_credentials.cpp in Sources */,
42D9B5F72465185C00AB3349 /* app.cpp in Sources */,
42D9B5F82465185D00AB3349 /* generic_network_transport.cpp in Sources */,
@@ -1175,9 +1177,16 @@
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/object-store/external/json",
"$(SRCROOT)/object-store/src",
"$(SRCROOT)/../vendor",
"$(SRCROOT)/../vendor/realm-ios/include",
"$(SRCROOT)/../vendor/realm-ios/include/realm",
"$(SRCROOT)/../vendor/**",
"$(SRCROOT)/../vendor/realm-ios/include/**",
"$(SRCROOT)/../vendor/realm-ios/include/realm/**",
);
"HEADER_SEARCH_PATHS[arch=*]" = (
"$(SRCROOT)/object-store/external/json/**",
"$(SRCROOT)/object-store/src/**",
"$(SRCROOT)/../vendor/**",
"$(SRCROOT)/../vendor/realm-ios/include/**",
"$(SRCROOT)/../vendor/realm-ios/include/realm/**",
);
OTHER_CPLUSPLUSFLAGS = (
"$(inherited)",
@@ -1204,9 +1213,9 @@
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/object-store/external/json",
"$(SRCROOT)/object-store/src",
"$(SRCROOT)/../vendor",
"$(SRCROOT)/../vendor/realm-ios/include",
"$(SRCROOT)/../vendor/realm-ios/include/realm",
"$(SRCROOT)/../vendor/**",
"$(SRCROOT)/../vendor/realm-ios/include/**",
"$(SRCROOT)/../vendor/realm-ios/include/realm/**",
);
OTHER_CPLUSPLUSFLAGS = (
"$(inherited)",
@@ -1226,9 +1235,16 @@
buildSettings = {
DEBUG_INFORMATION_FORMAT = dwarf;
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/object-store/src/**",
"$(SRCROOT)/../vendor/**",
"$(SRCROOT)/../vendor/core/include/**",
);
"HEADER_SEARCH_PATHS[arch=*]" = (
blagoev marked this conversation as resolved.
Show resolved Hide resolved
"$(SRCROOT)/object-store/external/json",
"$(SRCROOT)/object-store/src",
"$(SRCROOT)/../vendor",
"$(SRCROOT)/../vendor/core/include",
"$(SRCROOT)/../vendor/**",
"$(SRCROOT)/../vendor/realm-ios/include/**",
"$(SRCROOT)/../vendor/realm-ios/include/realm/**",
);
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1240,9 +1256,9 @@
isa = XCBuildConfiguration;
buildSettings = {
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/object-store/src",
"$(SRCROOT)/../vendor",
"$(SRCROOT)/../vendor/core/include",
"$(SRCROOT)/object-store/src/**",
"$(SRCROOT)/../vendor/**",
"$(SRCROOT)/../vendor/core/include/**",
);
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
8 changes: 6 additions & 2 deletions tests/react-test-app/ios/ReactTests.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -404,6 +404,7 @@
baseConfigurationReference = 5D0E6A5E310181A4243DC976 /* Pods-RealmReactTests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
DEAD_CODE_STRIPPING = NO;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
@@ -438,6 +439,7 @@
baseConfigurationReference = 62CE006B73F93219175A513E /* Pods-RealmReactTests.release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = NO;
HEADER_SEARCH_PATHS = (
@@ -469,6 +471,7 @@
baseConfigurationReference = B4AD696A6981CCCB8562CA07 /* Pods-ReactTestApp.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
INFOPLIST_FILE = ReactTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -482,6 +485,7 @@
baseConfigurationReference = CEC170030BD878AC562D7038 /* Pods-ReactTestApp.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
INFOPLIST_FILE = ReactTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -495,7 +499,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CC = "$(SRCROOT)/../../../scripts/ccache-clang.sh";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
@@ -556,7 +560,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CC = "$(SRCROOT)/../../../scripts/ccache-clang.sh";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;