diff --git a/Jenkinsfile b/Jenkinsfile index 7f53f8280eb..59aaa0db17c 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -201,7 +201,7 @@ jobWrapper { ] if (releaseTesting) { extendedChecks = [ - checkMacOsDebug : doBuildMacOs(buildOptions + [buildType: "Release"]), + checkMacOsDebug : doBuildMacOs(buildOptions + [buildType: "Debug"]), checkAndroidarmeabiDebug : doAndroidBuildInDocker('armeabi-v7a', 'Debug', TestAction.Run), // FIXME: https://github.com/realm/realm-core/issues/4159 //checkAndroidx86Release : doAndroidBuildInDocker('x86', 'Release', TestAction.Run), @@ -606,8 +606,11 @@ def doBuildMacOs(Map options = [:]) { dir('build-macosx') { withEnv(['DEVELOPER_DIR=/Applications/Xcode-14.app/Contents/Developer/']) { - sh "cmake ${cmakeDefinitions} -G Xcode .." - + try { + sh "cmake ${cmakeDefinitions} -G Xcode .." + } catch(Exception e) { + archiveArtifacts '**/*' + } runAndCollectWarnings( parser: 'clang', script: "cmake --build . --config ${buildType} --target package -- ONLY_ACTIVE_ARCH=NO -destination generic/name=macOS -sdk macosx", diff --git a/test/object-store/benchmarks/CMakeLists.txt b/test/object-store/benchmarks/CMakeLists.txt index 75d330ebec4..d77f5f021b4 100644 --- a/test/object-store/benchmarks/CMakeLists.txt +++ b/test/object-store/benchmarks/CMakeLists.txt @@ -35,9 +35,8 @@ target_include_directories(object-store-benchmarks PRIVATE if(REALM_ENABLE_SYNC) target_link_libraries(object-store-benchmarks SyncServer) - enable_stdfilesystem(object-store-benchmarks) endif() - +enable_stdfilesystem(object-store-benchmarks) target_link_libraries(object-store-benchmarks ObjectStore TestUtil Catch2::Catch2) add_dependencies(benchmarks object-store-benchmarks)