facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-05 14:28:17 +03:00
Code Issues Projects Releases Wiki Activity

get oss windows build back to functioning

Browse Source 
Summary:
The external OSS build is broken because thrift has a really long path and
cargo/git on Windows do not lick such long paths.

I'm not fixing that. But the external OSS build is the only one we run in CI any
more. In the meantime the internal build has broken because no one has been
watching.

There were 4 different breakages.

Reviewed By: chadaustin

Differential Revision: D44189633

fbshipit-source-id: 2eedbc2b3bbf5d1def075d99f11f2273dbb1f4ab
This commit is contained in:
Katie Mancini 2023-03-29 12:52:44 -07:00 committed by Facebook GitHub Bot
parent 394ec081b3
commit ce0287d81c
4 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eden/fs/inodes/TreeInode.cpp
View File

@ -4180,7 +4180,7 @@ ImmediateFuture<uint64_t> TreeInode::invalidateChildrenNotMaterialized(
// When the mount is shutting down, let's make sure to terminate quickly so
// unmount is not blocked for a potential very long amount of time.
if (getMount()->getState() == EdenMount::State::SHUTTING_DOWN) {
return 0;
return (uint64_t)0;
}
return getLoadedOrRememberedTreeChildren(this, getInodeMap(), context)

2
eden/fs/service/EdenServer.cpp
View File

@ -2227,7 +2227,7 @@ ImmediateFuture<uint64_t> EdenServer::garbageCollectWorkingCopy(
if (!lease) {
XLOG(DBG6) << "Not running GC for: " << mount->getPath()
<< ", another GC is already in progress";
return 0;
return (uint64_t)0;
}
auto mountPath = mount->getPath();

7
eden/fs/telemetry/CMakeLists.txt
View File

@ -5,13 +5,6 @@
file(GLOB TELEMETRY_SRCS "*.cpp")
if (WIN32)
list(
REMOVE_ITEM TELEMETRY_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/ScubaStructuredLogger.cpp
${CMAKE_CURRENT_SOURCE_DIR}/SubprocessScribeLogger.cpp
)
endif()
add_library(
eden_telemetry STATIC

2
eden/integration/helpers/CMakeLists.txt
View File

@ -32,7 +32,7 @@ if(WIN32)
add_executable(check_windows_rename CheckWindowsRename.cpp)
target_link_libraries(
read_reparse_buffer
check_windows_rename
eden_utils
edencommon::edencommon_utils
fmt::fmt