From 89cad664be3fbd61bb5cf2b37187690849a12a92 Mon Sep 17 00:00:00 2001 From: Xavier Deguillard Date: Fri, 25 Jun 2021 10:21:08 -0700 Subject: [PATCH 0001/7387] oss: move CODE_OF_CONDUCT.md to the root Summary: This file needs to be at the root, not under watchman/ Reviewed By: kmancini Differential Revision: D29394728 fbshipit-source-id: d1be0d428b7bce7b31f95c044bc165473a837419 --- watchman/CODE_OF_CONDUCT.md => CODE_OF_CONDUCT.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename watchman/CODE_OF_CONDUCT.md => CODE_OF_CONDUCT.md (100%) diff --git a/watchman/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md similarity index 100% rename from watchman/CODE_OF_CONDUCT.md rename to CODE_OF_CONDUCT.md From eb1faa9656265f9d730898dad22989230c923f15 Mon Sep 17 00:00:00 2001 From: Xavier Deguillard Date: Fri, 25 Jun 2021 17:08:39 -0700 Subject: [PATCH 0002/7387] watchers: fix condition variable misuse Summary: Condition variables are terrible synchronization mechanism that are very easy to misuse. In these cases, another thread may have modified the shared variable while no waiters were waiting on the condition variable. What happens then is that once the condition variable is waited on, it will simply block, regardless of whether the condition was previous notified. The fix is trivial: we just need to check the condition expression before waiting on the condition variable. Reviewed By: chadaustin Differential Revision: D29406650 fbshipit-source-id: 29768b71b5f19e3b7616dd9281ae73ab425b37ea --- watchman/watcher/fsevents.cpp | 6 ++++++ watchman/watcher/kqueue_and_fsevents.cpp | 3 +++ watchman/watcher/win32.cpp | 3 +++ 3 files changed, 12 insertions(+) diff --git a/watchman/watcher/fsevents.cpp b/watchman/watcher/fsevents.cpp index 76d4164051b9..936c2f9b75fe 100644 --- a/watchman/watcher/fsevents.cpp +++ b/watchman/watcher/fsevents.cpp @@ -664,6 +664,12 @@ folly::SemiFuture FSEventsWatcher::flushPendingEvents() { bool FSEventsWatcher::waitNotify(int timeoutms) { auto wlock = items_.lock(); + // First check to see if someone added elements to these lists while the lock + // wasn't held. + if (!wlock->items.empty() || !wlock->syncs.empty()) { + // Yes, let's not wait on the condition. + return true; + } fse_cond.wait_for(wlock.as_lock(), std::chrono::milliseconds(timeoutms)); return !wlock->items.empty() || !wlock->syncs.empty(); } diff --git a/watchman/watcher/kqueue_and_fsevents.cpp b/watchman/watcher/kqueue_and_fsevents.cpp index 4f973173fbf1..a924adbb4112 100644 --- a/watchman/watcher/kqueue_and_fsevents.cpp +++ b/watchman/watcher/kqueue_and_fsevents.cpp @@ -45,6 +45,9 @@ class PendingEventsCond { if (lock->shouldStop) { return false; } + if (lock->hasPending) { + return true; + } cond_.wait_for(lock.as_lock(), std::chrono::milliseconds(timeoutms)); return lock->hasPending; } diff --git a/watchman/watcher/win32.cpp b/watchman/watcher/win32.cpp index 99f7b4706e22..36c2b133b1bf 100644 --- a/watchman/watcher/win32.cpp +++ b/watchman/watcher/win32.cpp @@ -391,6 +391,9 @@ Watcher::ConsumeNotifyRet WinWatcher::consumeNotify( bool WinWatcher::waitNotify(int timeoutms) { auto wlock = changedItems.lock(); + if (!wlock->empty()) { + return true; + } cond.wait_for(wlock.as_lock(), std::chrono::milliseconds(timeoutms)); return !wlock->empty(); } From f9da32e3fedc47e88fe701a9e0f81ab0b8f6d687 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Fri, 25 Jun 2021 18:46:44 -0700 Subject: [PATCH 0003/7387] add debug-watcher-info-clear command Summary: When debugging Watchman event sequences, it's nice to flush events prior to a point in time. Add a debug-watcher-info-clear command that flushes any accumulated events for each watcher. Reviewed By: xavierd Differential Revision: D29346458 fbshipit-source-id: 4522e982ca5aa2211fbb1253073eb597b8da4410 --- watchman/InMemoryView.cpp | 40 +++++++++++------------- watchman/InMemoryView.h | 11 ++++--- watchman/QueryableView.h | 1 + watchman/RingBuffer.h | 51 +++++++++++++++++++++++++++++++ watchman/cmds/debug.cpp | 18 ++++++++++- watchman/tests/RingBufferTest.cpp | 39 +++++++++++++++++++++++ watchman/watcher/auto.cpp | 6 ---- watchman/watcher/eden.cpp | 4 ++- watchman/watcher/fsevents.cpp | 30 ++++++++---------- watchman/watcher/fsevents.h | 5 +-- watchman/watcher/inotify.cpp | 49 +++++++++++++---------------- watchman/watchman_watcher.h | 11 +++++-- 12 files changed, 181 insertions(+), 84 deletions(-) create mode 100644 watchman/RingBuffer.h create mode 100644 watchman/tests/RingBufferTest.cpp diff --git a/watchman/InMemoryView.cpp b/watchman/InMemoryView.cpp index c1d32e51f5a4..6962a386ed20 100644 --- a/watchman/InMemoryView.cpp +++ b/watchman/InMemoryView.cpp @@ -454,9 +454,8 @@ InMemoryView::InMemoryView( json_int_t in_memory_view_ring_log_size = config_.getInt("in_memory_view_ring_log_size", 0); if (in_memory_view_ring_log_size) { - this->processedPaths_ = - std::make_unique>( - in_memory_view_ring_log_size); + this->processedPaths_ = std::make_unique>( + in_memory_view_ring_log_size); } } @@ -781,33 +780,30 @@ json_ref InMemoryView::getWatcherDebugInfo() const { }); } +void InMemoryView::clearWatcherDebugInfo() { + watcher_->clearDebugInfo(); + clearViewDebugInfo(); +} + json_ref InMemoryView::getViewDebugInfo() const { - auto processedPaths = json_null(); + auto processedPathsResult = json_null(); if (processedPaths_) { - std::vector entries; - - auto head = processedPaths_->currentHead(); - if (head.moveBackward()) { - PendingChangeLogEntry entry; - while (processedPaths_->tryRead(entry, head)) { - entries.push_back(std::move(entry)); - if (!head.moveBackward()) { - break; - } - } - } - std::reverse(entries.begin(), entries.end()); - - processedPaths = json_array(); - for (auto& entry : entries) { - json_array_append(processedPaths, entry.asJsonValue()); + processedPathsResult = json_array(); + for (auto& entry : processedPaths_->readAll()) { + json_array_append(processedPathsResult, entry.asJsonValue()); } } return json_object({ - {"processed_paths", processedPaths}, + {"processed_paths", processedPathsResult}, }); } +void InMemoryView::clearViewDebugInfo() { + if (processedPaths_) { + processedPaths_->clear(); + } +} + SCM* InMemoryView::getSCM() const { return scm_.get(); } diff --git a/watchman/InMemoryView.h b/watchman/InMemoryView.h index 47a7fbfb9bf7..6ad182da8835 100644 --- a/watchman/InMemoryView.h +++ b/watchman/InMemoryView.h @@ -2,7 +2,6 @@ * Licensed under the Apache License, Version 2.0 */ #pragma once #include -#include #include #include #include @@ -12,6 +11,7 @@ #include "PendingCollection.h" #include "QueryableView.h" #include "SymlinkTargets.h" +#include "watchman/RingBuffer.h" #include "watchman/WatchmanConfig.h" #include "watchman/watchman_perf.h" #include "watchman/watchman_string.h" @@ -36,7 +36,7 @@ struct InMemoryViewCaches { std::chrono::milliseconds errorTTL); }; -class InMemoryFileResult : public FileResult { +class InMemoryFileResult final : public FileResult { public: InMemoryFileResult(const watchman_file* file, InMemoryViewCaches& caches); folly::Optional stat() override; @@ -134,7 +134,7 @@ class ViewDatabase { * Keeps track of the state of the filesystem in-memory and drives a notify * thread which consumes events from the watcher. */ -class InMemoryView : public QueryableView { +class InMemoryView final : public QueryableView { public: InMemoryView(watchman_root* root, std::shared_ptr watcher); ~InMemoryView() override; @@ -182,7 +182,9 @@ class InMemoryView : public QueryableView { const w_string& getName() const override; const std::shared_ptr& getWatcher() const; json_ref getWatcherDebugInfo() const override; + void clearWatcherDebugInfo() override; json_ref getViewDebugInfo() const; + void clearViewDebugInfo(); // If content cache warming is configured, do the warm up now void warmContentCache(); @@ -369,8 +371,7 @@ class InMemoryView : public QueryableView { static_assert(88 == sizeof(PendingChangeLogEntry)); // If set, paths processed by processPending are logged here. - std::unique_ptr> - processedPaths_; + std::unique_ptr> processedPaths_; }; } // namespace watchman diff --git a/watchman/QueryableView.h b/watchman/QueryableView.h index c3eae98f8cbe..54788c1bb2d0 100644 --- a/watchman/QueryableView.h +++ b/watchman/QueryableView.h @@ -68,6 +68,7 @@ class QueryableView : public std::enable_shared_from_this { virtual const w_string& getName() const = 0; virtual json_ref getWatcherDebugInfo() const = 0; + virtual void clearWatcherDebugInfo() = 0; virtual std::shared_future waitUntilReadyToQuery( const std::shared_ptr& root) = 0; diff --git a/watchman/RingBuffer.h b/watchman/RingBuffer.h new file mode 100644 index 000000000000..e05d1f7f836f --- /dev/null +++ b/watchman/RingBuffer.h @@ -0,0 +1,51 @@ +/* Copyright 2017-present Facebook, Inc. + * Licensed under the Apache License, Version 2.0 */ +#pragma once + +#include + +namespace watchman { + +/** + * Fixed-size, lock-free ring buffer. Used for low-latency event logging. + */ +template +class RingBuffer { + public: + explicit RingBuffer(uint32_t capacity) + : ring_{capacity}, lastClear_{ring_.currentHead()} {} + + void clear() { + lastClear_.store(ring_.currentHead(), std::memory_order_release); + } + + void write(const T& entry) { + ring_.write(entry); + } + + std::vector readAll() const { + auto lastClear = lastClear_.load(std::memory_order_acquire); + + std::vector entries; + + auto head = ring_.currentHead(); + T entry; + while (head.moveBackward() && head >= lastClear && + ring_.tryRead(entry, head)) { + entries.push_back(std::move(entry)); + } + std::reverse(entries.begin(), entries.end()); + return entries; + } + + private: + RingBuffer(RingBuffer&&) = delete; + RingBuffer(const RingBuffer&) = delete; + RingBuffer& operator=(RingBuffer&&) = delete; + RingBuffer& operator=(const RingBuffer&) = delete; + + folly::LockFreeRingBuffer ring_; + std::atomic::Cursor> lastClear_; +}; + +} // namespace watchman diff --git a/watchman/cmds/debug.cpp b/watchman/cmds/debug.cpp index 9fa83ffb5d12..fb571fb3b5ac 100644 --- a/watchman/cmds/debug.cpp +++ b/watchman/cmds/debug.cpp @@ -258,7 +258,7 @@ W_CMD_REG( static void cmd_debug_watcher_info( struct watchman_client* clientbase, const json_ref& args) { - auto client = (watchman_user_client*)clientbase; + auto* client = static_cast(clientbase); auto root = resolveRoot(client, args); auto response = make_response(); @@ -267,5 +267,21 @@ static void cmd_debug_watcher_info( } W_CMD_REG("debug-watcher-info", cmd_debug_watcher_info, CMD_DAEMON, NULL) +static void cmd_debug_watcher_info_clear( + struct watchman_client* clientbase, + const json_ref& args) { + auto* client = static_cast(clientbase); + + auto root = resolveRoot(client, args); + auto response = make_response(); + root->view()->clearWatcherDebugInfo(); + send_and_dispose_response(client, std::move(response)); +} +W_CMD_REG( + "debug-watcher-info-clear", + cmd_debug_watcher_info_clear, + CMD_DAEMON, + NULL) + /* vim:ts=2:sw=2:et: */ diff --git a/watchman/tests/RingBufferTest.cpp b/watchman/tests/RingBufferTest.cpp new file mode 100644 index 000000000000..c0e5853ca2eb --- /dev/null +++ b/watchman/tests/RingBufferTest.cpp @@ -0,0 +1,39 @@ +/* Copyright 2017-present Facebook, Inc. + * Licensed under the Apache License, Version 2.0 */ + +#include + +#include "watchman/RingBuffer.h" + +using namespace watchman; +using namespace ::testing; + +TEST(RingBufferTest, writes_can_be_read) { + RingBuffer rb{2}; + rb.write(10); + rb.write(11); + auto result = rb.readAll(); + EXPECT_EQ(2, result.size()); + EXPECT_EQ(10, result[0]); + EXPECT_EQ(11, result[1]); + + rb.write(12); + result = rb.readAll(); + EXPECT_EQ(11, result[0]); + EXPECT_EQ(12, result[1]); +} + +TEST(RingBufferTest, writes_can_be_cleared) { + RingBuffer rb{10}; + rb.write(3); + rb.write(4); + auto result = rb.readAll(); + EXPECT_EQ(2, result.size()); + EXPECT_EQ(3, result[0]); + EXPECT_EQ(4, result[1]); + rb.clear(); + rb.write(5); + result = rb.readAll(); + EXPECT_EQ(1, result.size()); + EXPECT_EQ(5, result[0]); +} diff --git a/watchman/watcher/auto.cpp b/watchman/watcher/auto.cpp index f511d8d994c3..56d670307f23 100644 --- a/watchman/watcher/auto.cpp +++ b/watchman/watcher/auto.cpp @@ -149,11 +149,5 @@ bool Watcher::start(const std::shared_ptr&) { return true; } -void Watcher::signalThreads() {} - -json_ref Watcher::getDebugInfo() { - return json_null(); -} - /* vim:ts=2:sw=2:et: */ diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index ee8c1d3890c3..7cc2749e9f15 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -698,7 +698,7 @@ std::vector globNameAndDType( } } -class EdenView : public QueryableView { +class EdenView final : public QueryableView { w_string root_path_; // The source control system that we detected during initialization mutable std::unique_ptr scm_; @@ -1113,6 +1113,8 @@ class EdenView : public QueryableView { return json_null(); } + void clearWatcherDebugInfo() override {} + // Called by the subscriberThread to scan for cookie file creation // events. These are used to manage sequencing for state-enter and // state-leave in eden. diff --git a/watchman/watcher/fsevents.cpp b/watchman/watcher/fsevents.cpp index 936c2f9b75fe..0888fc0e176b 100644 --- a/watchman/watcher/fsevents.cpp +++ b/watchman/watcher/fsevents.cpp @@ -566,8 +566,8 @@ FSEventsWatcher::FSEventsWatcher( json_int_t fsevents_ring_log_size = root->config.getInt("fsevents_ring_log_size", 0); if (fsevents_ring_log_size) { - ringBuffer_ = std::make_unique>( - fsevents_ring_log_size); + ringBuffer_ = + std::make_unique>(fsevents_ring_log_size); } } @@ -799,22 +799,8 @@ std::unique_ptr FSEventsWatcher::startWatchDir( json_ref FSEventsWatcher::getDebugInfo() { json_ref events = json_null(); if (ringBuffer_) { - std::vector entries; - - auto head = ringBuffer_->currentHead(); - if (head.moveBackward()) { - FSEventsLogEntry entry; - while (ringBuffer_->tryRead(entry, head)) { - entries.push_back(std::move(entry)); - if (!head.moveBackward()) { - break; - } - } - } - std::reverse(entries.begin(), entries.end()); - events = json_array(); - for (auto& entry : entries) { + for (auto& entry : ringBuffer_->readAll()) { json_array_append(events, entry.asJsonValue()); } } @@ -824,6 +810,16 @@ json_ref FSEventsWatcher::getDebugInfo() { }); } +void FSEventsWatcher::clearDebugInfo() { + // This is just debug info so small races are not problematic. To avoid races, + // totalEventsSeen_ could be stored directly if ringBuffer_ is null, or as the + // difference between currentHead() - lastClear_ if not null. + totalEventsSeen_.store(0, std::memory_order_release); + if (ringBuffer_) { + ringBuffer_->clear(); + } +} + static RegisterWatcher reg("fsevents"); // A helper command to facilitate testing that we can successfully diff --git a/watchman/watcher/fsevents.h b/watchman/watcher/fsevents.h index b286a512b1ac..c5ccf81f430e 100644 --- a/watchman/watcher/fsevents.h +++ b/watchman/watcher/fsevents.h @@ -1,8 +1,8 @@ /* Copyright 2012-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ -#include #include +#include "watchman/RingBuffer.h" #include "watchman/watchman.h" #if HAVE_FSEVENTS @@ -45,7 +45,7 @@ struct FSEventsWatcher : public Watcher { * If not null, holds a fixed-size ring of the last `fsevents_ring_log_size` * FSEvents events. */ - std::unique_ptr> ringBuffer_; + std::unique_ptr> ringBuffer_; explicit FSEventsWatcher( bool hasFileWatching, @@ -74,6 +74,7 @@ struct FSEventsWatcher : public Watcher { void FSEventsThread(const std::shared_ptr& root); json_ref getDebugInfo() override; + void clearDebugInfo() override; }; } // namespace watchman diff --git a/watchman/watcher/inotify.cpp b/watchman/watcher/inotify.cpp index dea83c60d036..cd1da6f70212 100644 --- a/watchman/watcher/inotify.cpp +++ b/watchman/watcher/inotify.cpp @@ -3,11 +3,11 @@ #include #include -#include #include #include "watchman/FileDescriptor.h" #include "watchman/InMemoryView.h" #include "watchman/Pipe.h" +#include "watchman/RingBuffer.h" #include "watchman/watchman.h" #include "watchman/watchman_error_category.h" @@ -123,17 +123,12 @@ struct InotifyWatcher : public Watcher { * If not null, holds a fixed-size ring of the last `inotify_ring_log_size` * inotify events. */ - std::unique_ptr> ringBuffer_; - - /** - * Incremented by consumeNotify, which only runs on one thread. - */ - uint64_t totalEventsSeen_ = 0; + std::unique_ptr> ringBuffer_; /** * Published from consumeNotify so getDebugInfo can read a recent value. */ - std::atomic totalEventsSeenAtomic_ = 0; + std::atomic totalEventsSeen_ = 0; struct maps { /* map of active watch descriptor to name of the corresponding dir */ @@ -174,6 +169,7 @@ struct InotifyWatcher : public Watcher { void signalThreads() override; json_ref getDebugInfo() override; + void clearDebugInfo() override; }; InotifyWatcher::InotifyWatcher(watchman_root* root) @@ -198,8 +194,8 @@ InotifyWatcher::InotifyWatcher(watchman_root* root) json_int_t inotify_ring_log_size = root->config.getInt("inotify_ring_log_size", 0); if (inotify_ring_log_size) { - ringBuffer_ = std::make_unique>( - inotify_ring_log_size); + ringBuffer_ = + std::make_unique>(inotify_ring_log_size); } } @@ -413,15 +409,16 @@ Watcher::ConsumeNotifyRet InotifyWatcher::consumeNotify( struct inotify_event* ine; bool cancel = false; + size_t eventsSeen = 0; for (char* iptr = ibuf; iptr < ibuf + n; iptr += sizeof(*ine) + ine->len) { ine = (struct inotify_event*)iptr; cancel |= process_inotify_event(root, coll, ine, now); - ++totalEventsSeen_; + ++eventsSeen; } // Relaxed because we don't really care exactly when the value is visible. - totalEventsSeenAtomic_.store(totalEventsSeen_, std::memory_order_relaxed); + totalEventsSeen_.fetch_add(eventsSeen, std::memory_order_relaxed); // It is possible that we can accumulate a set of pending_move // structs in move_map. This happens when a directory is moved @@ -478,31 +475,27 @@ void InotifyWatcher::signalThreads() { json_ref InotifyWatcher::getDebugInfo() { json_ref events = json_null(); if (ringBuffer_) { - std::vector entries; - - auto head = ringBuffer_->currentHead(); - if (head.moveBackward()) { - InotifyLogEntry entry; - while (ringBuffer_->tryRead(entry, head)) { - entries.push_back(std::move(entry)); - if (!head.moveBackward()) { - break; - } - } - } - std::reverse(entries.begin(), entries.end()); - events = json_array(); - for (auto& entry : entries) { + for (auto& entry : ringBuffer_->readAll()) { json_array_append(events, entry.asJsonValue()); } } return json_object({ {"events", events}, - {"total_event_count", json_integer(totalEventsSeenAtomic_.load())}, + {"total_event_count", json_integer(totalEventsSeen_.load())}, }); } +void InotifyWatcher::clearDebugInfo() { + // This is just debug info so small races are not problematic. To avoid races, + // totalEventsSeen_ could be stored directly if ringBuffer_ is null, or as the + // difference between currentHead() - lastClear_ if not null. + totalEventsSeen_.store(0, std::memory_order_release); + if (ringBuffer_) { + ringBuffer_->clear(); + } +} + namespace { std::shared_ptr detectInotify(watchman_root* root) { if (is_edenfs_fs_type(root->fs_type)) { diff --git a/watchman/watchman_watcher.h b/watchman/watchman_watcher.h index 1a96ba448e88..989cae4676f9 100644 --- a/watchman/watchman_watcher.h +++ b/watchman/watchman_watcher.h @@ -74,7 +74,7 @@ class Watcher : public std::enable_shared_from_this { const char* path) = 0; // Signal any threads to terminate. Do not join them here. - virtual void signalThreads(); + virtual void signalThreads() {} struct ConsumeNotifyRet { // Were events added to the collection? @@ -104,7 +104,14 @@ class Watcher : public std::enable_shared_from_this { * Returns a JSON value containing this watcher's debug state. Intended for * inclusion in diagnostics. */ - virtual json_ref getDebugInfo(); + virtual json_ref getDebugInfo() { + return json_null(); + } + + /** + * Clear any accumulated debug state. + */ + virtual void clearDebugInfo() {} }; /** Maintains the list of available watchers. From 7c4bbd66d0113c1f776cf5a792e1c067d5abcba1 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Fri, 25 Jun 2021 18:46:44 -0700 Subject: [PATCH 0004/7387] watchman_watcher/auto -> Watcher/WatcherRegistry Summary: Bring the Watcher and WatcherRegistry classes closer to our modern file structure. Reviewed By: xavierd Differential Revision: D29349832 fbshipit-source-id: 572ed6a9278d3f150c345180614eba2601c676ab --- CMakeLists.txt | 3 +- watchman/CookieSync.h | 2 + watchman/InMemoryView.cpp | 1 + watchman/InMemoryView.h | 3 +- watchman/root/crawler.cpp | 1 + watchman/root/init.cpp | 1 + watchman/root/iothread.cpp | 1 + watchman/root/notifythread.cpp | 1 + watchman/root/stat.cpp | 1 + watchman/root/sync.cpp | 1 + watchman/watcher/Watcher.cpp | 19 +++++ .../{watchman_watcher.h => watcher/Watcher.h} | 64 +++-------------- .../watcher/{auto.cpp => WatcherRegistry.cpp} | 18 ++--- watchman/watcher/WatcherRegistry.h | 72 +++++++++++++++++++ watchman/watcher/eden.cpp | 2 + watchman/watcher/fsevents.cpp | 1 + watchman/watcher/fsevents.h | 1 + watchman/watcher/inotify.cpp | 2 + watchman/watcher/kqueue.cpp | 2 + watchman/watcher/kqueue.h | 1 + watchman/watcher/kqueue_and_fsevents.cpp | 1 + watchman/watcher/win32.cpp | 2 + watchman/watchman.h | 1 - watchman/watchman_root.h | 4 ++ 24 files changed, 134 insertions(+), 71 deletions(-) create mode 100644 watchman/watcher/Watcher.cpp rename watchman/{watchman_watcher.h => watcher/Watcher.h} (63%) rename watchman/watcher/{auto.cpp => WatcherRegistry.cpp} (93%) create mode 100644 watchman/watcher/WatcherRegistry.h diff --git a/CMakeLists.txt b/CMakeLists.txt index ae95aa049f86..93a2f77ad683 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -689,7 +689,8 @@ watchman/saved_state/LocalSavedStateInterface.cpp watchman/saved_state/SavedStateInterface.cpp watchman/scm/Mercurial.cpp watchman/scm/SCM.cpp -watchman/watcher/auto.cpp +watchman/watcher/Watcher.cpp +watchman/watcher/WatcherRegistry.cpp watchman/watcher/fsevents.cpp watchman/watcher/inotify.cpp watchman/watcher/kqueue.cpp diff --git a/watchman/CookieSync.h b/watchman/CookieSync.h index b14383704feb..58f9cbbe6dcb 100644 --- a/watchman/CookieSync.h +++ b/watchman/CookieSync.h @@ -3,6 +3,8 @@ #pragma once #include #include +#include "watchman/watchman_string.h" + #define WATCHMAN_COOKIE_PREFIX ".watchman-cookie-" namespace watchman { diff --git a/watchman/InMemoryView.cpp b/watchman/InMemoryView.cpp index 6962a386ed20..2b48a9023929 100644 --- a/watchman/InMemoryView.cpp +++ b/watchman/InMemoryView.cpp @@ -8,6 +8,7 @@ #include #include "watchman/ThreadPool.h" #include "watchman/scm/SCM.h" +#include "watchman/watcher/Watcher.h" #include "watchman/watchman.h" using folly::Optional; diff --git a/watchman/InMemoryView.h b/watchman/InMemoryView.h index 6ad182da8835..ea8f5f1a73e0 100644 --- a/watchman/InMemoryView.h +++ b/watchman/InMemoryView.h @@ -19,11 +19,12 @@ #include "watchman_opendir.h" #include "watchman_query.h" -class Watcher; struct watchman_client; namespace watchman { +class Watcher; + // Helper struct to hold caches used by the InMemoryView struct InMemoryViewCaches { ContentHashCache contentHashCache; diff --git a/watchman/root/crawler.cpp b/watchman/root/crawler.cpp index 82a75bc1aa09..c19f06a5d773 100644 --- a/watchman/root/crawler.cpp +++ b/watchman/root/crawler.cpp @@ -2,6 +2,7 @@ * Licensed under the Apache License, Version 2.0 */ #include "watchman/InMemoryView.h" +#include "watchman/watcher/Watcher.h" #include "watchman/watchman.h" #include "watchman/watchman_error_category.h" #include "watchman/watchman_system.h" diff --git a/watchman/root/init.cpp b/watchman/root/init.cpp index b39f6aad3ada..bbb729ab146d 100644 --- a/watchman/root/init.cpp +++ b/watchman/root/init.cpp @@ -5,6 +5,7 @@ #include #include "watchman/InMemoryView.h" +#include "watchman/watcher/WatcherRegistry.h" using namespace watchman; diff --git a/watchman/root/iothread.cpp b/watchman/root/iothread.cpp index aaf628692357..af2586ccb7b6 100644 --- a/watchman/root/iothread.cpp +++ b/watchman/root/iothread.cpp @@ -3,6 +3,7 @@ #include #include "watchman/InMemoryView.h" +#include "watchman/watcher/Watcher.h" #include "watchman/watchman.h" namespace watchman { diff --git a/watchman/root/notifythread.cpp b/watchman/root/notifythread.cpp index 6defdfbd84b8..c6a0901f07a3 100644 --- a/watchman/root/notifythread.cpp +++ b/watchman/root/notifythread.cpp @@ -2,6 +2,7 @@ * Licensed under the Apache License, Version 2.0 */ #include "watchman/InMemoryView.h" +#include "watchman/watcher/Watcher.h" #include "watchman/watchman.h" namespace watchman { diff --git a/watchman/root/stat.cpp b/watchman/root/stat.cpp index 2a5a2cd33312..586ae3a02146 100644 --- a/watchman/root/stat.cpp +++ b/watchman/root/stat.cpp @@ -2,6 +2,7 @@ * Licensed under the Apache License, Version 2.0 */ #include "watchman/InMemoryView.h" +#include "watchman/watcher/Watcher.h" #include "watchman/watchman.h" #include "watchman/watchman_error_category.h" diff --git a/watchman/root/sync.cpp b/watchman/root/sync.cpp index 6c700c2c123a..c0cf2570389d 100644 --- a/watchman/root/sync.cpp +++ b/watchman/root/sync.cpp @@ -2,6 +2,7 @@ * Licensed under the Apache License, Version 2.0 */ #include "watchman/InMemoryView.h" +#include "watchman/watcher/Watcher.h" #include "watchman/watchman.h" #include "watchman/watchman_error_category.h" diff --git a/watchman/watcher/Watcher.cpp b/watchman/watcher/Watcher.cpp new file mode 100644 index 000000000000..430e21c1a1bd --- /dev/null +++ b/watchman/watcher/Watcher.cpp @@ -0,0 +1,19 @@ +/* Copyright 2012-present Facebook, Inc. + * Licensed under the Apache License, Version 2.0 */ +#include "watchman/watcher/Watcher.h" + +namespace watchman { + +Watcher::Watcher(const char* name, unsigned flags) : name(name), flags(flags) {} + +Watcher::~Watcher() {} + +bool Watcher::startWatchFile(watchman_file*) { + return true; +} + +bool Watcher::start(const std::shared_ptr&) { + return true; +} + +} // namespace watchman diff --git a/watchman/watchman_watcher.h b/watchman/watcher/Watcher.h similarity index 63% rename from watchman/watchman_watcher.h rename to watchman/watcher/Watcher.h index 989cae4676f9..2cd20b6093dc 100644 --- a/watchman/watchman_watcher.h +++ b/watchman/watcher/Watcher.h @@ -3,17 +3,21 @@ #pragma once #include #include -#include "PendingCollection.h" -#include "watchman_opendir.h" +#include "watchman/PendingCollection.h" +#include "watchman/thirdparty/jansson/jansson.h" +#include "watchman/watchman_opendir.h" + +struct watchman_file; +struct watchman_root; namespace watchman { + class QueryableView; class InMemoryView; class TerminalWatcherError : public std::runtime_error { public: using std::runtime_error::runtime_error; }; -} // namespace watchman class Watcher : public std::enable_shared_from_this { public: @@ -64,7 +68,7 @@ class Watcher : public std::enable_shared_from_this { } // Initiate an OS-level watch on the provided file - virtual bool startWatchFile(struct watchman_file* file); + virtual bool startWatchFile(watchman_file* file); // Initiate an OS-level watch on the provided dir, return a DIR // handle, or NULL on error @@ -114,54 +118,4 @@ class Watcher : public std::enable_shared_from_this { virtual void clearDebugInfo() {} }; -/** Maintains the list of available watchers. - * This is fundamentally a map of name -> factory function. - * Some watchers (kqueue, inotify) are available on multiple operating - * systems: kqueue on OSX and *BSD, inotify on Linux and Solaris. - * There are cases where a given watcher is not the preferred mechanism - * (eg: inotify is implemented in terms of portfs on Solaris, so we - * prefer to target the portfs layer directly), so we have a concept - * of priority associated with the watcher. - * Larger numbers are higher priority and will be favored when performing - * auto-detection. - **/ -class WatcherRegistry { - public: - WatcherRegistry( - const std::string& name, - std::function(watchman_root*)> - init, - int priority = 0); - - /** Locate the appropriate watcher for root and initialize it */ - static std::shared_ptr initWatcher( - watchman_root* root); - - const std::string& getName() const { - return name_; - } - - private: - std::string name_; - std::function(watchman_root*)> init_; - int pri_; - - static std::unordered_map& getRegistry(); - static void registerFactory(const WatcherRegistry& factory); - static const WatcherRegistry* getWatcherByName(const std::string& name); -}; - -/** This template makes it less verbose for the common case of defining - * a name -> class mapping in the registry. */ -template -class RegisterWatcher : public WatcherRegistry { - public: - explicit RegisterWatcher(const std::string& name, int priority = 0) - : WatcherRegistry( - name, - [](watchman_root* root) { - return std::make_shared( - root, std::make_shared(root)); - }, - priority) {} -}; +} // namespace watchman diff --git a/watchman/watcher/auto.cpp b/watchman/watcher/WatcherRegistry.cpp similarity index 93% rename from watchman/watcher/auto.cpp rename to watchman/watcher/WatcherRegistry.cpp index 56d670307f23..210c73afe211 100644 --- a/watchman/watcher/auto.cpp +++ b/watchman/watcher/WatcherRegistry.cpp @@ -1,6 +1,10 @@ /* Copyright 2012-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ -#include "watchman/watchman.h" +#include "watchman/watcher/WatcherRegistry.h" +#include +#include "watchman/CommandRegistry.h" +#include "watchman/watcher/Watcher.h" +#include "watchman/watchman_root.h" using namespace watchman; @@ -137,17 +141,5 @@ std::shared_ptr WatcherRegistry::initWatcher( throw std::runtime_error(failureReasons); } -Watcher::Watcher(const char* name, unsigned flags) : name(name), flags(flags) {} - -Watcher::~Watcher() {} - -bool Watcher::startWatchFile(struct watchman_file*) { - return true; -} - -bool Watcher::start(const std::shared_ptr&) { - return true; -} - /* vim:ts=2:sw=2:et: */ diff --git a/watchman/watcher/WatcherRegistry.h b/watchman/watcher/WatcherRegistry.h new file mode 100644 index 000000000000..09ace470658e --- /dev/null +++ b/watchman/watcher/WatcherRegistry.h @@ -0,0 +1,72 @@ +/* Copyright 2012-present Facebook, Inc. + * Licensed under the Apache License, Version 2.0 */ +#pragma once + +#include +#include +#include +#include + +struct watchman_root; + +namespace watchman { + +class InMemoryView; +class QueryableView; + +/** + * Maintains the list of available watchers. + * This is fundamentally a map of name -> factory function. + * Some watchers (kqueue, inotify) are available on multiple operating + * systems: kqueue on OSX and *BSD, inotify on Linux and Solaris. + * There are cases where a given watcher is not the preferred mechanism + * (eg: inotify is implemented in terms of portfs on Solaris, so we + * prefer to target the portfs layer directly), so we have a concept + * of priority associated with the watcher. + * Larger numbers are higher priority and will be favored when performing + * auto-detection. + **/ +class WatcherRegistry { + public: + WatcherRegistry( + const std::string& name, + std::function(watchman_root*)> + init, + int priority = 0); + + /** Locate the appropriate watcher for root and initialize it */ + static std::shared_ptr initWatcher( + watchman_root* root); + + const std::string& getName() const { + return name_; + } + + private: + std::string name_; + std::function(watchman_root*)> init_; + int pri_; + + static std::unordered_map& getRegistry(); + static void registerFactory(const WatcherRegistry& factory); + static const WatcherRegistry* getWatcherByName(const std::string& name); +}; + +/** + * This template makes it less verbose for the common case of defining + * a name -> class mapping in the registry. + */ +template +class RegisterWatcher : public WatcherRegistry { + public: + explicit RegisterWatcher(const std::string& name, int priority = 0) + : WatcherRegistry( + name, + [](watchman_root* root) { + return std::make_shared( + root, std::make_shared(root)); + }, + priority) {} +}; + +} // namespace watchman diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index 7cc2749e9f15..fb52c1b00eb6 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -20,6 +20,8 @@ #include "watchman/ThreadPool.h" #include "watchman/scm/SCM.h" #include "watchman/thirdparty/wildmatch/wildmatch.h" +#include "watchman/watcher/Watcher.h" +#include "watchman/watcher/WatcherRegistry.h" #include "watchman/watchman.h" #include "watchman/watchman_error_category.h" diff --git a/watchman/watcher/fsevents.cpp b/watchman/watcher/fsevents.cpp index 0888fc0e176b..bffc78a9e38e 100644 --- a/watchman/watcher/fsevents.cpp +++ b/watchman/watcher/fsevents.cpp @@ -11,6 +11,7 @@ #include "watchman/InMemoryView.h" #include "watchman/LogConfig.h" #include "watchman/Pipe.h" +#include "watchman/watcher/WatcherRegistry.h" #include "watchman/watchman.h" #if HAVE_FSEVENTS diff --git a/watchman/watcher/fsevents.h b/watchman/watcher/fsevents.h index c5ccf81f430e..c35e29153a06 100644 --- a/watchman/watcher/fsevents.h +++ b/watchman/watcher/fsevents.h @@ -3,6 +3,7 @@ #include #include "watchman/RingBuffer.h" +#include "watchman/watcher/Watcher.h" #include "watchman/watchman.h" #if HAVE_FSEVENTS diff --git a/watchman/watcher/inotify.cpp b/watchman/watcher/inotify.cpp index cd1da6f70212..7a398dc57eb0 100644 --- a/watchman/watcher/inotify.cpp +++ b/watchman/watcher/inotify.cpp @@ -8,6 +8,8 @@ #include "watchman/InMemoryView.h" #include "watchman/Pipe.h" #include "watchman/RingBuffer.h" +#include "watchman/watcher/Watcher.h" +#include "watchman/watcher/WatcherRegistry.h" #include "watchman/watchman.h" #include "watchman/watchman_error_category.h" diff --git a/watchman/watcher/kqueue.cpp b/watchman/watcher/kqueue.cpp index 83e7d11d726d..30636838ca3a 100644 --- a/watchman/watcher/kqueue.cpp +++ b/watchman/watcher/kqueue.cpp @@ -8,6 +8,8 @@ #include "watchman/FileDescriptor.h" #include "watchman/InMemoryView.h" #include "watchman/Pipe.h" +#include "watchman/watcher/Watcher.h" +#include "watchman/watcher/WatcherRegistry.h" #include "watchman/watchman.h" #ifdef HAVE_KQUEUE diff --git a/watchman/watcher/kqueue.h b/watchman/watcher/kqueue.h index 0cf9fe2ddd1f..61accc1bed5d 100644 --- a/watchman/watcher/kqueue.h +++ b/watchman/watcher/kqueue.h @@ -3,6 +3,7 @@ #include "watchman/FileDescriptor.h" #include "watchman/Pipe.h" +#include "watchman/watcher/Watcher.h" #include "watchman/watchman.h" #ifdef HAVE_KQUEUE diff --git a/watchman/watcher/kqueue_and_fsevents.cpp b/watchman/watcher/kqueue_and_fsevents.cpp index a924adbb4112..1fef05b508b0 100644 --- a/watchman/watcher/kqueue_and_fsevents.cpp +++ b/watchman/watcher/kqueue_and_fsevents.cpp @@ -7,6 +7,7 @@ #include "fsevents.h" #include "kqueue.h" #include "watchman/InMemoryView.h" +#include "watchman/watcher/WatcherRegistry.h" #include "watchman/watchman.h" #if HAVE_FSEVENTS && defined(HAVE_KQUEUE) diff --git a/watchman/watcher/win32.cpp b/watchman/watcher/win32.cpp index 36c2b133b1bf..21f2799da14e 100644 --- a/watchman/watcher/win32.cpp +++ b/watchman/watcher/win32.cpp @@ -4,6 +4,8 @@ #include #include "watchman/FileDescriptor.h" #include "watchman/InMemoryView.h" +#include "watchman/watcher/Watcher.h" +#include "watchman/watcher/WatcherRegistry.h" #include "watchman/watchman.h" #include diff --git a/watchman/watchman.h b/watchman/watchman.h index 55ef5c4782fc..f30d248840d6 100644 --- a/watchman/watchman.h +++ b/watchman/watchman.h @@ -20,7 +20,6 @@ struct watchman_trigger_command; #include "watchman_dir.h" #include "watchman_file.h" #include "watchman_opendir.h" -#include "watchman_watcher.h" #define WATCHMAN_IO_BUF_SIZE 1048576 #define WATCHMAN_BATCH_LIMIT (16 * 1024) diff --git a/watchman/watchman_root.h b/watchman/watchman_root.h index a9b4e01200ca..13c55ac5b7ef 100644 --- a/watchman/watchman_root.h +++ b/watchman/watchman_root.h @@ -7,9 +7,11 @@ #include #include "watchman/CookieSync.h" #include "watchman/FileSystem.h" +#include "watchman/PendingCollection.h" #include "watchman/PubSub.h" #include "watchman/QueryableView.h" #include "watchman/WatchmanConfig.h" +#include "watchman/watchman_ignore.h" #define HINT_NUM_DIRS 128 * 1024 #define CFG_HINT_NUM_DIRS "hint_num_dirs" @@ -24,6 +26,8 @@ constexpr std::chrono::milliseconds DEFAULT_QUERY_SYNC_MS(60000); /* Idle out watches that haven't had activity in several days */ #define DEFAULT_REAP_AGE (86400 * 5) +struct watchman_trigger_command; + namespace watchman { class ClientStateAssertion; From af6b3902899f999f299ebf87329a2423696eb4d4 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Fri, 25 Jun 2021 18:46:44 -0700 Subject: [PATCH 0005/7387] json_ref explicit operator bool Summary: operator bool should be explicit whenever possible. Reviewed By: xavierd Differential Revision: D29350922 fbshipit-source-id: ee993122d3b9e104c4401e8186f391d6aebcefd8 --- watchman/thirdparty/jansson/jansson.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/thirdparty/jansson/jansson.h b/watchman/thirdparty/jansson/jansson.h index 020d5141416c..a58492d90e3d 100644 --- a/watchman/thirdparty/jansson/jansson.h +++ b/watchman/thirdparty/jansson/jansson.h @@ -106,7 +106,7 @@ class json_ref { return ref_; } - /* implicit */ operator bool() const { + explicit operator bool() const { return ref_ != nullptr; } From dfce80b37adbdf34aed3a6a9354056c5eb17c57c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Sun, 27 Jun 2021 04:33:30 -0700 Subject: [PATCH 0006/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fatal/commit/f6027517825468612c7130e00b06d13100910835 https://github.com/facebook/fb303/commit/a8f5d31826943c4f7e160f34ff2e85013f980807 https://github.com/facebook/fbthrift/commit/9aab60f81d86981de9ce01da8a693b8690f8845f https://github.com/facebook/fbzmq/commit/fe953377ba65952480f74b5288b1f4ceadc3c621 https://github.com/facebook/litho/commit/7d3b42946d644a53c6ece2c20f0177deb9e05459 https://github.com/facebook/mcrouter/commit/dfd3f4c8466bd001364216b49ec8ab95a6ac251f https://github.com/facebook/proxygen/commit/28675f591b35ed45bd73fe8a1f1e1473a5998361 https://github.com/facebook/rocksdb/commit/be8199cdb99b2de17a7d1479a16e9944c278e51f https://github.com/facebook/squangle/commit/f5848eb14d87f9d1a446768af2d10b02d845dcdd https://github.com/facebook/wangle/commit/2c7e6178d69025e98c76d8ffe3019631c511f6e9 https://github.com/facebook/watchman/commit/af6b3902899f999f299ebf87329a2423696eb4d4 https://github.com/facebookexperimental/rust-shed/commit/db4853866afb9c9ee10b0babf026d2c2ed42cb4f https://github.com/facebookexternal/stl_tasks/commit/590e2a5079dfb05835634c3b2c3e1903ec3fca3d https://github.com/facebookincubator/conversionsapi-tag-for-googletagmanager/commit/1569c8fef36553e9cb74f5551f3a2f6902293dbf https://github.com/facebookincubator/fizz/commit/80d9f5bddc5a972320e5b1de5db15a53d2a24b50 https://github.com/facebookincubator/katran/commit/b7e389af8280889a8861467a8af737ddcbfeefb4 https://github.com/facebookincubator/mvfst/commit/db4121c5f665cb849ff6177120858d6fe3e02ebe https://github.com/facebookincubator/profilo/commit/b3cd90158746c4bb16b10d42bf6b2fd27d6706dd https://github.com/facebookresearch/pytorch-biggraph/commit/e76138a89dab3725c23d886188d7a1e8b49a22c9 https://github.com/pytorch/fbgemm/commit/1bad64bc0d187b93bc136a7b8cbb917097e1ca4b https://github.com/pytorch/kineto/commit/683604e999009d7460b3210beaffa641af5cea24 https://github.com/rsocket/rsocket-cpp/commit/c48eb39fdc7e969f511e35ac05357649038dd9fe Reviewed By: jurajh-fb fbshipit-source-id: c66e47f4b48668d854f1ed0e3d721834e2e5eccc --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 781732cad10f..d419a1982e03 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ec71afa89573c92de4a2a2ab87a51bd9021f5819 +Subproject commit 9aab60f81d86981de9ce01da8a693b8690f8845f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6343da7417eb..ae1d0505789d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 33d84df82ba2681eb21551346802ec7dc21c7785 +Subproject commit 2c7e6178d69025e98c76d8ffe3019631c511f6e9 From cda9198a24164dd12b4e9a89e1731d98a74c892c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Sun, 27 Jun 2021 04:57:31 -0700 Subject: [PATCH 0007/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/42895733aae5e42ef69e60ac1d9281770c16ef72 https://github.com/facebook/fbthrift/commit/f08870aa819de160b363b493385d917c66045eaf https://github.com/facebook/fbzmq/commit/6bba39ee6c872debcca424c8c8944816920907a8 https://github.com/facebook/folly/commit/f434460f8a98e85f3ddb75390ddd1cc330c8f658 https://github.com/facebook/proxygen/commit/be66f51011211145c9b977876706fd49cc02900b https://github.com/facebook/wangle/commit/fd9f41462028267f8fe7270f35e4839ac5c0edeb https://github.com/facebook/watchman/commit/dfce80b37adbdf34aed3a6a9354056c5eb17c57c https://github.com/facebookexperimental/rust-shed/commit/eb83210914972ee374b7160b05f0675ae9cd901b https://github.com/facebookincubator/katran/commit/14d7cece3ea757e5d8c96b90442b967e489836eb https://github.com/facebookincubator/mvfst/commit/c430ba0b95ea55b7b58b8a796cb12e0f25b6b13d Reviewed By: jurajh-fb fbshipit-source-id: 585f5f2c80de0a56681c4d07b9fbc0d491459487 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d419a1982e03..b9bb30588a95 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9aab60f81d86981de9ce01da8a693b8690f8845f +Subproject commit f08870aa819de160b363b493385d917c66045eaf diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 743048bef4b8..70598a3ccded 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 99fbca1df19fdd21f1b831cad6f50ece94573675 +Subproject commit f434460f8a98e85f3ddb75390ddd1cc330c8f658 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ae1d0505789d..6ba920ea77d8 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2c7e6178d69025e98c76d8ffe3019631c511f6e9 +Subproject commit fd9f41462028267f8fe7270f35e4839ac5c0edeb From edab4fbf0e80ea3f84a2a2c7c0db11445728749b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Sun, 27 Jun 2021 05:23:33 -0700 Subject: [PATCH 0008/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/586b831b1e5898f03f3234528051173bff6895c5 https://github.com/facebook/fbthrift/commit/8f5076843c890cb9b9b337e95ee857ada2b077cb https://github.com/facebook/fbzmq/commit/fea73e46dd86d9d9f4dd5ebe4d616e2f23bf6d08 https://github.com/facebook/proxygen/commit/6299d9b85180c6d4c3be340b406ae4221b5607da https://github.com/facebook/wangle/commit/d33e4c0607d249669a1c18286302261aa9442fcc https://github.com/facebook/watchman/commit/cda9198a24164dd12b4e9a89e1731d98a74c892c https://github.com/facebookexperimental/rust-shed/commit/acc20c89bb5ac631879f7547a22b653ab633e810 https://github.com/facebookincubator/fizz/commit/b786cc1f079a1b65f2f648178af28cfd3dfe44d2 https://github.com/facebookincubator/katran/commit/0714b87f89365f60a1d3d6387506865be3c01d1a https://github.com/facebookincubator/mvfst/commit/757fd2030d5b7befa23804b0035602419f73b2d6 https://github.com/rsocket/rsocket-cpp/commit/e06948db63f8f42fe1fc7433bf0e7aed6f71a94b Reviewed By: jurajh-fb fbshipit-source-id: 40e8b8b93d8a58c09bc70d063e89d40363a065ff --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b9bb30588a95..1d535ec2bd04 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f08870aa819de160b363b493385d917c66045eaf +Subproject commit 8f5076843c890cb9b9b337e95ee857ada2b077cb diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6ba920ea77d8..626d965b9bbf 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit fd9f41462028267f8fe7270f35e4839ac5c0edeb +Subproject commit d33e4c0607d249669a1c18286302261aa9442fcc From 73d2ce95fbb35d565839adfec04e9fdcfb4ce470 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Sun, 27 Jun 2021 05:50:46 -0700 Subject: [PATCH 0009/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/3f24c4706c1924317f392f6c8b768a5ad5d67b08 https://github.com/facebook/fbthrift/commit/de761ec4184e9004f5cd0e8e4cb28e271e18056d https://github.com/facebook/fbzmq/commit/c5b4362dfd9c09d16eb1788f5df9845dc6e59950 https://github.com/facebook/proxygen/commit/5d308f429838e7c20a53b39c05b34e1f8cc7a476 https://github.com/facebook/wangle/commit/acb170a102b7d4693a6d7bec677db11159a730a5 https://github.com/facebook/watchman/commit/edab4fbf0e80ea3f84a2a2c7c0db11445728749b https://github.com/facebookexperimental/rust-shed/commit/59d13fe72a35b74c9f00614cec0c5b3b0ccab062 https://github.com/facebookincubator/katran/commit/8a534c9ee60277b0a9e4cf0d71c175989dbc8eec https://github.com/facebookincubator/mvfst/commit/25d6b6d2a26d85fffbbd9be8533afa951a03fc58 Reviewed By: jurajh-fb fbshipit-source-id: dd459d400da33efa95a954c0e139e840a831ccad --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1d535ec2bd04..fa11b96dbe0b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8f5076843c890cb9b9b337e95ee857ada2b077cb +Subproject commit de761ec4184e9004f5cd0e8e4cb28e271e18056d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 626d965b9bbf..87246df39a52 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d33e4c0607d249669a1c18286302261aa9442fcc +Subproject commit acb170a102b7d4693a6d7bec677db11159a730a5 From 0a88109208b011618ac8b58aff9fae9ae03479da Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Sun, 27 Jun 2021 06:12:42 -0700 Subject: [PATCH 0010/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/a3f64d9b5a20afb92788915921370bb2d10405df https://github.com/facebook/fbthrift/commit/32036a5505970a5a8c905543ebc6de1b20a662d8 https://github.com/facebook/fbzmq/commit/b7ccc0b150dd6eccd8b4b2cb6676df6336777abd https://github.com/facebook/proxygen/commit/5eda293e977087cc0a617ef48242e30e37c8b1f2 https://github.com/facebook/watchman/commit/73d2ce95fbb35d565839adfec04e9fdcfb4ce470 https://github.com/facebookexperimental/rust-shed/commit/a634be82c3a9b007e94a88fee8535395b98c92a9 Reviewed By: jurajh-fb fbshipit-source-id: 1c47ea00221bd82ec6812aa8df2da1ce8be6a761 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index fa11b96dbe0b..e648d98d7706 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit de761ec4184e9004f5cd0e8e4cb28e271e18056d +Subproject commit 32036a5505970a5a8c905543ebc6de1b20a662d8 From f38a2155f6cb1aa0ab0952f27853086fe79221cc Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Sun, 27 Jun 2021 12:57:58 -0700 Subject: [PATCH 0011/7387] fsevents: add a config for turning off FSEventStreamFlushSync Summary: FSEventStreamFlushSync, even if required for correct behavior, appears to have an unfortunate effect on sync performance, especially in the kqueue+fsevents watcher, where flushing runs serially. Introduce a config bit that allows skipping FSEventStreamFlushSync and opts into the older broken behavior. Reviewed By: xavierd Differential Revision: D29351920 fbshipit-source-id: 6e99cf30d54f12bf0486694b890ac00a0bf13323 --- watchman/watcher/fsevents.cpp | 81 ++++++++++++----------- watchman/watcher/fsevents.h | 82 ++++++++++++++++-------- watchman/watcher/kqueue_and_fsevents.cpp | 8 ++- 3 files changed, 101 insertions(+), 70 deletions(-) diff --git a/watchman/watcher/fsevents.cpp b/watchman/watcher/fsevents.cpp index bffc78a9e38e..67e772460e96 100644 --- a/watchman/watcher/fsevents.cpp +++ b/watchman/watcher/fsevents.cpp @@ -91,12 +91,6 @@ struct FSEventsLogEntry { }; static_assert(64 == sizeof(FSEventsLogEntry)); -static fse_stream* fse_stream_make( - const std::shared_ptr& root, - FSEventsWatcher* watcher, - FSEventStreamEventId since, - w_string& failure_reason); - std::shared_ptr watcherFromRoot( const std::shared_ptr& root) { auto view = std::dynamic_pointer_cast(root->view()); @@ -118,7 +112,7 @@ static void log_drop_event( sample.log(); } -static void fse_callback( +void FSEventsWatcher::fse_callback( ConstFSEventStreamRef, void* clientCallBackInfo, size_t numEvents, @@ -165,7 +159,7 @@ static void fse_callback( log_drop_event( root, eventFlags[i] & kFSEventStreamEventFlagKernelDropped); - if (watcher->attempt_resync_on_drop) { + if (watcher->attemptResyncOnDrop_) { // fseventsd has a reliable journal so we can attempt to resync. do_resync: if (stream->event_id_wrapped) { @@ -177,7 +171,7 @@ static void fse_callback( goto propagate; } - if (watcher->stream == stream) { + if (watcher->stream_ == stream) { // We are the active stream for this watch which means that it // is safe for us to proceed with changing watcher->stream. // Attempt to set up a new stream to resync from the last-good @@ -214,7 +208,7 @@ static void fse_callback( stream->last_good); // mark the replacement as the winner - watcher->stream = replacement; + watcher->stream_ = replacement; // And tear ourselves down delete stream; @@ -226,7 +220,7 @@ static void fse_callback( break; } } - } else if (watcher->attempt_resync_on_drop) { + } else if (watcher->attemptResyncOnDrop_) { // This stream has already lost sync and our policy is to resync // for ourselves. This is most likely a spurious callback triggered // after we'd taken action above. We just ignore further events @@ -275,7 +269,7 @@ static void fse_callback( if (!items.empty()) { auto wlock = watcher->items_.lock(); wlock->items.push_back(std::move(items)); - watcher->fse_cond.notify_one(); + watcher->fseCond_.notify_one(); } } @@ -295,7 +289,7 @@ fse_stream::~fse_stream() { } } -static fse_stream* fse_stream_make( +fse_stream* FSEventsWatcher::fse_stream_make( const std::shared_ptr& root, FSEventsWatcher* watcher, FSEventStreamEventId since, @@ -341,7 +335,7 @@ static fse_stream* fse_stream_make( goto fail; } // Compare the UUID with that of the current stream - if (!watcher->stream->uuid) { + if (!watcher->stream_->uuid) { failure_reason = w_string( "fsevents journal was not available for prior stream", W_STRING_UNICODE); @@ -349,7 +343,7 @@ static fse_stream* fse_stream_make( } a = CFUUIDGetUUIDBytes(fse_stream->uuid); - b = CFUUIDGetUUIDBytes(watcher->stream->uuid); + b = CFUUIDGetUUIDBytes(watcher->stream_->uuid); if (memcmp(&a, &b, sizeof(a)) != 0) { failure_reason = @@ -394,7 +388,7 @@ static fse_stream* fse_stream_make( latency); flags = kFSEventStreamCreateFlagNoDefer | kFSEventStreamCreateFlagWatchRoot; - if (watcher->has_file_watching) { + if (watcher->hasFileWatching_) { flags |= kFSEventStreamCreateFlagFileEvents; } fse_stream->stream = FSEventStreamCreate( @@ -492,12 +486,12 @@ void FSEventsWatcher::FSEventsThread( // Block until fsevents_root_start is waiting for our initialization auto wlock = items_.lock(); - attempt_resync_on_drop = root->config.getBool("fsevents_try_resync", true); + attemptResyncOnDrop_ = root->config.getBool("fsevents_try_resync", true); fdctx.info = root.get(); fdref = CFFileDescriptorCreate( - nullptr, fse_pipe.read.fd(), true, fse_pipe_callback, &fdctx); + nullptr, fsePipe_.read.fd(), true, fse_pipe_callback, &fdctx); CFFileDescriptorEnableCallBacks(fdref, kCFFileDescriptorReadCallBack); { CFRunLoopSourceRef fdsrc; @@ -512,13 +506,13 @@ void FSEventsWatcher::FSEventsThread( CFRelease(fdsrc); } - stream = fse_stream_make( + stream_ = fse_stream_make( root, this, kFSEventStreamEventIdSinceNow, root->failure_reason); - if (!stream) { + if (!stream_) { goto done; } - if (!FSEventStreamStart(stream->stream)) { + if (!FSEventStreamStart(stream_->stream)) { root->failure_reason = w_string::build( "FSEventStreamStart failed, look at your log file ", log_name, @@ -529,15 +523,15 @@ void FSEventsWatcher::FSEventsThread( } // Signal to fsevents_root_start that we're done initializing - fse_cond.notify_one(); + fseCond_.notify_one(); } // Process the events stream until we get signalled to quit CFRunLoopRun(); done: - if (stream) { - delete stream; + if (stream_) { + delete stream_; } if (fdref) { CFRelease(fdref); @@ -548,14 +542,16 @@ void FSEventsWatcher::FSEventsThread( FSEventsWatcher::FSEventsWatcher( bool hasFileWatching, + Configuration& config, std::optional dir) : Watcher( hasFileWatching ? "fsevents" : "dirfsevents", hasFileWatching ? (WATCHER_HAS_PER_FILE_NOTIFICATIONS | WATCHER_COALESCED_RENAME) : WATCHER_ONLY_DIRECTORY_NOTIFICATIONS), - has_file_watching(hasFileWatching), - subdir(std::move(dir)) { + hasFileWatching_{hasFileWatching}, + enableStreamFlush_{config.getBool("fsevents_enable_stream_flush", true)}, + subdir{std::move(dir)} { // TODO: Add ring buffer logging for events in the shared kqueue+fsevents // logger. } @@ -563,7 +559,10 @@ FSEventsWatcher::FSEventsWatcher( FSEventsWatcher::FSEventsWatcher( watchman_root* root, std::optional dir) - : FSEventsWatcher(root->config.getBool("fsevents_watch_files", true), dir) { + : FSEventsWatcher( + root->config.getBool("fsevents_watch_files", true), + root->config, + dir) { json_int_t fsevents_ring_log_size = root->config.getInt("fsevents_ring_log_size", 0); if (fsevents_ring_log_size) { @@ -595,7 +594,7 @@ bool FSEventsWatcher::start(const std::shared_ptr& root) { // Ensure that we signal the condition variable before we // finish this thread. That ensures that don't get stuck // waiting in FSEventsWatcher::start if something unexpected happens. - self->fse_cond.notify_one(); + self->fseCond_.notify_one(); }); // We have to detach because the readChangesThread may wind up // being the last thread to reference the watcher state and @@ -603,7 +602,7 @@ bool FSEventsWatcher::start(const std::shared_ptr& root) { thread.detach(); // Allow thread init to proceed; wait for its signal - fse_cond.wait(wlock.as_lock()); + fseCond_.wait(wlock.as_lock()); if (root->failure_reason) { logf(ERR, "failed to start fsevents thread: {}\n", root->failure_reason); @@ -619,6 +618,10 @@ bool FSEventsWatcher::start(const std::shared_ptr& root) { } folly::SemiFuture FSEventsWatcher::flushPendingEvents() { + if (!enableStreamFlush_) { + return folly::SemiFuture::makeEmpty(); + } + auto [p, f] = folly::makePromiseContract(); /* @@ -653,13 +656,13 @@ folly::SemiFuture FSEventsWatcher::flushPendingEvents() { */ // Ensure all events queued by FSEvents are pushed into wlock->items. - FSEventStreamFlushSync(stream->stream); + FSEventStreamFlushSync(stream_->stream); // Now return a Future that is fulfilled when all of the items have been // processed by InMemoryView. auto wlock = items_.lock(); wlock->syncs.push_back(std::move(p)); - fse_cond.notify_one(); + fseCond_.notify_one(); return std::move(f); } @@ -671,7 +674,7 @@ bool FSEventsWatcher::waitNotify(int timeoutms) { // Yes, let's not wait on the condition. return true; } - fse_cond.wait_for(wlock.as_lock(), std::chrono::milliseconds(timeoutms)); + fseCond_.wait_for(wlock.as_lock(), std::chrono::milliseconds(timeoutms)); return !wlock->items.empty() || !wlock->syncs.empty(); } @@ -753,7 +756,7 @@ Watcher::ConsumeNotifyRet FSEventsWatcher::consumeNotify( break; } - if (!has_file_watching && item.path.size() < root->root_path.size()) { + if (!hasFileWatching_ && item.path.size() < root->root_path.size()) { // The test_watch_del_all appear to trigger this? log(ERR, "Got an event on a directory parent to the root directory: {}?\n", @@ -787,7 +790,7 @@ Watcher::ConsumeNotifyRet FSEventsWatcher::consumeNotify( } void FSEventsWatcher::signalThreads() { - write(fse_pipe.write.fd(), "X", 1); + write(fsePipe_.write.fd(), "X", 1); } std::unique_ptr FSEventsWatcher::startWatchDir( @@ -825,7 +828,7 @@ static RegisterWatcher reg("fsevents"); // A helper command to facilitate testing that we can successfully // resync the stream. -static void cmd_debug_fsevents_inject_drop( +void FSEventsWatcher::cmd_debug_fsevents_inject_drop( watchman_client* client, const json_ref& args) { FSEventStreamEventId last_good; @@ -845,15 +848,15 @@ static void cmd_debug_fsevents_inject_drop( return; } - if (!watcher->attempt_resync_on_drop) { + if (!watcher->attemptResyncOnDrop_) { send_error_response(client, "fsevents_try_resync is not enabled"); return; } { auto wlock = watcher->items_.lock(); - last_good = watcher->stream->last_good; - watcher->stream->inject_drop = true; + last_good = watcher->stream_->last_good; + watcher->stream_->inject_drop = true; } auto resp = make_response(); @@ -862,7 +865,7 @@ static void cmd_debug_fsevents_inject_drop( } W_CMD_REG( "debug-fsevents-inject-drop", - cmd_debug_fsevents_inject_drop, + FSEventsWatcher::cmd_debug_fsevents_inject_drop, CMD_DAEMON, w_cmd_realpath_root) diff --git a/watchman/watcher/fsevents.h b/watchman/watcher/fsevents.h index c35e29153a06..0244db153ae4 100644 --- a/watchman/watcher/fsevents.h +++ b/watchman/watcher/fsevents.h @@ -1,15 +1,20 @@ /* Copyright 2012-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#pragma once + #include +#include "watchman/Pipe.h" #include "watchman/RingBuffer.h" #include "watchman/watcher/Watcher.h" -#include "watchman/watchman.h" #if HAVE_FSEVENTS +struct watchman_client; + namespace watchman { +class Configuration; struct fse_stream; struct FSEventsLogEntry; @@ -21,35 +26,11 @@ struct watchman_fsevent { : path(std::move(path)), flags(flags) {} }; -struct FSEventsWatcher : public Watcher { - watchman::Pipe fse_pipe; - - std::condition_variable fse_cond; - struct Items { - // Unflattened queue of pending events. The fse_callback function will push - // exactly one vector to the end of this one, flattening the vector would - // require extra copying and allocations. - std::vector> items; - // Sync requests to be inserted into PendingCollection. - std::vector> syncs; - }; - folly::Synchronized items_; - - struct fse_stream* stream{nullptr}; - bool attempt_resync_on_drop{false}; - bool has_file_watching{false}; - std::optional subdir{std::nullopt}; - - // Incremented in fse_callback - std::atomic totalEventsSeen_{0}; - /** - * If not null, holds a fixed-size ring of the last `fsevents_ring_log_size` - * FSEvents events. - */ - std::unique_ptr> ringBuffer_; - +class FSEventsWatcher : public Watcher { + public: explicit FSEventsWatcher( bool hasFileWatching, + Configuration& config, std::optional dir = std::nullopt); explicit FSEventsWatcher( @@ -76,6 +57,51 @@ struct FSEventsWatcher : public Watcher { json_ref getDebugInfo() override; void clearDebugInfo() override; + + static void cmd_debug_fsevents_inject_drop( + watchman_client* client, + const json_ref& args); + + private: + static fse_stream* fse_stream_make( + const std::shared_ptr& root, + FSEventsWatcher* watcher, + FSEventStreamEventId since, + w_string& failure_reason); + static void fse_callback( + ConstFSEventStreamRef, + void* clientCallBackInfo, + size_t numEvents, + void* eventPaths, + const FSEventStreamEventFlags eventFlags[], + const FSEventStreamEventId eventIds[]); + + watchman::Pipe fsePipe_; + + std::condition_variable fseCond_; + struct Items { + // Unflattened queue of pending events. The fse_callback function will push + // exactly one vector to the end of this one, flattening the vector would + // require extra copying and allocations. + std::vector> items; + // Sync requests to be inserted into PendingCollection. + std::vector> syncs; + }; + folly::Synchronized items_; + + fse_stream* stream_{nullptr}; + bool attemptResyncOnDrop_{false}; + const bool hasFileWatching_{false}; + const bool enableStreamFlush_{true}; + std::optional subdir{std::nullopt}; + + // Incremented in fse_callback + std::atomic totalEventsSeen_{0}; + /** + * If not null, holds a fixed-size ring of the last `fsevents_ring_log_size` + * FSEvents events. + */ + std::unique_ptr> ringBuffer_; }; } // namespace watchman diff --git a/watchman/watcher/kqueue_and_fsevents.cpp b/watchman/watcher/kqueue_and_fsevents.cpp index 1fef05b508b0..8faff2d3cf07 100644 --- a/watchman/watcher/kqueue_and_fsevents.cpp +++ b/watchman/watcher/kqueue_and_fsevents.cpp @@ -172,8 +172,9 @@ folly::SemiFuture KQueueAndFSEventsWatcher::flushPendingEvents() { futures.reserve(fseventsWatchers.size()); for (auto& [name, watcher] : fseventsWatchers) { auto future = watcher->flushPendingEvents(); - w_check(future.valid(), "FSEvents did not return valid flush future"); - futures.push_back(std::move(future)); + if (future.valid()) { + futures.push_back(std::move(future)); + } } return folly::collect(futures).unit(); } @@ -197,7 +198,8 @@ std::unique_ptr KQueueAndFSEventsWatcher::startWatchDir( root->cookies.addCookieDir(fullPath); auto [it, _] = wlock->emplace( fullPath, - std::make_shared(false, std::optional(fullPath))); + std::make_shared( + false, root->config, std::optional(fullPath))); const auto& watcher = it->second; if (!watcher->start(root)) { throw std::runtime_error("couldn't start fsEvent"); From 30b2294142cf903e1113e8ab0cca6c1fa650bc25 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 28 Jun 2021 11:34:35 -0700 Subject: [PATCH 0012/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/3ede3face4d0e86d6127d22d78b5424b92b0fc77 https://github.com/facebook/wangle/commit/76c20793b7866d4e1d50ff078cca17e7fd117548 Reviewed By: yns88 fbshipit-source-id: 4458a18a73b9bfae2d3f3cf78c716ca7aed9e8d4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e648d98d7706..eb95b54b3fe9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 32036a5505970a5a8c905543ebc6de1b20a662d8 +Subproject commit 3ede3face4d0e86d6127d22d78b5424b92b0fc77 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 87246df39a52..e5ab9abace83 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit acb170a102b7d4693a6d7bec677db11159a730a5 +Subproject commit 76c20793b7866d4e1d50ff078cca17e7fd117548 From 1f97ba3767956ec46c3d12800eb2b6e3cc4d0f2c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 28 Jun 2021 14:11:55 -0700 Subject: [PATCH 0013/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/8ef908529a03f1e647a5f459a07f82f5cea71f60 https://github.com/facebook/fbthrift/commit/291e513b8f0ce18e775aca2ffc0a09a7381e2c8a https://github.com/facebook/fbzmq/commit/88be1a7bccbb29ee94f0b52962d3c9a3a7040f99 https://github.com/facebook/proxygen/commit/5bd0efe252ec3d7cc3d7387be7be9a5e813f3893 https://github.com/facebook/rocksdb/commit/373e3a154dfac4708b0d07eabd097abd23651c6b https://github.com/facebook/watchman/commit/30b2294142cf903e1113e8ab0cca6c1fa650bc25 https://github.com/facebookexperimental/rust-shed/commit/348eb060affe9fefb1431e170f98a1d7689770c6 https://github.com/facebookincubator/fizz/commit/259b0f7bf98115d2645452df7e5a4dcebcf339fc https://github.com/facebookincubator/mvfst/commit/7fa3a9fc8e1b5f52e47cb027cb5924f6e9a1e82a https://github.com/pytorch/fbgemm/commit/c607cb65cbd9493adbb21b858adab507c16c716e Reviewed By: yns88 fbshipit-source-id: 52b34660676402e37448e8e72e5ee19d81cc508f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index eb95b54b3fe9..888496f58c31 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3ede3face4d0e86d6127d22d78b5424b92b0fc77 +Subproject commit 291e513b8f0ce18e775aca2ffc0a09a7381e2c8a From 6d24eea28d00282d3efb5f978c2c1cee5bcf08ef Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 28 Jun 2021 15:12:02 -0700 Subject: [PATCH 0014/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/dc5ce4e791308b7b2e9931450207e71a20d6ce60 https://github.com/facebook/fbzmq/commit/99afc0852b4eba45dddb281b16e2df9877af35a5 https://github.com/facebook/proxygen/commit/8e0a3e7eb671042499f0578efc7ce9198af8f4a7 https://github.com/facebook/wangle/commit/ba609a5ab2888ba6a791c739f7eab805dcd588ce https://github.com/facebook/watchman/commit/1f97ba3767956ec46c3d12800eb2b6e3cc4d0f2c https://github.com/facebookexperimental/rust-shed/commit/44fb4dffae3cdfbf6344e3209dbbf7c4d14e6861 https://github.com/facebookincubator/katran/commit/8e38012ba2c740d4fb35fde552039ed80ccc7bbc https://github.com/facebookincubator/mvfst/commit/1dad3dec6851cb3c5315a88bba8c0eca6a40562e Reviewed By: yns88 fbshipit-source-id: 69a27ca4cd9188b402c1b23def5fe33ae2435a6e --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e5ab9abace83..4df2049e72bc 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 76c20793b7866d4e1d50ff078cca17e7fd117548 +Subproject commit ba609a5ab2888ba6a791c739f7eab805dcd588ce From 93047f2e344acd96d511370408762b2aa4b39e61 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 28 Jun 2021 15:59:14 -0700 Subject: [PATCH 0015/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/78a8de054c8f18d88029be287e365c30e8962a0b https://github.com/facebook/fbthrift/commit/f872e8e1674178ffcc787335c9f43245ce3116f4 https://github.com/facebook/fbzmq/commit/989002d767196219ed3b074a3aaf2ab17631c42b https://github.com/facebook/proxygen/commit/c03a261f0f8436844736295fcbdd02214abb301a https://github.com/facebook/watchman/commit/6d24eea28d00282d3efb5f978c2c1cee5bcf08ef Reviewed By: yns88 fbshipit-source-id: cef1ef9819a22329665f89a639b89ee6e1d91a12 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 888496f58c31..2655ed5b35ae 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 291e513b8f0ce18e775aca2ffc0a09a7381e2c8a +Subproject commit f872e8e1674178ffcc787335c9f43245ce3116f4 From 7778f67a0385331b8767d5752c76b0e7963c6cc5 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Mon, 28 Jun 2021 16:24:41 -0700 Subject: [PATCH 0016/7387] improve a debug logging message Summary: The pending event flags transition during crawl is important information to see when debugging incorrect query results. Reviewed By: genevievehelsel Differential Revision: D29412377 fbshipit-source-id: 39e615858ee4e5985fed9a8cb72d4710fb69348a --- watchman/root/crawler.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/watchman/root/crawler.cpp b/watchman/root/crawler.cpp index c19f06a5d773..4102ad8b2255 100644 --- a/watchman/root/crawler.cpp +++ b/watchman/root/crawler.cpp @@ -141,7 +141,6 @@ void InMemoryView::crawler( } if (!file || !file->exists || stat_all || recursive) { auto full_path = dir->getFullPathToChild(name); - logf(DBG, "in crawler calling process_path on {}\n", full_path); int newFlags = 0; if (recursive || !file || !file->exists) { @@ -152,6 +151,13 @@ void InMemoryView::crawler( newFlags |= W_PENDING_IS_DESYNCED; } + logf( + DBG, + "in crawler calling processPath on {} oldflags={} newflags={}\n", + full_path, + pending.flags, + newFlags); + processPath( root, view, From f6fdb5696bfb0caf0377fdffbdfd77ebf709e23b Mon Sep 17 00:00:00 2001 From: Xavier Deguillard Date: Mon, 28 Jun 2021 18:55:44 -0700 Subject: [PATCH 0017/7387] kqueue_and_fsevents: fix infinite spinning loop Summary: Since `hasPending` was never reset, the `wait` function would never actually wait, causing the caller to spin endlessly. Reviewed By: chadaustin Differential Revision: D29440276 fbshipit-source-id: 8906a871c2a8f2e6c7e9a0ce6cdb1a54f793929f --- watchman/watcher/kqueue_and_fsevents.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/watchman/watcher/kqueue_and_fsevents.cpp b/watchman/watcher/kqueue_and_fsevents.cpp index 8faff2d3cf07..b0fa652a7540 100644 --- a/watchman/watcher/kqueue_and_fsevents.cpp +++ b/watchman/watcher/kqueue_and_fsevents.cpp @@ -41,16 +41,13 @@ class PendingEventsCond { * Wait for a change from a nested watcher. Return true if some events are * pending. */ - bool wait(int timeoutms) { + bool waitAndClear(int timeoutms) { auto lock = stop_.lock(); - if (lock->shouldStop) { - return false; - } - if (lock->hasPending) { - return true; - } - cond_.wait_for(lock.as_lock(), std::chrono::milliseconds(timeoutms)); - return lock->hasPending; + cond_.wait_until( + lock.as_lock(), + std::chrono::steady_clock::now() + std::chrono::milliseconds(timeoutms), + [&] { return lock->hasPending || lock->shouldStop; }); + return std::exchange(lock->hasPending, false); } /** @@ -261,7 +258,7 @@ Watcher::ConsumeNotifyRet KQueueAndFSEventsWatcher::consumeNotify( } bool KQueueAndFSEventsWatcher::waitNotify(int timeoutms) { - return pendingCondition_->wait(timeoutms); + return pendingCondition_->waitAndClear(timeoutms); } void KQueueAndFSEventsWatcher::signalThreads() { From 6452e4322fa12cd2802b11509d974fd535391726 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Mon, 28 Jun 2021 19:56:55 -0700 Subject: [PATCH 0018/7387] fix a Watchman divergence in FSEvents directory-only mode Summary: I don't have enough logging and tracing to precisely determine the sequence of events that leads to a divergent state, but I have a reproduction that occasionally results in a state where all Watchman queries produce incorrect data henceforth. I can reproduce this in the dirfsevents watcher (when fsevents_watch_files is set to false in /etc/watchman.json). My hypothesis is that, when a crawl and a pending directory change event overlap, the crawl may coalence the pending directory change incorrectly, resulting in Watchman not calling stat() on each child of the directory. Instead of a per-watcher flag that indicates whether the watcher supports per-file or per-directory change events, instead define a three-state flag hierarchy on the pending event (non-recursive, shallow, and deep) and coalesce it properly in PendingCollection. This may increase the number of stats that Watchman does, and perhaps cause queries to run more slowly, but the old logic was incorrect. Reviewed By: xavierd Differential Revision: D29412921 fbshipit-source-id: 1fc524de383bdae70661ce58883d7f38414d0aa9 --- watchman/InMemoryView.h | 2 +- watchman/PendingCollection.cpp | 4 +++- watchman/PendingCollection.h | 15 ++++++++++++--- watchman/root/crawler.cpp | 11 +++++------ watchman/root/stat.cpp | 23 +++++++++++------------ watchman/watcher/Watcher.h | 4 +--- watchman/watcher/fsevents.cpp | 4 +++- watchman/watcher/kqueue.cpp | 7 +++---- watchman/watcher/kqueue_and_fsevents.cpp | 4 +--- 9 files changed, 40 insertions(+), 34 deletions(-) diff --git a/watchman/InMemoryView.h b/watchman/InMemoryView.h index ea8f5f1a73e0..f747b0183ac1 100644 --- a/watchman/InMemoryView.h +++ b/watchman/InMemoryView.h @@ -251,7 +251,7 @@ class InMemoryView final : public QueryableView { * Allowed flags: * - W_PENDING_RECURSIVE: the directory will be recursively crawled, * - W_PENDING_VIA_NOTIFY when the watcher only supports directory - * notification (WATCHER_ONLY_DIRECTORY_NOTIFICATIONS), this will stat all + * notification (W_PENDING_NONRECURSIVE_SCAN), this will stat all * the files and directories contained in the passed in directory and stop. */ void crawler( diff --git a/watchman/PendingCollection.cpp b/watchman/PendingCollection.cpp index 68dc4ec4043e..e92a5fca485a 100644 --- a/watchman/PendingCollection.cpp +++ b/watchman/PendingCollection.cpp @@ -12,6 +12,7 @@ namespace { constexpr flag_map kFlags[] = { {W_PENDING_CRAWL_ONLY, "CRAWL_ONLY"}, {W_PENDING_RECURSIVE, "RECURSIVE"}, + {W_PENDING_NONRECURSIVE_SCAN, "NONRECURSIVE_SCAN"}, {W_PENDING_VIA_NOTIFY, "VIA_NOTIFY"}, {W_PENDING_IS_DESYNCED, "IS_DESYNCED"}, {0, NULL}, @@ -227,7 +228,8 @@ void PendingChanges::consolidateItem(watchman_pending_fs* p, int flags) { // we've recently just performed the stat and we want to avoid // infinitely trying to stat-and-crawl p->flags |= flags & - (W_PENDING_CRAWL_ONLY | W_PENDING_RECURSIVE | W_PENDING_IS_DESYNCED); + (W_PENDING_CRAWL_ONLY | W_PENDING_RECURSIVE | + W_PENDING_NONRECURSIVE_SCAN | W_PENDING_IS_DESYNCED); maybePruneObsoletedChildren(p->path, p->flags); } diff --git a/watchman/PendingCollection.h b/watchman/PendingCollection.h index 76366a0222c9..2323faf8a210 100644 --- a/watchman/PendingCollection.h +++ b/watchman/PendingCollection.h @@ -21,6 +21,15 @@ namespace watchman { * pruned. */ #define W_PENDING_RECURSIVE 1 +/** + * Set when this change requires a non-recursive scan of its children. + * + * Some watchers, notably FSEvents in its default mode, only report changes to + * directories and expect Watchman to enumerate and stat their children. + * + * This flag indicates to the IO thread that it must do such a scan. + */ +#define W_PENDING_NONRECURSIVE_SCAN 2 /** * This change event came from a watcher. * @@ -30,7 +39,7 @@ namespace watchman { * iothread uses this flag to detect whether cookie events were discovered via a * crawl or watcher. */ -#define W_PENDING_VIA_NOTIFY 2 +#define W_PENDING_VIA_NOTIFY 4 /** * Set by the IO thread when it adds new pending paths while crawling. * @@ -39,14 +48,14 @@ namespace watchman { * * Sort of exclusive with VIA_NOTIFY... */ -#define W_PENDING_CRAWL_ONLY 4 +#define W_PENDING_CRAWL_ONLY 8 /** * Set this flag when the watcher is desynced and may have missed filesystem * events. The W_PENDING_RECURSIVE flag should also be set alongside it to * force an recrawl of the passed in directory. Cookies will not be considered * when this flag is set. */ -#define W_PENDING_IS_DESYNCED 8 +#define W_PENDING_IS_DESYNCED 16 /** * Represents a change notification from the Watcher. diff --git a/watchman/root/crawler.cpp b/watchman/root/crawler.cpp index 4102ad8b2255..c890ce246518 100644 --- a/watchman/root/crawler.cpp +++ b/watchman/root/crawler.cpp @@ -24,7 +24,6 @@ void InMemoryView::crawler( PendingChanges& coll, const PendingChange& pending) { bool recursive = pending.flags & W_PENDING_RECURSIVE; - bool is_desynced = pending.flags & W_PENDING_IS_DESYNCED; bool stat_all; if (watcher_->flags & WATCHER_HAS_PER_FILE_NOTIFICATIONS) { @@ -36,8 +35,7 @@ void InMemoryView::crawler( // need to look at the files again when we crawl. To avoid recursing into // all the subdirectories, only stat all the files/directories when this // directory was added by the watcher. - stat_all = (pending.flags & W_PENDING_VIA_NOTIFY) && - watcher_->flags & WATCHER_ONLY_DIRECTORY_NOTIFICATIONS; + stat_all = pending.flags & W_PENDING_NONRECURSIVE_SCAN; } auto dir = view.resolveDir(pending.path, true); @@ -81,7 +79,8 @@ void InMemoryView::crawler( memcpy(path, pending.path.data(), pending.path.size()); path[pending.path.size()] = 0; - logf(DBG, "opendir({}) recursive={}\n", path, recursive); + logf( + DBG, "opendir({}) recursive={} stat_all={}\n", path, recursive, stat_all); /* Start watching and open the dir for crawling. * Whether we open the dir prior to watching or after is watcher specific, @@ -91,6 +90,7 @@ void InMemoryView::crawler( try { osdir = watcher_->startWatchDir(root, dir, path); } catch (const std::system_error& err) { + logf(DBG, "startWatchDir({}) threw {}\n", path, err.what()); handle_open_errno(*root, dir, pending.now, "opendir", err.code()); view.markDirDeleted(*watcher_, dir, getClock(pending.now), true); return; @@ -146,8 +146,7 @@ void InMemoryView::crawler( if (recursive || !file || !file->exists) { newFlags |= W_PENDING_RECURSIVE; } - - if (is_desynced) { + if (pending.flags & W_PENDING_IS_DESYNCED) { newFlags |= W_PENDING_IS_DESYNCED; } diff --git a/watchman/root/stat.cpp b/watchman/root/stat.cpp index 586ae3a02146..20a44786b5a4 100644 --- a/watchman/root/stat.cpp +++ b/watchman/root/stat.cpp @@ -60,8 +60,8 @@ void InMemoryView::statPath( const PendingChange& pending, const watchman_dir_ent* pre_stat) { bool recursive = pending.flags & W_PENDING_RECURSIVE; - bool via_notify = pending.flags & W_PENDING_VIA_NOTIFY; - int desynced_flag = pending.flags & W_PENDING_IS_DESYNCED; + const bool via_notify = pending.flags & W_PENDING_VIA_NOTIFY; + const int desynced_flag = pending.flags & W_PENDING_IS_DESYNCED; if (root.ignore.isIgnoreDir(pending.path)) { logf(DBG, "{} matches ignore_dir rules\n", pending.path); @@ -261,20 +261,19 @@ void InMemoryView::statPath( pending.path, pending.now, desynced_flag | W_PENDING_RECURSIVE | W_PENDING_CRAWL_ONLY); + } else if (pending.flags & W_PENDING_NONRECURSIVE_SCAN) { + /* on file changes, we receive a notification on the directory and + * thus we just need to crawl this one directory to consider all + * the pending files. */ + coll.add( + pending.path, + pending.now, + desynced_flag | W_PENDING_NONRECURSIVE_SCAN | + W_PENDING_CRAWL_ONLY); } else { if (watcher_->flags & WATCHER_HAS_PER_FILE_NOTIFICATIONS) { /* we get told about changes on the child, so we don't need to do * anything */ - } else if (watcher_->flags & WATCHER_ONLY_DIRECTORY_NOTIFICATIONS) { - /* on file changes, we receive a notification on the directory and - * thus we just need to crawl this one directory to consider all - * the pending files. To avoid recursing into the path recursively, - * the flags are passed as is and the crawler will only recurse - * down if W_PENDING_VIA_NOTIFY is set. */ - coll.add( - pending.path, - pending.now, - pending.flags | W_PENDING_CRAWL_ONLY); } else { /* in all the other cases, crawl */ coll.add( diff --git a/watchman/watcher/Watcher.h b/watchman/watcher/Watcher.h index 2cd20b6093dc..271bb596a88a 100644 --- a/watchman/watcher/Watcher.h +++ b/watchman/watcher/Watcher.h @@ -32,10 +32,8 @@ class Watcher : public std::enable_shared_from_this { // if renames do not reliably report the individual // files renamed in the hierarchy #define WATCHER_COALESCED_RENAME 2 - // if the watcher only watches the directories, and not the individual files. -#define WATCHER_ONLY_DIRECTORY_NOTIFICATIONS 4 // if the watcher is comprised of multiple watchers -#define WATCHER_HAS_SPLIT_WATCH 8 +#define WATCHER_HAS_SPLIT_WATCH 4 unsigned flags; Watcher(const char* name, unsigned flags); diff --git a/watchman/watcher/fsevents.cpp b/watchman/watcher/fsevents.cpp index 67e772460e96..51e7a34e14d0 100644 --- a/watchman/watcher/fsevents.cpp +++ b/watchman/watcher/fsevents.cpp @@ -548,7 +548,7 @@ FSEventsWatcher::FSEventsWatcher( hasFileWatching ? "fsevents" : "dirfsevents", hasFileWatching ? (WATCHER_HAS_PER_FILE_NOTIFICATIONS | WATCHER_COALESCED_RENAME) - : WATCHER_ONLY_DIRECTORY_NOTIFICATIONS), + : 0), hasFileWatching_{hasFileWatching}, enableStreamFlush_{config.getBool("fsevents_enable_stream_flush", true)}, subdir{std::move(dir)} { @@ -770,6 +770,8 @@ Watcher::ConsumeNotifyRet FSEventsWatcher::consumeNotify( (kFSEventStreamEventFlagMustScanSubDirs | kFSEventStreamEventFlagItemRenamed)) { flags |= W_PENDING_RECURSIVE; + } else if (!hasFileWatching_) { + flags |= W_PENDING_NONRECURSIVE_SCAN; } if (item.flags & diff --git a/watchman/watcher/kqueue.cpp b/watchman/watcher/kqueue.cpp index 30636838ca3a..b46db521326b 100644 --- a/watchman/watcher/kqueue.cpp +++ b/watchman/watcher/kqueue.cpp @@ -217,12 +217,10 @@ std::unique_ptr KQueueWatcher::startWatchDir( Watcher::ConsumeNotifyRet KQueueWatcher::consumeNotify( const std::shared_ptr& root, PendingChanges& coll) { - int n; - int i; struct timespec ts = {0, 0}; errno = 0; - n = kevent( + int n = kevent( kq_fd.fd(), nullptr, 0, @@ -240,7 +238,7 @@ Watcher::ConsumeNotifyRet KQueueWatcher::consumeNotify( } auto now = std::chrono::system_clock::now(); - for (i = 0; n > 0 && i < n; i++) { + for (int i = 0; n > 0 && i < n; i++) { uint32_t fflags = keventbuf[i].fflags; bool is_dir = is_udata_dir(keventbuf[i].udata); char flags_label[128]; @@ -283,6 +281,7 @@ Watcher::ConsumeNotifyRet KQueueWatcher::consumeNotify( wlock->fd_to_name.erase(fd); } + // TODO: W_PENDING_VIA_NOTIFY should always be set coll.add( path, now, is_dir ? 0 : (W_PENDING_RECURSIVE | W_PENDING_VIA_NOTIFY)); } diff --git a/watchman/watcher/kqueue_and_fsevents.cpp b/watchman/watcher/kqueue_and_fsevents.cpp index b0fa652a7540..200d296a4d11 100644 --- a/watchman/watcher/kqueue_and_fsevents.cpp +++ b/watchman/watcher/kqueue_and_fsevents.cpp @@ -115,9 +115,7 @@ class KQueueAndFSEventsWatcher : public Watcher { }; KQueueAndFSEventsWatcher::KQueueAndFSEventsWatcher(watchman_root* root) - : Watcher( - "kqueue+fsevents", - WATCHER_ONLY_DIRECTORY_NOTIFICATIONS | WATCHER_HAS_SPLIT_WATCH), + : Watcher("kqueue+fsevents", WATCHER_HAS_SPLIT_WATCH), kqueueWatcher_(std::make_shared(root, false)), pendingCondition_(std::make_shared()) {} From 721ac7f01ab11511dcac05caf681f623b6507336 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Mon, 28 Jun 2021 19:56:55 -0700 Subject: [PATCH 0019/7387] make pruning logic independent of order Summary: I noticed pruning upwards and pruning downwards had slightly different logic, so fix that and add a test. Reviewed By: xavierd Differential Revision: D28399471 fbshipit-source-id: 37bbbdab0d30ee02ae715e5a48c82dd85382aea2 --- watchman/PendingCollection.cpp | 4 ++- watchman/tests/PendingCollectionTest.cpp | 39 +++++++++++++++++++++++- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/watchman/PendingCollection.cpp b/watchman/PendingCollection.cpp index e92a5fca485a..807c9577491c 100644 --- a/watchman/PendingCollection.cpp +++ b/watchman/PendingCollection.cpp @@ -1,6 +1,7 @@ /* Copyright 2012-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/PendingCollection.h" #include #include "watchman/watchman.h" @@ -245,7 +246,8 @@ bool PendingChanges::isObsoletedByContainingDir(const w_string& path) { } auto p = leaf->value; - if ((p->flags & W_PENDING_RECURSIVE) && + if ((p->flags & (W_PENDING_RECURSIVE | W_PENDING_CRAWL_ONLY)) == + W_PENDING_RECURSIVE && is_path_prefix( path.data(), path.size(), diff --git a/watchman/tests/PendingCollectionTest.cpp b/watchman/tests/PendingCollectionTest.cpp index fb12c7a7f30e..94ac04047b06 100644 --- a/watchman/tests/PendingCollectionTest.cpp +++ b/watchman/tests/PendingCollectionTest.cpp @@ -140,7 +140,8 @@ class NaivePendingCollection { for (std::shared_ptr p = head_; p; p = p->next) { if (w_string_startswith(path, p->path) && watchman::is_path_prefix(path, p->path)) { - if (p->flags & W_PENDING_RECURSIVE) { + if ((p->flags & (W_PENDING_RECURSIVE | W_PENDING_CRAWL_ONLY)) == + W_PENDING_RECURSIVE) { return; } } @@ -301,6 +302,42 @@ TYPED_TEST(PendingCollectionFixture, unrelated_prefixes_dont_prune) { EXPECT_EQ(0, item->flags); } +TYPED_TEST(PendingCollectionFixture, queue_crawl_then_notify) { + this->coll.add( + w_string{"foo"}, this->now, W_PENDING_CRAWL_ONLY | W_PENDING_RECURSIVE); + this->coll.add(w_string{"foo/bar"}, this->now, W_PENDING_VIA_NOTIFY); + + // TODO: Why are these paths not returned bottom-up? + + auto item = this->coll.stealItems(); + ASSERT_NE(nullptr, item); + EXPECT_NE(nullptr, item->next); + EXPECT_EQ(w_string{"foo/bar"}, item->path); + EXPECT_EQ(W_PENDING_VIA_NOTIFY, item->flags); + + item = item->next; + EXPECT_EQ(nullptr, item->next); + EXPECT_EQ(w_string{"foo"}, item->path); + EXPECT_EQ(W_PENDING_CRAWL_ONLY | W_PENDING_RECURSIVE, item->flags); +} + +TYPED_TEST(PendingCollectionFixture, queue_notify_then_crawl) { + this->coll.add(w_string{"foo/bar"}, this->now, W_PENDING_VIA_NOTIFY); + this->coll.add( + w_string{"foo"}, this->now, W_PENDING_CRAWL_ONLY | W_PENDING_RECURSIVE); + + auto item = this->coll.stealItems(); + ASSERT_NE(nullptr, item); + EXPECT_NE(nullptr, item->next); + EXPECT_EQ(w_string{"foo"}, item->path); + EXPECT_EQ(W_PENDING_CRAWL_ONLY | W_PENDING_RECURSIVE, item->flags); + + item = item->next; + EXPECT_EQ(nullptr, item->next); + EXPECT_EQ(w_string{"foo/bar"}, item->path); + EXPECT_EQ(W_PENDING_VIA_NOTIFY, item->flags); +} + TYPED_TEST(PendingCollectionFixture, real_example) { this->coll.add( w_string{"/home/chadaustin/tmp/watchmanroots/test-root/foo/baz"}, From e4455a784a2456eafce1bd5ff39a901bd9651d2a Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 28 Jun 2021 20:46:41 -0700 Subject: [PATCH 0020/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5976312dccac0e57058232f3ba909f10e170750e https://github.com/facebook/watchman/commit/721ac7f01ab11511dcac05caf681f623b6507336 https://github.com/pytorch/fbgemm/commit/da7fbbc05dba4c9607d9d7114e19c7a0e92e40b8 Reviewed By: yns88 fbshipit-source-id: 99d1a1614c4cd1a09b9307072d77bc411620edd5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2655ed5b35ae..3d6262e8b9c2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f872e8e1674178ffcc787335c9f43245ce3116f4 +Subproject commit 5976312dccac0e57058232f3ba909f10e170750e From 22dfd9686d001fd826b7e349c7c2e8376f40b547 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 00:35:08 -0700 Subject: [PATCH 0021/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/bd5503c99789055f93df297121a1a333e1d65a7f Reviewed By: yns88 fbshipit-source-id: 9d2501e0051e3d1b6dc15727d2e314d06b2ec635 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3d6262e8b9c2..5014d5544650 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5976312dccac0e57058232f3ba909f10e170750e +Subproject commit bd5503c99789055f93df297121a1a333e1d65a7f From 642ad42ca7a561cb21a3f64546892b783cf5dff5 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 03:27:17 -0700 Subject: [PATCH 0022/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/70da9b6bac8cb8387c37a30a8536cf8a22d75663 Reviewed By: yns88 fbshipit-source-id: 38395aa647b91c303cd848403a928a2622b8f318 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5014d5544650..54daa86bfd20 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bd5503c99789055f93df297121a1a333e1d65a7f +Subproject commit 70da9b6bac8cb8387c37a30a8536cf8a22d75663 From 8d0c8bdbdd81156c268c973eddc98fa14a3fa81b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 09:43:01 -0700 Subject: [PATCH 0023/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/c03e671e4b574d95c2d349b8586e4b6e7080f591 https://github.com/facebook/rocksdb/commit/89f66d44840f7e51055580ff8f7e37e10371adc1 Reviewed By: yns88 fbshipit-source-id: ae075d06e3a60f5344f5fd5986bafe1924e3266a --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 70598a3ccded..aef6e9e1fbe5 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f434460f8a98e85f3ddb75390ddd1cc330c8f658 +Subproject commit c03e671e4b574d95c2d349b8586e4b6e7080f591 From 3750dc5c1b3ad4558b04e8e35e9a7ade46405d9e Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 10:28:46 -0700 Subject: [PATCH 0024/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/46092c79a355e355d5b517e17560838912e224fa https://github.com/facebook/fbthrift/commit/e05266aea86c84a25debb7a198658fe893239f7a https://github.com/facebook/fbzmq/commit/32cdf0f43119e22800ce04defc19f62dafb66141 https://github.com/facebook/proxygen/commit/57d7b1d7a386a37c0749dd7a5d50d212334563ea https://github.com/facebook/wangle/commit/a1362ba4fe91137e9faf57c40ad1eb375320e302 https://github.com/facebook/watchman/commit/8d0c8bdbdd81156c268c973eddc98fa14a3fa81b https://github.com/facebookincubator/fizz/commit/6237d840bd29cf8ce279e6e4bb6d585311b644a2 https://github.com/facebookincubator/katran/commit/580cab4af42e82c6825257c899287bf4a6920919 https://github.com/facebookincubator/mvfst/commit/7c60d96ce07620af7a7d9210dee42f64814efed8 https://github.com/rsocket/rsocket-cpp/commit/4619cccd1ddf9fadf1c47806fba1fc60218edcdc Reviewed By: yns88 fbshipit-source-id: fd4ab946e715c7c6737d9e6c60452bc7743cb9e1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 54daa86bfd20..e55b3129deec 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 70da9b6bac8cb8387c37a30a8536cf8a22d75663 +Subproject commit e05266aea86c84a25debb7a198658fe893239f7a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4df2049e72bc..1a24bfee5aa0 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ba609a5ab2888ba6a791c739f7eab805dcd588ce +Subproject commit a1362ba4fe91137e9faf57c40ad1eb375320e302 From f30130a7c3a8edd9888eb6d62847341639abd3ee Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 29 Jun 2021 11:30:44 -0700 Subject: [PATCH 0025/7387] small comments tweak Reviewed By: genevievehelsel Differential Revision: D29448881 fbshipit-source-id: 5dc5650fb12237a3058a457633439c0a4ce3294f --- watchman/PendingCollection.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/watchman/PendingCollection.h b/watchman/PendingCollection.h index 2323faf8a210..0bc3fbcb7257 100644 --- a/watchman/PendingCollection.h +++ b/watchman/PendingCollection.h @@ -50,10 +50,11 @@ namespace watchman { */ #define W_PENDING_CRAWL_ONLY 8 /** - * Set this flag when the watcher is desynced and may have missed filesystem - * events. The W_PENDING_RECURSIVE flag should also be set alongside it to - * force an recrawl of the passed in directory. Cookies will not be considered - * when this flag is set. + * Set when the watcher is desynced and may have missed filesystem events. The + * watcher is no longer guaranteed to report every file or directory, which + * could prevent cookies from being observed. W_PENDING_RECURSIVE flag should + * also be set alongside it to force an recrawl of the passed in directory. + * Cookies will not be considered when this flag is set. */ #define W_PENDING_IS_DESYNCED 16 From 020d080cc7d025f769db19db079d69daf45403b4 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 11:31:12 -0700 Subject: [PATCH 0026/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c07abeaf5edf29fc109767d882ff66b617dae3c5 https://github.com/facebook/fbthrift/commit/088ffeee1bd5872aa55a4f6c748917b98118cb7a https://github.com/facebook/fbzmq/commit/8cf731a9fcef0cb782bba30e38e3b6f9d3a04be6 https://github.com/facebook/mcrouter/commit/67eda7182bb1cb625abf5d652daf2848060d36a6 https://github.com/facebook/proxygen/commit/bb26055a388e244fd5e30d8d091bcb5d5afaef3a https://github.com/facebook/rocksdb/commit/3503f289820b8b199db6ffddb4da2565822948c8 https://github.com/facebook/wangle/commit/55b214bb827a35c9d47d44de886456632f17b443 https://github.com/facebook/watchman/commit/3750dc5c1b3ad4558b04e8e35e9a7ade46405d9e https://github.com/facebookexperimental/rust-shed/commit/95436152ca10be48240606c080291503a5f9511c https://github.com/facebookincubator/katran/commit/568d0d09425ed904db901c3709458f7596d79546 https://github.com/facebookincubator/mvfst/commit/8dbd56f51086f30726fe3f282655835587bc9aa3 https://github.com/pytorch/fbgemm/commit/ecca2c24cda6234e1c88ca30f113ad13d8741292 Reviewed By: yns88 fbshipit-source-id: 22b8c4d82e5ba5f03ea51f6c9ca63a0d30bbcb7c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e55b3129deec..a290a4ab7499 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e05266aea86c84a25debb7a198658fe893239f7a +Subproject commit 088ffeee1bd5872aa55a4f6c748917b98118cb7a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1a24bfee5aa0..0352701a53ed 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a1362ba4fe91137e9faf57c40ad1eb375320e302 +Subproject commit 55b214bb827a35c9d47d44de886456632f17b443 From 041438b9a7e09ba1b4842d82166ebd3e5d05f962 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 11:53:27 -0700 Subject: [PATCH 0027/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/032d0a80fc67b90f4f8bf74d307011e9a9addd44 https://github.com/facebook/fbthrift/commit/3b9d4c76a7ecc28ce3e3690e5220ba0450257423 https://github.com/facebook/fbzmq/commit/4688ccf0792977fd92dd823b81042a9d138a94e5 https://github.com/facebook/proxygen/commit/c8442815193584b696ce507ffdace1de198841ed https://github.com/facebook/watchman/commit/020d080cc7d025f769db19db079d69daf45403b4 https://github.com/facebookexperimental/rust-shed/commit/12bb3e2f9f3975a39b0735c08b00e35ea3e3440d Reviewed By: yns88 fbshipit-source-id: eefdceccdbd4ad90da35669910f7052d4f20c0c5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a290a4ab7499..680a578d8075 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 088ffeee1bd5872aa55a4f6c748917b98118cb7a +Subproject commit 3b9d4c76a7ecc28ce3e3690e5220ba0450257423 From cba2266d84959eca26e0b8b67febda9ba4bcb7a2 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 14:50:22 -0700 Subject: [PATCH 0028/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/ec15ad3d4c82c51127282df3bafd35fb2adb96d3 Reviewed By: yns88 fbshipit-source-id: 0c671a6c76d572725597b27baba18716a968a731 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index aef6e9e1fbe5..01b90b4a3be1 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c03e671e4b574d95c2d349b8586e4b6e7080f591 +Subproject commit ec15ad3d4c82c51127282df3bafd35fb2adb96d3 From 3bea1efb4ffba6ac45c8514778bd366a85fe50ca Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 15:45:52 -0700 Subject: [PATCH 0029/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/87fa51da8d2d360d8da4e6bc16e46bc78a5fb8ec https://github.com/facebook/fbthrift/commit/a6a60720166b90ec017378fbea5b5a9b18f71cfe https://github.com/facebook/fbzmq/commit/f1e829afd81be3eadc55925474180766655f1c83 https://github.com/facebook/proxygen/commit/ad508ef1d3945e05789f3d64655ec5b96679a827 https://github.com/facebook/wangle/commit/a0c5979d72b83ffaffb60686c57024187fb98f4c https://github.com/facebook/watchman/commit/cba2266d84959eca26e0b8b67febda9ba4bcb7a2 https://github.com/facebookincubator/fizz/commit/229d3580e5688e8605e3cb5b1ba3b6933d4fac26 https://github.com/facebookincubator/katran/commit/c063d7982c27705645d267ba1bafc7770d8be1d2 https://github.com/facebookincubator/mvfst/commit/5c1452ef4d837e8f9bd4fb00f60dcd166a9838b3 https://github.com/rsocket/rsocket-cpp/commit/f12458690d1129ff6dab842f00213365cfe7ca06 Reviewed By: yns88 fbshipit-source-id: c02a7a43d3dcaa6d81638ed9a87889efce05f129 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 680a578d8075..b0d422b28f07 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3b9d4c76a7ecc28ce3e3690e5220ba0450257423 +Subproject commit a6a60720166b90ec017378fbea5b5a9b18f71cfe diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0352701a53ed..e10ce988c749 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 55b214bb827a35c9d47d44de886456632f17b443 +Subproject commit a0c5979d72b83ffaffb60686c57024187fb98f4c From e858621a58b3a019babba3304d60f5af34b37f60 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 16:14:43 -0700 Subject: [PATCH 0030/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/e43a926fd07e2714130128c77b86c28e087a93f3 https://github.com/facebook/fbthrift/commit/57f196647f1dc29e16ea821822876a599d2a2909 https://github.com/facebook/fbzmq/commit/9773c660d589d8754032485394338de41fd35af5 https://github.com/facebook/proxygen/commit/80ab577aaad34ab3b673bf6b95dce86ed2b930ad https://github.com/facebook/wangle/commit/06b51f997487e80a30b79d6eaee9fd9239bfeeef https://github.com/facebook/watchman/commit/3bea1efb4ffba6ac45c8514778bd366a85fe50ca https://github.com/facebookexperimental/rust-shed/commit/5ee0c84e648095cd7de0042c4b4d3e7f55c0d109 https://github.com/facebookincubator/katran/commit/913394ca011cbeeb55abe8a932b98b7d756524d7 https://github.com/facebookincubator/mvfst/commit/32d59ce5ee3e493d8c1d849ea8219deb00431fda Reviewed By: yns88 fbshipit-source-id: ed11d12f1769b1a90b8f4dd4c5aa09211336f052 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b0d422b28f07..815702cbb889 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a6a60720166b90ec017378fbea5b5a9b18f71cfe +Subproject commit 57f196647f1dc29e16ea821822876a599d2a2909 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e10ce988c749..128787f0eaa9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a0c5979d72b83ffaffb60686c57024187fb98f4c +Subproject commit 06b51f997487e80a30b79d6eaee9fd9239bfeeef From 17bcf9adb6d8a0101e426a06f42f7481a79ad1a1 Mon Sep 17 00:00:00 2001 From: Xavier Deguillard Date: Tue, 29 Jun 2021 16:28:43 -0700 Subject: [PATCH 0031/7387] testpilot: testpilot is broken on Sandcastle Summary: Hack to use parexec and the par directly. Reviewed By: chadaustin Differential Revision: D29461444 fbshipit-source-id: 9ac6c1aa43728782b8de0a71446109f7fd5dab1d --- build/fbcode_builder/getdeps/builder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 0ecbe20bc530..addddea05991 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -726,7 +726,8 @@ def list_tests(): if platform == "win32": machine_suffix = self.build_opts.host_type.as_tuple_string() testpilot_args = [ - testpilot, + "parexec-testinfra.exe", + "C:/tools/testpilot/sc_testpilot.par", # Need to force the repo type otherwise testpilot on windows # can be confused (presumably sparse profile related) "--force-repo", @@ -740,7 +741,6 @@ def list_tests(): "--test-config", "platform=%s" % machine_suffix, "buildsystem=getdeps", - "--print-long-results", ] else: testpilot_args = [ From 5860cab5e3ab1cf68d08bb63d556dea0d74c81c3 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 17:01:01 -0700 Subject: [PATCH 0032/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/3518b634aede0416e9c53030ec56175d1218a286 https://github.com/facebook/fbthrift/commit/60a1a477747b8cbfbcf9ba1258b881bf0528945b https://github.com/facebook/fbzmq/commit/8b38328a3f89b131d8b06969acec7f65f0cdd338 https://github.com/facebook/folly/commit/6a6e02c2a316218654e661ae0f5d10e7f3db9d7b https://github.com/facebook/proxygen/commit/3d28082a35369352b54cb26f42b375f536ecf912 https://github.com/facebook/wangle/commit/01e792670c6fad61fb58871a827c91f47cad3876 https://github.com/facebook/watchman/commit/17bcf9adb6d8a0101e426a06f42f7481a79ad1a1 https://github.com/facebookexperimental/rust-shed/commit/f6b72a7423f587ae77fc5b286d6f765b01a85e09 https://github.com/facebookincubator/fizz/commit/b0a809444aee14fb8df1b5f462bd2e311a0dc08a https://github.com/facebookincubator/katran/commit/0be557b67c400fd7f4a3562f1177346e6bee3664 https://github.com/facebookincubator/mvfst/commit/9cd26b40129d7ea5575640f9b05c0becd2dc774c https://github.com/rsocket/rsocket-cpp/commit/a3acb868304eba7766cfd21745f127c3d0f30dca Reviewed By: yns88 fbshipit-source-id: ce19176f92fd8e98906d53059ce7b5f21fd93058 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 815702cbb889..4157211bed37 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 57f196647f1dc29e16ea821822876a599d2a2909 +Subproject commit 60a1a477747b8cbfbcf9ba1258b881bf0528945b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 01b90b4a3be1..1cf1a49a1042 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ec15ad3d4c82c51127282df3bafd35fb2adb96d3 +Subproject commit 6a6e02c2a316218654e661ae0f5d10e7f3db9d7b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 128787f0eaa9..e587f8660cf8 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 06b51f997487e80a30b79d6eaee9fd9239bfeeef +Subproject commit 01e792670c6fad61fb58871a827c91f47cad3876 From 196dc63bc4eebc2a87afed23776bcb7c50fce004 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 17:28:57 -0700 Subject: [PATCH 0033/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/0fdf0cdb82eee4f1d1648a6b66800a393b3f31db https://github.com/facebook/fbthrift/commit/784f64d7d2dc9f2ccb1cd6fd14a08805f3605410 https://github.com/facebook/fbzmq/commit/0aa3cdab93e46c52ed3a59122150475939b4a287 https://github.com/facebook/proxygen/commit/c514ec5f02006afb958edfed58367ebd82ce7166 https://github.com/facebook/wangle/commit/61001a346b1aca9c6221b90b6f4f6676d57ca9dc https://github.com/facebook/watchman/commit/5860cab5e3ab1cf68d08bb63d556dea0d74c81c3 https://github.com/facebookexperimental/rust-shed/commit/bdf262227a0abb0ee21704ab3b54dd340d18a501 https://github.com/facebookincubator/fizz/commit/3e17f198d3642025d357dad1ac67ee12d275ba5d https://github.com/facebookincubator/katran/commit/c68f1d5566c546e5195ff5667322638495ea1446 https://github.com/facebookincubator/mvfst/commit/2f95d1c8b1ce818b4af4b24c0bbd004595940d58 https://github.com/rsocket/rsocket-cpp/commit/277754265eb4038a8b978b5e23615b1f03fc29d8 Reviewed By: yns88 fbshipit-source-id: 7a988f86ef7064e33795860a91ac5d91da46fee1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4157211bed37..bc82a8cf555a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 60a1a477747b8cbfbcf9ba1258b881bf0528945b +Subproject commit 784f64d7d2dc9f2ccb1cd6fd14a08805f3605410 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e587f8660cf8..4b25e1e0c9aa 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 01e792670c6fad61fb58871a827c91f47cad3876 +Subproject commit 61001a346b1aca9c6221b90b6f4f6676d57ca9dc From 657c469a8354b8fda5e01f02d015e89d2d260c09 Mon Sep 17 00:00:00 2001 From: Zhengchao Liu Date: Tue, 29 Jun 2021 17:49:25 -0700 Subject: [PATCH 0034/7387] add edenfsctl trace fs support for nfs Summary: This diff connects the trace bus with trace fs command. Reviewed By: chadaustin Differential Revision: D29367135 fbshipit-source-id: f9217b286c1a21805d70b21282c10d4ad722a391 --- eden/fs/service/eden.thrift | 13 +++++++++++++ eden/fs/service/streamingeden.thrift | 7 ++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 0c9bb0b8488b..53adb25907d5 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -645,6 +645,12 @@ struct FuseCall { 9: optional string processName; } +struct NfsCall { + 1: i32 xid; + 2: i32 procNumber; + 3: string procName; +} + struct GetConfigParams { // Whether to reload the config from disk to make sure it is up-to-date 1: eden_config.ConfigReloadBehavior reload = eden_config.ConfigReloadBehavior.AutoReload; @@ -1161,6 +1167,13 @@ service EdenService extends fb303_core.BaseService { */ list debugOutstandingFuseCalls(1: PathString mountPoint); + /** + * Get the list of outstanding NFS requests + * + * This will return the list of NfsCall structure containing the data from the RPC request. + */ + list debugOutstandingNfsCalls(1: PathString mountPoint); + /** * Get the InodePathDebugInfo for the inode that corresponds to the given * inode number. This provides the path for the inode and also indicates diff --git a/eden/fs/service/streamingeden.thrift b/eden/fs/service/streamingeden.thrift index ed91f4b3c0c0..eb631976ef66 100644 --- a/eden/fs/service/streamingeden.thrift +++ b/eden/fs/service/streamingeden.thrift @@ -48,9 +48,10 @@ struct FsEvent { // See fuseRequest or prjfsRequest for the request opcode name. 4: string arguments; - // Always defined on Linux and macOS, but marked optional to support Windows. - 5: eden.FuseCall fuseRequest; - // To add Windows support, mark fuseRequest optional, and add: + // At most one of the *Request fields will be set, depending on the filesystem implementation. + 5: optional eden.FuseCall fuseRequest; + 10: optional eden.NfsCall nfsRequest; + // To add Windows support: // 6: optional eden.PrjfsCall prjfsRequest; 8: RequestInfo requestInfo; From a45d289c0d43c63dae5c845815f8875361d94f5a Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 18:09:14 -0700 Subject: [PATCH 0035/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/6e58005f443ba30a7224ab87c79263c03fc7f3b2 https://github.com/facebook/fbthrift/commit/d0a2e1b9c174221310bd70a60624658b7f49888c https://github.com/facebook/fbzmq/commit/93d95b41f79c3fba49cd67fab8b6ad9ac200d069 https://github.com/facebook/folly/commit/aa605f8e955876f4e99f0e769fa79fe49c76bf2f https://github.com/facebook/proxygen/commit/09705873ed39a6e4df4f98bdae067524caf8d511 https://github.com/facebook/wangle/commit/656e188c3f86f4fd446a51b0c0283037813d8f02 https://github.com/facebook/watchman/commit/657c469a8354b8fda5e01f02d015e89d2d260c09 https://github.com/facebookexperimental/rust-shed/commit/3eaffdd92db00304442dc6e2ed96028d12d38dc0 https://github.com/facebookincubator/katran/commit/d877734b2885760f6998b7f5298b718e0cc76acb https://github.com/facebookincubator/mvfst/commit/0a322e12b8ba8475cb2840f0531eac009afd3e75 Reviewed By: yns88 fbshipit-source-id: d0f56611a1c64ad53da884496483419cd856726c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bc82a8cf555a..a00fa90567f3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 784f64d7d2dc9f2ccb1cd6fd14a08805f3605410 +Subproject commit d0a2e1b9c174221310bd70a60624658b7f49888c diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 1cf1a49a1042..830429f009b8 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 6a6e02c2a316218654e661ae0f5d10e7f3db9d7b +Subproject commit aa605f8e955876f4e99f0e769fa79fe49c76bf2f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4b25e1e0c9aa..27d4d9fee372 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 61001a346b1aca9c6221b90b6f4f6676d57ca9dc +Subproject commit 656e188c3f86f4fd446a51b0c0283037813d8f02 From 2b1a6092a586b6bfcdb02b1b3ab4526a277b607b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 18:37:31 -0700 Subject: [PATCH 0036/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/f49b246a32b66e4990374413585b8af61329d7da https://github.com/facebook/fbthrift/commit/c7831a316b95771d9fb58de2adb1864896df8916 https://github.com/facebook/fbzmq/commit/f56d2ab17430e34d36dd385007fe32bf84439e40 https://github.com/facebook/proxygen/commit/de52c9437a8880e64554fd370a2ed6db7bb5aa23 https://github.com/facebook/wangle/commit/3207c57cbb7c9bfa9adec31447531eb8544791f1 https://github.com/facebook/watchman/commit/a45d289c0d43c63dae5c845815f8875361d94f5a https://github.com/facebookexperimental/rust-shed/commit/89980b45f45f51286e663371996384bd7e44462e https://github.com/facebookincubator/fizz/commit/90b4b108b68f30cb2ecb7a4831cffc944e0b9565 https://github.com/facebookincubator/katran/commit/ad0f202e6bdfff822f457ada85e70844dbd4c89f https://github.com/facebookincubator/mvfst/commit/f35ac5b5842562a2b80898710e6cf0a728804cba https://github.com/rsocket/rsocket-cpp/commit/f0339108750f1d69467d8d3104b6c289fb660dc8 Reviewed By: yns88 fbshipit-source-id: 019401f4fec457f20ddff006f1927e764986fe7b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a00fa90567f3..d12e9727bfd0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d0a2e1b9c174221310bd70a60624658b7f49888c +Subproject commit c7831a316b95771d9fb58de2adb1864896df8916 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 27d4d9fee372..671df9899a25 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 656e188c3f86f4fd446a51b0c0283037813d8f02 +Subproject commit 3207c57cbb7c9bfa9adec31447531eb8544791f1 From a605b9fcefa77ee2d103d445b056db1958449e5a Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 19:03:30 -0700 Subject: [PATCH 0037/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/d5921d4b05c461b6a01332876e86489ce0a7c682 https://github.com/facebook/fbthrift/commit/25196a4d6642546ae522c1cfabbe3a9ab77244b4 https://github.com/facebook/fbzmq/commit/cd9f47af4bcf1f8b29bfaeeeb41c627753cdf8a3 https://github.com/facebook/proxygen/commit/0cd7902faed7dce0b5f22fa4aa81f9b09fbe26e3 https://github.com/facebook/wangle/commit/6f2eae55dd925825a8dc0f6ac04819539ff7a66b https://github.com/facebook/watchman/commit/2b1a6092a586b6bfcdb02b1b3ab4526a277b607b https://github.com/facebookexperimental/rust-shed/commit/dba6c10cc216e25b3f6dc890c5f390e12b1544c7 https://github.com/facebookincubator/katran/commit/8797223153b2985b49d70cd6f9f12b1b841c7e0f https://github.com/facebookincubator/mvfst/commit/cfaa0da4d85b79a482b8be630a509d32c49048f6 Reviewed By: yns88 fbshipit-source-id: 8ee41e641c614e478f355651afb80d600aefdd37 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d12e9727bfd0..0fedf8cc8fad 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c7831a316b95771d9fb58de2adb1864896df8916 +Subproject commit 25196a4d6642546ae522c1cfabbe3a9ab77244b4 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 671df9899a25..06cd39589141 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3207c57cbb7c9bfa9adec31447531eb8544791f1 +Subproject commit 6f2eae55dd925825a8dc0f6ac04819539ff7a66b From 00fd6dff619052b02e571607181103483106c73e Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 19:35:22 -0700 Subject: [PATCH 0038/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c7d6089b77d91c8a127f44530849f40be6d1a537 https://github.com/facebook/fbthrift/commit/19d5d91cd5baa3c6756a554b8ab6632ee501a512 https://github.com/facebook/fbzmq/commit/9b618a92922e5f1c8cddc22388cdfa685fb984c6 https://github.com/facebook/litho/commit/21095c3c54c3a06921c3e49406a15c6fc251f15b https://github.com/facebook/proxygen/commit/655d49653dd1f3ccc3eeb43d560d429831faf95a https://github.com/facebook/watchman/commit/a605b9fcefa77ee2d103d445b056db1958449e5a https://github.com/facebookexperimental/rust-shed/commit/6f2ce1afb2b4d6b27a85dd12d23a47ae0b959ecf Reviewed By: yns88 fbshipit-source-id: c5aedcc748710da983410f7685c239a181f42168 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0fedf8cc8fad..f08dab935188 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 25196a4d6642546ae522c1cfabbe3a9ab77244b4 +Subproject commit 19d5d91cd5baa3c6756a554b8ab6632ee501a512 From 3c7cfddd3f927c6bf162d259882adcda7b8ed839 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 20:07:47 -0700 Subject: [PATCH 0039/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/b72b192b7072b623992046dd6455cc20a987bf84 https://github.com/facebook/fbzmq/commit/1898bc5cf240f624e9efdd0ce8d78a3dc1dd8df9 https://github.com/facebook/folly/commit/d7ba07915df8c52b7493b3b24079f35f6e35baf9 https://github.com/facebook/watchman/commit/00fd6dff619052b02e571607181103483106c73e https://github.com/facebookexperimental/rust-shed/commit/5e2d9dd9635c79a4ddd7060d936b51fa1a3acbb1 Reviewed By: yns88 fbshipit-source-id: ca5f058e615155f7d21b2a5feb130a273b92ac1d --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 830429f009b8..5dad4ad51299 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit aa605f8e955876f4e99f0e769fa79fe49c76bf2f +Subproject commit d7ba07915df8c52b7493b3b24079f35f6e35baf9 From b4fbb62a94e2e723abf254165fe9a1d27e71e54b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 20:38:29 -0700 Subject: [PATCH 0040/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/1401a769c52b4d30fb8eba85a5a0cdc160659f01 https://github.com/facebook/fbthrift/commit/cd99ecf324da34ebdc708a9e96b01b6e4e976d8b https://github.com/facebook/fbzmq/commit/e85b30991d9ae453f5c598b1c35d6fbfb5d830a1 https://github.com/facebook/proxygen/commit/710ce226133c3734890927d6cf321a38f21011ca https://github.com/facebook/wangle/commit/2fde4fde11cb5b3ae8cef2da8e7c4578e073b857 https://github.com/facebook/watchman/commit/3c7cfddd3f927c6bf162d259882adcda7b8ed839 https://github.com/facebookincubator/fizz/commit/96b3aa198d157b755fb6b106207dc4a938e4f6f6 https://github.com/facebookincubator/katran/commit/6527c0ce87f9e9a45772bee4ea3307519c8a5cea https://github.com/facebookincubator/mvfst/commit/31e86d615a9db6440ebe1d876f2c43f834dcc83a https://github.com/rsocket/rsocket-cpp/commit/c1b8cb9576762441facb8f162cc2e6008b984c28 Reviewed By: yns88 fbshipit-source-id: 9c23f89e1c5881334370dcdd0e8a562efb642918 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f08dab935188..c254671c3092 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 19d5d91cd5baa3c6756a554b8ab6632ee501a512 +Subproject commit cd99ecf324da34ebdc708a9e96b01b6e4e976d8b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 06cd39589141..4718ed7a696a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6f2eae55dd925825a8dc0f6ac04819539ff7a66b +Subproject commit 2fde4fde11cb5b3ae8cef2da8e7c4578e073b857 From bb74fefd96389d4267d39de2b9ce0751625c0606 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 21:11:39 -0700 Subject: [PATCH 0041/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/490056871c77583eeaea4e7348660b3c8d96e384 https://github.com/facebook/fbthrift/commit/eacd8e8360292df82c647af1e43e89a38a286cbe https://github.com/facebook/fbzmq/commit/ea2410544731925c8010df9a177e7f6dc60cc553 https://github.com/facebook/proxygen/commit/0cb63dbbdd5a8946fab0091399393bd1428fa40d https://github.com/facebook/wangle/commit/0182b1ce897bb251d2f92fd26728cc412c3fc6c4 https://github.com/facebook/watchman/commit/b4fbb62a94e2e723abf254165fe9a1d27e71e54b https://github.com/facebookexperimental/rust-shed/commit/1187b1e4ef051e25b4feae2ca76d9297afe89674 https://github.com/facebookincubator/katran/commit/677439c906881191a0876685f907dd53bb1dab49 https://github.com/facebookincubator/mvfst/commit/348d61a6edc55dda2a0b04a329e5cbad4cc33b49 Reviewed By: yns88 fbshipit-source-id: f0fe2c557248c1273ca63190d7ba7cf265daed81 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c254671c3092..a5ab026b1f2e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cd99ecf324da34ebdc708a9e96b01b6e4e976d8b +Subproject commit eacd8e8360292df82c647af1e43e89a38a286cbe diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4718ed7a696a..e519c8eda189 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2fde4fde11cb5b3ae8cef2da8e7c4578e073b857 +Subproject commit 0182b1ce897bb251d2f92fd26728cc412c3fc6c4 From f42e03e6ceb76a7ba3fc23dcc912d2560f2562a0 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 21:36:33 -0700 Subject: [PATCH 0042/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/0a8c0f8e1a337e27c3519364fa2cb7e17bdf80e5 https://github.com/facebook/fbthrift/commit/36ee30d92b5dddac8c01bc873f5c49c211bbff5d https://github.com/facebook/fbzmq/commit/884b66cc070deaa1885736b2adc5da3173d89211 https://github.com/facebook/proxygen/commit/f590dbbdb92af6d15e9c906d8b2573cc93ad1f94 https://github.com/facebook/watchman/commit/bb74fefd96389d4267d39de2b9ce0751625c0606 https://github.com/facebookexperimental/rust-shed/commit/9b8222d5f53dbc3533e7afe77ea565be23256238 Reviewed By: yns88 fbshipit-source-id: 253f164655926cb06db91424ac7738d790fe7e6a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a5ab026b1f2e..fb078d9ff097 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit eacd8e8360292df82c647af1e43e89a38a286cbe +Subproject commit 36ee30d92b5dddac8c01bc873f5c49c211bbff5d From 33c1a418cb5e2b77117613644ee2614c32b2833a Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 22:54:18 -0700 Subject: [PATCH 0043/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/4f8552a88d9e66aa52df4faaa3e623d64eb36a39 https://github.com/facebook/litho/commit/c10ca7ef5b80b25821b351b18c1e3ed08e1f6763 https://github.com/facebook/proxygen/commit/2a573e4bf4753fa75664c2c129ea80b2128cccbc https://github.com/facebook/wangle/commit/1706fa1dbd72862ec0cd2dd61c1ba25c9b2cf225 https://github.com/facebookincubator/katran/commit/7a1cb7c5117be79bfae028a7d1e15d84904ac3b5 https://github.com/facebookincubator/mvfst/commit/32150de7669829f3a3468d8edb94aa87f9574813 Reviewed By: yns88 fbshipit-source-id: fe27416408fc78ea2d607f982e5b5dbd9ed08050 --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e519c8eda189..8206d29a1ced 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0182b1ce897bb251d2f92fd26728cc412c3fc6c4 +Subproject commit 1706fa1dbd72862ec0cd2dd61c1ba25c9b2cf225 From 90b998fbad1f272529cb08672287e8f410979cd7 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 29 Jun 2021 23:13:59 -0700 Subject: [PATCH 0044/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/8351c6ae4295fa302b97f87934a1102a87b98d8e https://github.com/facebook/fbthrift/commit/08b4d371d1c22a3971c9325f2c48d401915f6934 https://github.com/facebook/fbzmq/commit/cc28e4f36fccdbcd400752a74e6f1188d31bd9c8 https://github.com/facebook/proxygen/commit/95f8aed821c5faca6e3687106b1b81bb0aca3d14 https://github.com/facebook/watchman/commit/33c1a418cb5e2b77117613644ee2614c32b2833a Reviewed By: yns88 fbshipit-source-id: f2ac89da96ba5b64caaa482a98cee1e95950c5ec --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index fb078d9ff097..120aeaa08da9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 36ee30d92b5dddac8c01bc873f5c49c211bbff5d +Subproject commit 08b4d371d1c22a3971c9325f2c48d401915f6934 From b20b1bd591f796cb0e4ce67f0665c43d310bfa73 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 00:02:44 -0700 Subject: [PATCH 0045/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/1f106643af6e7c7de5295f66dbb0893eb3bd1710 Reviewed By: yns88 fbshipit-source-id: daeba1349c706fcb69ca7722fc8f7e2ed320682b --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 5dad4ad51299..e6d809db15b8 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d7ba07915df8c52b7493b3b24079f35f6e35baf9 +Subproject commit 1f106643af6e7c7de5295f66dbb0893eb3bd1710 From 7ef62b5c166f681edac0ae52d6540010f140bd9a Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 00:32:10 -0700 Subject: [PATCH 0046/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/04c6d9f120c6ba0a9cd46a839f6b0ef62219d8f6 https://github.com/facebook/fbthrift/commit/dbbd4e322b6879c954d28ae92cc0920a52a0af6d https://github.com/facebook/fbzmq/commit/27a76093afa506971dfb693d312cf25d550c32c9 https://github.com/facebook/proxygen/commit/c6be98dcbbf67f83fcaeee73cf8c4bd4d7384b24 https://github.com/facebook/wangle/commit/bd9bff139688d35f7fc6ad8aff057d0224c88641 https://github.com/facebook/watchman/commit/b20b1bd591f796cb0e4ce67f0665c43d310bfa73 https://github.com/facebookincubator/fizz/commit/48f85f9c2ceaf4acf711325a5c24b34c4e820eb6 https://github.com/facebookincubator/katran/commit/a71afe5b8ac88e8134136eb4b60233644c6d66be https://github.com/facebookincubator/mvfst/commit/ffbdb7291561b5fd55352da34eee0545800f3513 https://github.com/rsocket/rsocket-cpp/commit/f0990b2980b8bd6a856c22108ff4f3fec935f665 Reviewed By: yns88 fbshipit-source-id: 098acfbba340f59c503365f528668525d3041e6b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 120aeaa08da9..745ed9905817 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 08b4d371d1c22a3971c9325f2c48d401915f6934 +Subproject commit dbbd4e322b6879c954d28ae92cc0920a52a0af6d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8206d29a1ced..04d7c8cfacea 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1706fa1dbd72862ec0cd2dd61c1ba25c9b2cf225 +Subproject commit bd9bff139688d35f7fc6ad8aff057d0224c88641 From f34946eb0938723ed59dbf242aa239c102e3b61b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 01:15:12 -0700 Subject: [PATCH 0047/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/706c85cf486cf012a54062d638d859ad7476bf0d https://github.com/facebook/fbthrift/commit/bb66f5863852562c15eb366a0d4976da42567ee4 https://github.com/facebook/fbzmq/commit/2b1b48295a5f8aeb9efc2c21ffd756446470cdf7 https://github.com/facebook/proxygen/commit/a17703f0fceb742d875510ea69209c4c0de58139 https://github.com/facebook/wangle/commit/2adf895f94a542138ec4900f90037bdd801355e3 https://github.com/facebook/watchman/commit/7ef62b5c166f681edac0ae52d6540010f140bd9a https://github.com/facebookexperimental/rust-shed/commit/f50c12dbf4a7949d78228cc3987c59c78af643c5 https://github.com/facebookincubator/katran/commit/e0ae1a810d758af4f5e9ad3fce2d4b677ead92e6 https://github.com/facebookincubator/mvfst/commit/4882f4ebd6adc53976c1b867b962ebbfa2576bca https://github.com/facebookincubator/profilo/commit/0cb7453664f4c2b231386df0cad76e9cce9c02d3 Reviewed By: yns88 fbshipit-source-id: 64a9ce6b4fa0770920417a1b21f9d61c89b684d3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 745ed9905817..3126d3ecb176 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit dbbd4e322b6879c954d28ae92cc0920a52a0af6d +Subproject commit bb66f5863852562c15eb366a0d4976da42567ee4 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 04d7c8cfacea..04633c14bd51 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit bd9bff139688d35f7fc6ad8aff057d0224c88641 +Subproject commit 2adf895f94a542138ec4900f90037bdd801355e3 From f48cd1963849709a3e8b768214d5c64fb9211c6c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 01:37:50 -0700 Subject: [PATCH 0048/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/4a71095154dc253fd3464c9f375bc8b5a926d3ed https://github.com/facebook/fbthrift/commit/68631c2a7bd3ee30f3f687129dee5b188a024b64 https://github.com/facebook/fbzmq/commit/e9be1ba288a6bcb159a171987dbb2e40060d8729 https://github.com/facebook/proxygen/commit/61c242f8cf3ff7c91c27d0c9164f9a0e3eea26b9 https://github.com/facebook/watchman/commit/f34946eb0938723ed59dbf242aa239c102e3b61b https://github.com/facebookexperimental/rust-shed/commit/c53c8689c4bd83a7f546bdd7da0cd1d5847fa526 Reviewed By: yns88 fbshipit-source-id: eee974de4647c998eecc9772f249fa3926887fff --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3126d3ecb176..95dcd5cdc64d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bb66f5863852562c15eb366a0d4976da42567ee4 +Subproject commit 68631c2a7bd3ee30f3f687129dee5b188a024b64 From e062e97f6e48a84c0275a4edcd0a3d6f29c1fc58 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 02:18:53 -0700 Subject: [PATCH 0049/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/9a696855058effa9f15112debce8f23719aec2bf https://github.com/facebook/fbzmq/commit/4e87d9e8760254de3d4be596bda084a12dcd46e6 https://github.com/facebook/folly/commit/af0a489dbc1cac6868651da55ca30d723fe28c4e https://github.com/facebook/watchman/commit/f48cd1963849709a3e8b768214d5c64fb9211c6c https://github.com/facebookexperimental/rust-shed/commit/8fcc2122e2fbfb54671e385c8974e75b2a6d6360 Reviewed By: yns88 fbshipit-source-id: 431fe584eb357491f3572b2a225ebdbecda17613 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e6d809db15b8..e4f0fdcadc6b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1f106643af6e7c7de5295f66dbb0893eb3bd1710 +Subproject commit af0a489dbc1cac6868651da55ca30d723fe28c4e From 535d77c849291cd1393b599171804e6cf2340be9 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 02:45:14 -0700 Subject: [PATCH 0050/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ab9bd3a958fa8f15ff1a912d8940a5f44506a41f https://github.com/facebook/fbthrift/commit/4b1e82144ce2791ca6c158340831994411228618 https://github.com/facebook/fbzmq/commit/27f49a1388fb002420ff119cd9943f036b023c1b https://github.com/facebook/proxygen/commit/7187d5cfc32d8a63e1aa5620b70c7cc94dbf5fe6 https://github.com/facebook/wangle/commit/d68caa3a69658435eec8b6895f1974eee55ded3a https://github.com/facebook/watchman/commit/e062e97f6e48a84c0275a4edcd0a3d6f29c1fc58 https://github.com/facebookincubator/fizz/commit/12c62b40b7e0c23dc02290eb66918936ceee7189 https://github.com/facebookincubator/katran/commit/40bf79df6d00e226e303f483888905f84663fd7e https://github.com/facebookincubator/mvfst/commit/ab43cfbc95691afcdaac2306cc6482a31b387868 https://github.com/rsocket/rsocket-cpp/commit/a10ef77672bae8c957022b1e9360eece67910434 Reviewed By: yns88 fbshipit-source-id: 2a178b7336985671e8d96aa2664becff81781d01 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 95dcd5cdc64d..8981d6dd865d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 68631c2a7bd3ee30f3f687129dee5b188a024b64 +Subproject commit 4b1e82144ce2791ca6c158340831994411228618 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 04633c14bd51..1a0005b5eb99 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2adf895f94a542138ec4900f90037bdd801355e3 +Subproject commit d68caa3a69658435eec8b6895f1974eee55ded3a From d07231a50e9105fd83604f84d182fb030fdbb107 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 03:10:06 -0700 Subject: [PATCH 0051/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/fb9fc410d4f7c5f4840965c4691926995181d9f5 https://github.com/facebook/fbthrift/commit/c75c1f6eeb471ec1c1d6248012ef62774f8a7657 https://github.com/facebook/fbzmq/commit/ed86caeca5cf6bd964de985609bd558a60127c86 https://github.com/facebook/proxygen/commit/4375c4a3caeb631231af032b945a8414a00a905e https://github.com/facebook/wangle/commit/4eb00866237a54d0b659333e497ad9a4fece2c8a https://github.com/facebook/watchman/commit/535d77c849291cd1393b599171804e6cf2340be9 https://github.com/facebookexperimental/rust-shed/commit/67aa8e2c215de192d9726c58db3fe3e6a30a0493 https://github.com/facebookincubator/katran/commit/d64a471d9f9cd9d0613a73e390231296472955af https://github.com/facebookincubator/mvfst/commit/c31ce62950c15371ef03da2673642fb7029da4bf Reviewed By: yns88 fbshipit-source-id: c219dd8616917b9fedfad87349e58e97deb23b84 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8981d6dd865d..a3548ebeca65 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4b1e82144ce2791ca6c158340831994411228618 +Subproject commit c75c1f6eeb471ec1c1d6248012ef62774f8a7657 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1a0005b5eb99..9f6db154d30b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d68caa3a69658435eec8b6895f1974eee55ded3a +Subproject commit 4eb00866237a54d0b659333e497ad9a4fece2c8a From 739b60bbf8945e625b924f8cb0f1bd0d75fb8936 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 03:47:46 -0700 Subject: [PATCH 0052/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/f6dd2211749cb87abb9bd137609a3e2af9a29a61 https://github.com/facebook/fbthrift/commit/580e1c7989a2f3ee114ad2d367401d73accbd766 https://github.com/facebook/fbzmq/commit/88fb88ceb0d8058148d75c08aebc56b0638baa30 https://github.com/facebook/litho/commit/3441e493a44740b8e772e7a495b030738f9dbd7c https://github.com/facebook/proxygen/commit/888be7fffa870a985325f1b7a639b2ea480e8c6c https://github.com/facebook/watchman/commit/d07231a50e9105fd83604f84d182fb030fdbb107 https://github.com/facebookexperimental/rust-shed/commit/f92e4031b64c396ab7eb48506764b3fa7492e3c2 Reviewed By: yns88 fbshipit-source-id: 97bba8cf36424b71ccd6a10bce0e66f5f16a0649 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a3548ebeca65..87be0b6cfc28 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c75c1f6eeb471ec1c1d6248012ef62774f8a7657 +Subproject commit 580e1c7989a2f3ee114ad2d367401d73accbd766 From 4b8cdea14cd95eabd7c6ea96b90d7cf957bc398d Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 06:18:51 -0700 Subject: [PATCH 0053/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/90d302447732dea5ffa90b363a6b63178d6762bf Reviewed By: yns88 fbshipit-source-id: a37d714338fd5545c16ff27965be86d0a1f3570b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 87be0b6cfc28..11f4fb5d0f2e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 580e1c7989a2f3ee114ad2d367401d73accbd766 +Subproject commit 90d302447732dea5ffa90b363a6b63178d6762bf From af36845620cb22be349feb6a26ed67afee41aaf5 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 08:31:52 -0700 Subject: [PATCH 0054/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/94a4dcebddc73af9ddb8c06b3d890465586323bb https://github.com/facebook/litho/commit/bdbd2911990fcaf464842167cee974ab12338d72 Reviewed By: yns88 fbshipit-source-id: c35025e4e1ff710428af8919eb0a08519583b757 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 11f4fb5d0f2e..8c4b313c2cdc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 90d302447732dea5ffa90b363a6b63178d6762bf +Subproject commit 94a4dcebddc73af9ddb8c06b3d890465586323bb From bc28c5ed0fb18368c61ca2f6021be0881262d7b9 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 11:18:40 -0700 Subject: [PATCH 0055/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/120926cdbf20496eba553cc6c62b7499cfdcdd96 Reviewed By: yns88 fbshipit-source-id: e336af93285a558078bda50e0bd268a7bd8fc204 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e4f0fdcadc6b..4af19890248b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit af0a489dbc1cac6868651da55ca30d723fe28c4e +Subproject commit 120926cdbf20496eba553cc6c62b7499cfdcdd96 From 544eda60323822095f9b8faed8dfaadf542cdf2e Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 12:12:07 -0700 Subject: [PATCH 0056/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/9406a0a725c59f9feca20f29c7fa2c6c4c76a662 https://github.com/facebook/fbthrift/commit/e4b9256f5f317fe8b3c0212605dc4edfc6d33324 https://github.com/facebook/fbzmq/commit/e0d34dcae963397f7d15dc253103acf48190a5a7 https://github.com/facebook/litho/commit/123081476b60dcc5004e8c43728d883971222c2a https://github.com/facebook/proxygen/commit/909a7b377d54e134e63c365a7b5cf70700b1a662 https://github.com/facebook/wangle/commit/6d967996a7dfd2d04310b2d3f3200db058ac755c https://github.com/facebook/watchman/commit/bc28c5ed0fb18368c61ca2f6021be0881262d7b9 https://github.com/facebookincubator/fizz/commit/08241d2498c413ae4ae50ac9fbce2ffedcaa8387 https://github.com/facebookincubator/katran/commit/16afdf2a895280e9eed0b07b199d2f64bb102643 https://github.com/facebookincubator/mvfst/commit/64f5bef865b0034ed21e55921fa695d9fe08fe74 https://github.com/rsocket/rsocket-cpp/commit/b7338ffa3e471f15cf976f3d51410ce98c38046f Reviewed By: yns88 fbshipit-source-id: a59498e3e96579be6abd22cbf5c8408e46ced271 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8c4b313c2cdc..8868003c40e0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 94a4dcebddc73af9ddb8c06b3d890465586323bb +Subproject commit e4b9256f5f317fe8b3c0212605dc4edfc6d33324 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9f6db154d30b..2b60b821a114 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 4eb00866237a54d0b659333e497ad9a4fece2c8a +Subproject commit 6d967996a7dfd2d04310b2d3f3200db058ac755c From ab9a330e0fbee0d83acf3b469fbdfcddbda3ec00 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 13:05:12 -0700 Subject: [PATCH 0057/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/2a0b39730ecac33e5699adca4f7b9f934c1236db https://github.com/facebook/fbthrift/commit/4f1e9a0d28441f1fe7aff62baf946f3975e92911 https://github.com/facebook/fbzmq/commit/a53ead799bbf3858fa591c91dc15875fbf5b5c04 https://github.com/facebook/folly/commit/6bfd387921c53e8bbdef4b38301fb52925411bf4 https://github.com/facebook/litho/commit/6c3e2ea13142ab9c1986bd1a0582e0e2c9f5c165 https://github.com/facebook/proxygen/commit/a1f3a1eef6b22543aa41e7e5110566789da58147 https://github.com/facebook/wangle/commit/cba86b481bf15b8fcc937abde64b90ddc0e1db55 https://github.com/facebook/watchman/commit/544eda60323822095f9b8faed8dfaadf542cdf2e https://github.com/facebookexperimental/rust-shed/commit/51f4ba81ea4027c40fc2d1612ed99f8cd4996cec https://github.com/facebookincubator/fizz/commit/c58600b7e717d9f09f556cfdb24a275c6e44a9aa https://github.com/facebookincubator/katran/commit/379e48297f8933e18443cdacba22157be02db2e5 https://github.com/facebookincubator/mvfst/commit/7ae92adbb852f037be0b3dcb83ad0037354485a3 https://github.com/pytorch/fbgemm/commit/e8bf32a75d5fe4e3a55b6d59fcc3fa55e8474be3 Reviewed By: yns88 fbshipit-source-id: 1d421ea8c96fbf1c6ab047b72372aa0974479d23 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8868003c40e0..86ffa3bef076 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e4b9256f5f317fe8b3c0212605dc4edfc6d33324 +Subproject commit 4f1e9a0d28441f1fe7aff62baf946f3975e92911 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4af19890248b..963735d4bcd1 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 120926cdbf20496eba553cc6c62b7499cfdcdd96 +Subproject commit 6bfd387921c53e8bbdef4b38301fb52925411bf4 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2b60b821a114..1585c6c5bc12 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6d967996a7dfd2d04310b2d3f3200db058ac755c +Subproject commit cba86b481bf15b8fcc937abde64b90ddc0e1db55 From 2b7c1489229983822a263e572a4049c31e6fda78 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 13:30:29 -0700 Subject: [PATCH 0058/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/65ec0b0aba136d8bd89d3c7a47ada2eb6694b1f3 https://github.com/facebook/fbthrift/commit/93b27b8dd667d49d62c0c7bcfb1cdd42631358ed https://github.com/facebook/fbzmq/commit/cdb0e101bad4bd0a0cfb489c89879445e7febc27 https://github.com/facebook/proxygen/commit/1db4d8dadff429a4423c814582592442cbbea381 https://github.com/facebook/wangle/commit/c88f6b8f4ef817cae3b5e85c31987dcd23f3990b https://github.com/facebook/watchman/commit/ab9a330e0fbee0d83acf3b469fbdfcddbda3ec00 https://github.com/facebookexperimental/rust-shed/commit/2e8639b5d3d4a5e38f82ca871da043caf3b8404f https://github.com/facebookincubator/fizz/commit/564285ea436dfdabb2d8e56547ee5f754528d75c https://github.com/facebookincubator/katran/commit/2f827869b5f2eab953b44d159eca12dc68534124 https://github.com/facebookincubator/mvfst/commit/2c09c73d85634ba65f36c2b59be01f4958dbc88a https://github.com/rsocket/rsocket-cpp/commit/ab1507f3e9f6a9d0039483ea6bbb657a0fcdf962 Reviewed By: yns88 fbshipit-source-id: 2e3c9c61643ffc9cb93d2c1bf3aad5a78d0ac762 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 86ffa3bef076..19ca84b5d9da 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4f1e9a0d28441f1fe7aff62baf946f3975e92911 +Subproject commit 93b27b8dd667d49d62c0c7bcfb1cdd42631358ed diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1585c6c5bc12..7f155f6a124b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit cba86b481bf15b8fcc937abde64b90ddc0e1db55 +Subproject commit c88f6b8f4ef817cae3b5e85c31987dcd23f3990b From 9e50977f23d9fa20cf9c3649199476466ee79941 Mon Sep 17 00:00:00 2001 From: Shai Szulanski Date: Wed, 30 Jun 2021 13:57:00 -0700 Subject: [PATCH 0059/7387] Regen github actions (#1614) Summary: Pull Request resolved: https://github.com/facebook/folly/pull/1614 Reviewed By: yfeldblum Differential Revision: D29496725 fbshipit-source-id: 7c726e3e310eb28cf33603ebd83df6d832488369 --- .github/workflows/getdeps_linux.yml | 2 -- .github/workflows/getdeps_mac.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/.github/workflows/getdeps_linux.yml b/.github/workflows/getdeps_linux.yml index 6b300797a05f..ad36aa6b47fc 100644 --- a/.github/workflows/getdeps_linux.yml +++ b/.github/workflows/getdeps_linux.yml @@ -15,8 +15,6 @@ jobs: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v1 - - name: Install system deps - run: sudo python3 build/fbcode_builder/getdeps.py install-system-deps --recursive watchman - name: Fetch boost run: python3 build/fbcode_builder/getdeps.py fetch --no-tests boost - name: Fetch rust diff --git a/.github/workflows/getdeps_mac.yml b/.github/workflows/getdeps_mac.yml index 5acd26d68d81..955c8e924b5d 100644 --- a/.github/workflows/getdeps_mac.yml +++ b/.github/workflows/getdeps_mac.yml @@ -15,8 +15,6 @@ jobs: runs-on: macOS-latest steps: - uses: actions/checkout@v1 - - name: Install system deps - run: sudo python3 build/fbcode_builder/getdeps.py install-system-deps --recursive watchman - name: Fetch boost run: python3 build/fbcode_builder/getdeps.py fetch --no-tests boost - name: Fetch rust From b2f3bb1deda7110546c89e5f616b40575222bdf4 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 14:20:17 -0700 Subject: [PATCH 0060/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/dc20ee49a00173a333f74dcef67d486cf7f02650 https://github.com/facebook/fbthrift/commit/9d976a39074d466de2c062a0fc1d7e0d4f27802b https://github.com/facebook/fbzmq/commit/2d018bbc3a6c406913045b124444d152e165bead https://github.com/facebook/folly/commit/1583ff067cdcd7a40eb0cecb5a5a9eb9518948dd https://github.com/facebook/proxygen/commit/19ed0bca0fa75f6d54c062da707f7e8ae82509ba https://github.com/facebook/rocksdb/commit/41c4b665f4c6c9ec17be7b75e1be63c13a3af1ab https://github.com/facebook/wangle/commit/27ab80e07c265aaf2fcda6bf00b43baa9264a13e https://github.com/facebook/watchman/commit/9e50977f23d9fa20cf9c3649199476466ee79941 https://github.com/facebookexperimental/rust-shed/commit/14e689782e79aa79cd02cb690128c880879469b5 https://github.com/facebookexternal/stl_tasks/commit/1c6baa3fbca54347ae7281058bf8931c603cff27 https://github.com/facebookincubator/fizz/commit/762110534f875c84e77b4723d6d0988e3a97a667 https://github.com/facebookincubator/katran/commit/03d14489ff05487c4c45b98f0586ca7c9cd7d2de https://github.com/facebookincubator/mvfst/commit/aa619fc12241d848e6a737f5547441cc10db58f0 Reviewed By: yns88 fbshipit-source-id: 03f5127b546c40605f72ac7863818570084fda4d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 19ca84b5d9da..a52b15ce6a61 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 93b27b8dd667d49d62c0c7bcfb1cdd42631358ed +Subproject commit 9d976a39074d466de2c062a0fc1d7e0d4f27802b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 963735d4bcd1..6e5e32c0e783 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 6bfd387921c53e8bbdef4b38301fb52925411bf4 +Subproject commit 1583ff067cdcd7a40eb0cecb5a5a9eb9518948dd diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7f155f6a124b..733e0ab02b85 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c88f6b8f4ef817cae3b5e85c31987dcd23f3990b +Subproject commit 27ab80e07c265aaf2fcda6bf00b43baa9264a13e From 600d46ee46d975e6797ac8692ea349f922eaa17c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 14:38:53 -0700 Subject: [PATCH 0061/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/f8293927db2267eaa5004e471760d45fab834703 https://github.com/facebook/fbthrift/commit/8c5ea9458a356ba2a64fdb6f79da5ffeefa9900a https://github.com/facebook/fbzmq/commit/a78ca95632ba237bad3a140239f49c86bc8a43ee https://github.com/facebook/proxygen/commit/060d6297007d55ac86659dfd33dc23f116652d3a https://github.com/facebook/wangle/commit/c7a4d2de7d4d9d3eb72680ff67a2929fad7f5b43 https://github.com/facebook/watchman/commit/b2f3bb1deda7110546c89e5f616b40575222bdf4 https://github.com/facebookexperimental/rust-shed/commit/6813a238dcaa105d378b490ac34fc1be013dbe9b https://github.com/facebookincubator/fizz/commit/4896b8ebbe5c3702379e4ea9d2eaf7686282e8a6 https://github.com/facebookincubator/katran/commit/82f8bb298191e1daba3b5015ad5971fa0f52d2ec https://github.com/facebookincubator/mvfst/commit/d8e7d563ce019481f603cf738a7500c0dda7e65c https://github.com/rsocket/rsocket-cpp/commit/1817f91f7df604f5ac3e9ab3d0d822a678063e94 Reviewed By: yns88 fbshipit-source-id: 6e342736765234228975a46b46e2c67aa634265b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a52b15ce6a61..15568f48a33d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9d976a39074d466de2c062a0fc1d7e0d4f27802b +Subproject commit 8c5ea9458a356ba2a64fdb6f79da5ffeefa9900a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 733e0ab02b85..dcfab7afba3c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 27ab80e07c265aaf2fcda6bf00b43baa9264a13e +Subproject commit c7a4d2de7d4d9d3eb72680ff67a2929fad7f5b43 From 863c1cf7b14e351df37fa0573115f7e42f0480cf Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 15:08:03 -0700 Subject: [PATCH 0062/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/cfbc503acc9bb64969155ae9c6ca0b6ef3dd50ce https://github.com/facebook/fbthrift/commit/890ea56b1953fc6ba3f6e1b6ba8822ea3721937c https://github.com/facebook/fbzmq/commit/8c541c30c91909ec24beed731bf7cb5a4b03b6e1 https://github.com/facebook/litho/commit/d5c3ef6aac79fd99679f0f2f2ac2570d92130680 https://github.com/facebook/proxygen/commit/db57d69358355d6bd166dac434a1598c1595b881 https://github.com/facebook/wangle/commit/c8ad2dee1d0b1cbdb75b2b07640c4cc7625ba997 https://github.com/facebook/watchman/commit/600d46ee46d975e6797ac8692ea349f922eaa17c https://github.com/facebookexperimental/rust-shed/commit/a84db526c78c49f689690d83e5415c1ba353e085 https://github.com/facebookincubator/katran/commit/636c51e6e97269936386e18acc522b7bc719b73d https://github.com/facebookincubator/mvfst/commit/ca4d01c26d8f3d9aa6741d5f6ac571de2a41fb02 Reviewed By: yns88 fbshipit-source-id: 119b2a9ed16f524c68337046e71674e35834f888 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 15568f48a33d..66ed6e97e0dd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8c5ea9458a356ba2a64fdb6f79da5ffeefa9900a +Subproject commit 890ea56b1953fc6ba3f6e1b6ba8822ea3721937c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index dcfab7afba3c..a1572e1de61e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c7a4d2de7d4d9d3eb72680ff67a2929fad7f5b43 +Subproject commit c8ad2dee1d0b1cbdb75b2b07640c4cc7625ba997 From 3dab6fc51f840b7f2725c3b0bb34084842fe71d1 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 15:45:36 -0700 Subject: [PATCH 0063/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/dd64fb1f154e56d170cef5ffb5c1c3d61074e3de https://github.com/facebook/fbthrift/commit/e874547791c8e91ddc5273e2e38ac85b45e7e337 https://github.com/facebook/fbzmq/commit/fb00269e96a6324ee64d8c8263557cd41e9f2b3a https://github.com/facebook/proxygen/commit/b268d2b356b53acec90a15b19090ecf701c31ac0 https://github.com/facebook/watchman/commit/863c1cf7b14e351df37fa0573115f7e42f0480cf https://github.com/facebookexperimental/rust-shed/commit/e02b8e21015479a1f820cb9a3a81ae01577b8d44 Reviewed By: yns88 fbshipit-source-id: 60ba9047debde9d0d4a17c8e67a7abe7848c9a33 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 66ed6e97e0dd..53a4330dd368 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 890ea56b1953fc6ba3f6e1b6ba8822ea3721937c +Subproject commit e874547791c8e91ddc5273e2e38ac85b45e7e337 From 0c58f1b7bf04a575adf4168bc3014e4f80aa0028 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 18:00:25 -0700 Subject: [PATCH 0064/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/17eabb9639caae39d8112da430e6af1dc2c52b22 https://github.com/facebook/rocksdb/commit/ba224b75c7362897df8c0da97f5fb04594c4664b Reviewed By: yns88 fbshipit-source-id: 218d2103f48e51101e5ff26ecd8bb02a36211967 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 53a4330dd368..d9f748447560 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e874547791c8e91ddc5273e2e38ac85b45e7e337 +Subproject commit 17eabb9639caae39d8112da430e6af1dc2c52b22 From 5c87fcb705f89b5a70d64f7a0185791ece2e7064 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 18:55:23 -0700 Subject: [PATCH 0065/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/1914e3a8851ecb546c9affdc1ef8afadb096c562 https://github.com/facebook/fbthrift/commit/c3f62e8d3c595f2ee2e0f60da0229591758e348c https://github.com/facebook/fbzmq/commit/6a2dc0e9e04ab5e90d031c9ef9cd4e58370a6920 https://github.com/facebook/watchman/commit/0c58f1b7bf04a575adf4168bc3014e4f80aa0028 https://github.com/facebookexperimental/rust-shed/commit/3bed639260f48c547c69ad0d8e8da514d2eaa9ca Reviewed By: yns88 fbshipit-source-id: acf41ab57ef927d49a03fff16a27f1d3ce8d1aed --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d9f748447560..d1e97b8ce400 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 17eabb9639caae39d8112da430e6af1dc2c52b22 +Subproject commit c3f62e8d3c595f2ee2e0f60da0229591758e348c From f98506f64a780a9b6855e5da1eeb502fe2e63708 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 20:33:49 -0700 Subject: [PATCH 0066/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5caa6b3ccb1e9b9b79047a8ffb15a8fb1aa1624f Reviewed By: yns88 fbshipit-source-id: d9ce14adb0008b2f465fa80e3d61cc116cd9b1a7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d1e97b8ce400..ea43afcb7bc6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c3f62e8d3c595f2ee2e0f60da0229591758e348c +Subproject commit 5caa6b3ccb1e9b9b79047a8ffb15a8fb1aa1624f From 8aab19b9df7f9e7d0d8f3ba79c5c541a1857fe34 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 20:59:08 -0700 Subject: [PATCH 0067/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/bae5b8c838172271a44b37a613be5710f22fb62b https://github.com/facebook/fbzmq/commit/9aa6b02cae926f7432ed038139f0cebfd5e2c3f9 https://github.com/facebook/folly/commit/d6610d6074ae12417a60a1f4457b715aed833bf6 https://github.com/facebook/watchman/commit/f98506f64a780a9b6855e5da1eeb502fe2e63708 https://github.com/facebookexperimental/rust-shed/commit/f38fd511e98fb4ad5922f08ff03be49e10052dd7 Reviewed By: yns88 fbshipit-source-id: 1bed7d4f30c1e278a0fcfb85c08f73d4549c7098 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6e5e32c0e783..adf97cab4658 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1583ff067cdcd7a40eb0cecb5a5a9eb9518948dd +Subproject commit d6610d6074ae12417a60a1f4457b715aed833bf6 From 4b94c2484de124e385c4ee3cf006e80fb7e1ff24 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 21:26:26 -0700 Subject: [PATCH 0068/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/0b9d441b29ce3922928eb986f68ccba50012402c https://github.com/facebook/fbthrift/commit/339c64b1284f7fa5f353ff91bfb3eb26681776df https://github.com/facebook/fbzmq/commit/87e00f4ad0452a1ce6908f95342f17c66560f2d6 https://github.com/facebook/proxygen/commit/7a48ed3e4799213a764506209a394ce72a8e5786 https://github.com/facebook/wangle/commit/f76db71d2166aadfc7f966aee1f915d86f73ab95 https://github.com/facebook/watchman/commit/8aab19b9df7f9e7d0d8f3ba79c5c541a1857fe34 https://github.com/facebookincubator/fizz/commit/4e99f9a44668900334b22c56dbd6574ad0c40eb1 https://github.com/facebookincubator/katran/commit/b0a497bae97cdcd4f7d5af683b145d3f7b243d66 https://github.com/facebookincubator/mvfst/commit/ac51903047cd69d6232f01aa5f1f0c74942142ba https://github.com/rsocket/rsocket-cpp/commit/863210632f1ee9a057a59a2141b62861f113da11 Reviewed By: yns88 fbshipit-source-id: 76bc2fc6145f19212f21584344a5981ed49ed547 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ea43afcb7bc6..3df5f357357b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5caa6b3ccb1e9b9b79047a8ffb15a8fb1aa1624f +Subproject commit 339c64b1284f7fa5f353ff91bfb3eb26681776df diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a1572e1de61e..a800aac706b9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c8ad2dee1d0b1cbdb75b2b07640c4cc7625ba997 +Subproject commit f76db71d2166aadfc7f966aee1f915d86f73ab95 From 26b74370fbbbf94c06c19137a30a3699bb752ff8 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 21:50:05 -0700 Subject: [PATCH 0069/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/55492f0fc8f672ed88829e981776c4308cf43fd1 https://github.com/facebook/fbthrift/commit/440b0599b9d172e2b46ca74781b4362ea43928ad https://github.com/facebook/fbzmq/commit/c6ef449c24313ed09f67a24830dcebb097912780 https://github.com/facebook/proxygen/commit/16179a2345c9bd0b9ab7565050eaf3ccfdf63deb https://github.com/facebook/wangle/commit/7bc0d4c16887878741a8b7373779ffd50207545a https://github.com/facebook/watchman/commit/4b94c2484de124e385c4ee3cf006e80fb7e1ff24 https://github.com/facebookexperimental/rust-shed/commit/6a2235495e8bcc10f303c625f9920386e1dbd242 https://github.com/facebookincubator/katran/commit/cdae89e757c926467abf66746a9585c8c3c0811f https://github.com/facebookincubator/mvfst/commit/963391dae30ba7ea9494dfbcf4ec08256789d4a0 Reviewed By: yns88 fbshipit-source-id: b050134b11920b4092a628abb34f7d27e20fde12 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3df5f357357b..96d46d6f3fc7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 339c64b1284f7fa5f353ff91bfb3eb26681776df +Subproject commit 440b0599b9d172e2b46ca74781b4362ea43928ad diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a800aac706b9..e4577418aeb4 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f76db71d2166aadfc7f966aee1f915d86f73ab95 +Subproject commit 7bc0d4c16887878741a8b7373779ffd50207545a From 86126065b649f53cfbc60bff44515e2c4a33a768 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 30 Jun 2021 22:47:16 -0700 Subject: [PATCH 0070/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/72a92f765220647744f07ea7f2c8fc07cc5c7833 https://github.com/facebook/fbthrift/commit/f56b6bfeeb160907ee0a6c372dc59d3b7c7050b9 https://github.com/facebook/fbzmq/commit/a1076c2048b0221422af7b71c52b5aa7c3f095c9 https://github.com/facebook/proxygen/commit/78cbfd8e6a0230087810f64d464c02df9fd2c8bc https://github.com/facebook/watchman/commit/26b74370fbbbf94c06c19137a30a3699bb752ff8 https://github.com/facebookexperimental/rust-shed/commit/3db2fc65c8ac47a0a064d5892169243ab77df9f4 https://github.com/pytorch/fbgemm/commit/f556e9309a77e816e16ae05cbfec3c5405241735 Reviewed By: yns88 fbshipit-source-id: 777e912885b13914e9e4b95605c338554d83ca7f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 96d46d6f3fc7..1eefc2b3cab2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 440b0599b9d172e2b46ca74781b4362ea43928ad +Subproject commit f56b6bfeeb160907ee0a6c372dc59d3b7c7050b9 From acad0f6fe626141af7b9b532c7d8643b1b94cf6e Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 1 Jul 2021 01:35:08 -0700 Subject: [PATCH 0071/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/88c8c91ec8368140965187da5145a86c1624ef29 Reviewed By: yns88 fbshipit-source-id: 22a927bccbb7c6cc7c9e0bc403069dd294494a3f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1eefc2b3cab2..23ffd7214dd2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f56b6bfeeb160907ee0a6c372dc59d3b7c7050b9 +Subproject commit 88c8c91ec8368140965187da5145a86c1624ef29 From f78d4f95b18bb3c2bb2a9e96325e35e7da059731 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 1 Jul 2021 02:47:37 -0700 Subject: [PATCH 0072/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/631d6c15044717fc8e83e2bdca5dcc3f9ed1eb2b Reviewed By: yns88 fbshipit-source-id: 0a6b3fd69640d15d6bde88d57feb6758e7b096af --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 23ffd7214dd2..35fc37a8ec79 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 88c8c91ec8368140965187da5145a86c1624ef29 +Subproject commit 631d6c15044717fc8e83e2bdca5dcc3f9ed1eb2b From 5535a29f3bf500a9f00326c1e7c54234f79104a6 Mon Sep 17 00:00:00 2001 From: Xavier Deguillard Date: Thu, 1 Jul 2021 09:12:13 -0700 Subject: [PATCH 0073/7387] win: add --return-nonzero-on-failures to sc_testpilot Summary: For whatever reason, sc_testpilot default to --return-zero-on-failures, which means that test failures are simply not reported properly to the signal box. Fix that by explicitely passing --return-nonzero-on-failures Reviewed By: fanzeyi Differential Revision: D29509158 fbshipit-source-id: ef991f91df48e99769f96ffd8d7015cdf507c723 --- build/fbcode_builder/getdeps/builder.py | 1 + 1 file changed, 1 insertion(+) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index addddea05991..4e523c2dca4f 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -741,6 +741,7 @@ def list_tests(): "--test-config", "platform=%s" % machine_suffix, "buildsystem=getdeps", + "--return-nonzero-on-failures", ] else: testpilot_args = [ From 37afb82fbbeeec7716fa2e5fa4bc6b913d755446 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 1 Jul 2021 09:55:41 -0700 Subject: [PATCH 0074/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/1741a45778f08c428689f360ab9c066478e31412 https://github.com/facebook/fbthrift/commit/1c4d126b5c6d709a35272ede9f905619c479e5d0 https://github.com/facebook/fbzmq/commit/0c624405be44c980b7db483c5825e2d249047e36 https://github.com/facebook/folly/commit/73484b8ab6173f0247f814a1f3a8055c016387f5 https://github.com/facebook/proxygen/commit/b810d2701cce10db5a59c8f5e5e5d1aeb0c6a16d https://github.com/facebook/wangle/commit/11c3ed47e570a1b65e6252f7a12a72f25ccba9a0 https://github.com/facebook/watchman/commit/5535a29f3bf500a9f00326c1e7c54234f79104a6 https://github.com/facebookexperimental/rust-shed/commit/3366196eb9ef901fd69b0e0130d6a3f6ebba893d https://github.com/facebookincubator/fizz/commit/10fddf459a538413397d4aa33658ebf16c1a14f9 https://github.com/facebookincubator/katran/commit/100cdece31d5bae36ac7513c96d49f3511e609c5 https://github.com/facebookincubator/mvfst/commit/e27a6f9ccb6c55cfa7477fb4ece428775417c897 https://github.com/rsocket/rsocket-cpp/commit/b4966a7dbc088db7112019318aac2a9d8c0c7787 Reviewed By: yns88 fbshipit-source-id: 3201cc498993c12b7bffaece4cb64ce4826be6b7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 35fc37a8ec79..d7e9f31524c0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 631d6c15044717fc8e83e2bdca5dcc3f9ed1eb2b +Subproject commit 1c4d126b5c6d709a35272ede9f905619c479e5d0 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index adf97cab4658..e3806b056689 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d6610d6074ae12417a60a1f4457b715aed833bf6 +Subproject commit 73484b8ab6173f0247f814a1f3a8055c016387f5 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e4577418aeb4..25f8126f4a9d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7bc0d4c16887878741a8b7373779ffd50207545a +Subproject commit 11c3ed47e570a1b65e6252f7a12a72f25ccba9a0 From 20e43d891e25f6739c4d676a940e42a7b2ab41a2 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 1 Jul 2021 10:24:39 -0700 Subject: [PATCH 0075/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c14b17bcdc49672cf77c58a31fae859fe7116075 https://github.com/facebook/fbthrift/commit/35ba07dc8b8ff1a09c376b23c6550a364941fa2c https://github.com/facebook/fbzmq/commit/75cba07c5fe3a6c386a9c1903cfb4175f9717b3c https://github.com/facebook/proxygen/commit/4eaf14b8a2ec32e9e73baaed59d93b73283c5d39 https://github.com/facebook/wangle/commit/b303515584880aaf66a76a119446e67bbab9ee9f https://github.com/facebook/watchman/commit/37afb82fbbeeec7716fa2e5fa4bc6b913d755446 https://github.com/facebookexperimental/rust-shed/commit/e9a90eaa82be51a7ba3b10b2d6395b05aac9c429 https://github.com/facebookincubator/fizz/commit/f732a04697249dbd3a57ce67b167d2efe435ecfe https://github.com/facebookincubator/katran/commit/bb1e9d0e60795c2e5a7cc2d87e7742560a71e93b https://github.com/facebookincubator/mvfst/commit/a4aa02708679d8712ac5e28691b88c34cffb1eb0 https://github.com/rsocket/rsocket-cpp/commit/a2e23838a07ef53809b2f716f145629e353221d1 Reviewed By: yns88 fbshipit-source-id: b786ce2d287edbd60d1f4a4a78ff90fa5a7fad5b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d7e9f31524c0..c18f9d897b87 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1c4d126b5c6d709a35272ede9f905619c479e5d0 +Subproject commit 35ba07dc8b8ff1a09c376b23c6550a364941fa2c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 25f8126f4a9d..271de8b60dc7 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 11c3ed47e570a1b65e6252f7a12a72f25ccba9a0 +Subproject commit b303515584880aaf66a76a119446e67bbab9ee9f From c4cabd6e2d244284d4991ad30553b99743624b6a Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 1 Jul 2021 10:54:31 -0700 Subject: [PATCH 0076/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/cf62fecd394809cf5c6e5f5f84acbea336569ff8 https://github.com/facebook/fbthrift/commit/0c623dc63913cb30440d0c604ac56e8e820925a1 https://github.com/facebook/fbzmq/commit/18117870f172ee91c8950b63c937e9512b9d28f9 https://github.com/facebook/litho/commit/2df897e9facc763648278f0f8655abd674519281 https://github.com/facebook/proxygen/commit/6c6b99ad8e1fda92b5b9d9932f91742d0a99f8db https://github.com/facebook/wangle/commit/61083e357f7ba799274afb481d319276f365845f https://github.com/facebook/watchman/commit/20e43d891e25f6739c4d676a940e42a7b2ab41a2 https://github.com/facebookexperimental/rust-shed/commit/0d93607d621c72037d2fd0a7f80456258bdbe732 https://github.com/facebookincubator/katran/commit/1744033627c79d3951c469710ce5b2f21d125185 https://github.com/facebookincubator/mvfst/commit/169a3ef36d55e4ecda8387c5ce329eb01315671a Reviewed By: yns88 fbshipit-source-id: 8341758180f982df7c59eb12aba956a696709e0f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c18f9d897b87..ddb223f9a2cd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 35ba07dc8b8ff1a09c376b23c6550a364941fa2c +Subproject commit 0c623dc63913cb30440d0c604ac56e8e820925a1 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 271de8b60dc7..fe99618f36aa 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b303515584880aaf66a76a119446e67bbab9ee9f +Subproject commit 61083e357f7ba799274afb481d319276f365845f From 7281ec8c8562496b5ecb2ccd58dfe5fd9c0188c7 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 1 Jul 2021 12:51:05 -0700 Subject: [PATCH 0077/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/96899e60329a27e5cb956610ddf5f2e89ad3a7a3 https://github.com/facebook/fbthrift/commit/6c2a7567772f3954006c77a8bdc041df83802a00 https://github.com/facebook/fbzmq/commit/52d52b9f533213ab46e85f4925768f528059e38b https://github.com/facebook/proxygen/commit/051cdf8eabf19cf524940f32e7e5b034d701ffb0 https://github.com/facebook/rocksdb/commit/41d32152cede8f93c011cb48b92392911f1c69bd https://github.com/facebook/watchman/commit/c4cabd6e2d244284d4991ad30553b99743624b6a https://github.com/facebookexperimental/rust-shed/commit/f05452db7449bde7a3c0dcb72d8db0dccf5c3a49 https://github.com/facebookincubator/katran/commit/74619b17d83f160aff60a9924139c1ba317a47d5 Reviewed By: yns88 fbshipit-source-id: 7679f3e304965e6142c28ce08d7080e6c158cb41 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ddb223f9a2cd..d41644a23d18 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0c623dc63913cb30440d0c604ac56e8e820925a1 +Subproject commit 6c2a7567772f3954006c77a8bdc041df83802a00 From 20cccb985a7f012b29bf0ec0f1c248f63ba303f0 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Thu, 1 Jul 2021 14:20:13 -0700 Subject: [PATCH 0078/7387] use noautodeps to make autodeps "work" on watchman Summary: As a first step to cleaning up the Watchman dependency story, enable autodeps on the root targets by explicitly opting them all out. Reviewed By: xavierd Differential Revision: D29475318 fbshipit-source-id: 5d38ef20cf2398af19b3d42b0d8d43a5447d93ca --- watchman/watchman_system.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/watchman_system.h b/watchman/watchman_system.h index eabdbecd2c6a..7228be641570 100644 --- a/watchman/watchman_system.h +++ b/watchman/watchman_system.h @@ -143,7 +143,7 @@ size_t backtrace_from_exception( #include #endif #ifdef HAVE_PCRE_H -#include +#include // @manual #endif #ifdef HAVE_EXECINFO_H #include From 687f759f43b951f0875c789e248a81a2535f5a06 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Thu, 1 Jul 2021 14:20:13 -0700 Subject: [PATCH 0079/7387] enable autodeps for hash Summary: Enable autodeps on the hash target. Reviewed By: xavierd Differential Revision: D29475350 fbshipit-source-id: 5fc94a2705d6698b81a7bee6944b0025c181c503 --- watchman/Logging.h | 2 +- watchman/hash.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/watchman/Logging.h b/watchman/Logging.h index a66f3e92ce39..5f5e75c68b77 100644 --- a/watchman/Logging.h +++ b/watchman/Logging.h @@ -3,8 +3,8 @@ #pragma once #include "PubSub.h" #include "folly/Synchronized.h" +#include "watchman/watchman_preprocessor.h" #include "watchman/watchman_string.h" -#include "watchman_preprocessor.h" namespace watchman { diff --git a/watchman/hash.cpp b/watchman/hash.cpp index 7196f13fb94c..529536f3ec55 100644 --- a/watchman/hash.cpp +++ b/watchman/hash.cpp @@ -1,12 +1,12 @@ /* Copyright 2012-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ -#include "watchman/watchman.h" - // By Bob Jenkins, 2006. bob_jenkins@burtleburtle.net. You may use this // code any way you wish, private, educational, or commercial. It's free. // Origin: http://www.burtleburtle.net/bob/c/lookup3.c +#include "watchman/watchman_system.h" + #if HAVE_SYS_PARAM_H #include /* attempt to define endianness */ #endif From e4b3d1b6d165ab810e40820dd844332bdb203d77 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Thu, 1 Jul 2021 14:20:13 -0700 Subject: [PATCH 0080/7387] default autodeps on Summary: Make autodeps run cleanly enough that it can be defaulted on for all new targets. Reviewed By: xavierd Differential Revision: D29475477 fbshipit-source-id: 73c86085bcf2ea114c46e882f1b78b63d2d4b1f0 --- watchman/FileDescriptor.h | 2 +- watchman/tests/integration/cppclient.cpp | 2 +- watchman/thirdparty/jansson/jansson.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/watchman/FileDescriptor.h b/watchman/FileDescriptor.h index a7521837b53d..93c024b834ef 100644 --- a/watchman/FileDescriptor.h +++ b/watchman/FileDescriptor.h @@ -2,7 +2,7 @@ * Licensed under the Apache License, Version 2.0 */ #pragma once #include -#include "Result.h" +#include "watchman/Result.h" #include "watchman/watchman_system.h" class w_string; diff --git a/watchman/tests/integration/cppclient.cpp b/watchman/tests/integration/cppclient.cpp index 7b5b8bf7977a..af4702dc0605 100644 --- a/watchman/tests/integration/cppclient.cpp +++ b/watchman/tests/integration/cppclient.cpp @@ -1,7 +1,7 @@ /* Copyright 2016-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ -#include "WatchmanClient.h" +#include "watchman/cppclient/WatchmanClient.h" #include #include diff --git a/watchman/thirdparty/jansson/jansson.h b/watchman/thirdparty/jansson/jansson.h index a58492d90e3d..9996f1016b1f 100644 --- a/watchman/thirdparty/jansson/jansson.h +++ b/watchman/thirdparty/jansson/jansson.h @@ -16,8 +16,8 @@ #include #include #include -#include "jansson_config.h" // @manual -#include "utf.h" +#include "jansson_config.h" // @manual=//watchman/thirdparty/jansson:config_h +#include "watchman/thirdparty/jansson/utf.h" /* version */ From 88502fcf58a6721a5c3ba28a4da6d1143dda6141 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Thu, 1 Jul 2021 14:20:13 -0700 Subject: [PATCH 0081/7387] enable autodeps for CommandRegistry Reviewed By: xavierd Differential Revision: D29476419 fbshipit-source-id: 2053f2a60aadad43e192231ac98106005ad2a589 --- watchman/watchman_cmd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/watchman_cmd.h b/watchman/watchman_cmd.h index 44bfa553363f..ba1e95ada397 100644 --- a/watchman/watchman_cmd.h +++ b/watchman/watchman_cmd.h @@ -4,7 +4,7 @@ #pragma once #include -#include "CommandRegistry.h" +#include "watchman/CommandRegistry.h" // For commands that take the root dir as the second parameter, // realpath's that parameter on the client side and updates the From f2196ddbcaca710a8bcd53c563ffd5cee1d4dec6 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 1 Jul 2021 17:13:35 -0700 Subject: [PATCH 0082/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/2d5fd57b15b577461835992a0d86744e6173d836 https://github.com/facebookexternal/stl_tasks/commit/e97fb0e6bd4a5517a2ae0f7d47fb666f1f62d7f3 Reviewed By: yns88 fbshipit-source-id: c786b1877a1c1e520bcf46879477275faa4e595a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d41644a23d18..bb82089995c5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6c2a7567772f3954006c77a8bdc041df83802a00 +Subproject commit 2d5fd57b15b577461835992a0d86744e6173d836 From 22f79e681587c65a14c56f956e780f41b48055b1 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 1 Jul 2021 18:35:14 -0700 Subject: [PATCH 0083/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/4c9c18e65a770b031470f698263cf3b85c14dd4b https://github.com/facebook/fbthrift/commit/64601e0ad6de1794c562977ed8720ff620d4146d https://github.com/facebook/fbzmq/commit/d31c8641dc53cd37a53ab619c0a1d17a5988fa90 https://github.com/facebook/mcrouter/commit/168a35060ac504c4169896ca38f90354250c0bfb https://github.com/facebook/watchman/commit/f2196ddbcaca710a8bcd53c563ffd5cee1d4dec6 https://github.com/facebookexperimental/rust-shed/commit/e3a16c8616ead7f90e0c08f0f22611cb9a144df9 Reviewed By: yns88 fbshipit-source-id: 1c0777bb38a2d055e0452167b0ded6ae8c44bc8e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bb82089995c5..7cf6e805c813 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2d5fd57b15b577461835992a0d86744e6173d836 +Subproject commit 64601e0ad6de1794c562977ed8720ff620d4146d From 2d62e7c036500ee3478e39f206a99ab2de2dff14 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 1 Jul 2021 19:00:35 -0700 Subject: [PATCH 0084/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/aea62a2d7d11fa9cdafd88a2109f73b7657bedd6 https://github.com/facebook/fbthrift/commit/b123925cf53609d7075604b79715bc3b5b07bff2 https://github.com/facebook/fbzmq/commit/2764d7b61c0cf7220029379d8a2326cfdae512c8 https://github.com/facebook/rocksdb/commit/b20737709f504ce2d5b619a0e539e9f9b426d47e https://github.com/facebook/watchman/commit/22f79e681587c65a14c56f956e780f41b48055b1 https://github.com/facebookexperimental/rust-shed/commit/bcaddcbda0f5332b549285a979f623a1bedfa9a5 Reviewed By: yns88 fbshipit-source-id: 06399d0685a26f1f6afddc1f29df3bb4b8e8c5ee --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7cf6e805c813..ccbbac3f9c86 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 64601e0ad6de1794c562977ed8720ff620d4146d +Subproject commit b123925cf53609d7075604b79715bc3b5b07bff2 From 7e763798c6fec0f30162f1662b11b1058e939575 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 1 Jul 2021 19:32:43 -0700 Subject: [PATCH 0085/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/a63f8a01f615a3752fadfb3fbed23165ed5696ad https://github.com/facebook/fbthrift/commit/3f3d81380ab9fccc0795cf1f199bfd675a31a956 https://github.com/facebook/fbzmq/commit/eccac3b1cdbed4047e60979f6c6718950398eded https://github.com/facebook/watchman/commit/2d62e7c036500ee3478e39f206a99ab2de2dff14 https://github.com/facebookexperimental/rust-shed/commit/f8f74efd0f3bffce1fe88fd4086446d55b50e4c5 Reviewed By: yns88 fbshipit-source-id: 622ce0a0e18414f0c4be6b451c2271c6a8980d9a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ccbbac3f9c86..cff46b6776eb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b123925cf53609d7075604b79715bc3b5b07bff2 +Subproject commit 3f3d81380ab9fccc0795cf1f199bfd675a31a956 From 46274b74afab32fbe94b210de789b2227d30029e Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 1 Jul 2021 22:59:54 -0700 Subject: [PATCH 0086/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/e9f56a1ec96534d0c8357f02293c5687e3caae16 Reviewed By: yns88 fbshipit-source-id: 5ec71c5c2af1ffa57a3aef46e55b63940957bd10 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cff46b6776eb..4818858b1125 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3f3d81380ab9fccc0795cf1f199bfd675a31a956 +Subproject commit e9f56a1ec96534d0c8357f02293c5687e3caae16 From df08d77dd7006f055840c4116f97aa3f0f001475 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 2 Jul 2021 11:21:10 -0700 Subject: [PATCH 0087/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/dadce0ae48f25b80a5e244d04478febecfdaa407 Reviewed By: yns88 fbshipit-source-id: a4917e616555db9e76b55aa307bd61870f228ad5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4818858b1125..2c79b36a2a8a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e9f56a1ec96534d0c8357f02293c5687e3caae16 +Subproject commit dadce0ae48f25b80a5e244d04478febecfdaa407 From d5a1e6f14974783fd3737dcef33bc25928b6210f Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 2 Jul 2021 13:18:37 -0700 Subject: [PATCH 0088/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/1262119e16940de8e18e4fe3db032054ca920175 Reviewed By: yns88 fbshipit-source-id: 13e0b2636b30c76d548065f27c47ad247d049786 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2c79b36a2a8a..2a4da5254394 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit dadce0ae48f25b80a5e244d04478febecfdaa407 +Subproject commit 1262119e16940de8e18e4fe3db032054ca920175 From d1a9643cdda46562472db3655c5e4dfab09bf63c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 2 Jul 2021 13:47:43 -0700 Subject: [PATCH 0089/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/b73ada20d40a5c752d4486f15fe102e94dc5e44a https://github.com/facebook/fbthrift/commit/49149fa666182999b627407cc5f49bff20ff886b https://github.com/facebook/fbzmq/commit/1fd5c614976797da43bbcfe30777fb0470e150fd https://github.com/facebook/watchman/commit/d5a1e6f14974783fd3737dcef33bc25928b6210f https://github.com/facebookexperimental/rust-shed/commit/34f97fdc26fb013a276ae47aef6d495c342476eb Reviewed By: yns88 fbshipit-source-id: 77c79710b1a6110a15f54fa03aafb58ad0dd7ea7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2a4da5254394..038a2ceffbdd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1262119e16940de8e18e4fe3db032054ca920175 +Subproject commit 49149fa666182999b627407cc5f49bff20ff886b From 8e88a152a3405bd4d8f136220bf7fbb90fa82bc2 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Sat, 3 Jul 2021 13:42:53 -0700 Subject: [PATCH 0090/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/73e34451134e16dcd6b6da7d9a5cd23ef045886e Reviewed By: yns88 fbshipit-source-id: 05d23dde942dc5e9c64ce2338cf46e05780e8ccf --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 038a2ceffbdd..d709d7483b7d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 49149fa666182999b627407cc5f49bff20ff886b +Subproject commit 73e34451134e16dcd6b6da7d9a5cd23ef045886e From 51ff2afa88e85cefc7585c92cf7f8b3d66f7aae6 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Sun, 4 Jul 2021 08:20:32 -0700 Subject: [PATCH 0091/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/124ed1e692ca63f2113d6c09569ab30dcef4367e Reviewed By: yns88 fbshipit-source-id: 975526015e1f191a211ee49e535be98dfec5b8bf --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d709d7483b7d..250ca0266e8e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 73e34451134e16dcd6b6da7d9a5cd23ef045886e +Subproject commit 124ed1e692ca63f2113d6c09569ab30dcef4367e From 0ac9cc64f84aae15e969943a558f9117864f50c0 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 5 Jul 2021 15:18:51 -0700 Subject: [PATCH 0092/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/c30c7c1bf2910cd1573a43dbe0565f50ec4cfa3c Reviewed By: bigfootjon fbshipit-source-id: 5b05bfd1e2321f45816b2b0eb74b4c09003ad4c3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 250ca0266e8e..164b6685f0e5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 124ed1e692ca63f2113d6c09569ab30dcef4367e +Subproject commit c30c7c1bf2910cd1573a43dbe0565f50ec4cfa3c From 77ff3bb3d285f2382a697a01cfa61c480f872baf Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 6 Jul 2021 00:02:59 -0700 Subject: [PATCH 0093/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/a2b4cc12ca0945532903e2d9928041a88b4697de Reviewed By: bigfootjon fbshipit-source-id: 1c67ebdf9e42fa1ac5b3880c76ad4753870fa789 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 164b6685f0e5..cef99a2816e1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c30c7c1bf2910cd1573a43dbe0565f50ec4cfa3c +Subproject commit a2b4cc12ca0945532903e2d9928041a88b4697de From 151893aa22b25cbf9552124c8236ece62bc02d57 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 6 Jul 2021 08:21:23 -0700 Subject: [PATCH 0094/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/eac6011ae2492a88535341702cdc14af811bebfa Reviewed By: bigfootjon fbshipit-source-id: 887a0fb4ae4d3f71cdbdb3ef0cb0fbf7d52a4403 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e3806b056689..f646ed823bb3 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 73484b8ab6173f0247f814a1f3a8055c016387f5 +Subproject commit eac6011ae2492a88535341702cdc14af811bebfa From 91c4e6d3e71ed1b572cc49de8b68397729342fad Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 6 Jul 2021 08:50:55 -0700 Subject: [PATCH 0095/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/caad46a885eaa1cc990c200bd8563efa645ad8f5 https://github.com/facebook/fbthrift/commit/210ce0673299d80afa8eea17799e691cf2da1ba5 https://github.com/facebook/fbzmq/commit/97fefa455c4040121d42fd9f0490b556199bd53c https://github.com/facebook/proxygen/commit/51db6ba9b2cda579c4991bb39657e521970d4716 https://github.com/facebook/wangle/commit/ffbe8aff6ae4901fe1c9356cc6415229cd83221a https://github.com/facebook/watchman/commit/151893aa22b25cbf9552124c8236ece62bc02d57 https://github.com/facebookincubator/fizz/commit/2a26624c6f5b98751f12a84d2effe16fbe1d59ff https://github.com/facebookincubator/katran/commit/581f546b6a29de854a7750a34d65d9d772fe5787 https://github.com/facebookincubator/mvfst/commit/9bdd3c8e464cd32157bc75b7651db3332382a40c https://github.com/rsocket/rsocket-cpp/commit/f3144634179379e4a63023872858cbbcba3865e1 Reviewed By: bigfootjon fbshipit-source-id: 3a0bd9496b80d0612acc8786442ea33666607dcd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cef99a2816e1..b4346e46fd23 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a2b4cc12ca0945532903e2d9928041a88b4697de +Subproject commit 210ce0673299d80afa8eea17799e691cf2da1ba5 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index fe99618f36aa..69ea91131d6c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 61083e357f7ba799274afb481d319276f365845f +Subproject commit ffbe8aff6ae4901fe1c9356cc6415229cd83221a From f84d5f7a8058f5c3784b76ec335d194512ac8ca9 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 6 Jul 2021 09:20:33 -0700 Subject: [PATCH 0096/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/85402d8d7bd8dad9ada38bbcc63a4abf2485735e https://github.com/facebook/fbthrift/commit/37cd53cacc200d7aa62311bfc9d8038b21491087 https://github.com/facebook/fbzmq/commit/7fa83d2430511246298785500e458a98dc3bdb30 https://github.com/facebook/litho/commit/c6c2a78adc9b9b63a465174b7b088dfd849406f5 https://github.com/facebook/proxygen/commit/87b0f70d839b7b78b4228fc1e6506fa3cb63d069 https://github.com/facebook/wangle/commit/331236f54cb2c64c51693f4a5187fbd8143fe961 https://github.com/facebook/watchman/commit/91c4e6d3e71ed1b572cc49de8b68397729342fad https://github.com/facebookexperimental/rust-shed/commit/89bb2f5cad770f94d4b0ecebe32bef7bbb18499d https://github.com/facebookincubator/katran/commit/5d0836e442af2c3bbdf368b81362640a3ec1b9ee https://github.com/facebookincubator/mvfst/commit/a30d4c981356dafd0b9cbb597f2d3de307728919 Reviewed By: bigfootjon fbshipit-source-id: cf9c951e115446e1a434437825b35e9d0e2e0f80 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b4346e46fd23..1d553d934c0d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 210ce0673299d80afa8eea17799e691cf2da1ba5 +Subproject commit 37cd53cacc200d7aa62311bfc9d8038b21491087 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 69ea91131d6c..c7d3eada89d2 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ffbe8aff6ae4901fe1c9356cc6415229cd83221a +Subproject commit 331236f54cb2c64c51693f4a5187fbd8143fe961 From 0e94d0aa64c80131f90760efd09722bc53f39887 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 6 Jul 2021 09:58:23 -0700 Subject: [PATCH 0097/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/6cda44845cb892fc56f1b910d95df7079ce487ad https://github.com/facebook/fbthrift/commit/67cc649bb987b4bfddcd24508b6f826b58e9a981 https://github.com/facebook/fbzmq/commit/50b9a4906b165cb94690d8f19250c5680bae0cb0 https://github.com/facebook/proxygen/commit/91735ef36af5df117321b97e36cb3f31ef014684 https://github.com/facebook/rocksdb/commit/570248aeff8873acdc8ebbad57962d02a1078aeb https://github.com/facebook/watchman/commit/f84d5f7a8058f5c3784b76ec335d194512ac8ca9 https://github.com/facebookexperimental/rust-shed/commit/406423afddda82961f8da97052e7d941cbb4d720 Reviewed By: bigfootjon fbshipit-source-id: 13eddc0d40b264f1933436d7fa1c1beaf2d5f01c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1d553d934c0d..c6d80a15e015 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 37cd53cacc200d7aa62311bfc9d8038b21491087 +Subproject commit 67cc649bb987b4bfddcd24508b6f826b58e9a981 From 4dd70bdb5d92aef892e1f1e9f6232410020740a9 Mon Sep 17 00:00:00 2001 From: "Zeyi (Rice) Fan" Date: Tue, 6 Jul 2021 12:40:38 -0700 Subject: [PATCH 0098/7387] cppclient: fix Windows build Reviewed By: chadaustin Differential Revision: D29561552 fbshipit-source-id: 4b29f4a7ad912dc21fd0bdf8b0eb688de9bdf7b3 --- watchman/cppclient/WatchmanConnection.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/watchman/cppclient/WatchmanConnection.cpp b/watchman/cppclient/WatchmanConnection.cpp index 77562c51c23a..a54c9ea54b24 100644 --- a/watchman/cppclient/WatchmanConnection.cpp +++ b/watchman/cppclient/WatchmanConnection.cpp @@ -11,9 +11,9 @@ #include #ifdef _WIN32 -#include +#include // @manual #else -#include +#include // @manual #endif namespace watchman { From 8e9824a6beb60296654e921b1639f7fb0ef36d5c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 6 Jul 2021 13:05:39 -0700 Subject: [PATCH 0099/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/e6fe42d8f108baffd647c687fbafcb663423377e https://github.com/facebook/watchman/commit/4dd70bdb5d92aef892e1f1e9f6232410020740a9 Reviewed By: bigfootjon fbshipit-source-id: 828dba036da8e878b3c2a02556280a8950338ad3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c6d80a15e015..c7afe8bc348f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 67cc649bb987b4bfddcd24508b6f826b58e9a981 +Subproject commit e6fe42d8f108baffd647c687fbafcb663423377e From a46edfd40bed776471efa7837124ad94424a9cc9 Mon Sep 17 00:00:00 2001 From: Durham Goode Date: Tue, 6 Jul 2021 13:52:27 -0700 Subject: [PATCH 0100/7387] Enable fb dynamicconfig loading inside eden backingstore Summary: Reenables dynamicconfig loading with eden backingstore. Previously it broke edenfs-windows-release, but we believe the opensource/fbcode_builder/manifests/eden tweak has fixed it. Reviewed By: xavierd Differential Revision: D29561192 fbshipit-source-id: 775dd21d177f3baa09b0192e7d3f7231008c3766 --- build/fbcode_builder/manifests/eden | 1 + 1 file changed, 1 insertion(+) diff --git a/build/fbcode_builder/manifests/eden b/build/fbcode_builder/manifests/eden index 3e8b4b874519..3174bb3df1b5 100644 --- a/build/fbcode_builder/manifests/eden +++ b/build/fbcode_builder/manifests/eden @@ -46,6 +46,7 @@ libcurl fbcode/eden/oss = . fbcode/eden = eden fbcode/tools/lfs = tools/lfs +fbcode/thrift/lib/rust = thrift/lib/rust [shipit.strip] ^fbcode/eden/fs/eden-config\.h$ From 0f63fb79b419cb2c41e5a0fa5400035502c5a074 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 6 Jul 2021 14:14:54 -0700 Subject: [PATCH 0101/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/956e582e9fd8e0701d13a4cc0a8099b3405e8e2e https://github.com/facebook/fbthrift/commit/804e733c7aad6507ca69dad72f5c264867ccb235 https://github.com/facebook/fbzmq/commit/321cbeffe4c4a99e10f60a0f396eaff8e79902b8 https://github.com/facebook/folly/commit/4215b920c94fa245c41c6ea0b90a7e863e1c3f80 https://github.com/facebook/proxygen/commit/76d10ab8ddec8e226d83c83a4f218ef4e7ab8927 https://github.com/facebook/wangle/commit/eca48d21603204d67b8fb8ae6cafb8c3a5e768c2 https://github.com/facebook/watchman/commit/a46edfd40bed776471efa7837124ad94424a9cc9 https://github.com/facebookexperimental/rust-shed/commit/a52699d2e6d73bb23dc02e5f4a3dd31f407a87a8 https://github.com/facebookexternal/stl_tasks/commit/464b0d357e92a7042c50bd6fc3caca31a9216aea https://github.com/facebookincubator/fizz/commit/eef3da61adaa2e383b0d598a7c14b6c8fb079e0d https://github.com/facebookincubator/katran/commit/3e1556b2969dfc5d6c7508d21b579776693dfeaf https://github.com/facebookincubator/mvfst/commit/e7f6e586d5e6bc1a35aee2b550cd161c2576c503 https://github.com/rsocket/rsocket-cpp/commit/521ee0cb38e01f22d97e69a878bdccaecd0b4c9f Reviewed By: bigfootjon fbshipit-source-id: 40da914e15e0a69175d3e2aac33e73c3c1fc0bae --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c7afe8bc348f..24957bb0baa4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e6fe42d8f108baffd647c687fbafcb663423377e +Subproject commit 804e733c7aad6507ca69dad72f5c264867ccb235 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f646ed823bb3..dfa4ace77295 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit eac6011ae2492a88535341702cdc14af811bebfa +Subproject commit 4215b920c94fa245c41c6ea0b90a7e863e1c3f80 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c7d3eada89d2..190d128a23fb 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 331236f54cb2c64c51693f4a5187fbd8143fe961 +Subproject commit eca48d21603204d67b8fb8ae6cafb8c3a5e768c2 From 1270443964ee561156ee098df6a46db145d7693b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 6 Jul 2021 14:44:31 -0700 Subject: [PATCH 0102/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/6403a7cc18e78f20b60aebcdfb15f2c2965f5f0b https://github.com/facebook/fbthrift/commit/067e4c3b5be42fdde9579eb8cd7880d587256fc5 https://github.com/facebook/fbzmq/commit/4cb4dbb5102bd5cf87978b6cd93fe31ac5313060 https://github.com/facebook/proxygen/commit/0d620697e72217aa2c1df4a45bfa421e459b7f6a https://github.com/facebook/rocksdb/commit/fcd808833342edbb8052d992b6e7ec85986a056c https://github.com/facebook/wangle/commit/657e5b791ced7a9e4ddc525c3a6cad99d132dcf9 https://github.com/facebook/watchman/commit/0f63fb79b419cb2c41e5a0fa5400035502c5a074 https://github.com/facebookexperimental/rust-shed/commit/e4a612e384ff7bb09911366f596d6a272598b7bd https://github.com/facebookincubator/fizz/commit/8768ca465181d79fe07f5a02208b3cc6e395056a https://github.com/facebookincubator/katran/commit/810be648efbb715f78ab7f3496cfeb233f14168e https://github.com/facebookincubator/mvfst/commit/4f93740b0750deb2a574986b7fdc2908e7647902 https://github.com/rsocket/rsocket-cpp/commit/7ec4368577c60aa1102a1f99dd8b60b2c65affa2 Reviewed By: bigfootjon fbshipit-source-id: 1b8874e875d6beb121d670b9bf6b8197d7271f33 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 24957bb0baa4..bd2d60784604 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 804e733c7aad6507ca69dad72f5c264867ccb235 +Subproject commit 067e4c3b5be42fdde9579eb8cd7880d587256fc5 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 190d128a23fb..8d8bd7389606 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit eca48d21603204d67b8fb8ae6cafb8c3a5e768c2 +Subproject commit 657e5b791ced7a9e4ddc525c3a6cad99d132dcf9 From 9dfdac68ec8d72ec6d6800d95b39261ea07efae7 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 6 Jul 2021 15:11:37 -0700 Subject: [PATCH 0103/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/f5cedf0b32be9b245598900aa14877b9c3efc34f https://github.com/facebook/fbthrift/commit/820702a9ab9fb55cbc0bf89ce21f92f1b2f9373a https://github.com/facebook/fbzmq/commit/3b3cee122f38a0096464b3697445b58c414a0a5a https://github.com/facebook/proxygen/commit/0aad991e60d0ee8e9ecc97294ae26b95fe4319a0 https://github.com/facebook/wangle/commit/dbdb7394df234757eefd1ce706935591bfea9b46 https://github.com/facebook/watchman/commit/1270443964ee561156ee098df6a46db145d7693b https://github.com/facebookexperimental/rust-shed/commit/7f20d7ae8ae18204d6bc75d54d0b4ba3f6115a98 https://github.com/facebookincubator/katran/commit/f5b69ce1baa1961b067f5cc3956c226e59fcba8e https://github.com/facebookincubator/mvfst/commit/f706f4ebfff7729a1b2ee6c17cd2739b307b88fe Reviewed By: bigfootjon fbshipit-source-id: f28429d892ecef3f1fae1cff088a81132e59bb5f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bd2d60784604..6ab87b47e2a2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 067e4c3b5be42fdde9579eb8cd7880d587256fc5 +Subproject commit 820702a9ab9fb55cbc0bf89ce21f92f1b2f9373a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8d8bd7389606..be36371a3ef3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 657e5b791ced7a9e4ddc525c3a6cad99d132dcf9 +Subproject commit dbdb7394df234757eefd1ce706935591bfea9b46 From 212d2eb1b418df67d50fa944145f9dda7e3e9850 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 6 Jul 2021 15:13:43 -0700 Subject: [PATCH 0104/7387] split clock into its own target Summary: ClockSpec and QuerySince are simple data structures so give them their own target. Reviewed By: xavierd Differential Revision: D29477665 fbshipit-source-id: 18bb18713a9cdb5706bc7713beb8af4c8e844e00 --- watchman/Clock.cpp | 13 +++---------- watchman/Clock.h | 24 ++++++++++++++++++++++-- watchman/cmds/watch.cpp | 7 +++++++ watchman/query/since.cpp | 2 ++ watchman/spawn.cpp | 2 +- watchman/watchman_cmd.h | 3 --- watchman/watchman_query.h | 15 ++------------- 7 files changed, 37 insertions(+), 29 deletions(-) diff --git a/watchman/Clock.cpp b/watchman/Clock.cpp index 0fd8da6da9f2..4bb646cffdb2 100644 --- a/watchman/Clock.cpp +++ b/watchman/Clock.cpp @@ -1,10 +1,10 @@ /* Copyright 2012-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/Clock.h" #include #include #include -#include "watchman/watchman.h" using namespace watchman; @@ -135,12 +135,12 @@ ClockSpec::ClockSpec() : tag(w_cs_timestamp), timestamp(0) {} ClockSpec::ClockSpec(const ClockPosition& position) : tag(w_cs_clock), clock{proc_start_time, proc_pid, position} {} -w_query_since ClockSpec::evaluate( +QuerySince ClockSpec::evaluate( const ClockPosition& position, const uint32_t lastAgeOutTick, folly::Synchronized>* cursorMap) const { - w_query_since since; + QuerySince since; switch (tag) { case w_cs_timestamp: @@ -238,13 +238,6 @@ w_string ClockPosition::toClockString() const { return w_string(clockbuf, W_STRING_UNICODE); } -/* Add the current clock value to the response */ -void annotate_with_clock( - const std::shared_ptr& root, - json_ref& resp) { - resp.set("clock", w_string_to_json(root->view()->getCurrentClockString())); -} - json_ref ClockSpec::toJson() const { if (hasScmParams()) { auto scm = json_object( diff --git a/watchman/Clock.h b/watchman/Clock.h index 5259c4e467d2..a67574f068a3 100644 --- a/watchman/Clock.h +++ b/watchman/Clock.h @@ -10,7 +10,20 @@ struct w_clock_t { time_t timestamp; }; -struct w_query_since; +namespace watchman { + +struct QuerySince { + bool is_timestamp; + union { + time_t timestamp; + struct { + bool is_fresh_instance; + uint32_t ticks; + } clock; + }; + + QuerySince() : is_timestamp(false), clock{true, 0} {} +}; struct ClockPosition { uint32_t rootNumber{0}; @@ -61,7 +74,7 @@ struct ClockSpec { * the effective since parameter. * If cursorMap is passed in, it MUST be unlocked, as this method * will acquire a lock to evaluate a named cursor. */ - w_query_since evaluate( + QuerySince evaluate( const ClockPosition& position, const uint32_t lastAgeOutTick, folly::Synchronized>* cursorMap = @@ -83,3 +96,10 @@ struct ClockSpec { * constructor of this class */ json_ref toJson() const; }; + +} // namespace watchman + +// Legacy exports into global namespace. +// TODO: remove these. +using w_query_since = watchman::QuerySince; +using ClockSpec = watchman::ClockSpec; diff --git a/watchman/cmds/watch.cpp b/watchman/cmds/watch.cpp index 4258ac8dc5c9..a86f6df28811 100644 --- a/watchman/cmds/watch.cpp +++ b/watchman/cmds/watch.cpp @@ -32,6 +32,13 @@ void w_cmd_realpath_root(json_ref& args) { } W_CAP_REG("clock-sync-timeout") +/* Add the current clock value to the response */ +static void annotate_with_clock( + const std::shared_ptr& root, + json_ref& resp) { + resp.set("clock", w_string_to_json(root->view()->getCurrentClockString())); +} + /* clock /root [options] * Returns the current clock value for a watched root * If the options contain a sync_timeout, we ensure that the repo diff --git a/watchman/query/since.cpp b/watchman/query/since.cpp index 2ddfd95ac68a..5d86b5ec30cb 100644 --- a/watchman/query/since.cpp +++ b/watchman/query/since.cpp @@ -5,6 +5,8 @@ #include +using namespace watchman; + enum since_what { SINCE_OCLOCK, SINCE_CCLOCK, SINCE_MTIME, SINCE_CTIME }; static struct { diff --git a/watchman/spawn.cpp b/watchman/spawn.cpp index bb3e992c90b9..13c301c54fcf 100644 --- a/watchman/spawn.cpp +++ b/watchman/spawn.cpp @@ -89,7 +89,7 @@ static void spawn_command( const std::shared_ptr& root, struct watchman_trigger_command* cmd, w_query_res* res, - struct ClockSpec* since_spec) { + ClockSpec* since_spec) { bool file_overflow = false; size_t arg_max = ChildProcess::getArgMax(); diff --git a/watchman/watchman_cmd.h b/watchman/watchman_cmd.h index ba1e95ada397..2a77777df989 100644 --- a/watchman/watchman_cmd.h +++ b/watchman/watchman_cmd.h @@ -57,9 +57,6 @@ std::shared_ptr resolveOrCreateRoot( const json_ref& args); json_ref make_response(); -void annotate_with_clock( - const std::shared_ptr& root, - json_ref& resp); void add_root_warnings_to_response( json_ref& response, const std::shared_ptr& root); diff --git a/watchman/watchman_query.h b/watchman/watchman_query.h index bf13c884fd17..a8d07866944a 100644 --- a/watchman/watchman_query.h +++ b/watchman/watchman_query.h @@ -31,18 +31,7 @@ struct w_query_field_renderer { using w_query_field_list = std::vector; using watchman_root = struct watchman_root; -struct w_query_since { - bool is_timestamp; - union { - time_t timestamp; - struct { - bool is_fresh_instance; - uint32_t ticks; - } clock; - }; - - w_query_since() : is_timestamp(false), clock{true, 0} {} -}; +using w_query_since = watchman::QuerySince; // A View-independent way of accessing file properties in the // query engine. A FileResult is not intended to be accessed @@ -209,7 +198,7 @@ struct w_query_ctx { std::shared_ptr root; std::unique_ptr file; w_string wholename; - struct w_query_since since; + w_query_since since; // root number, ticks at start of query execution ClockSpec clockAtStartOfQuery; uint32_t lastAgeOutTickValueAtStartOfQuery; From c52945ed7f101f334ecafd76df35fe4f578829ae Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 6 Jul 2021 15:13:43 -0700 Subject: [PATCH 0105/7387] make a view target for dir and file Summary: PendingCollection depends on watchman_dir and watchman_file, so split those into their own target. Reviewed By: xavierd Differential Revision: D29494641 fbshipit-source-id: 37e20372e95adb198bc27c2ad7958b420c48e3f1 --- watchman/FileInformation.cpp | 4 ++-- watchman/FileSystem.h | 2 +- watchman/Logging.h | 2 +- watchman/PubSub.cpp | 2 +- watchman/root/dir.cpp | 3 ++- watchman/root/file.cpp | 2 +- watchman/watchman.h | 4 ++-- watchman/watchman_dir.h | 3 +++ watchman/watchman_file.h | 3 ++- watchman/watchman_opendir.h | 2 +- 10 files changed, 16 insertions(+), 11 deletions(-) diff --git a/watchman/FileInformation.cpp b/watchman/FileInformation.cpp index 72a8b3df8518..8b110d6d60c5 100644 --- a/watchman/FileInformation.cpp +++ b/watchman/FileInformation.cpp @@ -1,7 +1,7 @@ /* Copyright 2017-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ -#include "FileInformation.h" -#include "watchman_time.h" +#include "watchman/FileInformation.h" +#include "watchman/watchman_time.h" namespace watchman { diff --git a/watchman/FileSystem.h b/watchman/FileSystem.h index ab182438adb5..6d911f000b8d 100644 --- a/watchman/FileSystem.h +++ b/watchman/FileSystem.h @@ -1,9 +1,9 @@ /* Copyright 2017-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ #pragma once -#include "FileInformation.h" #include "Result.h" #include "watchman/FileDescriptor.h" +#include "watchman/FileInformation.h" /** This header defines platform independent helper functions for * operating on the filesystem at a low level. diff --git a/watchman/Logging.h b/watchman/Logging.h index 5f5e75c68b77..9e606401867d 100644 --- a/watchman/Logging.h +++ b/watchman/Logging.h @@ -1,8 +1,8 @@ /* Copyright 2016-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ #pragma once -#include "PubSub.h" #include "folly/Synchronized.h" +#include "watchman/PubSub.h" #include "watchman/watchman_preprocessor.h" #include "watchman/watchman_string.h" diff --git a/watchman/PubSub.cpp b/watchman/PubSub.cpp index c878edd7f4cc..4ad62ab40663 100644 --- a/watchman/PubSub.cpp +++ b/watchman/PubSub.cpp @@ -1,6 +1,6 @@ /* Copyright 2016-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ -#include "PubSub.h" +#include "watchman/PubSub.h" #include #include diff --git a/watchman/root/dir.cpp b/watchman/root/dir.cpp index ff05cc869e2e..b4325478939e 100644 --- a/watchman/root/dir.cpp +++ b/watchman/root/dir.cpp @@ -1,7 +1,8 @@ /* Copyright 2012-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ -#include "watchman/watchman.h" +#include "watchman/watchman_dir.h" +#include "watchman/watchman_file.h" void watchman_dir::Deleter::operator()(watchman_file* file) const { free_file_node(file); diff --git a/watchman/root/file.cpp b/watchman/root/file.cpp index 1d952b26b988..646cc18030fd 100644 --- a/watchman/root/file.cpp +++ b/watchman/root/file.cpp @@ -1,7 +1,7 @@ /* Copyright 2012-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ -#include "watchman/watchman.h" +#include "watchman/watchman_file.h" #ifdef __APPLE__ #include // @manual #endif diff --git a/watchman/watchman.h b/watchman/watchman.h index f30d248840d6..1b8f398ce9d5 100644 --- a/watchman/watchman.h +++ b/watchman/watchman.h @@ -17,8 +17,8 @@ struct watchman_dir; struct watchman_root; struct watchman_trigger_command; -#include "watchman_dir.h" -#include "watchman_file.h" +#include "watchman/watchman_dir.h" +#include "watchman/watchman_file.h" #include "watchman_opendir.h" #define WATCHMAN_IO_BUF_SIZE 1048576 diff --git a/watchman/watchman_dir.h b/watchman/watchman_dir.h index aa795f75d367..c714172e4a75 100644 --- a/watchman/watchman_dir.h +++ b/watchman/watchman_dir.h @@ -2,6 +2,9 @@ * Licensed under the Apache License, Version 2.0 */ #pragma once #include +#include "watchman/watchman_string.h" + +struct watchman_file; struct watchman_dir { /* the name of this dir, relative to its parent */ diff --git a/watchman/watchman_file.h b/watchman/watchman_file.h index 312bdc74fba2..f590c74660a6 100644 --- a/watchman/watchman_file.h +++ b/watchman/watchman_file.h @@ -2,8 +2,9 @@ * Licensed under the Apache License, Version 2.0 */ #pragma once -#include "FileInformation.h" #include "watchman/Clock.h" +#include "watchman/FileInformation.h" +#include "watchman/watchman_dir.h" struct watchman_file { /* the parent dir */ diff --git a/watchman/watchman_opendir.h b/watchman/watchman_opendir.h index 307053124ae4..84ebbdedb33a 100644 --- a/watchman/watchman_opendir.h +++ b/watchman/watchman_opendir.h @@ -1,7 +1,7 @@ /* Copyright 2012-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ #pragma once -#include "FileInformation.h" +#include "watchman/FileInformation.h" struct watchman_dir_ent { bool has_stat; From c7b77471e26f7778bfe1c50de1c0322725e856fc Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 6 Jul 2021 15:13:43 -0700 Subject: [PATCH 0106/7387] remove some files from the headers target Summary: Make progress towards eliminating the "headers" target. Reviewed By: xavierd Differential Revision: D29494732 fbshipit-source-id: c870eea5f28618664e019b8e71aff1bffcc3af97 --- watchman/watchman.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/watchman.h b/watchman/watchman.h index 1b8f398ce9d5..72a4ab25eed0 100644 --- a/watchman/watchman.h +++ b/watchman/watchman.h @@ -53,7 +53,7 @@ bool w_is_stopping(); void w_request_shutdown(); -#include "watchman_time.h" +#include "watchman/watchman_time.h" extern std::string watchman_tmp_dir; extern std::string watchman_state_file; From 2d736fa5581a0e83b5349caf46ea8bffa88e2a22 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 6 Jul 2021 15:13:43 -0700 Subject: [PATCH 0107/7387] split flag_map into its own target Summary: I love headers that only include and . :) Reviewed By: xavierd Differential Revision: D29494989 fbshipit-source-id: 77ff9b4c815c5b7f27e2ec33a517b633000e0566 --- CMakeLists.txt | 4 ++-- watchman/{expflags.cpp => FlagMap.cpp} | 8 +++----- watchman/FlagMap.h | 24 ++++++++++++++++++++++++ watchman/PendingCollection.cpp | 1 + watchman/watcher/fsevents.cpp | 1 + watchman/watcher/inotify.cpp | 1 + watchman/watcher/kqueue.cpp | 1 + watchman/watchman.h | 10 ---------- 8 files changed, 33 insertions(+), 17 deletions(-) rename watchman/{expflags.cpp => FlagMap.cpp} (70%) create mode 100644 watchman/FlagMap.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 93a2f77ad683..7c9d46f6733d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -543,12 +543,12 @@ list(APPEND testsupport_sources watchman/ChildProcess.cpp watchman/FileDescriptor.cpp watchman/FileInformation.cpp +watchman/FlagMap.cpp watchman/PendingCollection.cpp watchman/Pipe.cpp watchman/ThreadPool.cpp watchman/WatchmanConfig.cpp watchman/bser.cpp -watchman/expflags.cpp watchman/ignore.cpp watchman/opendir.cpp watchman/time.cpp @@ -605,6 +605,7 @@ watchman/ContentHash.cpp watchman/CookieSync.cpp watchman/FileDescriptor.cpp watchman/FileInformation.cpp +watchman/FlagMap.cpp watchman/InMemoryView.cpp watchman/LocalFileResult.cpp watchman/PendingCollection.cpp @@ -620,7 +621,6 @@ watchman/bser.cpp watchman/checksock.cpp watchman/clientmode.cpp watchman/error_category.cpp -watchman/expflags.cpp watchman/fstype.cpp watchman/groups.cpp # hash.cpp (in libhash) diff --git a/watchman/expflags.cpp b/watchman/FlagMap.cpp similarity index 70% rename from watchman/expflags.cpp rename to watchman/FlagMap.cpp index 6b8c1983002f..03d2de1b033a 100644 --- a/watchman/expflags.cpp +++ b/watchman/FlagMap.cpp @@ -1,12 +1,10 @@ /* Copyright 2015-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ -#include "watchman/watchman.h" +#include "watchman/FlagMap.h" +#include +#include -/* Given a flag map in `fmap`, and a set of flags in `flags`, - * expand the flag bits that are set in `flags` into the corresponding - * labels in `fmap` and print the result into the caller provided - * buffer `buf` of size `len` bytes. */ void w_expand_flags( const struct flag_map* fmap, uint32_t flags, diff --git a/watchman/FlagMap.h b/watchman/FlagMap.h new file mode 100644 index 000000000000..cfd66bf4262e --- /dev/null +++ b/watchman/FlagMap.h @@ -0,0 +1,24 @@ +/* Copyright 2012-present Facebook, Inc. + * Licensed under the Apache License, Version 2.0 */ + +#pragma once + +#include +#include + +struct flag_map { + uint32_t value; + const char* label; +}; + +/** + * Given a flag map in `fmap`, and a set of flags in `flags`, + * expand the flag bits that are set in `flags` into the corresponding + * labels in `fmap` and print the result into the caller provided + * buffer `buf` of size `len` bytes. + */ +void w_expand_flags( + const struct flag_map* fmap, + uint32_t flags, + char* buf, + size_t len); diff --git a/watchman/PendingCollection.cpp b/watchman/PendingCollection.cpp index 807c9577491c..25ea42ab9769 100644 --- a/watchman/PendingCollection.cpp +++ b/watchman/PendingCollection.cpp @@ -3,6 +3,7 @@ #include "watchman/PendingCollection.h" #include +#include "watchman/FlagMap.h" #include "watchman/watchman.h" using namespace watchman; diff --git a/watchman/watcher/fsevents.cpp b/watchman/watcher/fsevents.cpp index 51e7a34e14d0..e7e7f3985ef6 100644 --- a/watchman/watcher/fsevents.cpp +++ b/watchman/watcher/fsevents.cpp @@ -8,6 +8,7 @@ #include #include #include +#include "watchman/FlagMap.h" #include "watchman/InMemoryView.h" #include "watchman/LogConfig.h" #include "watchman/Pipe.h" diff --git a/watchman/watcher/inotify.cpp b/watchman/watcher/inotify.cpp index 7a398dc57eb0..08b477666aeb 100644 --- a/watchman/watcher/inotify.cpp +++ b/watchman/watcher/inotify.cpp @@ -5,6 +5,7 @@ #include #include #include "watchman/FileDescriptor.h" +#include "watchman/FlagMap.h" #include "watchman/InMemoryView.h" #include "watchman/Pipe.h" #include "watchman/RingBuffer.h" diff --git a/watchman/watcher/kqueue.cpp b/watchman/watcher/kqueue.cpp index b46db521326b..99906940ea65 100644 --- a/watchman/watcher/kqueue.cpp +++ b/watchman/watcher/kqueue.cpp @@ -6,6 +6,7 @@ #include #include #include "watchman/FileDescriptor.h" +#include "watchman/FlagMap.h" #include "watchman/InMemoryView.h" #include "watchman/Pipe.h" #include "watchman/watcher/Watcher.h" diff --git a/watchman/watchman.h b/watchman/watchman.h index 72a4ab25eed0..587676769832 100644 --- a/watchman/watchman.h +++ b/watchman/watchman.h @@ -115,16 +115,6 @@ const std::string& get_named_pipe_sock_path(); const struct group* w_get_group(const char* group_name); #endif // ndef WIN32 -struct flag_map { - uint32_t value; - const char* label; -}; -void w_expand_flags( - const struct flag_map* fmap, - uint32_t flags, - char* buf, - size_t len); - #endif /* vim:ts=2:sw=2:et: From 058f73db2ffa1abba604c5d684123823ffc6585c Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 6 Jul 2021 15:13:43 -0700 Subject: [PATCH 0108/7387] split Cookie into its own header Summary: Just the cookie prefix name and matcher function... Reviewed By: kmancini Differential Revision: D29509737 fbshipit-source-id: 8b477226ce31783eeac1d21297106dcaa5152c10 --- watchman/Cookie.h | 27 +++++++++++++++++++++++++++ watchman/CookieSync.cpp | 3 +-- watchman/CookieSync.h | 15 +-------------- watchman/PendingCollection.cpp | 4 ++-- 4 files changed, 31 insertions(+), 18 deletions(-) create mode 100644 watchman/Cookie.h diff --git a/watchman/Cookie.h b/watchman/Cookie.h new file mode 100644 index 000000000000..2afdab4095e2 --- /dev/null +++ b/watchman/Cookie.h @@ -0,0 +1,27 @@ +/* Copyright 2012-present Facebook, Inc. + * Licensed under the Apache License, Version 2.0 */ + +#pragma once + +#include +#include "watchman/watchman_string.h" + +namespace watchman { + +inline constexpr std::string_view kCookiePrefix = ".watchman-cookie-"; + +/** + * We need to guarantee that we never collapse a cookie notification + * out of the pending list, because we absolutely must observe it coming + * in via the kernel notification mechanism in order for synchronization + * to be correct. + * Since we don't have a watchman_root available, we can't tell what the + * precise cookie prefix is for the current pending list here, so + * we do a substring match. Not the most elegant thing in the world. + */ +inline bool isPossiblyACookie(const w_string_t* path) { + return w_string_contains_cstr_len( + path, kCookiePrefix.data(), kCookiePrefix.size()); +} + +} // namespace watchman diff --git a/watchman/CookieSync.cpp b/watchman/CookieSync.cpp index 1a3a7ecd6a42..3bc53e3a1a40 100644 --- a/watchman/CookieSync.cpp +++ b/watchman/CookieSync.cpp @@ -16,8 +16,7 @@ CookieSync::CookieSync(const w_string& dir) { gethostname(hostname, sizeof(hostname)); hostname[sizeof(hostname) - 1] = '\0'; - auto prefix = - w_string::build(WATCHMAN_COOKIE_PREFIX, hostname, "-", ::getpid(), "-"); + auto prefix = w_string::build(kCookiePrefix, hostname, "-", ::getpid(), "-"); auto guard = cookieDirs_.wlock(); guard->cookiePrefix_ = prefix; diff --git a/watchman/CookieSync.h b/watchman/CookieSync.h index 58f9cbbe6dcb..9330fc2e917c 100644 --- a/watchman/CookieSync.h +++ b/watchman/CookieSync.h @@ -3,10 +3,9 @@ #pragma once #include #include +#include "watchman/Cookie.h" #include "watchman/watchman_string.h" -#define WATCHMAN_COOKIE_PREFIX ".watchman-cookie-" - namespace watchman { class CookieSyncAborted : public std::exception {}; @@ -53,18 +52,6 @@ class CookieSync { * with a CookieSyncAborted exception */ void abortAllCookies(); - // We need to guarantee that we never collapse a cookie notification - // out of the pending list, because we absolutely must observe it coming - // in via the kernel notification mechanism in order for synchronization - // to be correct. - // Since we don't have a watchman_root available, we can't tell what the - // precise cookie prefix is for the current pending list here, so - // we do a substring match. Not the most elegant thing in the world. - static inline bool isPossiblyACookie(const w_string_t* path) { - return w_string_contains_cstr_len( - path, WATCHMAN_COOKIE_PREFIX, sizeof(WATCHMAN_COOKIE_PREFIX) - 1); - } - // Check if this path matches an actual cookie. bool isCookiePrefix(const w_string& path); diff --git a/watchman/PendingCollection.cpp b/watchman/PendingCollection.cpp index 25ea42ab9769..397fbb89f1d1 100644 --- a/watchman/PendingCollection.cpp +++ b/watchman/PendingCollection.cpp @@ -182,7 +182,7 @@ void PendingChanges::maybePruneObsoletedChildren(w_string path, int flags) { if ((p->flags & W_PENDING_CRAWL_ONLY) == 0 && key.size() > path.size() && is_path_prefix( (const char*)key.data(), key.size(), path.data(), path.size()) && - !watchman::CookieSync::isPossiblyACookie(p->path)) { + !watchman::isPossiblyACookie(p->path)) { logf( DBG, "delete_kids: removing ({}) {} from pending because it is " @@ -254,7 +254,7 @@ bool PendingChanges::isObsoletedByContainingDir(const w_string& path) { path.size(), (const char*)leaf->key.data(), leaf->key.size())) { - if (watchman::CookieSync::isPossiblyACookie(path)) { + if (watchman::isPossiblyACookie(path)) { return false; } From 298ac02521fb03941118d193050ea42ecb05e05e Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 6 Jul 2021 15:13:43 -0700 Subject: [PATCH 0109/7387] add a pending target Summary: Give PendingCollection its own target. Reviewed By: kmancini Differential Revision: D29509742 fbshipit-source-id: 846c9df0572c152cdbef138d9667f494b312d912 --- watchman/InMemoryView.h | 10 +++++----- watchman/PendingCollection.cpp | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/watchman/InMemoryView.h b/watchman/InMemoryView.h index f747b0183ac1..a2eb0e5b048b 100644 --- a/watchman/InMemoryView.h +++ b/watchman/InMemoryView.h @@ -6,12 +6,12 @@ #include #include #include -#include "ContentHash.h" -#include "CookieSync.h" -#include "PendingCollection.h" -#include "QueryableView.h" -#include "SymlinkTargets.h" +#include "watchman/ContentHash.h" +#include "watchman/CookieSync.h" +#include "watchman/PendingCollection.h" +#include "watchman/QueryableView.h" #include "watchman/RingBuffer.h" +#include "watchman/SymlinkTargets.h" #include "watchman/WatchmanConfig.h" #include "watchman/watchman_perf.h" #include "watchman/watchman_string.h" diff --git a/watchman/PendingCollection.cpp b/watchman/PendingCollection.cpp index 397fbb89f1d1..dedf1c07853a 100644 --- a/watchman/PendingCollection.cpp +++ b/watchman/PendingCollection.cpp @@ -3,8 +3,10 @@ #include "watchman/PendingCollection.h" #include +#include "watchman/Cookie.h" #include "watchman/FlagMap.h" -#include "watchman/watchman.h" +#include "watchman/Logging.h" +#include "watchman/watchman_dir.h" using namespace watchman; From 050eb262cfd4ce22ff27c31ed8d6f4dd972ac116 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 6 Jul 2021 15:13:43 -0700 Subject: [PATCH 0110/7387] move w_path_exists into FileInformation.h Reviewed By: kmancini Differential Revision: D29509746 fbshipit-source-id: bcb5208906600e696ff93f33a2f4a0645bdb02e1 --- watchman/FileInformation.h | 9 +++++++++ watchman/watchman.h | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/watchman/FileInformation.h b/watchman/FileInformation.h index 3207be1ccb3e..e280401638d7 100644 --- a/watchman/FileInformation.h +++ b/watchman/FileInformation.h @@ -141,4 +141,13 @@ struct FileInformation { // files that were deleted between two revisions. static FileInformation makeDeletedFileInformation(); }; + } // namespace watchman + +#ifndef _WIN32 +static inline bool w_path_exists(const char* path) { + return access(path, F_OK) == 0; +} +#else +bool w_path_exists(const char* path); +#endif diff --git a/watchman/watchman.h b/watchman/watchman.h index 587676769832..b7f9faf255ab 100644 --- a/watchman/watchman.h +++ b/watchman/watchman.h @@ -41,14 +41,6 @@ w_string find_fstype_in_linux_proc_mounts( extern folly::Synchronized poisoned_reason; -#ifndef _WIN32 -static inline bool w_path_exists(const char* path) { - return access(path, F_OK) == 0; -} -#else -bool w_path_exists(const char* path); -#endif - bool w_is_stopping(); void w_request_shutdown(); From ae7f1be9c2e8594606a78f2d09cc59d903fc58e8 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 6 Jul 2021 15:13:43 -0700 Subject: [PATCH 0111/7387] split errors into its own target Reviewed By: kmancini Differential Revision: D29509760 fbshipit-source-id: fc0041a68243e84ace750b8a114b74c33504323a --- CMakeLists.txt | 2 +- watchman/{error_category.cpp => Errors.cpp} | 7 +++- .../{watchman_error_category.h => Errors.h} | 38 +++++++++++++++++++ watchman/LocalFileResult.cpp | 2 +- watchman/QueryableView.cpp | 1 + watchman/WatchmanConfig.cpp | 2 +- watchman/cmds/subscribe.cpp | 2 +- watchman/listener-user.cpp | 1 + watchman/query/base.cpp | 3 ++ watchman/query/dirname.cpp | 3 +- watchman/query/eval.cpp | 1 + watchman/query/fieldlist.cpp | 2 +- watchman/query/glob.cpp | 2 + watchman/query/intcompare.cpp | 3 ++ watchman/query/match.cpp | 3 ++ watchman/query/name.cpp | 4 +- watchman/query/parse.cpp | 1 + watchman/query/pcre.cpp | 5 ++- watchman/query/since.cpp | 1 + watchman/query/suffix.cpp | 3 ++ watchman/query/type.cpp | 2 + watchman/root/crawler.cpp | 2 +- watchman/root/resolve.cpp | 2 +- watchman/root/stat.cpp | 2 +- watchman/root/symlink.cpp | 2 +- watchman/root/sync.cpp | 2 +- watchman/root/warnerr.cpp | 2 +- .../saved_state/LocalSavedStateInterface.cpp | 1 + watchman/saved_state/SavedStateInterface.cpp | 1 + watchman/spawn.cpp | 1 + watchman/state.cpp | 2 +- .../tests/LocalSavedStateInterfaceTest.cpp | 1 + watchman/watcher/eden.cpp | 2 +- watchman/watcher/inotify.cpp | 2 +- watchman/watchman_query.h | 30 --------------- 35 files changed, 90 insertions(+), 50 deletions(-) rename watchman/{error_category.cpp => Errors.cpp} (98%) rename watchman/{watchman_error_category.h => Errors.h} (79%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c9d46f6733d..03e746e597b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -603,6 +603,7 @@ watchman/Clock.cpp watchman/CommandRegistry.cpp watchman/ContentHash.cpp watchman/CookieSync.cpp +watchman/Errors.cpp watchman/FileDescriptor.cpp watchman/FileInformation.cpp watchman/FlagMap.cpp @@ -620,7 +621,6 @@ watchman/WatchmanConfig.cpp watchman/bser.cpp watchman/checksock.cpp watchman/clientmode.cpp -watchman/error_category.cpp watchman/fstype.cpp watchman/groups.cpp # hash.cpp (in libhash) diff --git a/watchman/error_category.cpp b/watchman/Errors.cpp similarity index 98% rename from watchman/error_category.cpp rename to watchman/Errors.cpp index 8f8bf4d08113..3b99cb376374 100644 --- a/watchman/error_category.cpp +++ b/watchman/Errors.cpp @@ -1,7 +1,10 @@ /* Copyright 2016-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ -#include "watchman/watchman.h" -#include "watchman/watchman_error_category.h" +#include "watchman/Errors.h" + +#ifdef _WIN32 +#include // @manual +#endif using std::generic_category; diff --git a/watchman/watchman_error_category.h b/watchman/Errors.h similarity index 79% rename from watchman/watchman_error_category.h rename to watchman/Errors.h index 4bc18a85b792..44163b499bc2 100644 --- a/watchman/watchman_error_category.h +++ b/watchman/Errors.h @@ -1,6 +1,8 @@ /* Copyright 2016-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ #pragma once + +#include #include #include @@ -89,6 +91,42 @@ class inotify_category : public std::error_category { // Obtain a ref to the above error category const std::error_category& inotify_category(); +/** + * Represents an error parsing a query. + */ +class QueryParseError : public std::runtime_error { + public: + template + explicit QueryParseError(Args&&... args) + : std::runtime_error(folly::to( + "failed to parse query: ", + std::forward(args)...)) {} +}; + +/** + * Represents an error executing a query. + */ +class QueryExecError : public std::runtime_error { + public: + template + explicit QueryExecError(Args&&... args) + : std::runtime_error(folly::to( + "query failed: ", + std::forward(args)...)) {} +}; + +/** + * Represents an error resolving a root. + */ +class RootResolveError : public std::runtime_error { + public: + template + explicit RootResolveError(Args&&... args) + : std::runtime_error(folly::to( + "RootResolveError: ", + std::forward(args)...)) {} +}; + } // namespace watchman // Allow watchman::error_code to implicitly convert to std::error_condition diff --git a/watchman/LocalFileResult.cpp b/watchman/LocalFileResult.cpp index f9a6405b3be0..c5c0887251f4 100644 --- a/watchman/LocalFileResult.cpp +++ b/watchman/LocalFileResult.cpp @@ -1,6 +1,6 @@ #include "watchman/LocalFileResult.h" #include "ContentHash.h" -#include "watchman/watchman_error_category.h" +#include "watchman/Errors.h" using folly::Optional; diff --git a/watchman/QueryableView.cpp b/watchman/QueryableView.cpp index 4b592b5c0875..273d43f8563a 100644 --- a/watchman/QueryableView.cpp +++ b/watchman/QueryableView.cpp @@ -2,6 +2,7 @@ * Licensed under the Apache License, Version 2.0 */ #include "QueryableView.h" +#include "watchman/Errors.h" namespace watchman { QueryableView::~QueryableView() {} diff --git a/watchman/WatchmanConfig.cpp b/watchman/WatchmanConfig.cpp index 5addfeafc583..0e4acee18d7d 100644 --- a/watchman/WatchmanConfig.cpp +++ b/watchman/WatchmanConfig.cpp @@ -4,8 +4,8 @@ #include "watchman/WatchmanConfig.h" #include #include +#include "watchman/Errors.h" #include "watchman/watchman.h" -#include "watchman/watchman_error_category.h" using namespace watchman; diff --git a/watchman/cmds/subscribe.cpp b/watchman/cmds/subscribe.cpp index 52d3fe86cb4e..dadcf8071bd2 100644 --- a/watchman/cmds/subscribe.cpp +++ b/watchman/cmds/subscribe.cpp @@ -1,9 +1,9 @@ /* Copyright 2013-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/Errors.h" #include "watchman/MapUtil.h" #include "watchman/watchman.h" -#include "watchman/watchman_error_category.h" using namespace watchman; diff --git a/watchman/listener-user.cpp b/watchman/listener-user.cpp index 35f024c6c60b..c65e19bebd1d 100644 --- a/watchman/listener-user.cpp +++ b/watchman/listener-user.cpp @@ -2,6 +2,7 @@ * Licensed under the Apache License, Version 2.0 */ #include +#include "watchman/Errors.h" #include "watchman/watchman.h" // Functions relating to the per-user service diff --git a/watchman/query/base.cpp b/watchman/query/base.cpp index df5d9a16ef36..cf8c07423fc8 100644 --- a/watchman/query/base.cpp +++ b/watchman/query/base.cpp @@ -1,11 +1,14 @@ /* Copyright 2013-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/Errors.h" #include "watchman/watchman.h" #include #include +using namespace watchman; + /* Basic boolean and compound expressions */ class NotExpr : public QueryExpr { diff --git a/watchman/query/dirname.cpp b/watchman/query/dirname.cpp index 66c782232616..2106262764ab 100644 --- a/watchman/query/dirname.cpp +++ b/watchman/query/dirname.cpp @@ -1,11 +1,12 @@ /* Copyright 2015-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/Errors.h" #include "watchman/watchman.h" #include -using watchman::CaseSensitivity; +using namespace watchman; static inline bool is_dir_sep(int c) { return c == '/' || c == '\\'; diff --git a/watchman/query/eval.cpp b/watchman/query/eval.cpp index 52fc01e36a05..0153c079d468 100644 --- a/watchman/query/eval.cpp +++ b/watchman/query/eval.cpp @@ -4,6 +4,7 @@ #include "watchman/watchman.h" #include +#include "watchman/Errors.h" #include "watchman/LocalFileResult.h" #include "watchman/saved_state/SavedStateInterface.h" #include "watchman/scm/SCM.h" diff --git a/watchman/query/fieldlist.cpp b/watchman/query/fieldlist.cpp index 2dc2d4ddb81b..cc0963e9875c 100644 --- a/watchman/query/fieldlist.cpp +++ b/watchman/query/fieldlist.cpp @@ -1,8 +1,8 @@ /* Copyright 2013-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/Errors.h" #include "watchman/watchman.h" -#include "watchman/watchman_error_category.h" using namespace watchman; using folly::Optional; diff --git a/watchman/query/glob.cpp b/watchman/query/glob.cpp index 683644e2cd49..2eb5ca1455b2 100644 --- a/watchman/query/glob.cpp +++ b/watchman/query/glob.cpp @@ -3,11 +3,13 @@ #include #include +#include "watchman/Errors.h" #include "watchman/InMemoryView.h" #include "watchman/thirdparty/wildmatch/wildmatch.h" #include "watchman/watchman.h" using std::make_unique; +using watchman::QueryParseError; /* The glob generator. * The user can specify a list of globs as the set of candidate nodes diff --git a/watchman/query/intcompare.cpp b/watchman/query/intcompare.cpp index e35f19075c0c..2bfd557c230b 100644 --- a/watchman/query/intcompare.cpp +++ b/watchman/query/intcompare.cpp @@ -1,10 +1,13 @@ /* Copyright 2015-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/Errors.h" #include "watchman/watchman.h" #include +using namespace watchman; + // Helper functions for integer comparisons in query expressions static const struct { diff --git a/watchman/query/match.cpp b/watchman/query/match.cpp index 034d5ab66d4d..7fd18394756c 100644 --- a/watchman/query/match.cpp +++ b/watchman/query/match.cpp @@ -1,12 +1,15 @@ /* Copyright 2013-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/Errors.h" #include "watchman/watchman.h" #include #include #include "watchman/thirdparty/wildmatch/wildmatch.h" + using watchman::CaseSensitivity; +using watchman::QueryParseError; class WildMatchExpr : public QueryExpr { std::string pattern; diff --git a/watchman/query/name.cpp b/watchman/query/name.cpp index fad21cc1e17f..86370cb64856 100644 --- a/watchman/query/name.cpp +++ b/watchman/query/name.cpp @@ -1,8 +1,10 @@ /* Copyright 2013-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/Errors.h" #include "watchman/watchman.h" -using watchman::CaseSensitivity; + +using namespace watchman; class NameExpr : public QueryExpr { w_string name; diff --git a/watchman/query/parse.cpp b/watchman/query/parse.cpp index 52ae890ae3ca..159913df878f 100644 --- a/watchman/query/parse.cpp +++ b/watchman/query/parse.cpp @@ -1,6 +1,7 @@ /* Copyright 2013-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/Errors.h" #include "watchman/watchman.h" using namespace watchman; diff --git a/watchman/query/pcre.cpp b/watchman/query/pcre.cpp index 73252f88ee01..1fb43c82bc20 100644 --- a/watchman/query/pcre.cpp +++ b/watchman/query/pcre.cpp @@ -1,13 +1,14 @@ /* Copyright 2013-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ -#include "watchman/watchman.h" - #include +#include "watchman/Errors.h" +#include "watchman/watchman.h" #ifdef HAVE_PCRE_H using watchman::CaseSensitivity; +using watchman::QueryParseError; class PcreExpr : public QueryExpr { pcre* re; diff --git a/watchman/query/since.cpp b/watchman/query/since.cpp index 5d86b5ec30cb..111ad9223395 100644 --- a/watchman/query/since.cpp +++ b/watchman/query/since.cpp @@ -1,6 +1,7 @@ /* Copyright 2013-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/Errors.h" #include "watchman/watchman.h" #include diff --git a/watchman/query/suffix.cpp b/watchman/query/suffix.cpp index 57f488e2e448..13f537b2106d 100644 --- a/watchman/query/suffix.cpp +++ b/watchman/query/suffix.cpp @@ -1,10 +1,13 @@ /* Copyright 2013-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/Errors.h" #include "watchman/watchman.h" #include +using namespace watchman; + class SuffixExpr : public QueryExpr { std::unordered_set suffixSet_; diff --git a/watchman/query/type.cpp b/watchman/query/type.cpp index 0c44a7f8bae9..573ef84e8713 100644 --- a/watchman/query/type.cpp +++ b/watchman/query/type.cpp @@ -1,11 +1,13 @@ /* Copyright 2013-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/Errors.h" #include "watchman/watchman.h" #include using watchman::DType; +using watchman::QueryParseError; class TypeExpr : public QueryExpr { char arg; diff --git a/watchman/root/crawler.cpp b/watchman/root/crawler.cpp index c890ce246518..ea37e4609504 100644 --- a/watchman/root/crawler.cpp +++ b/watchman/root/crawler.cpp @@ -1,10 +1,10 @@ /* Copyright 2012-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/Errors.h" #include "watchman/InMemoryView.h" #include "watchman/watcher/Watcher.h" #include "watchman/watchman.h" -#include "watchman/watchman_error_category.h" #include "watchman/watchman_system.h" static void diff --git a/watchman/root/resolve.cpp b/watchman/root/resolve.cpp index c762dc4528c9..672d85095a8a 100644 --- a/watchman/root/resolve.cpp +++ b/watchman/root/resolve.cpp @@ -1,10 +1,10 @@ /* Copyright 2012-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/Errors.h" #include "watchman/FileSystem.h" #include "watchman/InMemoryView.h" #include "watchman/watchman.h" -#include "watchman/watchman_error_category.h" using namespace watchman; diff --git a/watchman/root/stat.cpp b/watchman/root/stat.cpp index 20a44786b5a4..9fda47405f36 100644 --- a/watchman/root/stat.cpp +++ b/watchman/root/stat.cpp @@ -1,10 +1,10 @@ /* Copyright 2012-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/Errors.h" #include "watchman/InMemoryView.h" #include "watchman/watcher/Watcher.h" #include "watchman/watchman.h" -#include "watchman/watchman_error_category.h" namespace watchman { diff --git a/watchman/root/symlink.cpp b/watchman/root/symlink.cpp index 4de4de67b423..143df953223f 100644 --- a/watchman/root/symlink.cpp +++ b/watchman/root/symlink.cpp @@ -3,10 +3,10 @@ #include #include +#include "watchman/Errors.h" #include "watchman/FileSystem.h" #include "watchman/LogConfig.h" #include "watchman/watchman.h" -#include "watchman/watchman_error_category.h" #include "watchman/watchman_system.h" using watchman::readSymbolicLink; diff --git a/watchman/root/sync.cpp b/watchman/root/sync.cpp index c0cf2570389d..274260013148 100644 --- a/watchman/root/sync.cpp +++ b/watchman/root/sync.cpp @@ -1,10 +1,10 @@ /* Copyright 2012-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/Errors.h" #include "watchman/InMemoryView.h" #include "watchman/watcher/Watcher.h" #include "watchman/watchman.h" -#include "watchman/watchman_error_category.h" using folly::to; using watchman::w_perf_t; diff --git a/watchman/root/warnerr.cpp b/watchman/root/warnerr.cpp index b26a6c57316d..3443d32eac65 100644 --- a/watchman/root/warnerr.cpp +++ b/watchman/root/warnerr.cpp @@ -1,9 +1,9 @@ /* Copyright 2012-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/Errors.h" #include "watchman/InMemoryView.h" #include "watchman/watchman.h" -#include "watchman/watchman_error_category.h" using namespace watchman; diff --git a/watchman/saved_state/LocalSavedStateInterface.cpp b/watchman/saved_state/LocalSavedStateInterface.cpp index d88c01da64be..e6851e346f28 100644 --- a/watchman/saved_state/LocalSavedStateInterface.cpp +++ b/watchman/saved_state/LocalSavedStateInterface.cpp @@ -2,6 +2,7 @@ * Licensed under the Apache License, Version 2.0 */ #include "LocalSavedStateInterface.h" +#include "watchman/Errors.h" #include "watchman/scm/SCM.h" #include "watchman/watchman.h" #include "watchman/watchman_cmd.h" diff --git a/watchman/saved_state/SavedStateInterface.cpp b/watchman/saved_state/SavedStateInterface.cpp index 00561964da2c..d84bfd92adc8 100644 --- a/watchman/saved_state/SavedStateInterface.cpp +++ b/watchman/saved_state/SavedStateInterface.cpp @@ -2,6 +2,7 @@ * Licensed under the Apache License, Version 2.0 */ #include "watchman/saved_state/SavedStateInterface.h" #include +#include "watchman/Errors.h" #include "watchman/saved_state/LocalSavedStateInterface.h" #include "watchman/watchman.h" #if HAVE_MANIFOLD diff --git a/watchman/spawn.cpp b/watchman/spawn.cpp index 13c301c54fcf..d7d6f96fa4db 100644 --- a/watchman/spawn.cpp +++ b/watchman/spawn.cpp @@ -3,6 +3,7 @@ #include #include +#include "watchman/Errors.h" #include "watchman/watchman.h" #include "watchman/watchman_system.h" diff --git a/watchman/state.cpp b/watchman/state.cpp index 6eb7534027dc..a49c7703fa35 100644 --- a/watchman/state.cpp +++ b/watchman/state.cpp @@ -3,9 +3,9 @@ #include #include +#include "watchman/Errors.h" #include "watchman/Logging.h" #include "watchman/watchman.h" -#include "watchman/watchman_error_category.h" using namespace watchman; diff --git a/watchman/tests/LocalSavedStateInterfaceTest.cpp b/watchman/tests/LocalSavedStateInterfaceTest.cpp index 5919b328bdd0..3213ee4f801d 100644 --- a/watchman/tests/LocalSavedStateInterfaceTest.cpp +++ b/watchman/tests/LocalSavedStateInterfaceTest.cpp @@ -4,6 +4,7 @@ #include "watchman/saved_state/LocalSavedStateInterface.h" #include #include +#include "watchman/Errors.h" #include "watchman/thirdparty/jansson/jansson.h" #include "watchman/watchman.h" diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index fb52c1b00eb6..f9249b146213 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -16,6 +16,7 @@ #include #include "eden/fs/service/gen-cpp2/StreamingEdenService.h" #include "watchman/ChildProcess.h" +#include "watchman/Errors.h" #include "watchman/QueryableView.h" #include "watchman/ThreadPool.h" #include "watchman/scm/SCM.h" @@ -23,7 +24,6 @@ #include "watchman/watcher/Watcher.h" #include "watchman/watcher/WatcherRegistry.h" #include "watchman/watchman.h" -#include "watchman/watchman_error_category.h" using apache::thrift::TApplicationException; using facebook::eden::EdenError; diff --git a/watchman/watcher/inotify.cpp b/watchman/watcher/inotify.cpp index 08b477666aeb..6f091d387847 100644 --- a/watchman/watcher/inotify.cpp +++ b/watchman/watcher/inotify.cpp @@ -4,6 +4,7 @@ #include #include #include +#include "watchman/Errors.h" #include "watchman/FileDescriptor.h" #include "watchman/FlagMap.h" #include "watchman/InMemoryView.h" @@ -12,7 +13,6 @@ #include "watchman/watcher/Watcher.h" #include "watchman/watcher/WatcherRegistry.h" #include "watchman/watchman.h" -#include "watchman/watchman_error_category.h" #ifdef HAVE_INOTIFY_INIT diff --git a/watchman/watchman_query.h b/watchman/watchman_query.h index a8d07866944a..fd16b2abd25f 100644 --- a/watchman/watchman_query.h +++ b/watchman/watchman_query.h @@ -323,36 +323,6 @@ class QueryExpr { struct watchman_glob_tree; -// represents an error parsing a query -class QueryParseError : public std::runtime_error { - public: - template - explicit QueryParseError(Args&&... args) - : std::runtime_error(folly::to( - "failed to parse query: ", - std::forward(args)...)) {} -}; - -// represents an error executing a query -class QueryExecError : public std::runtime_error { - public: - template - explicit QueryExecError(Args&&... args) - : std::runtime_error(folly::to( - "query failed: ", - std::forward(args)...)) {} -}; - -// represents an error resolving the root -class RootResolveError : public std::runtime_error { - public: - template - explicit RootResolveError(Args&&... args) - : std::runtime_error(folly::to( - "RootResolveError: ", - std::forward(args)...)) {} -}; - struct w_query { watchman::CaseSensitivity case_sensitive{ watchman::CaseSensitivity::CaseInSensitive}; From 84a09eb188721349dd932a04a059ad1db59c0773 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 6 Jul 2021 15:13:43 -0700 Subject: [PATCH 0112/7387] split saved_state into its own target Reviewed By: kmancini Differential Revision: D29509835 fbshipit-source-id: a4814fdb9c5412daf37a84e0e6d2be8ceb2cad21 --- CMakeLists.txt | 1 + watchman/query/eval.cpp | 3 +- .../saved_state/LocalSavedStateInterface.cpp | 4 ++- .../saved_state/LocalSavedStateInterface.h | 2 +- watchman/saved_state/SavedStateFactory.cpp | 29 +++++++++++++++++++ watchman/saved_state/SavedStateFactory.h | 29 +++++++++++++++++++ watchman/saved_state/SavedStateInterface.cpp | 23 +-------------- watchman/saved_state/SavedStateInterface.h | 14 ++------- 8 files changed, 68 insertions(+), 37 deletions(-) create mode 100644 watchman/saved_state/SavedStateFactory.cpp create mode 100644 watchman/saved_state/SavedStateFactory.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 03e746e597b6..fa120bc9ce39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -686,6 +686,7 @@ watchman/root/vcs.cpp # root/warnerr.cpp (in liberr) watchman/root/watchlist.cpp watchman/saved_state/LocalSavedStateInterface.cpp +watchman/saved_state/SavedStateFactory.cpp watchman/saved_state/SavedStateInterface.cpp watchman/scm/Mercurial.cpp watchman/scm/SCM.cpp diff --git a/watchman/query/eval.cpp b/watchman/query/eval.cpp index 0153c079d468..e632b27c8fad 100644 --- a/watchman/query/eval.cpp +++ b/watchman/query/eval.cpp @@ -6,6 +6,7 @@ #include #include "watchman/Errors.h" #include "watchman/LocalFileResult.h" +#include "watchman/saved_state/SavedStateFactory.h" #include "watchman/saved_state/SavedStateInterface.h" #include "watchman/scm/SCM.h" @@ -424,7 +425,7 @@ w_query_res w_query_execute( if (query->since_spec->hasSavedStateParams()) { // Find the most recent saved state to the new mergebase and return // changed files since that saved state, if available. - auto savedStateInterface = SavedStateInterface::getInterface( + auto savedStateInterface = getInterface( query->since_spec->savedStateStorageType, query->since_spec->savedStateConfig, scm, diff --git a/watchman/saved_state/LocalSavedStateInterface.cpp b/watchman/saved_state/LocalSavedStateInterface.cpp index e6851e346f28..9532b14ab802 100644 --- a/watchman/saved_state/LocalSavedStateInterface.cpp +++ b/watchman/saved_state/LocalSavedStateInterface.cpp @@ -1,8 +1,10 @@ /* Copyright 2017-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ -#include "LocalSavedStateInterface.h" +#include "watchman/saved_state/LocalSavedStateInterface.h" +#include "watchman/CommandRegistry.h" #include "watchman/Errors.h" +#include "watchman/Logging.h" #include "watchman/scm/SCM.h" #include "watchman/watchman.h" #include "watchman/watchman_cmd.h" diff --git a/watchman/saved_state/LocalSavedStateInterface.h b/watchman/saved_state/LocalSavedStateInterface.h index cd84dc74894b..cb59ab44594e 100644 --- a/watchman/saved_state/LocalSavedStateInterface.h +++ b/watchman/saved_state/LocalSavedStateInterface.h @@ -2,7 +2,7 @@ * Licensed under the Apache License, Version 2.0 */ #pragma once -#include "SavedStateInterface.h" +#include "watchman/saved_state/SavedStateInterface.h" namespace watchman { diff --git a/watchman/saved_state/SavedStateFactory.cpp b/watchman/saved_state/SavedStateFactory.cpp new file mode 100644 index 000000000000..f9f491ff1459 --- /dev/null +++ b/watchman/saved_state/SavedStateFactory.cpp @@ -0,0 +1,29 @@ +#include "watchman/saved_state/SavedStateFactory.h" +#include "watchman/Errors.h" +#include "watchman/saved_state/LocalSavedStateInterface.h" + +#if HAVE_MANIFOLD +#include "watchman/facebook/saved_state/ManifoldSavedStateInterface.h" // @manual +#endif + +namespace watchman { + +std::unique_ptr getInterface( + w_string_piece storageType, + const json_ref& savedStateConfig, + const SCM* scm, + const std::shared_ptr root) { + unused_parameter(root); +#if HAVE_MANIFOLD + if (storageType == "manifold") { + return std::make_unique( + savedStateConfig, scm, root); + } +#endif + if (storageType == "local") { + return std::make_unique(savedStateConfig, scm); + } + throw QueryParseError("invalid storage type '", storageType, "'"); +} + +} // namespace watchman diff --git a/watchman/saved_state/SavedStateFactory.h b/watchman/saved_state/SavedStateFactory.h new file mode 100644 index 000000000000..e53c6febbef2 --- /dev/null +++ b/watchman/saved_state/SavedStateFactory.h @@ -0,0 +1,29 @@ +/* Copyright 2017-present Facebook, Inc. + * Licensed under the Apache License, Version 2.0 */ + +#pragma once + +#include "watchman/thirdparty/jansson/jansson.h" +#include "watchman/watchman_string.h" + +class SCM; +struct watchman_root; + +namespace watchman { + +class SavedStateInterface; + +/** + * Returns an appropriate SavedStateInterface implementation for the + * specified storage type. Returns a managed pointer to the saved state + * interface if successful. Throws if the storage type is not recognized, or + * if the saved state interface does not successfully parse the saved state + * config. + */ +std::unique_ptr getInterface( + w_string_piece storageType, + const json_ref& savedStateConfig, + const SCM* scm, + const std::shared_ptr root); + +} // namespace watchman diff --git a/watchman/saved_state/SavedStateInterface.cpp b/watchman/saved_state/SavedStateInterface.cpp index d84bfd92adc8..ed34ab909c60 100644 --- a/watchman/saved_state/SavedStateInterface.cpp +++ b/watchman/saved_state/SavedStateInterface.cpp @@ -5,31 +5,10 @@ #include "watchman/Errors.h" #include "watchman/saved_state/LocalSavedStateInterface.h" #include "watchman/watchman.h" -#if HAVE_MANIFOLD -#include "watchman/facebook/saved_state/ManifoldSavedStateInterface.h" -#endif namespace watchman { -SavedStateInterface::~SavedStateInterface() {} - -std::unique_ptr SavedStateInterface::getInterface( - w_string_piece storageType, - const json_ref& savedStateConfig, - const SCM* scm, - const std::shared_ptr root) { - unused_parameter(root); -#if HAVE_MANIFOLD - if (storageType == "manifold") { - return std::make_unique( - savedStateConfig, scm, root); - } -#endif - if (storageType == "local") { - return std::make_unique(savedStateConfig, scm); - } - throw QueryParseError("invalid storage type '", storageType, "'"); -} +SavedStateInterface::~SavedStateInterface() = default; SavedStateInterface::SavedStateInterface(const json_ref& savedStateConfig) { auto project = savedStateConfig.get_default("project"); diff --git a/watchman/saved_state/SavedStateInterface.h b/watchman/saved_state/SavedStateInterface.h index a6c2ede5a72b..d042cbdd929f 100644 --- a/watchman/saved_state/SavedStateInterface.h +++ b/watchman/saved_state/SavedStateInterface.h @@ -3,7 +3,8 @@ #pragma once #include "watchman/thirdparty/jansson/jansson.h" -#include "watchman/watchman.h" + +struct watchman_root; namespace watchman { @@ -20,17 +21,6 @@ class SavedStateInterface { public: virtual ~SavedStateInterface(); - // Returns an appropriate SavedStateInterface implementation for the - // specified storage type. Returns a managed pointer to the saved state - // interface if successful. Throws if the storage type is not recognized, or - // if the saved state interface does not successfully parse the saved state - // config. - static std::unique_ptr getInterface( - w_string_piece storageType, - const json_ref& savedStateConfig, - const SCM* scm, - const std::shared_ptr root); - // The commit ID of a saved state and a JSON blob of information clients can // use to access the saved state. The contents of the info varies with the // storage type. From 435f2b1cb51425bdabac8bee81e7016cf8e087a6 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 6 Jul 2021 15:13:43 -0700 Subject: [PATCH 0113/7387] split fstype into its own target Reviewed By: kmancini Differential Revision: D29509842 fbshipit-source-id: c79e452ee8c9eb0778f84992b100c8d2a5d97da1 --- CMakeLists.txt | 2 +- watchman/{fstype.cpp => FSDetect.cpp} | 11 +++++------ watchman/FSDetect.h | 14 ++++++++++++++ watchman/root/resolve.cpp | 1 + watchman/tests/{FSType.cpp => FSDetectTest.cpp} | 2 +- watchman/watcher/eden.cpp | 1 + watchman/watcher/inotify.cpp | 1 + watchman/watchman.h | 6 ------ watchman/watchman_root.h | 4 ---- 9 files changed, 24 insertions(+), 18 deletions(-) rename watchman/{fstype.cpp => FSDetect.cpp} (97%) create mode 100644 watchman/FSDetect.h rename watchman/tests/{FSType.cpp => FSDetectTest.cpp} (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index fa120bc9ce39..7bf87bd50eee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -607,6 +607,7 @@ watchman/Errors.cpp watchman/FileDescriptor.cpp watchman/FileInformation.cpp watchman/FlagMap.cpp +watchman/FSDetect.cpp watchman/InMemoryView.cpp watchman/LocalFileResult.cpp watchman/PendingCollection.cpp @@ -621,7 +622,6 @@ watchman/WatchmanConfig.cpp watchman/bser.cpp watchman/checksock.cpp watchman/clientmode.cpp -watchman/fstype.cpp watchman/groups.cpp # hash.cpp (in libhash) watchman/ignore.cpp diff --git a/watchman/fstype.cpp b/watchman/FSDetect.cpp similarity index 97% rename from watchman/fstype.cpp rename to watchman/FSDetect.cpp index a9fce17add94..945466d9652f 100644 --- a/watchman/fstype.cpp +++ b/watchman/FSDetect.cpp @@ -1,7 +1,9 @@ -/* Copyright 2014-present Facebook, Inc. - * Licensed under the Apache License, Version 2.0 */ +#include "watchman/FSDetect.h" +#include +#include +#include "watchman/FileDescriptor.h" +#include "watchman/watchman_system.h" -#include "watchman/watchman.h" #ifdef HAVE_SYS_VFS_H #include #endif @@ -17,9 +19,6 @@ #ifdef __linux__ #include #endif -#include -#include -#include "watchman/FileDescriptor.h" // This function is used to return the fstype for a given path // based on the linux style /proc/mounts data provided. diff --git a/watchman/FSDetect.h b/watchman/FSDetect.h new file mode 100644 index 000000000000..c605301ca89d --- /dev/null +++ b/watchman/FSDetect.h @@ -0,0 +1,14 @@ +#pragma once + +#include +#include "watchman/watchman_string.h" + +// Returns the name of the filesystem for the specified path +w_string w_fstype(const char* path); +w_string find_fstype_in_linux_proc_mounts( + folly::StringPiece path, + folly::StringPiece procMountsData); + +inline bool is_edenfs_fs_type(w_string_piece fs_type) { + return fs_type == "edenfs" || fs_type.startsWith("edenfs:"); +} diff --git a/watchman/root/resolve.cpp b/watchman/root/resolve.cpp index 672d85095a8a..f2c66e53b9a4 100644 --- a/watchman/root/resolve.cpp +++ b/watchman/root/resolve.cpp @@ -2,6 +2,7 @@ * Licensed under the Apache License, Version 2.0 */ #include "watchman/Errors.h" +#include "watchman/FSDetect.h" #include "watchman/FileSystem.h" #include "watchman/InMemoryView.h" #include "watchman/watchman.h" diff --git a/watchman/tests/FSType.cpp b/watchman/tests/FSDetectTest.cpp similarity index 99% rename from watchman/tests/FSType.cpp rename to watchman/tests/FSDetectTest.cpp index 75a19f7c2ad3..1c7282abcb52 100644 --- a/watchman/tests/FSType.cpp +++ b/watchman/tests/FSDetectTest.cpp @@ -1,9 +1,9 @@ /* Copyright 2020-present Facebook, Inc. * Licensed under the Apache License, Version 2.0. */ +#include "watchman/FSDetect.h" #include #include -#include "watchman/watchman.h" TEST(FSType, fstype) { auto mount_data = diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index f9249b146213..876dec74c933 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -17,6 +17,7 @@ #include "eden/fs/service/gen-cpp2/StreamingEdenService.h" #include "watchman/ChildProcess.h" #include "watchman/Errors.h" +#include "watchman/FSDetect.h" #include "watchman/QueryableView.h" #include "watchman/ThreadPool.h" #include "watchman/scm/SCM.h" diff --git a/watchman/watcher/inotify.cpp b/watchman/watcher/inotify.cpp index 6f091d387847..cc65ff5bf33a 100644 --- a/watchman/watcher/inotify.cpp +++ b/watchman/watcher/inotify.cpp @@ -5,6 +5,7 @@ #include #include #include "watchman/Errors.h" +#include "watchman/FSDetect.h" #include "watchman/FileDescriptor.h" #include "watchman/FlagMap.h" #include "watchman/InMemoryView.h" diff --git a/watchman/watchman.h b/watchman/watchman.h index b7f9faf255ab..9824a3a2f1a2 100644 --- a/watchman/watchman.h +++ b/watchman/watchman.h @@ -33,12 +33,6 @@ struct watchman_trigger_command; #include "watchman/watchman_cmd.h" #include "watchman_trigger.h" -// Returns the name of the filesystem for the specified path -w_string w_fstype(const char* path); -w_string find_fstype_in_linux_proc_mounts( - folly::StringPiece path, - folly::StringPiece procMountsData); - extern folly::Synchronized poisoned_reason; bool w_is_stopping(); diff --git a/watchman/watchman_root.h b/watchman/watchman_root.h index 13c55ac5b7ef..c5cd30121973 100644 --- a/watchman/watchman_root.h +++ b/watchman/watchman_root.h @@ -237,7 +237,3 @@ void handle_open_errno( std::chrono::system_clock::time_point now, const char* syscall, const std::error_code& err); - -inline bool is_edenfs_fs_type(w_string_piece fs_type) { - return fs_type == "edenfs" || fs_type.startsWith("edenfs:"); -} From d211060fc92f491ae8c35ac355ba1b290d472da0 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 6 Jul 2021 15:13:43 -0700 Subject: [PATCH 0114/7387] split WatchmanConfig into its own target Reviewed By: kmancini Differential Revision: D29509855 fbshipit-source-id: 1752a656e0653a490c0542335a627eca65e20ca7 --- watchman/WatchmanConfig.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/watchman/WatchmanConfig.cpp b/watchman/WatchmanConfig.cpp index 0e4acee18d7d..a7d84862f19a 100644 --- a/watchman/WatchmanConfig.cpp +++ b/watchman/WatchmanConfig.cpp @@ -2,10 +2,11 @@ * Licensed under the Apache License, Version 2.0 */ #include "watchman/WatchmanConfig.h" +#include #include #include #include "watchman/Errors.h" -#include "watchman/watchman.h" +#include "watchman/Logging.h" using namespace watchman; From 4791f486f8d9e889abbf21a109d2084a2ce003b1 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 6 Jul 2021 15:13:43 -0700 Subject: [PATCH 0115/7387] split ChildProcess and fd-related things into their own targets Reviewed By: kmancini Differential Revision: D29509848 fbshipit-source-id: 97a72538a5ef8f9b56ecddd512e79a5e4e29b459 --- watchman/FileDescriptor.cpp | 12 +++++++----- watchman/FileSystem.h | 2 +- watchman/InMemoryView.h | 4 ++-- watchman/Pipe.cpp | 2 +- watchman/main.cpp | 3 ++- watchman/opendir.cpp | 5 ++++- watchman/watchman.h | 1 - watchman/winbuild/dir.cpp | 1 + 8 files changed, 18 insertions(+), 12 deletions(-) diff --git a/watchman/FileDescriptor.cpp b/watchman/FileDescriptor.cpp index 2a9ac2868cd2..4a270204b4f8 100644 --- a/watchman/FileDescriptor.cpp +++ b/watchman/FileDescriptor.cpp @@ -2,20 +2,22 @@ * Licensed under the Apache License, Version 2.0 */ #include "watchman/FileDescriptor.h" +#include +#include +#include +#include #include "watchman/FileSystem.h" -#include "watchman/watchman.h" +#include "watchman/watchman_string.h" + #ifdef __APPLE__ #include // @manual #include // @manual #include // @manual #endif -#include + #ifdef _WIN32 #include "WinIoCtl.h" // @manual #endif -#include -#include -#include #if defined(_WIN32) || defined(O_PATH) #define CAN_OPEN_SYMLINKS 1 diff --git a/watchman/FileSystem.h b/watchman/FileSystem.h index 6d911f000b8d..69ece53b2e69 100644 --- a/watchman/FileSystem.h +++ b/watchman/FileSystem.h @@ -1,9 +1,9 @@ /* Copyright 2017-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ #pragma once -#include "Result.h" #include "watchman/FileDescriptor.h" #include "watchman/FileInformation.h" +#include "watchman/Result.h" /** This header defines platform independent helper functions for * operating on the filesystem at a low level. diff --git a/watchman/InMemoryView.h b/watchman/InMemoryView.h index a2eb0e5b048b..8b58319e3feb 100644 --- a/watchman/InMemoryView.h +++ b/watchman/InMemoryView.h @@ -13,11 +13,11 @@ #include "watchman/RingBuffer.h" #include "watchman/SymlinkTargets.h" #include "watchman/WatchmanConfig.h" +#include "watchman/watchman_opendir.h" #include "watchman/watchman_perf.h" +#include "watchman/watchman_query.h" #include "watchman/watchman_string.h" #include "watchman/watchman_system.h" -#include "watchman_opendir.h" -#include "watchman_query.h" struct watchman_client; diff --git a/watchman/Pipe.cpp b/watchman/Pipe.cpp index aeb0dc3e082f..89074c1ad166 100644 --- a/watchman/Pipe.cpp +++ b/watchman/Pipe.cpp @@ -1,10 +1,10 @@ /* Copyright 2016-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ #include "watchman/Pipe.h" -#include "watchman/watchman.h" #ifdef _WIN32 #include // @manual #endif +#include #include #include diff --git a/watchman/main.cpp b/watchman/main.cpp index 33e84803db0a..1344158ac6f8 100644 --- a/watchman/main.cpp +++ b/watchman/main.cpp @@ -12,11 +12,12 @@ #include #include -#include "ProcessLock.h" #include "watchman/ChildProcess.h" #include "watchman/LogConfig.h" #include "watchman/Logging.h" +#include "watchman/ProcessLock.h" #include "watchman/ThreadPool.h" +#include "watchman/watchman_opendir.h" #ifdef _WIN32 #include // @manual diff --git a/watchman/opendir.cpp b/watchman/opendir.cpp index dd823737c545..4cb2f0ce99c3 100644 --- a/watchman/opendir.cpp +++ b/watchman/opendir.cpp @@ -2,7 +2,6 @@ * Licensed under the Apache License, Version 2.0 */ #include -#include "watchman/watchman.h" #ifndef _WIN32 #include #endif @@ -13,6 +12,10 @@ #endif #include #include "watchman/FileDescriptor.h" +#include "watchman/FileSystem.h" +#include "watchman/Logging.h" +#include "watchman/WatchmanConfig.h" +#include "watchman/watchman_opendir.h" using namespace watchman; using watchman::FileDescriptor; diff --git a/watchman/watchman.h b/watchman/watchman.h index 9824a3a2f1a2..ff02fe806102 100644 --- a/watchman/watchman.h +++ b/watchman/watchman.h @@ -19,7 +19,6 @@ struct watchman_trigger_command; #include "watchman/watchman_dir.h" #include "watchman/watchman_file.h" -#include "watchman_opendir.h" #define WATCHMAN_IO_BUF_SIZE 1048576 #define WATCHMAN_BATCH_LIMIT (16 * 1024) diff --git a/watchman/winbuild/dir.cpp b/watchman/winbuild/dir.cpp index 87801a1b073f..d8ec0ee3e74a 100644 --- a/watchman/winbuild/dir.cpp +++ b/watchman/winbuild/dir.cpp @@ -5,6 +5,7 @@ #include "watchman/FileDescriptor.h" #include "watchman/watchman.h" #include "watchman/watchman_system.h" +#include "watchman/watchman_opendir.h" using watchman::FileDescriptor; using watchman::FileInformation; From d67dfdb3834884b304a02f246e09d3212b253e61 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 6 Jul 2021 15:13:43 -0700 Subject: [PATCH 0116/7387] split ignore into its own target Reviewed By: kmancini Differential Revision: D29509858 fbshipit-source-id: 8ca59b714f3a02c393a31a039b7158458c151883 --- watchman/ignore.cpp | 2 +- watchman/thirdparty/libart/src/art-inl.h | 1 + watchman/watchman.h | 1 - watchman/watchman_ignore.h | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/watchman/ignore.cpp b/watchman/ignore.cpp index 739afea1f651..256bfedadfe9 100644 --- a/watchman/ignore.cpp +++ b/watchman/ignore.cpp @@ -1,7 +1,7 @@ /* Copyright 2016-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ -#include "watchman/watchman.h" +#include "watchman/watchman_ignore.h" // The path and everything below it is ignored. #define FULL_IGNORE 0x1 diff --git a/watchman/thirdparty/libart/src/art-inl.h b/watchman/thirdparty/libart/src/art-inl.h index 5e9b4508a564..8d9689ec8533 100644 --- a/watchman/thirdparty/libart/src/art-inl.h +++ b/watchman/thirdparty/libart/src/art-inl.h @@ -6,6 +6,7 @@ #include #include #include +#include #if defined(__clang__) # if __has_feature(address_sanitizer) diff --git a/watchman/watchman.h b/watchman/watchman.h index ff02fe806102..91ea27e2c461 100644 --- a/watchman/watchman.h +++ b/watchman/watchman.h @@ -9,7 +9,6 @@ #include "watchman/thirdparty/jansson/jansson.h" #include "watchman/watchman_string.h" #include "watchman_hash.h" -#include "watchman_ignore.h" #include "watchman_stream.h" struct watchman_file; diff --git a/watchman/watchman_ignore.h b/watchman/watchman_ignore.h index 4fd065071959..02180a81ad09 100644 --- a/watchman/watchman_ignore.h +++ b/watchman/watchman_ignore.h @@ -6,6 +6,7 @@ #include #include "watchman/thirdparty/libart/src/art.h" +#include "watchman/watchman_string.h" #ifdef __cplusplus extern "C" { From e1d9016d84568c668380ab24162ecaf777952fa6 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 6 Jul 2021 15:13:43 -0700 Subject: [PATCH 0117/7387] split bser into its own target Reviewed By: kmancini Differential Revision: D29509862 fbshipit-source-id: 16689dff2547dd7f1703adc730585a37836f06af --- watchman/bser.cpp | 3 ++- watchman/bser.h | 36 ++++++++++++++++++++++++++++++++++++ watchman/json.cpp | 1 + watchman/tests/bser.cpp | 1 + watchman/watchman_pdu.h | 31 ------------------------------- 5 files changed, 40 insertions(+), 32 deletions(-) create mode 100644 watchman/bser.h diff --git a/watchman/bser.cpp b/watchman/bser.cpp index a5b0c12095a7..b461a4fe3062 100644 --- a/watchman/bser.cpp +++ b/watchman/bser.cpp @@ -1,8 +1,9 @@ /* Copyright 2013-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/bser.h" +#include "watchman/Logging.h" #include "watchman/thirdparty/jansson/jansson_private.h" -#include "watchman/watchman.h" /* * This defines a binary serialization of the JSON data objects in this diff --git a/watchman/bser.h b/watchman/bser.h new file mode 100644 index 000000000000..02b5fafe90dc --- /dev/null +++ b/watchman/bser.h @@ -0,0 +1,36 @@ +// (c) Facebook, Inc. and its affiliates. Confidential and proprietary. + +#pragma once + +#include "watchman/thirdparty/jansson/jansson.h" + +typedef struct bser_ctx { + uint32_t bser_version; + uint32_t bser_capabilities; + json_dump_callback_t dump; +} bser_ctx_t; + +#define BSER_MAGIC "\x00\x01" +#define BSER_V2_MAGIC "\x00\x02" + +// BSERv2 capabilities. Must be powers of 2. +#define BSER_CAP_DISABLE_UNICODE 0x1 +#define BSER_CAP_DISABLE_UNICODE_FOR_ERRORS 0x2 + +int w_bser_write_pdu( + const uint32_t bser_version, + const uint32_t capabilities, + json_dump_callback_t dump, + const json_ref& json, + void* data); +int w_bser_dump(const bser_ctx_t* ctx, const json_ref& json, void* data); +bool bunser_int( + const char* buf, + json_int_t avail, + json_int_t* needed, + json_int_t* val); +json_ref bunser( + const char* buf, + const char* end, + json_int_t* needed, + json_error_t* jerr); diff --git a/watchman/json.cpp b/watchman/json.cpp index 540cced21c90..5d40f1d8d5b2 100644 --- a/watchman/json.cpp +++ b/watchman/json.cpp @@ -3,6 +3,7 @@ #include #include +#include "watchman/bser.h" #include "watchman/watchman.h" using namespace watchman; diff --git a/watchman/tests/bser.cpp b/watchman/tests/bser.cpp index 6747833a1a06..7a82045bac83 100644 --- a/watchman/tests/bser.cpp +++ b/watchman/tests/bser.cpp @@ -1,6 +1,7 @@ /* Copyright 2013-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/bser.h" #include #include #include diff --git a/watchman/watchman_pdu.h b/watchman/watchman_pdu.h index e9193b1a282a..e13f07fac7a0 100644 --- a/watchman/watchman_pdu.h +++ b/watchman/watchman_pdu.h @@ -64,35 +64,4 @@ struct watchman_json_buffer { bool streamN(w_stm_t stm, json_int_t len, json_error_t* jerr); }; -typedef struct bser_ctx { - uint32_t bser_version; - uint32_t bser_capabilities; - json_dump_callback_t dump; -} bser_ctx_t; - typedef struct watchman_json_buffer w_jbuffer_t; - -#define BSER_MAGIC "\x00\x01" -#define BSER_V2_MAGIC "\x00\x02" - -// BSERv2 capabilities. Must be powers of 2. -#define BSER_CAP_DISABLE_UNICODE 0x1 -#define BSER_CAP_DISABLE_UNICODE_FOR_ERRORS 0x2 - -int w_bser_write_pdu( - const uint32_t bser_version, - const uint32_t capabilities, - json_dump_callback_t dump, - const json_ref& json, - void* data); -int w_bser_dump(const bser_ctx_t* ctx, const json_ref& json, void* data); -bool bunser_int( - const char* buf, - json_int_t avail, - json_int_t* needed, - json_int_t* val); -json_ref bunser( - const char* buf, - const char* end, - json_int_t* needed, - json_error_t* jerr); From 34ac399bbcc8841692e9d7d7c8807efc772a5100 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 6 Jul 2021 15:13:43 -0700 Subject: [PATCH 0118/7387] enable autodeps for unit tests Summary: Remove the noautodeps tag from most of the unit tests. Reviewed By: kmancini Differential Revision: D29509910 fbshipit-source-id: 64454b291e04070a046642096a8d285c2a846f75 --- watchman/perf.cpp | 3 +++ watchman/tests/MapUtilTest.cpp | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/watchman/perf.cpp b/watchman/perf.cpp index 61de8da701b4..5cd3ab0622ac 100644 --- a/watchman/perf.cpp +++ b/watchman/perf.cpp @@ -6,9 +6,12 @@ #include #include "watchman/ChildProcess.h" #include "watchman/Logging.h" +#include "watchman/WatchmanConfig.h" #include "watchman/watchman.h" #include "watchman/watchman_perf.h" +#include "watchman/watchman_root.h" #include "watchman/watchman_system.h" +#include "watchman/watchman_time.h" namespace watchman { namespace { diff --git a/watchman/tests/MapUtilTest.cpp b/watchman/tests/MapUtilTest.cpp index 0fac3f2d9497..368830815cb9 100644 --- a/watchman/tests/MapUtilTest.cpp +++ b/watchman/tests/MapUtilTest.cpp @@ -4,7 +4,8 @@ #include "watchman/MapUtil.h" #include #include -#include "watchman/watchman.h" +#include +#include #include "watchman/watchman_string.h" using watchman::mapContainsAny; From 984de699ebb8747cdba1b4c4d995a2946eef154e Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 6 Jul 2021 15:41:51 -0700 Subject: [PATCH 0119/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/e90c93844323407af9494f0bc9c2a71031bcdc3a https://github.com/facebook/fbthrift/commit/434bd8414e53e3d04e8c176252f1fb3c46586613 https://github.com/facebook/fbzmq/commit/f463fab79e8762c5364c83750eaa6314b94ea23a https://github.com/facebook/proxygen/commit/cf76b341751833a8b373e82720eb633e6b15ae32 https://github.com/facebook/watchman/commit/34ac399bbcc8841692e9d7d7c8807efc772a5100 https://github.com/facebookexperimental/rust-shed/commit/1b1faddc90dac4b1d24cb8dc0eb86a89f87dd63a Reviewed By: bigfootjon fbshipit-source-id: f41db0bbec68819c3734336d2d15fd60f5187f92 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6ab87b47e2a2..5c19c3b11d27 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 820702a9ab9fb55cbc0bf89ce21f92f1b2f9373a +Subproject commit 434bd8414e53e3d04e8c176252f1fb3c46586613 From 478b9eef8c7e21b14146eeb5527f4e4123392044 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 6 Jul 2021 19:14:42 -0700 Subject: [PATCH 0120/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/90d973ee31923c5560b7c42b0a04616f1bbb3649 https://github.com/facebook/rocksdb/commit/714ce5041dedbfcaf964e7cf67999921110cd134 Reviewed By: bigfootjon fbshipit-source-id: 214cbf66289cad3abddae036ceb3ccd60501ae53 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5c19c3b11d27..fc09bf2994d6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 434bd8414e53e3d04e8c176252f1fb3c46586613 +Subproject commit 90d973ee31923c5560b7c42b0a04616f1bbb3649 From ef9928ce404e1880121490b175783bded4b58d62 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 6 Jul 2021 21:29:45 -0700 Subject: [PATCH 0121/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5ea3837abf19c8210e29abbd2b302d9c9b862023 Reviewed By: bigfootjon fbshipit-source-id: 8b2dd36846eb7a421b0a8e2e1f482ae2dd4ed0cf --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index fc09bf2994d6..4ac59e6b2983 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 90d973ee31923c5560b7c42b0a04616f1bbb3649 +Subproject commit 5ea3837abf19c8210e29abbd2b302d9c9b862023 From ee4706b482c2464ed7d353fa3346bcece07b8a13 Mon Sep 17 00:00:00 2001 From: Thomas Orozco Date: Wed, 7 Jul 2021 02:30:35 -0700 Subject: [PATCH 0122/7387] watchman/rust: make CanonicalPath Clone Summary: It's a PathBuf that is clone. No need to force the user to re-do the validation every time they need a CanonicalPath. Reviewed By: ndmitchell Differential Revision: D29550636 fbshipit-source-id: c814d6f0e5835f3c4a181d5e85815d3863220393 --- watchman/rust/watchman_client/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/rust/watchman_client/src/lib.rs b/watchman/rust/watchman_client/src/lib.rs index a7adfde851bb..2eb00cd33c08 100644 --- a/watchman/rust/watchman_client/src/lib.rs +++ b/watchman/rust/watchman_client/src/lib.rs @@ -244,7 +244,7 @@ impl Connector { } /// Represents a canonical path in the filesystem. -#[derive(Debug)] +#[derive(Debug, Clone)] pub struct CanonicalPath(PathBuf); impl CanonicalPath { From 839145932162e940d6079b57c9889774c962e7bf Mon Sep 17 00:00:00 2001 From: Thomas Orozco Date: Wed, 7 Jul 2021 02:30:35 -0700 Subject: [PATCH 0123/7387] buck2: take Connector when constructing a SyncableQuery Summary: This makes it easier to add tests for this. Reviewed By: ndmitchell Differential Revision: D29550643 fbshipit-source-id: dd0da9115b0e6ca7ecd8a268e3c4ae46c6ae84bf --- watchman/rust/watchman_client/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/rust/watchman_client/src/lib.rs b/watchman/rust/watchman_client/src/lib.rs index 2eb00cd33c08..13a1758fcf62 100644 --- a/watchman/rust/watchman_client/src/lib.rs +++ b/watchman/rust/watchman_client/src/lib.rs @@ -209,7 +209,7 @@ impl Connector { /// If the connector was configured to perform discovery (which is /// the default configuration), then this will attempt to start /// the watchman server. - pub async fn connect(self) -> Result { + pub async fn connect(&self) -> Result { let sock_path = self.resolve_unix_domain_path().await?; #[cfg(unix)] From 3677d083eb1536679044579229e7ac64712f9373 Mon Sep 17 00:00:00 2001 From: CodemodService FBSourceClangFormatLinterBot <> Date: Wed, 7 Jul 2021 04:14:04 -0700 Subject: [PATCH 0124/7387] Daily `arc lint --take CLANGFORMAT` Reviewed By: zertosh Differential Revision: D29581204 fbshipit-source-id: 5caac3f3b9aea3208b51b1c78f417fa8d37b15d6 --- watchman/winbuild/dir.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/winbuild/dir.cpp b/watchman/winbuild/dir.cpp index d8ec0ee3e74a..14b9743d979e 100644 --- a/watchman/winbuild/dir.cpp +++ b/watchman/winbuild/dir.cpp @@ -4,8 +4,8 @@ #include #include "watchman/FileDescriptor.h" #include "watchman/watchman.h" -#include "watchman/watchman_system.h" #include "watchman/watchman_opendir.h" +#include "watchman/watchman_system.h" using watchman::FileDescriptor; using watchman::FileInformation; From 5bc724e7e819f0cf1d6674a0b5a3bcbe9c657cd3 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 7 Jul 2021 07:57:40 -0700 Subject: [PATCH 0125/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/3ba0a1bf3213400ddd72233413f8bebf76f07a15 https://github.com/facebook/litho/commit/8d447e81b853da5cc0ea7c0912dd3e6708b0b5c5 Reviewed By: bigfootjon fbshipit-source-id: f1cce9e8a386a8a61b9345fecac9fd32ff707ce8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4ac59e6b2983..575ba33a56cf 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5ea3837abf19c8210e29abbd2b302d9c9b862023 +Subproject commit 3ba0a1bf3213400ddd72233413f8bebf76f07a15 From 2e0f26bb9ccce69782a9fa7f5793293370138cc9 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 7 Jul 2021 08:53:42 -0700 Subject: [PATCH 0126/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/6f5a0896d3f87f1f78d09130ccd0123683e0778c https://github.com/facebook/fbthrift/commit/c77fb8dcfa44506851faf5084fda84d67d326c7c https://github.com/facebook/fbzmq/commit/c7e890d8ec740355d5ea4dff40df852a53d62156 https://github.com/facebook/watchman/commit/5bc724e7e819f0cf1d6674a0b5a3bcbe9c657cd3 https://github.com/facebookexperimental/rust-shed/commit/15ff4ab906d0193e8ddc21ab7f234053210e4377 Reviewed By: bigfootjon fbshipit-source-id: 00498fed43787c3f98ae84e816c515beb35c5dde --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 575ba33a56cf..524c3099f23e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3ba0a1bf3213400ddd72233413f8bebf76f07a15 +Subproject commit c77fb8dcfa44506851faf5084fda84d67d326c7c From 7ba69af251fcb9b8bf6f2bdf401e8548629f82d5 Mon Sep 17 00:00:00 2001 From: l3ops Date: Wed, 7 Jul 2021 15:44:16 -0700 Subject: [PATCH 0127/7387] Fix the Rust client library on Windows (#926) Summary: The Rust library doesn't build on Windows since recent versions of Tokio removed the `PollEvented` abstraction. However a new `NamedPipeClient` type has since been introduced that directly implements `AsyncRead` and `AsyncWrite` for a named pipe client, so I modified the `NamedPipe` struct to be a simple convenience wrapper around the tokio implementation. Pull Request resolved: https://github.com/facebook/watchman/pull/926 Test Plan: ``` $ hg co bfee1cdae8dc $ cargo check ... Checking watchman_client v0.6.1 (C:\open\fbsource\fbcode\watchman\rust\watchman_client) Finished dev [unoptimized + debuginfo] target(s) in 29.77s $ cargo test ... Running unittests (target\debug\deps\watchman_client-f44c1f736dcb40c3.exe) running 7 tests test pdu::tests::test_content_sha1hex_hash ... ok test pdu::tests::test_content_sha1hex_none ... ok test tests::connection_builder_paths ... ok test pdu::tests::test_content_sha1hex_error ... ok test tests::test_decoder_err ... ok test expr::tests::exprs ... ok test tests::test_decoder ... ok test result: ok. 7 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s ... Doc-tests watchman_client running 3 tests test src\pdu.rs - pdu::FileType (line 660) ... ok test src\lib.rs - Client::query (line 796) ... ok test src\fields.rs - query_result_type (line 258) ... ok test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 6.48s ``` Reviewed By: xavierd Differential Revision: D29597937 Pulled By: fanzeyi fbshipit-source-id: ce1cb99f56b2d628550a0aa9c28e7cf421a1c1d8 --- .../rust/watchman_client/src/named_pipe.rs | 56 +++++-------------- 1 file changed, 13 insertions(+), 43 deletions(-) diff --git a/watchman/rust/watchman_client/src/named_pipe.rs b/watchman/rust/watchman_client/src/named_pipe.rs index c4a02c0dcf9f..dc092d9db5c8 100644 --- a/watchman/rust/watchman_client/src/named_pipe.rs +++ b/watchman/rust/watchman_client/src/named_pipe.rs @@ -1,24 +1,19 @@ #![cfg(windows)] use crate::Error; -use std::io::prelude::*; use std::io::Error as IoError; use std::os::windows::ffi::OsStrExt; -use std::os::windows::io::FromRawHandle; use std::path::PathBuf; use std::pin::Pin; use std::task::{Context, Poll}; -use tokio::io::PollEvented; -use tokio::prelude::*; +use tokio::io::{AsyncRead, AsyncWrite, ReadBuf}; +use tokio::net::windows::named_pipe::NamedPipeClient; use winapi::um::fileapi::*; use winapi::um::winbase::*; use winapi::um::winnt::*; -/// Spiritually similar in intent to the tokio-named-pipes crate -/// equivalent, but this implementation works with pipe clients -/// rather than servers, and works with the new async/await -/// futures impl +/// Wrapper around a tokio [`NamedPipeClient`] pub struct NamedPipe { - io: PollEvented, + io: NamedPipeClient, } impl NamedPipe { @@ -48,8 +43,7 @@ impl NamedPipe { }); } - let pipe = unsafe { mio_named_pipes::NamedPipe::from_raw_handle(handle) }; - let io = PollEvented::new(pipe)?; + let io = unsafe { NamedPipeClient::from_raw_handle(handle)? }; Ok(Self { io }) } } @@ -58,21 +52,9 @@ impl AsyncRead for NamedPipe { fn poll_read( self: Pin<&mut Self>, ctx: &mut Context, - buf: &mut [u8], - ) -> Poll> { - match self.io.poll_read_ready(ctx, mio::Ready::readable()) { - Poll::Ready(res) => res?, - Poll::Pending => return Poll::Pending, - }; - - match self.io.get_ref().read(buf) { - Err(ref e) if e.kind() == std::io::ErrorKind::WouldBlock => { - self.io.clear_read_ready(ctx, mio::Ready::readable())?; - Poll::Pending - } - - x => Poll::Ready(x), - } + buf: &mut ReadBuf, + ) -> Poll> { + AsyncRead::poll_read(Pin::new(&mut self.get_mut().io), ctx, buf) } } @@ -82,27 +64,15 @@ impl AsyncWrite for NamedPipe { ctx: &mut Context, buf: &[u8], ) -> Poll> { - match self.io.poll_write_ready(ctx) { - Poll::Ready(res) => res?, - Poll::Pending => return Poll::Pending, - }; - - match self.io.get_ref().write(buf) { - Err(ref e) if e.kind() == std::io::ErrorKind::WouldBlock => { - self.io.clear_write_ready(ctx)?; - Poll::Pending - } - - x => Poll::Ready(x), - } + AsyncWrite::poll_write(Pin::new(&mut self.get_mut().io), ctx, buf) } - fn poll_flush(self: Pin<&mut Self>, _ctx: &mut Context) -> Poll> { - Poll::Ready(Ok(())) + fn poll_flush(self: Pin<&mut Self>, ctx: &mut Context) -> Poll> { + AsyncWrite::poll_flush(Pin::new(&mut self.get_mut().io), ctx) } - fn poll_shutdown(self: Pin<&mut Self>, _ctx: &mut Context) -> Poll> { - Poll::Ready(Ok(())) + fn poll_shutdown(self: Pin<&mut Self>, ctx: &mut Context) -> Poll> { + AsyncWrite::poll_shutdown(Pin::new(&mut self.get_mut().io), ctx) } } From e3d072697c9c96473597481e28e3dcc9e5749317 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 7 Jul 2021 16:56:07 -0700 Subject: [PATCH 0128/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/734a69729251dc18e863ca35812090d17b9dedc8 https://github.com/facebook/folly/commit/b1fa3c6f94ff5129a39e74dd111fd1f8a44f88f0 https://github.com/facebook/rocksdb/commit/b1a53db327ec38e4417667e03ff6793092ebc7c5 https://github.com/facebook/watchman/commit/7ba69af251fcb9b8bf6f2bdf401e8548629f82d5 Reviewed By: bigfootjon fbshipit-source-id: e7c7878f07ab6238977109b7cc0bcc9fc2e9e491 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 524c3099f23e..f300e73e27af 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c77fb8dcfa44506851faf5084fda84d67d326c7c +Subproject commit 734a69729251dc18e863ca35812090d17b9dedc8 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index dfa4ace77295..98a11a096431 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 4215b920c94fa245c41c6ea0b90a7e863e1c3f80 +Subproject commit b1fa3c6f94ff5129a39e74dd111fd1f8a44f88f0 From ce635629a40e6e7386615ee74b02963d89506dad Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 7 Jul 2021 18:46:51 -0700 Subject: [PATCH 0129/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/1f7fb6a866b1f7bbe45936597d162be789a863c0 https://github.com/facebook/fbthrift/commit/e75cf05f64b7b2c5d0ddb6eb51f1e01a57b9ed06 https://github.com/facebook/fbzmq/commit/a8b30a4f82174463dbf163ebdf54904ec0c60dcf https://github.com/facebook/folly/commit/ee8d0a5318299337b6c05abc7f668eb9349de5a2 https://github.com/facebook/proxygen/commit/5f9018e7c9cc5c5cb174650e1ce6fd2e9c453a93 https://github.com/facebook/wangle/commit/73beac4bbb030d9a518948f5102388e6e9303e65 https://github.com/facebook/watchman/commit/e3d072697c9c96473597481e28e3dcc9e5749317 https://github.com/facebookexperimental/rust-shed/commit/567ffce89a3fcca9c032a91f2004f1464f3a24ab https://github.com/facebookexternal/stl_tasks/commit/f10f1f5e01fe4a2c91643cec2d1582b9552aca72 https://github.com/facebookincubator/fizz/commit/513942d2a3aa5cee4ea87b658e48aca7bfefdfc7 https://github.com/facebookincubator/katran/commit/aef9a6030648c0b5750cdb2767e07c8185fa2def https://github.com/facebookincubator/mvfst/commit/9e2ba784e0ce753e84460b155ad2af7446f966e6 https://github.com/rsocket/rsocket-cpp/commit/97d225fcbddc0fff647d9122e2360ba0b8845664 Reviewed By: bigfootjon fbshipit-source-id: 67c016ddb173981d8879c8d04ffc34bb5222db3a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f300e73e27af..3ed19ebcbd36 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 734a69729251dc18e863ca35812090d17b9dedc8 +Subproject commit e75cf05f64b7b2c5d0ddb6eb51f1e01a57b9ed06 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 98a11a096431..f188e2d63e41 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b1fa3c6f94ff5129a39e74dd111fd1f8a44f88f0 +Subproject commit ee8d0a5318299337b6c05abc7f668eb9349de5a2 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index be36371a3ef3..52d272ade8ba 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit dbdb7394df234757eefd1ce706935591bfea9b46 +Subproject commit 73beac4bbb030d9a518948f5102388e6e9303e65 From 68ce6372e469f1c40d046b2ed76a7265ef25d5b7 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 7 Jul 2021 19:41:23 -0700 Subject: [PATCH 0130/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/596485fd35cfa2a6e88a34f46d5aa6a0e2dec83a https://github.com/facebook/fbthrift/commit/65b5a5fbf7375723416ec3583ff9bbe4b0d898ca https://github.com/facebook/fbzmq/commit/27e33cead2cbab8984d7f3fa91d56913f63820fb https://github.com/facebook/proxygen/commit/d59935f97aad584ac1db70c0b16d692e5d075c3c https://github.com/facebook/wangle/commit/a699625e54f4bd0d9bce92e671dbe682ddf32708 https://github.com/facebook/watchman/commit/ce635629a40e6e7386615ee74b02963d89506dad https://github.com/facebookexperimental/rust-shed/commit/9977350423eedd426a814c42b6471716b4f7049e https://github.com/facebookexternal/stl_tasks/commit/1c47ef1de333c8b45551cba2c5b1d253b7362491 https://github.com/facebookincubator/fizz/commit/9312aca65db0ac625684f9a49ea8a20d609af029 https://github.com/facebookincubator/katran/commit/cddaeaf1b84ae53ec32d70db8a46108dcdfd3083 https://github.com/facebookincubator/mvfst/commit/a3f53318ab49e7bbe9be178393f675fe59c072cd https://github.com/rsocket/rsocket-cpp/commit/dcf27c9a407566ab75120d6b02d54a9108c89151 Reviewed By: bigfootjon fbshipit-source-id: 1b162c5dfd0734c46cfaaf83f678cf110c91a4fa --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3ed19ebcbd36..ccd8a6f5b1e8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e75cf05f64b7b2c5d0ddb6eb51f1e01a57b9ed06 +Subproject commit 65b5a5fbf7375723416ec3583ff9bbe4b0d898ca diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 52d272ade8ba..ce1ec4ece31e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 73beac4bbb030d9a518948f5102388e6e9303e65 +Subproject commit a699625e54f4bd0d9bce92e671dbe682ddf32708 From 4cb877633c0f57ef1825c828c283d6b139edb0e4 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 7 Jul 2021 20:48:14 -0700 Subject: [PATCH 0131/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/104814f666e1b3c917863b386cb06546396bf4df https://github.com/facebook/fbthrift/commit/b77dd3fe9bf1c77eae5065627397b71a18f6f32c https://github.com/facebook/fbzmq/commit/a2f7096289152ab68a652ff05eb13a4b2f86ac75 https://github.com/facebook/proxygen/commit/5024100be43528891aa7abe8e68220b22f854b5b https://github.com/facebook/wangle/commit/a193c5735736f4583c49eb1eacec9003739e05d3 https://github.com/facebook/watchman/commit/68ce6372e469f1c40d046b2ed76a7265ef25d5b7 https://github.com/facebookexperimental/rust-shed/commit/fd052e3e246476d23be581999d82446288ac0c1a https://github.com/facebookincubator/katran/commit/b405082af99613e1564e958184a658c0146ed35c https://github.com/facebookincubator/mvfst/commit/89acb4e6becd8afafda94f5c23676e3e2aa19380 Reviewed By: bigfootjon fbshipit-source-id: f6265b8e8cb3ac3d18a6005e20a1578d47966821 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ccd8a6f5b1e8..6e8d25ecf8d2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 65b5a5fbf7375723416ec3583ff9bbe4b0d898ca +Subproject commit b77dd3fe9bf1c77eae5065627397b71a18f6f32c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ce1ec4ece31e..9ba5336fdff9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a699625e54f4bd0d9bce92e671dbe682ddf32708 +Subproject commit a193c5735736f4583c49eb1eacec9003739e05d3 From b1053c9d79aff033ca2aef3c3f3acfde88485ec0 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 7 Jul 2021 21:36:37 -0700 Subject: [PATCH 0132/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/7e5b56fc096ee111f475e78d23e12ecee00ae65f https://github.com/facebook/fbthrift/commit/793a133b71eaa902008ac2b0cf650237db1ce6ac https://github.com/facebook/fbzmq/commit/d869dc4959e479cb25754bf76e46d42c71fd7894 https://github.com/facebook/proxygen/commit/ac2612b26e75c37d4cd2027fbdbec21c6ca0d6c1 https://github.com/facebook/watchman/commit/4cb877633c0f57ef1825c828c283d6b139edb0e4 https://github.com/facebookexperimental/rust-shed/commit/d6e46a5c0a67fcf3cb765c6cd016bcae4c1d6439 Reviewed By: bigfootjon fbshipit-source-id: 01700e693c26768007ee6a7638c601435dffd664 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6e8d25ecf8d2..a121d3b61cfc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b77dd3fe9bf1c77eae5065627397b71a18f6f32c +Subproject commit 793a133b71eaa902008ac2b0cf650237db1ce6ac From 0635aca6bad82dd92bea6c781baf79838a05f266 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 7 Jul 2021 22:45:09 -0700 Subject: [PATCH 0133/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/52d30a02eefdc5355ed5c8b0c4511f9eb82086c2 https://github.com/facebook/fbthrift/commit/28f6e4e45ad78d34cf0d2a29cfde47c4d25df484 https://github.com/facebook/fbzmq/commit/37360447361efbb5f80c3f92dbfe16090cd51e70 https://github.com/facebook/watchman/commit/b1053c9d79aff033ca2aef3c3f3acfde88485ec0 https://github.com/facebookexperimental/rust-shed/commit/660f9a196a980fbf8d2f056b7add334402884ce0 Reviewed By: bigfootjon fbshipit-source-id: f0e0ba4625475b4736cc5212ecabb4a1d3ab35df --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a121d3b61cfc..0f5d0de7a6ff 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 793a133b71eaa902008ac2b0cf650237db1ce6ac +Subproject commit 28f6e4e45ad78d34cf0d2a29cfde47c4d25df484 From 7bbcd1aec19583c25412cda2a85b213ee8cdc4b3 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 7 Jul 2021 23:48:39 -0700 Subject: [PATCH 0134/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/bd9648eb6534f1e9f55020408495ade9c3e87e12 https://github.com/facebook/fbzmq/commit/b7620791e37e419e3ddac84dadbee8411b21fa55 https://github.com/facebook/folly/commit/1787a34adb58b9fcd2205e113efde810b7985546 https://github.com/facebook/watchman/commit/0635aca6bad82dd92bea6c781baf79838a05f266 https://github.com/facebookexperimental/rust-shed/commit/6632e16512962ac076d51575c1d6e2b4811ba706 Reviewed By: bigfootjon fbshipit-source-id: 9ee2a3dd98f91c80113a7d4a23755c9f4ecdcea6 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f188e2d63e41..a97745a90532 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ee8d0a5318299337b6c05abc7f668eb9349de5a2 +Subproject commit 1787a34adb58b9fcd2205e113efde810b7985546 From d5d34e58e9537d2d7d0b1817f4e6f5efb8d078ea Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 8 Jul 2021 01:18:37 -0700 Subject: [PATCH 0135/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/9a6ae5bc8c2d92ec1fd6db9dc30999c6a0b0a5b9 https://github.com/facebook/fbthrift/commit/04d2a3a653593544dfa287093f575a3511b319b4 https://github.com/facebook/fbzmq/commit/261741bafebc758568bab1a4f661bdb2bc89b510 https://github.com/facebook/proxygen/commit/8dc31bd7d7c4fcea8f6dd7050219817716795cf3 https://github.com/facebook/wangle/commit/2511c8350a8c469b7a28b4d8f459b1273cf87a82 https://github.com/facebook/watchman/commit/7bbcd1aec19583c25412cda2a85b213ee8cdc4b3 https://github.com/facebookincubator/fizz/commit/6dc60b70e04e603e4ab8cc74a29652a3ef5f90eb https://github.com/facebookincubator/katran/commit/11fcc89ed7594026ba2c0bba9dba5657fe27ca3c https://github.com/facebookincubator/mvfst/commit/e41a89ab0f25c15eb52ec579472cdb6a1652c286 https://github.com/rsocket/rsocket-cpp/commit/b079ac9bab169a156db0a257ac7c3e9e15ac64b3 Reviewed By: bigfootjon fbshipit-source-id: a1af50691274dbb8501a41ffd59fc602628a0bb9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0f5d0de7a6ff..1658761a831a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 28f6e4e45ad78d34cf0d2a29cfde47c4d25df484 +Subproject commit 04d2a3a653593544dfa287093f575a3511b319b4 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9ba5336fdff9..bbe1c99dab9a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a193c5735736f4583c49eb1eacec9003739e05d3 +Subproject commit 2511c8350a8c469b7a28b4d8f459b1273cf87a82 From ef535de816491b7902b3acbc76482b3e16d6d228 Mon Sep 17 00:00:00 2001 From: Thomas Orozco Date: Thu, 8 Jul 2021 01:24:00 -0700 Subject: [PATCH 0136/7387] watchman/serde_bser: update to anyhow / thiserror Summary: This was using error_chain, which is pretty annoying to use in an async context because its errors aren't Sync. This updates it to use anyhow and thiserror, which are a) more common The existing code was doing a bit of mixing of strongly-typed errors and actual typed errors. I updated the internal-facing bits (reader) that want to use strings for their errors and add context to them to use anyhow, and the external-facing bits to use thiserror. Note that the error type isn't actually public in this crate so it cannot be matched on by callers even though it's now actually an enum. Reviewed By: chadaustin Differential Revision: D29555272 fbshipit-source-id: 4465ac8d436ac5fb60cc9d2cb73fdcfa65e73339 --- watchman/rust/serde_bser/Cargo.toml | 5 +- watchman/rust/serde_bser/src/de/bunser.rs | 46 +++++++---- watchman/rust/serde_bser/src/de/map.rs | 6 +- watchman/rust/serde_bser/src/de/mod.rs | 19 +++-- watchman/rust/serde_bser/src/de/read.rs | 29 ++++--- watchman/rust/serde_bser/src/de/reentrant.rs | 3 +- watchman/rust/serde_bser/src/errors.rs | 81 ++++++++++++-------- watchman/rust/serde_bser/src/lib.rs | 2 + watchman/rust/serde_bser/src/ser/mod.rs | 6 +- watchman/rust/watchman_client/Cargo.toml | 2 +- 10 files changed, 118 insertions(+), 81 deletions(-) diff --git a/watchman/rust/serde_bser/Cargo.toml b/watchman/rust/serde_bser/Cargo.toml index c2478863c39a..164bfbd9fe2c 100644 --- a/watchman/rust/serde_bser/Cargo.toml +++ b/watchman/rust/serde_bser/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde_bser" -version = "0.2.0" +version = "0.3.0" authors = ["Rain ", "Wez Furlong"] edition = "2018" repository = "https://github.com/facebook/watchman/" @@ -9,9 +9,10 @@ license = "Apache-2.0" documentation = "https://docs.rs/serde_bser" [dependencies] +anyhow = "1.0" byteorder = "1.0" bytes = "0.4" -error-chain = "0.12" +thiserror = "1.0" serde = { version = "1.0.102", features = ["derive"] } serde_bytes = "0.11" diff --git a/watchman/rust/serde_bser/src/de/bunser.rs b/watchman/rust/serde_bser/src/de/bunser.rs index 277a1b022f82..386e173841f3 100644 --- a/watchman/rust/serde_bser/src/de/bunser.rs +++ b/watchman/rust/serde_bser/src/de/bunser.rs @@ -1,7 +1,7 @@ //! Internal stateless code for handling BSER deserialization. +use anyhow::Context as _; use byteorder::{ByteOrder, NativeEndian}; -use error_chain::bail; use crate::de::read::{DeRead, Reference}; use crate::errors::*; @@ -35,10 +35,15 @@ where { let magic = self.read_bytes(2)?; if magic.get_ref() != &EMPTY_HEADER[..2] { - bail!("invalid magic header {:?}", magic); + return Err(Error::DeInvalidMagic { + magic: Vec::from(magic.get_ref()), + }); } } - let bser_capabilities = self.read.next_u32(&mut self.scratch)?; + let bser_capabilities = self + .read + .next_u32(&mut self.scratch) + .map_err(Error::de_reader_error)?; let len = self.check_next_int()?; let start = self.read_count(); Ok(PduInfo { @@ -55,18 +60,17 @@ where pub fn end(&self, pdu_info: &PduInfo) -> Result<()> { let expected = (pdu_info.start + pdu_info.len) as usize; if self.read.read_count() != expected { - bail!( - "Expected {} bytes read, but only read {} bytes", + return Err(Error::DeEof { expected, - self.read.read_count() - ); + read: self.read.read_count(), + }); } Ok(()) } #[inline] pub fn peek(&mut self) -> Result { - self.read.peek() + self.read.peek().map_err(Error::de_reader_error) } #[inline] @@ -78,7 +82,9 @@ where #[inline] pub fn read_bytes<'s>(&'s mut self, len: i64) -> Result> { let len = len as usize; - self.read.next_bytes(len, &mut self.scratch) + self.read + .next_bytes(len, &mut self.scratch) + .map_err(Error::de_reader_error) } /// Return the next i8 value. This assumes the caller already knows the next @@ -87,7 +93,8 @@ where self.read.discard(); let bytes = self .read_bytes(1) - .chain_err(|| "error while reading i8")? + .context("error while reading i8") + .map_err(Error::de_reader_error)? .get_ref(); Ok(bytes[0] as i8) } @@ -98,7 +105,8 @@ where self.read.discard(); let bytes = self .read_bytes(2) - .chain_err(|| "error while reading i16")? + .context("error while reading i16") + .map_err(Error::de_reader_error)? .get_ref(); Ok(NativeEndian::read_i16(bytes)) } @@ -109,7 +117,8 @@ where self.read.discard(); let bytes = self .read_bytes(4) - .chain_err(|| "error while reading i32")? + .context("error while reading i32") + .map_err(Error::de_reader_error)? .get_ref(); Ok(NativeEndian::read_i32(bytes)) } @@ -120,7 +129,8 @@ where self.read.discard(); let bytes = self .read_bytes(8) - .chain_err(|| "error while reading i64")? + .context("error while reading i64") + .map_err(Error::de_reader_error)? .get_ref(); Ok(NativeEndian::read_i64(bytes)) } @@ -133,7 +143,12 @@ where BSER_INT16 => self.next_i16()? as i64, BSER_INT32 => self.next_i32()? as i64, BSER_INT64 => self.next_i64()? as i64, - ch => bail!(ErrorKind::DeInvalidStartByte("integer".into(), ch)), + ch => { + return Err(Error::DeInvalidStartByte { + kind: "integer".into(), + byte: ch, + }); + } }; Ok(value) @@ -143,7 +158,8 @@ where self.read.discard(); let bytes = self .read_bytes(8) - .chain_err(|| "error while reading f64")? + .context("error while reading f64") + .map_err(Error::de_reader_error)? .get_ref(); Ok(NativeEndian::read_f64(bytes)) } diff --git a/watchman/rust/serde_bser/src/de/map.rs b/watchman/rust/serde_bser/src/de/map.rs index de93221ad139..1fbee1e9911c 100644 --- a/watchman/rust/serde_bser/src/de/map.rs +++ b/watchman/rust/serde_bser/src/de/map.rs @@ -1,4 +1,3 @@ -use error_chain::bail; use serde::{de, forward_to_deserialize_any}; use crate::errors::*; @@ -76,7 +75,10 @@ where // Both bytestrings and UTF-8 strings are treated as Unicode strings, since field // identifiers must be Unicode strings. BSER_BYTESTRING | BSER_UTF8STRING => self.de.visit_utf8string(visitor), - other => bail!(ErrorKind::DeInvalidStartByte("map key".into(), other)), + other => Err(Error::DeInvalidStartByte { + kind: "map key".into(), + byte: other, + }), } } diff --git a/watchman/rust/serde_bser/src/de/mod.rs b/watchman/rust/serde_bser/src/de/mod.rs index 811ce2f9d1d9..ebe0f5eaed79 100644 --- a/watchman/rust/serde_bser/src/de/mod.rs +++ b/watchman/rust/serde_bser/src/de/mod.rs @@ -11,7 +11,6 @@ mod variant; use std::io; use std::str; -use error_chain::bail; use serde::{de, forward_to_deserialize_any}; use crate::errors::*; @@ -131,7 +130,10 @@ where BSER_INT16 => self.visit_i16(visitor), BSER_INT32 => self.visit_i32(visitor), BSER_INT64 => self.visit_i64(visitor), - ch => bail!(ErrorKind::DeInvalidStartByte("next item".into(), ch)), + ch => Err(Error::DeInvalidStartByte { + kind: "next item".into(), + byte: ch, + }), } } @@ -168,7 +170,8 @@ where match self .bunser .read_bytes(len)? - .map_result(|x| str::from_utf8(x))? + .map_result(|x| str::from_utf8(x)) + .map_err(Error::de_reader_error)? { Reference::Borrowed(s) => visitor.visit_borrowed_str(s), Reference::Copied(s) => visitor.visit_str(s), @@ -264,10 +267,12 @@ where } visitor.visit_enum(variant::VariantAccess::new(self, &guard)) } - ch => bail!(ErrorKind::DeInvalidStartByte( - format!("enum '{}'", name), - ch - )), + ch => { + return Err(Error::DeInvalidStartByte { + kind: format!("enum '{}'", name), + byte: ch, + }); + } } } diff --git a/watchman/rust/serde_bser/src/de/read.rs b/watchman/rust/serde_bser/src/de/read.rs index a72588605acc..4476da174ef5 100644 --- a/watchman/rust/serde_bser/src/de/read.rs +++ b/watchman/rust/serde_bser/src/de/read.rs @@ -1,9 +1,8 @@ use std::io; use std::result; -use crate::errors::*; +use anyhow::{bail, Context as _}; use byteorder::{ByteOrder, NativeEndian}; -use error_chain::bail; #[cfg(feature = "debug_bytes")] use std::fmt; @@ -43,9 +42,9 @@ impl<'a> fmt::LowerHex for ByteBuf<'a> { pub trait DeRead<'de> { /// read next byte (if peeked byte not discarded return it) - fn next(&mut self) -> Result; + fn next(&mut self) -> anyhow::Result; /// peek next byte (peeked byte should come in next and next_bytes unless discarded) - fn peek(&mut self) -> Result; + fn peek(&mut self) -> anyhow::Result; /// how many bytes have been read so far. /// this doesn't include the peeked byte fn read_count(&self) -> usize; @@ -56,12 +55,12 @@ pub trait DeRead<'de> { &'s mut self, len: usize, scratch: &'s mut Vec, - ) -> Result>; + ) -> anyhow::Result>; /// read u32 as native endian - fn next_u32(&mut self, scratch: &mut Vec) -> Result { + fn next_u32(&mut self, scratch: &mut Vec) -> anyhow::Result { let bytes = self .next_bytes(4, scratch) - .chain_err(|| "error while parsing u32")? + .context("error while parsing u32")? .get_ref(); Ok(NativeEndian::read_u32(bytes)) } @@ -112,7 +111,7 @@ where } impl<'a> DeRead<'a> for SliceRead<'a> { - fn next(&mut self) -> Result { + fn next(&mut self) -> anyhow::Result { if self.index >= self.slice.len() { bail!("eof while reading next byte"); } @@ -121,7 +120,7 @@ impl<'a> DeRead<'a> for SliceRead<'a> { Ok(ch) } - fn peek(&mut self) -> Result { + fn peek(&mut self) -> anyhow::Result { if self.index >= self.slice.len() { bail!("eof while peeking next byte"); } @@ -142,7 +141,7 @@ impl<'a> DeRead<'a> for SliceRead<'a> { &'s mut self, len: usize, _scratch: &'s mut Vec, - ) -> Result> { + ) -> anyhow::Result> { // BSER has no escaping or anything similar, so just go ahead and return // a reference to the bytes. if self.index + len > self.slice.len() { @@ -158,7 +157,7 @@ impl<'de, R> DeRead<'de> for IoRead where R: io::Read, { - fn next(&mut self) -> Result { + fn next(&mut self) -> anyhow::Result { match self.peeked.take() { Some(peeked) => Ok(peeked), None => { @@ -171,7 +170,7 @@ where } } - fn peek(&mut self) -> Result { + fn peek(&mut self) -> anyhow::Result { match self.peeked { Some(peeked) => Ok(peeked), None => { @@ -202,7 +201,7 @@ where &'s mut self, len: usize, scratch: &'s mut Vec, - ) -> Result> { + ) -> anyhow::Result> { scratch.resize(len, 0); let mut idx = 0; if self.peeked.is_some() { @@ -233,10 +232,10 @@ impl<'b, 'c, T> Reference<'b, 'c, T> where T: ?Sized + 'b + 'c, { - pub fn map_result(self, f: F) -> Result> + pub fn map_result(self, f: F) -> anyhow::Result> where F: FnOnce(&T) -> result::Result<&U, E>, - Error: From, + E: std::error::Error + Send + Sync + 'static, U: ?Sized + 'b + 'c, { match self { diff --git a/watchman/rust/serde_bser/src/de/reentrant.rs b/watchman/rust/serde_bser/src/de/reentrant.rs index aacfcdaadbea..a7cfb83ae4ec 100644 --- a/watchman/rust/serde_bser/src/de/reentrant.rs +++ b/watchman/rust/serde_bser/src/de/reentrant.rs @@ -1,6 +1,5 @@ //! Module to handle reentrant/recursion limits while deserializing. -use error_chain::bail; use std::cell::Cell; use std::rc::Rc; @@ -20,7 +19,7 @@ impl ReentrantLimit { /// will increase the limit by 1. pub fn acquire>(&mut self, kind: S) -> Result { if self.0.get() == 0 { - bail!(ErrorKind::DeRecursionLimitExceeded(kind.into())); + return Err(Error::DeRecursionLimitExceeded { kind: kind.into() }); } self.0.set(self.0.get() - 1); Ok(ReentrantGuard(self.0.clone())) diff --git a/watchman/rust/serde_bser/src/errors.rs b/watchman/rust/serde_bser/src/errors.rs index 2785df1299a1..e9065af0a8c4 100644 --- a/watchman/rust/serde_bser/src/errors.rs +++ b/watchman/rust/serde_bser/src/errors.rs @@ -1,53 +1,66 @@ use std::fmt; -use error_chain::error_chain; use serde::{de, ser}; +use thiserror::Error; use crate::header::header_byte_desc; -error_chain! { - errors { - DeInvalidStartByte(kind: String, byte: u8) { - description("while deserializing BSER: invalid start byte") - display("while deserializing BSER: invalid start byte for {}: {}", - kind, header_byte_desc(*byte)) - } - DeCustom(msg: String) { - description("error while deserializing BSER") - display("error while deserializing BSER: {}", msg) - } - DeRecursionLimitExceeded(kind: String) { - description("while deserializing BSER: recursion limit exceeded") - display("while deserializing BSER: recursion limit exceeded with {}", kind) - } - SerCustom(msg: String) { - description("error while serializing BSER") - display("error while serializing BSER: {}", msg) - } - SerNeedSize(kind: &'static str) { - description("while serializing BSER: need size") - display("while serializing BSER: need size of {}", kind) - } - SerU64TooBig(v: u64) { - description("while serializing BSER: integer too big") - display("while serializing BSER: integer too big: {}", v) - } - } +pub type Result = ::std::result::Result; + +#[derive(Error, Debug)] +pub enum Error { + #[error("while deserializing BSER: invalid start byte for {}: {}", .kind, header_byte_desc(*.byte))] + DeInvalidStartByte { kind: String, byte: u8 }, + + #[error("error while deserializing BSER: {}", msg)] + DeCustom { msg: String }, + + #[error("while deserializing BSER: recursion limit exceeded with {}", .kind)] + DeRecursionLimitExceeded { kind: String }, - foreign_links { - Io(::std::io::Error); - Utf8(::std::str::Utf8Error); + #[error("Expected {} bytes read, but only read {} bytes", .expected, .read)] + DeEof { expected: usize, read: usize }, + + #[error("Invalid magic header: {:?}", .magic)] + DeInvalidMagic { magic: Vec }, + + #[error("reader error while deserializing")] + DeReaderError { + #[source] + source: anyhow::Error, + }, + + #[error("error while serializing BSER: {}", .msg)] + SerCustom { msg: String }, + + #[error("while serializing BSER: need size of {}", .kind)] + SerNeedSize { kind: &'static str }, + + #[error("while serializing BSER: integer too big: {}", .v)] + SerU64TooBig { v: u64 }, + + #[error("IO Error")] + Io(#[from] ::std::io::Error), +} + +impl Error { + pub fn de_reader_error(source: anyhow::Error) -> Self { + Self::DeReaderError { source } } } impl de::Error for Error { fn custom(msg: T) -> Self { - ErrorKind::DeCustom(format!("{}", msg)).into() + Error::DeCustom { + msg: format!("{}", msg), + } } } impl ser::Error for Error { fn custom(msg: T) -> Self { - ErrorKind::SerCustom(format!("{}", msg)).into() + Error::SerCustom { + msg: format!("{}", msg), + } } } diff --git a/watchman/rust/serde_bser/src/lib.rs b/watchman/rust/serde_bser/src/lib.rs index 7bf15e7bfa95..63f5cbccbf24 100644 --- a/watchman/rust/serde_bser/src/lib.rs +++ b/watchman/rust/serde_bser/src/lib.rs @@ -1,3 +1,5 @@ +#![deny(warnings)] + pub mod bytestring; pub mod de; mod errors; diff --git a/watchman/rust/serde_bser/src/ser/mod.rs b/watchman/rust/serde_bser/src/ser/mod.rs index 512a47b8f08f..8efbaf1ea9ec 100644 --- a/watchman/rust/serde_bser/src/ser/mod.rs +++ b/watchman/rust/serde_bser/src/ser/mod.rs @@ -230,7 +230,7 @@ where // maybe_put_int! doesn't work for u64 because it converts to i64 // internally. if v > (i64::max_value() as u64) { - Err(ErrorKind::SerU64TooBig(v).into()) + Err(Error::SerU64TooBig { v }) } else { self.serialize_i64(v as i64) } @@ -339,7 +339,7 @@ where #[inline] fn serialize_seq(self, len: Option) -> Result { match len { - None => Err(ErrorKind::SerNeedSize("sequence").into()), + None => Err(Error::SerNeedSize { kind: "sequence" }), Some(len) => self.serialize_tuple(len), } } @@ -382,7 +382,7 @@ where #[inline] fn serialize_map(self, len: Option) -> Result { match len { - None => Err(ErrorKind::SerNeedSize("map").into()), + None => Err(Error::SerNeedSize { kind: "map" }), Some(len) => self.serialize_struct("", len), } } diff --git a/watchman/rust/watchman_client/Cargo.toml b/watchman/rust/watchman_client/Cargo.toml index f6eaaab1aed2..a1e6f8f94776 100644 --- a/watchman/rust/watchman_client/Cargo.toml +++ b/watchman/rust/watchman_client/Cargo.toml @@ -19,7 +19,7 @@ maplit = "1.0" futures = { version = "0.3.13", features = ["async-await", "compat"] } bytes = { version = "1.0", features = ["serde"] } serde = { version = "1.0.102", features = ["derive"] } -serde_bser = { version = "0.2", path = "../serde_bser" } +serde_bser = { version = "0.3", path = "../serde_bser" } thiserror = ">=1.0.6" tokio = { version = "1.5", features = ["full", "test-util"] } tokio-util = { version = "0.6", features = ["full"] } From 534f22cecc74cf6300ae016c1e97c8c7b3af383e Mon Sep 17 00:00:00 2001 From: Thomas Orozco Date: Thu, 8 Jul 2021 01:24:00 -0700 Subject: [PATCH 0137/7387] watchman_client: don't fail client task when requests are dropped Summary: If we receive a request, then receive a response, but can't deliver the response to the caller because it dropped its request, that doesn't really warrant shutting down the entire client. Reviewed By: xavierd Differential Revision: D29550642 fbshipit-source-id: 8cd2e4b513ec335896363d2c5765cf59fb8af9b0 --- watchman/rust/watchman_client/src/lib.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/watchman/rust/watchman_client/src/lib.rs b/watchman/rust/watchman_client/src/lib.rs index 13a1758fcf62..274b81adcb48 100644 --- a/watchman/rust/watchman_client/src/lib.rs +++ b/watchman/rust/watchman_client/src/lib.rs @@ -349,10 +349,8 @@ struct SendRequest { } impl SendRequest { - fn respond(self, result: Result) -> Result<(), Error> { - self.tx - .send(result) - .map_err(|_| Error::generic("requestor has dropped its receiver")) + fn respond(self, result: Result) { + let _ = self.tx.send(result); } } @@ -476,7 +474,7 @@ impl ClientTask { /// to the serve is non-recoverable. fn fail_all(&mut self, err: &Error) { while let Some(request) = self.request_queue.pop_front() { - request.respond(Err(err.to_string())).ok(); + request.respond(Err(err.to_string())); } } @@ -533,7 +531,7 @@ impl ClientTask { .expect("waiting_response is only true when request_queue is not empty"); self.waiting_response = false; - request.respond(Ok(pdu))?; + request.respond(Ok(pdu)); } else { // This should never happen as we're not doing any subscription stuff return Err(Error::generic("received a unilateral PDU from the server")); From a3716eac4306f185d4310876ae619867ba266872 Mon Sep 17 00:00:00 2001 From: Thomas Orozco Date: Thu, 8 Jul 2021 01:24:00 -0700 Subject: [PATCH 0138/7387] watchman/rust: use anyhow::Error for causes Summary: Rather than a boxed dyn error, let's use `anyhow::Error` here, which *is* a boxed error that can be given causes, prints better, etc. Also, it's `Sync`, which is quite convenient in async code. Reviewed By: kassens Differential Revision: D29555273 fbshipit-source-id: 27aeb94f500f435d048020c280adf1698b7c7c46 --- watchman/rust/watchman_client/Cargo.toml | 1 + watchman/rust/watchman_client/src/lib.rs | 27 ++++++++++++++++-------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/watchman/rust/watchman_client/Cargo.toml b/watchman/rust/watchman_client/Cargo.toml index a1e6f8f94776..efd9d2ded8d8 100644 --- a/watchman/rust/watchman_client/Cargo.toml +++ b/watchman/rust/watchman_client/Cargo.toml @@ -15,6 +15,7 @@ exclude = [ structopt = "0.3" [dependencies] +anyhow = "1.0" maplit = "1.0" futures = { version = "0.3.13", features = ["async-await", "compat"] } bytes = { version = "1.0", features = ["serde"] } diff --git a/watchman/rust/watchman_client/src/lib.rs b/watchman/rust/watchman_client/src/lib.rs index 274b81adcb48..0ec285b28e21 100644 --- a/watchman/rust/watchman_client/src/lib.rs +++ b/watchman/rust/watchman_client/src/lib.rs @@ -88,21 +88,24 @@ pub enum Error { #[error("Unexpected EOF from server")] Eof, - #[error("{source} (data: {data:x?})")] + #[error("Deserialization error (data: {data:x?})")] Deserialize { - source: Box, data: Vec, + #[source] + source: anyhow::Error, }, - #[error("{source}")] + #[error("Seriaization error")] Serialize { - source: Box, + #[source] + source: anyhow::Error, }, - #[error("while attempting to connect to {endpoint}: {source}")] + #[error("Failed to connect to {endpoint}")] Connect { endpoint: PathBuf, - source: Box, + #[source] + source: anyhow::Error, }, #[error("{0}")] @@ -386,7 +389,7 @@ impl Decoder for BserSplitter { // We should have succeded in reading some data here, but we didn't. Return an // error. return Err(Error::Deserialize { - source: Box::new(source), + source: source.into(), data: buf.to_vec(), }); } @@ -547,7 +550,7 @@ where T: serde::de::DeserializeOwned, { let response: T = serde_bser::from_slice(&buf).map_err(|source| Error::Deserialize { - source: Box::new(source), + source: source.into(), data: buf.to_vec(), })?; Ok(response) @@ -575,7 +578,7 @@ impl ClientInner { let mut request_data = vec![]; serde_bser::ser::serialize(&mut request_data, &request).map_err(|source| { Error::Serialize { - source: Box::new(source), + source: source.into(), } })?; @@ -1072,4 +1075,10 @@ mod tests { let r1 = BserSplitter.decode(&mut bytes); assert!(r1.is_err()); } + + #[test] + fn test_bounds() { + fn assert_bounds() {} + assert_bounds::(); + } } From 2d24f69051d93f2b3f70e86b904211428cbdf00b Mon Sep 17 00:00:00 2001 From: Thomas Orozco Date: Thu, 8 Jul 2021 01:24:00 -0700 Subject: [PATCH 0139/7387] watchman/cli: use own error type instead of watchman_client's Summary: I'd like to update watchman_client to have more specific error types instead of catch-all "generic" and "tokio" errors. This used one of them, so this diff updates this code to stop using it. Reviewed By: kassens Differential Revision: D29555276 fbshipit-source-id: ef5ae1190e703bf808fb0ca1189a1017ebdf8e2b --- watchman/cli/Cargo.toml | 1 + watchman/cli/src/audit.rs | 10 ++++------ watchman/cli/src/main.rs | 5 +---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index b8b8d0c11fe1..69886c368be5 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -4,6 +4,7 @@ version = "0.1.0" edition = "2018" [dependencies] +anyhow = "1.0" structopt = "0.3" watchman_client = { path = "../rust/watchman_client" } ahash = "0.3" diff --git a/watchman/cli/src/audit.rs b/watchman/cli/src/audit.rs index 6b1f27bf99dd..39065f4a88cd 100644 --- a/watchman/cli/src/audit.rs +++ b/watchman/cli/src/audit.rs @@ -45,7 +45,7 @@ fn is_cookie>(name: T) -> bool { } impl AuditCmd { - pub(crate) async fn run(&self) -> crate::Result<()> { + pub(crate) async fn run(&self) -> anyhow::Result<()> { let client = Connector::new().connect().await?; let resolved = Arc::new( client @@ -54,10 +54,10 @@ impl AuditCmd { ); if resolved.watcher() == "eden" { - return Err(watchman_client::Error::Generic(format!( + return Err(anyhow::anyhow!( "{} is an EdenFS mount - no need to audit", resolved.project_root().display() - ))); + )); } let config = client.get_config(&resolved).await?; @@ -217,9 +217,7 @@ impl AuditCmd { let watchman_files = match result.files { Some(files) => files, None => { - return Err(watchman_client::Error::Generic( - "No files set in result {}".into(), - )); + return Err(anyhow::anyhow!("No files set in result")); } }; diff --git a/watchman/cli/src/main.rs b/watchman/cli/src/main.rs index ac5120d274be..f61b15c10d5a 100644 --- a/watchman/cli/src/main.rs +++ b/watchman/cli/src/main.rs @@ -2,9 +2,6 @@ use structopt::{clap::AppSettings, StructOpt}; mod audit; -/// I'd like to replace this with anyhow, but we need to replace error-chain's use in watchman-client first. https://github.com/rust-lang-nursery/error-chain/pull/241 -pub type Result = std::result::Result; - #[derive(StructOpt, Debug)] #[structopt(setting = AppSettings::DisableVersion, setting = AppSettings::VersionlessSubcommands)] @@ -19,7 +16,7 @@ enum TopLevelSubcommand { } impl TopLevelSubcommand { - async fn run(&self) -> Result<()> { + async fn run(&self) -> anyhow::Result<()> { use TopLevelSubcommand::*; match self { Audit(cmd) => cmd.run().await, From 425f7289c21b8b26483fcab1beabadbf84836b9b Mon Sep 17 00:00:00 2001 From: Thomas Orozco Date: Thu, 8 Jul 2021 01:24:00 -0700 Subject: [PATCH 0140/7387] watchman_client: remove "generic" error Summary: I'd like to be able to introspect the errors returned by Watchman client, and in particular I'd like to know which errors are the result of losing connection to Watchman. I'd also like to be able to differentiate between errors that caused the worker task to crash, and errors that are returned to the caller, so this splits the error enum accordingly. Let's report those accordingly. Reviewed By: kassens Differential Revision: D29550641 fbshipit-source-id: 1ffcf6d676ca1175fd40bf42aeb6f770ed6ca544 --- watchman/rust/watchman_client/Cargo.toml | 2 +- watchman/rust/watchman_client/src/lib.rs | 91 ++++++++++++++++-------- 2 files changed, 62 insertions(+), 31 deletions(-) diff --git a/watchman/rust/watchman_client/Cargo.toml b/watchman/rust/watchman_client/Cargo.toml index efd9d2ded8d8..5d3acf765e4d 100644 --- a/watchman/rust/watchman_client/Cargo.toml +++ b/watchman/rust/watchman_client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "watchman_client" -version = "0.6.1" +version = "0.7.0" authors = ["Wez Furlong"] edition = "2018" repository = "https://github.com/facebook/watchman/" diff --git a/watchman/rust/watchman_client/src/lib.rs b/watchman/rust/watchman_client/src/lib.rs index 0ec285b28e21..400b523da314 100644 --- a/watchman/rust/watchman_client/src/lib.rs +++ b/watchman/rust/watchman_client/src/lib.rs @@ -26,6 +26,8 @@ //! Ok(()) //! } //! ``` +#![deny(warnings)] + pub mod expr; pub mod fields; mod named_pipe; @@ -63,10 +65,23 @@ pub mod prelude { use prelude::*; +#[derive(Error, Debug)] +pub enum ConnectionLost { + #[error("Client task exited")] + ClientTaskExited, + + #[error("Client task failed: {0}")] + Error(String), +} + #[derive(Error, Debug)] pub enum Error { - #[error("IO Error: {0}")] - Tokio(#[from] tokio::io::Error), + #[error("Failed to connect to Watchman: {0}")] + ConnectionError(tokio::io::Error), + + #[error("Lost connection to watchman")] + ConnectionLost(#[from] ConnectionLost), + #[error( "While invoking the {watchman_path} CLI to discover the server connection details: {reason}, stderr=`{stderr}`" )] @@ -85,8 +100,6 @@ pub enum Error { command: String, response: String, }, - #[error("Unexpected EOF from server")] - Eof, #[error("Deserialization error (data: {data:x?})")] Deserialize { @@ -107,15 +120,28 @@ pub enum Error { #[source] source: anyhow::Error, }, - - #[error("{0}")] - Generic(String), } -impl Error { - fn generic(error: T) -> Self { - Self::Generic(format!("{}", error)) - } +#[derive(Error, Debug)] +enum TaskError { + #[error("IO Error: {0}")] + Io(#[from] std::io::Error), + + #[error("Task is shutting down")] + Shutdown, + + #[error("EOF on Watchman socket")] + Eof, + + #[error("Received a unilateral PDU from the server")] + UnilateralPdu, + + #[error("Deserialization error (data: {data:x?})")] + Deserialize { + #[source] + source: anyhow::Error, + data: Vec, + }, } /// The Connector defines how to connect to the watchman server. @@ -216,11 +242,12 @@ impl Connector { let sock_path = self.resolve_unix_domain_path().await?; #[cfg(unix)] - let stream: Box = Box::new(UnixStream::connect(sock_path).await?); + let stream = UnixStream::connect(sock_path).await; #[cfg(windows)] - let stream: Box = - Box::new(named_pipe::NamedPipe::connect(sock_path).await?); + let stream = named_pipe::NamedPipe::connect(sock_path).await; + + let stream: Box = Box::new(stream.map_err(Error::ConnectionError)?); let (reader, writer) = tokio::io::split(stream); @@ -367,7 +394,7 @@ struct BserSplitter; impl Decoder for BserSplitter { type Item = Bytes; - type Error = Error; + type Error = TaskError; fn decode(&mut self, buf: &mut BytesMut) -> Result, Self::Error> { let mut bunser = Bunser::new(SliceRead::new(buf.as_ref())); @@ -388,7 +415,7 @@ impl Decoder for BserSplitter { // We should have succeded in reading some data here, but we didn't. Return an // error. - return Err(Error::Deserialize { + return Err(TaskError::Deserialize { source: source.into(), data: buf.to_vec(), }); @@ -427,12 +454,12 @@ struct ClientTask { impl Drop for ClientTask { fn drop(&mut self) { - self.fail_all(&Error::generic("the client task terminated")); + self.fail_all(&TaskError::Shutdown) } } impl ClientTask { - async fn run(&mut self) -> Result<(), Error> { + async fn run(&mut self) -> Result<(), TaskError> { // process things, and if we encounter an error, ensure that // we fail all outstanding requests match self.run_loop().await { @@ -444,13 +471,13 @@ impl ClientTask { } } - async fn run_loop(&mut self) -> Result<(), Error> { + async fn run_loop(&mut self) -> Result<(), TaskError> { loop { futures::select_biased! { pdu = self.reader.next().fuse() => { match pdu { Some(pdu) => self.process_pdu(pdu?).await?, - None => return Err(Error::Eof), + None => return Err(TaskError::Eof), } } task = self.request_rx.recv().fuse() => { @@ -475,7 +502,7 @@ impl ClientTask { /// Generate an error for each queued request. /// This is called in situations where the state of the connection /// to the serve is non-recoverable. - fn fail_all(&mut self, err: &Error) { + fn fail_all(&mut self, err: &TaskError) { while let Some(request) = self.request_queue.pop_front() { request.respond(Err(err.to_string())); } @@ -483,7 +510,7 @@ impl ClientTask { /// If we're not waiting for the response to a request, /// then send the next one! - async fn send_next_request(&mut self) -> Result<(), Error> { + async fn send_next_request(&mut self) -> Result<(), TaskError> { if !self.waiting_response && !self.request_queue.is_empty() { match self .writer @@ -503,14 +530,14 @@ impl ClientTask { /// Queue up a new request from the client code, and then /// check to see if we can send a queued request to the server. - async fn queue_request(&mut self, request: SendRequest) -> Result<(), Error> { + async fn queue_request(&mut self, request: SendRequest) -> Result<(), TaskError> { self.request_queue.push_back(request); self.send_next_request().await?; Ok(()) } /// Dispatch a PDU that we just read to the appropriate client code. - async fn process_pdu(&mut self, pdu: Bytes) -> Result<(), Error> { + async fn process_pdu(&mut self, pdu: Bytes) -> Result<(), TaskError> { use serde::Deserialize; #[derive(Deserialize, Debug)] pub struct Unilateral { @@ -537,7 +564,7 @@ impl ClientTask { request.respond(Ok(pdu)); } else { // This should never happen as we're not doing any subscription stuff - return Err(Error::generic("received a unilateral PDU from the server")); + return Err(TaskError::UnilateralPdu); } self.send_next_request().await?; @@ -590,10 +617,13 @@ impl ClientInner { tx, })) .await - .map_err(Error::generic)?; + .map_err(|_| ConnectionLost::ClientTaskExited)?; // Step 3: wait for the client task to give us the response - let pdu_data = rx.await.map_err(Error::generic)?.map_err(Error::generic)?; + let pdu_data = rx + .await + .map_err(|_| ConnectionLost::ClientTaskExited)? + .map_err(ConnectionLost::Error)?; // Step 4: sniff for an error response in the deserialized data use serde::Deserialize; @@ -704,7 +734,7 @@ where .responses .recv() .await - .ok_or_else(|| Error::generic("client was torn down"))?; + .ok_or(ConnectionLost::ClientTaskExited)?; let response: QueryResult = bunser(&pdu)?; @@ -920,7 +950,7 @@ impl Client { .request_tx .send(TaskItem::RegisterSubscription(name.clone(), tx)) .await - .map_err(Error::generic)?; + .map_err(|_| ConnectionLost::ClientTaskExited)?; } let subscription = Subscription:: { @@ -1027,7 +1057,7 @@ mod tests { let reader = StreamReader::new(stream::iter(chunks)); let decoded = FramedRead::new(reader, BserSplitter) - .map_err(Error::from) + .map_err(TaskError::from) .and_then(|bytes| async move { // We unwrap this since a) this is a test and b) serde_bser's errors aren't // easily propagated into en error type like anyhow::Error without losing the @@ -1080,5 +1110,6 @@ mod tests { fn test_bounds() { fn assert_bounds() {} assert_bounds::(); + assert_bounds::(); } } From 1b5a014c49b1664501456b27df7e31c5374a4f5d Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 8 Jul 2021 01:48:35 -0700 Subject: [PATCH 0141/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/2f415d653424d00b987d29612d7be4d1da78ac58 https://github.com/facebook/fbthrift/commit/9f825f922ae80d95553c59cde92bdc27163940cc https://github.com/facebook/fbzmq/commit/3526d7094b8165a7077b4ff2e732d6d538883aef https://github.com/facebook/proxygen/commit/e4a1f1e47c9beddebd3af9804dfdb952b06a4df3 https://github.com/facebook/wangle/commit/7b9af8f0bd019a096989e148f3093566d3183de9 https://github.com/facebook/watchman/commit/425f7289c21b8b26483fcab1beabadbf84836b9b https://github.com/facebookexperimental/rust-shed/commit/e89fc9b4f223c5b0333d5e25ea1cea121f408ce7 https://github.com/facebookincubator/katran/commit/07b0a71df95e2536e2292553ec801212adbc2704 https://github.com/facebookincubator/mvfst/commit/8f596b7da6f86a6d90e47e8af045de784d631a2b Reviewed By: bigfootjon fbshipit-source-id: 85f2caca97e85a4c711f85cdef63bec7899e318f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1658761a831a..0a9303c0b831 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 04d2a3a653593544dfa287093f575a3511b319b4 +Subproject commit 9f825f922ae80d95553c59cde92bdc27163940cc diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index bbe1c99dab9a..13887644f263 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2511c8350a8c469b7a28b4d8f459b1273cf87a82 +Subproject commit 7b9af8f0bd019a096989e148f3093566d3183de9 From 1c40433a600ffd13e23657ce13c5ce03e8706013 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 8 Jul 2021 02:17:42 -0700 Subject: [PATCH 0142/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/49232c501c4a8e7c81ed7052e89568fc6de3b8aa https://github.com/facebook/fbthrift/commit/8a788e3d36999ab0403bf2a4c3c0174e8093bf2e https://github.com/facebook/fbzmq/commit/d373687670b289f1a3ec0c65fd9af1144dd2a7de https://github.com/facebook/proxygen/commit/529e338d1b10f26ecde88e62f4ac3a83f38e9aa6 https://github.com/facebook/watchman/commit/1b5a014c49b1664501456b27df7e31c5374a4f5d https://github.com/facebookexperimental/rust-shed/commit/a00cb10768369117e50b5ca591cda8175fc52454 Reviewed By: bigfootjon fbshipit-source-id: 5fe859720eea4158db9b4440da946691a990f238 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0a9303c0b831..e42d95055123 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9f825f922ae80d95553c59cde92bdc27163940cc +Subproject commit 8a788e3d36999ab0403bf2a4c3c0174e8093bf2e From c6c18fe99706149597f1cbec2db30609cddd5f4a Mon Sep 17 00:00:00 2001 From: Thomas Orozco Date: Thu, 8 Jul 2021 09:38:21 -0700 Subject: [PATCH 0143/7387] watchman/serde_bser: fix rust-2018-idioms lints Summary: Like it says in the title. This fixes 2 lints: - https://doc.rust-lang.org/rustc/lints/listing/allowed-by-default.html#elided-lifetimes-in-paths - https://doc.rust-lang.org/rustc/lints/listing/allowed-by-default.html#explicit-outlives-requirements Weirdly, Rust complains about this: ``` warning: outlives requirements can be inferred --> src/de/read.rs:223:30 | 223 | pub enum Reference<'b, 'c, T> | ______________________________^ 224 | | where 225 | | T: ?Sized, | |______________^ help: remove these bounds ``` There is no lifetime requirements here, but switching this to `T: ?Sized` fixes it, hence the seemingly-opinionated-but-actually-required rewriting of this declaration here. This is useful because we have some code here (see: next diff in this stack) that disallows those via a Cargo config. Reviewed By: kassens Differential Revision: D29611430 fbshipit-source-id: 2eb0126e680c01387cdb6ef69e5f061c2990d058 --- watchman/rust/serde_bser/Cargo.toml | 2 +- watchman/rust/serde_bser/src/bytestring.rs | 4 ++-- watchman/rust/serde_bser/src/de/read.rs | 7 ++----- watchman/rust/serde_bser/src/de/template.rs | 2 +- watchman/rust/serde_bser/src/lib.rs | 2 +- watchman/rust/serde_bser/src/value.rs | 2 +- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/watchman/rust/serde_bser/Cargo.toml b/watchman/rust/serde_bser/Cargo.toml index 164bfbd9fe2c..59d366fb7e89 100644 --- a/watchman/rust/serde_bser/Cargo.toml +++ b/watchman/rust/serde_bser/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde_bser" -version = "0.3.0" +version = "0.3.1" authors = ["Rain ", "Wez Furlong"] edition = "2018" repository = "https://github.com/facebook/watchman/" diff --git a/watchman/rust/serde_bser/src/bytestring.rs b/watchman/rust/serde_bser/src/bytestring.rs index 121d474e47c1..6c6e6139547c 100644 --- a/watchman/rust/serde_bser/src/bytestring.rs +++ b/watchman/rust/serde_bser/src/bytestring.rs @@ -26,14 +26,14 @@ use std::path::PathBuf; pub struct ByteString(Vec); impl std::fmt::Debug for ByteString { - fn fmt(&self, fmt: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> { + fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> { let escaped = self.as_escaped_string(); write!(fmt, "\"{}\"", escaped.escape_debug()) } } impl std::fmt::Display for ByteString { - fn fmt(&self, fmt: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> { + fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> { let escaped = self.as_escaped_string(); write!(fmt, "\"{}\"", escaped.escape_default()) } diff --git a/watchman/rust/serde_bser/src/de/read.rs b/watchman/rust/serde_bser/src/de/read.rs index 4476da174ef5..2ab3749048b7 100644 --- a/watchman/rust/serde_bser/src/de/read.rs +++ b/watchman/rust/serde_bser/src/de/read.rs @@ -220,17 +220,14 @@ where } #[derive(Debug)] -pub enum Reference<'b, 'c, T> -where - T: ?Sized + 'b + 'c, -{ +pub enum Reference<'b, 'c, T: ?Sized> { Borrowed(&'b T), Copied(&'c T), } impl<'b, 'c, T> Reference<'b, 'c, T> where - T: ?Sized + 'b + 'c, + T: ?Sized, { pub fn map_result(self, f: F) -> anyhow::Result> where diff --git a/watchman/rust/serde_bser/src/de/template.rs b/watchman/rust/serde_bser/src/de/template.rs index ff1f1f8a01bb..7e99915e5a2b 100644 --- a/watchman/rust/serde_bser/src/de/template.rs +++ b/watchman/rust/serde_bser/src/de/template.rs @@ -179,7 +179,7 @@ where } } -struct KeyDeserializer<'a, 'de: 'a> { +struct KeyDeserializer<'a, 'de> { key: &'a Key<'de>, } diff --git a/watchman/rust/serde_bser/src/lib.rs b/watchman/rust/serde_bser/src/lib.rs index 63f5cbccbf24..1ffd7e3379bd 100644 --- a/watchman/rust/serde_bser/src/lib.rs +++ b/watchman/rust/serde_bser/src/lib.rs @@ -1,4 +1,4 @@ -#![deny(warnings)] +#![deny(warnings, rust_2018_idioms)] pub mod bytestring; pub mod de; diff --git a/watchman/rust/serde_bser/src/value.rs b/watchman/rust/serde_bser/src/value.rs index 548a4ca418d9..7cab5a0451f8 100644 --- a/watchman/rust/serde_bser/src/value.rs +++ b/watchman/rust/serde_bser/src/value.rs @@ -91,7 +91,7 @@ impl<'de> Deserialize<'de> for Value { impl<'de> Visitor<'de> for ValueVisitor { type Value = Value; - fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { formatter.write_str("any valid BSER value") } From 9e72cd97a8e951106615d84a90cfda91a7eb9b30 Mon Sep 17 00:00:00 2001 From: Fred Emmott Date: Thu, 8 Jul 2021 09:44:44 -0700 Subject: [PATCH 0144/7387] Make `travis_docker_build.sh` macos-compatible Summary: BSD readlink doesn't have -f. I'm not using TravisCI, however docker is still convenient for reproducing builds locally. Reviewed By: yns88 Differential Revision: D29523333 fbshipit-source-id: e01169f3eabca7b8baec95bc70fe119cad201b35 --- build/fbcode_builder/travis_docker_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/travis_docker_build.sh b/build/fbcode_builder/travis_docker_build.sh index 9733bb206be1..d4cba10ef8f6 100755 --- a/build/fbcode_builder/travis_docker_build.sh +++ b/build/fbcode_builder/travis_docker_build.sh @@ -11,7 +11,7 @@ travis_cache_dir=${travis_cache_dir:-} # The docker build never times out, unless specified docker_build_timeout=${docker_build_timeout:-} -cur_dir="$(readlink -f "$(dirname "$0")")" +cur_dir="$(realpath "$(dirname "$0")")" if [[ "$travis_cache_dir" == "" ]]; then echo "ccache disabled, enable by setting env. var. travis_cache_dir" From 3b9adb158d71ebf2dfe3be4ab02e99178d69ef8b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 8 Jul 2021 10:32:07 -0700 Subject: [PATCH 0145/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c6bd2e522cba634912c413e9bd8be7215bb34d98 https://github.com/facebook/fbthrift/commit/558503a6f670b6514b17c72aa5f4883556e0acbd https://github.com/facebook/fbzmq/commit/0f2caafcfc4f36475c2c0a81a4aed4b5459221c4 https://github.com/facebook/folly/commit/cb55944fddba226cbe58cf9ace02ea41701b1328 https://github.com/facebook/litho/commit/0ca800dfed6d72ab0ef54c6ae503c7de4317962d https://github.com/facebook/proxygen/commit/20430770bc6f769b3419879f6c52b3dfbca20379 https://github.com/facebook/wangle/commit/78f79f4f072af0f9cafd5634fc736bf5b38e53cf https://github.com/facebook/watchman/commit/9e72cd97a8e951106615d84a90cfda91a7eb9b30 https://github.com/facebookexperimental/rust-shed/commit/50702824ceae4cd67e80d8bdae5980047d6120e1 https://github.com/facebookincubator/fizz/commit/f35e62b5119b25ca6f4b693548d9e9d157a72910 https://github.com/facebookincubator/katran/commit/5b968687a81a241cf9add40df1fb268041a3ccc4 https://github.com/facebookincubator/mvfst/commit/3c1c51f5ef81f552e8b295cea629c56104d8d87c https://github.com/facebookincubator/profilo/commit/54e9ce5a6d4ad3fb097b0cf1b17c7a3a1ab33b3f https://github.com/rsocket/rsocket-cpp/commit/c17516e1fde6a2280056549a07c7312d7f7d3c0c Reviewed By: bigfootjon fbshipit-source-id: 20ceb2508f06edfacf3fecf992010bb9abff1b24 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e42d95055123..04855820a17e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8a788e3d36999ab0403bf2a4c3c0174e8093bf2e +Subproject commit 558503a6f670b6514b17c72aa5f4883556e0acbd diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a97745a90532..3dd5436a9a2d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1787a34adb58b9fcd2205e113efde810b7985546 +Subproject commit cb55944fddba226cbe58cf9ace02ea41701b1328 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 13887644f263..9b95167c3c73 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7b9af8f0bd019a096989e148f3093566d3183de9 +Subproject commit 78f79f4f072af0f9cafd5634fc736bf5b38e53cf From 7ac9bd8bec3d234e4db41b9e98441f8bfc08d8e5 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 8 Jul 2021 11:14:54 -0700 Subject: [PATCH 0146/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/2ff478bb69f4b4b0247e66f0883cd92b530ec383 https://github.com/facebook/fbthrift/commit/62ea399d645c47d833ca2684d1f01aa18c2df149 https://github.com/facebook/fbzmq/commit/341e891e3ece8c89d42c9def40fe77fa347776fe https://github.com/facebook/folly/commit/c226674cd7c197b3e632f4f246f6875fce64e951 https://github.com/facebook/proxygen/commit/a5dafb35eb4629228fb9fba88cc458621910b466 https://github.com/facebook/rocksdb/commit/f127d459adddd4d1e381541ac066610df6905f8a https://github.com/facebook/wangle/commit/ad86bd4dbc111cda17e81d530826e15f4fc0e002 https://github.com/facebook/watchman/commit/3b9adb158d71ebf2dfe3be4ab02e99178d69ef8b https://github.com/facebookexperimental/rust-shed/commit/b79407da4c432ffde79da75c16973f23bd4558f0 https://github.com/facebookincubator/fizz/commit/f21387488042dd376ad7f9004ec588d8801f7a43 https://github.com/facebookincubator/katran/commit/a571805376038706c037459b59728ab7f63b3ba7 https://github.com/facebookincubator/mvfst/commit/624881ff298e489d1827c848a607f535c8eda0d6 https://github.com/rsocket/rsocket-cpp/commit/d8aa69bca6c31ad08577b58a3185233be86a35c3 Reviewed By: bigfootjon fbshipit-source-id: 8536efb06d9018f2d5cea424cef14373407c4521 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 04855820a17e..a3ce6f60dca5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 558503a6f670b6514b17c72aa5f4883556e0acbd +Subproject commit 62ea399d645c47d833ca2684d1f01aa18c2df149 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 3dd5436a9a2d..965bba1e9a27 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit cb55944fddba226cbe58cf9ace02ea41701b1328 +Subproject commit c226674cd7c197b3e632f4f246f6875fce64e951 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9b95167c3c73..37ead5083844 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 78f79f4f072af0f9cafd5634fc736bf5b38e53cf +Subproject commit ad86bd4dbc111cda17e81d530826e15f4fc0e002 From d5f541c63d23834082b763ae586d9e3861c03c7a Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 8 Jul 2021 11:58:38 -0700 Subject: [PATCH 0147/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/56b57581086559f6fc9f7244c820bac646738652 https://github.com/facebook/fbthrift/commit/02588886104338db40970501c2bea1cf6316dc92 https://github.com/facebook/fbzmq/commit/18b37aaafddcda2d6b92fedac29369192fe035f2 https://github.com/facebook/litho/commit/0f88fe8a77a79f6da5ffd9c700b565cee358f8c8 https://github.com/facebook/proxygen/commit/2ab8baab34bd0147fd6029bbf6d409d96e15d082 https://github.com/facebook/wangle/commit/a26a767026eea81294fc228f37265c294f3e97de https://github.com/facebook/watchman/commit/7ac9bd8bec3d234e4db41b9e98441f8bfc08d8e5 https://github.com/facebookexperimental/rust-shed/commit/ec5c10bf4bd360c00a6cbed8e72f9234f3b5be07 https://github.com/facebookincubator/fizz/commit/9be8e8638c5cc503d8318cec1859cc3e0463afa0 https://github.com/facebookincubator/katran/commit/2110cac9535f2ae18179bd7cda5fb49471de24f7 https://github.com/facebookincubator/mvfst/commit/106acee429591799f1ab34cd995b84ad4023f69a https://github.com/rsocket/rsocket-cpp/commit/3710c6c65a60c2582cf8cb6417b4069ed7db6f16 Reviewed By: bigfootjon fbshipit-source-id: 0632d2a2dbd4ace8cf0a75290fbb042368eda11d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a3ce6f60dca5..852e041dd75a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 62ea399d645c47d833ca2684d1f01aa18c2df149 +Subproject commit 02588886104338db40970501c2bea1cf6316dc92 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 37ead5083844..ae9a1ffd1d59 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ad86bd4dbc111cda17e81d530826e15f4fc0e002 +Subproject commit a26a767026eea81294fc228f37265c294f3e97de From 9983f0c2316764386cf28c48485e604c983842b4 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 8 Jul 2021 12:50:01 -0700 Subject: [PATCH 0148/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/5ff2260f3082194b814681b48398dcf8fff51088 https://github.com/facebook/fbthrift/commit/2086de1581153dab6a7d86477533a90c010005fd https://github.com/facebook/fbzmq/commit/2f11555614e5649c683df49139c9559442cf622b https://github.com/facebook/proxygen/commit/5f4879c089a6eafbc62f4acb62658e498e6250b7 https://github.com/facebook/wangle/commit/3da0d984f11a4e67a3ae7c578cd9ebfedc9b8fdd https://github.com/facebook/watchman/commit/d5f541c63d23834082b763ae586d9e3861c03c7a https://github.com/facebookexperimental/rust-shed/commit/c9abba648bf6140cc426fe0098a98e69140dbdec https://github.com/facebookincubator/katran/commit/8f1209d10da16d0d0990be44634db7f3d16c4baf https://github.com/facebookincubator/mvfst/commit/b514e3970060111c1e39b3ab1bc54bc3d9540098 Reviewed By: bigfootjon fbshipit-source-id: bda5bd4eddc40e46ac710b35e70f34171caeaa18 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 852e041dd75a..92f86702d9b1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 02588886104338db40970501c2bea1cf6316dc92 +Subproject commit 2086de1581153dab6a7d86477533a90c010005fd diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ae9a1ffd1d59..bbddad3d7a81 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a26a767026eea81294fc228f37265c294f3e97de +Subproject commit 3da0d984f11a4e67a3ae7c578cd9ebfedc9b8fdd From c67e733f6529b097c11bef8abdb97b99ec47486b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 8 Jul 2021 14:13:07 -0700 Subject: [PATCH 0149/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/552a5d51f009fbe6478a804eda815910fdd9bbd9 https://github.com/facebook/fbthrift/commit/228a535a2af3535e6e25c4914b45effb0f0500e0 https://github.com/facebook/fbzmq/commit/bd61d45a96a41304f94ecd974621db23e88de102 https://github.com/facebook/proxygen/commit/5c3ed384b928a32eac324523756d97613e46b3e5 https://github.com/facebook/watchman/commit/9983f0c2316764386cf28c48485e604c983842b4 https://github.com/facebookexperimental/rust-shed/commit/79bca598664d9125fc2683f90b03f8113d4d6187 Reviewed By: bigfootjon fbshipit-source-id: e918f33e599d785ba75e5245515d8f68b2b22a43 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 92f86702d9b1..2f117cf5fcad 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2086de1581153dab6a7d86477533a90c010005fd +Subproject commit 228a535a2af3535e6e25c4914b45effb0f0500e0 From 4ba971a2640190f37eab5dd61b92062ada090fde Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 8 Jul 2021 16:45:09 -0700 Subject: [PATCH 0150/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/cb36f3c84958de88abf2c029950e5a2effdd1df4 Reviewed By: bigfootjon fbshipit-source-id: d7d80ef622ec3f60ce043999ce47d64f4a57e3b6 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 965bba1e9a27..039b135e2555 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c226674cd7c197b3e632f4f246f6875fce64e951 +Subproject commit cb36f3c84958de88abf2c029950e5a2effdd1df4 From cb961668c118f77e2d67891cf1c2ed1eee479ede Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 8 Jul 2021 17:45:44 -0700 Subject: [PATCH 0151/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/cce4cb37117cc8d9d2fb4f6066e649aa41a755d8 https://github.com/facebook/fbthrift/commit/43a0d10ebe6a276accb7c27aa1fd5c1781f24180 https://github.com/facebook/fbzmq/commit/0166ea19f380007cb624f1f8dc1b2ba5fa535f29 https://github.com/facebook/folly/commit/bc0818f89e7ab3802cdac95a25e29f4061021c3c https://github.com/facebook/proxygen/commit/71c9d2b11fa5dc730f2f0cc0ceafa2eecb48504f https://github.com/facebook/wangle/commit/70a88c8944aaf9b4cb594020b0a18ff0367fdce5 https://github.com/facebook/watchman/commit/4ba971a2640190f37eab5dd61b92062ada090fde https://github.com/facebookincubator/fizz/commit/0690e5931d4dca1ef5834b0ddfc01fbebf19efa9 https://github.com/facebookincubator/katran/commit/03ee41da7c55da41b96ec8f8b6343209093c147d https://github.com/facebookincubator/mvfst/commit/df8e592ad685d102e2aa9a51318bcd0ef9968d7b https://github.com/rsocket/rsocket-cpp/commit/d8ff811ecc93b3c8bc65f28482fc3adc82d4040b Reviewed By: bigfootjon fbshipit-source-id: ce250f8b42c12fdabcc0c292a99e11eeda359393 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2f117cf5fcad..bb0a49084143 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 228a535a2af3535e6e25c4914b45effb0f0500e0 +Subproject commit 43a0d10ebe6a276accb7c27aa1fd5c1781f24180 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 039b135e2555..b5825306a645 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit cb36f3c84958de88abf2c029950e5a2effdd1df4 +Subproject commit bc0818f89e7ab3802cdac95a25e29f4061021c3c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index bbddad3d7a81..29385f1288db 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3da0d984f11a4e67a3ae7c578cd9ebfedc9b8fdd +Subproject commit 70a88c8944aaf9b4cb594020b0a18ff0367fdce5 From 6bac9bafa2a68beac112e5a5283af2afe1d23e36 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 8 Jul 2021 18:39:51 -0700 Subject: [PATCH 0152/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/52838f91197b31e7dd89ffaaac10a6dec97547ef https://github.com/facebook/fbthrift/commit/5b64bccc6f18e0c5cdf40e4605ea680dc9b5c59c https://github.com/facebook/fbzmq/commit/1a0c2378fc53982761650a1cd5774f4647c91f2e https://github.com/facebook/proxygen/commit/95a2bfd848083784992399ea4f6d22fe52dca15f https://github.com/facebook/rocksdb/commit/5dd18a8d8ead19eac555460a66bc6e1840d20907 https://github.com/facebook/wangle/commit/4c365b753d9fdfa53ffdd34e6262f67b8c0938e4 https://github.com/facebook/watchman/commit/cb961668c118f77e2d67891cf1c2ed1eee479ede https://github.com/facebookexperimental/rust-shed/commit/428b5129b932b9df495b13de17df3951693d0ea4 https://github.com/facebookincubator/fizz/commit/4cc0f5ce04ea8f98d292569f5275ab90090e136b https://github.com/facebookincubator/katran/commit/d3a6b2cb877d9341cacd5c5f923107d6137b7a09 https://github.com/facebookincubator/mvfst/commit/a01487d06087afb442630511157f32aa2480a013 https://github.com/pytorch/fbgemm/commit/dac92116b5342f49203d37637350336ad287eb7b https://github.com/rsocket/rsocket-cpp/commit/0c4a7e98640ab57dbb5a05ab438a87ff59bb48e5 Reviewed By: bigfootjon fbshipit-source-id: 7d6b12577e4cf4399074f7aae476f32fec3f3a29 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bb0a49084143..4d39377d0d3f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 43a0d10ebe6a276accb7c27aa1fd5c1781f24180 +Subproject commit 5b64bccc6f18e0c5cdf40e4605ea680dc9b5c59c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 29385f1288db..be9f65c1955d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 70a88c8944aaf9b4cb594020b0a18ff0367fdce5 +Subproject commit 4c365b753d9fdfa53ffdd34e6262f67b8c0938e4 From a47e0c7e926d6fd25a723c336b6ac4f0f6636ae7 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 8 Jul 2021 20:38:00 -0700 Subject: [PATCH 0153/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/07f77139735f1727a3af1122adedc14f69a9c8b3 https://github.com/facebook/fbthrift/commit/4d6c18e6449edeb10b0cc96e69e8fcb51bdca40b https://github.com/facebook/fbzmq/commit/cc086ae33eb49e19c27f9ed3f496a65b3767c973 https://github.com/facebook/folly/commit/52c7808964e885775cd1751cc696a6181bfcc3d6 https://github.com/facebook/proxygen/commit/494102fc3c92912f130c3270949fb0a982d53ee2 https://github.com/facebook/wangle/commit/ec3ce262f5d8d5dcfdb9817d0e49d187d547d0c6 https://github.com/facebook/watchman/commit/6bac9bafa2a68beac112e5a5283af2afe1d23e36 https://github.com/facebookexperimental/rust-shed/commit/33c8a5c9b9402b1a2719a7eebdddfba46607eb90 https://github.com/facebookincubator/katran/commit/de16c1a2790ef58a3a1e29ee08073dcc4f1221e3 https://github.com/facebookincubator/mvfst/commit/d624663a58d60433d817fec52d4d93c09131953e Reviewed By: bigfootjon fbshipit-source-id: 1106461928f3f72f64671f6b41266f3b76f27203 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4d39377d0d3f..cdc891fd9e4b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5b64bccc6f18e0c5cdf40e4605ea680dc9b5c59c +Subproject commit 4d6c18e6449edeb10b0cc96e69e8fcb51bdca40b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b5825306a645..ee1aa2c0bcf0 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit bc0818f89e7ab3802cdac95a25e29f4061021c3c +Subproject commit 52c7808964e885775cd1751cc696a6181bfcc3d6 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index be9f65c1955d..178ddbc22ab0 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 4c365b753d9fdfa53ffdd34e6262f67b8c0938e4 +Subproject commit ec3ce262f5d8d5dcfdb9817d0e49d187d547d0c6 From a516099393ac2ace911cae9652589c762de69311 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 8 Jul 2021 22:05:02 -0700 Subject: [PATCH 0154/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/9eea545e1222800cd18648e1abe6fb63bb1fed85 https://github.com/facebook/fbthrift/commit/611ddf122f26cfbce806430c8d41686736fb34c1 https://github.com/facebook/fbzmq/commit/f5c4eda58a72f3a6c89fdc3e7dc6b0653caf14d5 https://github.com/facebook/folly/commit/c2ea37612a79d7017db330e47cc0773423bef315 https://github.com/facebook/proxygen/commit/da87982406dd6c7d6edd3095dbc637766066bea1 https://github.com/facebook/wangle/commit/9f471b407584d13ee0e6f84480a662128bf1975b https://github.com/facebook/watchman/commit/a47e0c7e926d6fd25a723c336b6ac4f0f6636ae7 https://github.com/facebookexperimental/rust-shed/commit/e0175e2d0ffdd53b705828600e7fad4f8aba33b6 https://github.com/facebookincubator/fizz/commit/2f07494f36c35a9f4551770663d4581e483723be https://github.com/facebookincubator/katran/commit/00f57731fc1a1b6a6af208455ac3a814789680e3 https://github.com/facebookincubator/mvfst/commit/bf68fa5a024f84dde8038686cfd4a772eb6ddde0 https://github.com/rsocket/rsocket-cpp/commit/f95036173ba60eaa9b9ac4ed694338795f787976 Reviewed By: bigfootjon fbshipit-source-id: 5c1e6a66f185fb5de4a465ad7834db7b8e01b52e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cdc891fd9e4b..146cfca862b6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4d6c18e6449edeb10b0cc96e69e8fcb51bdca40b +Subproject commit 611ddf122f26cfbce806430c8d41686736fb34c1 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ee1aa2c0bcf0..20fbff0426a6 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 52c7808964e885775cd1751cc696a6181bfcc3d6 +Subproject commit c2ea37612a79d7017db330e47cc0773423bef315 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 178ddbc22ab0..3d3c8575874d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ec3ce262f5d8d5dcfdb9817d0e49d187d547d0c6 +Subproject commit 9f471b407584d13ee0e6f84480a662128bf1975b From 3e5b33c901f21f5341cc1de16737906041941abe Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 8 Jul 2021 23:02:46 -0700 Subject: [PATCH 0155/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/95cf0dfdd618d4da460bdd7ae59e788dcb63ed1b https://github.com/facebook/fbthrift/commit/e80494427dffdef7b44ad564f76491f2b0653c8a https://github.com/facebook/fbzmq/commit/b3500da434f6afd2d8dea60b93495b57fe88dd32 https://github.com/facebook/proxygen/commit/101ceac7c60502d9cf643576996ceca7034e4dbc https://github.com/facebook/wangle/commit/b1b8a7a4a1f058b2ae69096d5da3588386f18c43 https://github.com/facebook/watchman/commit/a516099393ac2ace911cae9652589c762de69311 https://github.com/facebookexperimental/rust-shed/commit/bd2d800daea3482ed06e603408b09fab3bc3addb https://github.com/facebookincubator/fizz/commit/7b6908ed44b5bc8904632fd3e20c7e1fe2c13efc https://github.com/facebookincubator/katran/commit/52ab9daed3e865ff258146d49365d08bf614a41b https://github.com/facebookincubator/mvfst/commit/2fa82086e0a2d31b85d6039ac9a4ab5fe8315264 https://github.com/pytorch/fbgemm/commit/dafddbc27c791d294b8c03466f85e27c5f2a3314 https://github.com/rsocket/rsocket-cpp/commit/fd5e0681d19afe957a73076874800941c06e22c8 Reviewed By: bigfootjon fbshipit-source-id: b245c99d530f8686c5a06acca94176c2744d7237 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 146cfca862b6..a58b55115d8f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 611ddf122f26cfbce806430c8d41686736fb34c1 +Subproject commit e80494427dffdef7b44ad564f76491f2b0653c8a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3d3c8575874d..cabdbd983d31 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9f471b407584d13ee0e6f84480a662128bf1975b +Subproject commit b1b8a7a4a1f058b2ae69096d5da3588386f18c43 From d65035ea66c98aafabc9e5d5da5c1490553f6b64 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 8 Jul 2021 23:55:36 -0700 Subject: [PATCH 0156/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/fa67c34ca77e9cfe002274f0c7c7186d4493b955 https://github.com/facebook/fbthrift/commit/01e5c4c226fa65e64f43666ea45d03a2ba4f716c https://github.com/facebook/fbzmq/commit/f918b5202e525d6b68d4bae7865f807b8103364a https://github.com/facebook/proxygen/commit/52de2f4d73999453418759cdfc5b5f651f05f415 https://github.com/facebook/wangle/commit/8340e8466de15b8d979340daec91b92458c200a2 https://github.com/facebook/watchman/commit/3e5b33c901f21f5341cc1de16737906041941abe https://github.com/facebookexperimental/rust-shed/commit/89896eaed629745cc2bd7ad7eab4ff6bb1bc6b19 https://github.com/facebookincubator/katran/commit/c1b27ee0c38b1a1f036e4c635fec9e4cbf0e19a8 https://github.com/facebookincubator/mvfst/commit/042f0d88e35d467be6032f369d4daec21a23bd98 Reviewed By: bigfootjon fbshipit-source-id: 49bb011f3c705047181035a01a06e6ccf25c6b51 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a58b55115d8f..a7cdadd03f7d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e80494427dffdef7b44ad564f76491f2b0653c8a +Subproject commit 01e5c4c226fa65e64f43666ea45d03a2ba4f716c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index cabdbd983d31..24de195761f1 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b1b8a7a4a1f058b2ae69096d5da3588386f18c43 +Subproject commit 8340e8466de15b8d979340daec91b92458c200a2 From 59cc267ddb07bfe8e89b86a8bae8f32def9b37ac Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 9 Jul 2021 00:41:39 -0700 Subject: [PATCH 0157/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/87aeb7311c07809423b14e3de2cdf913f5f0524a https://github.com/facebook/fbthrift/commit/06743536f35c9298536e86e928ab818d842f8132 https://github.com/facebook/fbzmq/commit/e9c8bdba3af1db15f6979dbd4b8377bbabeb3227 https://github.com/facebook/proxygen/commit/f3b62e2316a06afa958fc5d4864171df5afc0c09 https://github.com/facebook/watchman/commit/d65035ea66c98aafabc9e5d5da5c1490553f6b64 https://github.com/facebookexperimental/rust-shed/commit/acd25c31e0d1510e23b94960c4cdd897c703aedc Reviewed By: bigfootjon fbshipit-source-id: 7aedd909c75b87838c31b8cfa9ccfbd4c71d8587 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a7cdadd03f7d..db01bfb83653 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 01e5c4c226fa65e64f43666ea45d03a2ba4f716c +Subproject commit 06743536f35c9298536e86e928ab818d842f8132 From 4f174669dbe5eb76582b8933abb2d54105879b4a Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 9 Jul 2021 01:51:21 -0700 Subject: [PATCH 0158/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c91623bf1da49eccae6dab4f7e51b4bed7ce993d https://github.com/facebook/fbthrift/commit/d499fd0937f7dddf03c262b51eb0a0b8f8ca6e57 https://github.com/facebook/fbzmq/commit/aea7c5eb9f01d8e978342b0db003e9b59b75a549 https://github.com/facebook/watchman/commit/59cc267ddb07bfe8e89b86a8bae8f32def9b37ac https://github.com/facebookexperimental/rust-shed/commit/c714f8315048e325d1c6df92a0917b98f912a60e Reviewed By: bigfootjon fbshipit-source-id: 9e924f68d70db0dfbb9c6241c6f55d5020ee115b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index db01bfb83653..92d4d6013e07 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 06743536f35c9298536e86e928ab818d842f8132 +Subproject commit d499fd0937f7dddf03c262b51eb0a0b8f8ca6e57 From b2a98f539b07cf7a838ad6a7d9d9b77d221e3494 Mon Sep 17 00:00:00 2001 From: Zsolt Dollenstein Date: Fri, 9 Jul 2021 06:17:52 -0700 Subject: [PATCH 0159/7387] Opt in opensource/fbcode_builder to pyfmt Reviewed By: zertosh Differential Revision: D29612107 fbshipit-source-id: ac450058134e23a3831db35d2e49c80eb8cde36a --- build/fbcode_builder/CMake/fb_py_test_main.py | 6 +- .../fbcode_builder/CMake/make_fbpy_archive.py | 6 +- build/fbcode_builder/docker_builder.py | 121 +++--- build/fbcode_builder/fbcode_builder.py | 411 ++++++++++-------- build/fbcode_builder/fbcode_builder_config.py | 11 +- build/fbcode_builder/make_docker_context.py | 157 ++++--- build/fbcode_builder/parse_args.py | 47 +- build/fbcode_builder/shell_builder.py | 74 ++-- build/fbcode_builder/shell_quoting.py | 66 +-- build/fbcode_builder/specs/fbthrift.py | 6 +- build/fbcode_builder/specs/fbzmq.py | 51 ++- build/fbcode_builder/specs/fizz.py | 2 +- build/fbcode_builder/specs/fmt.py | 14 +- build/fbcode_builder/specs/folly.py | 6 +- build/fbcode_builder/specs/gmock.py | 16 +- build/fbcode_builder/specs/mvfst.py | 4 +- build/fbcode_builder/specs/proxygen.py | 4 +- build/fbcode_builder/specs/proxygen_quic.py | 4 +- build/fbcode_builder/specs/re2.py | 6 +- build/fbcode_builder/specs/rocksdb.py | 11 +- build/fbcode_builder/specs/sodium.py | 19 +- build/fbcode_builder/specs/wangle.py | 4 +- build/fbcode_builder/specs/zstd.py | 23 +- build/fbcode_builder/utils.py | 43 +- 24 files changed, 612 insertions(+), 500 deletions(-) diff --git a/build/fbcode_builder/CMake/fb_py_test_main.py b/build/fbcode_builder/CMake/fb_py_test_main.py index a5b96c408160..1f3563affe74 100644 --- a/build/fbcode_builder/CMake/fb_py_test_main.py +++ b/build/fbcode_builder/CMake/fb_py_test_main.py @@ -485,7 +485,7 @@ def load_args(self, args): return loader.suiteClass(suites) -_COVERAGE_INI = '''\ +_COVERAGE_INI = """\ [report] exclude_lines = pragma: no cover @@ -495,7 +495,7 @@ def load_args(self, args): pragma:.*no${PY_IMPL}${PY_MAJOR} pragma:.*nopy${PY_MAJOR} pragma:.*nopy${PY_MAJOR}${PY_MINOR} -''' +""" class MainProgram(object): @@ -734,7 +734,7 @@ def start_coverage(self): if not self.options.collect_coverage: return - with tempfile.NamedTemporaryFile('w', delete=False) as coverage_ini: + with tempfile.NamedTemporaryFile("w", delete=False) as coverage_ini: coverage_ini.write(_COVERAGE_INI) self._coverage_ini_path = coverage_ini.name diff --git a/build/fbcode_builder/CMake/make_fbpy_archive.py b/build/fbcode_builder/CMake/make_fbpy_archive.py index 4e91447af81c..3724feb2183f 100755 --- a/build/fbcode_builder/CMake/make_fbpy_archive.py +++ b/build/fbcode_builder/CMake/make_fbpy_archive.py @@ -124,7 +124,7 @@ def install_file(info): def build_zipapp(args, path_map): - """ Create a self executing python binary using Python 3's built-in + """Create a self executing python binary using Python 3's built-in zipapp module. This type of Python binary is relatively simple, as zipapp is part of the @@ -165,7 +165,7 @@ def create_main_module(args, inst_dir, path_map): def build_install_dir(args, path_map): - """ Create a directory that contains all of the sources, with a __main__ + """Create a directory that contains all of the sources, with a __main__ module to run the program. """ # Populate a temporary directory first, then rename to the destination @@ -188,7 +188,7 @@ def ensure_directory(path): def install_library(args, path_map): - """ Create an installation directory a python library. """ + """Create an installation directory a python library.""" out_dir = args.output out_manifest = args.output + ".manifest" diff --git a/build/fbcode_builder/docker_builder.py b/build/fbcode_builder/docker_builder.py index f551ec739218..83df7137cf97 100644 --- a/build/fbcode_builder/docker_builder.py +++ b/build/fbcode_builder/docker_builder.py @@ -4,7 +4,8 @@ from __future__ import division from __future__ import print_function from __future__ import unicode_literals -''' + +""" Extends FBCodeBuilder to produce Docker context directories. @@ -15,26 +16,23 @@ that change the least often, and - Put the steps that you are debugging towards the very end. -''' +""" import logging import os import shutil import tempfile from fbcode_builder import FBCodeBuilder -from shell_quoting import ( - raw_shell, shell_comment, shell_join, ShellQuoted, path_join -) +from shell_quoting import raw_shell, shell_comment, shell_join, ShellQuoted, path_join from utils import recursively_flatten_list, run_command class DockerFBCodeBuilder(FBCodeBuilder): - def _user(self): - return self.option('user', 'root') + return self.option("user", "root") def _change_user(self): - return ShellQuoted('USER {u}').format(u=self._user()) + return ShellQuoted("USER {u}").format(u=self._user()) def setup(self): # Please add RPM-based OSes here as appropriate. @@ -63,17 +61,18 @@ def python_venv(self): # it is present when the resulting container is run add to PATH actions = [] if self.option("PYTHON_VENV", "OFF") == "ON": - actions = ShellQuoted('ENV PATH={p}:$PATH').format( - p=path_join(self.option('prefix'), "venv", "bin")) - return(actions) + actions = ShellQuoted("ENV PATH={p}:$PATH").format( + p=path_join(self.option("prefix"), "venv", "bin") + ) + return actions def step(self, name, actions): - assert '\n' not in name, 'Name {0} would span > 1 line'.format(name) - b = ShellQuoted('') - return [ShellQuoted('### {0} ###'.format(name)), b] + actions + [b] + assert "\n" not in name, "Name {0} would span > 1 line".format(name) + b = ShellQuoted("") + return [ShellQuoted("### {0} ###".format(name)), b] + actions + [b] def run(self, shell_cmd): - return ShellQuoted('RUN {cmd}').format(cmd=shell_cmd) + return ShellQuoted("RUN {cmd}").format(cmd=shell_cmd) def set_env(self, key, value): return ShellQuoted("ENV {key}={val}").format(key=key, val=value) @@ -84,12 +83,12 @@ def workdir(self, dir): # by root:root -- the explicit `mkdir` works around the bug: # USER nobody # WORKDIR build - ShellQuoted('USER root'), - ShellQuoted('RUN mkdir -p {d} && chown {u} {d}').format( + ShellQuoted("USER root"), + ShellQuoted("RUN mkdir -p {d} && chown {u} {d}").format( d=dir, u=self._user() ), self._change_user(), - ShellQuoted('WORKDIR {dir}').format(dir=dir), + ShellQuoted("WORKDIR {dir}").format(dir=dir), ] def comment(self, comment): @@ -99,60 +98,58 @@ def comment(self, comment): def copy_local_repo(self, repo_dir, dest_name): fd, archive_path = tempfile.mkstemp( - prefix='local_repo_{0}_'.format(dest_name), - suffix='.tgz', - dir=os.path.abspath(self.option('docker_context_dir')), + prefix="local_repo_{0}_".format(dest_name), + suffix=".tgz", + dir=os.path.abspath(self.option("docker_context_dir")), ) os.close(fd) - run_command('tar', 'czf', archive_path, '.', cwd=repo_dir) + run_command("tar", "czf", archive_path, ".", cwd=repo_dir) return [ - ShellQuoted('ADD {archive} {dest_name}').format( + ShellQuoted("ADD {archive} {dest_name}").format( archive=os.path.basename(archive_path), dest_name=dest_name ), # Docker permissions make very little sense... see also workdir() - ShellQuoted('USER root'), - ShellQuoted('RUN chown -R {u} {d}').format( - d=dest_name, u=self._user() - ), + ShellQuoted("USER root"), + ShellQuoted("RUN chown -R {u} {d}").format(d=dest_name, u=self._user()), self._change_user(), ] def _render_impl(self, steps): - return raw_shell(shell_join('\n', recursively_flatten_list(steps))) + return raw_shell(shell_join("\n", recursively_flatten_list(steps))) def debian_ccache_setup_steps(self): - source_ccache_tgz = self.option('ccache_tgz', '') + source_ccache_tgz = self.option("ccache_tgz", "") if not source_ccache_tgz: - logging.info('Docker ccache not enabled') + logging.info("Docker ccache not enabled") return [] - dest_ccache_tgz = os.path.join( - self.option('docker_context_dir'), 'ccache.tgz' - ) + dest_ccache_tgz = os.path.join(self.option("docker_context_dir"), "ccache.tgz") try: try: os.link(source_ccache_tgz, dest_ccache_tgz) except OSError: logging.exception( - 'Hard-linking {s} to {d} failed, falling back to copy' - .format(s=source_ccache_tgz, d=dest_ccache_tgz) + "Hard-linking {s} to {d} failed, falling back to copy".format( + s=source_ccache_tgz, d=dest_ccache_tgz + ) ) shutil.copyfile(source_ccache_tgz, dest_ccache_tgz) except Exception: logging.exception( - 'Failed to copy or link {s} to {d}, aborting' - .format(s=source_ccache_tgz, d=dest_ccache_tgz) + "Failed to copy or link {s} to {d}, aborting".format( + s=source_ccache_tgz, d=dest_ccache_tgz + ) ) raise return [ # Separate layer so that in development we avoid re-downloads. - self.run(ShellQuoted('apt-get install -yq ccache')), - ShellQuoted('ADD ccache.tgz /'), + self.run(ShellQuoted("apt-get install -yq ccache")), + ShellQuoted("ADD ccache.tgz /"), ShellQuoted( # Set CCACHE_DIR before the `ccache` invocations below. - 'ENV CCACHE_DIR=/ccache ' + "ENV CCACHE_DIR=/ccache " # No clang support for now, so it's easiest to hardcode gcc. 'CC="ccache gcc" CXX="ccache g++" ' # Always log for ease of debugging. For real FB projects, @@ -166,26 +163,28 @@ def debian_ccache_setup_steps(self): # # apt-get install sharutils # bzip2 -9 < /tmp/ccache.log | uuencode -m ccache.log.bz2 - 'CCACHE_LOGFILE=/tmp/ccache.log' + "CCACHE_LOGFILE=/tmp/ccache.log" + ), + self.run( + ShellQuoted( + # Future: Skipping this part made this Docker step instant, + # saving ~1min of build time. It's unclear if it is the + # chown or the du, but probably the chown -- since a large + # part of the cost is incurred at image save time. + # + # ccache.tgz may be empty, or may have the wrong + # permissions. + "mkdir -p /ccache && time chown -R nobody /ccache && " + "time du -sh /ccache && " + # Reset stats so `docker_build_with_ccache.sh` can print + # useful values at the end of the run. + "echo === Prev run stats === && ccache -s && ccache -z && " + # Record the current time to let travis_build.sh figure out + # the number of bytes in the cache that are actually used -- + # this is crucial for tuning the maximum cache size. + "date +%s > /FBCODE_BUILDER_CCACHE_START_TIME && " + # The build running as `nobody` should be able to write here + "chown nobody /tmp/ccache.log" + ) ), - self.run(ShellQuoted( - # Future: Skipping this part made this Docker step instant, - # saving ~1min of build time. It's unclear if it is the - # chown or the du, but probably the chown -- since a large - # part of the cost is incurred at image save time. - # - # ccache.tgz may be empty, or may have the wrong - # permissions. - 'mkdir -p /ccache && time chown -R nobody /ccache && ' - 'time du -sh /ccache && ' - # Reset stats so `docker_build_with_ccache.sh` can print - # useful values at the end of the run. - 'echo === Prev run stats === && ccache -s && ccache -z && ' - # Record the current time to let travis_build.sh figure out - # the number of bytes in the cache that are actually used -- - # this is crucial for tuning the maximum cache size. - 'date +%s > /FBCODE_BUILDER_CCACHE_START_TIME && ' - # The build running as `nobody` should be able to write here - 'chown nobody /tmp/ccache.log' - )), ] diff --git a/build/fbcode_builder/fbcode_builder.py b/build/fbcode_builder/fbcode_builder.py index 5727d71beaca..742099321698 100644 --- a/build/fbcode_builder/fbcode_builder.py +++ b/build/fbcode_builder/fbcode_builder.py @@ -4,7 +4,8 @@ from __future__ import division from __future__ import print_function from __future__ import unicode_literals -''' + +""" This is a small DSL to describe builds of Facebook's open-source projects that are published to Github from a single internal repo, including projects @@ -57,7 +58,7 @@ * do `make` and `cmake` - If we get non-Debian OSes, part of ccache setup should be factored out. -''' +""" import os import re @@ -66,22 +67,21 @@ def _read_project_github_hashes(): - base_dir = 'deps/github_hashes/' # trailing slash used in regex below + base_dir = "deps/github_hashes/" # trailing slash used in regex below for dirname, _, files in os.walk(base_dir): for filename in files: path = os.path.join(dirname, filename) with open(path) as f: - m_proj = re.match('^' + base_dir + '(.*)-rev\.txt$', path) + m_proj = re.match("^" + base_dir + "(.*)-rev\.txt$", path) if m_proj is None: - raise RuntimeError('Not a hash file? {0}'.format(path)) - m_hash = re.match('^Subproject commit ([0-9a-f]+)\n$', f.read()) + raise RuntimeError("Not a hash file? {0}".format(path)) + m_hash = re.match("^Subproject commit ([0-9a-f]+)\n$", f.read()) if m_hash is None: - raise RuntimeError('No hash in {0}'.format(path)) + raise RuntimeError("No hash in {0}".format(path)) yield m_proj.group(1), m_hash.group(1) class FBCodeBuilder(object): - def __init__(self, **kwargs): self._options_do_not_access = kwargs # Use .option() instead. # This raises upon detecting options that are specified but unused, @@ -90,22 +90,22 @@ def __init__(self, **kwargs): # Mark 'projects_dir' used even if the build installs no github # projects. This is needed because driver programs like # `shell_builder.py` unconditionally set this for all builds. - self._github_dir = self.option('projects_dir') + self._github_dir = self.option("projects_dir") self._github_hashes = dict(_read_project_github_hashes()) def __repr__(self): - return '{0}({1})'.format( + return "{0}({1})".format( self.__class__.__name__, - ', '.join( - '{0}={1}'.format(k, repr(v)) - for k, v in self._options_do_not_access.items() - ) + ", ".join( + "{0}={1}".format(k, repr(v)) + for k, v in self._options_do_not_access.items() + ), ) def option(self, name, default=None): value = self._options_do_not_access.get(name, default) if value is None: - raise RuntimeError('Option {0} is required'.format(name)) + raise RuntimeError("Option {0} is required".format(name)) self.options_used.add(name) return value @@ -114,7 +114,7 @@ def has_option(self, name): def add_option(self, name, value): if name in self._options_do_not_access: - raise RuntimeError('Option {0} already set'.format(name)) + raise RuntimeError("Option {0} already set".format(name)) self._options_do_not_access[name] = value # @@ -122,12 +122,12 @@ def add_option(self, name, value): # def render(self, steps): - ''' + """ Converts nested actions to your builder's expected output format. Typically takes the output of build(). - ''' + """ res = self._render_impl(steps) # Implementation-dependent # Now that the output is rendered, we expect all options to have # been used. @@ -135,41 +135,46 @@ def render(self, steps): unused_options -= self.options_used if unused_options: raise RuntimeError( - 'Unused options: {0} -- please check if you made a typo ' - 'in any of them. Those that are truly not useful should ' - 'be not be set so that this typo detection can be useful.' - .format(unused_options) + "Unused options: {0} -- please check if you made a typo " + "in any of them. Those that are truly not useful should " + "be not be set so that this typo detection can be useful.".format( + unused_options + ) ) return res def build(self, steps): if not steps: - raise RuntimeError('Please ensure that the config you are passing ' - 'contains steps') + raise RuntimeError( + "Please ensure that the config you are passing " "contains steps" + ) return [self.setup(), self.diagnostics()] + steps def setup(self): - 'Your builder may want to install packages here.' + "Your builder may want to install packages here." raise NotImplementedError def diagnostics(self): - 'Log some system diagnostics before/after setup for ease of debugging' + "Log some system diagnostics before/after setup for ease of debugging" # The builder's repr is not used in a command to avoid pointlessly # invalidating Docker's build cache. - return self.step('Diagnostics', [ - self.comment('Builder {0}'.format(repr(self))), - self.run(ShellQuoted('hostname')), - self.run(ShellQuoted('cat /etc/issue || echo no /etc/issue')), - self.run(ShellQuoted('g++ --version || echo g++ not installed')), - self.run(ShellQuoted('cmake --version || echo cmake not installed')), - ]) + return self.step( + "Diagnostics", + [ + self.comment("Builder {0}".format(repr(self))), + self.run(ShellQuoted("hostname")), + self.run(ShellQuoted("cat /etc/issue || echo no /etc/issue")), + self.run(ShellQuoted("g++ --version || echo g++ not installed")), + self.run(ShellQuoted("cmake --version || echo cmake not installed")), + ], + ) def step(self, name, actions): - 'A labeled collection of actions or other steps' + "A labeled collection of actions or other steps" raise NotImplementedError def run(self, shell_cmd): - 'Run this bash command' + "Run this bash command" raise NotImplementedError def set_env(self, key, value): @@ -177,54 +182,54 @@ def set_env(self, key, value): raise NotImplementedError def workdir(self, dir): - 'Create this directory if it does not exist, and change into it' + "Create this directory if it does not exist, and change into it" raise NotImplementedError def copy_local_repo(self, dir, dest_name): - ''' + """ Copy the local repo at `dir` into this step's `workdir()`, analog of: cp -r /path/to/folly folly - ''' + """ raise NotImplementedError def python_deps(self): return [ - 'wheel', - 'cython==0.28.6', + "wheel", + "cython==0.28.6", ] def debian_deps(self): return [ - 'autoconf-archive', - 'bison', - 'build-essential', - 'cmake', - 'curl', - 'flex', - 'git', - 'gperf', - 'joe', - 'libboost-all-dev', - 'libcap-dev', - 'libdouble-conversion-dev', - 'libevent-dev', - 'libgflags-dev', - 'libgoogle-glog-dev', - 'libkrb5-dev', - 'libpcre3-dev', - 'libpthread-stubs0-dev', - 'libnuma-dev', - 'libsasl2-dev', - 'libsnappy-dev', - 'libsqlite3-dev', - 'libssl-dev', - 'libtool', - 'netcat-openbsd', - 'pkg-config', - 'sudo', - 'unzip', - 'wget', - 'python3-venv', + "autoconf-archive", + "bison", + "build-essential", + "cmake", + "curl", + "flex", + "git", + "gperf", + "joe", + "libboost-all-dev", + "libcap-dev", + "libdouble-conversion-dev", + "libevent-dev", + "libgflags-dev", + "libgoogle-glog-dev", + "libkrb5-dev", + "libpcre3-dev", + "libpthread-stubs0-dev", + "libnuma-dev", + "libsasl2-dev", + "libsnappy-dev", + "libsqlite3-dev", + "libssl-dev", + "libtool", + "netcat-openbsd", + "pkg-config", + "sudo", + "unzip", + "wget", + "python3-venv", ] # @@ -234,51 +239,72 @@ def debian_deps(self): def install_debian_deps(self): actions = [ self.run( - ShellQuoted('apt-get update && apt-get install -yq {deps}').format( - deps=shell_join(' ', ( - ShellQuoted(dep) for dep in self.debian_deps()))) + ShellQuoted("apt-get update && apt-get install -yq {deps}").format( + deps=shell_join( + " ", (ShellQuoted(dep) for dep in self.debian_deps()) + ) + ) ), ] - gcc_version = self.option('gcc_version') + gcc_version = self.option("gcc_version") # Make the selected GCC the default before building anything - actions.extend([ - self.run(ShellQuoted('apt-get install -yq {c} {cpp}').format( - c=ShellQuoted('gcc-{v}').format(v=gcc_version), - cpp=ShellQuoted('g++-{v}').format(v=gcc_version), - )), - self.run(ShellQuoted( - 'update-alternatives --install /usr/bin/gcc gcc {c} 40 ' - '--slave /usr/bin/g++ g++ {cpp}' - ).format( - c=ShellQuoted('/usr/bin/gcc-{v}').format(v=gcc_version), - cpp=ShellQuoted('/usr/bin/g++-{v}').format(v=gcc_version), - )), - self.run(ShellQuoted('update-alternatives --config gcc')), - ]) + actions.extend( + [ + self.run( + ShellQuoted("apt-get install -yq {c} {cpp}").format( + c=ShellQuoted("gcc-{v}").format(v=gcc_version), + cpp=ShellQuoted("g++-{v}").format(v=gcc_version), + ) + ), + self.run( + ShellQuoted( + "update-alternatives --install /usr/bin/gcc gcc {c} 40 " + "--slave /usr/bin/g++ g++ {cpp}" + ).format( + c=ShellQuoted("/usr/bin/gcc-{v}").format(v=gcc_version), + cpp=ShellQuoted("/usr/bin/g++-{v}").format(v=gcc_version), + ) + ), + self.run(ShellQuoted("update-alternatives --config gcc")), + ] + ) actions.extend(self.debian_ccache_setup_steps()) - return self.step('Install packages for Debian-based OS', actions) + return self.step("Install packages for Debian-based OS", actions) def create_python_venv(self): actions = [] if self.option("PYTHON_VENV", "OFF") == "ON": - actions.append(self.run(ShellQuoted("python3 -m venv {p}").format( - p=path_join(self.option('prefix'), "venv")))) - return(actions) + actions.append( + self.run( + ShellQuoted("python3 -m venv {p}").format( + p=path_join(self.option("prefix"), "venv") + ) + ) + ) + return actions def python_venv(self): actions = [] if self.option("PYTHON_VENV", "OFF") == "ON": - actions.append(ShellQuoted("source {p}").format( - p=path_join(self.option('prefix'), "venv", "bin", "activate"))) + actions.append( + ShellQuoted("source {p}").format( + p=path_join(self.option("prefix"), "venv", "bin", "activate") + ) + ) - actions.append(self.run( - ShellQuoted("python3 -m pip install {deps}").format( - deps=shell_join(' ', (ShellQuoted(dep) for dep in - self.python_deps()))))) - return(actions) + actions.append( + self.run( + ShellQuoted("python3 -m pip install {deps}").format( + deps=shell_join( + " ", (ShellQuoted(dep) for dep in self.python_deps()) + ) + ) + ) + ) + return actions def enable_rust_toolchain(self, toolchain="stable", is_bootstrap=True): choices = set(["stable", "beta", "nightly"]) @@ -333,117 +359,148 @@ def github_project_workdir(self, project, path): # Only check out a non-default branch if requested. This especially # makes sense when building from a local repo. git_hash = self.option( - '{0}:git_hash'.format(project), + "{0}:git_hash".format(project), # Any repo that has a hash in deps/github_hashes defaults to # that, with the goal of making builds maximally consistent. - self._github_hashes.get(project, '') + self._github_hashes.get(project, ""), + ) + maybe_change_branch = ( + [ + self.run(ShellQuoted("git checkout {hash}").format(hash=git_hash)), + ] + if git_hash + else [] ) - maybe_change_branch = [ - self.run(ShellQuoted('git checkout {hash}').format(hash=git_hash)), - ] if git_hash else [] - local_repo_dir = self.option('{0}:local_repo_dir'.format(project), '') - return self.step('Check out {0}, workdir {1}'.format(project, path), [ - self.workdir(self._github_dir), - self.run( - ShellQuoted('git clone {opts} https://github.com/{p}').format( - p=project, - opts=ShellQuoted(self.option('{}:git_clone_opts'.format(project), ''))) - ) if not local_repo_dir else self.copy_local_repo( - local_repo_dir, os.path.basename(project) - ), - self.workdir( - path_join(self._github_dir, os.path.basename(project), path), - ), - ] + maybe_change_branch) + local_repo_dir = self.option("{0}:local_repo_dir".format(project), "") + return self.step( + "Check out {0}, workdir {1}".format(project, path), + [ + self.workdir(self._github_dir), + self.run( + ShellQuoted("git clone {opts} https://github.com/{p}").format( + p=project, + opts=ShellQuoted( + self.option("{}:git_clone_opts".format(project), "") + ), + ) + ) + if not local_repo_dir + else self.copy_local_repo(local_repo_dir, os.path.basename(project)), + self.workdir( + path_join(self._github_dir, os.path.basename(project), path), + ), + ] + + maybe_change_branch, + ) - def fb_github_project_workdir(self, project_and_path, github_org='facebook'): - 'This helper lets Facebook-internal CI special-cases FB projects' - project, path = project_and_path.split('/', 1) - return self.github_project_workdir(github_org + '/' + project, path) + def fb_github_project_workdir(self, project_and_path, github_org="facebook"): + "This helper lets Facebook-internal CI special-cases FB projects" + project, path = project_and_path.split("/", 1) + return self.github_project_workdir(github_org + "/" + project, path) def _make_vars(self, make_vars): - return shell_join(' ', ( - ShellQuoted('{k}={v}').format(k=k, v=v) + return shell_join( + " ", + ( + ShellQuoted("{k}={v}").format(k=k, v=v) for k, v in ({} if make_vars is None else make_vars).items() - )) + ), + ) def parallel_make(self, make_vars=None): - return self.run(ShellQuoted('make -j {n} VERBOSE=1 {vars}').format( - n=self.option('make_parallelism'), - vars=self._make_vars(make_vars), - )) + return self.run( + ShellQuoted("make -j {n} VERBOSE=1 {vars}").format( + n=self.option("make_parallelism"), + vars=self._make_vars(make_vars), + ) + ) def make_and_install(self, make_vars=None): return [ self.parallel_make(make_vars), - self.run(ShellQuoted('make install VERBOSE=1 {vars}').format( - vars=self._make_vars(make_vars), - )), + self.run( + ShellQuoted("make install VERBOSE=1 {vars}").format( + vars=self._make_vars(make_vars), + ) + ), ] def configure(self, name=None): autoconf_options = {} if name is not None: autoconf_options.update( - self.option('{0}:autoconf_options'.format(name), {}) + self.option("{0}:autoconf_options".format(name), {}) ) return [ - self.run(ShellQuoted( - 'LDFLAGS="$LDFLAGS -L"{p}"/lib -Wl,-rpath="{p}"/lib" ' - 'CFLAGS="$CFLAGS -I"{p}"/include" ' - 'CPPFLAGS="$CPPFLAGS -I"{p}"/include" ' - 'PY_PREFIX={p} ' - './configure --prefix={p} {args}' - ).format( - p=self.option('prefix'), - args=shell_join(' ', ( - ShellQuoted('{k}={v}').format(k=k, v=v) - for k, v in autoconf_options.items() - )), - )), + self.run( + ShellQuoted( + 'LDFLAGS="$LDFLAGS -L"{p}"/lib -Wl,-rpath="{p}"/lib" ' + 'CFLAGS="$CFLAGS -I"{p}"/include" ' + 'CPPFLAGS="$CPPFLAGS -I"{p}"/include" ' + "PY_PREFIX={p} " + "./configure --prefix={p} {args}" + ).format( + p=self.option("prefix"), + args=shell_join( + " ", + ( + ShellQuoted("{k}={v}").format(k=k, v=v) + for k, v in autoconf_options.items() + ), + ), + ) + ), ] def autoconf_install(self, name): - return self.step('Build and install {0}'.format(name), [ - self.run(ShellQuoted('autoreconf -ivf')), - ] + self.configure() + self.make_and_install()) + return self.step( + "Build and install {0}".format(name), + [ + self.run(ShellQuoted("autoreconf -ivf")), + ] + + self.configure() + + self.make_and_install(), + ) - def cmake_configure(self, name, cmake_path='..'): + def cmake_configure(self, name, cmake_path=".."): cmake_defines = { - 'BUILD_SHARED_LIBS': 'ON', - 'CMAKE_INSTALL_PREFIX': self.option('prefix'), + "BUILD_SHARED_LIBS": "ON", + "CMAKE_INSTALL_PREFIX": self.option("prefix"), } # Hacks to add thriftpy3 support - if 'BUILD_THRIFT_PY3' in os.environ and 'folly' in name: - cmake_defines['PYTHON_EXTENSIONS'] = 'True' + if "BUILD_THRIFT_PY3" in os.environ and "folly" in name: + cmake_defines["PYTHON_EXTENSIONS"] = "True" - if 'BUILD_THRIFT_PY3' in os.environ and 'fbthrift' in name: - cmake_defines['thriftpy3'] = 'ON' + if "BUILD_THRIFT_PY3" in os.environ and "fbthrift" in name: + cmake_defines["thriftpy3"] = "ON" - cmake_defines.update( - self.option('{0}:cmake_defines'.format(name), {}) - ) + cmake_defines.update(self.option("{0}:cmake_defines".format(name), {})) return [ - self.run(ShellQuoted( - 'CXXFLAGS="$CXXFLAGS -fPIC -isystem "{p}"/include" ' - 'CFLAGS="$CFLAGS -fPIC -isystem "{p}"/include" ' - 'cmake {args} {cmake_path}' - ).format( - p=self.option('prefix'), - args=shell_join(' ', ( - ShellQuoted('-D{k}={v}').format(k=k, v=v) - for k, v in cmake_defines.items() - )), - cmake_path=cmake_path, - )), + self.run( + ShellQuoted( + 'CXXFLAGS="$CXXFLAGS -fPIC -isystem "{p}"/include" ' + 'CFLAGS="$CFLAGS -fPIC -isystem "{p}"/include" ' + "cmake {args} {cmake_path}" + ).format( + p=self.option("prefix"), + args=shell_join( + " ", + ( + ShellQuoted("-D{k}={v}").format(k=k, v=v) + for k, v in cmake_defines.items() + ), + ), + cmake_path=cmake_path, + ) + ), ] - def cmake_install(self, name, cmake_path='..'): + def cmake_install(self, name, cmake_path=".."): return self.step( - 'Build and install {0}'.format(name), - self.cmake_configure(name, cmake_path) + self.make_and_install() + "Build and install {0}".format(name), + self.cmake_configure(name, cmake_path) + self.make_and_install(), ) def cargo_build(self, name): @@ -458,13 +515,15 @@ def cargo_build(self, name): ], ) - def fb_github_autoconf_install(self, project_and_path, github_org='facebook'): + def fb_github_autoconf_install(self, project_and_path, github_org="facebook"): return [ self.fb_github_project_workdir(project_and_path, github_org), self.autoconf_install(project_and_path), ] - def fb_github_cmake_install(self, project_and_path, cmake_path='..', github_org='facebook'): + def fb_github_cmake_install( + self, project_and_path, cmake_path="..", github_org="facebook" + ): return [ self.fb_github_project_workdir(project_and_path, github_org), self.cmake_install(project_and_path, cmake_path), diff --git a/build/fbcode_builder/fbcode_builder_config.py b/build/fbcode_builder/fbcode_builder_config.py index c8f868a51950..5ba6e607a920 100644 --- a/build/fbcode_builder/fbcode_builder_config.py +++ b/build/fbcode_builder/fbcode_builder_config.py @@ -4,12 +4,13 @@ from __future__ import division from __future__ import print_function from __future__ import unicode_literals -'Demo config, so that `make_docker_context.py --help` works in this directory.' + +"Demo config, so that `make_docker_context.py --help` works in this directory." config = { - 'fbcode_builder_spec': lambda _builder: { - 'depends_on': [], - 'steps': [], + "fbcode_builder_spec": lambda _builder: { + "depends_on": [], + "steps": [], }, - 'github_project': 'demo/project', + "github_project": "demo/project", } diff --git a/build/fbcode_builder/make_docker_context.py b/build/fbcode_builder/make_docker_context.py index 11986ca65cfc..d4b0f0a89938 100755 --- a/build/fbcode_builder/make_docker_context.py +++ b/build/fbcode_builder/make_docker_context.py @@ -4,7 +4,8 @@ from __future__ import division from __future__ import print_function from __future__ import unicode_literals -''' + +""" Reads `fbcode_builder_config.py` from the current directory, and prepares a Docker context directory to build this project. Prints to stdout the path to the context directory. @@ -14,7 +15,7 @@ By default, the Docker context directory will be in /tmp. It will always contain a Dockerfile, and might also contain copies of your local repos, and other data needed for the build container. -''' +""" import os import tempfile @@ -27,7 +28,7 @@ def make_docker_context( get_steps_fn, github_project, opts=None, default_context_dir=None ): - ''' + """ Returns a path to the Docker context directory. See parse_args.py. Helper for making a command-line utility that writes your project's @@ -38,83 +39,97 @@ def make_docker_context( lambda builder: [builder.step(...), ...], 'facebook/your_project', )) - ''' + """ if opts is None: opts = {} valid_versions = ( - ('ubuntu:16.04', '5'), - ('ubuntu:18.04', '7'), + ("ubuntu:16.04", "5"), + ("ubuntu:18.04", "7"), ) def add_args(parser): parser.add_argument( - '--docker-context-dir', metavar='DIR', + "--docker-context-dir", + metavar="DIR", default=default_context_dir, - help='Write the Dockerfile and its context into this directory. ' - 'If empty, make a temporary directory. Default: %(default)s.', + help="Write the Dockerfile and its context into this directory. " + "If empty, make a temporary directory. Default: %(default)s.", ) parser.add_argument( - '--user', metavar='NAME', default=opts.get('user', 'nobody'), - help='Build and install as this user. Default: %(default)s.', + "--user", + metavar="NAME", + default=opts.get("user", "nobody"), + help="Build and install as this user. Default: %(default)s.", ) parser.add_argument( - '--prefix', metavar='DIR', - default=opts.get('prefix', '/home/install'), - help='Install all libraries in this prefix. Default: %(default)s.', + "--prefix", + metavar="DIR", + default=opts.get("prefix", "/home/install"), + help="Install all libraries in this prefix. Default: %(default)s.", ) parser.add_argument( - '--projects-dir', metavar='DIR', - default=opts.get('projects_dir', '/home'), - help='Place project code directories here. Default: %(default)s.', + "--projects-dir", + metavar="DIR", + default=opts.get("projects_dir", "/home"), + help="Place project code directories here. Default: %(default)s.", ) parser.add_argument( - '--os-image', metavar='IMG', choices=zip(*valid_versions)[0], - default=opts.get('os_image', valid_versions[0][0]), - help='Docker OS image -- be sure to use only ones you trust (See ' - 'README.docker). Choices: %(choices)s. Default: %(default)s.', + "--os-image", + metavar="IMG", + choices=zip(*valid_versions)[0], + default=opts.get("os_image", valid_versions[0][0]), + help="Docker OS image -- be sure to use only ones you trust (See " + "README.docker). Choices: %(choices)s. Default: %(default)s.", ) parser.add_argument( - '--gcc-version', metavar='VER', + "--gcc-version", + metavar="VER", choices=set(zip(*valid_versions)[1]), - default=opts.get('gcc_version', valid_versions[0][1]), - help='Choices: %(choices)s. Default: %(default)s.', + default=opts.get("gcc_version", valid_versions[0][1]), + help="Choices: %(choices)s. Default: %(default)s.", ) parser.add_argument( - '--make-parallelism', metavar='NUM', type=int, - default=opts.get('make_parallelism', 1), - help='Use `make -j` on multi-CPU systems with lots of RAM. ' - 'Default: %(default)s.', + "--make-parallelism", + metavar="NUM", + type=int, + default=opts.get("make_parallelism", 1), + help="Use `make -j` on multi-CPU systems with lots of RAM. " + "Default: %(default)s.", ) parser.add_argument( - '--local-repo-dir', metavar='DIR', - help='If set, build {0} from a local directory instead of Github.' - .format(github_project), + "--local-repo-dir", + metavar="DIR", + help="If set, build {0} from a local directory instead of Github.".format( + github_project + ), ) parser.add_argument( - '--ccache-tgz', metavar='PATH', - help='If set, enable ccache for the build. To initialize the ' - 'cache, first try to hardlink, then to copy --cache-tgz ' - 'as ccache.tgz into the --docker-context-dir.' + "--ccache-tgz", + metavar="PATH", + help="If set, enable ccache for the build. To initialize the " + "cache, first try to hardlink, then to copy --cache-tgz " + "as ccache.tgz into the --docker-context-dir.", ) opts = parse_args_to_fbcode_builder_opts( add_args, # These have add_argument() calls, others are set via --option. ( - 'docker_context_dir', - 'user', - 'prefix', - 'projects_dir', - 'os_image', - 'gcc_version', - 'make_parallelism', - 'local_repo_dir', - 'ccache_tgz', + "docker_context_dir", + "user", + "prefix", + "projects_dir", + "os_image", + "gcc_version", + "make_parallelism", + "local_repo_dir", + "ccache_tgz", ), opts, - help=textwrap.dedent(''' + help=textwrap.dedent( + """ Reads `fbcode_builder_config.py` from the current directory, and prepares a Docker context directory to build {github_project} and @@ -130,47 +145,55 @@ def add_args(parser): Usage: (cd $(./make_docker_context.py) && docker build . 2>&1 | tee log) - '''.format(github_project=github_project)), + """.format( + github_project=github_project + ) + ), ) # This allows travis_docker_build.sh not to know the main Github project. - local_repo_dir = opts.pop('local_repo_dir', None) + local_repo_dir = opts.pop("local_repo_dir", None) if local_repo_dir is not None: - opts['{0}:local_repo_dir'.format(github_project)] = local_repo_dir + opts["{0}:local_repo_dir".format(github_project)] = local_repo_dir - if (opts.get('os_image'), opts.get('gcc_version')) not in valid_versions: + if (opts.get("os_image"), opts.get("gcc_version")) not in valid_versions: raise Exception( - 'Due to 4/5 ABI changes (std::string), we can only use {0}'.format( - ' / '.join('GCC {1} on {0}'.format(*p) for p in valid_versions) + "Due to 4/5 ABI changes (std::string), we can only use {0}".format( + " / ".join("GCC {1} on {0}".format(*p) for p in valid_versions) ) ) - if opts.get('docker_context_dir') is None: - opts['docker_context_dir'] = tempfile.mkdtemp(prefix='docker-context-') - elif not os.path.exists(opts.get('docker_context_dir')): - os.makedirs(opts.get('docker_context_dir')) + if opts.get("docker_context_dir") is None: + opts["docker_context_dir"] = tempfile.mkdtemp(prefix="docker-context-") + elif not os.path.exists(opts.get("docker_context_dir")): + os.makedirs(opts.get("docker_context_dir")) builder = DockerFBCodeBuilder(**opts) - context_dir = builder.option('docker_context_dir') # Mark option "in-use" + context_dir = builder.option("docker_context_dir") # Mark option "in-use" # The renderer may also populate some files into the context_dir. dockerfile = builder.render(get_steps_fn(builder)) - with os.fdopen(os.open( - os.path.join(context_dir, 'Dockerfile'), - os.O_RDWR | os.O_CREAT | os.O_EXCL, # Do not overwrite existing files - 0o644, - ), 'w') as f: + with os.fdopen( + os.open( + os.path.join(context_dir, "Dockerfile"), + os.O_RDWR | os.O_CREAT | os.O_EXCL, # Do not overwrite existing files + 0o644, + ), + "w", + ) as f: f.write(dockerfile) return context_dir -if __name__ == '__main__': +if __name__ == "__main__": from utils import read_fbcode_builder_config, build_fbcode_builder_config # Load a spec from the current directory - config = read_fbcode_builder_config('fbcode_builder_config.py') - print(make_docker_context( - build_fbcode_builder_config(config), - config['github_project'], - )) + config = read_fbcode_builder_config("fbcode_builder_config.py") + print( + make_docker_context( + build_fbcode_builder_config(config), + config["github_project"], + ) + ) diff --git a/build/fbcode_builder/parse_args.py b/build/fbcode_builder/parse_args.py index def9e504de8b..8d5e353308a0 100644 --- a/build/fbcode_builder/parse_args.py +++ b/build/fbcode_builder/parse_args.py @@ -4,7 +4,8 @@ from __future__ import division from __future__ import print_function from __future__ import unicode_literals -'Argument parsing logic shared by all fbcode_builder CLI tools.' + +"Argument parsing logic shared by all fbcode_builder CLI tools." import argparse import logging @@ -13,7 +14,7 @@ def parse_args_to_fbcode_builder_opts(add_args_fn, top_level_opts, opts, help): - ''' + """ Provides some standard arguments: --debug, --option, --shell-quoted-option @@ -26,46 +27,52 @@ def parse_args_to_fbcode_builder_opts(add_args_fn, top_level_opts, opts, help): `help` is printed in response to the `--help` argument. - ''' + """ top_level_opts = set(top_level_opts) parser = argparse.ArgumentParser( - description=help, - formatter_class=argparse.RawDescriptionHelpFormatter + description=help, formatter_class=argparse.RawDescriptionHelpFormatter ) add_args_fn(parser) parser.add_argument( - '--option', nargs=2, metavar=('KEY', 'VALUE'), action='append', + "--option", + nargs=2, + metavar=("KEY", "VALUE"), + action="append", default=[ - (k, v) for k, v in opts.items() - if k not in top_level_opts and not isinstance(v, ShellQuoted) + (k, v) + for k, v in opts.items() + if k not in top_level_opts and not isinstance(v, ShellQuoted) ], - help='Set project-specific options. These are assumed to be raw ' - 'strings, to be shell-escaped as needed. Default: %(default)s.', + help="Set project-specific options. These are assumed to be raw " + "strings, to be shell-escaped as needed. Default: %(default)s.", ) parser.add_argument( - '--shell-quoted-option', nargs=2, metavar=('KEY', 'VALUE'), - action='append', + "--shell-quoted-option", + nargs=2, + metavar=("KEY", "VALUE"), + action="append", default=[ - (k, raw_shell(v)) for k, v in opts.items() - if k not in top_level_opts and isinstance(v, ShellQuoted) + (k, raw_shell(v)) + for k, v in opts.items() + if k not in top_level_opts and isinstance(v, ShellQuoted) ], - help='Set project-specific options. These are assumed to be shell-' - 'quoted, and may be used in commands as-is. Default: %(default)s.', + help="Set project-specific options. These are assumed to be shell-" + "quoted, and may be used in commands as-is. Default: %(default)s.", ) - parser.add_argument('--debug', action='store_true', help='Log more') + parser.add_argument("--debug", action="store_true", help="Log more") args = parser.parse_args() logging.basicConfig( level=logging.DEBUG if args.debug else logging.INFO, - format='%(levelname)s: %(message)s' + format="%(levelname)s: %(message)s", ) # Map command-line args back into opts. - logging.debug('opts before command-line arguments: {0}'.format(opts)) + logging.debug("opts before command-line arguments: {0}".format(opts)) new_opts = {} for key in top_level_opts: @@ -78,6 +85,6 @@ def parse_args_to_fbcode_builder_opts(add_args_fn, top_level_opts, opts, help): for key, val in args.shell_quoted_option: new_opts[key] = ShellQuoted(val) - logging.debug('opts after command-line arguments: {0}'.format(new_opts)) + logging.debug("opts after command-line arguments: {0}".format(new_opts)) return new_opts diff --git a/build/fbcode_builder/shell_builder.py b/build/fbcode_builder/shell_builder.py index cb848490b52c..e0d5429ad42b 100644 --- a/build/fbcode_builder/shell_builder.py +++ b/build/fbcode_builder/shell_builder.py @@ -5,7 +5,7 @@ from __future__ import print_function from __future__ import unicode_literals -''' +""" shell_builder.py allows running the fbcode_builder logic on the host rather than in a container. @@ -17,50 +17,50 @@ cd build python fbcode_builder/shell_builder.py > ~/run.sh bash ~/run.sh -''' +""" -import os import distutils.spawn +import os from fbcode_builder import FBCodeBuilder -from shell_quoting import ( - raw_shell, shell_comment, shell_join, ShellQuoted -) +from shell_quoting import raw_shell, shell_comment, shell_join, ShellQuoted from utils import recursively_flatten_list class ShellFBCodeBuilder(FBCodeBuilder): def _render_impl(self, steps): - return raw_shell(shell_join('\n', recursively_flatten_list(steps))) + return raw_shell(shell_join("\n", recursively_flatten_list(steps))) def set_env(self, key, value): return ShellQuoted("export {key}={val}").format(key=key, val=value) def workdir(self, dir): return [ - ShellQuoted('mkdir -p {d} && cd {d}').format( - d=dir - ), + ShellQuoted("mkdir -p {d} && cd {d}").format(d=dir), ] def run(self, shell_cmd): - return ShellQuoted('{cmd}').format(cmd=shell_cmd) + return ShellQuoted("{cmd}").format(cmd=shell_cmd) def step(self, name, actions): - assert '\n' not in name, 'Name {0} would span > 1 line'.format(name) - b = ShellQuoted('') - return [ShellQuoted('### {0} ###'.format(name)), b] + actions + [b] + assert "\n" not in name, "Name {0} would span > 1 line".format(name) + b = ShellQuoted("") + return [ShellQuoted("### {0} ###".format(name)), b] + actions + [b] def setup(self): - steps = [ - ShellQuoted('set -exo pipefail'), - ] + self.create_python_venv() + self.python_venv() - if self.has_option('ccache_dir'): - ccache_dir = self.option('ccache_dir') + steps = ( + [ + ShellQuoted("set -exo pipefail"), + ] + + self.create_python_venv() + + self.python_venv() + ) + if self.has_option("ccache_dir"): + ccache_dir = self.option("ccache_dir") steps += [ ShellQuoted( # Set CCACHE_DIR before the `ccache` invocations below. - 'export CCACHE_DIR={ccache_dir} ' + "export CCACHE_DIR={ccache_dir} " 'CC="ccache ${{CC:-gcc}}" CXX="ccache ${{CXX:-g++}}"' ).format(ccache_dir=ccache_dir) ] @@ -71,44 +71,44 @@ def comment(self, comment): def copy_local_repo(self, dir, dest_name): return [ - ShellQuoted('cp -r {dir} {dest_name}').format( - dir=dir, - dest_name=dest_name - ), + ShellQuoted("cp -r {dir} {dest_name}").format(dir=dir, dest_name=dest_name), ] def find_project_root(): here = os.path.dirname(os.path.realpath(__file__)) maybe_root = os.path.dirname(os.path.dirname(here)) - if os.path.isdir(os.path.join(maybe_root, '.git')): + if os.path.isdir(os.path.join(maybe_root, ".git")): return maybe_root raise RuntimeError( "I expected shell_builder.py to be in the " - "build/fbcode_builder subdir of a git repo") + "build/fbcode_builder subdir of a git repo" + ) def persistent_temp_dir(repo_root): - escaped = repo_root.replace('/', 'sZs').replace('\\', 'sZs').replace(':', '') - return os.path.join(os.path.expandvars("$HOME"), '.fbcode_builder-' + escaped) + escaped = repo_root.replace("/", "sZs").replace("\\", "sZs").replace(":", "") + return os.path.join(os.path.expandvars("$HOME"), ".fbcode_builder-" + escaped) -if __name__ == '__main__': +if __name__ == "__main__": from utils import read_fbcode_builder_config, build_fbcode_builder_config + repo_root = find_project_root() temp = persistent_temp_dir(repo_root) - config = read_fbcode_builder_config('fbcode_builder_config.py') + config = read_fbcode_builder_config("fbcode_builder_config.py") builder = ShellFBCodeBuilder(projects_dir=temp) - if distutils.spawn.find_executable('ccache'): - builder.add_option('ccache_dir', - os.environ.get('CCACHE_DIR', os.path.join(temp, '.ccache'))) - builder.add_option('prefix', os.path.join(temp, 'installed')) - builder.add_option('make_parallelism', 4) + if distutils.spawn.find_executable("ccache"): + builder.add_option( + "ccache_dir", os.environ.get("CCACHE_DIR", os.path.join(temp, ".ccache")) + ) + builder.add_option("prefix", os.path.join(temp, "installed")) + builder.add_option("make_parallelism", 4) builder.add_option( - '{project}:local_repo_dir'.format(project=config['github_project']), - repo_root) + "{project}:local_repo_dir".format(project=config["github_project"]), repo_root + ) make_steps = build_fbcode_builder_config(config) steps = make_steps(builder) print(builder.render(steps)) diff --git a/build/fbcode_builder/shell_quoting.py b/build/fbcode_builder/shell_quoting.py index f3b968a6db44..7429226bddb4 100644 --- a/build/fbcode_builder/shell_quoting.py +++ b/build/fbcode_builder/shell_quoting.py @@ -4,7 +4,8 @@ from __future__ import division from __future__ import print_function from __future__ import unicode_literals -''' + +""" Almost every FBCodeBuilder string is ultimately passed to a shell. Escaping too little or too much tends to be the most common error. The utilities in @@ -16,15 +17,14 @@ - Use `path_join` to join path components. - Use `shell_join` to join already-quoted command arguments or shell lines. -''' +""" import os - from collections import namedtuple -class ShellQuoted(namedtuple('ShellQuoted', ('do_not_use_raw_str',))): - ''' +class ShellQuoted(namedtuple("ShellQuoted", ("do_not_use_raw_str",))): + """ Wrap a string with this to make it transparent to shell_quote(). It will almost always suffice to use ShellQuoted.format(), path_join(), @@ -32,27 +32,25 @@ class ShellQuoted(namedtuple('ShellQuoted', ('do_not_use_raw_str',))): If you really must, use raw_shell() to access the raw string. - ''' + """ def __new__(cls, s): - 'No need to nest ShellQuoted.' + "No need to nest ShellQuoted." return super(ShellQuoted, cls).__new__( cls, s.do_not_use_raw_str if isinstance(s, ShellQuoted) else s ) def __str__(self): raise RuntimeError( - 'One does not simply convert {0} to a string -- use path_join() ' - 'or ShellQuoted.format() instead'.format(repr(self)) + "One does not simply convert {0} to a string -- use path_join() " + "or ShellQuoted.format() instead".format(repr(self)) ) def __repr__(self): - return '{0}({1})'.format( - self.__class__.__name__, repr(self.do_not_use_raw_str) - ) + return "{0}({1})".format(self.__class__.__name__, repr(self.do_not_use_raw_str)) def format(self, **kwargs): - ''' + """ Use instead of str.format() when the arguments are either `ShellQuoted()` or raw strings needing to be `shell_quote()`d. @@ -60,40 +58,46 @@ def format(self, **kwargs): Positional args are deliberately not supported since they are more error-prone. - ''' - return ShellQuoted(self.do_not_use_raw_str.format(**dict( - (k, shell_quote(v).do_not_use_raw_str) for k, v in kwargs.items() - ))) + """ + return ShellQuoted( + self.do_not_use_raw_str.format( + **dict( + (k, shell_quote(v).do_not_use_raw_str) for k, v in kwargs.items() + ) + ) + ) def shell_quote(s): - 'Quotes a string if it is not already quoted' - return s if isinstance(s, ShellQuoted) \ + "Quotes a string if it is not already quoted" + return ( + s + if isinstance(s, ShellQuoted) else ShellQuoted("'" + str(s).replace("'", "'\\''") + "'") + ) def raw_shell(s): - 'Not a member of ShellQuoted so we get a useful error for raw strings' + "Not a member of ShellQuoted so we get a useful error for raw strings" if isinstance(s, ShellQuoted): return s.do_not_use_raw_str - raise RuntimeError('{0} should have been ShellQuoted'.format(s)) + raise RuntimeError("{0} should have been ShellQuoted".format(s)) def shell_join(delim, it): - 'Joins an iterable of ShellQuoted with a delimiter between each two' + "Joins an iterable of ShellQuoted with a delimiter between each two" return ShellQuoted(delim.join(raw_shell(s) for s in it)) def path_join(*args): - 'Joins ShellQuoted and raw pieces of paths to make a shell-quoted path' - return ShellQuoted(os.path.join(*[ - raw_shell(shell_quote(s)) for s in args - ])) + "Joins ShellQuoted and raw pieces of paths to make a shell-quoted path" + return ShellQuoted(os.path.join(*[raw_shell(shell_quote(s)) for s in args])) def shell_comment(c): - 'Do not shell-escape raw strings in comments, but do handle line breaks.' - return ShellQuoted('# {c}').format(c=ShellQuoted( - (raw_shell(c) if isinstance(c, ShellQuoted) else c) - .replace('\n', '\n# ') - )) + "Do not shell-escape raw strings in comments, but do handle line breaks." + return ShellQuoted("# {c}").format( + c=ShellQuoted( + (raw_shell(c) if isinstance(c, ShellQuoted) else c).replace("\n", "\n# ") + ) + ) diff --git a/build/fbcode_builder/specs/fbthrift.py b/build/fbcode_builder/specs/fbthrift.py index 5a81d9980e6a..f0c7e7ac7c7f 100644 --- a/build/fbcode_builder/specs/fbthrift.py +++ b/build/fbcode_builder/specs/fbthrift.py @@ -15,8 +15,8 @@ def fbcode_builder_spec(builder): return { - 'depends_on': [fmt, folly, fizz, sodium, wangle, zstd], - 'steps': [ - builder.fb_github_cmake_install('fbthrift/thrift'), + "depends_on": [fmt, folly, fizz, sodium, wangle, zstd], + "steps": [ + builder.fb_github_cmake_install("fbthrift/thrift"), ], } diff --git a/build/fbcode_builder/specs/fbzmq.py b/build/fbcode_builder/specs/fbzmq.py index 1f8f2ba405f4..78c8bc9dd97c 100644 --- a/build/fbcode_builder/specs/fbzmq.py +++ b/build/fbcode_builder/specs/fbzmq.py @@ -10,31 +10,40 @@ import specs.folly as folly import specs.gmock as gmock import specs.sodium as sodium - from shell_quoting import ShellQuoted def fbcode_builder_spec(builder): - builder.add_option('zeromq/libzmq:git_hash', 'v4.2.2') + builder.add_option("zeromq/libzmq:git_hash", "v4.2.2") return { - 'depends_on': [fmt, folly, fbthrift, gmock, sodium], - 'steps': [ - builder.github_project_workdir('zeromq/libzmq', '.'), - builder.step('Build and install zeromq/libzmq', [ - builder.run(ShellQuoted('./autogen.sh')), - builder.configure(), - builder.make_and_install(), - ]), - - builder.fb_github_project_workdir('fbzmq/_build', 'facebook'), - builder.step('Build and install fbzmq/', [ - builder.cmake_configure('fbzmq/_build'), - # we need the pythonpath to find the thrift compiler - builder.run(ShellQuoted( - 'PYTHONPATH="$PYTHONPATH:"{p}/lib/python2.7/site-packages ' - 'make -j {n}' - ).format(p=builder.option('prefix'), n=builder.option('make_parallelism'))), - builder.run(ShellQuoted('make install')), - ]), + "depends_on": [fmt, folly, fbthrift, gmock, sodium], + "steps": [ + builder.github_project_workdir("zeromq/libzmq", "."), + builder.step( + "Build and install zeromq/libzmq", + [ + builder.run(ShellQuoted("./autogen.sh")), + builder.configure(), + builder.make_and_install(), + ], + ), + builder.fb_github_project_workdir("fbzmq/_build", "facebook"), + builder.step( + "Build and install fbzmq/", + [ + builder.cmake_configure("fbzmq/_build"), + # we need the pythonpath to find the thrift compiler + builder.run( + ShellQuoted( + 'PYTHONPATH="$PYTHONPATH:"{p}/lib/python2.7/site-packages ' + "make -j {n}" + ).format( + p=builder.option("prefix"), + n=builder.option("make_parallelism"), + ) + ), + builder.run(ShellQuoted("make install")), + ], + ), ], } diff --git a/build/fbcode_builder/specs/fizz.py b/build/fbcode_builder/specs/fizz.py index 5d8e0eff2bc1..f951b156f5e5 100644 --- a/build/fbcode_builder/specs/fizz.py +++ b/build/fbcode_builder/specs/fizz.py @@ -5,9 +5,9 @@ from __future__ import print_function from __future__ import unicode_literals -import specs.gmock as gmock import specs.fmt as fmt import specs.folly as folly +import specs.gmock as gmock import specs.sodium as sodium diff --git a/build/fbcode_builder/specs/fmt.py b/build/fbcode_builder/specs/fmt.py index 9e3a334675f6..3953167995b7 100644 --- a/build/fbcode_builder/specs/fmt.py +++ b/build/fbcode_builder/specs/fmt.py @@ -7,20 +7,20 @@ def fbcode_builder_spec(builder): - builder.add_option('fmtlib/fmt:git_hash', '6.2.1') + builder.add_option("fmtlib/fmt:git_hash", "6.2.1") builder.add_option( - 'fmtlib/fmt:cmake_defines', + "fmtlib/fmt:cmake_defines", { # Avoids a bizarred failure to run tests in Bistro: # test_crontab_selector: error while loading shared libraries: # libfmt.so.6: cannot open shared object file: # No such file or directory - 'BUILD_SHARED_LIBS': 'OFF', - } + "BUILD_SHARED_LIBS": "OFF", + }, ) return { - 'steps': [ - builder.github_project_workdir('fmtlib/fmt', 'build'), - builder.cmake_install('fmtlib/fmt'), + "steps": [ + builder.github_project_workdir("fmtlib/fmt", "build"), + builder.cmake_install("fmtlib/fmt"), ], } diff --git a/build/fbcode_builder/specs/folly.py b/build/fbcode_builder/specs/folly.py index 09e1531c4b8b..e89d5e955e1c 100644 --- a/build/fbcode_builder/specs/folly.py +++ b/build/fbcode_builder/specs/folly.py @@ -11,13 +11,13 @@ def fbcode_builder_spec(builder): return { "depends_on": [fmt], - 'steps': [ + "steps": [ # on macOS the filesystem is typically case insensitive. # We need to ensure that the CWD is not the folly source # dir when we build, otherwise the system will decide # that `folly/String.h` is the file it wants when including # `string.h` and the build will fail. - builder.fb_github_project_workdir('folly/_build'), - builder.cmake_install('facebook/folly'), + builder.fb_github_project_workdir("folly/_build"), + builder.cmake_install("facebook/folly"), ], } diff --git a/build/fbcode_builder/specs/gmock.py b/build/fbcode_builder/specs/gmock.py index 8b0562f7e697..774137301c26 100644 --- a/build/fbcode_builder/specs/gmock.py +++ b/build/fbcode_builder/specs/gmock.py @@ -7,18 +7,18 @@ def fbcode_builder_spec(builder): - builder.add_option('google/googletest:git_hash', 'release-1.8.1') + builder.add_option("google/googletest:git_hash", "release-1.8.1") builder.add_option( - 'google/googletest:cmake_defines', + "google/googletest:cmake_defines", { - 'BUILD_GTEST': 'ON', + "BUILD_GTEST": "ON", # Avoid problems with MACOSX_RPATH - 'BUILD_SHARED_LIBS': 'OFF', - } + "BUILD_SHARED_LIBS": "OFF", + }, ) return { - 'steps': [ - builder.github_project_workdir('google/googletest', 'build'), - builder.cmake_install('google/googletest'), + "steps": [ + builder.github_project_workdir("google/googletest", "build"), + builder.cmake_install("google/googletest"), ], } diff --git a/build/fbcode_builder/specs/mvfst.py b/build/fbcode_builder/specs/mvfst.py index e9213ce43b28..ce8b003d9a91 100644 --- a/build/fbcode_builder/specs/mvfst.py +++ b/build/fbcode_builder/specs/mvfst.py @@ -5,9 +5,9 @@ from __future__ import print_function from __future__ import unicode_literals -import specs.gmock as gmock -import specs.folly as folly import specs.fizz as fizz +import specs.folly as folly +import specs.gmock as gmock def fbcode_builder_spec(builder): diff --git a/build/fbcode_builder/specs/proxygen.py b/build/fbcode_builder/specs/proxygen.py index 28f160f651a6..6a584d71081f 100644 --- a/build/fbcode_builder/specs/proxygen.py +++ b/build/fbcode_builder/specs/proxygen.py @@ -5,10 +5,10 @@ from __future__ import print_function from __future__ import unicode_literals -import specs.gmock as gmock +import specs.fizz as fizz import specs.fmt as fmt import specs.folly as folly -import specs.fizz as fizz +import specs.gmock as gmock import specs.mvfst as mvfst import specs.sodium as sodium import specs.wangle as wangle diff --git a/build/fbcode_builder/specs/proxygen_quic.py b/build/fbcode_builder/specs/proxygen_quic.py index b095c06e10e0..b4959fb89c90 100644 --- a/build/fbcode_builder/specs/proxygen_quic.py +++ b/build/fbcode_builder/specs/proxygen_quic.py @@ -5,10 +5,10 @@ from __future__ import print_function from __future__ import unicode_literals -import specs.gmock as gmock +import specs.fizz as fizz import specs.fmt as fmt import specs.folly as folly -import specs.fizz as fizz +import specs.gmock as gmock import specs.mvfst as mvfst import specs.sodium as sodium import specs.wangle as wangle diff --git a/build/fbcode_builder/specs/re2.py b/build/fbcode_builder/specs/re2.py index b6b81ab94225..cf4e08a0bd9c 100644 --- a/build/fbcode_builder/specs/re2.py +++ b/build/fbcode_builder/specs/re2.py @@ -8,8 +8,8 @@ def fbcode_builder_spec(builder): return { - 'steps': [ - builder.github_project_workdir('google/re2', 'build'), - builder.cmake_install('google/re2'), + "steps": [ + builder.github_project_workdir("google/re2", "build"), + builder.cmake_install("google/re2"), ], } diff --git a/build/fbcode_builder/specs/rocksdb.py b/build/fbcode_builder/specs/rocksdb.py index c7d7c6ac2b29..9ebfe4739424 100644 --- a/build/fbcode_builder/specs/rocksdb.py +++ b/build/fbcode_builder/specs/rocksdb.py @@ -7,10 +7,13 @@ def fbcode_builder_spec(builder): - builder.add_option("rocksdb/_build:cmake_defines", { - "USE_RTTI": "1", - "PORTABLE": "ON", - }) + builder.add_option( + "rocksdb/_build:cmake_defines", + { + "USE_RTTI": "1", + "PORTABLE": "ON", + }, + ) return { "steps": [ builder.fb_github_cmake_install("rocksdb/_build"), diff --git a/build/fbcode_builder/specs/sodium.py b/build/fbcode_builder/specs/sodium.py index 52bb0006ec64..8be9833cfe4e 100644 --- a/build/fbcode_builder/specs/sodium.py +++ b/build/fbcode_builder/specs/sodium.py @@ -9,14 +9,17 @@ def fbcode_builder_spec(builder): - builder.add_option('jedisct1/libsodium:git_hash', 'stable') + builder.add_option("jedisct1/libsodium:git_hash", "stable") return { - 'steps': [ - builder.github_project_workdir('jedisct1/libsodium', '.'), - builder.step('Build and install jedisct1/libsodium', [ - builder.run(ShellQuoted('./autogen.sh')), - builder.configure(), - builder.make_and_install(), - ]), + "steps": [ + builder.github_project_workdir("jedisct1/libsodium", "."), + builder.step( + "Build and install jedisct1/libsodium", + [ + builder.run(ShellQuoted("./autogen.sh")), + builder.configure(), + builder.make_and_install(), + ], + ), ], } diff --git a/build/fbcode_builder/specs/wangle.py b/build/fbcode_builder/specs/wangle.py index db1c5fc1d11a..62b5b3c867ce 100644 --- a/build/fbcode_builder/specs/wangle.py +++ b/build/fbcode_builder/specs/wangle.py @@ -5,10 +5,10 @@ from __future__ import print_function from __future__ import unicode_literals -import specs.gmock as gmock +import specs.fizz as fizz import specs.fmt as fmt import specs.folly as folly -import specs.fizz as fizz +import specs.gmock as gmock import specs.sodium as sodium diff --git a/build/fbcode_builder/specs/zstd.py b/build/fbcode_builder/specs/zstd.py index d24385dd7dbb..14d9a1249d0c 100644 --- a/build/fbcode_builder/specs/zstd.py +++ b/build/fbcode_builder/specs/zstd.py @@ -11,16 +11,21 @@ def fbcode_builder_spec(builder): # This API should change rarely, so build the latest tag instead of master. builder.add_option( - 'facebook/zstd:git_hash', - ShellQuoted('$(git describe --abbrev=0 --tags origin/master)') + "facebook/zstd:git_hash", + ShellQuoted("$(git describe --abbrev=0 --tags origin/master)"), ) return { - 'steps': [ - builder.github_project_workdir('facebook/zstd', '.'), - builder.step('Build and install zstd', [ - builder.make_and_install(make_vars={ - 'PREFIX': builder.option('prefix'), - }) - ]), + "steps": [ + builder.github_project_workdir("facebook/zstd", "."), + builder.step( + "Build and install zstd", + [ + builder.make_and_install( + make_vars={ + "PREFIX": builder.option("prefix"), + } + ) + ], + ), ], } diff --git a/build/fbcode_builder/utils.py b/build/fbcode_builder/utils.py index bdf7b01d52d9..02459a200d4b 100644 --- a/build/fbcode_builder/utils.py +++ b/build/fbcode_builder/utils.py @@ -4,7 +4,8 @@ from __future__ import division from __future__ import print_function from __future__ import unicode_literals -'Miscellaneous utility functions.' + +"Miscellaneous utility functions." import itertools import logging @@ -12,21 +13,19 @@ import shutil import subprocess import sys - from contextlib import contextmanager def recursively_flatten_list(l): return itertools.chain.from_iterable( - (recursively_flatten_list(i) if type(i) is list else (i,)) - for i in l + (recursively_flatten_list(i) if type(i) is list else (i,)) for i in l ) def run_command(*cmd, **kwargs): - 'The stdout of most fbcode_builder utilities is meant to be parsed.' - logging.debug('Running: {0} with {1}'.format(cmd, kwargs)) - kwargs['stdout'] = sys.stderr + "The stdout of most fbcode_builder utilities is meant to be parsed." + logging.debug("Running: {0} with {1}".format(cmd, kwargs)) + kwargs["stdout"] = sys.stderr subprocess.check_call(cmd, **kwargs) @@ -40,13 +39,13 @@ def make_temp_dir(d): def _inner_read_config(path): - ''' + """ Helper to read a named config file. The grossness with the global is a workaround for this python bug: https://bugs.python.org/issue21591 The bug prevents us from defining either a local function or a lambda in the scope of read_fbcode_builder_config below. - ''' + """ global _project_dir full_path = os.path.join(_project_dir, path) return read_fbcode_builder_config(full_path) @@ -60,37 +59,37 @@ def read_fbcode_builder_config(filename): global _project_dir _project_dir = os.path.dirname(filename) - scope = {'read_fbcode_builder_config': _inner_read_config} + scope = {"read_fbcode_builder_config": _inner_read_config} with open(filename) as config_file: - code = compile(config_file.read(), filename, mode='exec') + code = compile(config_file.read(), filename, mode="exec") exec(code, scope) - return scope['config'] + return scope["config"] def steps_for_spec(builder, spec, processed_modules=None): - ''' + """ Sets `builder` configuration, and returns all the builder steps necessary to build `spec` and its dependencies. Traverses the dependencies in depth-first order, honoring the sequencing in each 'depends_on' list. - ''' + """ if processed_modules is None: processed_modules = set() steps = [] - for module in spec.get('depends_on', []): + for module in spec.get("depends_on", []): if module not in processed_modules: processed_modules.add(module) - steps.extend(steps_for_spec( - builder, - module.fbcode_builder_spec(builder), - processed_modules - )) - steps.extend(spec.get('steps', [])) + steps.extend( + steps_for_spec( + builder, module.fbcode_builder_spec(builder), processed_modules + ) + ) + steps.extend(spec.get("steps", [])) return steps def build_fbcode_builder_config(config): return lambda builder: builder.build( - steps_for_spec(builder, config['fbcode_builder_spec'](builder)) + steps_for_spec(builder, config["fbcode_builder_spec"](builder)) ) From c69abd69dcdf3bdc5e2ab320a44233b414f7e951 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 9 Jul 2021 06:57:44 -0700 Subject: [PATCH 0160/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/e053fa4f5c276b58dccc5932adba55f160cb10f0 https://github.com/facebook/fbthrift/commit/101dc747949e3be57f3ed2bce45cfaee821053a8 https://github.com/facebook/fbzmq/commit/8ddfe3b9940e8aa7126cd0b779bee400b26e4fe7 https://github.com/facebook/folly/commit/40803d695d1a5004739fbac91a62ffed3884e5e5 https://github.com/facebook/proxygen/commit/40b6e08b08217a6dab4306144a66ced14754c2a9 https://github.com/facebook/wangle/commit/ac833d3f2c4bbcf2ae97bca062f2cd2c14301c4c https://github.com/facebook/watchman/commit/b2a98f539b07cf7a838ad6a7d9d9b77d221e3494 https://github.com/facebookexperimental/rust-shed/commit/d34c215be3a097ffbc01e8d3631e4cdb5295541c https://github.com/facebookincubator/fizz/commit/91d093ced59d0f2dd4c74ee2719acf02d5be0814 https://github.com/facebookincubator/katran/commit/ca5c8d4ce794e03cadab5d7f4f449e0f06eccfd7 https://github.com/facebookincubator/mvfst/commit/2790a09266bc163022b411550306ec004da80546 https://github.com/pytorch/fbgemm/commit/18710ba80f13f39fb092f0a62b947fe2a2663915 https://github.com/rsocket/rsocket-cpp/commit/d098d204ff3524d5b6bbf14c4f44869457617c09 Reviewed By: bigfootjon fbshipit-source-id: d6b1bc9833581e5faa0c6ad84bfe5f40756842a6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 92d4d6013e07..5d2e32b106ea 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d499fd0937f7dddf03c262b51eb0a0b8f8ca6e57 +Subproject commit 101dc747949e3be57f3ed2bce45cfaee821053a8 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 20fbff0426a6..e84376b8fb2d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c2ea37612a79d7017db330e47cc0773423bef315 +Subproject commit 40803d695d1a5004739fbac91a62ffed3884e5e5 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 24de195761f1..3b5013e308fa 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8340e8466de15b8d979340daec91b92458c200a2 +Subproject commit ac833d3f2c4bbcf2ae97bca062f2cd2c14301c4c From bc6ac11dfdceaa1e07b39eba6b205c52a3ee49b1 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 9 Jul 2021 07:39:40 -0700 Subject: [PATCH 0161/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/0c5df4ce29b393f5ce0fef6c8cc968cadf2c3420 https://github.com/facebook/fbthrift/commit/19772a4d457d5bda23e7a2b6f537720d27b4e401 https://github.com/facebook/fbzmq/commit/496bf18dcb93709245a320e5f7ce38c21f59ebfe https://github.com/facebook/proxygen/commit/fe28f3ba1ce4081abedec688bf1128dfe5ab1b88 https://github.com/facebook/wangle/commit/e27bc4b812a271849e9a8884eea09cede8319107 https://github.com/facebook/watchman/commit/c69abd69dcdf3bdc5e2ab320a44233b414f7e951 https://github.com/facebookexperimental/rust-shed/commit/83bf1ab3519bc7a25a6a64a30e0bc36083f4f030 https://github.com/facebookincubator/fizz/commit/cfa5a7f8072ab05abb2dc5afe65f4b217ba6b34f https://github.com/facebookincubator/katran/commit/b539a3c758f240fc5bb7ad63a66a354b1869e623 https://github.com/facebookincubator/mvfst/commit/e7e66a5ba43d5dfa5fd4dfb4023c57cec0ac2d8c https://github.com/rsocket/rsocket-cpp/commit/e7559d8600f6430a324338aaf102177925564406 Reviewed By: bigfootjon fbshipit-source-id: 33147bf486a1d186ebfedf8aa110856994c3dffc --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5d2e32b106ea..a776dafd801a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 101dc747949e3be57f3ed2bce45cfaee821053a8 +Subproject commit 19772a4d457d5bda23e7a2b6f537720d27b4e401 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3b5013e308fa..5f2446bf0b85 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ac833d3f2c4bbcf2ae97bca062f2cd2c14301c4c +Subproject commit e27bc4b812a271849e9a8884eea09cede8319107 From a071eb515809b28cdf42d462a09c6cf92cc7ca95 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 9 Jul 2021 08:40:19 -0700 Subject: [PATCH 0162/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/44d757f2a52cb80213a92982ea84fe31a7b405a1 https://github.com/facebook/fbthrift/commit/b0a7a48eec947837d03a25c608faf97253eea7c8 https://github.com/facebook/fbzmq/commit/3db00afd58d085efe145a2015822afb7124f45fd https://github.com/facebook/litho/commit/4f19da0f5a09bd32b19287b5a2068536dd76dbec https://github.com/facebook/proxygen/commit/b51d20bfc9c49418e272af49673e232d0448f21e https://github.com/facebook/wangle/commit/a50fcab358f394742c2dd0a524792b161141cfa4 https://github.com/facebook/watchman/commit/bc6ac11dfdceaa1e07b39eba6b205c52a3ee49b1 https://github.com/facebookexperimental/rust-shed/commit/78d9568dd6df34c42a9cd3f4d63d9f754a34f8ad https://github.com/facebookincubator/katran/commit/396d82d04ba7d29c37db80fc38aaf6f34bd63da2 https://github.com/facebookincubator/mvfst/commit/b090919185665b89fb3040b3220be1142c6f19b5 Reviewed By: bigfootjon fbshipit-source-id: 03e8589843bfb5deff90c2ba34a502730e57d2d6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a776dafd801a..edeb3f140c98 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 19772a4d457d5bda23e7a2b6f537720d27b4e401 +Subproject commit b0a7a48eec947837d03a25c608faf97253eea7c8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5f2446bf0b85..0040cd1cb019 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e27bc4b812a271849e9a8884eea09cede8319107 +Subproject commit a50fcab358f394742c2dd0a524792b161141cfa4 From b1059355ad3d37ae4f7c396402ea410214365706 Mon Sep 17 00:00:00 2001 From: Fred Emmott Date: Fri, 9 Jul 2021 09:32:59 -0700 Subject: [PATCH 0163/7387] Mark zstd as a dependency of fizz Summary: I don't understand why we have both manifests/specs; I was assuming one was generated from the other, but I don't see a at-generated and grep doesn't show up anything, so both are manual edits. Reviewed By: iahs Differential Revision: D29524000 fbshipit-source-id: 5f6df62f0162ea24a9903bedf5d220eab5c2dff1 --- build/fbcode_builder/manifests/fizz | 1 + build/fbcode_builder/specs/fizz.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/fbcode_builder/manifests/fizz b/build/fbcode_builder/manifests/fizz index da54b1119a8f..72f29973f10d 100644 --- a/build/fbcode_builder/manifests/fizz +++ b/build/fbcode_builder/manifests/fizz @@ -26,6 +26,7 @@ BUILD_TESTS = OFF [dependencies] folly libsodium +zstd [dependencies.all(test=on, not(os=windows))] googletest_1_8 diff --git a/build/fbcode_builder/specs/fizz.py b/build/fbcode_builder/specs/fizz.py index f951b156f5e5..723096fbf7b7 100644 --- a/build/fbcode_builder/specs/fizz.py +++ b/build/fbcode_builder/specs/fizz.py @@ -9,7 +9,7 @@ import specs.folly as folly import specs.gmock as gmock import specs.sodium as sodium - +import specs.zstd as zstd def fbcode_builder_spec(builder): builder.add_option( @@ -22,7 +22,7 @@ def fbcode_builder_spec(builder): }, ) return { - "depends_on": [gmock, fmt, folly, sodium], + "depends_on": [gmock, fmt, folly, sodium, zstd], "steps": [ builder.fb_github_cmake_install( "fizz/fizz/build", github_org="facebookincubator" From f949714ac400333f74330835ae7ecb768c735903 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 9 Jul 2021 09:44:28 -0700 Subject: [PATCH 0164/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/83ae662219660d30b49ad8474f5c63bbfc6d5f6f https://github.com/facebook/fbthrift/commit/4e11f6e2472603941a51f265188636459af7514f https://github.com/facebook/fbzmq/commit/a2acf10125c66eda7f930d512a369a371117aae6 https://github.com/facebook/proxygen/commit/f89cc1400815a5b11fabd3f0e88e9f580c6e6a41 https://github.com/facebook/watchman/commit/a071eb515809b28cdf42d462a09c6cf92cc7ca95 https://github.com/facebookexperimental/rust-shed/commit/553d8cc0fcf4b978faa91ab15f7083ea3be5ff61 Reviewed By: bigfootjon fbshipit-source-id: ed6d071eaf1815210fd2150c56be0afde2d0a2ce --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index edeb3f140c98..b5423e5fcaf1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b0a7a48eec947837d03a25c608faf97253eea7c8 +Subproject commit 4e11f6e2472603941a51f265188636459af7514f From b53c15cd25b7ed161c77ed9fc4d6b2db87d21fd3 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 9 Jul 2021 12:42:58 -0700 Subject: [PATCH 0165/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/74fe9b3cffd265d5416f29497a1536685b3493eb https://github.com/facebook/fbthrift/commit/b581bd6ec73e83bb10f27ae2e38ab43837c2b139 https://github.com/facebook/fbzmq/commit/26016e9eaaa677e35fa28b6289cd7c5cbd2c186f https://github.com/facebook/folly/commit/a405d073069a6e41fc58f3762bc94cc9c50bcb06 https://github.com/facebook/litho/commit/5c5498cf2aafed49808fcfe234f0cbba8d8f2638 https://github.com/facebook/proxygen/commit/5537c0f30224a81c4d425fbbfb62c1168a555c44 https://github.com/facebook/wangle/commit/3ea0766eb25b000e870afd810360357d21c7bdc5 https://github.com/facebook/watchman/commit/f949714ac400333f74330835ae7ecb768c735903 https://github.com/facebookexperimental/rust-shed/commit/c9b5f0a335b5542c676a02731a0e9b20acbdbd1d https://github.com/facebookincubator/fizz/commit/32ad80d0ceb9b2bd3771afd1a688ffdd99ef5fff https://github.com/facebookincubator/katran/commit/a601088157f044c7d14bee0788931e10e5da42b7 https://github.com/facebookincubator/mvfst/commit/6ad6a9374569338897ecee84da29f0d37f2cfd82 https://github.com/pytorch/fbgemm/commit/40cb9fecf00009a95c4733d32f2893b14568a5bd https://github.com/rsocket/rsocket-cpp/commit/02180890b3b137c1b04e947b735d24638d631b3d Reviewed By: bigfootjon fbshipit-source-id: 1bfd7633d9b4221d8c7890df548b05873a1a92ea --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b5423e5fcaf1..620a679450a3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4e11f6e2472603941a51f265188636459af7514f +Subproject commit b581bd6ec73e83bb10f27ae2e38ab43837c2b139 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e84376b8fb2d..85a1c0aafaf7 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 40803d695d1a5004739fbac91a62ffed3884e5e5 +Subproject commit a405d073069a6e41fc58f3762bc94cc9c50bcb06 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0040cd1cb019..7ab0c72f604c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a50fcab358f394742c2dd0a524792b161141cfa4 +Subproject commit 3ea0766eb25b000e870afd810360357d21c7bdc5 From ce09d8e29aa208068e45a437bf54aa05130f9e0c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 9 Jul 2021 14:01:32 -0700 Subject: [PATCH 0166/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/0da726204cf560cad57c21fbd1e4c5cb3fb612f6 https://github.com/facebook/fbthrift/commit/b6ff3f12275c74439a18963cba4665b7fcb3b6de https://github.com/facebook/fbzmq/commit/509cf6ceb9ef72cdc7b567c3a0993f290fe9cb01 https://github.com/facebook/proxygen/commit/70eff75632d9566eec2d0033fc59eaa6edbe37b1 https://github.com/facebook/wangle/commit/d2f4cdb6bc8256a042f475562fb5bea9d3f4afd7 https://github.com/facebook/watchman/commit/b53c15cd25b7ed161c77ed9fc4d6b2db87d21fd3 https://github.com/facebookexperimental/rust-shed/commit/97c26a1df4b36d5b2b8854f64fdd384ae0f47512 https://github.com/facebookexternal/stl_tasks/commit/5dd4434031631b2911ac5aaad41ef57e6b8e0a94 https://github.com/facebookincubator/fizz/commit/81ced2d7baf22109de451274f32fe942c1f23cb4 https://github.com/facebookincubator/katran/commit/a8dd73bf8e3f8814fdfbe7eb089034d86aadd7d8 https://github.com/facebookincubator/mvfst/commit/4efb972d71215fccb4de324d2c1ace7e22313cb1 https://github.com/rsocket/rsocket-cpp/commit/01f0adb7583384678bba5c038c889aa1aa9aa705 Reviewed By: bigfootjon fbshipit-source-id: 0e8875886d7dfd79cc536c34c68bf4f08ab561a3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 620a679450a3..9d9dc2ab4ae7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b581bd6ec73e83bb10f27ae2e38ab43837c2b139 +Subproject commit b6ff3f12275c74439a18963cba4665b7fcb3b6de diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7ab0c72f604c..13a2d9bdb2f3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3ea0766eb25b000e870afd810360357d21c7bdc5 +Subproject commit d2f4cdb6bc8256a042f475562fb5bea9d3f4afd7 From 4a567e95ac9bfb6e998887bd454e1bbe2baf0a96 Mon Sep 17 00:00:00 2001 From: Mingtao Yang Date: Fri, 9 Jul 2021 14:18:05 -0700 Subject: [PATCH 0167/7387] Move FindZstd.cmake into fbcode_builder Summary: A bunch of existing projects vendor it into their own CMake folder. But these same projects also have fbcode_builder's CMake directory in their CMAKE_MODULE_PATH, so move FindZstd here. Differential Revision: D29637686 fbshipit-source-id: 805676e18f98ef217dea8511d039edc38771b529 --- build/fbcode_builder/CMake/FindZstd.cmake | 41 +++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 build/fbcode_builder/CMake/FindZstd.cmake diff --git a/build/fbcode_builder/CMake/FindZstd.cmake b/build/fbcode_builder/CMake/FindZstd.cmake new file mode 100644 index 000000000000..89300ddfd398 --- /dev/null +++ b/build/fbcode_builder/CMake/FindZstd.cmake @@ -0,0 +1,41 @@ +# Copyright (c) Facebook, Inc. and its affiliates. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# +# - Try to find Facebook zstd library +# This will define +# ZSTD_FOUND +# ZSTD_INCLUDE_DIR +# ZSTD_LIBRARY +# + +find_path(ZSTD_INCLUDE_DIR NAMES zstd.h) + +find_library(ZSTD_LIBRARY_DEBUG NAMES zstdd zstd_staticd) +find_library(ZSTD_LIBRARY_RELEASE NAMES zstd zstd_static) + +include(SelectLibraryConfigurations) +SELECT_LIBRARY_CONFIGURATIONS(ZSTD) + +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS( + ZSTD DEFAULT_MSG + ZSTD_LIBRARY ZSTD_INCLUDE_DIR +) + +if (ZSTD_FOUND) + message(STATUS "Found Zstd: ${ZSTD_LIBRARY}") +endif() + +mark_as_advanced(ZSTD_INCLUDE_DIR ZSTD_LIBRARY) From 8f204570c9d098b74c7280a4d984ee71870a2157 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 9 Jul 2021 15:14:10 -0700 Subject: [PATCH 0168/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/e1274139a942b7ba6a35c32007e29adaafe6ee40 https://github.com/facebook/fbthrift/commit/bd31299ba13eaf6115db4a390e104beb6d87f599 https://github.com/facebook/fbzmq/commit/7c82c05e1acb36a785f33c66480cc698116a1a20 https://github.com/facebook/folly/commit/427077374736415f4eb6c497f9172ae9e4a9f1d7 https://github.com/facebook/proxygen/commit/c336c5b1f96190cfe10528819b5db8dde5ee6850 https://github.com/facebook/wangle/commit/df0811ad526052279a4c3388bbf56137d47953b3 https://github.com/facebook/watchman/commit/4a567e95ac9bfb6e998887bd454e1bbe2baf0a96 https://github.com/facebookexperimental/rust-shed/commit/3584bba982eef179d94fa21e24ba5e477061efc2 https://github.com/facebookexternal/stl_tasks/commit/d51395b9b23826a5d245ad08fab9935dcea40f7f https://github.com/facebookincubator/fizz/commit/38cefa8c5b3fe2267c570db7312272a2e29756ec https://github.com/facebookincubator/katran/commit/219cd409947ca297c5d136bef46ee3ece26f25fd https://github.com/facebookincubator/mvfst/commit/613ec89e84fc35faf11976818d8eb2435da685f4 https://github.com/rsocket/rsocket-cpp/commit/c6b9a12ccb8a370a400302227f902d1e4ff79f5c Reviewed By: bigfootjon fbshipit-source-id: 930e1f9c210aeebfe3d980565f3f3f2d69e94227 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9d9dc2ab4ae7..f2363600a19e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b6ff3f12275c74439a18963cba4665b7fcb3b6de +Subproject commit bd31299ba13eaf6115db4a390e104beb6d87f599 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 85a1c0aafaf7..f59d6977be44 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a405d073069a6e41fc58f3762bc94cc9c50bcb06 +Subproject commit 427077374736415f4eb6c497f9172ae9e4a9f1d7 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 13a2d9bdb2f3..6b5de2eb2280 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d2f4cdb6bc8256a042f475562fb5bea9d3f4afd7 +Subproject commit df0811ad526052279a4c3388bbf56137d47953b3 From 79fc63e622b6c1a57071a0e9d87b8e5e67c6a4c3 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 9 Jul 2021 15:57:35 -0700 Subject: [PATCH 0169/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/0649f491e8bacd08a15d0c4d36d5e855cc2f05d5 https://github.com/facebook/fbthrift/commit/c0d0b116102683f3eed59c6f3e62a46031d30993 https://github.com/facebook/fbzmq/commit/266b8361d442f651d0b9276fae5ed1b493c9c4fd https://github.com/facebook/proxygen/commit/85cb7f1442a31d586efb79635fe7503b1ed71589 https://github.com/facebook/wangle/commit/68477a2ee3c7850e3b235c91c12e103849e1d74e https://github.com/facebook/watchman/commit/8f204570c9d098b74c7280a4d984ee71870a2157 https://github.com/facebookexperimental/rust-shed/commit/aea89926426ef6208365fbbea561720fec3a79ff https://github.com/facebookincubator/fizz/commit/4c822a44a7c6799796482c96bfc383b42915ddca https://github.com/facebookincubator/katran/commit/40c2b4b01266f1467d3a853ab36820a84dbe37e7 https://github.com/facebookincubator/mvfst/commit/bdad8aa58650fe16e39c11f6394cdd9ef0465f94 https://github.com/pytorch/kineto/commit/dbfa0ead96612f7ca265c63a35fdf0488395179b https://github.com/rsocket/rsocket-cpp/commit/73cbdae9f320fc4eb402e83873a4f1183c91c9e0 Reviewed By: bigfootjon fbshipit-source-id: 6f370ecceb81c51ba03955d793fc9370f996495a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f2363600a19e..76fbc938e6d5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bd31299ba13eaf6115db4a390e104beb6d87f599 +Subproject commit c0d0b116102683f3eed59c6f3e62a46031d30993 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6b5de2eb2280..5e9e50982b8f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit df0811ad526052279a4c3388bbf56137d47953b3 +Subproject commit 68477a2ee3c7850e3b235c91c12e103849e1d74e From 4144e8e07a521b69aac53155702256429d36b143 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 9 Jul 2021 16:47:53 -0700 Subject: [PATCH 0170/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/71db4d921aa148624140354e4a8037966cdee141 https://github.com/facebook/fbthrift/commit/e7ae227d02af1234e7f27d47f0b40b001a52e5c8 https://github.com/facebook/fbzmq/commit/f7c9add74c3fcc4bd108eea594f0d7ebe468447d https://github.com/facebook/proxygen/commit/f99a2f10bbded83e723f4c16e04560afb8977f3a https://github.com/facebook/rocksdb/commit/bb485e986a1ca782cfd87b9f6c0f800346c85a30 https://github.com/facebook/wangle/commit/3e417ed5b743f645eef221e01ee8b685596e612c https://github.com/facebook/watchman/commit/79fc63e622b6c1a57071a0e9d87b8e5e67c6a4c3 https://github.com/facebookexperimental/rust-shed/commit/e612fa7a8f6f091b8247185c420af66cd9a35359 https://github.com/facebookincubator/katran/commit/2f977bd3d40d3d015b65fc057e64ab55e4a350f8 https://github.com/facebookincubator/mvfst/commit/8464a4ffc379cfd21aa0d3dae2bf46a66e9a037f Reviewed By: bigfootjon fbshipit-source-id: 09e516189e8733c931ace1cba6904eb8cb0dbadd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 76fbc938e6d5..cae6246112fa 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c0d0b116102683f3eed59c6f3e62a46031d30993 +Subproject commit e7ae227d02af1234e7f27d47f0b40b001a52e5c8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5e9e50982b8f..446968c2d703 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 68477a2ee3c7850e3b235c91c12e103849e1d74e +Subproject commit 3e417ed5b743f645eef221e01ee8b685596e612c From 06ebccbca42ded3732f159f2f16c0d686b3eff57 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 9 Jul 2021 17:44:44 -0700 Subject: [PATCH 0171/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/1c16848d7c7d30d51c5450fbb420403feb72580a https://github.com/facebook/fbthrift/commit/a261957e0ecc36456f8ccc8538b3c090572c2b06 https://github.com/facebook/fbzmq/commit/3f6ae9cf5acaff8a19a71201a14cdea76b5f2195 https://github.com/facebook/proxygen/commit/c2bb40d00be20fea5af0308dd857bfc27ee2d6b9 https://github.com/facebook/rocksdb/commit/837705ad8011e249d5e96ff5ae98f6e9efa61ecb https://github.com/facebook/watchman/commit/4144e8e07a521b69aac53155702256429d36b143 https://github.com/facebookexperimental/rust-shed/commit/c67200d82322d52ce16566038964c00fb916534c Reviewed By: bigfootjon fbshipit-source-id: 1499a65607fdc448c6ae5887766e952a37d4e9d0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cae6246112fa..3dd7d21deef9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e7ae227d02af1234e7f27d47f0b40b001a52e5c8 +Subproject commit a261957e0ecc36456f8ccc8538b3c090572c2b06 From 63a235396369eb3dd6938ceac54e1ff635056c92 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 9 Jul 2021 18:51:31 -0700 Subject: [PATCH 0172/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/de00cdb7509534105c2a15918b756201302693ef https://github.com/facebook/fbthrift/commit/05b232e33bb0c65bc25fce61b634f6f6372b0f84 https://github.com/facebook/fbzmq/commit/f60ff4581d54790d67a49fe3ba248bbf96e94866 https://github.com/facebook/watchman/commit/06ebccbca42ded3732f159f2f16c0d686b3eff57 https://github.com/facebookexperimental/rust-shed/commit/4606ed56438b97b906485ae83d87cd8e962d046e Reviewed By: bigfootjon fbshipit-source-id: 7425bd35e3dfb4aad065c3aa2c95a02f6f72c6b7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3dd7d21deef9..c1e2c5460742 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a261957e0ecc36456f8ccc8538b3c090572c2b06 +Subproject commit 05b232e33bb0c65bc25fce61b634f6f6372b0f84 From 20ace6a135345e30e98c1dd2b9e9940c9873edf6 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 9 Jul 2021 20:15:42 -0700 Subject: [PATCH 0173/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/cf751f07e27dc4675b28cdee7287413d88b3c010 https://github.com/facebook/fbthrift/commit/5166ccb1b193ae299beb697b4534faa0274f659c https://github.com/facebook/fbzmq/commit/eaab4bafa70a6e056b218e9b1deb5167f2d9c336 https://github.com/facebook/watchman/commit/63a235396369eb3dd6938ceac54e1ff635056c92 https://github.com/facebookexperimental/rust-shed/commit/455c9907c1a279014f88c5e9a1ce772178530468 Reviewed By: bigfootjon fbshipit-source-id: 6e694daf361b9a41e5b3053739a90ff980543776 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c1e2c5460742..49882899f544 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 05b232e33bb0c65bc25fce61b634f6f6372b0f84 +Subproject commit 5166ccb1b193ae299beb697b4534faa0274f659c From 7574750e759ce4e6707eb5a7221016ff1d33b72b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 9 Jul 2021 20:43:16 -0700 Subject: [PATCH 0174/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/6f9ea4b4b7dd49a21180eb34b4d130a9899d8db1 https://github.com/facebook/fbthrift/commit/6f69bfcbafec0ce5fd8a740a6818f3c72f2238bd https://github.com/facebook/fbzmq/commit/f3e7cf6a6ad04bc8cb1b85ba3baa728ca27ff31b https://github.com/facebook/watchman/commit/20ace6a135345e30e98c1dd2b9e9940c9873edf6 https://github.com/facebookexperimental/rust-shed/commit/e63287a8901b721796fdd7f78c5ce633958de19e Reviewed By: bigfootjon fbshipit-source-id: 7537dfb9e28e7cb8df4d0b085e6026d4f395308d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 49882899f544..477586fa83c6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5166ccb1b193ae299beb697b4534faa0274f659c +Subproject commit 6f69bfcbafec0ce5fd8a740a6818f3c72f2238bd From 5599a74b4ae46b87d4a8cc621356ce3d58a63aff Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 9 Jul 2021 23:10:20 -0700 Subject: [PATCH 0175/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/465e1df1b0e60a3c34f7325232ecbf70c0fa3e23 Reviewed By: bigfootjon fbshipit-source-id: ee2bba80591473a4bdae2983ffbc53819eace4d4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 477586fa83c6..cb0595b2e97c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6f69bfcbafec0ce5fd8a740a6818f3c72f2238bd +Subproject commit 465e1df1b0e60a3c34f7325232ecbf70c0fa3e23 From 17744957768510bdb32965562379597a023e205a Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Sat, 10 Jul 2021 04:46:00 -0700 Subject: [PATCH 0176/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/4a79240cc5dc2783334329f0b255886493d2c20d Reviewed By: bigfootjon fbshipit-source-id: ccb59bd1c87326795ec3609c4df5f12deaaba007 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cb0595b2e97c..3800818fba4b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 465e1df1b0e60a3c34f7325232ecbf70c0fa3e23 +Subproject commit 4a79240cc5dc2783334329f0b255886493d2c20d From 69353459aad1b58cd0792dc7bb3bfe0e0179d412 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Sat, 10 Jul 2021 13:15:39 -0700 Subject: [PATCH 0177/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/da31071c83aa30c3221769e6a18300870e6f9028 Reviewed By: bigfootjon fbshipit-source-id: 4434586a17e75c0ac25f431d4740af4058d93ce9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3800818fba4b..c2d5f34e9e91 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4a79240cc5dc2783334329f0b255886493d2c20d +Subproject commit da31071c83aa30c3221769e6a18300870e6f9028 From c635e2302f337d7e9802965a9a0c8a4925bb7eb8 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Sun, 11 Jul 2021 16:49:26 -0700 Subject: [PATCH 0178/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/faeb22efa9ed948e6096e37e65e6d121c83e329a Reviewed By: 2d2d2d2d2d fbshipit-source-id: ae8c24d9752fc859358311ee91a9d12653210c44 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c2d5f34e9e91..b745d5573470 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit da31071c83aa30c3221769e6a18300870e6f9028 +Subproject commit faeb22efa9ed948e6096e37e65e6d121c83e329a From 879d03bdac2fbe2d62c4a3e68b26fdbc862f9a1e Mon Sep 17 00:00:00 2001 From: CodemodService Bot <> Date: Mon, 12 Jul 2021 04:13:39 -0700 Subject: [PATCH 0179/7387] Daily `arc lint --take BLACK` Reviewed By: zertosh Differential Revision: D29656934 fbshipit-source-id: c40bbc8e4512b145050ee47db2c8dc781f3c36e9 --- build/fbcode_builder/specs/fizz.py | 1 + 1 file changed, 1 insertion(+) diff --git a/build/fbcode_builder/specs/fizz.py b/build/fbcode_builder/specs/fizz.py index 723096fbf7b7..82f26e67c4f0 100644 --- a/build/fbcode_builder/specs/fizz.py +++ b/build/fbcode_builder/specs/fizz.py @@ -11,6 +11,7 @@ import specs.sodium as sodium import specs.zstd as zstd + def fbcode_builder_spec(builder): builder.add_option( "fizz/fizz/build:cmake_defines", From 4d0a62cb7fc57126078be2e038011d5eee6da79a Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 12 Jul 2021 04:33:49 -0700 Subject: [PATCH 0180/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/53a71e424f7ed078955e963f1c6df2ac252cb913 https://github.com/facebook/fbthrift/commit/63edd495cfcd7c2564824e7f70dab5eb178c8449 https://github.com/facebook/fbzmq/commit/b7aa110321b6a56c51b11911efb48c7bc7ea8ed6 https://github.com/facebook/folly/commit/367f28b774dc7af5a612a9e37fe5ce74006508f6 https://github.com/facebook/proxygen/commit/3520e5442211e900f00ed4a1ae02c0849ed1ae2a https://github.com/facebook/wangle/commit/e5f38482eb0b5c84e2c663fcbdea4992fec57778 https://github.com/facebook/watchman/commit/879d03bdac2fbe2d62c4a3e68b26fdbc862f9a1e https://github.com/facebookexperimental/rust-shed/commit/acf84fadf50318b48badd007f9a8f97bb21ae7a7 https://github.com/facebookincubator/fizz/commit/a05d2625762723667eb32a6215ecf95ed87946bb https://github.com/facebookincubator/katran/commit/2be188992d5aac7b8f3cda10123be910ffccd90e https://github.com/facebookincubator/mvfst/commit/09e5469490195c2644164fdca38bcab71b420235 https://github.com/rsocket/rsocket-cpp/commit/9925279a1401749372459e7d1e079ce2e18869f2 Reviewed By: 2d2d2d2d2d fbshipit-source-id: a79e8fa6e09c7d76974191a8643623caf2fa5e6d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b745d5573470..d590c28da544 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit faeb22efa9ed948e6096e37e65e6d121c83e329a +Subproject commit 63edd495cfcd7c2564824e7f70dab5eb178c8449 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f59d6977be44..f197b899b1b8 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 427077374736415f4eb6c497f9172ae9e4a9f1d7 +Subproject commit 367f28b774dc7af5a612a9e37fe5ce74006508f6 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 446968c2d703..5bc34afac564 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3e417ed5b743f645eef221e01ee8b685596e612c +Subproject commit e5f38482eb0b5c84e2c663fcbdea4992fec57778 From ea1d14ed30d4e69cf73dbc047f7476aa8be10910 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 12 Jul 2021 05:17:46 -0700 Subject: [PATCH 0181/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/94ea7e6bb9622543dc4d548a850af286738d93a5 https://github.com/facebook/fbthrift/commit/6d8af5d7f61964fd15a4656846826a32921a9d70 https://github.com/facebook/fbzmq/commit/faca69c436c9ba9795fb0d05fb7354cf682dcfc8 https://github.com/facebook/litho/commit/7191629e56fa6a95e72cbcb02af4b25d7830d71a https://github.com/facebook/proxygen/commit/a591fcf67f8955d3f2c0eb6e8d1450de83fed158 https://github.com/facebook/wangle/commit/b62b8429976752a50bd42e1e728b2522b7850392 https://github.com/facebook/watchman/commit/4d0a62cb7fc57126078be2e038011d5eee6da79a https://github.com/facebookexperimental/rust-shed/commit/391ad2cbeef531ff1051b66eb4594ec41f947160 https://github.com/facebookincubator/fizz/commit/198ac93ef347aa40825ab2852f17777b4fd23eee https://github.com/facebookincubator/katran/commit/a07b276d4f8c2353a1d25d8e1e7cf871c43e1fca https://github.com/facebookincubator/mvfst/commit/b20c7515e36a4607aa0b47d93c456bd2fcf1afe2 https://github.com/rsocket/rsocket-cpp/commit/579aef4d3585d504a86711a9d7c86c2c93d75c27 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 1736c8dde38cd1d865b49e70445a8f4365be94dc --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d590c28da544..176099d32820 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 63edd495cfcd7c2564824e7f70dab5eb178c8449 +Subproject commit 6d8af5d7f61964fd15a4656846826a32921a9d70 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5bc34afac564..95463c42585e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e5f38482eb0b5c84e2c663fcbdea4992fec57778 +Subproject commit b62b8429976752a50bd42e1e728b2522b7850392 From 06d8cf142ac3d58385da93a4df49cfae1595995d Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 12 Jul 2021 05:48:32 -0700 Subject: [PATCH 0182/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/5a7c88c855db2cee487b306ac1573358790a9c1d https://github.com/facebook/fbthrift/commit/761ccdcfb6fcb00ced5f53115725257b93fd4246 https://github.com/facebook/fbzmq/commit/078a878510b007b131b105322a3340471e6aee57 https://github.com/facebook/proxygen/commit/f77ae9b6faddc9e67e28ee538a3caf93a7aee4e6 https://github.com/facebook/rocksdb/commit/5afd1e309c6959bf192393e4957e0c83234db4fe https://github.com/facebook/wangle/commit/b3c7b163544fb52993834139f5ae638da54b30e6 https://github.com/facebook/watchman/commit/ea1d14ed30d4e69cf73dbc047f7476aa8be10910 https://github.com/facebookexperimental/rust-shed/commit/43ce28078a2aecb0c2aae9b17a7bce8c97856179 https://github.com/facebookincubator/katran/commit/dda68ee5d3cfefd8538b05be4bc31b5c6c7efcab https://github.com/facebookincubator/mvfst/commit/db5273a27e692d22c30ea05552a55eb6405bf36c Reviewed By: 2d2d2d2d2d fbshipit-source-id: 970265ef49f5ab166e4e9b7a5a8d90ef2da9202f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 176099d32820..8a5e76aa1f69 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6d8af5d7f61964fd15a4656846826a32921a9d70 +Subproject commit 761ccdcfb6fcb00ced5f53115725257b93fd4246 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 95463c42585e..3ac2dab0b524 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b62b8429976752a50bd42e1e728b2522b7850392 +Subproject commit b3c7b163544fb52993834139f5ae638da54b30e6 From 74911f3e46807af45f7494ca2764d8b25bb8895b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 12 Jul 2021 06:19:05 -0700 Subject: [PATCH 0183/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/d2971163e440fc626b18e2c2a1f1cab0c311ed69 https://github.com/facebook/fbthrift/commit/c34697e1b496818e4deb97864425997c6ecb6781 https://github.com/facebook/fbzmq/commit/61da34e57d3848d207537692ede578b01c936518 https://github.com/facebook/proxygen/commit/4deeb3dd13948fd2a217853c63f02bcbd432225e https://github.com/facebook/watchman/commit/06d8cf142ac3d58385da93a4df49cfae1595995d https://github.com/facebookexperimental/rust-shed/commit/1572bc222f2e2fe1fb7320f4a8cc27179f4daf22 Reviewed By: 2d2d2d2d2d fbshipit-source-id: b7ef314fa02aa1f4f3a28ef593e0881e5dfffbfc --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8a5e76aa1f69..bea646d04f87 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 761ccdcfb6fcb00ced5f53115725257b93fd4246 +Subproject commit c34697e1b496818e4deb97864425997c6ecb6781 From e523b8f6f4ae96e76ada4db4945f1a4f59f47e10 Mon Sep 17 00:00:00 2001 From: Thomas Orozco Date: Mon, 12 Jul 2021 09:46:52 -0700 Subject: [PATCH 0184/7387] watchman/rust: properly handle subscription cancellation Summary: The current code doesn't work because we can't successfully parse a subscription cancellation at the point where we try to do it because we also expect some other fields to be present that aren't there on this notification. Instead, we should peek at the canceled field at the same time we peek for unilateral PDUs. This diff does that. See here for a bug report: https://fb.workplace.com/groups/watchman.users/permalink/2910791889238279/ Reviewed By: kassens Differential Revision: D29636575 fbshipit-source-id: 8804fac50c1de46d5873e396790501bc439bbc8f --- watchman/rust/watchman_client/Cargo.toml | 2 +- watchman/rust/watchman_client/src/lib.rs | 68 ++++++++++++++++-------- watchman/rust/watchman_client/src/pdu.rs | 8 --- 3 files changed, 46 insertions(+), 32 deletions(-) diff --git a/watchman/rust/watchman_client/Cargo.toml b/watchman/rust/watchman_client/Cargo.toml index 5d3acf765e4d..00960f66c7b8 100644 --- a/watchman/rust/watchman_client/Cargo.toml +++ b/watchman/rust/watchman_client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "watchman_client" -version = "0.7.0" +version = "0.7.1" authors = ["Wez Furlong"] edition = "2018" repository = "https://github.com/facebook/watchman/" diff --git a/watchman/rust/watchman_client/src/lib.rs b/watchman/rust/watchman_client/src/lib.rs index 400b523da314..a034e1a4097d 100644 --- a/watchman/rust/watchman_client/src/lib.rs +++ b/watchman/rust/watchman_client/src/lib.rs @@ -384,9 +384,14 @@ impl SendRequest { } } +enum SubscriptionNotification { + Pdu(Bytes), + Canceled, +} + enum TaskItem { QueueRequest(SendRequest), - RegisterSubscription(String, UnboundedSender), + RegisterSubscription(String, UnboundedSender), } /// Splits BSER mesages out of a stream. Does not attempt to actually decode them. @@ -449,7 +454,7 @@ struct ClientTask { request_rx: Receiver, request_queue: VecDeque, waiting_response: bool, - subscriptions: HashMap>, + subscriptions: HashMap>, } impl Drop for ClientTask { @@ -495,7 +500,11 @@ impl ClientTask { Ok(()) } - fn register_subscription(&mut self, name: String, tx: UnboundedSender) { + fn register_subscription( + &mut self, + name: String, + tx: UnboundedSender, + ) { self.subscriptions.insert(name, tx); } @@ -543,11 +552,19 @@ impl ClientTask { pub struct Unilateral { pub unilateral: bool, pub subscription: String, + #[serde(default)] + pub canceled: bool, } if let Ok(unilateral) = bunser::(&pdu) { if let Some(subscription) = self.subscriptions.get_mut(&unilateral.subscription) { - if subscription.send(pdu).is_err() { + let msg = if unilateral.canceled { + SubscriptionNotification::Canceled + } else { + SubscriptionNotification::Pdu(pdu) + }; + + if subscription.send(msg).is_err() || unilateral.canceled { // The `Subscription` was dropped; we don't need to // treat this as terminal for this client session, // so just de-register the handler @@ -712,7 +729,7 @@ where name: String, inner: Arc>, root: ResolvedRoot, - responses: UnboundedReceiver, + responses: UnboundedReceiver, _phantom: PhantomData, } @@ -730,29 +747,34 @@ where /// from the server. #[allow(clippy::should_implement_trait)] pub async fn next(&mut self) -> Result, Error> { - let pdu = self + let msg = self .responses .recv() .await .ok_or(ConnectionLost::ClientTaskExited)?; - let response: QueryResult = bunser(&pdu)?; - - if response.subscription_canceled { - self.responses.close(); - Ok(SubscriptionData::Canceled) - } else if let Some(state_name) = response.state_enter { - Ok(SubscriptionData::StateEnter { - state_name, - metadata: response.state_metadata, - }) - } else if let Some(state_name) = response.state_leave { - Ok(SubscriptionData::StateLeave { - state_name, - metadata: response.state_metadata, - }) - } else { - Ok(SubscriptionData::FilesChanged(response)) + match msg { + SubscriptionNotification::Pdu(pdu) => { + let response: QueryResult = bunser(&pdu)?; + + if let Some(state_name) = response.state_enter { + Ok(SubscriptionData::StateEnter { + state_name, + metadata: response.state_metadata, + }) + } else if let Some(state_name) = response.state_leave { + Ok(SubscriptionData::StateLeave { + state_name, + metadata: response.state_metadata, + }) + } else { + Ok(SubscriptionData::FilesChanged(response)) + } + } + SubscriptionNotification::Canceled => { + self.responses.close(); + Ok(SubscriptionData::Canceled) + } } } diff --git a/watchman/rust/watchman_client/src/pdu.rs b/watchman/rust/watchman_client/src/pdu.rs index 25ed79a95e5c..6d57459e0c61 100644 --- a/watchman/rust/watchman_client/src/pdu.rs +++ b/watchman/rust/watchman_client/src/pdu.rs @@ -352,14 +352,6 @@ where /// The clock value at the time that these results were generated pub clock: Clock, - /// in the context of a subscription, this is set to true if - /// the subscription was canceled, perhaps by an unsubscribe request, - /// or perhaps because the watch was deleted. The server logs - /// will explain the reason. - #[serde(rename = "canceled", default)] - #[doc(hidden)] - pub subscription_canceled: bool, - #[serde(rename = "state-enter")] #[doc(hidden)] pub state_enter: Option, From 773bf52ba0a743879bf002e78001ed224a2af641 Mon Sep 17 00:00:00 2001 From: Dead Code Bot <> Date: Mon, 12 Jul 2021 10:26:27 -0700 Subject: [PATCH 0185/7387] Remove dead includes in watchman/tests Reviewed By: genevievehelsel Differential Revision: D29657483 fbshipit-source-id: a5bee5fdfe0cf85e8dcbba8a2dc9d2291237ba4a --- watchman/tests/RingBufferTest.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/watchman/tests/RingBufferTest.cpp b/watchman/tests/RingBufferTest.cpp index c0e5853ca2eb..61282c9eb9ba 100644 --- a/watchman/tests/RingBufferTest.cpp +++ b/watchman/tests/RingBufferTest.cpp @@ -6,7 +6,6 @@ #include "watchman/RingBuffer.h" using namespace watchman; -using namespace ::testing; TEST(RingBufferTest, writes_can_be_read) { RingBuffer rb{2}; From fb9d4ea42080821aeb8e3895bddd333e721969bb Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 12 Jul 2021 11:56:31 -0700 Subject: [PATCH 0186/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/efee0902921d6c71006285afddad24509cb27d32 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 39cdc294b1319457210e1e761a81ef88e13dd088 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bea646d04f87..527efd55c4c8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c34697e1b496818e4deb97864425997c6ecb6781 +Subproject commit efee0902921d6c71006285afddad24509cb27d32 From e7b3f8f65fd545dcc2eac8e8d0c930c2ca50ed35 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 12 Jul 2021 12:37:41 -0700 Subject: [PATCH 0187/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/2018f66a7507d36a9c6223ec7ff17f4e69a4b32a https://github.com/facebook/fbthrift/commit/daa412bed2db72eaf82bc93bad4c1fd64ea71483 https://github.com/facebook/fbzmq/commit/602c2991ec84d55d1856e56976c32da9d9e308cf https://github.com/facebook/rocksdb/commit/da90e239987120b85159672540a79a7384b5e1c6 https://github.com/facebook/watchman/commit/fb9d4ea42080821aeb8e3895bddd333e721969bb https://github.com/facebookexperimental/rust-shed/commit/a60ad1d2fb0441d2976ba9df28bc632f6bcb9734 Reviewed By: 2d2d2d2d2d fbshipit-source-id: bd7094e3ec992245c0801d304064fd1b9a709485 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 527efd55c4c8..f0f95b8dfe0a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit efee0902921d6c71006285afddad24509cb27d32 +Subproject commit daa412bed2db72eaf82bc93bad4c1fd64ea71483 From c495c8c456be26ae71ea7ada4551b595365e67f9 Mon Sep 17 00:00:00 2001 From: Jessica Vandebon Date: Mon, 12 Jul 2021 13:15:11 -0700 Subject: [PATCH 0188/7387] Make eden doctor report when the PrivHelper is inaccessible Summary: Extended eden doctor to check if the PrivHelper is accessible and report when it is not. Reviewed By: genevievehelsel Differential Revision: D29593250 fbshipit-source-id: 2390e75b91c9d6f713db4b6084868af91a0b6623 --- eden/fs/service/eden.thrift | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 53adb25907d5..7c688b3d0d96 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -125,6 +125,13 @@ struct DaemonInfo { 4: optional float uptime; } +/** +* Information about the privhelper process +*/ +struct PrivHelperInfo { + 1: bool connected; +} + /** * The current running state of an EdenMount. */ @@ -1061,6 +1068,11 @@ service EdenService extends fb303_core.BaseService { */ DaemonInfo getDaemonInfo() throws (1: EdenError ex); + /** + * Returns information about the privhelper process, including accesibility. + */ + PrivHelperInfo checkPrivHelper() throws (1: EdenError ex); + /** * DEPRECATED * From b4402b26897563526fda9d182e58cb51ec551be8 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 12 Jul 2021 14:05:13 -0700 Subject: [PATCH 0189/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/f15fd0420cec389b935ab69c6ecb910e9e92a578 https://github.com/facebook/litho/commit/6810e81b5d819471fe9597aad5ef85027e840610 https://github.com/facebook/watchman/commit/c495c8c456be26ae71ea7ada4551b595365e67f9 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 431a0928751c9a804fd534731db996f9ceb9bf72 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f0f95b8dfe0a..b98865364251 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit daa412bed2db72eaf82bc93bad4c1fd64ea71483 +Subproject commit f15fd0420cec389b935ab69c6ecb910e9e92a578 From 469affede99517928c04a6ec21bd6189f2dfff27 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 12 Jul 2021 15:14:23 -0700 Subject: [PATCH 0190/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/21021ec98ec066300f7e901d3f42fcf22624a9d3 Reviewed By: 2d2d2d2d2d fbshipit-source-id: ee70ac4ba1d0865cb5668e0bae4e8791715d3d99 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f197b899b1b8..f00f75c0aca7 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 367f28b774dc7af5a612a9e37fe5ce74006508f6 +Subproject commit 21021ec98ec066300f7e901d3f42fcf22624a9d3 From 3ca45eabae87442f7195e31f1f388daab21cdbf0 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 12 Jul 2021 15:47:10 -0700 Subject: [PATCH 0191/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/be5a047feeca4dcde6b5310c5a4119e3711d8b52 https://github.com/facebook/fbthrift/commit/572f46348bc08b596658982a075117f22c741d07 https://github.com/facebook/fbzmq/commit/9f0cfd6c0b3b1e8c411bfbe5e6f71925bfa4d3ca https://github.com/facebook/proxygen/commit/8b5c0ca30882baae46bc0efd38330601849ec87e https://github.com/facebook/wangle/commit/09ce1d2fbabdee5d7d579b72f5c566457f2b9e7d https://github.com/facebook/watchman/commit/469affede99517928c04a6ec21bd6189f2dfff27 https://github.com/facebookincubator/fizz/commit/62a2dc854dbfe94999d0d7774e35636298e6efcb https://github.com/facebookincubator/katran/commit/3ac95248c9cddeb572422607cce9d3e8c0a907f4 https://github.com/facebookincubator/mvfst/commit/59b36764cbd97231679941b00e26bb40bba9560f https://github.com/rsocket/rsocket-cpp/commit/94f6f5ac4ee276068967cb4264d56df948669061 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 71ba6d4b9deb3e81e4673abb01c7136f5789455d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b98865364251..c285208f801d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f15fd0420cec389b935ab69c6ecb910e9e92a578 +Subproject commit 572f46348bc08b596658982a075117f22c741d07 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3ac2dab0b524..544868219898 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b3c7b163544fb52993834139f5ae638da54b30e6 +Subproject commit 09ce1d2fbabdee5d7d579b72f5c566457f2b9e7d From acb1b39ccce4eb3f1d6035d66f7da23fc92fd75b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 12 Jul 2021 16:21:20 -0700 Subject: [PATCH 0192/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/0bdb6cdddd27480cd5b0bc3012f280604055f302 https://github.com/facebook/fbthrift/commit/eb105a3f7a433dd16a8e4321cd1331120eb2be19 https://github.com/facebook/fbzmq/commit/48a9c97d8bc5f3c6ba2210b01f34f80384ca6b21 https://github.com/facebook/proxygen/commit/4249d2a3876bae400d1bc3d748a1a15a510a96d2 https://github.com/facebook/wangle/commit/d3ea54dcfc00241f883b3cc4d8a7dfd249a56770 https://github.com/facebook/watchman/commit/3ca45eabae87442f7195e31f1f388daab21cdbf0 https://github.com/facebookexperimental/rust-shed/commit/6fca3261c0b6fdb49ed68137900cf390416cafc6 https://github.com/facebookincubator/katran/commit/7c71df377c097ff3b8abc98eaf14af1659fde8a8 https://github.com/facebookincubator/mvfst/commit/ec799b386039054b027b3732fca87a5aa4c68bbd Reviewed By: 2d2d2d2d2d fbshipit-source-id: 6878401d7b778e4ca714e5b261c39a5e5d1b9b48 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c285208f801d..abe4decba90c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 572f46348bc08b596658982a075117f22c741d07 +Subproject commit eb105a3f7a433dd16a8e4321cd1331120eb2be19 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 544868219898..5645e13dce60 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 09ce1d2fbabdee5d7d579b72f5c566457f2b9e7d +Subproject commit d3ea54dcfc00241f883b3cc4d8a7dfd249a56770 From 0b2a0e087e3e5ad35db76e0d266761028f2685b4 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 12 Jul 2021 16:51:15 -0700 Subject: [PATCH 0193/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/6101538a53248940a8861c08fdeba616042127d2 https://github.com/facebook/fbthrift/commit/27bda461d333adf43c46479b68d1809062be9254 https://github.com/facebook/fbzmq/commit/dde72902f1c481a989595d4095cb23d5ed664ff0 https://github.com/facebook/proxygen/commit/d85137a1c4ed08e01547f4d4f74a1f7d18c48228 https://github.com/facebook/watchman/commit/acb1b39ccce4eb3f1d6035d66f7da23fc92fd75b https://github.com/facebookexperimental/rust-shed/commit/87929b1bdd694f1851c334b39914995a69ba6b25 Reviewed By: 2d2d2d2d2d fbshipit-source-id: f7003a9bd0284ff122ead9d7d0edd341bb31f861 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index abe4decba90c..faddca9f2c60 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit eb105a3f7a433dd16a8e4321cd1331120eb2be19 +Subproject commit 27bda461d333adf43c46479b68d1809062be9254 From 633847beaeebfa8477a0b779c6368fee06ba5b4f Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 12 Jul 2021 22:16:53 -0700 Subject: [PATCH 0194/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/38b5252bafb3b6812cc76d3833603693ff912dc0 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 50eae54ad1d87d6209adb32fc54738471db65c43 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index faddca9f2c60..1502cd29372b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 27bda461d333adf43c46479b68d1809062be9254 +Subproject commit 38b5252bafb3b6812cc76d3833603693ff912dc0 From 1c821b28fcb16fe08b37a6223d41f8d0336a0415 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 13 Jul 2021 03:20:29 -0700 Subject: [PATCH 0195/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/7a18d1823185495cae6676258ee64afd7e36c84c Reviewed By: 2d2d2d2d2d fbshipit-source-id: e78c95eda6e856797585599a36dbaaa4ce674590 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f00f75c0aca7..fbebfb4439c0 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 21021ec98ec066300f7e901d3f42fcf22624a9d3 +Subproject commit 7a18d1823185495cae6676258ee64afd7e36c84c From 5a99327ce77ca2eabd33ecd50de67796ce517500 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 13 Jul 2021 03:56:02 -0700 Subject: [PATCH 0196/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/fb75d7e3a99ecd0c8d57a404b2aa36851cb8071f https://github.com/facebook/fbthrift/commit/c085589d887f627ecc7df50c551af95b2ce77f7b https://github.com/facebook/fbzmq/commit/34b5b7d63ca7764760d56eebc1a569b577e4a880 https://github.com/facebook/proxygen/commit/23551073aafffa3a8872171808a5059d488270ee https://github.com/facebook/wangle/commit/c5b3731f7fe4f79ff3be6fcc98a54f9b73c9e257 https://github.com/facebook/watchman/commit/1c821b28fcb16fe08b37a6223d41f8d0336a0415 https://github.com/facebookincubator/fizz/commit/a30a01f248a357aad792c32b9f6ad6d6cef13654 https://github.com/facebookincubator/katran/commit/1cc97a29382d3fe8c96b2d43fabc2f5bfc0170cb https://github.com/facebookincubator/mvfst/commit/00445107e39001e43ff92827d950d4165bc54283 https://github.com/rsocket/rsocket-cpp/commit/7bbfc63916ab9fa28f5090cc2e9ac776027b84b0 Reviewed By: 2d2d2d2d2d fbshipit-source-id: e6ca496d7b208a9503fefd995ae20f4add86960f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1502cd29372b..f75ba3dbbbaf 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 38b5252bafb3b6812cc76d3833603693ff912dc0 +Subproject commit c085589d887f627ecc7df50c551af95b2ce77f7b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5645e13dce60..ee5eea04fbf7 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d3ea54dcfc00241f883b3cc4d8a7dfd249a56770 +Subproject commit c5b3731f7fe4f79ff3be6fcc98a54f9b73c9e257 From 39de8ffd2014461f8a2f1afe68170c41284b07a5 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 13 Jul 2021 04:22:19 -0700 Subject: [PATCH 0197/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/7574956d2608eb0c540d4487c3c085a446824dca https://github.com/facebook/fbthrift/commit/99cb8f23bbaa40b40f8988e242e2f362be2ff0f6 https://github.com/facebook/fbzmq/commit/63abc6f33be0b170c28eabd5d048c4b7ef6d6b16 https://github.com/facebook/proxygen/commit/0d2654fcd0b08519f248db76a882dec028dbcffd https://github.com/facebook/wangle/commit/7ffaa6b17de25b74e260b2e058e527f9d627692a https://github.com/facebook/watchman/commit/5a99327ce77ca2eabd33ecd50de67796ce517500 https://github.com/facebookexperimental/rust-shed/commit/8f967f3eb92705cdd558fab5d16dcfa7b86c53bd https://github.com/facebookincubator/katran/commit/0673989d7c3bf3471eb42b72910ac2c62f867c99 https://github.com/facebookincubator/mvfst/commit/2c860b4529086b88053645c8372cc93f72822db9 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 04b57fffc48fd12c3a1c6d0f8a603c803d68a524 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f75ba3dbbbaf..ed4a7b775f07 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c085589d887f627ecc7df50c551af95b2ce77f7b +Subproject commit 99cb8f23bbaa40b40f8988e242e2f362be2ff0f6 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ee5eea04fbf7..99edf9f97fb6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c5b3731f7fe4f79ff3be6fcc98a54f9b73c9e257 +Subproject commit 7ffaa6b17de25b74e260b2e058e527f9d627692a From 36412a057199903ab44e839bcd7d1baa303ee7ba Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 13 Jul 2021 04:57:56 -0700 Subject: [PATCH 0198/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c1c2a25913eb359c735c3ac119d5b58030e1d276 https://github.com/facebook/fbthrift/commit/535265bc32c43b8bcc0a4e996b236b73de6b26e9 https://github.com/facebook/fbzmq/commit/47a04c817bddfde39bd8236a42642015267c4376 https://github.com/facebook/proxygen/commit/b5db5cf4637871b314bc5f090b3147c4c3557d00 https://github.com/facebook/watchman/commit/39de8ffd2014461f8a2f1afe68170c41284b07a5 https://github.com/facebookexperimental/rust-shed/commit/33e516106928d687225609ee9238cfde88ce472e Reviewed By: 2d2d2d2d2d fbshipit-source-id: 87f7791415d1166834eb78ff75a67bb454d8191e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ed4a7b775f07..d3322e685c44 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 99cb8f23bbaa40b40f8988e242e2f362be2ff0f6 +Subproject commit 535265bc32c43b8bcc0a4e996b236b73de6b26e9 From 7e21bff54513dfff5a17ca7769a6df9f3ff31c3f Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 13 Jul 2021 07:05:54 -0700 Subject: [PATCH 0199/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5a46041b1e8eb546bd19049fd5de1877902df760 Reviewed By: 2d2d2d2d2d fbshipit-source-id: cbdf3e08580e1088beb042d02be8e6a43224b2f3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d3322e685c44..7d9b1fd362fe 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 535265bc32c43b8bcc0a4e996b236b73de6b26e9 +Subproject commit 5a46041b1e8eb546bd19049fd5de1877902df760 From 0afe08c0c8a6533f42f90d6afeaa778f70c1b6db Mon Sep 17 00:00:00 2001 From: Jan Kassens Date: Tue, 13 Jul 2021 09:22:19 -0700 Subject: [PATCH 0200/7387] Rust: fix windows build (#927) Summary: - Usage of `mio` was removed in 7ba69af251fcb9b8bf6f2bdf401e8548629f82d5, so we no longer need the dependencies. - The error type was changed in 425f7289c21b8b26483fcab1beabadbf84836b9b and broke windows build. Pull Request resolved: https://github.com/facebook/watchman/pull/927 Test Plan: Windows build using: cargo build --target x86_64-pc-windows-gnu macOS build using cargo build Reviewed By: krallin Differential Revision: D29678692 Pulled By: kassens fbshipit-source-id: 6d20880971e746319d407414c188149765812bd3 --- watchman/rust/watchman_client/Cargo.toml | 2 -- watchman/rust/watchman_client/src/lib.rs | 10 ++++++---- watchman/rust/watchman_client/src/named_pipe.rs | 13 +++++++++---- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/watchman/rust/watchman_client/Cargo.toml b/watchman/rust/watchman_client/Cargo.toml index 00960f66c7b8..eace2ddaa93e 100644 --- a/watchman/rust/watchman_client/Cargo.toml +++ b/watchman/rust/watchman_client/Cargo.toml @@ -26,8 +26,6 @@ tokio = { version = "1.5", features = ["full", "test-util"] } tokio-util = { version = "0.6", features = ["full"] } [target."cfg(windows)".dependencies] -mio-named-pipes = "0.1" -mio = "0.6" winapi = { version = "0.3", features = [ "handleapi", "winuser", diff --git a/watchman/rust/watchman_client/src/lib.rs b/watchman/rust/watchman_client/src/lib.rs index a034e1a4097d..65b63a94cc01 100644 --- a/watchman/rust/watchman_client/src/lib.rs +++ b/watchman/rust/watchman_client/src/lib.rs @@ -118,7 +118,7 @@ pub enum Error { Connect { endpoint: PathBuf, #[source] - source: anyhow::Error, + source: Box, }, } @@ -242,12 +242,14 @@ impl Connector { let sock_path = self.resolve_unix_domain_path().await?; #[cfg(unix)] - let stream = UnixStream::connect(sock_path).await; + let stream = UnixStream::connect(sock_path) + .await + .map_err(Error::ConnectionError)?; #[cfg(windows)] - let stream = named_pipe::NamedPipe::connect(sock_path).await; + let stream = named_pipe::NamedPipe::connect(sock_path).await?; - let stream: Box = Box::new(stream.map_err(Error::ConnectionError)?); + let stream: Box = Box::new(stream); let (reader, writer) = tokio::io::split(stream); diff --git a/watchman/rust/watchman_client/src/named_pipe.rs b/watchman/rust/watchman_client/src/named_pipe.rs index dc092d9db5c8..7dc7bb180b0e 100644 --- a/watchman/rust/watchman_client/src/named_pipe.rs +++ b/watchman/rust/watchman_client/src/named_pipe.rs @@ -7,9 +7,9 @@ use std::pin::Pin; use std::task::{Context, Poll}; use tokio::io::{AsyncRead, AsyncWrite, ReadBuf}; use tokio::net::windows::named_pipe::NamedPipeClient; -use winapi::um::fileapi::*; -use winapi::um::winbase::*; -use winapi::um::winnt::*; +use winapi::um::fileapi::{CreateFileW, OPEN_EXISTING}; +use winapi::um::winbase::FILE_FLAG_OVERLAPPED; +use winapi::um::winnt::{GENERIC_READ, GENERIC_WRITE}; /// Wrapper around a tokio [`NamedPipeClient`] pub struct NamedPipe { @@ -43,7 +43,12 @@ impl NamedPipe { }); } - let io = unsafe { NamedPipeClient::from_raw_handle(handle)? }; + let io = unsafe { + NamedPipeClient::from_raw_handle(handle).map_err(|err| Error::Connect { + endpoint: path, + source: Box::new(err), + })? + }; Ok(Self { io }) } } From 7c856d1d43107f0e6bdfa181ae33c0122ca55d49 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 13 Jul 2021 09:55:03 -0700 Subject: [PATCH 0201/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/9d050ffa872df9b07aaa8d9a4f9fce0bc882b8f4 https://github.com/facebook/proxygen/commit/9140ef476bd1787dd66b1061629313e58daa1e0d https://github.com/facebook/watchman/commit/0afe08c0c8a6533f42f90d6afeaa778f70c1b6db Reviewed By: 2d2d2d2d2d fbshipit-source-id: 2721f5b0d9702865dc4f6836c78c3f48fbfcc66c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7d9b1fd362fe..b3082fe72f16 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5a46041b1e8eb546bd19049fd5de1877902df760 +Subproject commit 9d050ffa872df9b07aaa8d9a4f9fce0bc882b8f4 From f412d78ec3bbbcdf7b1dafef7a92304aa092314e Mon Sep 17 00:00:00 2001 From: Jan Kassens Date: Tue, 13 Jul 2021 10:16:27 -0700 Subject: [PATCH 0202/7387] move serde_bytes to dev-dependencies Summary: This is only used in a test. @public Reviewed By: krallin Differential Revision: D29680501 fbshipit-source-id: 8a3208abf95b918eb336cd4f2abb8b9c80bb70cc --- watchman/rust/serde_bser/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/rust/serde_bser/Cargo.toml b/watchman/rust/serde_bser/Cargo.toml index 59d366fb7e89..edecf8394cd3 100644 --- a/watchman/rust/serde_bser/Cargo.toml +++ b/watchman/rust/serde_bser/Cargo.toml @@ -14,7 +14,6 @@ byteorder = "1.0" bytes = "0.4" thiserror = "1.0" serde = { version = "1.0.102", features = ["derive"] } -serde_bytes = "0.11" [features] default = [] @@ -22,3 +21,4 @@ debug_bytes = [] [dev-dependencies] maplit = "1.0" +serde_bytes = "0.11" From b6de93e1949bb8f2b4f054a9f0e62947e61ca39a Mon Sep 17 00:00:00 2001 From: Jan Kassens Date: Tue, 13 Jul 2021 10:16:27 -0700 Subject: [PATCH 0203/7387] reorder Cargo.toml files Summary: This reflects the ordering generated by autocargo and makes it a bit easier to understand the next diffs. Reviewed By: krallin Differential Revision: D29671447 fbshipit-source-id: f0f31cf4fce917347142123c37a4766c7f33d19c --- watchman/rust/serde_bser/Cargo.toml | 12 ++++++------ watchman/rust/watchman_client/Cargo.toml | 21 ++++++++------------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/watchman/rust/serde_bser/Cargo.toml b/watchman/rust/serde_bser/Cargo.toml index edecf8394cd3..8fb9181699df 100644 --- a/watchman/rust/serde_bser/Cargo.toml +++ b/watchman/rust/serde_bser/Cargo.toml @@ -3,10 +3,10 @@ name = "serde_bser" version = "0.3.1" authors = ["Rain ", "Wez Furlong"] edition = "2018" -repository = "https://github.com/facebook/watchman/" description = "Implements the Watchman BSER encoding for serde. https://facebook.github.io/watchman/docs/bser.html" -license = "Apache-2.0" documentation = "https://docs.rs/serde_bser" +repository = "https://github.com/facebook/watchman/" +license = "Apache-2.0" [dependencies] anyhow = "1.0" @@ -15,10 +15,10 @@ bytes = "0.4" thiserror = "1.0" serde = { version = "1.0.102", features = ["derive"] } -[features] -default = [] -debug_bytes = [] - [dev-dependencies] maplit = "1.0" serde_bytes = "0.11" + +[features] +debug_bytes = [] +default = [] diff --git a/watchman/rust/watchman_client/Cargo.toml b/watchman/rust/watchman_client/Cargo.toml index eace2ddaa93e..0627cc218eab 100644 --- a/watchman/rust/watchman_client/Cargo.toml +++ b/watchman/rust/watchman_client/Cargo.toml @@ -3,16 +3,11 @@ name = "watchman_client" version = "0.7.1" authors = ["Wez Furlong"] edition = "2018" -repository = "https://github.com/facebook/watchman/" description = "a client for the Watchman file watching service" -license = "Apache-2.0" documentation = "https://docs.rs/watchman_client" -exclude = [ - "examples/*", -] - -[dev-dependencies] -structopt = "0.3" +repository = "https://github.com/facebook/watchman/" +license = "Apache-2.0" +exclude = ["examples/*"] [dependencies] anyhow = "1.0" @@ -25,8 +20,8 @@ thiserror = ">=1.0.6" tokio = { version = "1.5", features = ["full", "test-util"] } tokio-util = { version = "0.6", features = ["full"] } -[target."cfg(windows)".dependencies] -winapi = { version = "0.3", features = [ - "handleapi", - "winuser", -]} +[dev-dependencies] +structopt = "0.3" + +[target.'cfg(windows)'.dependencies] +winapi = { version = "0.3", features = ["handleapi", "winuser"] } From 732eeca86c529821b4e266608c2f5ba26d71e306 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 13 Jul 2021 10:48:36 -0700 Subject: [PATCH 0204/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/cbf367153d1e482cd7f6da4b5f5f0c993c41112a https://github.com/facebook/fbzmq/commit/b62c2098e2b6818226477f8e5ba3d95a681c4743 https://github.com/facebook/folly/commit/0f00cc10cd1768b4a393a4a7998cb4c1fe674039 https://github.com/facebook/watchman/commit/b6de93e1949bb8f2b4f054a9f0e62947e61ca39a https://github.com/facebookexperimental/rust-shed/commit/9ab993116e59a0551b33ce819d05236b1d567e1e Reviewed By: 2d2d2d2d2d fbshipit-source-id: 80a3c798afe087b78ec7980af27aba981e1de53b --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index fbebfb4439c0..06f682864605 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7a18d1823185495cae6676258ee64afd7e36c84c +Subproject commit 0f00cc10cd1768b4a393a4a7998cb4c1fe674039 From c39d15955cb7ee949de2d78f592d36b728e243ec Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 13 Jul 2021 11:26:26 -0700 Subject: [PATCH 0205/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/725c92759ee5a7cbc4f4b7c788d9aba14fb301a1 https://github.com/facebook/fbthrift/commit/ab9a8edb76d587a3c1e3473ffd92b56dbb023c9c https://github.com/facebook/fbzmq/commit/4aecdd2ef39899260cf19df5903c3037ced18c0f https://github.com/facebook/litho/commit/55dac17f01f7b79a981e8bfcffa6786088adb8ae https://github.com/facebook/proxygen/commit/051ba30b9a0e57a5c7958e2e7e30f0e1665d02cf https://github.com/facebook/wangle/commit/0ebd2ce9aeb8cdfa77272064386544715ed19a97 https://github.com/facebook/watchman/commit/732eeca86c529821b4e266608c2f5ba26d71e306 https://github.com/facebookincubator/fizz/commit/b2c65373987b9436afd29bb1db9a06b5a47ed701 https://github.com/facebookincubator/katran/commit/565bfefe079bf92fc0c28cb95f87d97e16ab19c7 https://github.com/facebookincubator/mvfst/commit/9f58e53adb62e563cd402384e5ac06ea783f589d https://github.com/rsocket/rsocket-cpp/commit/d724906051a6c104c311d25954d066b5fc245eb1 Reviewed By: 2d2d2d2d2d fbshipit-source-id: e4d0b94366f8ef4015f14161913b00cc4ee681c3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b3082fe72f16..a111561d5337 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9d050ffa872df9b07aaa8d9a4f9fce0bc882b8f4 +Subproject commit ab9a8edb76d587a3c1e3473ffd92b56dbb023c9c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 99edf9f97fb6..ecf5f1411ad6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7ffaa6b17de25b74e260b2e058e527f9d627692a +Subproject commit 0ebd2ce9aeb8cdfa77272064386544715ed19a97 From 2cd02e5558e9bfd34f1a95c7e61dfb2e8e933f71 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 13 Jul 2021 12:05:56 -0700 Subject: [PATCH 0206/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/bcc80bd4f7796c7dbb716326ba332c6a5bb9c9a1 https://github.com/facebook/fbthrift/commit/ea9212fdd4cc641573616a97c9d5895cf87fb907 https://github.com/facebook/fbzmq/commit/a0dfe3eaadc0f63f6066d3b27903926552ca5443 https://github.com/facebook/litho/commit/b6ad7342004c95ac1e227a83c82a6ba6e56f0c81 https://github.com/facebook/proxygen/commit/5940da0f16e8b2d11e7c88682bc407caacea2057 https://github.com/facebook/wangle/commit/9104c0b05f7c096cc62fb800e008e528c5ba8477 https://github.com/facebook/watchman/commit/c39d15955cb7ee949de2d78f592d36b728e243ec https://github.com/facebookexperimental/rust-shed/commit/003bbf0b29acfa1c62ec57432050781349719586 https://github.com/facebookincubator/katran/commit/fe50b9a149829115d50e085989b5d5b2d2097b04 https://github.com/facebookincubator/mvfst/commit/793a3698ffc2e663feb65c74066840dac5f66fce Reviewed By: 2d2d2d2d2d fbshipit-source-id: 40d224241204fcf44b8d4c450b2ca7652ca099b0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a111561d5337..626be027ff1d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ab9a8edb76d587a3c1e3473ffd92b56dbb023c9c +Subproject commit ea9212fdd4cc641573616a97c9d5895cf87fb907 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ecf5f1411ad6..248e6b500797 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0ebd2ce9aeb8cdfa77272064386544715ed19a97 +Subproject commit 9104c0b05f7c096cc62fb800e008e528c5ba8477 From 5cb160366449d9f75f3eeae6a356421ca5a67679 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 13 Jul 2021 13:42:34 -0700 Subject: [PATCH 0207/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/d2e9590f7e17caf676128697f3097521ff34c27c https://github.com/facebook/fbthrift/commit/4ee6fa0f70f47f07dbec81369ba61edd0b9f1173 https://github.com/facebook/fbzmq/commit/f232ed725b52787e89e8278981284944d24aaec4 https://github.com/facebook/proxygen/commit/9259524f0fd694e3aa2c08fee457251d3ec323bf https://github.com/facebook/rocksdb/commit/7b9ecd4067abd8fa0e449e30dcb3a2162a0aae53 https://github.com/facebook/watchman/commit/2cd02e5558e9bfd34f1a95c7e61dfb2e8e933f71 https://github.com/facebookexperimental/rust-shed/commit/0309bd9be92ea12c9e5f829b048409ee1f57a258 https://github.com/facebookincubator/mvfst/commit/06d73544f5bab9abd3ccf58f33af67e651f55bf2 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 13018a7ca0ce51ed4689d01946b738fe83b81632 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 626be027ff1d..e8991446b147 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ea9212fdd4cc641573616a97c9d5895cf87fb907 +Subproject commit 4ee6fa0f70f47f07dbec81369ba61edd0b9f1173 From a36140fe331d43288674190128d96f2816069b02 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 13 Jul 2021 16:43:32 -0700 Subject: [PATCH 0208/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/579caed714ec462928a1cbc4628db13548660ca8 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 94d105554f03b57897d987e47ea9da1225bc16cd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e8991446b147..329f52d9d8b6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4ee6fa0f70f47f07dbec81369ba61edd0b9f1173 +Subproject commit 579caed714ec462928a1cbc4628db13548660ca8 From e37159012f4233b4e76d1182c8019e619e997782 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 13 Jul 2021 21:59:35 -0700 Subject: [PATCH 0209/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/abbaf29e0917b628405a4dee66eb0a8277dba169 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 0c28748d626b947f6b12b261d77c2187038175fd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 329f52d9d8b6..2f402cc3940c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 579caed714ec462928a1cbc4628db13548660ca8 +Subproject commit abbaf29e0917b628405a4dee66eb0a8277dba169 From 86638df7676e749286a7fbb73ff737213d4a2f39 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 14 Jul 2021 05:16:39 -0700 Subject: [PATCH 0210/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/c5a32c5a88fe7cfde8f3b9969e2da3b297e03787 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 7ea78fb8525ceb2932a2586505fb9ac0c3e92171 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2f402cc3940c..f49f4ff020cd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit abbaf29e0917b628405a4dee66eb0a8277dba169 +Subproject commit c5a32c5a88fe7cfde8f3b9969e2da3b297e03787 From 464cd2f2a5382b47d630d4f21506b3ca77ac3678 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 14 Jul 2021 12:26:47 -0700 Subject: [PATCH 0211/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/9ae8ae457ea06a22b992b4f2943c0baf05b1d56c https://github.com/facebook/proxygen/commit/688dc2dc31e6869d38f5f9daaddbc3b85e1251d5 https://github.com/facebookexternal/stl_tasks/commit/d73fd8e87f4c730077b25aff0d4fd3560f11696a https://github.com/facebookincubator/mvfst/commit/c85ec4dbd3caa02bff260a46e72430931cc9eaa7 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 67122548e418a20c00e2f439af10e590de750722 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f49f4ff020cd..b682d0250aef 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c5a32c5a88fe7cfde8f3b9969e2da3b297e03787 +Subproject commit 9ae8ae457ea06a22b992b4f2943c0baf05b1d56c From 8d8f213fc22ed06d4289f51dbcc83b74b72f97ed Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 14 Jul 2021 14:16:42 -0700 Subject: [PATCH 0212/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/0f4ee6caf6cc7e360f841345b0644caf3e1aa1be Reviewed By: 2d2d2d2d2d fbshipit-source-id: 7200db7db2df0f7ea80885be4f2a27e0a958a35e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b682d0250aef..830fabfa5a32 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9ae8ae457ea06a22b992b4f2943c0baf05b1d56c +Subproject commit 0f4ee6caf6cc7e360f841345b0644caf3e1aa1be From 64d7394e0321dae9687c4d1cf11bc0a4f2f7cb37 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 14 Jul 2021 14:54:20 -0700 Subject: [PATCH 0213/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/112999e8b82df96c41bc2e5f47a28634c8330198 https://github.com/facebook/fbzmq/commit/29088631079390c1884eb79be3ccf4e20f00a059 https://github.com/facebook/folly/commit/74f3c0434b36a780812443fcefd02f2d7fe6f6a7 https://github.com/facebook/watchman/commit/8d8f213fc22ed06d4289f51dbcc83b74b72f97ed https://github.com/facebookexperimental/rust-shed/commit/59e63e47960a80fb12c5a27591027f40f8bf110f Reviewed By: 2d2d2d2d2d fbshipit-source-id: d95a8fb04238fbaa65c83a8939ecf693d6d4a3e4 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 06f682864605..d8e989114f79 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0f00cc10cd1768b4a393a4a7998cb4c1fe674039 +Subproject commit 74f3c0434b36a780812443fcefd02f2d7fe6f6a7 From 77197bf27efb8ebbc5baa74f8dd9fb921197d0d5 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 14 Jul 2021 15:14:11 -0700 Subject: [PATCH 0214/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/9b8946aef57cd420e5d30420f31aacb8cbe5a760 https://github.com/facebook/fbthrift/commit/ac2484d5daf78f40081c6bc5972d015c5ea51cc0 https://github.com/facebook/fbzmq/commit/b422ba0475b2cdc392353c3ed64d5222a68886bd https://github.com/facebook/proxygen/commit/6fc6d07f2e7bf6953bc4d25ce2c50796e020eaf0 https://github.com/facebook/wangle/commit/4c4d0ceab845f4ab8a38e6aa5c1ecfae2b1cc883 https://github.com/facebook/watchman/commit/64d7394e0321dae9687c4d1cf11bc0a4f2f7cb37 https://github.com/facebookincubator/fizz/commit/4e8ac84b3d9df85a5de14133c8f4e116416943e7 https://github.com/facebookincubator/katran/commit/63ab77fe1094dbb9a7a7ae8689a8075eddee7221 https://github.com/facebookincubator/mvfst/commit/b6a4242bfe76211ebd451e7f78639e2cea91df80 https://github.com/rsocket/rsocket-cpp/commit/cf00c0d56fbd3a3bf0bc0e049aff7e0730115728 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 1dc8fce52885a773b7e19f43545d7a484857a649 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 830fabfa5a32..f6c5d343dce1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0f4ee6caf6cc7e360f841345b0644caf3e1aa1be +Subproject commit ac2484d5daf78f40081c6bc5972d015c5ea51cc0 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 248e6b500797..e8692fd92970 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9104c0b05f7c096cc62fb800e008e528c5ba8477 +Subproject commit 4c4d0ceab845f4ab8a38e6aa5c1ecfae2b1cc883 From 96a1ac0ce5ba129a8bb8e0e26504b144ccb2c745 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 14 Jul 2021 15:38:33 -0700 Subject: [PATCH 0215/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/3eb8cac42ff32b69a08354e34a008031e2540b02 https://github.com/facebook/fbthrift/commit/f80e2533cb224262aa825629d111793960326346 https://github.com/facebook/fbzmq/commit/d7b1577753671212cc5b6e1b6f4f44c3376ab6a8 https://github.com/facebook/proxygen/commit/ab11704fffdb4d95b7bc7fea6bfbe73f8dd289e4 https://github.com/facebook/squangle/commit/229323a042d36ce1be0db90b6852c894df627fab https://github.com/facebook/wangle/commit/0be4784f0994698fafce9498295277c2d9b2c11b https://github.com/facebook/watchman/commit/77197bf27efb8ebbc5baa74f8dd9fb921197d0d5 https://github.com/facebookexperimental/rust-shed/commit/5d432d0223291f3b1fa4d282edbb10ec9532bba7 https://github.com/facebookincubator/katran/commit/e17a3c5cbea81e8c21512f25a6e036356d1e6542 https://github.com/facebookincubator/mvfst/commit/c77b5f36c6b3dba801dac441abf691fc2801768b Reviewed By: 2d2d2d2d2d fbshipit-source-id: dd1c49e604bd9df8a3cc3fbcd7cb6a52447459c8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f6c5d343dce1..f5c997ebfbac 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ac2484d5daf78f40081c6bc5972d015c5ea51cc0 +Subproject commit f80e2533cb224262aa825629d111793960326346 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e8692fd92970..4a7df06ef6df 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 4c4d0ceab845f4ab8a38e6aa5c1ecfae2b1cc883 +Subproject commit 0be4784f0994698fafce9498295277c2d9b2c11b From c6b0ee081912062b2c22a24d900b820300217868 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 14 Jul 2021 16:25:58 -0700 Subject: [PATCH 0216/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/5035d489c0d36bfc599d47c0dacbd2ff582e8f35 https://github.com/facebook/fbthrift/commit/05c22b40272704af3b038d587ad594a2dfcd4f97 https://github.com/facebook/fbzmq/commit/bd21594e5bef9d316c7cc6a85509b6fb6caded87 https://github.com/facebook/proxygen/commit/98d9acb4ff70b19d4d4d0518b5d1bec36043fbda https://github.com/facebook/rocksdb/commit/803a40d4123e8447a4b271ff5bb2e582ab45c6ef https://github.com/facebook/watchman/commit/96a1ac0ce5ba129a8bb8e0e26504b144ccb2c745 https://github.com/facebookexperimental/rust-shed/commit/66782226e871b7bc5203a947797d8f75347a500f Reviewed By: 2d2d2d2d2d fbshipit-source-id: f1f8308e50d2aed6c5c4dfebd5506d5c5a3a38c1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f5c997ebfbac..4978b6e56613 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f80e2533cb224262aa825629d111793960326346 +Subproject commit 05c22b40272704af3b038d587ad594a2dfcd4f97 From 7bbcbc8225c62355bd8fa2a50d87948650fc7c70 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 14 Jul 2021 21:37:49 -0700 Subject: [PATCH 0217/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/ea91c9bc37bd25f8adfa4652822263f196f2d482 Reviewed By: 2d2d2d2d2d fbshipit-source-id: e00b7d3b5145bb3bc384da37532fc447099ad2dd --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d8e989114f79..68f3078bbbbd 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 74f3c0434b36a780812443fcefd02f2d7fe6f6a7 +Subproject commit ea91c9bc37bd25f8adfa4652822263f196f2d482 From 48481e3b39bf64784473a1abcd37be6b7e8ec846 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 14 Jul 2021 22:11:54 -0700 Subject: [PATCH 0218/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/62f6c4b48d015221d48144ff9b69b0541e34708f https://github.com/facebook/fbthrift/commit/5d9a555412a2dcbc241ce3e4678aa868170bd297 https://github.com/facebook/fbzmq/commit/47254b8405354d951132472f61ab537524f15d73 https://github.com/facebook/proxygen/commit/08e12a163e741ca169ac4a493309b208061cd134 https://github.com/facebook/wangle/commit/b886015dfa8bf72b41137c6ce276893ecf8d1adb https://github.com/facebook/watchman/commit/7bbcbc8225c62355bd8fa2a50d87948650fc7c70 https://github.com/facebookincubator/fizz/commit/3a1e8475808c089486b2ecb2a24584c7d3f1cab0 https://github.com/facebookincubator/katran/commit/c0d7838c9388a3147389da98f30c21e9088b152a https://github.com/facebookincubator/mvfst/commit/bc69db06b386b077d3e4c9770e9397bf4c4692e8 https://github.com/rsocket/rsocket-cpp/commit/b508ca10e94b7766e03219956c092b9a92e7884e Reviewed By: 2d2d2d2d2d fbshipit-source-id: 6588e276ad254c74468948bb59f9b6792ad71b5a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4978b6e56613..7489c94e932a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 05c22b40272704af3b038d587ad594a2dfcd4f97 +Subproject commit 5d9a555412a2dcbc241ce3e4678aa868170bd297 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4a7df06ef6df..725f535a0499 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0be4784f0994698fafce9498295277c2d9b2c11b +Subproject commit b886015dfa8bf72b41137c6ce276893ecf8d1adb From 40a845bd701d1a8a030b533c9e1801af89c146e6 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 14 Jul 2021 22:45:21 -0700 Subject: [PATCH 0219/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c17f7b52aa3a965542279f674c93c288b86d5b94 https://github.com/facebook/fbthrift/commit/4af8888be5d92fd38b6417ed110c2c914c9212f0 https://github.com/facebook/fbzmq/commit/6c82d95dbfe09c25aa9c6c340964b8c8f659ba53 https://github.com/facebook/proxygen/commit/b859bdcc2936f6847a0b59c7e6ada3049a619d56 https://github.com/facebook/wangle/commit/edeb36bb6d46bc370278f7d1ddc37eb24493e21e https://github.com/facebook/watchman/commit/48481e3b39bf64784473a1abcd37be6b7e8ec846 https://github.com/facebookexperimental/rust-shed/commit/248eb1e4457bfc6db9a9f51a7986943b943a9477 https://github.com/facebookincubator/katran/commit/ad5e07a1a811cb6149a6d98674231deaa826eb20 https://github.com/facebookincubator/mvfst/commit/448ba9132909bd662b5f310f4ad8aea162532a93 Reviewed By: 2d2d2d2d2d fbshipit-source-id: d86be693a6c834c7bbdf2f6fe1b9b58e951a4032 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7489c94e932a..1837afdebf9a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5d9a555412a2dcbc241ce3e4678aa868170bd297 +Subproject commit 4af8888be5d92fd38b6417ed110c2c914c9212f0 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 725f535a0499..dfb4b0cc0bed 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b886015dfa8bf72b41137c6ce276893ecf8d1adb +Subproject commit edeb36bb6d46bc370278f7d1ddc37eb24493e21e From 60281d1a6ee7e65e93170749d5367025bd5a9d23 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 14 Jul 2021 23:24:03 -0700 Subject: [PATCH 0220/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/a3f7ab0f0cf248dd5de8df501c1361e4227c2cb1 https://github.com/facebook/fbthrift/commit/bd4beb6c5d9825ac9e41c5c6d7ad879551b420c3 https://github.com/facebook/fbzmq/commit/fd394a8de2f1109e43a3e0177b0b79aac12cf894 https://github.com/facebook/proxygen/commit/a35de6c7b02c99c82dfbd1c51273ea66d66656ab https://github.com/facebook/watchman/commit/40a845bd701d1a8a030b533c9e1801af89c146e6 https://github.com/facebookexperimental/rust-shed/commit/6e6d1bf4f54e1492129a3b47bb5ee428af456119 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 2ec8ae6acfaa92195b65b2344c8624329632c018 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1837afdebf9a..51bda866225a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4af8888be5d92fd38b6417ed110c2c914c9212f0 +Subproject commit bd4beb6c5d9825ac9e41c5c6d7ad879551b420c3 From 618776e8dbef8aa8de5d119ce218b203ed350943 Mon Sep 17 00:00:00 2001 From: Jan Kassens Date: Thu, 15 Jul 2021 07:12:41 -0700 Subject: [PATCH 0221/7387] update versions Summary: This matches the fbcode third-party versions and features. A diff in preparation to limit the changes seen in the next diff enabling autocargo. Reviewed By: krallin Differential Revision: D29680601 fbshipit-source-id: e99bd48573916c760f7b14548517a4e488e1c300 --- watchman/rust/serde_bser/Cargo.toml | 6 +++--- watchman/rust/watchman_client/Cargo.toml | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/watchman/rust/serde_bser/Cargo.toml b/watchman/rust/serde_bser/Cargo.toml index 8fb9181699df..0bd12035d951 100644 --- a/watchman/rust/serde_bser/Cargo.toml +++ b/watchman/rust/serde_bser/Cargo.toml @@ -10,10 +10,10 @@ license = "Apache-2.0" [dependencies] anyhow = "1.0" -byteorder = "1.0" -bytes = "0.4" +byteorder = "1.3" +bytes = { version = "1.0", features = ["serde"] } +serde = { version = "1.0.126", features = ["derive", "rc"] } thiserror = "1.0" -serde = { version = "1.0.102", features = ["derive"] } [dev-dependencies] maplit = "1.0" diff --git a/watchman/rust/watchman_client/Cargo.toml b/watchman/rust/watchman_client/Cargo.toml index 0627cc218eab..35e8b69edccc 100644 --- a/watchman/rust/watchman_client/Cargo.toml +++ b/watchman/rust/watchman_client/Cargo.toml @@ -11,13 +11,13 @@ exclude = ["examples/*"] [dependencies] anyhow = "1.0" -maplit = "1.0" -futures = { version = "0.3.13", features = ["async-await", "compat"] } bytes = { version = "1.0", features = ["serde"] } -serde = { version = "1.0.102", features = ["derive"] } +futures = { version = "0.3.13", features = ["async-await", "compat"] } +maplit = "1.0" +serde = { version = "1.0.126", features = ["derive", "rc"] } serde_bser = { version = "0.3", path = "../serde_bser" } -thiserror = ">=1.0.6" -tokio = { version = "1.5", features = ["full", "test-util"] } +thiserror = "1.0" +tokio = { version = "1.7.1", features = ["full", "test-util"] } tokio-util = { version = "0.6", features = ["full"] } [dev-dependencies] From a9afc02e2bb71494e8d277800ddbe33e45d455f0 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 15 Jul 2021 08:40:48 -0700 Subject: [PATCH 0222/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/d673760763ce9bb556e3412fc5be4d6ba7c09523 https://github.com/facebook/litho/commit/efa3362c273fb6255499b4e7cd6151ce734ba7a6 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 3c74a97136ec8fe61f92784ac4e51e03d4358644 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 51bda866225a..535a46790c09 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bd4beb6c5d9825ac9e41c5c6d7ad879551b420c3 +Subproject commit d673760763ce9bb556e3412fc5be4d6ba7c09523 From b4632d10efc6007c396ea2273bb5396f0c84fdf0 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 15 Jul 2021 09:13:33 -0700 Subject: [PATCH 0223/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/7484125dbb4b962744823a682252fc26a98e27cd https://github.com/facebook/fbthrift/commit/2067794e8e3f7226fc895b10add497483f707a62 https://github.com/facebook/fbzmq/commit/92715ad160491835ab78f61dab28ffa0771fb957 https://github.com/facebook/watchman/commit/a9afc02e2bb71494e8d277800ddbe33e45d455f0 https://github.com/facebookexperimental/rust-shed/commit/1f7d54275966e1f82b60bd9e11db160f6e71a256 Reviewed By: 2d2d2d2d2d fbshipit-source-id: f833ae436c7d718283515a20e1cc9aa12ba23fa8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 535a46790c09..1890381ae6a7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d673760763ce9bb556e3412fc5be4d6ba7c09523 +Subproject commit 2067794e8e3f7226fc895b10add497483f707a62 From 948f2dcdfd464712f8c94fe73d17d3d1ffb3c984 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 15 Jul 2021 13:12:32 -0700 Subject: [PATCH 0224/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/bdf3741482ea57d74dcfe66b2159e1a65b9525fd Reviewed By: 2d2d2d2d2d fbshipit-source-id: 4773a2233566e77dedafecbbf5a40ac3f17a1ea5 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 68f3078bbbbd..0740537b7b04 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ea91c9bc37bd25f8adfa4652822263f196f2d482 +Subproject commit bdf3741482ea57d74dcfe66b2159e1a65b9525fd From 9cdad1d68a1e3b22fe6884dcc14b7be2cf1a56a9 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 15 Jul 2021 13:44:47 -0700 Subject: [PATCH 0225/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/3d829c16e274338e137266f303aada7be39f2598 https://github.com/facebook/fbthrift/commit/58d5aee5918dc93b784d8d0a765604cc4eab2f0a https://github.com/facebook/fbzmq/commit/5ca93fdae77817cfb9e8dde6bf333bb1ad3fea13 https://github.com/facebook/proxygen/commit/ce4e4a1e76cea80dc188b2f5d07879a64f47a0e6 https://github.com/facebook/wangle/commit/709c9fb70ea1d09143e1ca266fc04477c1d3b9b3 https://github.com/facebook/watchman/commit/948f2dcdfd464712f8c94fe73d17d3d1ffb3c984 https://github.com/facebookincubator/fizz/commit/f366e77513015a71803ef71b9fe74a3b9e6469ff https://github.com/facebookincubator/katran/commit/e82be2fec3853086928d6eb0ee2f219e2a9e1c44 https://github.com/facebookincubator/mvfst/commit/a4c7966a2a1c062b7c8e1c055a7e5d3f94490988 https://github.com/rsocket/rsocket-cpp/commit/8c5226774cf2f25744cfe1a11d5ef10b6a6bd5f7 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 2feb79f95f06d98c0837bdfb2aa7e2f0435fdc68 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1890381ae6a7..7169555d440a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2067794e8e3f7226fc895b10add497483f707a62 +Subproject commit 58d5aee5918dc93b784d8d0a765604cc4eab2f0a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index dfb4b0cc0bed..a5d56ac42ac7 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit edeb36bb6d46bc370278f7d1ddc37eb24493e21e +Subproject commit 709c9fb70ea1d09143e1ca266fc04477c1d3b9b3 From 01980f86b261ab3fbd4610e855a4d1edb1d97037 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 15 Jul 2021 14:10:16 -0700 Subject: [PATCH 0226/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/13b8227a468bcb20ccf318fd80f5d8f9e670cfef https://github.com/facebook/fbthrift/commit/276f461218d1b8aa72cc8bc79b316ee1dd94ac65 https://github.com/facebook/fbzmq/commit/060379d872e524ff887e40edadf2d1f09437b506 https://github.com/facebook/folly/commit/d26d241b9fd6a3cc704401dc0e8d1edbb50e2be6 https://github.com/facebook/proxygen/commit/236e1265e66cadce3811b3e0f4597a4f6a8226d5 https://github.com/facebook/rocksdb/commit/31193a73a4353b4112eeb16cb3b91ec6318d2be0 https://github.com/facebook/wangle/commit/1c6269ab092086271fafa332276f87b700fe1ecc https://github.com/facebook/watchman/commit/9cdad1d68a1e3b22fe6884dcc14b7be2cf1a56a9 https://github.com/facebookexperimental/rust-shed/commit/7b5750bf79eb87ad67108dd5b5d2cb31cefb69da https://github.com/facebookincubator/katran/commit/d043c158a0d74448e145004d756ed62b663eb444 https://github.com/facebookincubator/mvfst/commit/8da7aa02b70e9418d654204866f02d07e669207f Reviewed By: 2d2d2d2d2d fbshipit-source-id: ef87486c669a879ae40736db9cf68ec1c0f67324 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7169555d440a..7b87a34a1266 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 58d5aee5918dc93b784d8d0a765604cc4eab2f0a +Subproject commit 276f461218d1b8aa72cc8bc79b316ee1dd94ac65 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0740537b7b04..9e63c42d3da0 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit bdf3741482ea57d74dcfe66b2159e1a65b9525fd +Subproject commit d26d241b9fd6a3cc704401dc0e8d1edbb50e2be6 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a5d56ac42ac7..4fe080706943 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 709c9fb70ea1d09143e1ca266fc04477c1d3b9b3 +Subproject commit 1c6269ab092086271fafa332276f87b700fe1ecc From b3a5b849d8ac7a62a783eee423fa597976456e28 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 15 Jul 2021 14:45:59 -0700 Subject: [PATCH 0227/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/1a0dcdccacb321358032779f23780fe09722d4dd https://github.com/facebook/fbthrift/commit/2847c7149b2746f13b36d638421f3fe352d3e6d2 https://github.com/facebook/fbzmq/commit/f96df24486e1bcd2ab5106484ee45396391b56f0 https://github.com/facebook/proxygen/commit/e844675e8d389f57bf459aaf210b016e6eaea679 https://github.com/facebook/wangle/commit/42fe2805f8a8f782b974fed0b93374e090f85ebf https://github.com/facebook/watchman/commit/01980f86b261ab3fbd4610e855a4d1edb1d97037 https://github.com/facebookexperimental/rust-shed/commit/7dda263214cd1f056bfc952a597e8538ab422481 https://github.com/facebookexternal/stl_tasks/commit/3d369e505512da8b00a82e1e4ce818b3b3d66f27 https://github.com/facebookincubator/fizz/commit/284e09bf986c70c343761780db886c835701f8c1 https://github.com/facebookincubator/katran/commit/405110310057e6e13b7b834378c3cdeb899ec673 https://github.com/facebookincubator/mvfst/commit/b3730253959131d5b8f0ee01f034559a44dfbabd https://github.com/rsocket/rsocket-cpp/commit/e7dc25bb6407b3b48a04922679d8df620fd64195 Reviewed By: 2d2d2d2d2d fbshipit-source-id: bb3be814b0b9e9ba2504894879febdd835467166 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7b87a34a1266..91bf9f45bc2f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 276f461218d1b8aa72cc8bc79b316ee1dd94ac65 +Subproject commit 2847c7149b2746f13b36d638421f3fe352d3e6d2 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4fe080706943..93dc90b1fbff 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1c6269ab092086271fafa332276f87b700fe1ecc +Subproject commit 42fe2805f8a8f782b974fed0b93374e090f85ebf From af02c7e7973a27db8acdd965aa41536f3f359216 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 15 Jul 2021 15:36:59 -0700 Subject: [PATCH 0228/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/9be3ccaf32c9c1c8b7d135a7b49d7b7f1ff24e0d https://github.com/facebook/fbthrift/commit/58ea20418b1feb3fc3495dc404ea82dbe05386c1 https://github.com/facebook/fbzmq/commit/02726a7077c96118fafa40963982a959243fbcea https://github.com/facebook/proxygen/commit/6d1a4ee124109a37f242aba5852c52b8a50cbd29 https://github.com/facebook/wangle/commit/7517da402bee0055642d7223c9b0d1f714d62891 https://github.com/facebook/watchman/commit/b3a5b849d8ac7a62a783eee423fa597976456e28 https://github.com/facebookexperimental/rust-shed/commit/89ce1cfcecc3531e3d0b40b65999ddfe333f0e22 https://github.com/facebookincubator/katran/commit/6646608570a4e2bf6bd799debb09745a04a53e26 https://github.com/facebookincubator/mvfst/commit/101062e9089060e9accc359ff0f8228d3b9d1e36 Reviewed By: 2d2d2d2d2d fbshipit-source-id: e308fcd2ccdbc4453215fee9d1f733f24f3b4275 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 91bf9f45bc2f..a3d3a15ce938 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2847c7149b2746f13b36d638421f3fe352d3e6d2 +Subproject commit 58ea20418b1feb3fc3495dc404ea82dbe05386c1 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 93dc90b1fbff..6135086d9a4b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 42fe2805f8a8f782b974fed0b93374e090f85ebf +Subproject commit 7517da402bee0055642d7223c9b0d1f714d62891 From 27daa18365fb7fe7ded88c529f6bc4ee11be302f Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 15 Jul 2021 16:13:23 -0700 Subject: [PATCH 0229/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/54d509a092d2153e4471767260133d8f12334047 https://github.com/facebook/fbthrift/commit/880786aa9695602a112c00e8912e38c45cfb1425 https://github.com/facebook/fbzmq/commit/9e02af76930f4a0026365a340c943bccaa6bfb27 https://github.com/facebook/proxygen/commit/1c87c2a1a9d0949cb9e1a8de576b7ffa52be5a88 https://github.com/facebook/watchman/commit/af02c7e7973a27db8acdd965aa41536f3f359216 https://github.com/facebookexperimental/rust-shed/commit/70dc556bbaa6ce605fb8329905c875d07f062ed5 Reviewed By: 2d2d2d2d2d fbshipit-source-id: a2bcc3ff66eca093026591f533bb6172beec7451 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a3d3a15ce938..ec7b9f693dca 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 58ea20418b1feb3fc3495dc404ea82dbe05386c1 +Subproject commit 880786aa9695602a112c00e8912e38c45cfb1425 From f25292a5727d8fa428b3ab26c5fb928d909bc3c0 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 15 Jul 2021 17:47:05 -0700 Subject: [PATCH 0230/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8aa69b5a20cf10a0ad9ad489f4cbf4652e75c39f https://github.com/facebook/rocksdb/commit/4e4ec1695759ff99af75d3b649bef93d45640676 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 6b6769c81d71f1cb6c872541862e7c72a6ffce5b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ec7b9f693dca..cf286540e5aa 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 880786aa9695602a112c00e8912e38c45cfb1425 +Subproject commit 8aa69b5a20cf10a0ad9ad489f4cbf4652e75c39f From 8e564c3f576d4cda1b4c8aaf99061da53e5c0c99 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 15 Jul 2021 19:01:58 -0700 Subject: [PATCH 0231/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/2f7fdc20e3313626a56f89ad333b96efa3d3d318 https://github.com/facebook/rocksdb/commit/b678cb1f8611f4981013c1b01a235652cb48b3c0 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 85e2a0f408ffe52e6df35f1147786fd2648afe79 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9e63c42d3da0..db364812d3ad 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d26d241b9fd6a3cc704401dc0e8d1edbb50e2be6 +Subproject commit 2f7fdc20e3313626a56f89ad333b96efa3d3d318 From f41d22326a545133e914d30d388aae888387af12 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 15 Jul 2021 19:29:59 -0700 Subject: [PATCH 0232/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/bb73ab731e6d3717f18b88f84c266bc5372e8ac2 https://github.com/facebook/fbthrift/commit/3e624341919ffbee26836c3bdc45a8dd4fcb7627 https://github.com/facebook/fbzmq/commit/d866c7549f1ae2fb9e875b93da41623c72155021 https://github.com/facebook/proxygen/commit/a0b6e54da21d725a07edb65ba8a58941f95f1168 https://github.com/facebook/wangle/commit/aba56bfc88d830836d5a6eea3e8fae30b3aa9593 https://github.com/facebook/watchman/commit/8e564c3f576d4cda1b4c8aaf99061da53e5c0c99 https://github.com/facebookincubator/fizz/commit/5d0e886bd64470363a0a49cf8ee8b78998f21302 https://github.com/facebookincubator/katran/commit/db105755f2c787481321e9ffbe156c9e39a8739a https://github.com/facebookincubator/mvfst/commit/dfc3b7e34963137880404bf2e26a014ae1ae3958 https://github.com/rsocket/rsocket-cpp/commit/880ac00b1e092dd6b1dec78060570c3ff5c3eb8e Reviewed By: 2d2d2d2d2d fbshipit-source-id: b490d7b06af84b2f7e9d11d0b78cf6aacb35725b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cf286540e5aa..5c82b0109592 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8aa69b5a20cf10a0ad9ad489f4cbf4652e75c39f +Subproject commit 3e624341919ffbee26836c3bdc45a8dd4fcb7627 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6135086d9a4b..181d1f24fe5f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7517da402bee0055642d7223c9b0d1f714d62891 +Subproject commit aba56bfc88d830836d5a6eea3e8fae30b3aa9593 From 44acbd443f17a3a86040c457731bcc5229354765 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 15 Jul 2021 19:57:21 -0700 Subject: [PATCH 0233/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/a9ddb82489b81f61faafd23543d4ce753e14d932 https://github.com/facebook/fbthrift/commit/1a9d8b5b01742fdb28a716fa37e80d9311291de7 https://github.com/facebook/fbzmq/commit/976868eeb9719894f8b492614d3a4573ddcc1464 https://github.com/facebook/proxygen/commit/3bde1b1a96b5bac8807e11a62d45a62725754b4c https://github.com/facebook/wangle/commit/55db03421b5d40067373a4aa5037596e8b221829 https://github.com/facebook/watchman/commit/f41d22326a545133e914d30d388aae888387af12 https://github.com/facebookexperimental/rust-shed/commit/19302d115799a7c205638feb3dd12ce4f7c4ef71 https://github.com/facebookincubator/katran/commit/40c498ce782c08ba190e2a6569dc3381c06348c8 https://github.com/facebookincubator/mvfst/commit/61c7a55f80e42840bb760712bacaf6eff48405e7 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 293fe4a1f6f5a184c7121ef9fbf0a7c402ede88f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5c82b0109592..e1c74b0610ff 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3e624341919ffbee26836c3bdc45a8dd4fcb7627 +Subproject commit 1a9d8b5b01742fdb28a716fa37e80d9311291de7 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 181d1f24fe5f..382f6918f8ed 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit aba56bfc88d830836d5a6eea3e8fae30b3aa9593 +Subproject commit 55db03421b5d40067373a4aa5037596e8b221829 From a407bd2e274f5c1bf04a00c57c2662b5a0549b88 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 15 Jul 2021 20:33:58 -0700 Subject: [PATCH 0234/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/f1307afaf4d822f8a641fcdf4af03527ffcd6e06 https://github.com/facebook/fbthrift/commit/b79ce221ce11ffa1275df4bd10150c7e877ac875 https://github.com/facebook/fbzmq/commit/13fa9f5d47e8850acd440b5a285d41b38b9a2a31 https://github.com/facebook/proxygen/commit/b70ef8bb0c73e28e93b2d4cc67675ec829b11d30 https://github.com/facebook/watchman/commit/44acbd443f17a3a86040c457731bcc5229354765 https://github.com/facebookexperimental/rust-shed/commit/31157794e5b7b51e2a52aaa3f8c6e8263072b4ee Reviewed By: 2d2d2d2d2d fbshipit-source-id: 7d7ee7152384896def824b27b94d5d42c1edd670 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e1c74b0610ff..7e065fe6f67c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1a9d8b5b01742fdb28a716fa37e80d9311291de7 +Subproject commit b79ce221ce11ffa1275df4bd10150c7e877ac875 From 417b2db1557079140b71f446c3b72d290d312491 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 15 Jul 2021 22:28:32 -0700 Subject: [PATCH 0235/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/877a542b9246ff89b0af01f452a84f08b527a12c Reviewed By: 2d2d2d2d2d fbshipit-source-id: 2733eb6bd4a309a2375860c1f194ec64babb1507 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7e065fe6f67c..505b14a1d8e2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b79ce221ce11ffa1275df4bd10150c7e877ac875 +Subproject commit 877a542b9246ff89b0af01f452a84f08b527a12c From 0dfee2adce6f37976d6b0b9ef3b9186ed464bf5b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 16 Jul 2021 07:10:54 -0700 Subject: [PATCH 0236/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/abe0b43f01c43f43503d9e0f5abc6cb4399b3966 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 12033af1e91b6e00c4bb89117ec488f687d9e46c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 505b14a1d8e2..668928f8f0e5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 877a542b9246ff89b0af01f452a84f08b527a12c +Subproject commit abe0b43f01c43f43503d9e0f5abc6cb4399b3966 From 53a7a45be2822a7012f4c76a44ec78b61b8e016c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 16 Jul 2021 09:15:39 -0700 Subject: [PATCH 0237/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8f5e83be073673a04c435e7e079080389234a159 Reviewed By: 2d2d2d2d2d fbshipit-source-id: f2f84f1e6566aa2f3abb5c0693853b7cf80cf7c4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 668928f8f0e5..2c49b3c20f84 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit abe0b43f01c43f43503d9e0f5abc6cb4399b3966 +Subproject commit 8f5e83be073673a04c435e7e079080389234a159 From 6294ebbde435b4075851b4d4c147a5eb13929035 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 16 Jul 2021 10:33:51 -0700 Subject: [PATCH 0238/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/ca7ce442f965b02c881087f3ea4efc95ea99787f Reviewed By: 2d2d2d2d2d fbshipit-source-id: 674723b7a7993da61e9bb3083c540928b9c47f98 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index db364812d3ad..114aa38f266b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 2f7fdc20e3313626a56f89ad333b96efa3d3d318 +Subproject commit ca7ce442f965b02c881087f3ea4efc95ea99787f From 11273605307f6bc4a3283aa805eb01cb6a89e29e Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 16 Jul 2021 11:01:22 -0700 Subject: [PATCH 0239/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ca12dd0aa7059a7a41560b0fcf16f75bf0f71327 https://github.com/facebook/fbthrift/commit/db9a72cadc4f7b3407a0324330f66e301b286835 https://github.com/facebook/fbzmq/commit/70efd0d39308c61f68b4b64d012bf1bac7a547a3 https://github.com/facebook/litho/commit/41c4de8db91ec1e2facf3cfae8f8314411f1d37c https://github.com/facebook/proxygen/commit/a80b7758042ab5aea03773a2086adbe2167ea1b0 https://github.com/facebook/rocksdb/commit/0229a88dfe4c48ef3edc5115b114cebe7b94d604 https://github.com/facebook/wangle/commit/6554b542eec8a065d13603584f39f483efa46b92 https://github.com/facebook/watchman/commit/6294ebbde435b4075851b4d4c147a5eb13929035 https://github.com/facebookincubator/fizz/commit/04855aa8acbfec8792028da716b22a623cadef51 https://github.com/facebookincubator/katran/commit/9fe84341752accc96eed8b9b788d307a949b982c https://github.com/facebookincubator/mvfst/commit/27e007357b8a578575564c5e7a6531b86c7cd19d https://github.com/rsocket/rsocket-cpp/commit/381315afb77b15b706e02e84e4495163d80457c3 Reviewed By: 2d2d2d2d2d fbshipit-source-id: a13e6e1fa4af6d7458b13ff8fbbc916399bc6ac7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2c49b3c20f84..4d6d231b485d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8f5e83be073673a04c435e7e079080389234a159 +Subproject commit db9a72cadc4f7b3407a0324330f66e301b286835 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 382f6918f8ed..85b79811fb38 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 55db03421b5d40067373a4aa5037596e8b221829 +Subproject commit 6554b542eec8a065d13603584f39f483efa46b92 From c680a454665ad53c0349d94e261b7dafd23b8a66 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 16 Jul 2021 11:26:10 -0700 Subject: [PATCH 0240/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/74389467209e183cbad10e8e1be8697d4a6bb552 https://github.com/facebook/fbthrift/commit/59a9ea84901ee35c00b0f10db83e56f63db794b2 https://github.com/facebook/fbzmq/commit/d6b6f6f27e837731c6fd357f2efaf4c81e67de01 https://github.com/facebook/proxygen/commit/b28b1723372b6ed3f1e1bda53e728e6a520b4cf2 https://github.com/facebook/wangle/commit/c76ab87f33a4c52bc35cbaef92786f2deee0636d https://github.com/facebook/watchman/commit/11273605307f6bc4a3283aa805eb01cb6a89e29e https://github.com/facebookexperimental/rust-shed/commit/d935fea9ac458efd890039175dabdb9055980dde https://github.com/facebookincubator/katran/commit/2a3704ce8a46f475659947209add98908e31cb81 https://github.com/facebookincubator/mvfst/commit/fb6644a16183c4a80af81754819f6187502fbf52 Reviewed By: 2d2d2d2d2d fbshipit-source-id: b09cf3b5e62a16954d8aa6d68507ff334c1cab8b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4d6d231b485d..0a7552b6aafa 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit db9a72cadc4f7b3407a0324330f66e301b286835 +Subproject commit 59a9ea84901ee35c00b0f10db83e56f63db794b2 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 85b79811fb38..9198efa84c3c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6554b542eec8a065d13603584f39f483efa46b92 +Subproject commit c76ab87f33a4c52bc35cbaef92786f2deee0636d From e3b65c816f830e1c5b8c796ea2d9968541e888f2 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 16 Jul 2021 12:06:11 -0700 Subject: [PATCH 0241/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/4faf65a439d5da0eaba0010fc4417fda7b287797 https://github.com/facebook/fbthrift/commit/b157feff61c3bdefb138753af7636dae5a7b3c08 https://github.com/facebook/fbzmq/commit/b2be36349d5219d957880dabbfc5b332336c3555 https://github.com/facebook/mcrouter/commit/9f2590d97f37a66a046059984db41d356df80c81 https://github.com/facebook/proxygen/commit/71317952775cf725b91399eaef26e74f732371fc https://github.com/facebook/watchman/commit/c680a454665ad53c0349d94e261b7dafd23b8a66 https://github.com/facebookexperimental/rust-shed/commit/48de6d7d22289149ab388e5d3b37a1f3da0d654a https://github.com/facebookexternal/stl_tasks/commit/3d33c46549c563178ed24f7e978cc62d4db46cf0 Reviewed By: 2d2d2d2d2d fbshipit-source-id: e35969e2d5fe300c995d0149f5ba4cb5d1f3e7b8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0a7552b6aafa..36a74c4dafde 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 59a9ea84901ee35c00b0f10db83e56f63db794b2 +Subproject commit b157feff61c3bdefb138753af7636dae5a7b3c08 From e2b6c4ba3e653b299b253c9d2c5b5de13d640bdf Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 16 Jul 2021 12:39:58 -0700 Subject: [PATCH 0242/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ed87810e6ee7bb2cf94ab9dcb9e7a3a09cef5bad https://github.com/facebook/fbzmq/commit/39bf875ce91d43dc7f1aad3fa53232074240c891 https://github.com/facebook/folly/commit/653703a3859a0270836e725f0fb9e0556445e3b4 https://github.com/facebook/watchman/commit/e3b65c816f830e1c5b8c796ea2d9968541e888f2 https://github.com/facebookexperimental/rust-shed/commit/ddee971093baf2293e63d1f51420770dd6d15756 Reviewed By: 2d2d2d2d2d fbshipit-source-id: c0e323a7dc3cc4ded79837f00da5ab275b79b2d5 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 114aa38f266b..391f53296f58 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ca7ce442f965b02c881087f3ea4efc95ea99787f +Subproject commit 653703a3859a0270836e725f0fb9e0556445e3b4 From 74534743cf6ef3652aa2c333e000ebb85cc4c73f Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 16 Jul 2021 13:05:52 -0700 Subject: [PATCH 0243/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/bb4fe81caa7390b6cabe6bfcc857e4ea616a18ca https://github.com/facebook/fbthrift/commit/bbdc820e711295dece0727f00d15b2a60c32db67 https://github.com/facebook/fbzmq/commit/7593a582dbffc2298f83ed0a7b9bc9ff2f5bdeb5 https://github.com/facebook/proxygen/commit/8578922355e9a71b02e55c50cdf8c00afc24a6d0 https://github.com/facebook/rocksdb/commit/1e5b631e514bd5902db9c0f736740bdf1112953c https://github.com/facebook/wangle/commit/14f71cf724e2d07354ee0e7529e14e91a794fa17 https://github.com/facebook/watchman/commit/e2b6c4ba3e653b299b253c9d2c5b5de13d640bdf https://github.com/facebookincubator/fizz/commit/34ac4721e7ecba1faf655446a2a056a34574a168 https://github.com/facebookincubator/katran/commit/10ec7903f97e2ffceb14c07376068a550b2ca90b https://github.com/facebookincubator/mvfst/commit/2a886ba9d9ada63c18707bf83e770f00d97b4c8a https://github.com/rsocket/rsocket-cpp/commit/4c15d66422f75283e4dd1bead8de2880957e3fb0 Reviewed By: 2d2d2d2d2d fbshipit-source-id: f11889bb30b9b6f4d8c2b561e0bbc95554a023a3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 36a74c4dafde..01daa7d2ae86 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b157feff61c3bdefb138753af7636dae5a7b3c08 +Subproject commit bbdc820e711295dece0727f00d15b2a60c32db67 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9198efa84c3c..3b7f9e8cfed4 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c76ab87f33a4c52bc35cbaef92786f2deee0636d +Subproject commit 14f71cf724e2d07354ee0e7529e14e91a794fa17 From d717ae0f57c0ea9ad6a5dc381d96f8155c2a0b39 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 16 Jul 2021 14:03:48 -0700 Subject: [PATCH 0244/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/f2ba5f4a3f5cfbcaefddde5794f2df9475d1414d https://github.com/facebook/fbthrift/commit/ef6bfa6d4b29901915166d48792d4295caebbd47 https://github.com/facebook/fbzmq/commit/a2ddd0afc1376e680593cd5a1a48441b1ca37e1a https://github.com/facebook/proxygen/commit/25233cf5d0f23d033f2557812aa31152e3c78ee5 https://github.com/facebook/wangle/commit/2a0ab306bd39b47779f4df9e2007239172d8e9d5 https://github.com/facebook/watchman/commit/74534743cf6ef3652aa2c333e000ebb85cc4c73f https://github.com/facebookexperimental/rust-shed/commit/0998b712ae4593c6c16e81a4ce8ca04907244874 https://github.com/facebookincubator/katran/commit/33faec596708613551e38d54b41771c8318183b6 https://github.com/facebookincubator/mvfst/commit/02c50615a44da21d7dfd7f71307a731b3da22f05 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 822a09b75a7ba779e42acdae3857bccfb18b87c4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 01daa7d2ae86..38cccb80ce85 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bbdc820e711295dece0727f00d15b2a60c32db67 +Subproject commit ef6bfa6d4b29901915166d48792d4295caebbd47 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3b7f9e8cfed4..6dbfeb1e4699 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 14f71cf724e2d07354ee0e7529e14e91a794fa17 +Subproject commit 2a0ab306bd39b47779f4df9e2007239172d8e9d5 From 965efa806fe8659555eb8a360a0fb89b0734a42e Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 16 Jul 2021 14:35:42 -0700 Subject: [PATCH 0245/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/02984da3ba00608838e3210993bf068a11aad29e https://github.com/facebook/fbthrift/commit/99a16225cf3aab4133736455df706e9148d8dca5 https://github.com/facebook/fbzmq/commit/1ce7d818ec1b46cd70e34ddf9403c739f137408c https://github.com/facebook/proxygen/commit/508f3d1a65385a0798ef098d51b7e70714a6042d https://github.com/facebook/rocksdb/commit/df5dc73beca0baed622f110068e36a44d4c3095a https://github.com/facebook/watchman/commit/d717ae0f57c0ea9ad6a5dc381d96f8155c2a0b39 https://github.com/facebookexperimental/rust-shed/commit/22567a4d563701d2d2028da778016a6b0df394a5 https://github.com/facebookincubator/fizz/commit/380dc4abe160f2d3339f3d8f1773e00b034e94c6 Reviewed By: 2d2d2d2d2d fbshipit-source-id: b22d1d2f8cd6d5f635fdc6a076204b4ee7a7f210 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 38cccb80ce85..abc0cc29bb68 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ef6bfa6d4b29901915166d48792d4295caebbd47 +Subproject commit 99a16225cf3aab4133736455df706e9148d8dca5 From 6ed5f4aff94edfa33b37f6ec6fad9b8864bc82ed Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 16 Jul 2021 14:55:50 -0700 Subject: [PATCH 0246/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/bd8c4f2db705d12bda394f86344ce6b0ffd782ca https://github.com/facebook/fbzmq/commit/84fd1514032dbcfb36dc1db154c0f8c029ee1780 https://github.com/facebook/proxygen/commit/40884e856416b5b200f1da84fb7da1faf2fce2dc https://github.com/facebook/wangle/commit/69e064f678256dd0a634412249bba32c3f89bb95 https://github.com/facebook/watchman/commit/965efa806fe8659555eb8a360a0fb89b0734a42e https://github.com/facebookexperimental/rust-shed/commit/92840487c302b395cf18ae224ad6e7d85bf07f34 https://github.com/facebookincubator/katran/commit/32077a97c464e04cd0fa8a84457b845929a5d994 https://github.com/facebookincubator/mvfst/commit/f8e0a5ec24ccddb3ad95ad669534e1cc3e500d77 Reviewed By: 2d2d2d2d2d fbshipit-source-id: ffef915beb8c2f31ac3d65c775f5be88a34d727b --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6dbfeb1e4699..b20e3a4cada3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2a0ab306bd39b47779f4df9e2007239172d8e9d5 +Subproject commit 69e064f678256dd0a634412249bba32c3f89bb95 From 6aca7aea1599f11dd44b9d5f3b3b4d10a636a0cd Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 16 Jul 2021 15:23:01 -0700 Subject: [PATCH 0247/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/f4578c94a39c57ed89bb8480a6242e520f7964b3 https://github.com/facebook/fbthrift/commit/213c693131c18c2d5d3c5d9e441b2f7c71f13b8f https://github.com/facebook/fbzmq/commit/577fe813b797a18a36b7893fcca88a416cd966cb https://github.com/facebook/proxygen/commit/8738bcff36c2353c2f07a3cfa172082ad3f11b20 https://github.com/facebook/rocksdb/commit/ac37bfded0cdb3351809a1ca1417244ff432c558 https://github.com/facebook/watchman/commit/6ed5f4aff94edfa33b37f6ec6fad9b8864bc82ed Reviewed By: 2d2d2d2d2d fbshipit-source-id: 28f71dde19432ee01849a571e8209e0df5af0a79 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index abc0cc29bb68..855e8e8afdb9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 99a16225cf3aab4133736455df706e9148d8dca5 +Subproject commit 213c693131c18c2d5d3c5d9e441b2f7c71f13b8f From 1d34af89f9e8d18dcc7f4e7b22319708f70fb118 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 16 Jul 2021 16:17:57 -0700 Subject: [PATCH 0248/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/28338c5a1bf1cd72e95c047a037945d24d344196 https://github.com/facebook/fbthrift/commit/2b0a9d404c2b9065533e7dc58cec64cb5449d643 https://github.com/facebook/fbzmq/commit/5a5b4abd0944895e823909e135a29a4ee95a0528 https://github.com/facebook/rocksdb/commit/a379dae4f7fc280f6e1e16890495e8f380d73aee https://github.com/facebook/watchman/commit/6aca7aea1599f11dd44b9d5f3b3b4d10a636a0cd https://github.com/facebookexperimental/rust-shed/commit/4b971828fc524ee1d0c3e5de0422bfb759b4ab7a https://github.com/facebookexternal/stl_tasks/commit/ea9454034834deb66035b715c19e4a9ed14d5cb5 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 0631b10783bf598e525bd53f75e728aca810d0bd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 855e8e8afdb9..2a7c902208c1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 213c693131c18c2d5d3c5d9e441b2f7c71f13b8f +Subproject commit 2b0a9d404c2b9065533e7dc58cec64cb5449d643 From aed0d0da2b5fbd086639f08b2fc9bf412be1b8fc Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 16 Jul 2021 17:45:44 -0700 Subject: [PATCH 0249/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/8a845377baabe4f35f74225e9a29136a84d3dc65 https://github.com/facebook/fbzmq/commit/27b0f51ff4edaf3bb945e8ce9ffca406ac5732c6 https://github.com/facebook/folly/commit/b8fdbc94a7defaa5b4b0ec43f59bccf2e71cadd3 https://github.com/facebook/rocksdb/commit/3455ab0e2bd90fd2faed6fe4dabca795430bfb10 https://github.com/facebook/watchman/commit/1d34af89f9e8d18dcc7f4e7b22319708f70fb118 https://github.com/facebookexperimental/rust-shed/commit/8519192653e853da7dc8f0d2d300182d7f37605a Reviewed By: 2d2d2d2d2d fbshipit-source-id: e7141ae4a3c7ed8f4c4598f085914f0710143697 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 391f53296f58..0fdeae79b0bb 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 653703a3859a0270836e725f0fb9e0556445e3b4 +Subproject commit b8fdbc94a7defaa5b4b0ec43f59bccf2e71cadd3 From f620a352fd0b5917c1442ef78bd22d5f40ff20a0 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 16 Jul 2021 18:07:52 -0700 Subject: [PATCH 0250/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/314b640b486e4edbf6f1109066c005f39400ee67 https://github.com/facebook/fbthrift/commit/a7c7c9c0f101fe938bb75d376e1fd3d0109ae600 https://github.com/facebook/fbzmq/commit/8ba6d12c5c384016937860f813d0fd76c32d604d https://github.com/facebook/proxygen/commit/803b636e61886304b4aa5f14cdc45c7dd151688e https://github.com/facebook/rocksdb/commit/c04a86a0e9a28ef3e02d5fe74928dfd5e8fdd910 https://github.com/facebook/wangle/commit/243894b5dcae741ab8abed29274a5bdbc103e430 https://github.com/facebook/watchman/commit/aed0d0da2b5fbd086639f08b2fc9bf412be1b8fc https://github.com/facebookincubator/fizz/commit/15cb9b3f1a06e7e1b32f779fb7826b02a20f0efc https://github.com/facebookincubator/katran/commit/64fb0b968c10decb6a0072f2f24fe0f182df861f https://github.com/facebookincubator/mvfst/commit/c05ff65aae8e88c0446eb83a98216ab4388da56f https://github.com/rsocket/rsocket-cpp/commit/89b1bd08492b2b3ebd3f4e6ac81bc6c8e1bf229b Reviewed By: 2d2d2d2d2d fbshipit-source-id: 5626b50f197a0de8136d04da1fed3329823eb83f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2a7c902208c1..3b810c25c753 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2b0a9d404c2b9065533e7dc58cec64cb5449d643 +Subproject commit a7c7c9c0f101fe938bb75d376e1fd3d0109ae600 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b20e3a4cada3..7a3f520d746d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 69e064f678256dd0a634412249bba32c3f89bb95 +Subproject commit 243894b5dcae741ab8abed29274a5bdbc103e430 From e25cd1cf222b03c2fbc2797674d2b2824e8a2ce5 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 16 Jul 2021 18:52:31 -0700 Subject: [PATCH 0251/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/e33de4d1e3d22175d76d23a125eb63905647a680 https://github.com/facebook/fbthrift/commit/00eed2c5013738a71fa004a30355e3d3ef511ffb https://github.com/facebook/fbzmq/commit/18fb31216b44aa33963d4bf3c89625483aebc6cb https://github.com/facebook/proxygen/commit/c407a6368a1c09fd2ce2ea3c57030fbd2762b34e https://github.com/facebook/wangle/commit/629e45417a87844b62a750c95f30c9266b2da5f5 https://github.com/facebook/watchman/commit/f620a352fd0b5917c1442ef78bd22d5f40ff20a0 https://github.com/facebookexperimental/rust-shed/commit/3c8d8a519fee3ed1fbe4a0842ab4defbbd70d0eb https://github.com/facebookincubator/katran/commit/fb9cc2f9d75adcda5cac8c9435d7cce8162799a2 https://github.com/facebookincubator/mvfst/commit/d80248f57785ab79363cbfc5e809f0aa8d1c7b5e Reviewed By: 2d2d2d2d2d fbshipit-source-id: 1b9634f154c68c111567563995f4c8bfbcfd6a18 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3b810c25c753..e3a483253cfe 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a7c7c9c0f101fe938bb75d376e1fd3d0109ae600 +Subproject commit 00eed2c5013738a71fa004a30355e3d3ef511ffb diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7a3f520d746d..6bc6a561229d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 243894b5dcae741ab8abed29274a5bdbc103e430 +Subproject commit 629e45417a87844b62a750c95f30c9266b2da5f5 From 4e9b9da8b854d841033ebe37175ac610bdf10f31 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 16 Jul 2021 19:17:14 -0700 Subject: [PATCH 0252/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/1df2f2b282b09a47cc46a62fc8d5f5839db9f11b https://github.com/facebook/fbthrift/commit/7c03ce77811a3145b6f2ed9eb146eca1fbbf252a https://github.com/facebook/fbzmq/commit/7441dc286a12b1c81a9145c728bc98c4d84f67dd https://github.com/facebook/proxygen/commit/2083599ecce6daaf617690b3c47a06109da67cba https://github.com/facebook/watchman/commit/e25cd1cf222b03c2fbc2797674d2b2824e8a2ce5 https://github.com/facebookexperimental/rust-shed/commit/b7d1f44cd2968ea1093862ade82046f9c94425fd https://github.com/facebookincubator/conversionsapi-tag-for-googletagmanager/commit/9d7cfe44251dc0426564ba6d9a2d8dc9e97c1fc6 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 02706e85ffd906e9e804e19cfde047dddd8dac98 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e3a483253cfe..1ddf752b7a4d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 00eed2c5013738a71fa004a30355e3d3ef511ffb +Subproject commit 7c03ce77811a3145b6f2ed9eb146eca1fbbf252a From efce41e52f81cc5b33a0788d22d4429e61bc298a Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 16 Jul 2021 21:21:55 -0700 Subject: [PATCH 0253/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/d327ce838c81b6abea6744ee566e460e94659c66 Reviewed By: 2d2d2d2d2d fbshipit-source-id: b2b235246ef8cc6eac130fd4c1b3b5293be0e0d7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1ddf752b7a4d..93eed3bdd739 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7c03ce77811a3145b6f2ed9eb146eca1fbbf252a +Subproject commit d327ce838c81b6abea6744ee566e460e94659c66 From f4fac1c49963f7e61940ed91e0b7021faedfb48b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Sat, 17 Jul 2021 16:16:49 -0700 Subject: [PATCH 0254/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/0729042dc349df3ea433461133dee2def189d60b Reviewed By: 2d2d2d2d2d fbshipit-source-id: e2ddb2b2e8bff125f395ac10d907d2e6135c68fd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 93eed3bdd739..e7b0518d8c5a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d327ce838c81b6abea6744ee566e460e94659c66 +Subproject commit 0729042dc349df3ea433461133dee2def189d60b From fb09d0250b903962281c1a82540b2f344a65682e Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 19 Jul 2021 05:04:22 -0700 Subject: [PATCH 0255/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/fbe1e6f4676954d62a67d1ff32a125d048ec571e Reviewed By: 2d2d2d2d2d fbshipit-source-id: b0128312508b667e894aa86f5befcddf23468081 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e7b0518d8c5a..7ba4dbc2c41a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0729042dc349df3ea433461133dee2def189d60b +Subproject commit fbe1e6f4676954d62a67d1ff32a125d048ec571e From 48d84359ce6ebf44727914a0d3999f3c633ae9d7 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 19 Jul 2021 06:22:43 -0700 Subject: [PATCH 0256/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/81657eec53e52868723747559024c644dff9b324 https://github.com/facebook/fbthrift/commit/cea1dc0fb5bb10d057bed95a89bd4a8a9da8b527 https://github.com/facebook/fbzmq/commit/2e276bbc67a7a958799470720689221b59d526d8 https://github.com/facebook/litho/commit/dc2cd813468073e2d72f2cea47851ebf80ab5c67 https://github.com/facebook/watchman/commit/fb09d0250b903962281c1a82540b2f344a65682e https://github.com/facebookexperimental/rust-shed/commit/56edaa253c1df46089880b60e2c7d6e3e61409ab Reviewed By: 2d2d2d2d2d fbshipit-source-id: 2909a125006ca44c30f54b0193199b8a15e58a71 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7ba4dbc2c41a..a17a0ddc582d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit fbe1e6f4676954d62a67d1ff32a125d048ec571e +Subproject commit cea1dc0fb5bb10d057bed95a89bd4a8a9da8b527 From d80aa78d21bd6548a6a9f7f94e6c238abc2f8560 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 19 Jul 2021 09:09:10 -0700 Subject: [PATCH 0257/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/49162e4b9700b7a20eb540803406b8d89bee729e https://github.com/facebook/rocksdb/commit/d5f3b77f23b2fbd887f6af045d5f8785ba4caa9c Reviewed By: 2d2d2d2d2d fbshipit-source-id: 29b409327eb84b2213a7ca15e2615ccf7ef89033 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a17a0ddc582d..2307d96a8004 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cea1dc0fb5bb10d057bed95a89bd4a8a9da8b527 +Subproject commit 49162e4b9700b7a20eb540803406b8d89bee729e From c00b3ab6c7345fc115be23a6aed50bbf598cca2f Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 19 Jul 2021 15:13:49 -0700 Subject: [PATCH 0258/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8664a02e0c2d83a2857ffe222f18b9793f000aae https://github.com/pytorch/fbgemm/commit/630a5a43a2f634bf58e618e4363d575465f4b113 Reviewed By: wittgenst fbshipit-source-id: a7cc7e57e5a6ce35ca3e14f64ed27ca4e0dfa395 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2307d96a8004..fd4eb0ae91f2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 49162e4b9700b7a20eb540803406b8d89bee729e +Subproject commit 8664a02e0c2d83a2857ffe222f18b9793f000aae From 46cf93eb0572388b02977c567b5a5836a03120a8 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 19 Jul 2021 15:47:34 -0700 Subject: [PATCH 0259/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/dfe8e6a7ee0beee52488b50baad6c461ce743c08 https://github.com/facebook/fbthrift/commit/5cd7f3615ab090c15f363f438561f6ce7885c84b https://github.com/facebook/fbzmq/commit/b54adcf727b33b79d0ccc17c7aced830a552d0bf https://github.com/facebook/mcrouter/commit/8c4b699d617a78acfe072b98e929bdfaa311152c https://github.com/facebook/watchman/commit/c00b3ab6c7345fc115be23a6aed50bbf598cca2f https://github.com/facebookexperimental/rust-shed/commit/cfb5c77f7aec4c8b252040b2f7199fa2c48e30eb Reviewed By: wittgenst fbshipit-source-id: 62cbd93527a7bea63b3220a42f2872397ab6ee78 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index fd4eb0ae91f2..6d2e9e93901f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8664a02e0c2d83a2857ffe222f18b9793f000aae +Subproject commit 5cd7f3615ab090c15f363f438561f6ce7885c84b From ae7f661cf39cd829ebfbd255debf8e7e067e3279 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 19 Jul 2021 16:19:59 -0700 Subject: [PATCH 0260/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/da140c495eb5decba4c616765cd8463a2a885260 https://github.com/facebook/fbthrift/commit/ca06e49139e82c8e3c8f6d15a770db93678b5489 https://github.com/facebook/fbzmq/commit/657399403d44cee8baaa969a598285f69a98c858 https://github.com/facebook/watchman/commit/46cf93eb0572388b02977c567b5a5836a03120a8 https://github.com/facebookexperimental/rust-shed/commit/bdb8a06f8318f8426d16451a58a17767dda52626 https://github.com/facebookexternal/stl_tasks/commit/235d9b0d1520e1c1c454f3746b2d874e44e48cc9 https://github.com/facebookincubator/mvfst/commit/a1b662877471cb4e263107fd9977ed53e16cb741 Reviewed By: wittgenst fbshipit-source-id: 51a8c81ff7c5fc09b89076a761f24d3c416b933e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6d2e9e93901f..7aac27b17da5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5cd7f3615ab090c15f363f438561f6ce7885c84b +Subproject commit ca06e49139e82c8e3c8f6d15a770db93678b5489 From b90669aa50b53d177aae1ff4cc53fff632f2cf6c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 19 Jul 2021 16:59:18 -0700 Subject: [PATCH 0261/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/77d3d81fda666957c20b3f7e756eeebce16a06c5 https://github.com/facebook/fbthrift/commit/628722d849c586967057551051f6d0b2cfdfe935 https://github.com/facebook/fbzmq/commit/5c510fa0cce61468dadef9c61da539bbebdcd7ad https://github.com/facebook/proxygen/commit/4b9407979eba72356605a0e88436699a2a61d9c0 https://github.com/facebook/watchman/commit/ae7f661cf39cd829ebfbd255debf8e7e067e3279 https://github.com/facebookexperimental/rust-shed/commit/d7725bbc2ca94a44362ec2ce1631ef75bd1fcb58 https://github.com/facebookexternal/stl_tasks/commit/a059c542177acac08071646e26f0927725eff680 Reviewed By: wittgenst fbshipit-source-id: 78c73cddaa4e5e0fa47138bde6776dfb65e7ab93 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7aac27b17da5..0aa29ffee0f8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ca06e49139e82c8e3c8f6d15a770db93678b5489 +Subproject commit 628722d849c586967057551051f6d0b2cfdfe935 From eb577aed122f6344f931e2d033818d29d0972fcc Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 19 Jul 2021 17:31:55 -0700 Subject: [PATCH 0262/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c8362ce5b3b3a819065f3fb9bf5fe9afebc0ed7e https://github.com/facebook/fbthrift/commit/c2c5c491e8439d890659e834b8ecfff43e0e6cf4 https://github.com/facebook/fbzmq/commit/51f8df71ce83db52bfff8833b188749ed1ec1187 https://github.com/facebook/rocksdb/commit/bbc85a5f22b0cf4a63cf0f68ecdba16c518e6b64 https://github.com/facebook/watchman/commit/b90669aa50b53d177aae1ff4cc53fff632f2cf6c https://github.com/facebookexperimental/rust-shed/commit/55114f4cc83e0fecd437cd979d6c75295439ee08 Reviewed By: wittgenst fbshipit-source-id: 4785924b0cf033840d5aad2e435dcd4279ccf48a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0aa29ffee0f8..536b5fcce642 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 628722d849c586967057551051f6d0b2cfdfe935 +Subproject commit c2c5c491e8439d890659e834b8ecfff43e0e6cf4 From 0ebab44ccb424fa07327e37caeb174d97ef9dc43 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 02:16:24 -0700 Subject: [PATCH 0263/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/f7ccdc9584ae28c9d38ca342a0f3a01e02833952 Reviewed By: wittgenst fbshipit-source-id: 63118b9931258e49598ceae0dabf60e1bbd33a0a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 536b5fcce642..ac2364877a47 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c2c5c491e8439d890659e834b8ecfff43e0e6cf4 +Subproject commit f7ccdc9584ae28c9d38ca342a0f3a01e02833952 From 734ddd728b85145241c973c7d36e7e263416c492 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 02:52:09 -0700 Subject: [PATCH 0264/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/8426f971dee5b8c24708a4a3499cc1397701bd04 https://github.com/facebook/fbzmq/commit/76ba1f347b5f4ea7c07e8112908b3af252c1e94a https://github.com/facebook/folly/commit/4548ec7bfd2753a1f4b63a605486a83bc72bc9c9 https://github.com/facebook/watchman/commit/0ebab44ccb424fa07327e37caeb174d97ef9dc43 https://github.com/facebookexperimental/rust-shed/commit/0150af506149a2ba844ca16a82fbec801ca9adc7 Reviewed By: wittgenst fbshipit-source-id: 1a4ea1a93447394e3e8343a64bcade8423effc91 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0fdeae79b0bb..b46dec8b9472 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b8fdbc94a7defaa5b4b0ec43f59bccf2e71cadd3 +Subproject commit 4548ec7bfd2753a1f4b63a605486a83bc72bc9c9 From 2a36b1c25543e9935b8f49195b7f268169aec117 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 03:17:52 -0700 Subject: [PATCH 0265/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/9b4811ec099ec6e4dddf0f34e494a35c45c9a62f https://github.com/facebook/fbthrift/commit/62d2c1b61d7d2154f9133bb05fd77bfa898d9fb5 https://github.com/facebook/fbzmq/commit/05be35b69f78a223eb4f10e7984bfacb94fea132 https://github.com/facebook/litho/commit/e983418157412212c539ba716fc35cc2a21eb21d https://github.com/facebook/proxygen/commit/81577f2d747680104e4df47d3769d1894281098e https://github.com/facebook/wangle/commit/a434689c00de8868983f96263fdb8bdf9920d7b3 https://github.com/facebook/watchman/commit/734ddd728b85145241c973c7d36e7e263416c492 https://github.com/facebookincubator/fizz/commit/f61526113e05eb32d643c2a1812bf2d97b979d2a https://github.com/facebookincubator/katran/commit/4cf15a9762e6287ccecb12c69fc399cecafea475 https://github.com/facebookincubator/mvfst/commit/07747f6997a84c3fe66a79d50b9270674f7811db https://github.com/rsocket/rsocket-cpp/commit/59515dc9bceaec5c82c0b185e6eac6d61579f6ee Reviewed By: wittgenst fbshipit-source-id: dac1a9cc18623ce8a669a2bf9a69162ed034be02 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ac2364877a47..37089a609e35 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f7ccdc9584ae28c9d38ca342a0f3a01e02833952 +Subproject commit 62d2c1b61d7d2154f9133bb05fd77bfa898d9fb5 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6bc6a561229d..e5e053b1e49a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 629e45417a87844b62a750c95f30c9266b2da5f5 +Subproject commit a434689c00de8868983f96263fdb8bdf9920d7b3 From cf7eef92d5b82fa68a03c9caffefb9de28cefb79 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 03:44:22 -0700 Subject: [PATCH 0266/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/bcc6fe7edcc00569c2babb2f1df25a2f9284bed6 https://github.com/facebook/fbthrift/commit/91a5c4c64d13c250f3c71c0d255d8d83f8179347 https://github.com/facebook/fbzmq/commit/497afeaa6bd13168ce360af1a6a68e724f5f0b83 https://github.com/facebook/proxygen/commit/ac6960e555184de2da4962a3da1a05ed25ac68f9 https://github.com/facebook/wangle/commit/8d4ffb9c268b43f66d32816c5ddeb3222b374e6f https://github.com/facebook/watchman/commit/2a36b1c25543e9935b8f49195b7f268169aec117 https://github.com/facebookexperimental/rust-shed/commit/a2a5984202126e7ca671c487aa678fe5d764ad5e https://github.com/facebookincubator/katran/commit/ef7de8470cbc1492906c8d398c4aeceea8319874 https://github.com/facebookincubator/mvfst/commit/ee1db3c553d763479ff6d3bf3135772e8027e0d3 Reviewed By: wittgenst fbshipit-source-id: 3dc33967c0f8d6855cd0f1d2a9caf1f86b29302a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 37089a609e35..8eaed03d8590 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 62d2c1b61d7d2154f9133bb05fd77bfa898d9fb5 +Subproject commit 91a5c4c64d13c250f3c71c0d255d8d83f8179347 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e5e053b1e49a..f74618c37651 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a434689c00de8868983f96263fdb8bdf9920d7b3 +Subproject commit 8d4ffb9c268b43f66d32816c5ddeb3222b374e6f From f396c768d90c0a87c900fd993ca45ce092a5f28e Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 04:03:47 -0700 Subject: [PATCH 0267/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/10e8c2b2e36f142eb46ea42300370558317b54e9 https://github.com/facebook/fbthrift/commit/3dedb8c888ef6456332c602b4dcc0537435dd7d3 https://github.com/facebook/fbzmq/commit/15f1e59d04e4afa0d66b8a18609c2bc026f26024 https://github.com/facebook/proxygen/commit/c3f04304368a5bfdc306c5a5a8f562a49eaf2531 https://github.com/facebook/watchman/commit/cf7eef92d5b82fa68a03c9caffefb9de28cefb79 https://github.com/facebookexperimental/rust-shed/commit/ff34e422fd7ff1e358e957aa02bd8ea7045602c2 Reviewed By: wittgenst fbshipit-source-id: ea9492e19ab87e59ff889845cfb603fbb50f312e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8eaed03d8590..bfca4c391d48 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 91a5c4c64d13c250f3c71c0d255d8d83f8179347 +Subproject commit 3dedb8c888ef6456332c602b4dcc0537435dd7d3 From e8eb5740586c9352b42cb0dbde998eb46ed1a2c9 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 08:50:05 -0700 Subject: [PATCH 0268/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7415a5fa149b7b1ce8826404fe1b3ef6b36a3073 https://github.com/facebook/folly/commit/bb79a9beefc76173027ea81db10ccdfe16a8993b https://github.com/facebook/litho/commit/0c87a15350bc71bbab9554928afb390ba5ed1a02 Reviewed By: wittgenst fbshipit-source-id: 399ba5051474a072cfa51aea0000590b452d37f1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bfca4c391d48..2defd6ad9339 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3dedb8c888ef6456332c602b4dcc0537435dd7d3 +Subproject commit 7415a5fa149b7b1ce8826404fe1b3ef6b36a3073 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b46dec8b9472..6f90bfe7d8de 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 4548ec7bfd2753a1f4b63a605486a83bc72bc9c9 +Subproject commit bb79a9beefc76173027ea81db10ccdfe16a8993b From 13d9cd7c049aece8bc97d21d6e16d78de3734361 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 09:44:46 -0700 Subject: [PATCH 0269/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/dad5c94168e15de98899e98369c4c07db264faa2 https://github.com/facebook/fbthrift/commit/d8cdd9190887732a128716c1e87f6ad57e7cc10e https://github.com/facebook/fbzmq/commit/b438662d645c4a34bcaa3eeff787626562daad35 https://github.com/facebook/litho/commit/1eeddf90da76f0fe533c5ff579988083caa19917 https://github.com/facebook/proxygen/commit/ee4d73089ed52d102cb0d55eabed39ff55466878 https://github.com/facebook/wangle/commit/b2bf18777988272504c6c57473c20c5d78d5d996 https://github.com/facebook/watchman/commit/e8eb5740586c9352b42cb0dbde998eb46ed1a2c9 https://github.com/facebookexperimental/rust-shed/commit/da47bf3ef9d7093cd8f08fe19ee0ae2c59ebb689 https://github.com/facebookincubator/fizz/commit/f6629835711bf0b05e8af07e0befa0258d358002 https://github.com/facebookincubator/katran/commit/6fdc18e3fcf76f12c3423c3da014d117801ca2b1 https://github.com/facebookincubator/mvfst/commit/4206a1a6469496c7928adce4d5828a2da445520b https://github.com/rsocket/rsocket-cpp/commit/c9a22d25a5d85b0bf80bc916312f65da357ccf46 Reviewed By: wittgenst fbshipit-source-id: 23a457a8eb3c2818cbda5895800387fe0509b1ab --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2defd6ad9339..c7968d7eb379 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7415a5fa149b7b1ce8826404fe1b3ef6b36a3073 +Subproject commit d8cdd9190887732a128716c1e87f6ad57e7cc10e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f74618c37651..66dd81c4f9f5 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8d4ffb9c268b43f66d32816c5ddeb3222b374e6f +Subproject commit b2bf18777988272504c6c57473c20c5d78d5d996 From e5290a3bf97870e84d6869ce44e8e383ab996624 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 12:42:45 -0700 Subject: [PATCH 0270/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ec15a860c59dc21b99750936eaa7c117ad64cf91 https://github.com/facebook/fbthrift/commit/04a1dbffccf834f512e6c828e3a654cd8717779d https://github.com/facebook/fbzmq/commit/8f1e1fd74b3ee06965ef93c2d1e0313634e94cd0 https://github.com/facebook/folly/commit/e121b8f692e95557f11a274fb32481ef0010a54c https://github.com/facebook/proxygen/commit/88bcbe7f70aaaaf1fe193de3d4b96d0dd99f5cde https://github.com/facebook/wangle/commit/b60454a23024a1e2ab37234fa0b287b2ad6170f1 https://github.com/facebook/watchman/commit/13d9cd7c049aece8bc97d21d6e16d78de3734361 https://github.com/facebookexperimental/rust-shed/commit/676bdf4baa8dc5b7ffbb820e3200d2f00e388a90 https://github.com/facebookexternal/stl_tasks/commit/ab233de05100674216fbab3b5c1d0b337dea8616 https://github.com/facebookincubator/katran/commit/b778b1a4ce934290490da7bcefb603eb0ddd3d3a https://github.com/facebookincubator/mvfst/commit/003f012cb7f5224770eaca985cc96b53da496834 Reviewed By: wittgenst fbshipit-source-id: df8990f557989bf30f38e578e52f5d97f6c80e8a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c7968d7eb379..4900dee76721 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d8cdd9190887732a128716c1e87f6ad57e7cc10e +Subproject commit 04a1dbffccf834f512e6c828e3a654cd8717779d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6f90bfe7d8de..d3d2ef138547 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit bb79a9beefc76173027ea81db10ccdfe16a8993b +Subproject commit e121b8f692e95557f11a274fb32481ef0010a54c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 66dd81c4f9f5..0bbc2726e7b4 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b2bf18777988272504c6c57473c20c5d78d5d996 +Subproject commit b60454a23024a1e2ab37234fa0b287b2ad6170f1 From 0e549d3fb38e3a5bbe330ad9a4bbe90588fb5b7d Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 13:16:26 -0700 Subject: [PATCH 0271/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ee49800d4dd3edf70845a05c99dd9ef9ce66e72e https://github.com/facebook/fbthrift/commit/6fb7d4018180490de01dff4f0256c60e5972fae8 https://github.com/facebook/fbzmq/commit/ee6da34e5ab0b081d5985d31ea59cf3894fe6cd3 https://github.com/facebook/proxygen/commit/91a2b943026299ac63e29203df6387cc25c6b292 https://github.com/facebook/wangle/commit/d8120582eb0b26cf0a3076b0eb4689f45266d89e https://github.com/facebook/watchman/commit/e5290a3bf97870e84d6869ce44e8e383ab996624 https://github.com/facebookexperimental/rust-shed/commit/2197724cbfb2ebdf5a222d884dce885e07f7a93e https://github.com/facebookincubator/fizz/commit/bf68983f168199e494046b192f6edf8518e8e165 https://github.com/facebookincubator/katran/commit/f3952a16a4225429817b5f2562ac95b5ec781c9c https://github.com/facebookincubator/mvfst/commit/71cf6d95e055f6da4fefa24e64019ae3f1948947 https://github.com/rsocket/rsocket-cpp/commit/ed9613f7fa00db74129d532cc3a1426e3216af88 Reviewed By: wittgenst fbshipit-source-id: e9b7e503af1ec5a2f5366a0a5bf8c017edb6b5fe --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4900dee76721..c9927678b11d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 04a1dbffccf834f512e6c828e3a654cd8717779d +Subproject commit 6fb7d4018180490de01dff4f0256c60e5972fae8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0bbc2726e7b4..2ed20eb21ba2 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b60454a23024a1e2ab37234fa0b287b2ad6170f1 +Subproject commit d8120582eb0b26cf0a3076b0eb4689f45266d89e From f388bb098d8d084b04dc9306ec5b0ce9a3338f9e Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 13:53:46 -0700 Subject: [PATCH 0272/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/350e7dca9d087790ae4e0814d671d044356b41c4 https://github.com/facebook/fbthrift/commit/db1cd5e5f1df56cd49fb0c6ed1110636953b70a2 https://github.com/facebook/fbzmq/commit/b48ff81ae2784b5659dfa2a3811be3f8787dafe6 https://github.com/facebook/proxygen/commit/ac6503e6da934fed2981f615210981a36c0406d6 https://github.com/facebook/wangle/commit/ce64f0dc4d4fa501982db7fb50b87f357360cef6 https://github.com/facebook/watchman/commit/0e549d3fb38e3a5bbe330ad9a4bbe90588fb5b7d https://github.com/facebookexperimental/rust-shed/commit/f25ed4ad8f43fd0e6b78fd511ec9693a840b2147 https://github.com/facebookincubator/katran/commit/14cd462ac4ee40c46e11c9b1b70ee8eb1afa950e https://github.com/facebookincubator/mvfst/commit/5e2f5719b736bc27564b1a8b826897fc5ed8a699 Reviewed By: wittgenst fbshipit-source-id: d64e16992e2b0ec632b8801ea18051b1687bf402 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c9927678b11d..1dc27a968b51 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6fb7d4018180490de01dff4f0256c60e5972fae8 +Subproject commit db1cd5e5f1df56cd49fb0c6ed1110636953b70a2 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2ed20eb21ba2..0245f55a9ae1 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d8120582eb0b26cf0a3076b0eb4689f45266d89e +Subproject commit ce64f0dc4d4fa501982db7fb50b87f357360cef6 From 2d8143bfca0485682e191322e88ba36f4df0c5ae Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 14:31:35 -0700 Subject: [PATCH 0273/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/e8527e8f9bf5e317831360b8baac8b1df488fb54 https://github.com/facebook/fbthrift/commit/77d7e95dc5d5653ab372bdc1ec9e0edfc438a1d4 https://github.com/facebook/fbzmq/commit/d167114d45491641b49e6dd10865d2f9c1242b3c https://github.com/facebook/litho/commit/2f78e97d9843192f9b5d399a0af081546c1c3c6b https://github.com/facebook/proxygen/commit/e9dbab0dd86d313b3ec67a274994f5adb552390a https://github.com/facebook/watchman/commit/f388bb098d8d084b04dc9306ec5b0ce9a3338f9e https://github.com/facebookexperimental/rust-shed/commit/1d9d5a236b35180687b75ce01a21887abd77791f Reviewed By: wittgenst fbshipit-source-id: 6fa452138ddfff6a52ab26a92a29becf8f8f6bfa --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1dc27a968b51..b1db6f4b97b8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit db1cd5e5f1df56cd49fb0c6ed1110636953b70a2 +Subproject commit 77d7e95dc5d5653ab372bdc1ec9e0edfc438a1d4 From 6f5ca5b4f39e6a8ee53efaa3dc6f2a3966b1d4cd Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 16:28:23 -0700 Subject: [PATCH 0274/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/d625fc784c8e36ae9d7702f1fa2fe92e91362512 Reviewed By: wittgenst fbshipit-source-id: bc80ac930030513cca0106466cb2f3c266a0a1c0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b1db6f4b97b8..dc219a87a41a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 77d7e95dc5d5653ab372bdc1ec9e0edfc438a1d4 +Subproject commit d625fc784c8e36ae9d7702f1fa2fe92e91362512 From 175fc52b61091d9a36cf0c32726351261844138b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 16:56:24 -0700 Subject: [PATCH 0275/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/5e86c295010295762c6e97830b332b854f4b34ac https://github.com/facebook/fbzmq/commit/4702f8da81509bfaf8f93021e6aa8bf4b8d39638 https://github.com/facebook/folly/commit/ef028e3b24f4755f893b89e18bef79ef407cc17d https://github.com/facebook/watchman/commit/6f5ca5b4f39e6a8ee53efaa3dc6f2a3966b1d4cd https://github.com/facebookexperimental/rust-shed/commit/3ca0c89902943fcecc45ef50be56a99468a53d87 Reviewed By: wittgenst fbshipit-source-id: cc2ad4741117fa08422d308a656f292c9023b76c --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d3d2ef138547..a4e41edaf43c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e121b8f692e95557f11a274fb32481ef0010a54c +Subproject commit ef028e3b24f4755f893b89e18bef79ef407cc17d From 410efa487921fb44816338821e47c1d210f6bf82 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 17:25:07 -0700 Subject: [PATCH 0276/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c94a5adce0998ac5da6f1108166225cca5ff48ae https://github.com/facebook/fbthrift/commit/d2b610f9d3013981b0355a470bab1d55c9e996e0 https://github.com/facebook/fbzmq/commit/0df9b897c7c04894a524e7904aae8e69daecc2e5 https://github.com/facebook/proxygen/commit/b6ba3e20e1bd6eeff40f58b735acad7d4161e46a https://github.com/facebook/wangle/commit/8064782db23da774f8ed66c495c9135892ea4e84 https://github.com/facebook/watchman/commit/175fc52b61091d9a36cf0c32726351261844138b https://github.com/facebookincubator/fizz/commit/821daf761e6275ed592437831c088a78006cd074 https://github.com/facebookincubator/katran/commit/9134cf184d6ec90bf3da204b036204a7802619c2 https://github.com/facebookincubator/mvfst/commit/58ea007eb7bef2fcee762987e02b45fdd4fb0b7a https://github.com/rsocket/rsocket-cpp/commit/28a0dd3cdb84d235a54afef2f5931daab7553c6e Reviewed By: wittgenst fbshipit-source-id: 65e253b12300724e7f4a4f5bd7cbf7067747839b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index dc219a87a41a..bebbeb7bfe18 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d625fc784c8e36ae9d7702f1fa2fe92e91362512 +Subproject commit d2b610f9d3013981b0355a470bab1d55c9e996e0 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0245f55a9ae1..5b6f3df396c5 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ce64f0dc4d4fa501982db7fb50b87f357360cef6 +Subproject commit 8064782db23da774f8ed66c495c9135892ea4e84 From eca783c974de550c12b1c25f2ccefc9a89af2d52 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 18:51:55 -0700 Subject: [PATCH 0277/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/df944eda3e80cfd6da2e482bbbbaa9811bbc24c9 https://github.com/facebook/fbthrift/commit/18a0ab75da4a58a1e23dae349793084e9f3c758d https://github.com/facebook/fbzmq/commit/ace72958a77fff2209834c11383b05727da201c4 https://github.com/facebook/proxygen/commit/af9ce6b5bcb0df5c1d77395bda65eee84c793168 https://github.com/facebook/rocksdb/commit/87e82a41a98fbb89591b0599625235de0b60dafc https://github.com/facebook/wangle/commit/cd449e2d9f6aa2704d6d6b70750a6ee65647b256 https://github.com/facebook/watchman/commit/410efa487921fb44816338821e47c1d210f6bf82 https://github.com/facebookexperimental/rust-shed/commit/d8bf60fc87343611892b1169f5d23843baf984bb https://github.com/facebookincubator/katran/commit/64c3999e0afb237d55123d24c8ecab571dfe362b https://github.com/facebookincubator/mvfst/commit/c49651d8776415df2209067a1cfec71385051898 https://github.com/pytorch/fbgemm/commit/d2440b40f6047ebebec3b213d00a491e252a2779 Reviewed By: wittgenst fbshipit-source-id: e2a5ddfdeedb88378f847a08ede6d6f772185243 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bebbeb7bfe18..6ea5171e295b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d2b610f9d3013981b0355a470bab1d55c9e996e0 +Subproject commit 18a0ab75da4a58a1e23dae349793084e9f3c758d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5b6f3df396c5..f62d2abd0db8 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8064782db23da774f8ed66c495c9135892ea4e84 +Subproject commit cd449e2d9f6aa2704d6d6b70750a6ee65647b256 From dbb797db9324b52b9b7867b08cd3aaea2f6672c2 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 19:32:10 -0700 Subject: [PATCH 0278/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/00636f8dd25b6bb7211a993240017196494a6a8d https://github.com/facebook/fbthrift/commit/5a54e6655e9b3c4701efb7a65158aa66f5df777c https://github.com/facebook/fbzmq/commit/94d6a3ec9b0a9ab669711cd56a72d4e9f91bfe10 https://github.com/facebook/proxygen/commit/e79e3a44e40f63d0294ad51258197ad7e11aa8f8 https://github.com/facebook/watchman/commit/eca783c974de550c12b1c25f2ccefc9a89af2d52 https://github.com/facebookexperimental/rust-shed/commit/195e6bb3e3d9938b079043ae12393bdee9788553 Reviewed By: wittgenst fbshipit-source-id: 6f5b187b0a22cbfc79b714b93b7a6ca6ac1e0356 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6ea5171e295b..26a6d0468ab7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 18a0ab75da4a58a1e23dae349793084e9f3c758d +Subproject commit 5a54e6655e9b3c4701efb7a65158aa66f5df777c From ab90e43b24e5e222cfaf85abc3c45eb75b7b5f55 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 19:55:20 -0700 Subject: [PATCH 0279/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/7aa65ca5006e3af35a2d167ffcfbcf7578667278 https://github.com/facebook/fbthrift/commit/c36589d856cff4c6beadeb51f87866f6eff8ce89 https://github.com/facebook/fbzmq/commit/867d0fc836f6102311cd4f6df2521d726c15f955 https://github.com/facebook/watchman/commit/dbb797db9324b52b9b7867b08cd3aaea2f6672c2 https://github.com/facebookexperimental/rust-shed/commit/6ff61db615b689418f3978babeed4355e47a6c27 https://github.com/facebookexternal/stl_tasks/commit/6fd23655b7675666349491d7b8fb15f4d43b7f1a Reviewed By: wittgenst fbshipit-source-id: 9d357c1ec76d992a354ce3b585f6748b01835919 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 26a6d0468ab7..4876913fbd50 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5a54e6655e9b3c4701efb7a65158aa66f5df777c +Subproject commit c36589d856cff4c6beadeb51f87866f6eff8ce89 From 303cbeef549a9ef0b5a39eb0e8f9f90f768465d3 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 20:54:14 -0700 Subject: [PATCH 0280/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/936cdd2b03002b97226853ffe33878b7377c73c6 Reviewed By: wittgenst fbshipit-source-id: 767e51dbafa1088dacbadb0827b92ebf44a8b015 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4876913fbd50..925e71a2ad78 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c36589d856cff4c6beadeb51f87866f6eff8ce89 +Subproject commit 936cdd2b03002b97226853ffe33878b7377c73c6 From c56a96c55a108820e706d1123f1543598bfcde9c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 21:53:41 -0700 Subject: [PATCH 0281/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/f623e9948a60e0159c300fd2e9b460ac84a81950 Reviewed By: wittgenst fbshipit-source-id: 887f9d31601c784d3bcabd5eb98d7e269447e868 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a4e41edaf43c..8acda067bea9 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ef028e3b24f4755f893b89e18bef79ef407cc17d +Subproject commit f623e9948a60e0159c300fd2e9b460ac84a81950 From f48d0acd6331342a22dec9213a72d22eadbf3d0c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 22:33:36 -0700 Subject: [PATCH 0282/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/a3908f84e44652cb21e670b3d7a2a56ee1ad84ac https://github.com/facebook/fbthrift/commit/8e6e9be62f54b156ea3d4352ab68e61ec5b5d3f8 https://github.com/facebook/fbzmq/commit/54b20f00262e223d9c2279a0a72e2350f082a2da https://github.com/facebook/proxygen/commit/797b08567b1b7afe55cf1cfb5b02d27feb25bbf3 https://github.com/facebook/wangle/commit/148db095909a80cadcf85c197972e99bd2e37b92 https://github.com/facebook/watchman/commit/c56a96c55a108820e706d1123f1543598bfcde9c https://github.com/facebookincubator/fizz/commit/318ce3fa9e367f178186d425bdd44ed100d87968 https://github.com/facebookincubator/katran/commit/df0bb4ea6889010fb978bb2435626c485fe04a71 https://github.com/facebookincubator/mvfst/commit/5ff7c278b8d9470626c139c39cf13bb40fda96f0 https://github.com/rsocket/rsocket-cpp/commit/2192f31d105589754fbcff16ff742bdaca6ee682 Reviewed By: wittgenst fbshipit-source-id: 9d1682a8d5d05541d329bc19596dcf82ea2d5236 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 925e71a2ad78..af12c1c54dbd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 936cdd2b03002b97226853ffe33878b7377c73c6 +Subproject commit 8e6e9be62f54b156ea3d4352ab68e61ec5b5d3f8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f62d2abd0db8..4d52f08857c3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit cd449e2d9f6aa2704d6d6b70750a6ee65647b256 +Subproject commit 148db095909a80cadcf85c197972e99bd2e37b92 From ca7ed69ea7328b523567b158eb662ddfaaccc7ef Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 23:05:03 -0700 Subject: [PATCH 0283/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/09673eba506676a3e9e334b2c0c5990cf9a4b3db https://github.com/facebook/fbthrift/commit/30ef67f4715b3d53887d9820c97ce4b180542614 https://github.com/facebook/fbzmq/commit/d9dd69bff658782dbdbfdccec530ab7f5e6468c5 https://github.com/facebook/proxygen/commit/b4906f8da2e1596e25f5573b7cb25ba8cbd47feb https://github.com/facebook/wangle/commit/6598c86691a4ab97171ba5ba2fd1b946fb2a202e https://github.com/facebook/watchman/commit/f48d0acd6331342a22dec9213a72d22eadbf3d0c https://github.com/facebookexperimental/rust-shed/commit/bfe6300ae9ed03957db05e5034eb3a616e5cb156 https://github.com/facebookincubator/katran/commit/8a8270238b77acfa3cafdcf14683a13a6062a869 https://github.com/facebookincubator/mvfst/commit/219032eb5c7f65df3ec136b6692f49fe2fc301b9 Reviewed By: wittgenst fbshipit-source-id: 1613ced212354194883c9adc0d665ed54e04bd1b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index af12c1c54dbd..c5ebaaf2fa84 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8e6e9be62f54b156ea3d4352ab68e61ec5b5d3f8 +Subproject commit 30ef67f4715b3d53887d9820c97ce4b180542614 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4d52f08857c3..a9f7fab0d808 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 148db095909a80cadcf85c197972e99bd2e37b92 +Subproject commit 6598c86691a4ab97171ba5ba2fd1b946fb2a202e From f2bf057f38ebe73945c71254a0adfcd1fcee85f8 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 20 Jul 2021 23:31:52 -0700 Subject: [PATCH 0284/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/27de91449560552d7a8e20f6a52bfeeed43de7f1 https://github.com/facebook/fbthrift/commit/a11966dea83a96d74df6247cec68227eb9f41576 https://github.com/facebook/fbzmq/commit/08817e9fcb5c2d32a93b385c9864899e58f2aeff https://github.com/facebook/proxygen/commit/aee3af8f96f3910dd477de1ca6ade9c1d0ae7951 https://github.com/facebook/watchman/commit/ca7ed69ea7328b523567b158eb662ddfaaccc7ef https://github.com/facebookexperimental/rust-shed/commit/cd508c5cdfb7157b7bc14c8be743e7f6c4de75a3 Reviewed By: wittgenst fbshipit-source-id: 894543b6e2fff4cc7ff0f07d9f69190b0ccedca6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c5ebaaf2fa84..192e0747e9da 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 30ef67f4715b3d53887d9820c97ce4b180542614 +Subproject commit a11966dea83a96d74df6247cec68227eb9f41576 From 34ae56d381b982bc8dabe59c01dbbfb1c84924b3 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 21 Jul 2021 01:47:43 -0700 Subject: [PATCH 0285/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/cdb7a478e65186dc850dd8af2b1ba9ab830917d3 Reviewed By: wittgenst fbshipit-source-id: 93931be3ad8093f893218251422045eb8ad83f21 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8acda067bea9..6612a1ecbca6 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f623e9948a60e0159c300fd2e9b460ac84a81950 +Subproject commit cdb7a478e65186dc850dd8af2b1ba9ab830917d3 From 665b9f30bca61ff2294beb9155187ba30c53042a Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 21 Jul 2021 02:12:44 -0700 Subject: [PATCH 0286/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/52547000d7b01511ca47589349c7940d90cfb236 https://github.com/facebook/fbthrift/commit/4b610534b23c1cf1e336630a576b261ff0983569 https://github.com/facebook/fbzmq/commit/36487cc60c27b5e0eb594f624069036e026e3640 https://github.com/facebook/proxygen/commit/823e7324a496754fc43488547729c36cc4817cdf https://github.com/facebook/wangle/commit/1b9af4f54514b221ad05f618b7b902328d4fc8a9 https://github.com/facebook/watchman/commit/34ae56d381b982bc8dabe59c01dbbfb1c84924b3 https://github.com/facebookincubator/fizz/commit/1bb06c154b5ac03d5da0bf9686a1b3bed3c5d916 https://github.com/facebookincubator/katran/commit/afd5b52bdf6a0b9f22e9c5bacd3081725a38bcab https://github.com/facebookincubator/mvfst/commit/c6bad0eb7adeda78767669a9d08379c194c361ea https://github.com/rsocket/rsocket-cpp/commit/479c4234a8f3e69d81a33723dfb64a6421d47247 Reviewed By: wittgenst fbshipit-source-id: c87c11465988ec7dd930047eb45883b9948c7792 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 192e0747e9da..aec31003608f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a11966dea83a96d74df6247cec68227eb9f41576 +Subproject commit 4b610534b23c1cf1e336630a576b261ff0983569 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a9f7fab0d808..185944bd2c02 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6598c86691a4ab97171ba5ba2fd1b946fb2a202e +Subproject commit 1b9af4f54514b221ad05f618b7b902328d4fc8a9 From 603fe370698bc371f1d7e36e7d09f9de3859b5e0 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 21 Jul 2021 02:42:06 -0700 Subject: [PATCH 0287/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/f37c53431d1bf7a8e8e1682f830e52cf99b2af70 https://github.com/facebook/fbthrift/commit/3ecb1e53ebf4464c87de96a3bfa24c2e64de5399 https://github.com/facebook/fbzmq/commit/e7f38bcc4c6e09d5713dc1dff411c2f577114d47 https://github.com/facebook/proxygen/commit/90f5024213a48e8b2df6679c275c186e6a32eb64 https://github.com/facebook/wangle/commit/67ec015b58d3b49fc7750bb5274f43af1ef63575 https://github.com/facebook/watchman/commit/665b9f30bca61ff2294beb9155187ba30c53042a https://github.com/facebookexperimental/rust-shed/commit/0649c1c764d240768d94e379e31c45a43c5fbac8 https://github.com/facebookincubator/katran/commit/590eca6e54adf904f1273057daf2800616333952 https://github.com/facebookincubator/mvfst/commit/78aa4b00570b866d52f191f6017ba264afb5573e Reviewed By: wittgenst fbshipit-source-id: 0169fecc3f08b0133a0b49c8b9fcf4a008e19c20 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index aec31003608f..5a3b4bef5fb5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4b610534b23c1cf1e336630a576b261ff0983569 +Subproject commit 3ecb1e53ebf4464c87de96a3bfa24c2e64de5399 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 185944bd2c02..cb56a2b4ca01 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1b9af4f54514b221ad05f618b7b902328d4fc8a9 +Subproject commit 67ec015b58d3b49fc7750bb5274f43af1ef63575 From 9f67665e2b4c54b7931dbbde4f205afe429f6b13 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 21 Jul 2021 03:11:13 -0700 Subject: [PATCH 0288/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/3205a8f8549e5d9a45a0ffa42c86f73434ecce69 https://github.com/facebook/fbthrift/commit/7b9761a5aaec7a4aa37f3cf1b5e99909d351b315 https://github.com/facebook/fbzmq/commit/6d3716e1fd1ec6dc189dde38a8dc1ae12c564ae3 https://github.com/facebook/proxygen/commit/b753874a180773a172526b7253051a040ff6b32d https://github.com/facebook/watchman/commit/603fe370698bc371f1d7e36e7d09f9de3859b5e0 https://github.com/facebookexperimental/rust-shed/commit/f840dba527ac30341a95a4a68b00ed8ebe67660d Reviewed By: wittgenst fbshipit-source-id: f1ad65a492b28760c86047d678c75571a69412ba --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5a3b4bef5fb5..ddf1e0b2a529 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3ecb1e53ebf4464c87de96a3bfa24c2e64de5399 +Subproject commit 7b9761a5aaec7a4aa37f3cf1b5e99909d351b315 From 6ca63ca04ca8d261d75e3e44c13ee6e8396d8223 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Wed, 21 Jul 2021 08:11:52 -0700 Subject: [PATCH 0289/7387] watchman: fix unknown attribute in doc Summary: Fix error while running tests: ``` error: unknown attribute `norun`. Did you mean `no_run`? --> /builddir/build/BUILD/watchman_client-0.7.1/src/lib.rs:1:1 ``` Reviewed By: michel-slm Differential Revision: D29804898 fbshipit-source-id: 48e2faa5a0d6fd13d9ff019e682a98ad682f8cdc --- watchman/rust/watchman_client/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/rust/watchman_client/src/lib.rs b/watchman/rust/watchman_client/src/lib.rs index 65b63a94cc01..87c455875e88 100644 --- a/watchman/rust/watchman_client/src/lib.rs +++ b/watchman/rust/watchman_client/src/lib.rs @@ -11,7 +11,7 @@ //! This example shows how to connect and expand a glob from the //! current working directory: //! -//! ```norun +//! ```no_run //! use watchman_client::prelude::*; //! #[tokio::main] //! async fn main() -> Result<(), Box> { From a4887a0cab488336b02a6f68a9f81609617302cc Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 21 Jul 2021 08:24:46 -0700 Subject: [PATCH 0290/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/9fa5f3327b5fbcce834f6eba3be954fe02f3fbd1 Reviewed By: wittgenst fbshipit-source-id: f59b2d2b1a935cf2de56985ecd2d5ebfa07abb33 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ddf1e0b2a529..ce6b6b2c4fde 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7b9761a5aaec7a4aa37f3cf1b5e99909d351b315 +Subproject commit 9fa5f3327b5fbcce834f6eba3be954fe02f3fbd1 From 18e6d1660496740286c9ecbc610dbc61590b6693 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 21 Jul 2021 14:02:09 -0700 Subject: [PATCH 0291/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/9cf1a54fd7eec5d8e52b7c4dacd4549d729d297b https://github.com/facebook/folly/commit/9acfd80da5d9794a471b2123cc40a2a20cc34bc7 https://github.com/facebook/litho/commit/e23f74981ac9caadce9bbd734a1b1c420391b364 https://github.com/facebook/rocksdb/commit/42eaa45c1bfcc33935d3cfdc4694955e2f1f3265 Reviewed By: wittgenst fbshipit-source-id: 4f621cd417cfa8c17ebbd77f3c270696fec9cde3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ce6b6b2c4fde..34866042781c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9fa5f3327b5fbcce834f6eba3be954fe02f3fbd1 +Subproject commit 9cf1a54fd7eec5d8e52b7c4dacd4549d729d297b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6612a1ecbca6..bd3cae16732d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit cdb7a478e65186dc850dd8af2b1ba9ab830917d3 +Subproject commit 9acfd80da5d9794a471b2123cc40a2a20cc34bc7 From 7f01e3fb4a0d1da6a491cc6cf6cc80ad6e5d3854 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 21 Jul 2021 15:02:07 -0700 Subject: [PATCH 0292/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/0a59605deb3682765497e2b8b73d305547b44f31 https://github.com/facebook/fbthrift/commit/28d8e7f4f9e99daa7a2d57856a7ce0aed4262cad https://github.com/facebook/fbzmq/commit/b62447fc8ee1c9c2b146857834606c0438075129 https://github.com/facebook/proxygen/commit/ab2dd18e24d73b6b239ef7aeacf2a1d900115625 https://github.com/facebook/wangle/commit/34b5befcacb629e9152d302e49869b1e048bfa0f https://github.com/facebook/watchman/commit/18e6d1660496740286c9ecbc610dbc61590b6693 https://github.com/facebookexperimental/rust-shed/commit/351857cd95938057b43af68d39a2b2c2e88ea3ee https://github.com/facebookincubator/fizz/commit/b20134e5fc06699ff95480af33c5d4138ebc2c1f https://github.com/facebookincubator/katran/commit/8600df44d33c7ac2b80de5f87866dbc13441cfaf https://github.com/facebookincubator/mvfst/commit/522a357a576b5cd73159e5193e29f55c68b14d6f https://github.com/rsocket/rsocket-cpp/commit/5f8ad3e157e4d88d0b9c258f672eeb629688940e Reviewed By: wittgenst fbshipit-source-id: 20233fdf902903ec29d949752e25aef762e39f34 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 34866042781c..d5f74efc2cbe 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9cf1a54fd7eec5d8e52b7c4dacd4549d729d297b +Subproject commit 28d8e7f4f9e99daa7a2d57856a7ce0aed4262cad diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index cb56a2b4ca01..7a0ab77466b7 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 67ec015b58d3b49fc7750bb5274f43af1ef63575 +Subproject commit 34b5befcacb629e9152d302e49869b1e048bfa0f From 362c59970502051afcaae7607f0982f412a28db6 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 21 Jul 2021 15:39:58 -0700 Subject: [PATCH 0293/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/324297e7b3bd3e5f01dbd8e971e33c6993b49447 https://github.com/facebook/fbthrift/commit/75b952fcadb850b0e1f304f7855996671e70f7f1 https://github.com/facebook/fbzmq/commit/64ab8869fe1c439c12ffa25ffd834cbca957771a https://github.com/facebook/proxygen/commit/df2ac62a8f82fb91fceaf423adc56d25405db05a https://github.com/facebook/wangle/commit/b198663e023eb9fc18d92e8d463c6720702b1ad7 https://github.com/facebook/watchman/commit/7f01e3fb4a0d1da6a491cc6cf6cc80ad6e5d3854 https://github.com/facebookexperimental/rust-shed/commit/9696e5a8543915606ef540f4c702f8a715fa538b https://github.com/facebookincubator/katran/commit/0c0767e2708fe172df6497a34fac4de09c47bbb0 https://github.com/facebookincubator/mvfst/commit/5105ae78e7ce09e8b12b5f3892ca0a6c60acf37d Reviewed By: wittgenst fbshipit-source-id: 2de6c7b58e12ef66b103685ced02a619952e38f3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d5f74efc2cbe..75d09d89aa80 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 28d8e7f4f9e99daa7a2d57856a7ce0aed4262cad +Subproject commit 75b952fcadb850b0e1f304f7855996671e70f7f1 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7a0ab77466b7..463bb4805392 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 34b5befcacb629e9152d302e49869b1e048bfa0f +Subproject commit b198663e023eb9fc18d92e8d463c6720702b1ad7 From 7efac5496e886803e9dfbb060da9456b29116d4f Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 21 Jul 2021 16:14:56 -0700 Subject: [PATCH 0294/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/bca96a87b2fa79763302b16c8af2eb0e85e6ae1a https://github.com/facebook/fbthrift/commit/f78b5f2f08876cb8325dc09c093076bc520dc76a https://github.com/facebook/fbzmq/commit/c3e1457ab957fca158227b9323d431fb6893cd31 https://github.com/facebook/proxygen/commit/2d75558dc9e3fb128e8728ec75c9d4577dfd2f69 https://github.com/facebook/watchman/commit/362c59970502051afcaae7607f0982f412a28db6 https://github.com/facebookexperimental/rust-shed/commit/169d6f3caf2d2852654e8bd38aacdacca8d49a93 Reviewed By: wittgenst fbshipit-source-id: 6a4af712bc1a9c03fb4863d0106ef4a00216e511 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 75d09d89aa80..7adf37146dbc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 75b952fcadb850b0e1f304f7855996671e70f7f1 +Subproject commit f78b5f2f08876cb8325dc09c093076bc520dc76a From 6daa11d4ae98b6f0765d489cfc6a3b2e8f54c376 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 21 Jul 2021 16:52:18 -0700 Subject: [PATCH 0295/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/fc3ebc466a24e4b0267b5053d09d814d322863a8 https://github.com/facebook/fbzmq/commit/393ad3e348d178d4aed59a5ce833da67f6b7ff78 https://github.com/facebook/folly/commit/d4241c98faced5d8af586ebd77f3d6ebd8afc444 https://github.com/facebook/rocksdb/commit/9b41082d4a21a4f8cc8be2c1df84a3ea3b407f3d https://github.com/facebook/watchman/commit/7efac5496e886803e9dfbb060da9456b29116d4f https://github.com/facebookexperimental/rust-shed/commit/94d2c609b584f89d3e03242fb164e8df0b8574aa Reviewed By: wittgenst fbshipit-source-id: 8220871308dde9b85a83a4e874b913507b520ea2 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index bd3cae16732d..95bb10718c9c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9acfd80da5d9794a471b2123cc40a2a20cc34bc7 +Subproject commit d4241c98faced5d8af586ebd77f3d6ebd8afc444 From 1f628e6aba8fb06b89883e4f4827e67de9481f43 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 21 Jul 2021 17:28:26 -0700 Subject: [PATCH 0296/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/5eff8f164ed6533a0e31d0f756cf9fe8ec97d22a https://github.com/facebook/fbthrift/commit/26e4a1e04dee92f2d3fd31bf561c37440e3c3f96 https://github.com/facebook/fbzmq/commit/ca9a05326b9eb6f3079f3feab146da32c5b3abff https://github.com/facebook/folly/commit/dd7d175acfeb96d6e7578ac6bb0733a1164f24ee https://github.com/facebook/mcrouter/commit/5e5754e5bf25ba10ebc9528644f4bf0d64a824d6 https://github.com/facebook/proxygen/commit/2023528ca405ba3010cf5228c729db7df5025231 https://github.com/facebook/wangle/commit/ecab9a1d194630d755590667484ed98b7da63afd https://github.com/facebook/watchman/commit/6daa11d4ae98b6f0765d489cfc6a3b2e8f54c376 https://github.com/facebookincubator/fizz/commit/751dffb266e53b7bf3ed421554299f2c727bfee6 https://github.com/facebookincubator/katran/commit/0cfec866ef6d62134a901fb33cfdc81b9e06de5e https://github.com/facebookincubator/mvfst/commit/885c08a977e3aa04f112b8103f3217ef884a2b0b https://github.com/rsocket/rsocket-cpp/commit/0bc7b8d79020d1cbaceb4a877e80600a86f64548 Reviewed By: wittgenst fbshipit-source-id: 4445a7895fa36f78b1bfd9b07075da6fe68726e9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7adf37146dbc..a2fcfe8958ea 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f78b5f2f08876cb8325dc09c093076bc520dc76a +Subproject commit 26e4a1e04dee92f2d3fd31bf561c37440e3c3f96 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 95bb10718c9c..b84c30db29c5 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d4241c98faced5d8af586ebd77f3d6ebd8afc444 +Subproject commit dd7d175acfeb96d6e7578ac6bb0733a1164f24ee diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 463bb4805392..786cf01c22b2 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b198663e023eb9fc18d92e8d463c6720702b1ad7 +Subproject commit ecab9a1d194630d755590667484ed98b7da63afd From 1c6d385ada22bf0b49fe1283acad5064014cbf11 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 21 Jul 2021 17:53:41 -0700 Subject: [PATCH 0297/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/6455c9a8a90df36e39aead86bdb70eb74f506443 https://github.com/facebook/fbthrift/commit/dcc350f52474a75b02c0bcacf99c7a29806f46f4 https://github.com/facebook/fbzmq/commit/2d39ec5b98a41a125f50a4d8389f1b1b6c8ec6f2 https://github.com/facebook/folly/commit/4baba28200d7446c870e96f3cdbeb492f54625d0 https://github.com/facebook/proxygen/commit/e057921807c78e89a7ef2c333b8165653651e4f0 https://github.com/facebook/rocksdb/commit/84eef260de9c0dc0c7ace8e6f605a2b3efd71038 https://github.com/facebook/wangle/commit/ac42b19f8e8ea8c183d0cc4da85ceb8d24ad2b73 https://github.com/facebook/watchman/commit/1f628e6aba8fb06b89883e4f4827e67de9481f43 https://github.com/facebookexperimental/rust-shed/commit/bba9277699721907064790405863a367a9b91c60 https://github.com/facebookincubator/fizz/commit/04e22ccad1346a05545c82858cdbacdfa8e252fb https://github.com/facebookincubator/katran/commit/24acb5fc9a07923783a7f0738455d7329717b147 https://github.com/facebookincubator/mvfst/commit/c71b547d10416b10981d628df42582f41a93bc90 https://github.com/rsocket/rsocket-cpp/commit/07ca4586fe3dc430ace0fed8edafd8061f32c612 Reviewed By: wittgenst fbshipit-source-id: 7b478c29619b7358c663cced783a40031402de01 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a2fcfe8958ea..21277155b392 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 26e4a1e04dee92f2d3fd31bf561c37440e3c3f96 +Subproject commit dcc350f52474a75b02c0bcacf99c7a29806f46f4 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b84c30db29c5..44ded47c5ca2 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit dd7d175acfeb96d6e7578ac6bb0733a1164f24ee +Subproject commit 4baba28200d7446c870e96f3cdbeb492f54625d0 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 786cf01c22b2..df1c08394f5b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ecab9a1d194630d755590667484ed98b7da63afd +Subproject commit ac42b19f8e8ea8c183d0cc4da85ceb8d24ad2b73 From 6e842aa10ee610de030d42be2cddb73d69b2f2aa Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 21 Jul 2021 18:24:56 -0700 Subject: [PATCH 0298/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c8cfbe3dd14db4adb1e67e21efa3b54fe67faaeb https://github.com/facebook/fbthrift/commit/cc7160dd70318253f61673c19f8212e67f5da04c https://github.com/facebook/fbzmq/commit/95eb0cd5c64a129dd274339049f1e3e3e74fcf90 https://github.com/facebook/proxygen/commit/901e514c3367c15de990ed5b9e1c03bf250eb3ca https://github.com/facebook/wangle/commit/dd258aaddf98a3f9ab2f22c313be0fba034c0a0d https://github.com/facebook/watchman/commit/1c6d385ada22bf0b49fe1283acad5064014cbf11 https://github.com/facebookexperimental/rust-shed/commit/fd856cb96ae0bef38e88fb92a9b74444a37bb1fd https://github.com/facebookexternal/stl_tasks/commit/5c4b9f11a586abfe637c3bb8cded0e093709b91f https://github.com/facebookincubator/fizz/commit/dc23e28ab7d0e3b982f5f7da49f817fa235bf80b https://github.com/facebookincubator/katran/commit/1c7acfaa0238d3f8edaef660781ae87424691463 https://github.com/facebookincubator/mvfst/commit/1cce4ffb86c041717d8b3e302856d267d94b9031 https://github.com/rsocket/rsocket-cpp/commit/955ff5180279529503871e1d19a7e950dcebe2cb Reviewed By: wittgenst fbshipit-source-id: 62e6ece74d24f91b828c7f40cf55069cade8a265 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 21277155b392..f3b8f9f06812 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit dcc350f52474a75b02c0bcacf99c7a29806f46f4 +Subproject commit cc7160dd70318253f61673c19f8212e67f5da04c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index df1c08394f5b..5aa44b22c962 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ac42b19f8e8ea8c183d0cc4da85ceb8d24ad2b73 +Subproject commit dd258aaddf98a3f9ab2f22c313be0fba034c0a0d From ddc1045e7027126bd0e198edffb97e5fdcf6048e Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 21 Jul 2021 18:54:36 -0700 Subject: [PATCH 0299/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/1d34d2a7162e874b6573160145f189767e65f757 https://github.com/facebook/fbthrift/commit/9a83b0bdd4d965d9ff4eb072e7361c4a35a3562f https://github.com/facebook/fbzmq/commit/d402afed9d30f37d36585510643ea34c040f5595 https://github.com/facebook/proxygen/commit/85dae1a6fb90ae7613d92d0bace2437310e974c2 https://github.com/facebook/wangle/commit/76941784f43e529a48b13bff05828c99b9a52bdd https://github.com/facebook/watchman/commit/6e842aa10ee610de030d42be2cddb73d69b2f2aa https://github.com/facebookexperimental/rust-shed/commit/e2fc49162e7559b300b2c06359a5889768167367 https://github.com/facebookincubator/katran/commit/cb9c9f020e9fb42fd327a07beab064a622c5e519 https://github.com/facebookincubator/mvfst/commit/df26cc037c351b910b961f7654c622822c6f9099 Reviewed By: wittgenst fbshipit-source-id: 4fcae3287b40f35c553eeed0461642dc7ed1c7bb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f3b8f9f06812..8a8d5fbc756e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cc7160dd70318253f61673c19f8212e67f5da04c +Subproject commit 9a83b0bdd4d965d9ff4eb072e7361c4a35a3562f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5aa44b22c962..7544530a432c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit dd258aaddf98a3f9ab2f22c313be0fba034c0a0d +Subproject commit 76941784f43e529a48b13bff05828c99b9a52bdd From 8b331cef54115e5f72d6174e1848d5107935da5c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 21 Jul 2021 19:17:42 -0700 Subject: [PATCH 0300/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/bfbda14bfb65686f823ba0074d6ef1e424ede3d1 https://github.com/facebook/fbthrift/commit/3a1532f0ee53c6746f50dbad17c248eeced05d21 https://github.com/facebook/fbzmq/commit/8c7c0cf396f99393afbc9b3a7d21cedcede5a9bb https://github.com/facebook/proxygen/commit/1307e59b80926205fcc422010d5c009cd47c65fe https://github.com/facebook/watchman/commit/ddc1045e7027126bd0e198edffb97e5fdcf6048e https://github.com/facebookexperimental/rust-shed/commit/ce4bed2a3b7c986008b702fd0b39504aab1cae0e Reviewed By: wittgenst fbshipit-source-id: 8784025b14d1717e5a8d60836d169b820cf37964 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8a8d5fbc756e..9868e153b3ee 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9a83b0bdd4d965d9ff4eb072e7361c4a35a3562f +Subproject commit 3a1532f0ee53c6746f50dbad17c248eeced05d21 From 84767c092af78fd5af845f7ed87df04eb4c68b94 Mon Sep 17 00:00:00 2001 From: Zhengchao Liu Date: Wed, 21 Jul 2021 21:36:13 -0700 Subject: [PATCH 0301/7387] collect memory and disk fetch counts Summary: This adds counters for memory and disk counts in addition to import count so that we can understand cache hit rates during local investigation or output this in ActivityRecorder. Reviewed By: genevievehelsel Differential Revision: D29805637 fbshipit-source-id: 34261f91c33d6bd4bcb4b85b17d2e68360410896 --- eden/fs/service/eden.thrift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 7c688b3d0d96..8333e681b13d 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -744,6 +744,8 @@ struct AccessCounts { 3: i64 fsChannelWrites; 4: i64 fsChannelBackingStoreImports; 5: i64 fsChannelDurationNs; + 6: i64 fsChannelMemoryCacheImports; + 7: i64 fsChannelDiskCacheImports; } struct MountAccesses { From 0bcb2b541cac72478d41aaf11653c3e29b4aae89 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 22 Jul 2021 03:11:33 -0700 Subject: [PATCH 0302/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/f95fa2c017a01aceb02d93706f373b033da99f21 Reviewed By: wittgenst fbshipit-source-id: 3e82889a7838415c02c5d2bc399db0347286b016 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9868e153b3ee..70ec3386e415 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3a1532f0ee53c6746f50dbad17c248eeced05d21 +Subproject commit f95fa2c017a01aceb02d93706f373b033da99f21 From 7bdbc103f2fc33d639c5c83a25fc84919dd5f06a Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 22 Jul 2021 10:00:00 -0700 Subject: [PATCH 0303/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/1059ea4373532d07e563b7606530b0568d22a864 https://github.com/facebookexperimental/rust-shed/commit/1a3872d2f0be342fffdd24369d23f0fa2a75a0a0 Reviewed By: wittgenst fbshipit-source-id: 0acb102f1f9fd7db79593747d856434efb441187 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 70ec3386e415..dcf72cbbb905 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f95fa2c017a01aceb02d93706f373b033da99f21 +Subproject commit 1059ea4373532d07e563b7606530b0568d22a864 From 3fd4a8c943d25e1818c07e4eb5e95898baf39ab5 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 22 Jul 2021 12:36:17 -0700 Subject: [PATCH 0304/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8430823fbf2bf4e8f3f5f22c564bd02adda057a7 Reviewed By: wittgenst fbshipit-source-id: 3d5b959754e1b1c14fc19da69e4165e93209404e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index dcf72cbbb905..5452471474f1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1059ea4373532d07e563b7606530b0568d22a864 +Subproject commit 8430823fbf2bf4e8f3f5f22c564bd02adda057a7 From 90b279cf640dff071a566f86cb97fde59851331d Mon Sep 17 00:00:00 2001 From: Yipu Miao Date: Thu, 22 Jul 2021 15:03:11 -0700 Subject: [PATCH 0305/7387] Implement setPathRootId method Reviewed By: chadaustin Differential Revision: D29439945 fbshipit-source-id: 92c19ccffd14fdb8c99bcdf7be2f63960a4d5733 --- eden/fs/service/eden.thrift | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 8333e681b13d..1c8de0b1197b 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -847,6 +847,27 @@ struct GetScmStatusParams { 3: bool listIgnored = false; } + /** + * BackingStore object type. Caller will response to verify the type of the content + * matching the parameters passed. Exception will be thrown if type mismatch. + */ +enum RootType { + TREE = 0, + BLOB = 1, +} + +struct SetPathRootIdParams { + 1: PathString mountPoint, + 2: PathString path, + 3: BinaryHash rootId, + 4: RootType type; + 5: CheckoutMode mode; +} + +struct SetPathRootIdResult { + 1: list conflicts +} + service EdenService extends fb303_core.BaseService { list listMounts() throws (1: EdenError ex); void mount(1: MountArgument info) throws (1: EdenError ex); @@ -1324,4 +1345,15 @@ service EdenService extends fb303_core.BaseService { * Returns the number of pending calls that were unblocked */ i64 unblockFault(1: UnblockFaultArg info) throws (1: EdenError ex); + + /** + * Directly load a BackingStore object identified by rootId at the given path. + * + * If any file or directory name conflict, the behavior is same with Checkout + * This method is thread safe. + */ + SetPathRootIdResult setPathRootId( + 1: SetPathRootIdParams params, + ) throws (1: EdenError ex); + } From d346c2ab8788f174c33216297d60403c18cedf53 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 22 Jul 2021 15:10:55 -0700 Subject: [PATCH 0306/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/937fc9806ec68112fa5e12e272400d678a5ccb93 https://github.com/facebookincubator/mvfst/commit/632367706931629d40cf7c24baa4a5f493b87f51 Reviewed By: wittgenst fbshipit-source-id: ba153206f1689cd1c0f1a68f0683a354b066d9d3 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 44ded47c5ca2..46bb6ef6ac31 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 4baba28200d7446c870e96f3cdbeb492f54625d0 +Subproject commit 937fc9806ec68112fa5e12e272400d678a5ccb93 From c8a76c88913f63dca7eb6abe1742eac515ff7542 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 22 Jul 2021 15:42:14 -0700 Subject: [PATCH 0307/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/0f7b1c837a0b3982d4f5e914e073f3aaf0cc2350 https://github.com/facebook/fbthrift/commit/3c3e2fe857716064546964b1ec83fbb2a1370e30 https://github.com/facebook/fbzmq/commit/dcbc54af0f75597adf0a5600f3d6fc127e196cd5 https://github.com/facebook/proxygen/commit/aa0044feddda6addda4d14c936b71d4fd83bcf84 https://github.com/facebook/wangle/commit/9d018eb6645eb60499ee7286cc152ab5a8171d9b https://github.com/facebook/watchman/commit/d346c2ab8788f174c33216297d60403c18cedf53 https://github.com/facebookincubator/fizz/commit/58f93028a69f4adbb7da0a4c3beee5c1e7b1b085 https://github.com/facebookincubator/katran/commit/c2009a879528f141f775df1c6afa947668d7dee0 https://github.com/facebookincubator/mvfst/commit/d2e793e2618fc2553e7411c08afb64fcb8e8bc8c https://github.com/rsocket/rsocket-cpp/commit/49d7cde5061612a6977d2587d2736e82e21536b5 Reviewed By: wittgenst fbshipit-source-id: d9856c9681cb553c9241d8f31c5c7f25ec90a948 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5452471474f1..71a1794f2fc4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8430823fbf2bf4e8f3f5f22c564bd02adda057a7 +Subproject commit 3c3e2fe857716064546964b1ec83fbb2a1370e30 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7544530a432c..bcba0a72b07e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 76941784f43e529a48b13bff05828c99b9a52bdd +Subproject commit 9d018eb6645eb60499ee7286cc152ab5a8171d9b From 9bdc7126d0d5fc30bbb7f364ab5bc7860a7f3247 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 22 Jul 2021 16:41:49 -0700 Subject: [PATCH 0308/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c0544369a223bbf1ea36cec71d54a154cc243468 https://github.com/facebook/fbthrift/commit/32bcb6984a01a889228471ee49bda018b88ba5db https://github.com/facebook/fbzmq/commit/397699503accbd72a55706c7a3ffa80f29da5011 https://github.com/facebook/proxygen/commit/c8e48f49ec709c013aa78398fd583545d993522c https://github.com/facebook/rocksdb/commit/2e5388178fcfcf0f7cbf051b0878e53c3236561a https://github.com/facebook/wangle/commit/541198a7d4b83cf590e425299ce4adb43c104662 https://github.com/facebook/watchman/commit/c8a76c88913f63dca7eb6abe1742eac515ff7542 https://github.com/facebookexperimental/rust-shed/commit/ac3c34caba0b2d37ce223570ce415ceb398c6c44 https://github.com/facebookincubator/katran/commit/3494264dc26bfbf91c279e3085cedc0ac95ad6c4 https://github.com/facebookincubator/mvfst/commit/f222c26ae1822a25e474ef04a454b9a9504bbc4e Reviewed By: wittgenst fbshipit-source-id: 3f1e7e64e98304b21e137051351ff2cc6b815dae --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 71a1794f2fc4..027a63486864 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3c3e2fe857716064546964b1ec83fbb2a1370e30 +Subproject commit 32bcb6984a01a889228471ee49bda018b88ba5db diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index bcba0a72b07e..7a3e4f2bd347 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9d018eb6645eb60499ee7286cc152ab5a8171d9b +Subproject commit 541198a7d4b83cf590e425299ce4adb43c104662 From 597ff69d0934ff2ad3e678ac6feb1475f75cca6e Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 22 Jul 2021 17:54:28 -0700 Subject: [PATCH 0309/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ce3391293e4fae179fce7bcb53cada6e065c28cc https://github.com/facebook/fbthrift/commit/1486e47402a5fa7df9791bd01c7e703671de9de6 https://github.com/facebook/fbzmq/commit/7a4cf50f1eebe25472387dca94452775b02a603b https://github.com/facebook/proxygen/commit/e32c20fdf10650c2d39f271f7f117610674bd1d0 https://github.com/facebook/rocksdb/commit/61c9bd49c16ec27304c2b0685fc72d0a9997b182 https://github.com/facebook/watchman/commit/9bdc7126d0d5fc30bbb7f364ab5bc7860a7f3247 https://github.com/facebookexperimental/rust-shed/commit/374b8f95dda6617f193ea5d0bb6ff11c1ce0cb81 https://github.com/facebookexternal/stl_tasks/commit/2386315b55418ea142aa8348094d2951153c8aae Reviewed By: wittgenst fbshipit-source-id: b3a95f82b21497386e0614216b720f571f9efd03 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 027a63486864..182aded7f6c5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 32bcb6984a01a889228471ee49bda018b88ba5db +Subproject commit 1486e47402a5fa7df9791bd01c7e703671de9de6 From f806201772881554df99d4d1ffa1356f72caef44 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 23 Jul 2021 00:31:19 -0700 Subject: [PATCH 0310/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/01c28618e79d42ec3e34e07e92cc3ecebc883450 Reviewed By: wittgenst fbshipit-source-id: 06d227c9844f62dcd36ae0fd57fc0271119013b4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 182aded7f6c5..cd785f1b94ac 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1486e47402a5fa7df9791bd01c7e703671de9de6 +Subproject commit 01c28618e79d42ec3e34e07e92cc3ecebc883450 From 134e173edaa29c49de7a1fdb3fca5e563adb3839 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 23 Jul 2021 09:47:21 -0700 Subject: [PATCH 0311/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/3275d8925613ed89bb9551f6671dab8dc4c9bc0c https://github.com/facebook/mcrouter/commit/c9cd4bddf894e84c342378a801f108d35f8c3385 Reviewed By: wittgenst fbshipit-source-id: 3b5c3cc492c034653ba8267bf21179933d6297b5 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 46bb6ef6ac31..a2b151e302bd 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 937fc9806ec68112fa5e12e272400d678a5ccb93 +Subproject commit 3275d8925613ed89bb9551f6671dab8dc4c9bc0c From 41c1ce873c1f4907ace9ffb32a423f703888b127 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 23 Jul 2021 10:11:48 -0700 Subject: [PATCH 0312/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/833b6e8c35b48bca0744e1b0731f2340a8376aae https://github.com/facebook/fbthrift/commit/838076e06c9e93cd2f09210ff820ebe13e3a5582 https://github.com/facebook/fbzmq/commit/4e492a3e8ff7a33f80aa4ae64f8df85b0f731f3d https://github.com/facebook/proxygen/commit/0ab560715646e046d7e7427364888acd56613434 https://github.com/facebook/wangle/commit/0dc6870f66ae576475e51a3c1032d80729da3402 https://github.com/facebook/watchman/commit/134e173edaa29c49de7a1fdb3fca5e563adb3839 https://github.com/facebookincubator/fizz/commit/3967c751d09e5c7d63d25bce831fcaae1c0ad382 https://github.com/facebookincubator/katran/commit/1e04f96fca4f09db22169a8b8bba4a310c5a06e5 https://github.com/facebookincubator/mvfst/commit/b07db1e3a56d5bd9fc81ea8ef055bc76f3171ff9 https://github.com/rsocket/rsocket-cpp/commit/dfed581d81a95bdc347297bc244d0704f8a8296f Reviewed By: wittgenst fbshipit-source-id: a5249eb70ffafc80dc15a280d923d50d78049e2e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cd785f1b94ac..3f7e48c9562e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 01c28618e79d42ec3e34e07e92cc3ecebc883450 +Subproject commit 838076e06c9e93cd2f09210ff820ebe13e3a5582 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7a3e4f2bd347..10db6457544a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 541198a7d4b83cf590e425299ce4adb43c104662 +Subproject commit 0dc6870f66ae576475e51a3c1032d80729da3402 From a3b492a57792c7b94bfec617fba454ea24c664f8 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 23 Jul 2021 10:41:27 -0700 Subject: [PATCH 0313/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c9b06d1a25540d504e7aa30adb20a554bb480d76 https://github.com/facebook/fbthrift/commit/e233ee6b26393bfe9e3d5ee53715db9182016f4d https://github.com/facebook/fbzmq/commit/ba9957e32e45daa96728bf23a91543cde899c809 https://github.com/facebook/litho/commit/71f3dcf5bc6f52d0c5222beaf5bd1f0ba78649e6 https://github.com/facebook/proxygen/commit/6635eccadb12b62e39b342b5217dc869b9861ce7 https://github.com/facebook/wangle/commit/79f77064d37baf9fc0343364a7a9f384bca1e89b https://github.com/facebook/watchman/commit/41c1ce873c1f4907ace9ffb32a423f703888b127 https://github.com/facebookexperimental/rust-shed/commit/d8031728feb8cb0d8d5bcaeb617f74f1f80ff573 https://github.com/facebookincubator/katran/commit/9c5f4daa2827f518c1d46a1d4d65dae0ac8dd2a3 https://github.com/facebookincubator/mvfst/commit/9b83cabe4147bb63d54c196a763759a69e5fc146 Reviewed By: wittgenst fbshipit-source-id: 1a4d15e80a392fc5cdab0589606ac4727d4e78c3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3f7e48c9562e..7538edf849a7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 838076e06c9e93cd2f09210ff820ebe13e3a5582 +Subproject commit e233ee6b26393bfe9e3d5ee53715db9182016f4d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 10db6457544a..e36b986fca86 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0dc6870f66ae576475e51a3c1032d80729da3402 +Subproject commit 79f77064d37baf9fc0343364a7a9f384bca1e89b From 4c97be6cd64946dfde607ad8a68c340a12bc2fff Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 23 Jul 2021 11:10:42 -0700 Subject: [PATCH 0314/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/baeb9ad1705de55e56be1cbc449a1fb2a183237e https://github.com/facebook/fbthrift/commit/4501d1c5b5f03bb5084ebe72a0ad3ca959634e9d https://github.com/facebook/fbzmq/commit/919f949f15f0db4cfe15a126e7e5b1fab9d37ce7 https://github.com/facebook/proxygen/commit/2a4c3a17ae7a721efa7d94aa467fcc9e9e09958c https://github.com/facebook/watchman/commit/a3b492a57792c7b94bfec617fba454ea24c664f8 https://github.com/facebookexperimental/rust-shed/commit/1ff2b831d46d21b58126549520032fda001dde80 Reviewed By: wittgenst fbshipit-source-id: 992343f12c6c69af42e77b091a3dbcf66065c53e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7538edf849a7..58e13ebda086 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e233ee6b26393bfe9e3d5ee53715db9182016f4d +Subproject commit 4501d1c5b5f03bb5084ebe72a0ad3ca959634e9d From 2c895d2e3fe08705b10fdb3e7c0d33fcfd104f07 Mon Sep 17 00:00:00 2001 From: Zhengchao Liu Date: Fri, 23 Jul 2021 12:30:09 -0700 Subject: [PATCH 0315/7387] cli support for ActivityRecorder Summary: This adds debug commands for ActivityRecorder: ``` eden debug start_recording --output-dir * stdout: the id of the profile eden debug stop_recording --unique * stdout: the output file path ``` Users can record multiple profiles concurrently. Each profile is identified by the timestamp when it started. Reviewed By: genevievehelsel Differential Revision: D29666359 fbshipit-source-id: 487ca67de77378a8141bc4ac46b9abd1375ffd23 --- eden/fs/service/eden.thrift | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 1c8de0b1197b..1d879200b5be 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -558,6 +558,14 @@ struct InodePathDebugInfo { 3: bool linked; } +struct ActivityRecorderResult { + // 0 if the operation has failed. For example, + // fail to start recording due to file permission issue + // or fail to stop recording due to no active subscriber. + 1: i64 unique; + 2: optional PathString path; +} + struct SetLogLevelResult { 1: bool categoryCreated; } @@ -1209,6 +1217,27 @@ service EdenService extends fb303_core.BaseService { */ list debugOutstandingNfsCalls(1: PathString mountPoint); + /** + * Start recording performance metrics such as files read + * + * This will return a structure containing unique id identifying this recording. + */ + ActivityRecorderResult debugStartRecordingActivity( + 1: PathString mountPoint, + 2: PathString outputDir, + ); + + /** + * Stop the recording identified by unique + * + * This will return a structure containing unique id identifying this recording + * and, if the recording is successfully stopped, the output file path. + */ + ActivityRecorderResult debugStopRecordingActivity( + 1: PathString mountPoint, + 2: i64 unique, + ); + /** * Get the InodePathDebugInfo for the inode that corresponds to the given * inode number. This provides the path for the inode and also indicates From 1efba66d43d5c7c08660c95225b8a71ecc36ea8d Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 23 Jul 2021 13:34:39 -0700 Subject: [PATCH 0316/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/3f0d184c66f705fe1019ce56692e394fc131b15d Reviewed By: wittgenst fbshipit-source-id: 899779fb278613ae031ce9470435e3010cb985ab --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 58e13ebda086..91d369291f4f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4501d1c5b5f03bb5084ebe72a0ad3ca959634e9d +Subproject commit 3f0d184c66f705fe1019ce56692e394fc131b15d From 3f2c07267f4cc315b74f55f82004ecdbf2728d4c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 23 Jul 2021 14:01:51 -0700 Subject: [PATCH 0317/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/0837edfb6a700f3f4b5cb86aa919486c7b3816e6 https://github.com/facebook/fbzmq/commit/60d4316012a43751bf7138676053c5adedd4c196 https://github.com/facebook/folly/commit/7fc541e802f830e856f457cb8f488a50189d8a3d https://github.com/facebook/watchman/commit/1efba66d43d5c7c08660c95225b8a71ecc36ea8d https://github.com/facebookexperimental/rust-shed/commit/874b2e3443b85f51a0e96b182be5092d548581e0 Reviewed By: wittgenst fbshipit-source-id: c7d9714790c7ec172d2e9f465fbb801fab6f81d5 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a2b151e302bd..fb8ffaab884c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 3275d8925613ed89bb9551f6671dab8dc4c9bc0c +Subproject commit 7fc541e802f830e856f457cb8f488a50189d8a3d From e745b27d6964b938a1249bbc161725ccbeca89bb Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 23 Jul 2021 14:57:31 -0700 Subject: [PATCH 0318/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/6a4c67ed2d3b386fa97e35985405512e354f4584 https://github.com/facebook/fbthrift/commit/595f13fd9f90252047ab66297f63c0936b3259d8 https://github.com/facebook/fbzmq/commit/5981da44ba3206396b8d9ce2178d16d30c37f92f https://github.com/facebook/folly/commit/832f135adede09d6e83e1f026c159d1b88249951 https://github.com/facebook/proxygen/commit/286b4385a5cf66d6ce642a04d94eca96acece059 https://github.com/facebook/rocksdb/commit/2febf1c45c5c34813038a1ae7d2b10013e0bc459 https://github.com/facebook/wangle/commit/a906e857e0c91541bee932ea8922f0b892f9df91 https://github.com/facebook/watchman/commit/3f2c07267f4cc315b74f55f82004ecdbf2728d4c https://github.com/facebookincubator/fizz/commit/0bacbf2d1a2e8cfa1924f0f1901e8a5f00a19102 https://github.com/facebookincubator/katran/commit/de6c059aa47f1991c7d3a9076f89dc848e2c4635 https://github.com/facebookincubator/mvfst/commit/612a00c3f9750b2829f008b55687d076e5244cb6 https://github.com/rsocket/rsocket-cpp/commit/8dea691dc105fd1043e4a548858ef3c0a7130c78 Reviewed By: wittgenst fbshipit-source-id: e27eeffe25d29b40670cbd9ccacbec38446cb0f0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 91d369291f4f..8beabce6ab54 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3f0d184c66f705fe1019ce56692e394fc131b15d +Subproject commit 595f13fd9f90252047ab66297f63c0936b3259d8 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index fb8ffaab884c..f633179fbafc 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7fc541e802f830e856f457cb8f488a50189d8a3d +Subproject commit 832f135adede09d6e83e1f026c159d1b88249951 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e36b986fca86..5e906e55580f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 79f77064d37baf9fc0343364a7a9f384bca1e89b +Subproject commit a906e857e0c91541bee932ea8922f0b892f9df91 From 52ed0d3ee728716763676a2727f15e81f914fa50 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 23 Jul 2021 15:32:18 -0700 Subject: [PATCH 0319/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ccbaa6ba340048f03e4d5475a2b868a8c7065d9b https://github.com/facebook/fbthrift/commit/021b1214d2cd1d0b168e841d602e0ba1b866af2b https://github.com/facebook/fbzmq/commit/8f2773b743994cc04a4e85b27bb928f00970ff92 https://github.com/facebook/folly/commit/5e2ab64f80b8eb4c8181ddfca511f64d4241f26a https://github.com/facebook/proxygen/commit/97ca1c13f0220ab018213bdd917cc4e21a3d28ca https://github.com/facebook/wangle/commit/f610dbee127a1fa5b99eb2dc7b25399dac18bc88 https://github.com/facebook/watchman/commit/e745b27d6964b938a1249bbc161725ccbeca89bb https://github.com/facebookexperimental/rust-shed/commit/9f7b797a750c9e206e3a8d519735540acbd9c2db https://github.com/facebookincubator/fizz/commit/c82b65e85c6a183dcffdfe867a949eed07c1bc72 https://github.com/facebookincubator/katran/commit/7f69f0e87bb2cc8f383d35c7d4dab6b11066414a https://github.com/facebookincubator/mvfst/commit/32ef4c559433ed10fa6d465644dd690bebce67ad https://github.com/rsocket/rsocket-cpp/commit/0a39ba775d316f1700d9a868696230eda53d6618 Reviewed By: wittgenst fbshipit-source-id: af4b72aa497470b74385dac0fbc3f617ee4ec321 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8beabce6ab54..e86623de675f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 595f13fd9f90252047ab66297f63c0936b3259d8 +Subproject commit 021b1214d2cd1d0b168e841d602e0ba1b866af2b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f633179fbafc..55e078a0cc10 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 832f135adede09d6e83e1f026c159d1b88249951 +Subproject commit 5e2ab64f80b8eb4c8181ddfca511f64d4241f26a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5e906e55580f..9abb29765f92 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a906e857e0c91541bee932ea8922f0b892f9df91 +Subproject commit f610dbee127a1fa5b99eb2dc7b25399dac18bc88 From 16c5376b494bba89977576f1862177bda9591820 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 23 Jul 2021 15:55:02 -0700 Subject: [PATCH 0320/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/52198ea49858b3a25187a65d6007fcbf7e6572c0 https://github.com/facebook/fbthrift/commit/e2158fcdb41ff314c70b2a0cbf365885f5ced17e https://github.com/facebook/fbzmq/commit/94ddcd3f65bd8c15f1810259b126a0588b30b50a https://github.com/facebook/proxygen/commit/6efb930aaa50f98784dd5024f259f4fe091cdbc4 https://github.com/facebook/wangle/commit/511fee0f6e84a2ddaacfff7d8bfdc86187762694 https://github.com/facebook/watchman/commit/52ed0d3ee728716763676a2727f15e81f914fa50 https://github.com/facebookexperimental/rust-shed/commit/6b9684445f40889bbe8ade1583eb81ab73ce4e08 https://github.com/facebookincubator/fizz/commit/90701d582a9625a29c7435d1ac5551b1f9dd6f14 https://github.com/facebookincubator/katran/commit/4d0558c5a5de95c499c69b8b4cb7f943990248c2 https://github.com/facebookincubator/mvfst/commit/46dea946568bd9c58476e1fc63d13e8f4629b6f1 https://github.com/rsocket/rsocket-cpp/commit/1e4fb5f51bc28419a15f351a121547e3c88fef7f Reviewed By: wittgenst fbshipit-source-id: 2ac8f3c030472e6ea313405ed414459ab25636ca --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e86623de675f..84dc636f559e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 021b1214d2cd1d0b168e841d602e0ba1b866af2b +Subproject commit e2158fcdb41ff314c70b2a0cbf365885f5ced17e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9abb29765f92..9a1b893b037a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f610dbee127a1fa5b99eb2dc7b25399dac18bc88 +Subproject commit 511fee0f6e84a2ddaacfff7d8bfdc86187762694 From 039276f563747384c5cbca5ea3b7f862bc80f803 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 23 Jul 2021 16:24:11 -0700 Subject: [PATCH 0321/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ccae12f79c7210c79d098e4bd6f98b3ac190e261 https://github.com/facebook/fbthrift/commit/cc336e5fec881745d1fbb34e9b3d637b37d9a6b9 https://github.com/facebook/fbzmq/commit/0b3f740bc08c0f1263d80e1a7d65cdc6485387de https://github.com/facebook/folly/commit/ff841baa23dbcd653acedaa0a4f8cc2a896b49d9 https://github.com/facebook/proxygen/commit/a056be3dcb29f31328b659721460cadc3d1ad1c6 https://github.com/facebook/rocksdb/commit/daf7e77a6b432fac116d5842df2eb34f37c8ec1e https://github.com/facebook/wangle/commit/a2d3d0862efaaf14c4586faea686a484926c5486 https://github.com/facebook/watchman/commit/16c5376b494bba89977576f1862177bda9591820 https://github.com/facebookexperimental/rust-shed/commit/a60a6a3c10c0a5b7d06d5b8e952334fd27f2c09c https://github.com/facebookincubator/katran/commit/d32c2f8452b0d18c254e91ac5a702262e7fc954c https://github.com/facebookincubator/mvfst/commit/e950bc4fc5ce7a1f74162c066e850b5f14a60619 Reviewed By: wittgenst fbshipit-source-id: 660cba604aab557accc60273f0bd6b118bd934a8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 84dc636f559e..c5f898fecfbd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e2158fcdb41ff314c70b2a0cbf365885f5ced17e +Subproject commit cc336e5fec881745d1fbb34e9b3d637b37d9a6b9 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 55e078a0cc10..e040553b16b0 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 5e2ab64f80b8eb4c8181ddfca511f64d4241f26a +Subproject commit ff841baa23dbcd653acedaa0a4f8cc2a896b49d9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9a1b893b037a..95a4565b049b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 511fee0f6e84a2ddaacfff7d8bfdc86187762694 +Subproject commit a2d3d0862efaaf14c4586faea686a484926c5486 From e85da1e44aae89af57142d481a8d1d44f4aa11ab Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 23 Jul 2021 16:48:05 -0700 Subject: [PATCH 0322/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/435c22fdb5e9fb5eb3a2751d1d33f8e9b525a0b5 https://github.com/facebook/fbthrift/commit/9846d41e1a529cc96953ef9d4587994427adb145 https://github.com/facebook/fbzmq/commit/03d1b05874bcafffb81ab8d63cfc80d8600cec72 https://github.com/facebook/proxygen/commit/e00ad88e379d8c8f860b3fb1dc853f60014fc6d4 https://github.com/facebook/wangle/commit/9552323b6b6ef0611321a6c23cc0ee31abe09036 https://github.com/facebook/watchman/commit/039276f563747384c5cbca5ea3b7f862bc80f803 https://github.com/facebookexperimental/rust-shed/commit/906f60a40ea9140ffaef78f316773ade2559f29d https://github.com/facebookincubator/fizz/commit/83c39e100d6a0396b11c6b2ba2883eea702d5529 https://github.com/facebookincubator/katran/commit/6338d48da645176f708998499d227b0536d3c04b https://github.com/facebookincubator/mvfst/commit/ff07f798404d708f4b6420c46ff6440e45f9b931 https://github.com/rsocket/rsocket-cpp/commit/22b998d90b7eeb225e025e7d1361b2d20865c4e0 Reviewed By: wittgenst fbshipit-source-id: 3044b25019c9e96d1d38870bd724bd2750db2530 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c5f898fecfbd..c55fe0dc0855 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cc336e5fec881745d1fbb34e9b3d637b37d9a6b9 +Subproject commit 9846d41e1a529cc96953ef9d4587994427adb145 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 95a4565b049b..6abe46985827 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a2d3d0862efaaf14c4586faea686a484926c5486 +Subproject commit 9552323b6b6ef0611321a6c23cc0ee31abe09036 From fb5ebe9f38d8daf75bf3a4409b89952e05fd20a0 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 23 Jul 2021 17:16:08 -0700 Subject: [PATCH 0323/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/b817e87f844a81cc94072b4dce5e32904cd9bc81 https://github.com/facebook/fbthrift/commit/4c4141bc68e4f1c25d499391dd207a2d70df02ce https://github.com/facebook/fbzmq/commit/19f6310814c39e632e1be7cb488c0a15a8d562bc https://github.com/facebook/proxygen/commit/6b865b280728d5d4cee72c7b705b8f04ce2d5825 https://github.com/facebook/wangle/commit/6b17743d3996239c47067a2f57c246bee0b29b56 https://github.com/facebook/watchman/commit/e85da1e44aae89af57142d481a8d1d44f4aa11ab https://github.com/facebookexperimental/rust-shed/commit/815e9a105d57fa67b12c82dcff824bf8d1c10618 https://github.com/facebookincubator/katran/commit/395a70f2d214e47a2bde6f7f3940d47204dbe0d3 https://github.com/facebookincubator/mvfst/commit/7171bb3f19b8996b65988d31f0dcf20ae9272136 Reviewed By: wittgenst fbshipit-source-id: 710fc621a60a5df050424e1935328c37653f4d2c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c55fe0dc0855..7908af20ea1f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9846d41e1a529cc96953ef9d4587994427adb145 +Subproject commit 4c4141bc68e4f1c25d499391dd207a2d70df02ce diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6abe46985827..b858c8570adb 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9552323b6b6ef0611321a6c23cc0ee31abe09036 +Subproject commit 6b17743d3996239c47067a2f57c246bee0b29b56 From cf6d5f609ea36b97031ca5a17f2e429698b7687a Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 23 Jul 2021 17:38:18 -0700 Subject: [PATCH 0324/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c6186307d31371ad6868836b22e6835e6ebf6ccc https://github.com/facebook/fbthrift/commit/8a5cda0044eb41667ba77a4ef1f23d6f9c1ad556 https://github.com/facebook/fbzmq/commit/fd84fe702940e9688e057500081c30dbfec0becc https://github.com/facebook/proxygen/commit/88ebd1a8c70815777fbba7b175ceaa2448d0f77a https://github.com/facebook/watchman/commit/fb5ebe9f38d8daf75bf3a4409b89952e05fd20a0 https://github.com/facebookexperimental/rust-shed/commit/ad2d79a86b807906fa7a0b904badab7fcfa8a9ac Reviewed By: wittgenst fbshipit-source-id: cc29b85cf5e7357126505f67cf5c1a01155ef82e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7908af20ea1f..b798ccddb9f4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4c4141bc68e4f1c25d499391dd207a2d70df02ce +Subproject commit 8a5cda0044eb41667ba77a4ef1f23d6f9c1ad556 From 0cf3f8650d564cb474f804edbf4954de0870343d Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Sat, 24 Jul 2021 04:34:30 -0700 Subject: [PATCH 0325/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/774312cb3e1ccd7a78546c5cd92e540cadd7e965 Reviewed By: wittgenst fbshipit-source-id: 0da04e2e65c88fc56e146e9399c1272349860dbd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b798ccddb9f4..b4f50a57b4d0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8a5cda0044eb41667ba77a4ef1f23d6f9c1ad556 +Subproject commit 774312cb3e1ccd7a78546c5cd92e540cadd7e965 From 37b138646e964687dcf4e1e5deb389d512342dc9 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 26 Jul 2021 08:14:57 -0700 Subject: [PATCH 0326/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/f361cb0b0ece549fb9cf7eb508b49bccc4af0ddb Reviewed By: wittgenst fbshipit-source-id: c87e7793431297e155c747c471e1715e628d7dfa --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b4f50a57b4d0..3ea7022c72b7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 774312cb3e1ccd7a78546c5cd92e540cadd7e965 +Subproject commit f361cb0b0ece549fb9cf7eb508b49bccc4af0ddb From 936fc84c3c19af5ca50112c684619a6a705536a1 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 26 Jul 2021 09:58:51 -0700 Subject: [PATCH 0327/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/8067a25696d483544b6260144aa27103d6f97196 Reviewed By: yns88 fbshipit-source-id: 7622aab0432bcf94d30852c71f05802c5f522d57 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e040553b16b0..6afa7c52d5ef 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ff841baa23dbcd653acedaa0a4f8cc2a896b49d9 +Subproject commit 8067a25696d483544b6260144aa27103d6f97196 From 96b1708e1451af0aad060ccd1c3973de89cca8a4 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 26 Jul 2021 10:51:55 -0700 Subject: [PATCH 0328/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/1099ad60e1edcb086fd3859441695d2ea43ffc80 https://github.com/facebook/fbthrift/commit/8c7b33a03e0437c778dfd66fb339bc5946844e74 https://github.com/facebook/fbzmq/commit/77f150ac6c1975a4a61cc9d5bb2f5d55c7e83a76 https://github.com/facebook/proxygen/commit/02e5b0244e1f46323fd2fb47beb513a43a9a13f3 https://github.com/facebook/wangle/commit/d83d99e7ebd4a01713b4fd32410ac7854f19203f https://github.com/facebook/watchman/commit/936fc84c3c19af5ca50112c684619a6a705536a1 https://github.com/facebookincubator/fizz/commit/ed5d16ccd5857327c3bdee94c2a54a7a0f866b60 https://github.com/facebookincubator/katran/commit/07b496660c49e3ae6d9dbcc0c62d91a53883233d https://github.com/facebookincubator/mvfst/commit/ba96e3fc25aa9cc0de70959d92c6ad5f0dcc5868 https://github.com/rsocket/rsocket-cpp/commit/f1006d2ad184ed0bc8529f5e867f754494004690 Reviewed By: yns88 fbshipit-source-id: 2a6dd8469bf60be4c729013b017e7e75a9c6892f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3ea7022c72b7..afc7ca768d59 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f361cb0b0ece549fb9cf7eb508b49bccc4af0ddb +Subproject commit 8c7b33a03e0437c778dfd66fb339bc5946844e74 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b858c8570adb..fcaae6ea22c2 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6b17743d3996239c47067a2f57c246bee0b29b56 +Subproject commit d83d99e7ebd4a01713b4fd32410ac7854f19203f From 38c1cf1419d3aae22ae8adeec60341f80184d34d Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 26 Jul 2021 12:05:35 -0700 Subject: [PATCH 0329/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/d494546857e9ae90ffa1f2b1a7b9a5c4eec72bd7 https://github.com/facebook/fbthrift/commit/a07078cc6c92fe3eb3e3dac037b034d8756fe92a https://github.com/facebook/fbzmq/commit/206f3704c3d9b8feccda1921773e70bcf60219ce https://github.com/facebook/litho/commit/4bffeb311a78bc7b9d4923b3c59340cdc82d5b6d https://github.com/facebook/proxygen/commit/15ef6e5cd5c717d76f6c0a06cfac471a5ae40012 https://github.com/facebook/squangle/commit/16a37e240583cbd1278d1dfe359c7d53229ea3e0 https://github.com/facebook/wangle/commit/0ad0913950693c73dcf8cbaae07d50d8e08bfae7 https://github.com/facebook/watchman/commit/96b1708e1451af0aad060ccd1c3973de89cca8a4 https://github.com/facebookexperimental/rust-shed/commit/b0937f8f76b4c8848b0c72e520aeef6f30972b9f https://github.com/facebookincubator/katran/commit/b52dcbd2817e83cfc6b166d05423a3d2d196c818 https://github.com/facebookincubator/mvfst/commit/58f8421f1cd28a493254ccad5d4ed6fa56526d23 Reviewed By: yns88 fbshipit-source-id: 70f1ae46626af7b23f801f967f4b59ae9adf50f9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index afc7ca768d59..75bd6d901868 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8c7b33a03e0437c778dfd66fb339bc5946844e74 +Subproject commit a07078cc6c92fe3eb3e3dac037b034d8756fe92a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index fcaae6ea22c2..07dee78ea663 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d83d99e7ebd4a01713b4fd32410ac7854f19203f +Subproject commit 0ad0913950693c73dcf8cbaae07d50d8e08bfae7 From fb6b1abd24948e79aa768888e709bdbd246d2850 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 26 Jul 2021 12:27:32 -0700 Subject: [PATCH 0330/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/0bed4bfcc189716d0ddf1debb4f1eda87e5f5346 https://github.com/facebook/fbthrift/commit/99a1c5a2e9afc81e85287589324e508a75d4f75c https://github.com/facebook/fbzmq/commit/f96199bd64890b67eeff70ebe532767f8ad6379a https://github.com/facebook/proxygen/commit/a08d2e44e1b68dcb050ec69bb403cae9fa6ad10e https://github.com/facebook/rocksdb/commit/4361d6d16380f619833d58225183cbfbb2c7a1dd https://github.com/facebook/watchman/commit/38c1cf1419d3aae22ae8adeec60341f80184d34d https://github.com/facebookexperimental/rust-shed/commit/4ad73e9d80afd3cd53ebbf1bf34185b82e4e3ab3 Reviewed By: yns88 fbshipit-source-id: f019d12cb784d8837611864968b63e68ab4b4c6f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 75bd6d901868..ddb10000d554 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a07078cc6c92fe3eb3e3dac037b034d8756fe92a +Subproject commit 99a1c5a2e9afc81e85287589324e508a75d4f75c From f15796f701a578a4bbc8badc4a20d83dc582acc7 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 26 Jul 2021 13:54:59 -0700 Subject: [PATCH 0331/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/d4153a597598d825146fb9a8d6a308f2c7dbed85 Reviewed By: yns88 fbshipit-source-id: 1c13481813bd8be71041a61f0106f25d18da39cd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ddb10000d554..e2f1517ad639 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 99a1c5a2e9afc81e85287589324e508a75d4f75c +Subproject commit d4153a597598d825146fb9a8d6a308f2c7dbed85 From 81b7ef67fd3ef56ba9ab061614763ff917e1bb67 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 26 Jul 2021 15:55:38 -0700 Subject: [PATCH 0332/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/b9176fc5bb45b703687157515818710f8008b614 Reviewed By: yns88 fbshipit-source-id: 5d9bfadaa6be45bba7f7be26960d4e9f0246694b --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6afa7c52d5ef..7881c9d89a61 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 8067a25696d483544b6260144aa27103d6f97196 +Subproject commit b9176fc5bb45b703687157515818710f8008b614 From 568a6d4dfd7041d84fefb81458cfec7bc9b5014c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 26 Jul 2021 16:24:38 -0700 Subject: [PATCH 0333/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/8ba3877c5c5c0f228741507d66bc620f233f9316 https://github.com/facebook/fbthrift/commit/37e3199a330948f0a685d5ab51f95addd55535e7 https://github.com/facebook/fbzmq/commit/01dfd7b968f9892ebbd3b7876d197e56d0e2bef7 https://github.com/facebook/proxygen/commit/84153ceabef3f0f8e66f7444eccd85e0c3c7cf3a https://github.com/facebook/wangle/commit/7d4e33849172e95068fd99147deda64ac588fb38 https://github.com/facebook/watchman/commit/81b7ef67fd3ef56ba9ab061614763ff917e1bb67 https://github.com/facebookincubator/fizz/commit/cab7956eb16cac0eef810c3bc88818b313482983 https://github.com/facebookincubator/katran/commit/8cda0a5f40bcf079379a030a0e843d01b5fac882 https://github.com/facebookincubator/mvfst/commit/e7ae8fc19236aee398828d7f18a74ca20d29a0d2 https://github.com/rsocket/rsocket-cpp/commit/4f47ecf162e1772aa2e3e334ab0cd54fd0b4addc Reviewed By: yns88 fbshipit-source-id: bfbe94330f27f1e4fc3630ad162d368754831843 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e2f1517ad639..52583f84283e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d4153a597598d825146fb9a8d6a308f2c7dbed85 +Subproject commit 37e3199a330948f0a685d5ab51f95addd55535e7 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 07dee78ea663..92b4cd80749d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0ad0913950693c73dcf8cbaae07d50d8e08bfae7 +Subproject commit 7d4e33849172e95068fd99147deda64ac588fb38 From 69e3272f726e36fc76fed62b03a29e3118b5b6d6 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 26 Jul 2021 17:09:38 -0700 Subject: [PATCH 0334/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/8bb53a149a243d1f4a63f206737c43d3de7f52e8 https://github.com/facebook/fbthrift/commit/3a147a59a3f17f974571dec40451b39d5041c937 https://github.com/facebook/fbzmq/commit/fc98b0c98e12aeeb9a1f5ece5599132239de0ab7 https://github.com/facebook/proxygen/commit/3ee8d094dd2e37726d167f04fd957b5a7eb08fef https://github.com/facebook/wangle/commit/6d425a5ee75de36ef0b56e540b0b34b60f0c111e https://github.com/facebook/watchman/commit/568a6d4dfd7041d84fefb81458cfec7bc9b5014c https://github.com/facebookexperimental/rust-shed/commit/0c3131f471d118183ef5f3a0125ff994a480c9d0 https://github.com/facebookexternal/stl_tasks/commit/2e1bbbcd9b1508e9ceb55477766f19ce514cedf8 https://github.com/facebookincubator/katran/commit/568d3ace378d95983b65f3e1ba068f5e1c9ecca1 https://github.com/facebookincubator/mvfst/commit/2da6f25456d2fefd55137411cf34043e45a16a52 Reviewed By: yns88 fbshipit-source-id: 0c3a8368ebfc09d5d7538e02016a377d34fdfc67 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 52583f84283e..bc39ddc4732f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 37e3199a330948f0a685d5ab51f95addd55535e7 +Subproject commit 3a147a59a3f17f974571dec40451b39d5041c937 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 92b4cd80749d..ba78ae7535ce 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7d4e33849172e95068fd99147deda64ac588fb38 +Subproject commit 6d425a5ee75de36ef0b56e540b0b34b60f0c111e From dfaea40f8f2191e9907d174757d15979550679e7 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 26 Jul 2021 17:40:31 -0700 Subject: [PATCH 0335/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c683eca1409da2727f8d66b816bafcf8e74c29d5 https://github.com/facebook/fbthrift/commit/66bb3778a6559428b0b9b059d243f8062f28aff3 https://github.com/facebook/fbzmq/commit/2d3f37e47f142397150e6b6df8c8df5e2cc8cb18 https://github.com/facebook/proxygen/commit/632f586698823c2a23c4a0f12b16c69562e89460 https://github.com/facebook/watchman/commit/69e3272f726e36fc76fed62b03a29e3118b5b6d6 https://github.com/facebookexperimental/rust-shed/commit/40d5b78d17e72992e8c574d3ff77734fb6f1d24e Reviewed By: yns88 fbshipit-source-id: cecdf19d86a99d8a6c884462d0db0f1bbc0a81f1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bc39ddc4732f..c8fbf641b1fa 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3a147a59a3f17f974571dec40451b39d5041c937 +Subproject commit 66bb3778a6559428b0b9b059d243f8062f28aff3 From 3b522eb71479765f061440cd3a35488942ef2f61 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 26 Jul 2021 19:09:36 -0700 Subject: [PATCH 0336/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/c17ed205196baefa18501b50b8d774183c35baa5 Reviewed By: yns88 fbshipit-source-id: 756d9fcffaf141c8a2c5453b1641c6184adbcb19 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7881c9d89a61..65f3ba40d707 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b9176fc5bb45b703687157515818710f8008b614 +Subproject commit c17ed205196baefa18501b50b8d774183c35baa5 From c32742334247c4c70c90a1589d9625372d19705c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 26 Jul 2021 19:34:34 -0700 Subject: [PATCH 0337/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/b7b9e3a82641be0b2af8c33cbdaf609160d919f5 https://github.com/facebook/fbthrift/commit/e638beedc43b69c032000ba82d68a9ae422fe015 https://github.com/facebook/fbzmq/commit/6db5af8e018f291bf4cbd93d6e458755cc3f130b https://github.com/facebook/proxygen/commit/c4c26a22dbca80b800a45b913bdbf6e0065b6fe2 https://github.com/facebook/wangle/commit/d7440b680bfe2da96f77176d5d674a9445ecc508 https://github.com/facebook/watchman/commit/3b522eb71479765f061440cd3a35488942ef2f61 https://github.com/facebookincubator/fizz/commit/b22a1bd7fb03fd8ac8dcf9c15e48daf01e32460a https://github.com/facebookincubator/katran/commit/ce5a4ca493a8bbd6bf0972ec83ef816f1ff82fb6 https://github.com/facebookincubator/mvfst/commit/11a49cf846b317cfe7b891f04f4e6687a46f6bfe https://github.com/rsocket/rsocket-cpp/commit/41da7acc06a7e54e1a127291b3e4b9ee8689720b Reviewed By: yns88 fbshipit-source-id: 5c8f47a48a5cc331d82cd521ca1fb14be398c2dd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c8fbf641b1fa..18c6545b8068 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 66bb3778a6559428b0b9b059d243f8062f28aff3 +Subproject commit e638beedc43b69c032000ba82d68a9ae422fe015 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ba78ae7535ce..10a0edd6d990 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6d425a5ee75de36ef0b56e540b0b34b60f0c111e +Subproject commit d7440b680bfe2da96f77176d5d674a9445ecc508 From 658c21ab1f4b21527b196d9ecd8f914555752e97 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 26 Jul 2021 20:13:35 -0700 Subject: [PATCH 0338/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ff539ea5151f3442420b8a42480a03a1a98c87f3 https://github.com/facebook/fbthrift/commit/18fc2162defcd027d182391315be72f503cf628b https://github.com/facebook/fbzmq/commit/83d9b5c5a1f46b603e7d9e7494b6e662569af966 https://github.com/facebook/proxygen/commit/99decc39f67887388b53e338f66cefc2cd701d7a https://github.com/facebook/wangle/commit/e3064e213b169652e0fccbda61c80e6da1224880 https://github.com/facebook/watchman/commit/c32742334247c4c70c90a1589d9625372d19705c https://github.com/facebookexperimental/rust-shed/commit/178a0d6606428e4369ac4381865d3342c3931366 https://github.com/facebookincubator/katran/commit/82c9b0fa557160598e63a49e60660e7df1a92515 https://github.com/facebookincubator/mvfst/commit/711844b0f900145a07d2cf67399515454a830261 Reviewed By: yns88 fbshipit-source-id: dcec4baa3c8fce4ea7cc7c09f184d5d3a17ec7b9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 18c6545b8068..cff8a605bba5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e638beedc43b69c032000ba82d68a9ae422fe015 +Subproject commit 18fc2162defcd027d182391315be72f503cf628b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 10a0edd6d990..1fe9969d9977 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d7440b680bfe2da96f77176d5d674a9445ecc508 +Subproject commit e3064e213b169652e0fccbda61c80e6da1224880 From bbbe57e9eceb4ed8ec5f1090c31bf40f67a3cf36 Mon Sep 17 00:00:00 2001 From: Zhengchao Liu Date: Mon, 26 Jul 2021 20:26:57 -0700 Subject: [PATCH 0339/7387] fix watchman website doc page favicon Summary: As title Reviewed By: singhsrb Differential Revision: D29926636 fbshipit-source-id: f06aa4c8ede9619c0c5ea8ffa85f42f62706e42a --- website/_includes/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/_includes/head.html b/website/_includes/head.html index 567f11e2c63a..c3c03141eee9 100644 --- a/website/_includes/head.html +++ b/website/_includes/head.html @@ -6,7 +6,7 @@ {% seo %} - + From bf50555417f9743fd26afcc5dc8a174d182a2177 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 26 Jul 2021 20:49:48 -0700 Subject: [PATCH 0340/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/bd413314c844098e5b0dc0458cec927d1868f4d1 https://github.com/facebook/fbthrift/commit/7c79000b9efcc2b857f74d1a0713579df76f0872 https://github.com/facebook/fbzmq/commit/f53215180e4719f30a54473609ee7948b91424ac https://github.com/facebook/proxygen/commit/3728ccbb98d2d92b930ca158e74f8054f040376e https://github.com/facebook/watchman/commit/bbbe57e9eceb4ed8ec5f1090c31bf40f67a3cf36 https://github.com/facebookexperimental/rust-shed/commit/b5c323cbdfc2dab1b2952f9b43e81dcea9d2f27e Reviewed By: yns88 fbshipit-source-id: 9d0d003fb5751a787a5f295ae3c41b8418b06400 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cff8a605bba5..781fdd69bac7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 18fc2162defcd027d182391315be72f503cf628b +Subproject commit 7c79000b9efcc2b857f74d1a0713579df76f0872 From 985b76f6d699c42a9b9ba2d468003efda96a6391 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 27 Jul 2021 00:09:49 -0700 Subject: [PATCH 0341/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/56a0fb11cc79eb398422b981a554f417e551a603 https://github.com/pytorch/fbgemm/commit/bc3560be409fb089653726a51e9062d9bc4e35a3 Reviewed By: yns88 fbshipit-source-id: dc4ddf3bfcb5903e5fcc206f306c45bde611740b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 781fdd69bac7..c6cf4231ae4b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7c79000b9efcc2b857f74d1a0713579df76f0872 +Subproject commit 56a0fb11cc79eb398422b981a554f417e551a603 From 6c8ac1214ca482f1d648868d73f1f9257f371962 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 27 Jul 2021 10:43:14 -0700 Subject: [PATCH 0342/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/6325d62a7330a910dfdb4405aedebf27acc35993 https://github.com/facebook/litho/commit/b1ac233d18f8e37f3fb624cf2221d481e76f35f1 Reviewed By: yns88 fbshipit-source-id: 2487636659e44c2d395599e9034b622fba988bf6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c6cf4231ae4b..a24ae21d992c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 56a0fb11cc79eb398422b981a554f417e551a603 +Subproject commit 6325d62a7330a910dfdb4405aedebf27acc35993 From 033f985630f39ba7d941f8e88c26c38f199b8a15 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 27 Jul 2021 11:53:31 -0700 Subject: [PATCH 0343/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/35b47412d4337d5aa669b17f19ba67e992bb3d2f https://github.com/facebook/fbthrift/commit/44bbc68fd2a574467b1a3182d9a19b3041ed4297 https://github.com/facebook/fbzmq/commit/170a0204b2ea5df5fd8704b0d19cea5a5a626a04 https://github.com/facebook/folly/commit/2f5a71ddc880bd545739c41a294dd9e037e5ba9f https://github.com/facebook/watchman/commit/6c8ac1214ca482f1d648868d73f1f9257f371962 https://github.com/facebookexperimental/rust-shed/commit/9781484c1c512c1846004e4e2c9c980597acfffa https://github.com/facebookexternal/stl_tasks/commit/82558727a2c0e44e154f6bbf07684b0f95e4f262 Reviewed By: yns88 fbshipit-source-id: 321f6293fa217463c4535a8d6133b889e7e52723 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a24ae21d992c..627733ea7d33 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6325d62a7330a910dfdb4405aedebf27acc35993 +Subproject commit 44bbc68fd2a574467b1a3182d9a19b3041ed4297 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 65f3ba40d707..b1b2384979bf 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c17ed205196baefa18501b50b8d774183c35baa5 +Subproject commit 2f5a71ddc880bd545739c41a294dd9e037e5ba9f From 567021db1153bbe9898b01941e2eecf1f5733d4c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 27 Jul 2021 12:46:44 -0700 Subject: [PATCH 0344/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/2d1ffadb2469095979f5cefb43ba3b4d28ece11c https://github.com/facebook/fbthrift/commit/04c1f39cb48d8172db26f481d51ac95586922b84 https://github.com/facebook/fbzmq/commit/d3480c068fd89d22618be4c372c78fd1256e26e4 https://github.com/facebook/proxygen/commit/8ff996238268d6a8f1bfde34507cca149f10c135 https://github.com/facebook/wangle/commit/694b142dfa6916920ca8129f1a0227fcf48d5485 https://github.com/facebook/watchman/commit/033f985630f39ba7d941f8e88c26c38f199b8a15 https://github.com/facebookexperimental/rust-shed/commit/0014bea1e24c8a15f78af3f75eca5ca2d4f43d1b https://github.com/facebookincubator/fizz/commit/1637c46bbafb0f5a4e3ed48e98cc03395e0a6bed https://github.com/facebookincubator/katran/commit/9fcee6178c67ca80f4ec5f2ad460544fc0d99a07 https://github.com/facebookincubator/mvfst/commit/4fa58c3ff9475d15884133a4ef410d93d4b1b333 https://github.com/rsocket/rsocket-cpp/commit/27ff73b703a3ba9e40b691881421d41f0f4af6e7 Reviewed By: yns88 fbshipit-source-id: f64833e98a27ed4fd06fbb306108e2e1503ab5c6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 627733ea7d33..75a9a4d39bdc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 44bbc68fd2a574467b1a3182d9a19b3041ed4297 +Subproject commit 04c1f39cb48d8172db26f481d51ac95586922b84 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1fe9969d9977..4c8bc532b7b9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e3064e213b169652e0fccbda61c80e6da1224880 +Subproject commit 694b142dfa6916920ca8129f1a0227fcf48d5485 From 19810520514caacc36038a4042727c2862847c72 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 27 Jul 2021 13:03:50 -0700 Subject: [PATCH 0345/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/e66f966bf786ff9f56b7a3df6e1c99859e7ea5ec https://github.com/facebook/fbthrift/commit/8b6fc1e349bf214a170b53bcc4b3983e5565ce7c https://github.com/facebook/fbzmq/commit/253039d73a9b303c0cf92f845aa7bd1340859e11 https://github.com/facebook/proxygen/commit/06baf857dfa0e0fb7a18a0628cd356c339138116 https://github.com/facebook/rocksdb/commit/ddf439c56132b87e52fd817431c64bc88aff19ef https://github.com/facebook/wangle/commit/121064b17feb3ba1e4845a315677b6551ddcb528 https://github.com/facebook/watchman/commit/567021db1153bbe9898b01941e2eecf1f5733d4c https://github.com/facebookexperimental/rust-shed/commit/51c186aec86f33de50997c84fe643ec7e2dc9344 https://github.com/facebookincubator/katran/commit/ce649ecb5be97a8680ddfabbabec14dafcec4c20 https://github.com/facebookincubator/mvfst/commit/3f0c67e8e150eaf1714ce36a79c38c7ede1aaa4b Reviewed By: yns88 fbshipit-source-id: 60061692cd56809d81459378b2346be35a376a07 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 75a9a4d39bdc..c713982986a7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 04c1f39cb48d8172db26f481d51ac95586922b84 +Subproject commit 8b6fc1e349bf214a170b53bcc4b3983e5565ce7c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4c8bc532b7b9..a73eeddc7f2c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 694b142dfa6916920ca8129f1a0227fcf48d5485 +Subproject commit 121064b17feb3ba1e4845a315677b6551ddcb528 From 2e069c7e8e41744d6ad312629bcdd5bdb42b6ed2 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 27 Jul 2021 13:31:05 -0700 Subject: [PATCH 0346/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/43a3a3c5f8056eeb5d22a288a5deb22453fd06d2 https://github.com/facebook/fbthrift/commit/b84a7cc41b66461230ed9bca48dc4f3d472981df https://github.com/facebook/fbzmq/commit/3a15af3aa779fb3e159e0b2a487424480188ed05 https://github.com/facebook/proxygen/commit/da3d8aa4905b5071431e21e6325a067653be7371 https://github.com/facebook/watchman/commit/19810520514caacc36038a4042727c2862847c72 https://github.com/facebookexperimental/rust-shed/commit/8245ea73650c55e0059d4ebe62a6ffdc98f4dc54 Reviewed By: yns88 fbshipit-source-id: c6f85dcd61805c2e43f538af816aae84f57d3b87 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c713982986a7..21280aae5514 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8b6fc1e349bf214a170b53bcc4b3983e5565ce7c +Subproject commit b84a7cc41b66461230ed9bca48dc4f3d472981df From 29c6e6779f69658c7e158116d03fa46e3a4f3602 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 27 Jul 2021 13:45:09 -0700 Subject: [PATCH 0347/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/2d1ffadb2469095979f5cefb43ba3b4d28ece11c https://github.com/facebook/fbthrift/commit/04c1f39cb48d8172db26f481d51ac95586922b84 https://github.com/facebook/fbzmq/commit/d3480c068fd89d22618be4c372c78fd1256e26e4 https://github.com/facebook/proxygen/commit/8ff996238268d6a8f1bfde34507cca149f10c135 https://github.com/facebook/rocksdb/commit/3aee4fbd41bd05799feb9da988698ab21b6a5f32 https://github.com/facebook/wangle/commit/694b142dfa6916920ca8129f1a0227fcf48d5485 https://github.com/facebook/watchman/commit/033f985630f39ba7d941f8e88c26c38f199b8a15 https://github.com/facebookexperimental/rust-shed/commit/0014bea1e24c8a15f78af3f75eca5ca2d4f43d1b https://github.com/facebookincubator/katran/commit/9fcee6178c67ca80f4ec5f2ad460544fc0d99a07 https://github.com/facebookincubator/mvfst/commit/4fa58c3ff9475d15884133a4ef410d93d4b1b333 Reviewed By: yns88 fbshipit-source-id: 5b1822389edbcb997805ad1726d371fff703986f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 21280aae5514..75a9a4d39bdc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b84a7cc41b66461230ed9bca48dc4f3d472981df +Subproject commit 04c1f39cb48d8172db26f481d51ac95586922b84 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a73eeddc7f2c..4c8bc532b7b9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 121064b17feb3ba1e4845a315677b6551ddcb528 +Subproject commit 694b142dfa6916920ca8129f1a0227fcf48d5485 From 10c8e1a603690785bf0555e8d143598a1e6f7d7a Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 27 Jul 2021 13:50:14 -0700 Subject: [PATCH 0348/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/43a3a3c5f8056eeb5d22a288a5deb22453fd06d2 https://github.com/facebook/fbthrift/commit/b84a7cc41b66461230ed9bca48dc4f3d472981df https://github.com/facebook/fbzmq/commit/3a15af3aa779fb3e159e0b2a487424480188ed05 https://github.com/facebook/proxygen/commit/da3d8aa4905b5071431e21e6325a067653be7371 https://github.com/facebook/rocksdb/commit/ddf439c56132b87e52fd817431c64bc88aff19ef https://github.com/facebook/wangle/commit/121064b17feb3ba1e4845a315677b6551ddcb528 https://github.com/facebook/watchman/commit/19810520514caacc36038a4042727c2862847c72 https://github.com/facebookexperimental/rust-shed/commit/8245ea73650c55e0059d4ebe62a6ffdc98f4dc54 https://github.com/facebookincubator/katran/commit/ce649ecb5be97a8680ddfabbabec14dafcec4c20 https://github.com/facebookincubator/mvfst/commit/3f0c67e8e150eaf1714ce36a79c38c7ede1aaa4b Reviewed By: yns88 fbshipit-source-id: 43dba5690799385fb82fe83846e826ff08fa9fec --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 75a9a4d39bdc..21280aae5514 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 04c1f39cb48d8172db26f481d51ac95586922b84 +Subproject commit b84a7cc41b66461230ed9bca48dc4f3d472981df diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4c8bc532b7b9..a73eeddc7f2c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 694b142dfa6916920ca8129f1a0227fcf48d5485 +Subproject commit 121064b17feb3ba1e4845a315677b6551ddcb528 From b6dac1d39871e362efc5c93a03d4d92bddc57765 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 27 Jul 2021 14:14:02 -0700 Subject: [PATCH 0349/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/dec8c37f48715262fac6543e7bdbfd256211e8f6 https://github.com/facebook/fbthrift/commit/5efc635c9ab673a6bac88be2a272d00254391f70 https://github.com/facebook/fbzmq/commit/ba2c892703b0eab54222727068fcdf5e2a010fe6 https://github.com/facebook/litho/commit/d6acb922dc22f33049eba6777f64edb8ec827268 https://github.com/facebook/proxygen/commit/24ec05d974769a7ce24f2446feaa4aed03524837 https://github.com/facebook/rocksdb/commit/eec79b39a69b9ad796804ad2970dba6c1a8bf9a2 https://github.com/facebook/watchman/commit/10c8e1a603690785bf0555e8d143598a1e6f7d7a https://github.com/facebookexperimental/rust-shed/commit/f52a2b2a59e593d223538ca682544f1dc99521f8 https://github.com/facebookincubator/mvfst/commit/bc72dbddcb64346a0b1c13407a956a9cdff08be9 Reviewed By: yns88 fbshipit-source-id: 38124ea0d4ec0be56974c8e931a8ce98e04f6b9f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 21280aae5514..4de2f63a8c5b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b84a7cc41b66461230ed9bca48dc4f3d472981df +Subproject commit 5efc635c9ab673a6bac88be2a272d00254391f70 From dd929c6d87e8a6f43aba70e31242bbbf05d73643 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 27 Jul 2021 14:59:32 -0700 Subject: [PATCH 0350/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/481fa5572833d7ab735187ed0e76aa0918514bb4 https://github.com/facebook/fbzmq/commit/9e8cc690fbc2d27d0c95333fe1d9712186b9a3b9 https://github.com/facebook/folly/commit/c3c6b7889579bf91eb69d10c56c61c404ecb6aac https://github.com/facebook/proxygen/commit/6c9dd7c504b73ae636671ab4caf18666fd0049ef https://github.com/facebook/watchman/commit/b6dac1d39871e362efc5c93a03d4d92bddc57765 https://github.com/facebookexperimental/rust-shed/commit/a96e1dd833ff0f22d27587ba9b0b961aad1729ed Reviewed By: yns88 fbshipit-source-id: 3d94bc5291641e5d53e69ae7f7fce553b3dd2b50 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b1b2384979bf..0bbe0f61708a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 2f5a71ddc880bd545739c41a294dd9e037e5ba9f +Subproject commit c3c6b7889579bf91eb69d10c56c61c404ecb6aac From 6d3eaae6153e7eb8b21bdc76e06965f954b3ae17 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 27 Jul 2021 15:32:38 -0700 Subject: [PATCH 0351/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/6af05b0b270b241ba67a08ac72524ab84729858a https://github.com/facebook/fbthrift/commit/e255024583bfdb894aa4fbabef9b6b27f34c210c https://github.com/facebook/fbzmq/commit/c8a2af2eafe9a2331334bbce0f4f0882c5db9340 https://github.com/facebook/proxygen/commit/df6cbaf9701d1848971a343bef88de46fe30747c https://github.com/facebook/wangle/commit/67b75d9bc7693cda57fcd94eea5a989fa3d22a7f https://github.com/facebook/watchman/commit/dd929c6d87e8a6f43aba70e31242bbbf05d73643 https://github.com/facebookincubator/fizz/commit/5d31f27c16ed2b33f4bda0bd731306c107b71a76 https://github.com/facebookincubator/katran/commit/522d2e45aaa63ae72970791601c0631a3129ec1f https://github.com/facebookincubator/mvfst/commit/e69480724975992d733515f4dc6fe2b542fda0c4 https://github.com/rsocket/rsocket-cpp/commit/5aec0fc41a58b0e8e76275e3b8c505690f8a9beb Reviewed By: yns88 fbshipit-source-id: bcfbe6731d8a5597e40868d1d09efe607a28cec2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4de2f63a8c5b..07343626b958 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5efc635c9ab673a6bac88be2a272d00254391f70 +Subproject commit e255024583bfdb894aa4fbabef9b6b27f34c210c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a73eeddc7f2c..e0d0f3199947 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 121064b17feb3ba1e4845a315677b6551ddcb528 +Subproject commit 67b75d9bc7693cda57fcd94eea5a989fa3d22a7f From 2f3497b9023203d021634f8ec09a2c7874132db9 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 27 Jul 2021 16:00:08 -0700 Subject: [PATCH 0352/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/a48f4965f57111507e555af2969658ad116f3b61 https://github.com/facebook/fbthrift/commit/ebb484997ee59619bfeb0dae89e7537e84f0f42b https://github.com/facebook/fbzmq/commit/d7c8be9bde90d1555ab9c0c16f7894cda14694db https://github.com/facebook/proxygen/commit/06ec2dfd76b44b83b28adf4d7582e7164683786e https://github.com/facebook/wangle/commit/a31a0a317d93fc10155ad8279cecdee549e510d8 https://github.com/facebook/watchman/commit/6d3eaae6153e7eb8b21bdc76e06965f954b3ae17 https://github.com/facebookexperimental/rust-shed/commit/d71b8d93c9e7c73c0bcc34caf18823086c8583e9 https://github.com/facebookincubator/katran/commit/71b3dd3f065e86b1173094df46c8c0c3de8a3d07 https://github.com/facebookincubator/mvfst/commit/3528a6734ffb3b4167bc7193be840817efa8cb29 Reviewed By: yns88 fbshipit-source-id: 53ebe9da1259923c7fa071c62243faa0ba3e52d4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 07343626b958..cc44e4a5f54e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e255024583bfdb894aa4fbabef9b6b27f34c210c +Subproject commit ebb484997ee59619bfeb0dae89e7537e84f0f42b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e0d0f3199947..dd1c84da851e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 67b75d9bc7693cda57fcd94eea5a989fa3d22a7f +Subproject commit a31a0a317d93fc10155ad8279cecdee549e510d8 From 5e76df09dbe000ec8c882f243554e7f18c505529 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 27 Jul 2021 16:37:32 -0700 Subject: [PATCH 0353/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/016726444d1459a0c4b7eb31182d592385ff7cbd https://github.com/facebook/fbthrift/commit/4b69bbf7e6c536ce2f2fd84f76996555c6239705 https://github.com/facebook/fbzmq/commit/b56918c6ca33bb6f6b485cf0cc05e40e0cb13829 https://github.com/facebook/proxygen/commit/5596fe44261f3491403fd2ae606c2ea17bab0edc https://github.com/facebook/watchman/commit/2f3497b9023203d021634f8ec09a2c7874132db9 https://github.com/facebookexperimental/rust-shed/commit/1bc35973267eaec1e0ba1d39f97ddf0a189b6c45 https://github.com/facebookexternal/stl_tasks/commit/2168cc8022e3e983f45cc71c098ef53e7ccc9f24 Reviewed By: yns88 fbshipit-source-id: fd047b9cba16ba05dcfcafb26ec5e4ce78bd6431 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cc44e4a5f54e..dec8bfb73e82 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ebb484997ee59619bfeb0dae89e7537e84f0f42b +Subproject commit 4b69bbf7e6c536ce2f2fd84f76996555c6239705 From a10ac3852438bb8487127b6f917f30e1f58003e5 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 27 Jul 2021 21:04:39 -0700 Subject: [PATCH 0354/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/d33f356c1d9769dc6b178047bec02ed06b27bd53 Reviewed By: yns88 fbshipit-source-id: 554e16480ad7fd8886336ef757bfccc035409c8d --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0bbe0f61708a..b4c058bc490c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c3c6b7889579bf91eb69d10c56c61c404ecb6aac +Subproject commit d33f356c1d9769dc6b178047bec02ed06b27bd53 From 20efcccf37a4eefc054298ead1f8f31823ae796f Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 27 Jul 2021 21:15:09 -0700 Subject: [PATCH 0355/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/c3c6b7889579bf91eb69d10c56c61c404ecb6aac Reviewed By: yns88 fbshipit-source-id: a0c93de36dd683a61d408fe98fb5fe25bf2faa68 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b4c058bc490c..0bbe0f61708a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d33f356c1d9769dc6b178047bec02ed06b27bd53 +Subproject commit c3c6b7889579bf91eb69d10c56c61c404ecb6aac From 7fc18faa96828796f938793f36708c73add619fc Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 27 Jul 2021 21:39:04 -0700 Subject: [PATCH 0356/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/94930340c6cd082cecd3286bcdd0a918ec2401dd https://github.com/facebook/fbthrift/commit/99a16314480d157e6b9588d747c1eb22ebf526c3 https://github.com/facebook/fbzmq/commit/1e4c4f7fe779bcb15831bce06e770c38f4378f89 https://github.com/facebook/folly/commit/d33f356c1d9769dc6b178047bec02ed06b27bd53 https://github.com/facebook/proxygen/commit/ef81a05c1384dc54e7270d118d2579c8e09e2714 https://github.com/facebook/wangle/commit/25a99760ac476896e52e7a9d45078256d80f3a2e https://github.com/facebook/watchman/commit/20efcccf37a4eefc054298ead1f8f31823ae796f https://github.com/facebookincubator/fizz/commit/6235f56fec564b8bcc4b06c31e2a175993549deb https://github.com/facebookincubator/katran/commit/b7c736b5b7c788b4afe7ecb41136ea013510f9f5 https://github.com/facebookincubator/mvfst/commit/6d12af05075c829b6b4fa5051244722f503fcb57 https://github.com/rsocket/rsocket-cpp/commit/a6eeb6cf51f4b18762633bd3892cef604ffc1586 Reviewed By: yns88 fbshipit-source-id: 7242b8cb0b290ff75e4d9af082cbfc49492b04f5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index dec8bfb73e82..a6ac15bcf72b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4b69bbf7e6c536ce2f2fd84f76996555c6239705 +Subproject commit 99a16314480d157e6b9588d747c1eb22ebf526c3 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0bbe0f61708a..b4c058bc490c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c3c6b7889579bf91eb69d10c56c61c404ecb6aac +Subproject commit d33f356c1d9769dc6b178047bec02ed06b27bd53 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index dd1c84da851e..e218908a3465 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a31a0a317d93fc10155ad8279cecdee549e510d8 +Subproject commit 25a99760ac476896e52e7a9d45078256d80f3a2e From 09e607c31ec9408d5b597c7e758f3eeaffc1958b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 27 Jul 2021 22:04:59 -0700 Subject: [PATCH 0357/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/d52bc0d98ed8e709f44e1988add0c265de9d4fe1 https://github.com/facebook/fbthrift/commit/f9de245193fcbb3103f7a8aca198389763857979 https://github.com/facebook/fbzmq/commit/879a31aece93dd4afbff2cf7bca9f26a08e9070f https://github.com/facebook/proxygen/commit/1bee701aa587c3e2b75f9bb75cd3df8d22c05702 https://github.com/facebook/rocksdb/commit/74b7c0d24997e12482105c09b47c7223e7b75b96 https://github.com/facebook/wangle/commit/232d07ae9f32222f2ab6f082cb8dc1c08ffecab0 https://github.com/facebook/watchman/commit/7fc18faa96828796f938793f36708c73add619fc https://github.com/facebookexperimental/rust-shed/commit/661b108c202897f1bcb24c4d54690fab947c54c4 https://github.com/facebookincubator/fizz/commit/3a4d18e0802a946978eb519cdba0f897982b9334 https://github.com/facebookincubator/katran/commit/744de65e03ff883d45979d6bec625351b5d7d191 https://github.com/facebookincubator/mvfst/commit/d13d48cdd908ebc4108c7897ee36e7f716ad935c https://github.com/rsocket/rsocket-cpp/commit/810c0932f9f0f82f0f8d1ea32d8d7927e4cf86a9 Reviewed By: yns88 fbshipit-source-id: 7d4ecb3661a70eb05ef3598d55148f5610a7ada6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a6ac15bcf72b..86bdcf280541 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 99a16314480d157e6b9588d747c1eb22ebf526c3 +Subproject commit f9de245193fcbb3103f7a8aca198389763857979 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e218908a3465..0a3658634450 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 25a99760ac476896e52e7a9d45078256d80f3a2e +Subproject commit 232d07ae9f32222f2ab6f082cb8dc1c08ffecab0 From a762cdb2985a64631875d7d3872c9a6175b0ce25 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 27 Jul 2021 22:48:58 -0700 Subject: [PATCH 0358/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/d4fc52b5ad664a54aa59f643e65312136e20aca6 https://github.com/facebook/fbthrift/commit/d86d167b7cf3fb34a096969036b29e655b361cb6 https://github.com/facebook/fbzmq/commit/27592c50a7af3c29c54d837e81e8c772b7e0d232 https://github.com/facebook/proxygen/commit/ebe299072e276b13897d3d9c3ca69313e5901fbc https://github.com/facebook/wangle/commit/804cff5013212efea0d4db92fb21d07b8943f206 https://github.com/facebook/watchman/commit/09e607c31ec9408d5b597c7e758f3eeaffc1958b https://github.com/facebookexperimental/rust-shed/commit/aea277da16853a9161ceb8df4ed2341651c4eb2b https://github.com/facebookincubator/katran/commit/d05d13a4e3153072a7a15c9e68cd53bd128883b6 https://github.com/facebookincubator/mvfst/commit/e351c30c71f61aeb9d8d29024417dc33d6dd9982 Reviewed By: yns88 fbshipit-source-id: 007558c444352332024bd6dd30c355bd840cd3c7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 86bdcf280541..700460db3193 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f9de245193fcbb3103f7a8aca198389763857979 +Subproject commit d86d167b7cf3fb34a096969036b29e655b361cb6 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0a3658634450..c4979cb6aa2a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 232d07ae9f32222f2ab6f082cb8dc1c08ffecab0 +Subproject commit 804cff5013212efea0d4db92fb21d07b8943f206 From 7faa0181ccb7e3c070e5922b8c422a343e493b46 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 27 Jul 2021 23:15:19 -0700 Subject: [PATCH 0359/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/68d70e2f57f2c78b19f86724884032654882f159 https://github.com/facebook/fbthrift/commit/187ecd29646e3be0529951479a6bd656bcbb03f7 https://github.com/facebook/fbzmq/commit/9594ca5fd98ddd8a218b724128122d23bd07b75f https://github.com/facebook/proxygen/commit/75494c2ba9adc8cfc9aaff155e24221e76cfb6c5 https://github.com/facebook/watchman/commit/a762cdb2985a64631875d7d3872c9a6175b0ce25 https://github.com/facebookexperimental/rust-shed/commit/28db5260b745a21c9e4041d748c671794e2e5b62 Reviewed By: yns88 fbshipit-source-id: d41e9aa4ee2f85400da2338e2fdbd2bac01a8d63 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 700460db3193..5ed1763fe8ec 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d86d167b7cf3fb34a096969036b29e655b361cb6 +Subproject commit 187ecd29646e3be0529951479a6bd656bcbb03f7 From 5c71a17eb11cc06da1fffeda1a3db7b40bd7ca38 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 27 Jul 2021 23:44:38 -0700 Subject: [PATCH 0360/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c5640a8345351f777e4f03344b9761df6e5bdaa6 https://github.com/facebook/fbzmq/commit/1aa70552c01e1e98e4f6e9abd93075cd2d3906b2 https://github.com/facebook/folly/commit/dc4916065f46421dc0a737cde890f7567fae8549 https://github.com/facebook/watchman/commit/7faa0181ccb7e3c070e5922b8c422a343e493b46 https://github.com/facebookexperimental/rust-shed/commit/ffc759d1e2d941da20b5723b938856af82393e8c Reviewed By: yns88 fbshipit-source-id: 9bc48faf342e8f4fa0895661273b40fc5d90b289 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b4c058bc490c..a66941d0fc64 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d33f356c1d9769dc6b178047bec02ed06b27bd53 +Subproject commit dc4916065f46421dc0a737cde890f7567fae8549 From a4594dded7f4809970f3f00cdad89236e273f6fa Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 28 Jul 2021 00:19:00 -0700 Subject: [PATCH 0361/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/cc26e5c6fd122a7a46a66eea2b8824cfb0cb2f61 https://github.com/facebook/fbthrift/commit/b3646e74ecbcf708b5b2b03ddfdf4a4dd4c7222b https://github.com/facebook/fbzmq/commit/d654d297715b1400cac214d08baa4ecc71da4e2e https://github.com/facebook/proxygen/commit/7a3e2cd7b14a96a7799163cd41ba9d805a194f86 https://github.com/facebook/wangle/commit/763e257bc04f0891b12a07619a156a552bc01c68 https://github.com/facebook/watchman/commit/5c71a17eb11cc06da1fffeda1a3db7b40bd7ca38 https://github.com/facebookincubator/fizz/commit/f7480b0c7556dac23f814574be0cce5cec6cf8a6 https://github.com/facebookincubator/katran/commit/c5b050edde0a1df3d80972411dba081bde87e60b https://github.com/facebookincubator/mvfst/commit/d6f1104f920045ccb15a55ac77479ece2aa13fad https://github.com/rsocket/rsocket-cpp/commit/f6f26fd0537fc7f7cc76e86f576951189f755c75 Reviewed By: yns88 fbshipit-source-id: aa7d4412c74b41130c7520bea312506d809c5185 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5ed1763fe8ec..77c23913abba 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 187ecd29646e3be0529951479a6bd656bcbb03f7 +Subproject commit b3646e74ecbcf708b5b2b03ddfdf4a4dd4c7222b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c4979cb6aa2a..b58097db50bc 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 804cff5013212efea0d4db92fb21d07b8943f206 +Subproject commit 763e257bc04f0891b12a07619a156a552bc01c68 From 72a12de62c46aa2dc8da49cf94dbf97d6908a16b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 28 Jul 2021 00:49:03 -0700 Subject: [PATCH 0362/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/0c7299f82b0bb98cb44b0c097e096c3180296eca https://github.com/facebook/fbthrift/commit/3e96c8c11c814f1f825e96eddd21569129d4ff7a https://github.com/facebook/fbzmq/commit/bd44385af9ff7fd76f724dec64ef18e6fc534b21 https://github.com/facebook/proxygen/commit/b8c196638cb1fedab76e58426abb750c53633c69 https://github.com/facebook/wangle/commit/159a45f875f0773ea77b8b18e79480de78b68e74 https://github.com/facebook/watchman/commit/a4594dded7f4809970f3f00cdad89236e273f6fa https://github.com/facebookexperimental/rust-shed/commit/fa411c0390abcac660e2a80fc84d2cca82efdb9d https://github.com/facebookincubator/katran/commit/922951519b8c7999a5a6e488b67cd5ee9e877ca9 https://github.com/facebookincubator/mvfst/commit/d3ab906006864d58d7e6d45b79cd6932568c26dc Reviewed By: yns88 fbshipit-source-id: ec276be66e8c4638d3993b3124f4ca6533b02064 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 77c23913abba..0bf27521454d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b3646e74ecbcf708b5b2b03ddfdf4a4dd4c7222b +Subproject commit 3e96c8c11c814f1f825e96eddd21569129d4ff7a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b58097db50bc..ebfdcc307892 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 763e257bc04f0891b12a07619a156a552bc01c68 +Subproject commit 159a45f875f0773ea77b8b18e79480de78b68e74 From 7f1c9cadf992f138a7367cac5c377f10c54714f6 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 28 Jul 2021 01:22:39 -0700 Subject: [PATCH 0363/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/e81e3e90b575f242510241ec6f6e8803766edee9 https://github.com/facebook/fbthrift/commit/c909edce98a4337ebfc2dc9a269bfc4cf42c8b58 https://github.com/facebook/fbzmq/commit/a53b398b69686399ea61588e8a466cf868e7bb3e https://github.com/facebook/proxygen/commit/25caedeeec7b3bd28773acc6c3fe389d67c70e2d https://github.com/facebook/watchman/commit/72a12de62c46aa2dc8da49cf94dbf97d6908a16b https://github.com/facebookexperimental/rust-shed/commit/d1e8efdd6b21dc827c4914b98f7f4ea16e5b15df Reviewed By: yns88 fbshipit-source-id: 5e1884b2098f640709892c5bb9fb4bf936a42eed --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0bf27521454d..38dc2c28f955 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3e96c8c11c814f1f825e96eddd21569129d4ff7a +Subproject commit c909edce98a4337ebfc2dc9a269bfc4cf42c8b58 From 1c05710aa1c859357e8fcac45e364708dbf91076 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 28 Jul 2021 11:42:56 -0700 Subject: [PATCH 0364/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/4ec769d54d05d255f608841deb354614f7672998 https://github.com/facebook/folly/commit/cc0f64d2dbfd01d5f123836571dc0559596c3b3b Reviewed By: yns88 fbshipit-source-id: 2f3b7d5852d062310909cc0f891afc4927e94e10 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 38dc2c28f955..b68fec03bb92 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c909edce98a4337ebfc2dc9a269bfc4cf42c8b58 +Subproject commit 4ec769d54d05d255f608841deb354614f7672998 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a66941d0fc64..83acc522afd9 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit dc4916065f46421dc0a737cde890f7567fae8549 +Subproject commit cc0f64d2dbfd01d5f123836571dc0559596c3b3b From 5ae24e5fce03d419cec1ba05a906f87fc3ead38c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 28 Jul 2021 12:25:26 -0700 Subject: [PATCH 0365/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/8ae97bf5ef32cb6a3962cdd336533dd93c1bed5b https://github.com/facebook/fbthrift/commit/013861b7320f7ed70eac527015139b15e6e8e817 https://github.com/facebook/fbzmq/commit/29cb0445e66f23a9e48d845ce5a458ce7e4a6eeb https://github.com/facebook/folly/commit/65180b253d7f1eb9a15be1fba3afd1572928469b https://github.com/facebook/litho/commit/98c21023429ef855394c727df2d4e83111a33611 https://github.com/facebook/proxygen/commit/23a46184a0da51c0faf8d78977bc9853813b30bf https://github.com/facebook/wangle/commit/b7a89daa5d4a40dc77da38c971f3cafaaa215207 https://github.com/facebook/watchman/commit/1c05710aa1c859357e8fcac45e364708dbf91076 https://github.com/facebookexperimental/rust-shed/commit/2b5b1da85762a975a9de51a472df258e7d40c0b0 https://github.com/facebookincubator/fizz/commit/9f826c7db96b28858a563214e29909a3363c2337 https://github.com/facebookincubator/katran/commit/8228d19a92893af229f1a641b3b625a508178ac2 https://github.com/facebookincubator/mvfst/commit/527cb45ffc0c1097701dd5a2428b201b356dfc2e https://github.com/rsocket/rsocket-cpp/commit/556b99fc0581f473f66b40a657911e2607e929ff Reviewed By: yns88 fbshipit-source-id: 490bf65e5304d0876f582af8cb78a11ce2814162 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b68fec03bb92..a06d6c38493c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4ec769d54d05d255f608841deb354614f7672998 +Subproject commit 013861b7320f7ed70eac527015139b15e6e8e817 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 83acc522afd9..9eb14619b078 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit cc0f64d2dbfd01d5f123836571dc0559596c3b3b +Subproject commit 65180b253d7f1eb9a15be1fba3afd1572928469b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ebfdcc307892..270013e05398 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 159a45f875f0773ea77b8b18e79480de78b68e74 +Subproject commit b7a89daa5d4a40dc77da38c971f3cafaaa215207 From f0088119b561625e834e16b59cb88648999ad8b0 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 28 Jul 2021 15:17:52 -0700 Subject: [PATCH 0366/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/d49215654b01beae098d3f340b3243f31adfe744 https://github.com/facebook/fbthrift/commit/6e229a289e2d991976d5bc4761c6532be59c8432 https://github.com/facebook/fbzmq/commit/94b3db808f2ddf89241765c499e88122bf9332c5 https://github.com/facebook/folly/commit/c22c915d070adacc0446e1ab193e8d1a955812bc https://github.com/facebook/proxygen/commit/0d02a770e65531fea22a0d7e392e1bae2babf599 https://github.com/facebook/rocksdb/commit/e0ff365a76fce8d76fd13ca21f14d16fe71f19f7 https://github.com/facebook/wangle/commit/74e34b93789c11fff1c305dcacfa3e845875da7c https://github.com/facebook/watchman/commit/5ae24e5fce03d419cec1ba05a906f87fc3ead38c https://github.com/facebookexperimental/rust-shed/commit/f53108117fbeb1ecb77a269c819ba231f2fcfc37 https://github.com/facebookincubator/fizz/commit/d471bbb28eb28f6deb1101fd1251e2ad947a6088 https://github.com/facebookincubator/katran/commit/78dee654a0dd488ac9a32893d419872b8065651d https://github.com/facebookincubator/mvfst/commit/48a9f864e8c3c098ad497c97ef752746444b6910 https://github.com/pytorch/kineto/commit/61a7083bb2687c187dac6a3054ac75bd6eb3d3bc https://github.com/rsocket/rsocket-cpp/commit/fc98f24814183f78cab0d7cb71511e4838bfefff Reviewed By: yns88 fbshipit-source-id: afbb3188e4980df4d515a029da3cd6e5858f9a25 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a06d6c38493c..0c384b3f24e6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 013861b7320f7ed70eac527015139b15e6e8e817 +Subproject commit 6e229a289e2d991976d5bc4761c6532be59c8432 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9eb14619b078..71e19290d5fd 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 65180b253d7f1eb9a15be1fba3afd1572928469b +Subproject commit c22c915d070adacc0446e1ab193e8d1a955812bc diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 270013e05398..00084d884b63 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b7a89daa5d4a40dc77da38c971f3cafaaa215207 +Subproject commit 74e34b93789c11fff1c305dcacfa3e845875da7c From acb1f5860a7adcb9394488aa96f51cb364b754fc Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 28 Jul 2021 15:49:33 -0700 Subject: [PATCH 0367/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/a0a928486045a0028f5c574ad76d7a5e8a94d901 https://github.com/facebook/fbthrift/commit/6d12a18b46f41040d36d65a0481a578a03b5f26b https://github.com/facebook/fbzmq/commit/010d4becad2b9400d781a01b4f3d0dbf63c7dff1 https://github.com/facebook/proxygen/commit/d518db91f5362149bb3ed95df8b24788012874f1 https://github.com/facebook/wangle/commit/bcd1974d553e69a5cf2314947bccc9da73e6a3b1 https://github.com/facebook/watchman/commit/f0088119b561625e834e16b59cb88648999ad8b0 https://github.com/facebookexperimental/rust-shed/commit/382c119b9b44d16bd0269c31e92d07c3755cd419 https://github.com/facebookincubator/fizz/commit/8ddd2750d835a4e45f8d71b7f08105e48c00784d https://github.com/facebookincubator/katran/commit/62f5df4fa306a0eec8dff2644aeedcff9be3bca0 https://github.com/facebookincubator/mvfst/commit/8c74707affb42e52142a21c2bb038e5f0f14ce96 https://github.com/rsocket/rsocket-cpp/commit/34600e9c548cdc9bf23ed916b562d1db1e71901c Reviewed By: yns88 fbshipit-source-id: 369e7a3bc9f47a57f071d2db02cc05d941fcac20 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0c384b3f24e6..6ffc96084ca4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6e229a289e2d991976d5bc4761c6532be59c8432 +Subproject commit 6d12a18b46f41040d36d65a0481a578a03b5f26b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 00084d884b63..ac9dd2c2fca9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 74e34b93789c11fff1c305dcacfa3e845875da7c +Subproject commit bcd1974d553e69a5cf2314947bccc9da73e6a3b1 From da20a7e4fe835a19df1e34a5807ae4920c0aca91 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 28 Jul 2021 16:17:46 -0700 Subject: [PATCH 0368/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/238748006b643a092b49425c5f40e6173312d657 https://github.com/facebook/fbthrift/commit/e10b9d404840fd13ee403b0f1c9912aa2eda9efe https://github.com/facebook/fbzmq/commit/3d8259dcc14113fd2af0f46a5f543c76b102a8c4 https://github.com/facebook/mcrouter/commit/8f5104d9b3bd3ed5d8a0be6b936c683f0108a4e7 https://github.com/facebook/proxygen/commit/85c8a0fe7f849ed386e5aff303f52de788045474 https://github.com/facebook/wangle/commit/9a8b53a71b6c75b62f6f169cec050e7bd7f3cd18 https://github.com/facebook/watchman/commit/acb1f5860a7adcb9394488aa96f51cb364b754fc https://github.com/facebookexperimental/rust-shed/commit/b8afdeae91997b787887acdc77d9a1cd39e3b2ec https://github.com/facebookincubator/katran/commit/95a62243a02ce3ada6ea5b93b0c951899590ddd0 https://github.com/facebookincubator/mvfst/commit/bc7ad34420570c7a0958b599e4f3e08c103799a1 Reviewed By: yns88 fbshipit-source-id: e1cf9d8706c84dc8111c12e832bc857c87ae63c3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6ffc96084ca4..694f5848b703 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6d12a18b46f41040d36d65a0481a578a03b5f26b +Subproject commit e10b9d404840fd13ee403b0f1c9912aa2eda9efe diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ac9dd2c2fca9..f0225f402abb 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit bcd1974d553e69a5cf2314947bccc9da73e6a3b1 +Subproject commit 9a8b53a71b6c75b62f6f169cec050e7bd7f3cd18 From 40ba81735e11ba4e7869957a8e7c9c8646238e6d Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 28 Jul 2021 16:44:18 -0700 Subject: [PATCH 0369/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/1d1a92e469cb7eb400d76bbfdc67f814634f9976 https://github.com/facebook/fbthrift/commit/ec3ba2e3b54c44a343c9e032caac04c60006db84 https://github.com/facebook/fbzmq/commit/ea7b0d4f858f949ea80df1d8f5815125a931d751 https://github.com/facebook/proxygen/commit/7e000f9a1fd51e066f0b8a5ddbd2c18101e9f522 https://github.com/facebook/rocksdb/commit/a4b8ac9a73079cc1faa652bdc1d7d7ec87259593 https://github.com/facebook/watchman/commit/da20a7e4fe835a19df1e34a5807ae4920c0aca91 https://github.com/facebookexperimental/rust-shed/commit/27951a32ad933551277c59eeb752b733b2cc535d Reviewed By: yns88 fbshipit-source-id: 49ed69bbddbce6d00cb1c23d29b4d36dd69300a0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 694f5848b703..8f6a82e4155e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e10b9d404840fd13ee403b0f1c9912aa2eda9efe +Subproject commit ec3ba2e3b54c44a343c9e032caac04c60006db84 From 2a138af5c211cedebe8aa6f8081022028a25e4c4 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 28 Jul 2021 19:26:11 -0700 Subject: [PATCH 0370/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/3e9865fca06082e340671abda6a6c81ee98dfb8b Reviewed By: yns88 fbshipit-source-id: 021b5168e8ad801a539367e2faa53046364a29dc --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 71e19290d5fd..051ff5a28c71 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c22c915d070adacc0446e1ab193e8d1a955812bc +Subproject commit 3e9865fca06082e340671abda6a6c81ee98dfb8b From 72e123344f747ed34354e88780c38afa43ecda4e Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 28 Jul 2021 20:14:44 -0700 Subject: [PATCH 0371/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/0779773884ebe54440feea321314341a7246173f https://github.com/facebook/fbthrift/commit/c831ab0d9e275a4f4a53379327dfa94397b069fe https://github.com/facebook/fbzmq/commit/65e3c467728ca1f7a952b32d07df11ac2db58795 https://github.com/facebook/proxygen/commit/f3519ff4f8a783b4142934fd5726fb8a7ad68451 https://github.com/facebook/wangle/commit/122f1cf7e84accfcd4259f95debf068ed462a2eb https://github.com/facebook/watchman/commit/2a138af5c211cedebe8aa6f8081022028a25e4c4 https://github.com/facebookincubator/fizz/commit/db8a044c20a03371133ea2a0ac648dc1f7156c8e https://github.com/facebookincubator/katran/commit/131e37b0a614019dc56ee8942a14ec91d994ee8b https://github.com/facebookincubator/mvfst/commit/5e3fe29849bf20b97cd5631f7b07832a2e76dbac https://github.com/rsocket/rsocket-cpp/commit/d98266c7ea2ecd1901dbf8f502471775583ba21d Reviewed By: yns88 fbshipit-source-id: 9b1d00e3843bdbc8bdcb633a9d40aa54b0aa7579 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8f6a82e4155e..65e58b5d4799 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ec3ba2e3b54c44a343c9e032caac04c60006db84 +Subproject commit c831ab0d9e275a4f4a53379327dfa94397b069fe diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f0225f402abb..5275c13fed3f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9a8b53a71b6c75b62f6f169cec050e7bd7f3cd18 +Subproject commit 122f1cf7e84accfcd4259f95debf068ed462a2eb From 8210d0bc76695b3e25b6d21b8221863b93e6e2d9 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 28 Jul 2021 21:00:21 -0700 Subject: [PATCH 0372/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/d760601f18eb967c69f3d1dfc36f4ae15f22d4c0 https://github.com/facebook/fbthrift/commit/8f65f5abca78fbf75608df1f151f665fc38b7228 https://github.com/facebook/fbzmq/commit/721ec18d8dfed9e57a2aeb9a9d0085dccebce1d6 https://github.com/facebook/folly/commit/8adc1e1f26189dac8f0cc8af0d6ddf8497578451 https://github.com/facebook/proxygen/commit/26f78b5c2f842ec0de1ea80769b5c971c6c08047 https://github.com/facebook/wangle/commit/ba681736d7d140ab2646d82e1c8b7cb770c47c2a https://github.com/facebook/watchman/commit/72e123344f747ed34354e88780c38afa43ecda4e https://github.com/facebookexperimental/rust-shed/commit/3c6045cc27323633b2329d8bba2a28397f4499f9 https://github.com/facebookincubator/katran/commit/b50c4133f4e54fc0824d511f0e38732de1a56ba2 https://github.com/facebookincubator/mvfst/commit/e5e942b3b8fd6fc7324763ace5642f842f547e2b Reviewed By: yns88 fbshipit-source-id: 13f15712c3e4d268b5016e16633f1424bae9926e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 65e58b5d4799..d8e1518fb4fd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c831ab0d9e275a4f4a53379327dfa94397b069fe +Subproject commit 8f65f5abca78fbf75608df1f151f665fc38b7228 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 051ff5a28c71..912db831a203 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 3e9865fca06082e340671abda6a6c81ee98dfb8b +Subproject commit 8adc1e1f26189dac8f0cc8af0d6ddf8497578451 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5275c13fed3f..31404083e2db 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 122f1cf7e84accfcd4259f95debf068ed462a2eb +Subproject commit ba681736d7d140ab2646d82e1c8b7cb770c47c2a From 2a14491c0a32857cf0b810e3b151c14b4f90c525 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 28 Jul 2021 21:29:08 -0700 Subject: [PATCH 0373/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/cd40d6e1f15d34daa78a70ad94f92d07c63575aa https://github.com/facebook/fbthrift/commit/4301a6f66f05f670795456c6771499e223bd088c https://github.com/facebook/fbzmq/commit/0237247dd3fe6bee6179fae416d4dd7c17d4d8fe https://github.com/facebook/proxygen/commit/447ea26f98437e3199fde77a79600ca14731a6bf https://github.com/facebook/wangle/commit/3fb9f3675e6add583e7a83914dcda44a2e950521 https://github.com/facebook/watchman/commit/8210d0bc76695b3e25b6d21b8221863b93e6e2d9 https://github.com/facebookexperimental/rust-shed/commit/691b2697d8b3f8b4c3353f3d5fe01bbad26d6e32 https://github.com/facebookincubator/fizz/commit/69d6784e8d30f6faa1e449160a8f0ab06a438fe7 https://github.com/facebookincubator/katran/commit/f58aa93079cba0bd660c96ac50d23e84d5c3776d https://github.com/facebookincubator/mvfst/commit/6889b98ed9ab1b9ed69feadcae85c4ecd1cae764 https://github.com/rsocket/rsocket-cpp/commit/d658c39ddcef9e7ab7748d4b5d1efea8d4c9a8d1 Reviewed By: yns88 fbshipit-source-id: 3d17e03da20db0ceb0313ae407f118cd44c02b5f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d8e1518fb4fd..f192c7a5d216 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8f65f5abca78fbf75608df1f151f665fc38b7228 +Subproject commit 4301a6f66f05f670795456c6771499e223bd088c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 31404083e2db..38a5b40a5c2a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ba681736d7d140ab2646d82e1c8b7cb770c47c2a +Subproject commit 3fb9f3675e6add583e7a83914dcda44a2e950521 From 3295cc7f89ed85e9567b6cf45204b180f14940a2 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 28 Jul 2021 21:59:26 -0700 Subject: [PATCH 0374/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/466e90ac9c86629e13d74971472b287db8f065ed https://github.com/facebook/fbthrift/commit/19d509b1464a840e53545b243cbaa93427dd9195 https://github.com/facebook/fbzmq/commit/d0fac82e2db6e0910b5e5d5970fc1f17c05a300e https://github.com/facebook/proxygen/commit/37620a78df8a41edd9cfde58e4e7af6f507df1af https://github.com/facebook/wangle/commit/cc1c057e7da87a31c623a25f699cf16368799233 https://github.com/facebook/watchman/commit/2a14491c0a32857cf0b810e3b151c14b4f90c525 https://github.com/facebookexperimental/rust-shed/commit/356ab82864d789f463c29b5cd9764987c6021dc9 https://github.com/facebookincubator/katran/commit/8585157ea6a243c5d27ca81eea2dad45b7125ffe https://github.com/facebookincubator/mvfst/commit/12baddf3f00b56d45761809bb909b338a8fb4dad Reviewed By: yns88 fbshipit-source-id: ff2dbb2f3e6eb1ad115c0b5198d678f1db91e569 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f192c7a5d216..726265afcc15 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4301a6f66f05f670795456c6771499e223bd088c +Subproject commit 19d509b1464a840e53545b243cbaa93427dd9195 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 38a5b40a5c2a..de2a54524443 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3fb9f3675e6add583e7a83914dcda44a2e950521 +Subproject commit cc1c057e7da87a31c623a25f699cf16368799233 From c9be4fbe3898c171d3057751a62b305d09a841cc Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 28 Jul 2021 22:24:29 -0700 Subject: [PATCH 0375/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/cf03da3d73cc9e321c5dcb9e98d067252b5fc634 https://github.com/facebook/fbthrift/commit/0ff36044f1cdceca3414cd996f79bcbeb916f281 https://github.com/facebook/fbzmq/commit/79427960faded7b69e36c1c0a04497128fcf4b26 https://github.com/facebook/proxygen/commit/6dfbde53188db6a9076a9347aed46f822faae570 https://github.com/facebook/watchman/commit/3295cc7f89ed85e9567b6cf45204b180f14940a2 https://github.com/facebookexperimental/rust-shed/commit/147847dd75dc3e3a21a41a0c9317cb81095c7a41 Reviewed By: yns88 fbshipit-source-id: 46fcaa1da7538b5bbcc52da4e7a8a4640cb82ab3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 726265afcc15..09fe7b952091 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 19d509b1464a840e53545b243cbaa93427dd9195 +Subproject commit 0ff36044f1cdceca3414cd996f79bcbeb916f281 From 6c29c64fd3f4109b476d6c2111cdfcf8ffb5dcf8 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 29 Jul 2021 01:50:04 -0700 Subject: [PATCH 0376/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/57f9d2cd02353e0f71fffb6db87d55ab11a2d990 Reviewed By: yns88 fbshipit-source-id: 199f62064d8b329fbfeec95e6586027a535b87ca --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 912db831a203..853a9c8e9233 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 8adc1e1f26189dac8f0cc8af0d6ddf8497578451 +Subproject commit 57f9d2cd02353e0f71fffb6db87d55ab11a2d990 From b55768b84d224a1a7d39899de6049910a892321b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 29 Jul 2021 02:15:04 -0700 Subject: [PATCH 0377/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/1901684c1780bfa69dd531c6a50bebc83b8cb2b1 https://github.com/facebook/fbthrift/commit/3c604f47bfd0569c2d58cca71d5c293c7be386e6 https://github.com/facebook/fbzmq/commit/9371f9ac24cc6fc961596cd3d589f55b96bfbdae https://github.com/facebook/proxygen/commit/73f6a924a1cb5dd137befee0e01dd02328a7d7b4 https://github.com/facebook/wangle/commit/24643fa2bb4d855b99ba4141facc54e12a4081f6 https://github.com/facebook/watchman/commit/6c29c64fd3f4109b476d6c2111cdfcf8ffb5dcf8 https://github.com/facebookincubator/fizz/commit/6bc260a89ff6e03633fb787187d61086f6961b91 https://github.com/facebookincubator/katran/commit/b034e8bc8eece0b2afc935b440897a8cf0eb8e57 https://github.com/facebookincubator/mvfst/commit/a1f85589d8a49ba620168e6676485c8900fecad6 https://github.com/rsocket/rsocket-cpp/commit/6c00fdc319f5cb30655fc6f9ea571705ed517c2a Reviewed By: yns88 fbshipit-source-id: d9aa5b21b59b33c3851f2c9e91b16da4978fbccc --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 09fe7b952091..99dad897497b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0ff36044f1cdceca3414cd996f79bcbeb916f281 +Subproject commit 3c604f47bfd0569c2d58cca71d5c293c7be386e6 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index de2a54524443..2c80f1597a46 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit cc1c057e7da87a31c623a25f699cf16368799233 +Subproject commit 24643fa2bb4d855b99ba4141facc54e12a4081f6 From e873cdf916543ff56a410f2de3736f7af347dd47 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 29 Jul 2021 02:18:00 -0700 Subject: [PATCH 0378/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/d023661e27407b6a51b0ca37487b9c6b20e83f78 https://github.com/facebook/fbthrift/commit/0ff36044f1cdceca3414cd996f79bcbeb916f281 https://github.com/facebook/fbzmq/commit/47f3e86a949ea911cb8176c13a1cded9da0a253c https://github.com/facebook/proxygen/commit/6dfbde53188db6a9076a9347aed46f822faae570 https://github.com/facebook/wangle/commit/cc1c057e7da87a31c623a25f699cf16368799233 https://github.com/facebook/watchman/commit/c9be4fbe3898c171d3057751a62b305d09a841cc https://github.com/facebookincubator/fizz/commit/69d6784e8d30f6faa1e449160a8f0ab06a438fe7 https://github.com/facebookincubator/katran/commit/8585157ea6a243c5d27ca81eea2dad45b7125ffe https://github.com/facebookincubator/mvfst/commit/12baddf3f00b56d45761809bb909b338a8fb4dad https://github.com/rsocket/rsocket-cpp/commit/d658c39ddcef9e7ab7748d4b5d1efea8d4c9a8d1 Reviewed By: yns88 fbshipit-source-id: 828e13b3eae65c0b8fbb3dbba772eb60406e0ede --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 99dad897497b..09fe7b952091 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3c604f47bfd0569c2d58cca71d5c293c7be386e6 +Subproject commit 0ff36044f1cdceca3414cd996f79bcbeb916f281 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2c80f1597a46..de2a54524443 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 24643fa2bb4d855b99ba4141facc54e12a4081f6 +Subproject commit cc1c057e7da87a31c623a25f699cf16368799233 From dfb242bdcf81ba402282ed29a18b1349084418bb Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 29 Jul 2021 02:44:02 -0700 Subject: [PATCH 0379/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/6dee3399b0218f22d6ccbb72273fe8df92fd37e1 https://github.com/facebook/fbthrift/commit/3ed2def0968612cf9f0b6a39e4b37fe03d4a7eef https://github.com/facebook/fbzmq/commit/c25ac43f7125cac5a0779287944cdea363c81137 https://github.com/facebook/proxygen/commit/fa6fb651d2ac20c3d3ff1ba4aedf263093399241 https://github.com/facebook/wangle/commit/2d16a8bdc3061cafaaeafcda4350e6091ed2bc39 https://github.com/facebook/watchman/commit/e873cdf916543ff56a410f2de3736f7af347dd47 https://github.com/facebookexperimental/rust-shed/commit/b439498de6ddc02bb2e9f2fbd9c8112baa2a8d40 https://github.com/facebookincubator/fizz/commit/6bc260a89ff6e03633fb787187d61086f6961b91 https://github.com/facebookincubator/katran/commit/490ca89601b6cd53d721f40ad2e58d26a3f41856 https://github.com/facebookincubator/mvfst/commit/c7aea9364ba6a05795605e52f156426465dd4caf https://github.com/rsocket/rsocket-cpp/commit/6c00fdc319f5cb30655fc6f9ea571705ed517c2a Reviewed By: yns88 fbshipit-source-id: 428cd1330ecfec4fc428a70f63e3c2e6a6c82a0b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 09fe7b952091..183d61d2b6ed 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0ff36044f1cdceca3414cd996f79bcbeb916f281 +Subproject commit 3ed2def0968612cf9f0b6a39e4b37fe03d4a7eef diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index de2a54524443..0a46620de5b8 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit cc1c057e7da87a31c623a25f699cf16368799233 +Subproject commit 2d16a8bdc3061cafaaeafcda4350e6091ed2bc39 From fecca34a9009925f4ee5081f926a8e193ba08ca9 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 29 Jul 2021 03:11:26 -0700 Subject: [PATCH 0380/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/7c386198b8dd982a7e7c72dee9ce6b2f1aca9c52 https://github.com/facebook/fbthrift/commit/931cb3f6f994a6c644ff78248e5ada493276d552 https://github.com/facebook/fbzmq/commit/b9455dee6c3999cd5d18a0a2bf6a48dd88f03789 https://github.com/facebook/proxygen/commit/800c3ae80464bd1c31c44929ff261ea4312d44ab https://github.com/facebook/wangle/commit/0497be8810fa20dfb73e5d4f4989909d2a4e150c https://github.com/facebook/watchman/commit/dfb242bdcf81ba402282ed29a18b1349084418bb https://github.com/facebookexperimental/rust-shed/commit/2727a916bf341c9d524e2f8f302a691dc11c1cd9 https://github.com/facebookincubator/katran/commit/6f3c2c2015d449d909874bb137d44f5d223e8875 https://github.com/facebookincubator/mvfst/commit/19a69d246b758dee5606998b0e4d4a8dc7574dfa Reviewed By: yns88 fbshipit-source-id: b93572b15610736bde06fee31e4bba7bb4b82ab4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 183d61d2b6ed..b128fe623156 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3ed2def0968612cf9f0b6a39e4b37fe03d4a7eef +Subproject commit 931cb3f6f994a6c644ff78248e5ada493276d552 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0a46620de5b8..efe669987be4 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2d16a8bdc3061cafaaeafcda4350e6091ed2bc39 +Subproject commit 0497be8810fa20dfb73e5d4f4989909d2a4e150c From 0efa4a0be929662ed09ba8578a2e69999221722a Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 29 Jul 2021 03:42:20 -0700 Subject: [PATCH 0381/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/d1363cac54a858e1fe562a00493077cebcea59d5 https://github.com/facebook/fbthrift/commit/6184170df3aedceb53b5162545824432274f178a https://github.com/facebook/fbzmq/commit/d1935e6a3033236936da8c19bd8417f7a9742965 https://github.com/facebook/proxygen/commit/a497fa2bead8259e932254f01f87db00d3988291 https://github.com/facebook/watchman/commit/fecca34a9009925f4ee5081f926a8e193ba08ca9 https://github.com/facebookexperimental/rust-shed/commit/a739f1f283e2895c31100b610c51e3d97556d124 Reviewed By: yns88 fbshipit-source-id: ead9f7bcd811571a5f449c2e920dc90853fb02d9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b128fe623156..8f5e2b0cf7e1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 931cb3f6f994a6c644ff78248e5ada493276d552 +Subproject commit 6184170df3aedceb53b5162545824432274f178a From 55fe8da839957c666abccb81b65c67d8290b322d Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 29 Jul 2021 09:05:39 -0700 Subject: [PATCH 0382/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/d32686fe867c2a725639ca55fc8624a0d9614d0f Reviewed By: yns88 fbshipit-source-id: 63664f8b515ac3606377bbb42a39fc976f384507 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8f5e2b0cf7e1..5df7c205689d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6184170df3aedceb53b5162545824432274f178a +Subproject commit d32686fe867c2a725639ca55fc8624a0d9614d0f From b7dab38681e13f00b591d933d1cbbdf21343f412 Mon Sep 17 00:00:00 2001 From: Mark Juggurnauth-Thomas Date: Thu, 29 Jul 2021 10:00:01 -0700 Subject: [PATCH 0383/7387] make hg inform edenfs of newly created root manifests Summary: If Mercurial asks EdenFS to update to a commit that it has just created, this can cause a long delay while EdenFS tries to import the commit. EdenFS needs to resolve the commit to a root manifest. It does this via the import helper, but the import helper won't know about the commit until it is restarted, which takes a long time. To fix this, we add an optional "root manifest" parameter to the checkout or reset parents thrift calls. This allows the Mercurial client to inform EdenFS of the root manifest that it already knows about, allowing EdenFS to skip this step. Reviewed By: chadaustin Differential Revision: D29845604 fbshipit-source-id: 61736d84971cd2dd9a8fdaa29a1578386246e4bf --- eden/fs/service/eden.thrift | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 1d879200b5be..696eff531074 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -876,6 +876,34 @@ struct SetPathRootIdResult { 1: list conflicts } +struct CheckOutRevisionParams { + /** + * The hg root manifest that corresponds to the commit (if known). + * + * When a commit is newly created, EdenFS won't know the commit + * to root-manifest mapping for the commit, and won't be able to find + * out from the import helper until the import helper re-opens the + * repo. To speed this up, Mercurial clients may optionally provide + * the hash of the root manifest directly, so that EdenFS doesn't + * need to look it up. + */ + 1: optional BinaryHash hgRootManifest; +} + +struct ResetParentCommitsParams { + /** + * The hg root manifest that corresponds to the commit (if known). + * + * When a commit is newly created, EdenFS won't know the commit + * to root-manifest mapping for the commit, and won't be able to find + * out from the import helper until the import helper re-opens the + * repo. To speed this up, Mercurial clients may optionally provide + * the hash of the root manifest directly, so that EdenFS doesn't + * need to look it up. + */ + 1: optional BinaryHash hgRootManifest; +} + service EdenService extends fb303_core.BaseService { list listMounts() throws (1: EdenError ex); void mount(1: MountArgument info) throws (1: EdenError ex); @@ -907,6 +935,7 @@ service EdenService extends fb303_core.BaseService { 1: PathString mountPoint, 2: ThriftRootId snapshotHash, 3: CheckoutMode checkoutMode, + 4: CheckOutRevisionParams params, ) throws (1: EdenError ex); /** @@ -918,6 +947,7 @@ service EdenService extends fb303_core.BaseService { void resetParentCommits( 1: PathString mountPoint, 2: WorkingDirectoryParents parents, + 3: ResetParentCommitsParams params, ) throws (1: EdenError ex); /** From c6e013a688df11e68372922484ea1e5d95b04db7 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 29 Jul 2021 10:54:38 -0700 Subject: [PATCH 0384/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/e2e78eec03d47187df44cf6b09f351539c28ab52 https://github.com/facebook/litho/commit/1639af1a2962a93a6681d1803c94795e9df70779 https://github.com/facebook/watchman/commit/b7dab38681e13f00b591d933d1cbbdf21343f412 https://github.com/facebookexternal/stl_tasks/commit/148e2a73577e73d4abda03bd1f8f6c2ce6b6be4e Reviewed By: yns88 fbshipit-source-id: f2f207e8580d66185e5db5731d1cd82e84874270 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5df7c205689d..7979aed7684d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d32686fe867c2a725639ca55fc8624a0d9614d0f +Subproject commit e2e78eec03d47187df44cf6b09f351539c28ab52 From 07730518f15badb5bca1919f1fe053fea54f5441 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 29 Jul 2021 11:37:05 -0700 Subject: [PATCH 0385/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/57da7c2fa14c3eb70ce45a634c9c4d8dab670705 https://github.com/facebook/fbthrift/commit/14952b79a8636e96da4a91c37377e3e8ef3d23c3 https://github.com/facebook/fbzmq/commit/68eb1a6bb3acd6f1506bc136ea06fbfd7206737b https://github.com/facebook/litho/commit/96f634c52f101521471cf1c32d72ea719eda4ff3 https://github.com/facebook/watchman/commit/c6e013a688df11e68372922484ea1e5d95b04db7 https://github.com/facebookexperimental/rust-shed/commit/61f277acfcb9fb99383ca5db832b3de8dbe9864f Reviewed By: yns88 fbshipit-source-id: 96df6670ccfd04540c91d011273bac0629d1a49a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7979aed7684d..dc61fd9fbff1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e2e78eec03d47187df44cf6b09f351539c28ab52 +Subproject commit 14952b79a8636e96da4a91c37377e3e8ef3d23c3 From 7fa58148d34d7c46e52799a53d859c1a6bde1075 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 29 Jul 2021 12:09:17 -0700 Subject: [PATCH 0386/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/0f8f8292451e13353b5cb83ccd59c0f0cbf966a8 https://github.com/facebook/fbthrift/commit/00e9095d6b2eeba01ba1b76b4816891d21ccf7e4 https://github.com/facebook/fbzmq/commit/55cbbc11bc00f51cb7780d109699695c02703628 https://github.com/facebook/rocksdb/commit/e8f218cb6863949a05bc38c8399433d8a0ff3368 https://github.com/facebook/watchman/commit/07730518f15badb5bca1919f1fe053fea54f5441 https://github.com/facebookexperimental/rust-shed/commit/a4106fe3ec01fd82adff5f4d2c31cbea6352e344 Reviewed By: yns88 fbshipit-source-id: e8b2abfa3c8fc9f4c5184bb82cfd631b16d7c3b5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index dc61fd9fbff1..248be510de3d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 14952b79a8636e96da4a91c37377e3e8ef3d23c3 +Subproject commit 00e9095d6b2eeba01ba1b76b4816891d21ccf7e4 From abcb8440069ba7bc0a2c4d212b6ddd565d0be502 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 29 Jul 2021 17:42:57 -0700 Subject: [PATCH 0387/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/806f2e2cbcac8a6830d3947e94f747ffaaa82841 https://github.com/facebook/fbthrift/commit/163f629e850c0b0b9b3fdbc6f797af51dc536150 https://github.com/facebook/fbzmq/commit/ee9ee4f3d29b788f4eeb843e0720fa599af9b3fa https://github.com/facebook/folly/commit/a87dba7174e7c51340456b9fbacd7e045edeca58 https://github.com/facebook/litho/commit/05a2b32466c74d0392cf5f22dc0af66391451173 https://github.com/facebook/proxygen/commit/2b7391265ee6ca82db03db5c7511e0284ef9be68 https://github.com/facebook/rocksdb/commit/1d34cd797ed59d90a9cc0b0f87a008f374aabb3c https://github.com/facebook/wangle/commit/b5b986b5961027908806bcb27024de70b765e53d https://github.com/facebook/watchman/commit/7fa58148d34d7c46e52799a53d859c1a6bde1075 https://github.com/facebookexperimental/rust-shed/commit/d61a0fa7862d98d20665fcf2c8c6436bca025013 https://github.com/facebookexternal/stl_tasks/commit/38e75c6af11b82aa6fea0e124802d2e6d54f1ec9 https://github.com/facebookincubator/fizz/commit/2d5b353cd65c750f7181a44f871ba82c58e4854b https://github.com/facebookresearch/pytorch-biggraph/commit/b590de4c61fe7185827e44ad41ef21ddcd8239a8 https://github.com/pytorch/kineto/commit/c47b406570d62f331187eee27e9825fed729f011 Reviewed By: yns88 fbshipit-source-id: eec04701da1ffcc571f0bc80da157d8deb2de18b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 248be510de3d..5b2433ccac16 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 00e9095d6b2eeba01ba1b76b4816891d21ccf7e4 +Subproject commit 163f629e850c0b0b9b3fdbc6f797af51dc536150 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 853a9c8e9233..b6db5d7bdf1c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 57f9d2cd02353e0f71fffb6db87d55ab11a2d990 +Subproject commit a87dba7174e7c51340456b9fbacd7e045edeca58 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index efe669987be4..e684705e83f8 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0497be8810fa20dfb73e5d4f4989909d2a4e150c +Subproject commit b5b986b5961027908806bcb27024de70b765e53d From 3d6429d91e2e702184caf11cf900104661fb5a6d Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 29 Jul 2021 18:04:30 -0700 Subject: [PATCH 0388/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/73836519b7c082d0d847cd93f399f64a2b96248a https://github.com/facebook/fbthrift/commit/bb8ee8c4ed299437c9b467cb29733caa3aaa8bf5 https://github.com/facebook/fbzmq/commit/b9bb57be2c7d6536184822badcd08f9749c9d759 https://github.com/facebook/proxygen/commit/cf0a1f2184cbbfbcdb40cbf2fe0312c2de7be409 https://github.com/facebook/wangle/commit/8810250d2e96d7e173dc80fd703711a33f202e06 https://github.com/facebook/watchman/commit/abcb8440069ba7bc0a2c4d212b6ddd565d0be502 https://github.com/facebookexperimental/rust-shed/commit/8089005fff832f8f7a7c232bd385ffa398967ec5 https://github.com/facebookincubator/fizz/commit/084fb64af9eeea6efaefbb7d2f64e62aa240c419 https://github.com/facebookincubator/katran/commit/9662940180786c45cba76e5a8e8bd3dfbc39f63d https://github.com/facebookincubator/mvfst/commit/7ebeeee92764b7f67f5c656f58c37fbe1fd639ef https://github.com/rsocket/rsocket-cpp/commit/f072c21cf6fdaa230e7d221817c50cfd8ff84758 Reviewed By: yns88 fbshipit-source-id: c6445b1351d58801ab15fcc293df75e0e2cb4730 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5b2433ccac16..f4c9a99ce664 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 163f629e850c0b0b9b3fdbc6f797af51dc536150 +Subproject commit bb8ee8c4ed299437c9b467cb29733caa3aaa8bf5 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e684705e83f8..532a13c11a9c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b5b986b5961027908806bcb27024de70b765e53d +Subproject commit 8810250d2e96d7e173dc80fd703711a33f202e06 From f762e1f8f8372e7bd8bdf5cb83be71eed5f04687 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 29 Jul 2021 18:22:34 -0700 Subject: [PATCH 0389/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/4c910da9d9f832716d824a20792e9062894733f0 https://github.com/facebook/fbthrift/commit/5816994b620a6ed0300a2159640312959a78a54a https://github.com/facebook/fbzmq/commit/c9692092f8d2b0f427fde80f882c6ab6c3065188 https://github.com/facebook/proxygen/commit/ba9f94d081414f06305439981b2b83d5c1c1709f https://github.com/facebook/wangle/commit/1be1b7c0736b04930e38f0b625030c4e086a778e https://github.com/facebook/watchman/commit/3d6429d91e2e702184caf11cf900104661fb5a6d https://github.com/facebookexperimental/rust-shed/commit/b79a1f55bfbd5bda8c3beb88c2daea1a5e0ed834 https://github.com/facebookincubator/katran/commit/07075a6a96b84e8094470af710487aa06f6587ea https://github.com/facebookincubator/mvfst/commit/2de78880a91d5ae0c89a4db49b8e8e9da35c85bf Reviewed By: yns88 fbshipit-source-id: 915de97b5cdf8e52d6018fd8ea71a4a86e420a03 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f4c9a99ce664..efefccf13218 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bb8ee8c4ed299437c9b467cb29733caa3aaa8bf5 +Subproject commit 5816994b620a6ed0300a2159640312959a78a54a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 532a13c11a9c..00f2df44b20b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8810250d2e96d7e173dc80fd703711a33f202e06 +Subproject commit 1be1b7c0736b04930e38f0b625030c4e086a778e From 24a992a5686e53497974b82228a9956c66266f1b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 29 Jul 2021 18:52:16 -0700 Subject: [PATCH 0390/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/6f8c003ce389278416536f432ddf1af8357658d9 https://github.com/facebook/fbthrift/commit/7e30c053b02ea15cade9cfdc3c9d08544bdd8134 https://github.com/facebook/fbzmq/commit/23ef94d97aaf072fb22a5a412e7d13f1ccfdb7a7 https://github.com/facebook/folly/commit/14933d5f7b527bf0cf5a9fe14b8f3d6a0abbcd02 https://github.com/facebook/proxygen/commit/c718688949f667a0374ddeb09003bfbf7389d0b4 https://github.com/facebook/watchman/commit/f762e1f8f8372e7bd8bdf5cb83be71eed5f04687 https://github.com/facebookexperimental/rust-shed/commit/3398d54be531edaba76e69309a9892c389b248d8 Reviewed By: yns88 fbshipit-source-id: 938a0cc30361c44736a5ab4cf6d1de5f6f71a162 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index efefccf13218..11cda06f13e8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5816994b620a6ed0300a2159640312959a78a54a +Subproject commit 7e30c053b02ea15cade9cfdc3c9d08544bdd8134 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b6db5d7bdf1c..e2b1f196b8ad 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a87dba7174e7c51340456b9fbacd7e045edeca58 +Subproject commit 14933d5f7b527bf0cf5a9fe14b8f3d6a0abbcd02 From ad15ea5b9973b262c9d175deb27721ab393aa357 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 29 Jul 2021 19:35:02 -0700 Subject: [PATCH 0391/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/02e5c94594727626043b9af53ccc4c60c399b746 https://github.com/facebook/fbthrift/commit/0870028bddaecb3ecd7948673fb34b9e5acfbe9e https://github.com/facebook/fbzmq/commit/04ef18409e5c282251aaa86a5f8d8632c7046c4f https://github.com/facebook/proxygen/commit/051dfbb4d1bb9ff805d789695273a9e152f43099 https://github.com/facebook/wangle/commit/29c23d906c631592f3f79a681a84029b869fe5c7 https://github.com/facebook/watchman/commit/24a992a5686e53497974b82228a9956c66266f1b https://github.com/facebookexperimental/rust-shed/commit/17f91638e4839de1de360b8daebc19155280aba2 https://github.com/facebookincubator/fizz/commit/1d8f80b5c26761bc987826a2619ddae3c6a51c67 https://github.com/facebookincubator/katran/commit/f98f553a66adbb30d593f5e56e0d0342f8401d5d https://github.com/facebookincubator/mvfst/commit/fab8361323831f440a86ca85e9479d704ac21ad2 https://github.com/rsocket/rsocket-cpp/commit/50abd63024efa0352b435f3854f5a78239fb4f23 Reviewed By: yns88 fbshipit-source-id: dd241a6670ca8f0742a4d865deaccef05f9e00ee --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 11cda06f13e8..988d7c850185 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7e30c053b02ea15cade9cfdc3c9d08544bdd8134 +Subproject commit 0870028bddaecb3ecd7948673fb34b9e5acfbe9e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 00f2df44b20b..74e7b36562d5 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1be1b7c0736b04930e38f0b625030c4e086a778e +Subproject commit 29c23d906c631592f3f79a681a84029b869fe5c7 From 0a5d0fcf95460a11375708b30c84adde3e3ff47f Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 29 Jul 2021 20:09:47 -0700 Subject: [PATCH 0392/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/6904af0fbfb49f2f5164ec5b29e0f00faea01fea https://github.com/facebook/fbthrift/commit/ad56240b2be5516ecb3f9dcaaec856a04d720dae https://github.com/facebook/fbzmq/commit/2f271c66804f17644b1618c2b0cd5ccddd40ffed https://github.com/facebook/proxygen/commit/9c4c0983993f2e60fb585edfe745f25d4a7558cd https://github.com/facebook/wangle/commit/a00c8c3513e97055e62cb15a0857dccca1065f92 https://github.com/facebook/watchman/commit/ad15ea5b9973b262c9d175deb27721ab393aa357 https://github.com/facebookexperimental/rust-shed/commit/bf5518b8997ba3b1506b1d5509d8da8047da5d5a https://github.com/facebookincubator/katran/commit/9cd97171ed50f682c97622a2fbcdd483d660147a https://github.com/facebookincubator/mvfst/commit/82eedbf38c2ebd0b100a9d134f7ade3cfe0d360f Reviewed By: yns88 fbshipit-source-id: 3698c0abb986282d84958168cbf5e38f6b3da934 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 988d7c850185..d0e3af4899ab 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0870028bddaecb3ecd7948673fb34b9e5acfbe9e +Subproject commit ad56240b2be5516ecb3f9dcaaec856a04d720dae diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 74e7b36562d5..fe19415ea6d7 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 29c23d906c631592f3f79a681a84029b869fe5c7 +Subproject commit a00c8c3513e97055e62cb15a0857dccca1065f92 From 5f3824848f84d38de75bd3d861ca80914c304fdb Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 29 Jul 2021 20:44:26 -0700 Subject: [PATCH 0393/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/2905db104281ee1078555db646b4b849890aa32e https://github.com/facebook/fbthrift/commit/f9b7187e3ac2b5bec63f89cb012b79ebfc752d86 https://github.com/facebook/fbzmq/commit/8a98326c8deee04399c60ba755725351a6c70fcc https://github.com/facebook/proxygen/commit/ee31821b630e32c2fd2a40447c741050cfa922fd https://github.com/facebook/watchman/commit/0a5d0fcf95460a11375708b30c84adde3e3ff47f https://github.com/facebookexperimental/rust-shed/commit/4584f62bac04542d1d080339b1a5bba24a8984cc Reviewed By: yns88 fbshipit-source-id: 25594f06d1c54d3d8e5d410a22aca9b2647d762e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d0e3af4899ab..f58fd80fae1b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ad56240b2be5516ecb3f9dcaaec856a04d720dae +Subproject commit f9b7187e3ac2b5bec63f89cb012b79ebfc752d86 From 30462db382b789c7569b96a2631d73e21e3f7ac3 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 29 Jul 2021 21:25:18 -0700 Subject: [PATCH 0394/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/b45139112804943fa6a40800cd9b72162aa3afc2 Reviewed By: yns88 fbshipit-source-id: e37fad45068e19d3e03346b0866472aef02ee8a5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f58fd80fae1b..729af37ded7e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f9b7187e3ac2b5bec63f89cb012b79ebfc752d86 +Subproject commit b45139112804943fa6a40800cd9b72162aa3afc2 From e09045182d2c44aac688bf7fd2a35217da178cba Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 29 Jul 2021 21:32:59 -0700 Subject: [PATCH 0395/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/f9b7187e3ac2b5bec63f89cb012b79ebfc752d86 Reviewed By: yns88 fbshipit-source-id: d15ac310073b38d9b7287535ff29631eb37f7d50 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 729af37ded7e..f58fd80fae1b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b45139112804943fa6a40800cd9b72162aa3afc2 +Subproject commit f9b7187e3ac2b5bec63f89cb012b79ebfc752d86 From 2f658675c8f56173d8e906850181ada808dc9e67 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 29 Jul 2021 21:47:50 -0700 Subject: [PATCH 0396/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/d6ffc40294e4f37458e01a8030917c4c6d1c38e2 https://github.com/facebook/fbthrift/commit/b45139112804943fa6a40800cd9b72162aa3afc2 https://github.com/facebook/fbzmq/commit/d0fafdceee9f8f95d6c75dc7a2e1f97aca73c27d https://github.com/facebook/watchman/commit/e09045182d2c44aac688bf7fd2a35217da178cba https://github.com/facebookexperimental/rust-shed/commit/4325d4519717cf2c040ed48e4304963ce57cecb1 Reviewed By: yns88 fbshipit-source-id: a1eecbed89a991bc47b0601419394b3abe77ac04 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f58fd80fae1b..729af37ded7e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f9b7187e3ac2b5bec63f89cb012b79ebfc752d86 +Subproject commit b45139112804943fa6a40800cd9b72162aa3afc2 From 0d9ae6263f6b77fddbe914b9ae20fc5f2c46da9a Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 30 Jul 2021 05:13:15 -0700 Subject: [PATCH 0397/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/de6685202c2427474957d8ad1e43c12c9a940df7 https://github.com/facebookresearch/pytorch-biggraph/commit/d7082b76bba4040ae2e86e35cd0c3210d9771d01 Reviewed By: yns88 fbshipit-source-id: f1db486e083fefcf5ddab07c72ac499375bf36c7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 729af37ded7e..b55f82ca8959 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b45139112804943fa6a40800cd9b72162aa3afc2 +Subproject commit de6685202c2427474957d8ad1e43c12c9a940df7 From 8fb98514378565384fa5ffd101a04f542420f538 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 30 Jul 2021 08:01:20 -0700 Subject: [PATCH 0398/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/487c86622738c344aedd13f65689bb47243e95ea https://github.com/facebook/litho/commit/ef5b353bc99f36585249abf4120732f992fabe04 Reviewed By: yns88 fbshipit-source-id: 6562a9bf79d75661f24cfb6a74fb99afe2a5d8fa --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b55f82ca8959..9cb08ca2dac4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit de6685202c2427474957d8ad1e43c12c9a940df7 +Subproject commit 487c86622738c344aedd13f65689bb47243e95ea From 4dbb9e77dc58d2a8496344696b0df1321ebc7047 Mon Sep 17 00:00:00 2001 From: Jun Wu Date: Fri, 30 Jul 2021 09:10:21 -0700 Subject: [PATCH 0399/7387] include rust-shed in edenscm builds Summary: They will be used by upcoming changes. Reviewed By: DurhamG Differential Revision: D30005548 fbshipit-source-id: 6154069f7dfd9b3c9b1b1a7ea3552081c7d1641e --- build/fbcode_builder/manifests/eden_scm | 1 + 1 file changed, 1 insertion(+) diff --git a/build/fbcode_builder/manifests/eden_scm b/build/fbcode_builder/manifests/eden_scm index 07b8c89d5ad3..cfe9c709660b 100644 --- a/build/fbcode_builder/manifests/eden_scm +++ b/build/fbcode_builder/manifests/eden_scm @@ -28,6 +28,7 @@ install-getdeps test-getdeps [shipit.pathmap] +fbcode/common/rust = common/rust fbcode/eden/oss = . fbcode/eden = eden fbcode/tools/lfs = tools/lfs From 7aee84531a31d6587430de0709bceea8cce76aa6 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 30 Jul 2021 09:38:54 -0700 Subject: [PATCH 0400/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/8202a0d39298d142613f292a1ac4cd46ca65a0bb https://github.com/facebook/fbthrift/commit/98775af521c01c42d79558232c91f4c81b5aaa96 https://github.com/facebook/fbzmq/commit/bf4a4e9c3cbd9c2038474f1b22e318ef87f3fe7b https://github.com/facebook/folly/commit/0d35ac1da98f13af0b498feaf14dc548c3efa216 https://github.com/facebook/proxygen/commit/c16afcc825e96581911737b79bc88f584fc8ff72 https://github.com/facebook/wangle/commit/9cd10a83f0577ace0a9d3c8c70b8bf806f5a0c7a https://github.com/facebook/watchman/commit/4dbb9e77dc58d2a8496344696b0df1321ebc7047 https://github.com/facebookexperimental/rust-shed/commit/49c1ddc2610ce9cd980bce104af2f1be6420b764 https://github.com/facebookincubator/fizz/commit/36786507b70b62e4556631f70784365dfe5ab338 https://github.com/facebookincubator/katran/commit/1290ac60f7c32bf266cd66cafb3436fcac3ed7a7 https://github.com/facebookincubator/mvfst/commit/c4ee9c63ece0ca4f4181209ec09df7bb4c130df1 https://github.com/rsocket/rsocket-cpp/commit/0fb0a13b883d0c7799d15a819b441d63e82a71c2 Reviewed By: yns88 fbshipit-source-id: 840cbcd4e04da7cdd3f874971e691a0d0e894cb0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9cb08ca2dac4..4f011f8809af 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 487c86622738c344aedd13f65689bb47243e95ea +Subproject commit 98775af521c01c42d79558232c91f4c81b5aaa96 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e2b1f196b8ad..a0b8e41e7d55 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 14933d5f7b527bf0cf5a9fe14b8f3d6a0abbcd02 +Subproject commit 0d35ac1da98f13af0b498feaf14dc548c3efa216 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index fe19415ea6d7..0c7c4c4449da 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a00c8c3513e97055e62cb15a0857dccca1065f92 +Subproject commit 9cd10a83f0577ace0a9d3c8c70b8bf806f5a0c7a From c42e1ac5a43ff44da215826c70daa9d666c3c72e Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 30 Jul 2021 10:26:37 -0700 Subject: [PATCH 0401/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/a89938242b4cf51d5438d2ceaf32fae79bee4adc https://github.com/facebook/fbthrift/commit/b0c92807b5394efbb9f11b979e28ce4307c8939e https://github.com/facebook/fbzmq/commit/a7b5bc1c4b419875fedcbf1717eec64073fa3b90 https://github.com/facebook/proxygen/commit/9f393904fcb683824d2dc85fe42c1f5a201f3314 https://github.com/facebook/wangle/commit/f88b0502e2e9654ffca19eb63b0b4a756b167a32 https://github.com/facebook/watchman/commit/7aee84531a31d6587430de0709bceea8cce76aa6 https://github.com/facebookexperimental/rust-shed/commit/b73b9cfe3f37260244ef2278d23239772b3999be https://github.com/facebookincubator/fizz/commit/f9fe62656cb44ac6708da5157ae56b4d48c674df https://github.com/facebookincubator/katran/commit/4b568769d10727e8e286b77315fb48a37616a7b2 https://github.com/facebookincubator/mvfst/commit/38657b18747c1652436b262c78bcfae4a3d2b4fc https://github.com/rsocket/rsocket-cpp/commit/7c75cf9cd4cdc58b78f99a2661830d8e366328a0 Reviewed By: yns88 fbshipit-source-id: 398da9fd57c91e2b9ad0eb3f4709f2a11b447f3e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4f011f8809af..49835088879a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 98775af521c01c42d79558232c91f4c81b5aaa96 +Subproject commit b0c92807b5394efbb9f11b979e28ce4307c8939e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0c7c4c4449da..0a80f86cc247 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9cd10a83f0577ace0a9d3c8c70b8bf806f5a0c7a +Subproject commit f88b0502e2e9654ffca19eb63b0b4a756b167a32 From 2cfc1f44ab82c714944f4865688cea0150d3dfbe Mon Sep 17 00:00:00 2001 From: "Zeyi (Rice) Fan" Date: Fri, 30 Jul 2021 10:49:02 -0700 Subject: [PATCH 0402/7387] fix oss Windows build Summary: Otherwise the build will fail with ``` Traceback (most recent call last): File "C:/Users/zeyi/GitHub/watchman/watchman/python/setup.py", line 25, in py_dir = os.path.relpath(py_dir) File "C:\Python38\lib\ntpath.py", line 703, in relpath raise ValueError("path is on mount %r, start on mount %r" % ( ValueError: path is on mount 'C:', start on mount 'Z:' CMake Error at cmake_install.cmake:44 (message): pywatchman install failed ``` This is because getdeps tries to build on a different drive on Windows and that breaks the relative path calculation. Reviewed By: kmancini Differential Revision: D29998898 fbshipit-source-id: 8d9d809e992e2d35dec1357ecbaa39cf45509adc --- watchman/python/setup.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/watchman/python/setup.py b/watchman/python/setup.py index dac2ea61ed31..1ee269ba2600 100755 --- a/watchman/python/setup.py +++ b/watchman/python/setup.py @@ -14,13 +14,14 @@ if watchman_src_dir is None: watchman_src_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..") -# The python source dir. -# On Windows, this has to be relative to the cwd otherwise something -# in the setuptools machinery does the wrong thing and produces a -# path like `Z:blah` which on windows resolves ambiguously depending -# on the cwd. +# Setuptools is very picky about the path on Windows. They have to be relative +# paths, and on Windows that means we have to be on the same drive as the source +# files. Otherwise it is impossible to obtain a relative path across different +# drives. However this has an implication that we will not be able to build this +# package outside the repository. Not great but it works. py_dir = os.path.join(watchman_src_dir, "watchman", "python") if os.name == "nt": + os.chdir(py_dir) py_dir = os.path.relpath(py_dir) From ae3cf4023fda4279e8097cfff64d71af3decce05 Mon Sep 17 00:00:00 2001 From: "Zeyi (Rice) Fan" Date: Fri, 30 Jul 2021 10:49:02 -0700 Subject: [PATCH 0403/7387] fix oss macOS build Summary: By default, GitHub Action CI runs on Catalina and it will use Catalina SDK by default. That version does not have support for building universal binary yet so it simply result as an error `architecture is not supported`. This diff fixes it by forcing us to use Big Sur SDK installed. Reviewed By: wez Differential Revision: D30016438 fbshipit-source-id: 0e10dd49b470224c4c1eaba1015ea4ea777cf313 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5562cf700df8..518bcdf5a3b9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -57,7 +57,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Build watchman - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --src-dir=. watchman --project-install-prefix watchman:/usr/local + run: SDKROOT=$(xcrun --show-sdk-path --sdk macosx11.1) python3 build/fbcode_builder/getdeps.py --allow-system-packages build --src-dir=. watchman --project-install-prefix watchman:/usr/local - name: Copy artifacts run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fixup-dyn-deps --src-dir=. watchman _artifacts/mac --project-install-prefix watchman:/usr/local --final-install-prefix /usr/local - name: Test watchman From 7c210a4f44c4d06fa65ed83301970e2d6ff1b01b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 30 Jul 2021 11:04:22 -0700 Subject: [PATCH 0404/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/3ea3907304e54a4af948614aa2ac930bb9717f6f https://github.com/facebook/fbthrift/commit/7c98b6d31eea496291e3dbddaf5a41b98c2a5fb3 https://github.com/facebook/fbzmq/commit/18f58268d53a1c89535b4dcf2617b1ef1027c8d0 https://github.com/facebook/proxygen/commit/48ba8c3f8c41acc8a84b116156c47f920bea32e5 https://github.com/facebook/wangle/commit/90d5e04b0d9be3f681ac25dbeca91f19aa17fe7f https://github.com/facebook/watchman/commit/ae3cf4023fda4279e8097cfff64d71af3decce05 https://github.com/facebookexperimental/rust-shed/commit/17511e4c54a3b5912b10bf08ca0042bc4ad8c53a https://github.com/facebookincubator/katran/commit/87981119786e195cbd38aeecc4c887ac7b09464b https://github.com/facebookincubator/mvfst/commit/01d6e1cfed8814392301d865e710325c23ccd614 Reviewed By: yns88 fbshipit-source-id: 796adcc4836c588d2dec52f860482bfcbe87e34a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 49835088879a..0b78b2321d4e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b0c92807b5394efbb9f11b979e28ce4307c8939e +Subproject commit 7c98b6d31eea496291e3dbddaf5a41b98c2a5fb3 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0a80f86cc247..f9175b9ce9a8 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f88b0502e2e9654ffca19eb63b0b4a756b167a32 +Subproject commit 90d5e04b0d9be3f681ac25dbeca91f19aa17fe7f From 12d9b8898371243fc75d1ad8bcf194916385c1d1 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 30 Jul 2021 11:32:05 -0700 Subject: [PATCH 0405/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/0f8f8537f41791cb8bb97eb6b0695098363d2dc5 https://github.com/facebook/fbthrift/commit/99defa70af1a582768d0cc66a9195e64b86a645a https://github.com/facebook/fbzmq/commit/a2fcaa360b5c0f2fb85f28ab8d1cf10afcdd600b https://github.com/facebook/proxygen/commit/aa8ce6b1f2e0e85b30f93d542ac9095d695372cf https://github.com/facebook/watchman/commit/7c210a4f44c4d06fa65ed83301970e2d6ff1b01b https://github.com/facebookexperimental/rust-shed/commit/b304ddf694c6383e2e95e217268300ed26f6ea22 Reviewed By: yns88 fbshipit-source-id: 776e7ae461aea38409601e0668d8e4305dd4c99b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0b78b2321d4e..6124354f81be 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7c98b6d31eea496291e3dbddaf5a41b98c2a5fb3 +Subproject commit 99defa70af1a582768d0cc66a9195e64b86a645a From 683f62677fcb64cdc94a7df67017b7d1bf10d8ed Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 30 Jul 2021 12:56:05 -0700 Subject: [PATCH 0406/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/rocksdb/commit/ab7f7c9e497a18c48837556bf2e68b4cc5d2a498 https://github.com/facebook/wangle/commit/150df865cb04e2085c609ed853c32ab33a40984e Reviewed By: yns88 fbshipit-source-id: c3723cd8e6e483e2f609d811a8f056f3fae25b20 --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f9175b9ce9a8..4c40bea23464 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 90d5e04b0d9be3f681ac25dbeca91f19aa17fe7f +Subproject commit 150df865cb04e2085c609ed853c32ab33a40984e From 9066f28ea8488ee470eb3f115e4b6bbaa19e9315 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 30 Jul 2021 13:22:50 -0700 Subject: [PATCH 0407/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/4f1e32c4a65b3549a982d072c717682a12ec269a https://github.com/facebook/fbthrift/commit/5aaf9f7bc908336f3a471cb6c1d27389cc9465ae https://github.com/facebook/fbzmq/commit/3361bcbb0efb2e9d8b74479fcd4fec6dbc5d6e6b https://github.com/facebook/proxygen/commit/cfe6949781f5ae0424bfd2a944aa306fd780f2b4 https://github.com/facebook/watchman/commit/683f62677fcb64cdc94a7df67017b7d1bf10d8ed Reviewed By: yns88 fbshipit-source-id: 3c5806c704530299a2e88d6d087945311a7bffcc --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6124354f81be..5afecbfc59ec 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 99defa70af1a582768d0cc66a9195e64b86a645a +Subproject commit 5aaf9f7bc908336f3a471cb6c1d27389cc9465ae From d31088ca433ffe664911d4e2ee5c927576b1dda5 Mon Sep 17 00:00:00 2001 From: "Zeyi (Rice) Fan" Date: Fri, 30 Jul 2021 15:07:14 -0700 Subject: [PATCH 0408/7387] avoid generating internal dependencies for public CI Reviewed By: wez Differential Revision: D30017863 fbshipit-source-id: fb94a7c36e05d874fc3a6ce568a7b757c1863ffa --- .github/workflows/getdeps_linux.yml | 4 ---- .github/workflows/getdeps_mac.yml | 4 ---- .github/workflows/getdeps_windows.yml | 4 ---- build/fbcode_builder/getdeps.py | 2 +- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/getdeps_linux.yml b/.github/workflows/getdeps_linux.yml index ad36aa6b47fc..ec0d90862707 100644 --- a/.github/workflows/getdeps_linux.yml +++ b/.github/workflows/getdeps_linux.yml @@ -17,8 +17,6 @@ jobs: - uses: actions/checkout@v1 - name: Fetch boost run: python3 build/fbcode_builder/getdeps.py fetch --no-tests boost - - name: Fetch rust - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests rust - name: Fetch ninja run: python3 build/fbcode_builder/getdeps.py fetch --no-tests ninja - name: Fetch cmake @@ -71,8 +69,6 @@ jobs: run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fb303 - name: Build boost run: python3 build/fbcode_builder/getdeps.py build --no-tests boost - - name: Build rust - run: python3 build/fbcode_builder/getdeps.py build --no-tests rust - name: Build ninja run: python3 build/fbcode_builder/getdeps.py build --no-tests ninja - name: Build cmake diff --git a/.github/workflows/getdeps_mac.yml b/.github/workflows/getdeps_mac.yml index 955c8e924b5d..e4b273ab737e 100644 --- a/.github/workflows/getdeps_mac.yml +++ b/.github/workflows/getdeps_mac.yml @@ -17,8 +17,6 @@ jobs: - uses: actions/checkout@v1 - name: Fetch boost run: python3 build/fbcode_builder/getdeps.py fetch --no-tests boost - - name: Fetch rust - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests rust - name: Fetch openssl run: python3 build/fbcode_builder/getdeps.py fetch --no-tests openssl - name: Fetch ninja @@ -73,8 +71,6 @@ jobs: run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fb303 - name: Build boost run: python3 build/fbcode_builder/getdeps.py build --no-tests boost - - name: Build rust - run: python3 build/fbcode_builder/getdeps.py build --no-tests rust - name: Build openssl run: python3 build/fbcode_builder/getdeps.py build --no-tests openssl - name: Build ninja diff --git a/.github/workflows/getdeps_windows.yml b/.github/workflows/getdeps_windows.yml index 9b5f9a789425..ea574100f3fa 100644 --- a/.github/workflows/getdeps_windows.yml +++ b/.github/workflows/getdeps_windows.yml @@ -22,8 +22,6 @@ jobs: run: git config --system core.longpaths true - name: Fetch boost run: python build/fbcode_builder/getdeps.py fetch --no-tests boost - - name: Fetch rust - run: python build/fbcode_builder/getdeps.py fetch --no-tests rust - name: Fetch bison run: python build/fbcode_builder/getdeps.py fetch --no-tests bison - name: Fetch flex @@ -76,8 +74,6 @@ jobs: run: python build/fbcode_builder/getdeps.py fetch --no-tests fb303 - name: Build boost run: python build/fbcode_builder/getdeps.py build --no-tests boost - - name: Build rust - run: python build/fbcode_builder/getdeps.py build --no-tests rust - name: Build bison run: python build/fbcode_builder/getdeps.py build --no-tests bison - name: Build flex diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index b455d12c794c..1b539735f14f 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -793,7 +793,7 @@ def run_project_cmd(self, args, loader, manifest): # TODO: Break up complex function def write_job_for_platform(self, platform, args): # noqa: C901 build_opts = setup_build_options(args, platform) - ctx_gen = build_opts.get_context_generator() + ctx_gen = build_opts.get_context_generator(facebook_internal=False) loader = ManifestLoader(build_opts, ctx_gen) manifest = loader.load_manifest(args.project) manifest_ctx = loader.ctx_gen.get_context(manifest.name) From 6cb9f699c4188bd76f2a73a383b6c0901d7c88f5 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 30 Jul 2021 15:41:59 -0700 Subject: [PATCH 0409/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/bde223480fd9d99e65f11fdc42cdcb8d5323cb9b https://github.com/facebook/fbthrift/commit/df133aeae03af60f23e0a9eaa1bbe9bdf69947ba https://github.com/facebook/fbzmq/commit/1e77b54fdb47f7ef893ce7d2bd4630fb74d765ee https://github.com/facebook/folly/commit/9781d415b4dbd5b69726330d3299c755c491267c https://github.com/facebook/proxygen/commit/b3f89425eb7db30594a8c022dfc444f173937520 https://github.com/facebook/wangle/commit/799597175e2880da1a22675cdfd85f9a39d62cc5 https://github.com/facebook/watchman/commit/d31088ca433ffe664911d4e2ee5c927576b1dda5 https://github.com/facebookexperimental/rust-shed/commit/853250eb0b7f97d07d74c865faf9d3574ee382cf https://github.com/facebookincubator/fizz/commit/274f95c008d00a8c593e6ac0e525491bcbe52821 https://github.com/facebookincubator/katran/commit/3cae8f4277f6d59c517a2fcdd5717f8152c36565 https://github.com/facebookincubator/mvfst/commit/67fe3b847c20f3a4575def9f5ed8b20098c4a023 https://github.com/rsocket/rsocket-cpp/commit/42591ff3a75c5e4a02084d399a0475aa67a90546 Reviewed By: yns88 fbshipit-source-id: 55a27d3bee79c92b31fe66060d6f630a69b4b54d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5afecbfc59ec..e86d255e63ae 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5aaf9f7bc908336f3a471cb6c1d27389cc9465ae +Subproject commit df133aeae03af60f23e0a9eaa1bbe9bdf69947ba diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a0b8e41e7d55..bb6285694f3a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0d35ac1da98f13af0b498feaf14dc548c3efa216 +Subproject commit 9781d415b4dbd5b69726330d3299c755c491267c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4c40bea23464..a41aa5769c56 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 150df865cb04e2085c609ed853c32ab33a40984e +Subproject commit 799597175e2880da1a22675cdfd85f9a39d62cc5 From 0bf5de465990aea624e158a350b41049a037ea45 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 30 Jul 2021 16:05:36 -0700 Subject: [PATCH 0410/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/e1217fddf45978e0c49345f44aacfef34c554e5a https://github.com/facebook/fbthrift/commit/93f4147fc6b7ba1928fffd239de2799e17f60a28 https://github.com/facebook/fbzmq/commit/a1a84689341305d16084655cc0f1c0cc79176f5e https://github.com/facebook/proxygen/commit/bbd9eb3170630bd4ba859862a3cba3ae38ab741b https://github.com/facebook/wangle/commit/0c4cbcad77124b859b7f560debb14222d9f2c59a https://github.com/facebook/watchman/commit/6cb9f699c4188bd76f2a73a383b6c0901d7c88f5 https://github.com/facebookexperimental/rust-shed/commit/1f13451da509f43361ebcb9db4a51894e0fb5d9b https://github.com/facebookincubator/fizz/commit/78d3fa067e31fbb37ad0023e2f5f72d6302bbeb8 https://github.com/facebookincubator/katran/commit/9e0a599bbea103b512aca5e02f462760fd29c5b4 https://github.com/facebookincubator/mvfst/commit/acf94a9c2e3515289b1afe004c5e415349425b23 https://github.com/rsocket/rsocket-cpp/commit/432c688278c3ef87c66a4ae719c83f6c1b2ad0c1 Reviewed By: yns88 fbshipit-source-id: 963957c0052286e119823bff4982ddd09c1c4f23 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e86d255e63ae..a997c8a8075b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit df133aeae03af60f23e0a9eaa1bbe9bdf69947ba +Subproject commit 93f4147fc6b7ba1928fffd239de2799e17f60a28 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a41aa5769c56..9223c074c263 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 799597175e2880da1a22675cdfd85f9a39d62cc5 +Subproject commit 0c4cbcad77124b859b7f560debb14222d9f2c59a From ce95b3db53d17ad9604489b67224563d897aa49d Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 30 Jul 2021 16:36:36 -0700 Subject: [PATCH 0411/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/3854f6ec4b407070e3f653ef8bfd866fcad115be https://github.com/facebook/fbthrift/commit/12300dcdd8f3b16bdfa0a3fff440f61eadd6a202 https://github.com/facebook/fbzmq/commit/14d72877766db8219689c2838ed3dc1555c461e0 https://github.com/facebook/proxygen/commit/6b7f21585d65f5f5854e6bfc6909fafb6bbb71ef https://github.com/facebook/wangle/commit/4d20b0dbf8b08ac8ab5ab9d9484e88841435c970 https://github.com/facebook/watchman/commit/0bf5de465990aea624e158a350b41049a037ea45 https://github.com/facebookexperimental/rust-shed/commit/0ca72bd805a0140379342b5e90fbef4d7cc6b829 https://github.com/facebookincubator/katran/commit/93858cd97c4e753c0ca9bac582c1b6711f031997 https://github.com/facebookincubator/mvfst/commit/11a26f33b6b0b690573549452557cfa8e3e2d342 Reviewed By: yns88 fbshipit-source-id: 26a843d75276740cc481547fe453188dab79d940 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a997c8a8075b..1a58167d5a44 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 93f4147fc6b7ba1928fffd239de2799e17f60a28 +Subproject commit 12300dcdd8f3b16bdfa0a3fff440f61eadd6a202 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9223c074c263..1acb728b7dda 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0c4cbcad77124b859b7f560debb14222d9f2c59a +Subproject commit 4d20b0dbf8b08ac8ab5ab9d9484e88841435c970 From e8277f094516b78be6bf958b946bad97ffa10b9a Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 30 Jul 2021 17:10:59 -0700 Subject: [PATCH 0412/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/b9e0429b789cb6f8c372aa0e5e023b96896d2618 https://github.com/facebook/fbthrift/commit/180084fae8ecb52ceeb2dafb06d888e382868920 https://github.com/facebook/fbzmq/commit/48a883d94e2045f6a12fc7710f6aabf6b75f30be https://github.com/facebook/litho/commit/722c770f83b7cf147b7815ca74f3e6c737aa6021 https://github.com/facebook/proxygen/commit/c93d411817355b6f6338b12855bf8f52f4d67924 https://github.com/facebook/watchman/commit/ce95b3db53d17ad9604489b67224563d897aa49d https://github.com/facebookexperimental/rust-shed/commit/25b89fbe21056100d919498812e032e407d7b0e5 https://github.com/pytorch/fbgemm/commit/3798fbec493d1aff0d54d70b8daf3dde151892aa Reviewed By: yns88 fbshipit-source-id: 2ea1a89008182901694a2c29a145ff11040e2beb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1a58167d5a44..a572569be4de 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 12300dcdd8f3b16bdfa0a3fff440f61eadd6a202 +Subproject commit 180084fae8ecb52ceeb2dafb06d888e382868920 From faa6abc0ddf6895a5322b132acc5006a340d3932 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 30 Jul 2021 19:35:55 -0700 Subject: [PATCH 0413/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/331e3a2c6fd4c8df6cb80a1f497e421b780d7115 https://github.com/facebook/fbzmq/commit/9d18fdf5e40aa854a6ed65b70364613bda8fcb6b https://github.com/facebook/folly/commit/d0edf4c66c005ee15ecaaf31ae91b118433156a1 https://github.com/facebook/litho/commit/75986258a7c6acf8a30ebd02dc206aa1abe47d91 https://github.com/facebook/mcrouter/commit/8fbbe53dd2c9d175236dbf8abb7c0f049522afc9 https://github.com/facebook/squangle/commit/674bfe48d04fc2e9deb0f2502024cc4655ef8d61 https://github.com/facebook/watchman/commit/e8277f094516b78be6bf958b946bad97ffa10b9a https://github.com/facebookexperimental/rust-shed/commit/150cba7e0718c7244be110fe66950b50eb9a4d9f https://github.com/facebookexternal/stl_tasks/commit/71d9f2866ab9eececf893cba5bda112429ced779 https://github.com/facebookincubator/profilo/commit/37643c16d0d8cbf7b93f5fb5a1e66b46d6988ee0 Reviewed By: yns88 fbshipit-source-id: 9fb378602bed304212d18657cd09aed45470a24f --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index bb6285694f3a..80e474ba50fe 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9781d415b4dbd5b69726330d3299c755c491267c +Subproject commit d0edf4c66c005ee15ecaaf31ae91b118433156a1 From efb0cdd1e76794cb27db4293dbecba98f4d7ff97 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 30 Jul 2021 20:10:40 -0700 Subject: [PATCH 0414/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/fab2a2fbb9605593d5e9e5e300498f460967d993 https://github.com/facebook/fbthrift/commit/b419ddb82968981562d2e29bcef040e5c256650e https://github.com/facebook/fbzmq/commit/d69a4665bf5e09729dc6ae0273759260253b14ec https://github.com/facebook/proxygen/commit/89368f159365016030781a6877f19d877510f982 https://github.com/facebook/wangle/commit/8213aafd3e6a37f93b6b5e9b75efce6ebb3ad180 https://github.com/facebook/watchman/commit/faa6abc0ddf6895a5322b132acc5006a340d3932 https://github.com/facebookincubator/fizz/commit/781ecb2d3814d0dc2a61383d2a52ed12ae37e4ff https://github.com/facebookincubator/katran/commit/53ffa99cb295bad57f5c267491fcc4aa05aa5131 https://github.com/facebookincubator/mvfst/commit/6184899bc09ad6f620cdcb2c6cedff11ad980f32 https://github.com/rsocket/rsocket-cpp/commit/2a4aa367442cc68dfcb2154f91554ef2a2f1b800 Reviewed By: yns88 fbshipit-source-id: ddd66ed86f62e28a8e0b0e715740f0065d4fa755 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a572569be4de..e4408d2e8519 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 180084fae8ecb52ceeb2dafb06d888e382868920 +Subproject commit b419ddb82968981562d2e29bcef040e5c256650e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1acb728b7dda..d852ab5b4434 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 4d20b0dbf8b08ac8ab5ab9d9484e88841435c970 +Subproject commit 8213aafd3e6a37f93b6b5e9b75efce6ebb3ad180 From b04c8cc584a1f48485b6094f742881221cee4bbf Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 30 Jul 2021 20:46:08 -0700 Subject: [PATCH 0415/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/5bae12c5c6639e55b558c4f0456db4c3f156ba2c https://github.com/facebook/fbthrift/commit/e3ed7f3c6b6db5890250b6675b4591787d1688eb https://github.com/facebook/fbzmq/commit/a97dcdf973767fdc3c11060ef8999a3670111668 https://github.com/facebook/proxygen/commit/b6682ada9506df24fc45c51336167ca8ab7aa899 https://github.com/facebook/wangle/commit/8428db29e16318e4ceedd05e42d1d3c6ff9b3239 https://github.com/facebook/watchman/commit/efb0cdd1e76794cb27db4293dbecba98f4d7ff97 https://github.com/facebookexperimental/rust-shed/commit/f7404b8796d9dbc8b46d4e37951427bcd7143076 https://github.com/facebookincubator/katran/commit/e609991edafd54d8f4e9ec32259ee8263b1ac015 https://github.com/facebookincubator/mvfst/commit/fd6757b6b8b470e165588c4beba5defb65b63676 Reviewed By: yns88 fbshipit-source-id: e4ece7ab395e55c67b214c8f177064d50404f016 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e4408d2e8519..65a74acd4c5e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b419ddb82968981562d2e29bcef040e5c256650e +Subproject commit e3ed7f3c6b6db5890250b6675b4591787d1688eb diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d852ab5b4434..27ffce86570d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8213aafd3e6a37f93b6b5e9b75efce6ebb3ad180 +Subproject commit 8428db29e16318e4ceedd05e42d1d3c6ff9b3239 From 5028eab7fdccb1b8c7c4b3028cd98eb4350f0f76 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Fri, 30 Jul 2021 21:12:15 -0700 Subject: [PATCH 0416/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/b8c82252a176d92591ba46624df3f053d4449c4a https://github.com/facebook/fbthrift/commit/1e86ef465838d024b78fb9e37c141f456903666d https://github.com/facebook/fbzmq/commit/eb7e1338a2550d55ca946bdd62ea652d7821483a https://github.com/facebook/proxygen/commit/249076a9fa9056bfbdd9202be51dc0c44f0650e9 https://github.com/facebook/watchman/commit/b04c8cc584a1f48485b6094f742881221cee4bbf https://github.com/facebookexperimental/rust-shed/commit/eedc5ffe38415187d4db276fb22b71d4ae7f0cbb Reviewed By: yns88 fbshipit-source-id: 0a745f8acf54a468eac74088fdb155da6a4670f8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 65a74acd4c5e..b016c109d648 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e3ed7f3c6b6db5890250b6675b4591787d1688eb +Subproject commit 1e86ef465838d024b78fb9e37c141f456903666d From 6fce8d0106aa6d1f13601bca313a51f677249ab1 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Sun, 1 Aug 2021 17:48:38 -0700 Subject: [PATCH 0417/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/acdb26d9938f6d93f1ff9059144751ee41581262 Reviewed By: yns88 fbshipit-source-id: d40072ce3fde2be229b0bbcd86fd6c458b8b1a31 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b016c109d648..f0faf1bdbfa3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1e86ef465838d024b78fb9e37c141f456903666d +Subproject commit acdb26d9938f6d93f1ff9059144751ee41581262 From 5e97694a77c797fd26c2364b68dd6dc917a89732 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Sun, 1 Aug 2021 19:16:59 -0700 Subject: [PATCH 0418/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/f4c8e8337b2d92e5ef216c701066aded117c34d7 Reviewed By: yns88 fbshipit-source-id: 1b6ed0aaecdce42e894c57a760b6e119ef4d72c8 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 80e474ba50fe..7ce41ad5c63c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d0edf4c66c005ee15ecaaf31ae91b118433156a1 +Subproject commit f4c8e8337b2d92e5ef216c701066aded117c34d7 From 4b9f4b568d55632c6e49f8e9355dc916d8018b63 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Sun, 1 Aug 2021 19:57:54 -0700 Subject: [PATCH 0419/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/555123f049c62741c38e62764674403fb7cbf282 https://github.com/facebook/fbthrift/commit/9c9ef24754589e94a4a104528644e34ae20bcb77 https://github.com/facebook/fbzmq/commit/1773015d57750b477b2d1bd0f3d1fbf17996f1c0 https://github.com/facebook/proxygen/commit/cdae8de384b245b0afd4ae0dd45fb800b94e7b54 https://github.com/facebook/wangle/commit/95a8ed0191830ab3d14ce50857766e044aea9f6b https://github.com/facebook/watchman/commit/5e97694a77c797fd26c2364b68dd6dc917a89732 https://github.com/facebookincubator/fizz/commit/d3a721b7441970c158b532f0919dad602aa7cd7a https://github.com/facebookincubator/katran/commit/e3c88f51f89cd641f0c516aae39fb586a6a6ed32 https://github.com/facebookincubator/mvfst/commit/e747f76f5984f781e70ee6d5891b3a74c3c9f324 https://github.com/rsocket/rsocket-cpp/commit/343023fbf0776c0bb83b6fbb7707249a3589103b Reviewed By: yns88 fbshipit-source-id: 9b0f163218fb05cfaceb0daffc4c3699c7e14570 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f0faf1bdbfa3..c94e0642bf5c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit acdb26d9938f6d93f1ff9059144751ee41581262 +Subproject commit 9c9ef24754589e94a4a104528644e34ae20bcb77 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 27ffce86570d..113aa9e86487 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8428db29e16318e4ceedd05e42d1d3c6ff9b3239 +Subproject commit 95a8ed0191830ab3d14ce50857766e044aea9f6b From 04a2b1e2ff2d8ece8b732b1d0dd40789dd7fbe7b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Sun, 1 Aug 2021 20:28:39 -0700 Subject: [PATCH 0420/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/5bd50a28ee10862e44e44cb1e799fb453e7307ab https://github.com/facebook/fbthrift/commit/b899d538753436ca64e8f3fb49397c97123d655a https://github.com/facebook/fbzmq/commit/1b178291a56ac0e6210c89f92cfd83649e2dcd0c https://github.com/facebook/proxygen/commit/3b611ffceb4e0a8f2dde16ead6c65e8c8f789918 https://github.com/facebook/wangle/commit/ea083d97f787401e230b377fd3bb14c5f07b9918 https://github.com/facebook/watchman/commit/4b9f4b568d55632c6e49f8e9355dc916d8018b63 https://github.com/facebookexperimental/rust-shed/commit/81ba7e88773d4e3d06d895e1ae3a5455ca90789a https://github.com/facebookincubator/katran/commit/c643e630e3c094323491b731d54062bf8dfd5377 https://github.com/facebookincubator/mvfst/commit/2ddfae961127185b55270e2130b54aae39063121 Reviewed By: yns88 fbshipit-source-id: f07a06624a8c8b7c9fb47ac645ff53a79f6bdb23 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c94e0642bf5c..6ddb3aeb5e57 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9c9ef24754589e94a4a104528644e34ae20bcb77 +Subproject commit b899d538753436ca64e8f3fb49397c97123d655a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 113aa9e86487..aac24571c0ee 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 95a8ed0191830ab3d14ce50857766e044aea9f6b +Subproject commit ea083d97f787401e230b377fd3bb14c5f07b9918 From 5451f6f54f85c293c15ca128db9a3182ef41b9d8 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Sun, 1 Aug 2021 21:03:52 -0700 Subject: [PATCH 0421/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/0a853849a5ec5edd7db7357cd43590ee2261b368 https://github.com/facebook/fbthrift/commit/a34f164969f76a1fbb0a8546a9e5d0abd54d2059 https://github.com/facebook/fbzmq/commit/83590cbe2068f41dfe5015450d7c47b8de534011 https://github.com/facebook/proxygen/commit/686d858d2fb90767e48bb9c6688ed9fb286d21a0 https://github.com/facebook/watchman/commit/04a2b1e2ff2d8ece8b732b1d0dd40789dd7fbe7b https://github.com/facebookexperimental/rust-shed/commit/7d38c5c30706593ed449cd1a98c10c2140dac9e6 Reviewed By: yns88 fbshipit-source-id: a7ecaf1f56fb571739324d7765e154694c1f6f3f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6ddb3aeb5e57..b4f2fa52d734 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b899d538753436ca64e8f3fb49397c97123d655a +Subproject commit a34f164969f76a1fbb0a8546a9e5d0abd54d2059 From 15c3bdc4679ed2361e7adc6c5f8bf92a549df2c8 Mon Sep 17 00:00:00 2001 From: Jan Mazur Date: Mon, 2 Aug 2021 05:54:39 -0700 Subject: [PATCH 0422/7387] adding copyright header Summary: as in the title Reviewed By: Croohand Differential Revision: D30041822 fbshipit-source-id: 923158fcba241f5cd2ace8f87fa12083fd22356c --- build/fbcode_builder/CMake/RustStaticLibrary.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/fbcode_builder/CMake/RustStaticLibrary.cmake b/build/fbcode_builder/CMake/RustStaticLibrary.cmake index ff78712675ff..8546fe2fbb12 100644 --- a/build/fbcode_builder/CMake/RustStaticLibrary.cmake +++ b/build/fbcode_builder/CMake/RustStaticLibrary.cmake @@ -1,3 +1,5 @@ +# Copyright (c) Facebook, Inc. and its affiliates. + include(FBCMakeParseArgs) set( @@ -286,4 +288,4 @@ function(install_rust_static_library TARGET) RENAME ${staticlib_output_name} DESTINATION ${ARG_INSTALL_DIR} ) -endfunction() \ No newline at end of file +endfunction() From 1d16da3e5f35162cbb36ef81f9d0482117e47169 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 2 Aug 2021 07:01:38 -0700 Subject: [PATCH 0423/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/a66a35a47ecffd00880c3ab4b3c8b81460aac0be https://github.com/facebook/fbthrift/commit/460e85a5451a08d2a4190da3f853492971622394 https://github.com/facebook/fbzmq/commit/0a5cc34bbe48e8199e9d674a5d50e576d29f8324 https://github.com/facebook/folly/commit/3e84bbd64b60d4a379fdd3de20d1538f836e371a https://github.com/facebook/proxygen/commit/686c12b037a66e91a46461aef0dfbb7a5420c7ed https://github.com/facebook/wangle/commit/856b78f82fed25c2ac3efaf4a7753727fc86a810 https://github.com/facebook/watchman/commit/15c3bdc4679ed2361e7adc6c5f8bf92a549df2c8 https://github.com/facebookexperimental/rust-shed/commit/c39fade100f60c68b093ff5145fd620fcaa90476 https://github.com/facebookincubator/fizz/commit/35c58f76c9281eb21936edc92c5732103a5e058b https://github.com/facebookincubator/katran/commit/4f14225358efac0748e4cc471742f6941abeb85c https://github.com/facebookincubator/mvfst/commit/cacc473b28915490eba8becf41eabed450b0d0aa https://github.com/rsocket/rsocket-cpp/commit/205c74b7088744280ab51d11a451632c0ffa48c6 Reviewed By: yns88 fbshipit-source-id: 79776a15326eb4c4c82b5b4f178e24a392757e12 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b4f2fa52d734..e52c011a43a2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a34f164969f76a1fbb0a8546a9e5d0abd54d2059 +Subproject commit 460e85a5451a08d2a4190da3f853492971622394 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7ce41ad5c63c..921627f5f490 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f4c8e8337b2d92e5ef216c701066aded117c34d7 +Subproject commit 3e84bbd64b60d4a379fdd3de20d1538f836e371a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index aac24571c0ee..52f1655f9e5e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ea083d97f787401e230b377fd3bb14c5f07b9918 +Subproject commit 856b78f82fed25c2ac3efaf4a7753727fc86a810 From 0b9710032e7887d12dde1a9f3218a69ac38eb0dc Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 2 Aug 2021 07:24:57 -0700 Subject: [PATCH 0424/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ae3259ba52740defedd84758030a9e1aa4bbf4ea https://github.com/facebook/fbthrift/commit/26906a2d4c78a712d02f53c33b233a6371e390f7 https://github.com/facebook/fbzmq/commit/4e034f6ab4c4b8b0fa765ef46288e7347eb8ff92 https://github.com/facebook/proxygen/commit/7aaf27526572421244f7744c536d078adb520056 https://github.com/facebook/wangle/commit/e562c83489691e4ed546905e324fc970d172050c https://github.com/facebook/watchman/commit/1d16da3e5f35162cbb36ef81f9d0482117e47169 https://github.com/facebookexperimental/rust-shed/commit/c33cb029d1786e454310113a9f5a9a65f6d4d0c9 https://github.com/facebookincubator/fizz/commit/26d075332e022f7cd7def7e372abfb1fb812ba59 https://github.com/facebookincubator/katran/commit/3ebdddf3177baaece2333b01e22c74fcb413c5e0 https://github.com/facebookincubator/mvfst/commit/d5dbedc5ca528a36764dbb9f3481e297e1d45aab https://github.com/rsocket/rsocket-cpp/commit/ed316b3b730bb48f35ecec54d964db5d11e28c56 Reviewed By: yns88 fbshipit-source-id: c468e762a9d561aaf251ef096f8ba1c36253724f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e52c011a43a2..d3e436538117 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 460e85a5451a08d2a4190da3f853492971622394 +Subproject commit 26906a2d4c78a712d02f53c33b233a6371e390f7 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 52f1655f9e5e..34f43060be76 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 856b78f82fed25c2ac3efaf4a7753727fc86a810 +Subproject commit e562c83489691e4ed546905e324fc970d172050c From 7f024715a0a379297aba747f84fe1a66a0f11aba Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 2 Aug 2021 07:41:47 -0700 Subject: [PATCH 0425/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/9148e4420840e8b9188b73b19db7ddc31fa8bb95 https://github.com/facebook/fbthrift/commit/4c390e4c77d140c1ccce4314c19b0ef044cbfe79 https://github.com/facebook/fbzmq/commit/b866894c249034493df263966c4e1bec144d8d32 https://github.com/facebook/proxygen/commit/44ac259603aa65abde956d62c1ff5598ff1a4cc2 https://github.com/facebook/wangle/commit/16b8ee4046365ed6e933976896b9b1d0afbc01fd https://github.com/facebook/watchman/commit/0b9710032e7887d12dde1a9f3218a69ac38eb0dc https://github.com/facebookexperimental/rust-shed/commit/ee417db656ec1c000944de0fc6114c9fc061e927 https://github.com/facebookincubator/katran/commit/9e430758ffef37cbb7ba8d6b5daf775846f44e84 https://github.com/facebookincubator/mvfst/commit/a758b9f5d3ff23f2090a873cc23ac46aa0ca0cc2 Reviewed By: yns88 fbshipit-source-id: e7bf8925e68288296e0e129364a4dcbfa4bc7e87 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d3e436538117..b18cdae2d293 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 26906a2d4c78a712d02f53c33b233a6371e390f7 +Subproject commit 4c390e4c77d140c1ccce4314c19b0ef044cbfe79 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 34f43060be76..3169d956696a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e562c83489691e4ed546905e324fc970d172050c +Subproject commit 16b8ee4046365ed6e933976896b9b1d0afbc01fd From 61f901a77c63d70dc3817abae2c23c3fa1622fe1 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 2 Aug 2021 08:02:11 -0700 Subject: [PATCH 0426/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/f00c3877b227616e0609f93e3ad0ee2da69ccd7f https://github.com/facebook/fbthrift/commit/9791fa9062e0234bb9cf29a827961afb8082a8aa https://github.com/facebook/fbzmq/commit/d65540530f805157ea50f6fa5f3599e9c381ed43 https://github.com/facebook/proxygen/commit/4371c6672840e14ec0f8266c4c800ce2ff5cb46d https://github.com/facebook/watchman/commit/7f024715a0a379297aba747f84fe1a66a0f11aba https://github.com/facebookexperimental/rust-shed/commit/49e583120087d08c100b95e85593e7dabd566d97 Reviewed By: yns88 fbshipit-source-id: 20c786fd53cabd94e452122ed1c49e685e0ad31a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b18cdae2d293..f0f25df5132d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4c390e4c77d140c1ccce4314c19b0ef044cbfe79 +Subproject commit 9791fa9062e0234bb9cf29a827961afb8082a8aa From 9d52da098a7e514f26e33b0d1d7730c210e2c77d Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 2 Aug 2021 10:45:21 -0700 Subject: [PATCH 0427/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/451819f6cb921f3ad2d69dbbf75afacfe74a3f49 https://github.com/facebook/litho/commit/acf6713a7d066af4d041ecab58ee7f2172cbf1e5 Reviewed By: jurajh-fb fbshipit-source-id: 8522408d00bdd1fc70ddda9578759177edbfa3fd --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 921627f5f490..0ef81eb9a7e4 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 3e84bbd64b60d4a379fdd3de20d1538f836e371a +Subproject commit 451819f6cb921f3ad2d69dbbf75afacfe74a3f49 From 2b312742a46f8b0f89b4d1f1be685e10a789d68b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 2 Aug 2021 11:14:51 -0700 Subject: [PATCH 0428/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/d0a8c9da1957147d259b7f9d4ac147b70819127f https://github.com/facebook/fbthrift/commit/07bac10e98185a58f3bb5d020708b493a9219153 https://github.com/facebook/fbzmq/commit/22e1769d5aaa7163de163a337a1a513dc640087f https://github.com/facebook/litho/commit/a109e455869c60b8c7916ae1b132cd65e7b6e09e https://github.com/facebook/proxygen/commit/c2d663223ba549a176151b1d0a70948e8fe28aaf https://github.com/facebook/wangle/commit/c5e22369eed8e316190e7361a1cda8f34047a642 https://github.com/facebook/watchman/commit/9d52da098a7e514f26e33b0d1d7730c210e2c77d https://github.com/facebookexternal/stl_tasks/commit/136aeea202dd93761bd03f4242c9da4725e1a3c3 https://github.com/facebookincubator/fizz/commit/e25ae7bfa69e1a4b7445eebcd7e54857c00e935f https://github.com/facebookincubator/katran/commit/6d4549e5ab1627a8c02b104fce34bccf3b553059 https://github.com/facebookincubator/mvfst/commit/0d83cba0ac36d9f8e810d182d976c1308c3b9fb3 https://github.com/rsocket/rsocket-cpp/commit/952124fa965bb5bf82e32fc3ced866d6ce38367d Reviewed By: jurajh-fb fbshipit-source-id: d6210a027085e736c4e038767dd32abaec83398c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f0f25df5132d..d84fc865a115 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9791fa9062e0234bb9cf29a827961afb8082a8aa +Subproject commit 07bac10e98185a58f3bb5d020708b493a9219153 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3169d956696a..81933978180a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 16b8ee4046365ed6e933976896b9b1d0afbc01fd +Subproject commit c5e22369eed8e316190e7361a1cda8f34047a642 From 5ae0014b439d5bb8a76fcf7a3284a519adcd53ad Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 2 Aug 2021 11:51:02 -0700 Subject: [PATCH 0429/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/781a01c47e141e623c78dc0d871dc6c1570990f2 https://github.com/facebook/fbthrift/commit/8b7919f36d75b714bd858d6e4384012b93590375 https://github.com/facebook/fbzmq/commit/a5814b31f86c34b5abe5bb8d7d09843faa2e4cba https://github.com/facebook/proxygen/commit/c677587ec9a5782f64806088ca75f739ea2dedad https://github.com/facebook/wangle/commit/63a65a4608dd42c952316d3f570a4f3dfa2eb7d7 https://github.com/facebook/watchman/commit/2b312742a46f8b0f89b4d1f1be685e10a789d68b https://github.com/facebookexperimental/rust-shed/commit/9607ee4564b5291f4fefa6e791f473aa3a23a362 https://github.com/facebookincubator/katran/commit/8eac7d6af229bfaea04753937dbedcb36a2e268f https://github.com/facebookincubator/mvfst/commit/6bff7c000854bb86c2a6b50c64c093d8c6fb3f60 Reviewed By: jurajh-fb fbshipit-source-id: 554c6b0959eb7d1306928a2b5f5be307d1759745 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d84fc865a115..9af31fe0b488 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 07bac10e98185a58f3bb5d020708b493a9219153 +Subproject commit 8b7919f36d75b714bd858d6e4384012b93590375 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 81933978180a..b5ef213df971 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c5e22369eed8e316190e7361a1cda8f34047a642 +Subproject commit 63a65a4608dd42c952316d3f570a4f3dfa2eb7d7 From c0df070ca343ea76c49265541c0c9215ad1c38cf Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 2 Aug 2021 12:28:37 -0700 Subject: [PATCH 0430/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/def02124f1993cc6ca7331466214a6fc0fe86146 https://github.com/facebook/fbthrift/commit/daa3c56ea0d2b9eb52528772ffefd510a0ef5b0a https://github.com/facebook/fbzmq/commit/ead68602ace66f95c7ef5604a7face0bfe18c1f4 https://github.com/facebook/proxygen/commit/600a4c3d39bc91f4f63a6e2d2248571a28a884ce https://github.com/facebook/watchman/commit/5ae0014b439d5bb8a76fcf7a3284a519adcd53ad https://github.com/facebookexperimental/rust-shed/commit/50713c76ae5f032d723ce3d413ba3b1cf44b9d2d Reviewed By: jurajh-fb fbshipit-source-id: 32b1971179ef77253c86918d9d2f4e703d96d048 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9af31fe0b488..f9f2183a2afa 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8b7919f36d75b714bd858d6e4384012b93590375 +Subproject commit daa3c56ea0d2b9eb52528772ffefd510a0ef5b0a From 98c055725bfb73a1e43d064d2ab568a895f9d7d0 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 2 Aug 2021 12:52:15 -0700 Subject: [PATCH 0431/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/e1082d128f865532194d6b8793c21636fd33e9a2 https://github.com/facebook/fbthrift/commit/697de69fdc45641aa92dc0a4bc2b424c2312e5f1 https://github.com/facebook/fbzmq/commit/a32fea7099bf841da1d1f215bdfcf6aa63a73780 https://github.com/facebook/watchman/commit/c0df070ca343ea76c49265541c0c9215ad1c38cf https://github.com/facebookexperimental/rust-shed/commit/565a076c99f8db949a80e34d6b814b8a855ea69b Reviewed By: jurajh-fb fbshipit-source-id: 35bd16b5e70d577d912b1bd0914bf960f3de4978 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f9f2183a2afa..d29caf1d9098 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit daa3c56ea0d2b9eb52528772ffefd510a0ef5b0a +Subproject commit 697de69fdc45641aa92dc0a4bc2b424c2312e5f1 From 3215b16702238ca544432849ba96a30bd09a27bf Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 2 Aug 2021 14:05:17 -0700 Subject: [PATCH 0432/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/dfcd34c389dfe3e2201119a13f8dad95b150d4ed Reviewed By: jurajh-fb fbshipit-source-id: c74b891a3d9567cc7e8d8f6d75c9c350a0911111 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d29caf1d9098..136f4fe046be 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 697de69fdc45641aa92dc0a4bc2b424c2312e5f1 +Subproject commit dfcd34c389dfe3e2201119a13f8dad95b150d4ed From e19c7e1dfde034f4ed176116e8ca95bae7545423 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 2 Aug 2021 16:28:38 -0700 Subject: [PATCH 0433/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/a7ea4c15aa0a96013d377a8ccd21c488324e9b4f Reviewed By: jurajh-fb fbshipit-source-id: d8eb0d46d9880f1a5d6554da0f283b5720f4fc36 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 136f4fe046be..d819d2e01454 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit dfcd34c389dfe3e2201119a13f8dad95b150d4ed +Subproject commit a7ea4c15aa0a96013d377a8ccd21c488324e9b4f From 29b27b0b2fab0d3e623777bb9d72777f4685b7c1 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 2 Aug 2021 19:55:42 -0700 Subject: [PATCH 0434/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/d5d0fa3f72ee0eb4c7b955e9e04a25052678d740 https://github.com/facebook/proxygen/commit/a71963c48225575bff3901c765bcbf2b488eeec3 Reviewed By: jurajh-fb fbshipit-source-id: eb81aea4f5fa9b2a4a01098cdb1c9e8336730c29 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d819d2e01454..123f3ca699ce 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a7ea4c15aa0a96013d377a8ccd21c488324e9b4f +Subproject commit d5d0fa3f72ee0eb4c7b955e9e04a25052678d740 From 8db54580d16c0a64e3bb029323329af39fff6fe0 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 2 Aug 2021 20:57:47 -0700 Subject: [PATCH 0435/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8ac5011ac37a5056b2c7c6441a504be0d24d4bad https://github.com/facebook/rocksdb/commit/b2781522613ab59dee3324abe9fe7a9ead9b77f0 Reviewed By: jurajh-fb fbshipit-source-id: b3163bf343a3c9b9c5d7ccf03bbfdce6400e9ade --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 123f3ca699ce..896fe865fa85 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d5d0fa3f72ee0eb4c7b955e9e04a25052678d740 +Subproject commit 8ac5011ac37a5056b2c7c6441a504be0d24d4bad From 4d8704f01f77f8cbdebfe912855705fcf5f4b169 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 2 Aug 2021 22:16:53 -0700 Subject: [PATCH 0436/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5120d06ada86ffedfc85935575843d6fc04bb26d Reviewed By: jurajh-fb fbshipit-source-id: ce2e9d887adaae22bb3d83ee698391fe85d32e5b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 896fe865fa85..5fe2b9475c42 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8ac5011ac37a5056b2c7c6441a504be0d24d4bad +Subproject commit 5120d06ada86ffedfc85935575843d6fc04bb26d From 22cbfd890571ed2910a15eda56f7982114f8b379 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 3 Aug 2021 09:13:30 -0700 Subject: [PATCH 0437/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8781dc1feac7bc79239bc0481023d5838bb4b567 https://github.com/facebook/litho/commit/9883bd08a7d15374944f9eaae9a217a28a96af40 https://github.com/facebook/mcrouter/commit/69e45c3422a5c411daac057173cfe561cad21d1d https://github.com/facebookincubator/profilo/commit/9b6c7a148f727faf747837c5e2bb2ed9b92a220a Reviewed By: jurajh-fb fbshipit-source-id: b452fda83552ed24b10c30faf41fa49a5861b9fe --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5fe2b9475c42..f6a99aa03de1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5120d06ada86ffedfc85935575843d6fc04bb26d +Subproject commit 8781dc1feac7bc79239bc0481023d5838bb4b567 From 4ebd9b7d8e740b2732d4750e27dfadfd28058505 Mon Sep 17 00:00:00 2001 From: Peyman Gardideh Date: Tue, 3 Aug 2021 11:44:12 -0700 Subject: [PATCH 0438/7387] Add CLI11 manifest Summary: Adding a oss manifest for CLI11 to fetch from github Reviewed By: shri-khare Differential Revision: D29833128 fbshipit-source-id: 39cae08f9a15b87da0fa6e26c7b9e0387a7cec50 --- build/fbcode_builder/manifests/CLI11 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 build/fbcode_builder/manifests/CLI11 diff --git a/build/fbcode_builder/manifests/CLI11 b/build/fbcode_builder/manifests/CLI11 new file mode 100644 index 000000000000..ad161bde1c81 --- /dev/null +++ b/build/fbcode_builder/manifests/CLI11 @@ -0,0 +1,14 @@ +[manifest] +name = CLI11 + +[download] +url = https://github.com/CLIUtils/CLI11/archive/v1.9.0.tar.gz +sha256 = 67640f37ec3be9289039930c987a492badc600645b65057023679f7bb99734e4 + +[build] +builder = cmake +subdir = CLI11-1.9.0 + +[cmake.defines] +CLI11_BUILD_TESTS = OFF +CLI11_BUILD_EXAMPLES = OFF From 15f71b7588ecddd2ca80cf85a2bac890b0a3492d Mon Sep 17 00:00:00 2001 From: Peyman Gardideh Date: Tue, 3 Aug 2021 11:44:12 -0700 Subject: [PATCH 0439/7387] switch to tp2 CLI11 Summary: migrating to tp2 version of CLI11. Will delete our local copy in next diff to keep this smaller Reviewed By: shri-khare Differential Revision: D29808579 fbshipit-source-id: c7b4cf40a64c9e8804f0eb6c749f36fabdbc79e1 --- build/fbcode_builder/manifests/fboss | 1 + 1 file changed, 1 insertion(+) diff --git a/build/fbcode_builder/manifests/fboss b/build/fbcode_builder/manifests/fboss index fbabf0cb8f8b..f29873e72843 100644 --- a/build/fbcode_builder/manifests/fboss +++ b/build/fbcode_builder/manifests/fboss @@ -34,6 +34,7 @@ re2 python yaml-cpp libyaml +CLI11 [shipit.pathmap] fbcode/fboss/github = . From fc78d67c7da0ca164c22764e89db2ce9338c4a75 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 3 Aug 2021 12:16:17 -0700 Subject: [PATCH 0440/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/12409386a3e0caf801c0be00482da06e7e2b5ade https://github.com/facebook/fbthrift/commit/dda8f8da1f6829c9f0eb5194f1cb512e4d765b6b https://github.com/facebook/fbzmq/commit/b973fbfbbcbe49d6cff671320da3db2a91dd3ff3 https://github.com/facebook/folly/commit/c9875b79822cccdfe5790e1fe6ab06a2e464d977 https://github.com/facebook/litho/commit/cdac0934af9122b489dc2a9b4d537d9d68432db7 https://github.com/facebook/proxygen/commit/4875765c2a640ecce560ff6762ca6db18f60d40e https://github.com/facebook/wangle/commit/c425ec284783c3508cc289fe50ab578b02e227d3 https://github.com/facebook/watchman/commit/15f71b7588ecddd2ca80cf85a2bac890b0a3492d https://github.com/facebookexperimental/rust-shed/commit/10f1d28f0fbcd10529656ee8507d2565a89cc301 https://github.com/facebookincubator/fizz/commit/64ec8c401275d23a1f6262efdf558a7474bf15df https://github.com/facebookincubator/katran/commit/f28816ce0391a0dc253c8cd999116c94134e0faa https://github.com/facebookincubator/mvfst/commit/c110c247f791b2c7c46e36b7972de7d44410eac3 https://github.com/rsocket/rsocket-cpp/commit/94742628073110f5e65969855afec7b2b6ca769b Reviewed By: jurajh-fb fbshipit-source-id: 12fe4de5590864c363f018e09de9a83ba20c1bd2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f6a99aa03de1..cd2ebba8e40e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8781dc1feac7bc79239bc0481023d5838bb4b567 +Subproject commit dda8f8da1f6829c9f0eb5194f1cb512e4d765b6b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0ef81eb9a7e4..493d960d0bb6 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 451819f6cb921f3ad2d69dbbf75afacfe74a3f49 +Subproject commit c9875b79822cccdfe5790e1fe6ab06a2e464d977 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b5ef213df971..6339219ab5bb 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 63a65a4608dd42c952316d3f570a4f3dfa2eb7d7 +Subproject commit c425ec284783c3508cc289fe50ab578b02e227d3 From f4d5f1525934f7a47804d84c43c6f4c25c788e1b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 3 Aug 2021 12:34:13 -0700 Subject: [PATCH 0441/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/5b17aebc8e39f65c0f1272a977e1e340f153e75b https://github.com/facebook/fbthrift/commit/9fedead3975884c63bda4e7e4236a748a4268d45 https://github.com/facebook/fbzmq/commit/dee79e0942ad8d4c5554856fddddf6730fb97e3f https://github.com/facebook/proxygen/commit/c813cc909a2eb3323d7254e7ef9b5442f3af9d95 https://github.com/facebook/wangle/commit/15489d16be0b178cf0f1366b2b30cf64e211532b https://github.com/facebook/watchman/commit/fc78d67c7da0ca164c22764e89db2ce9338c4a75 https://github.com/facebookexperimental/rust-shed/commit/ca55b571da18650c68a6d0a12e8f4045fafd4e89 https://github.com/facebookincubator/fizz/commit/8cc5a1e3f7b6a8ff5a900dd14bb07a735b04453b https://github.com/facebookincubator/katran/commit/ea663ca205706a95a0a015c2326e5ca720a40854 https://github.com/facebookincubator/mvfst/commit/0a7a4fd7ca6437545d2c9b3f2191e9b90ed7f3db https://github.com/rsocket/rsocket-cpp/commit/96be62f7d294ee7e8137ae631b9c81c39efbb5cc Reviewed By: jurajh-fb fbshipit-source-id: a8cde71f207e314a120ec98543cd18e78ff64d77 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cd2ebba8e40e..eaff3267cfe8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit dda8f8da1f6829c9f0eb5194f1cb512e4d765b6b +Subproject commit 9fedead3975884c63bda4e7e4236a748a4268d45 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6339219ab5bb..61e4a3bfeb81 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c425ec284783c3508cc289fe50ab578b02e227d3 +Subproject commit 15489d16be0b178cf0f1366b2b30cf64e211532b From c32bf5b669d04f3adbc012077cf933905ebc1e72 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 3 Aug 2021 13:35:36 -0700 Subject: [PATCH 0442/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/b85cf37d3ebb7dd0b8398c2aa224d6d5043f0535 https://github.com/facebook/fbthrift/commit/46146e10f68970e81427d29b709d3441736f87dd https://github.com/facebook/fbzmq/commit/a53eb2f5a2a9cc308fc3afde8f20d0731b87443b https://github.com/facebook/proxygen/commit/2d055d6fda05e659be51e75fa72ff0348a6856ac https://github.com/facebook/rocksdb/commit/8b2f60b668cfde8a5845f00648d8b4da3a873164 https://github.com/facebook/wangle/commit/07f45512b29ab9b58b16f82b0ef19bff3668f163 https://github.com/facebook/watchman/commit/f4d5f1525934f7a47804d84c43c6f4c25c788e1b https://github.com/facebookexperimental/rust-shed/commit/0f8190b3aeb07cadabf651d0e3a7d721566b7e23 https://github.com/facebookincubator/katran/commit/85e7a881bf685e79256183e829233981ed41fc3f https://github.com/facebookincubator/mvfst/commit/ae74cd8618b38067361e4042b1548de4a864905d Reviewed By: jurajh-fb fbshipit-source-id: c462d9f92eb366a825e0359e3ec5029950b2658f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index eaff3267cfe8..8bc259206bd5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9fedead3975884c63bda4e7e4236a748a4268d45 +Subproject commit 46146e10f68970e81427d29b709d3441736f87dd diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 61e4a3bfeb81..375fa7aabcc0 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 15489d16be0b178cf0f1366b2b30cf64e211532b +Subproject commit 07f45512b29ab9b58b16f82b0ef19bff3668f163 From 6ad1b8bec6750ab1505ce05f0979494b523da395 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 3 Aug 2021 14:03:30 -0700 Subject: [PATCH 0443/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/3aea85c2284bb51eec264e5b0b595dd3fbd618ed https://github.com/facebook/fbthrift/commit/0e3f5a0dcccd486739f4e09a1ca30ca80229711c https://github.com/facebook/fbzmq/commit/417c18e13cfbb7401435809a81aa9bdd74fdc160 https://github.com/facebook/proxygen/commit/515a06808ac950fb69dab9e71e48a4cd9aa5fbe4 https://github.com/facebook/rocksdb/commit/0879c240404b00142ba4718f36cd3f2bd537192d https://github.com/facebook/watchman/commit/c32bf5b669d04f3adbc012077cf933905ebc1e72 https://github.com/facebookexperimental/rust-shed/commit/83c72d8569d04b893a16abfc7a3c03da629c69ed Reviewed By: jurajh-fb fbshipit-source-id: d4237a5003e8dae00c252872e3ef39212947ea5c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8bc259206bd5..89dad2625379 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 46146e10f68970e81427d29b709d3441736f87dd +Subproject commit 0e3f5a0dcccd486739f4e09a1ca30ca80229711c From 920250ec98284b476e0def8d14530fb2d63c1c1b Mon Sep 17 00:00:00 2001 From: Zhengchao Liu Date: Tue, 3 Aug 2021 14:42:08 -0700 Subject: [PATCH 0444/7387] add command for listing active activity recorder sessions Summary: Currently we have to manually save the id returned from `start_recording`. After this, we can simply ask for the list of all active recorder sessions. Reviewed By: genevievehelsel Differential Revision: D30056117 fbshipit-source-id: 7fd69b70e7b04fcd0b3724f4ee16c5e5e86badaf --- eden/fs/service/eden.thrift | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 696eff531074..0edceea011d6 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -566,6 +566,10 @@ struct ActivityRecorderResult { 2: optional PathString path; } +struct ListActivityRecordingsResult { + 1: list recordings; +} + struct SetLogLevelResult { 1: bool categoryCreated; } @@ -855,7 +859,7 @@ struct GetScmStatusParams { 3: bool listIgnored = false; } - /** +/** * BackingStore object type. Caller will response to verify the type of the content * matching the parameters passed. Exception will be thrown if type mismatch. */ @@ -865,15 +869,15 @@ enum RootType { } struct SetPathRootIdParams { - 1: PathString mountPoint, - 2: PathString path, - 3: BinaryHash rootId, + 1: PathString mountPoint; + 2: PathString path; + 3: BinaryHash rootId; 4: RootType type; 5: CheckoutMode mode; } struct SetPathRootIdResult { - 1: list conflicts + 1: list conflicts; } struct CheckOutRevisionParams { @@ -1268,6 +1272,16 @@ service EdenService extends fb303_core.BaseService { 2: i64 unique, ); + /** + * Get the list of ongoing activity recordings + * + * This will return the list of ActivityRecorderResult structure + * containing the id and output file path. + */ + ListActivityRecordingsResult debugListActivityRecordings( + 1: PathString mountPoint, + ); + /** * Get the InodePathDebugInfo for the inode that corresponds to the given * inode number. This provides the path for the inode and also indicates @@ -1411,8 +1425,7 @@ service EdenService extends fb303_core.BaseService { * If any file or directory name conflict, the behavior is same with Checkout * This method is thread safe. */ - SetPathRootIdResult setPathRootId( - 1: SetPathRootIdParams params, - ) throws (1: EdenError ex); - + SetPathRootIdResult setPathRootId(1: SetPathRootIdParams params) throws ( + 1: EdenError ex, + ); } From c043af152a3893f1b47fec8f0415bb553bee922e Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 3 Aug 2021 14:55:31 -0700 Subject: [PATCH 0445/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/8707a8fac3c0f78b94b0676a5407a121cfa30446 https://github.com/facebook/fbthrift/commit/c3c823c6f8d8b3955cf5b531fb81cb6d9e93da3a https://github.com/facebook/fbzmq/commit/249426c5ea40de6663a01684e639bf12f2c2ccd6 https://github.com/facebook/watchman/commit/6ad1b8bec6750ab1505ce05f0979494b523da395 https://github.com/facebookexperimental/rust-shed/commit/0656f8e6e2a0afc16b8eda545572f8e10b4ccd93 Reviewed By: jurajh-fb fbshipit-source-id: 76938dd842d849fcb3ccc524a171e1948b0cff09 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 89dad2625379..0a43d06741da 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0e3f5a0dcccd486739f4e09a1ca30ca80229711c +Subproject commit c3c823c6f8d8b3955cf5b531fb81cb6d9e93da3a From 333df4e1e7df33383a78e1b8fcfa61bf48c63b40 Mon Sep 17 00:00:00 2001 From: Zhengchao Liu Date: Tue, 3 Aug 2021 15:28:37 -0700 Subject: [PATCH 0446/7387] allow eden stats output subset of stats and in JSON Summary: This adds the options to `eden stats` for collecting only fast stats and printing in JSON. `eden stats` can be slow especially due to collecting fb303 counters and private bytes. An example use case of this new lightweight endpoint is that Buck can poll it to display Eden related info in its cli (see [post](https://fb.workplace.com/groups/132499338763090/permalink/210396380973385/) for context). Reviewed By: xavierd Differential Revision: D29687041 fbshipit-source-id: a663e71231527c5dfb822acbf238af0ac6ce4a00 --- eden/fs/service/eden.thrift | 50 +++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 10 deletions(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 0edceea011d6..1fa90743ae87 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -600,50 +600,73 @@ struct CacheStats { 6: i64 dropCount; } +/* + * Bits that control the stats returned from getStatInfo + */ +const i64 STATS_MOUNTS_STATS = 0x1; +const i64 STATS_COUNTERS = 0x2; +const i64 STATS_SMAPS = 0x4; +const i64 STATS_PRIVATE_BYTES = 0x8; +const i64 STATS_RSS_BYTES = 0x10; +const i64 STATS_CACHE_STATS = 0x20; +const i64 STATS_ALL = 0xFFFF; + /** * Struct to store fb303 counters from ServiceData.getCounters() and inode * information of all the mount points. */ struct InternalStats { - 1: i64 periodicUnloadCount; + /** + * fbf303 counter of inodes unloaded by periodic job. + * Populated if STATS_COUNTERS is set. + */ + 1: optional i64 periodicUnloadCount; /** * counters is the list of fb303 counters, key is the counter name, value is the * counter value. + * Populated if STATS_COUNTERS is set. */ - 2: map counters; + 2: optional map counters; /** * mountPointInfo is a map whose key is the path of the mount point and value * is the details like number of loaded inodes,unloaded inodes in that mount * and number of materialized inodes in that mountpoint. + * Populated if STATS_MOUNTS_STATS is set. */ - 3: map mountPointInfo; + 3: optional map mountPointInfo; /** * Linux-only: the contents of /proc/self/smaps, to be parsed by the caller. + * Populated if STATS_SMAPS is set. */ - 4: binary smaps; + 4: optional binary smaps; /** * Linux-only: privateBytes populated from contents of /proc/self/smaps. * Populated with current value (the fb303 counters value is an average). + * Populated if STATS_PRIVATE_BYTES is set. */ - 5: i64 privateBytes; + 5: optional i64 privateBytes; /** * Linux-only: vmRSS bytes is populated from contents of /proc/self/stats. * Populated with current value (the fb303 counters value is an average). + * Populated if STATS_RSS_BYTES is set. */ - 6: i64 vmRSSBytes; + 6: optional i64 vmRSSBytes; /** * Statistics about the in-memory blob cache. + * Populated if STATS_CACHE_STATS is set. */ - 7: CacheStats blobCacheStats; + 7: optional CacheStats blobCacheStats; /** * mountPointJournalInfo is a map whose key is the path of the mount point * and whose value is information about the journal on that mount + * Populated if STATS_MOUNTS_STATS is set. */ - 8: map mountPointJournalInfo; + 8: optional map mountPointJournalInfo; /** * Statistics about the in-memory tree cache. + * Populated if STATS_CACHE_STATS is set. */ - 9: CacheStats treeCacheStats; + 9: optional CacheStats treeCacheStats; } struct FuseCall { @@ -675,6 +698,11 @@ struct GetConfigParams { 1: eden_config.ConfigReloadBehavior reload = eden_config.ConfigReloadBehavior.AutoReload; } +struct GetStatInfoParams { + // a bitset that indicates the requested stats. 0 indicates all stats are requested. + 1: i64 statsMask; +} + /** * A representation of the system-dependent dirent::d_type field. * The bits and their interpretation is system dependent. @@ -1390,7 +1418,9 @@ service EdenService extends fb303_core.BaseService { /** * Gets the number of inodes unloaded by periodic job on an EdenMount. */ - InternalStats getStatInfo() throws (1: EdenError ex); + InternalStats getStatInfo(1: GetStatInfoParams params) throws ( + 1: EdenError ex, + ); void enableTracing(); void disableTracing(); From 3195d41f688a0eb1e5761de8faa0efbd2e6e6116 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 3 Aug 2021 16:41:39 -0700 Subject: [PATCH 0447/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/c573bb147678127690b995a051e2f072d271887b https://github.com/facebook/rocksdb/commit/08af0ae3f0f3f69e8915f21fdca9659ed97ec847 https://github.com/facebook/watchman/commit/333df4e1e7df33383a78e1b8fcfa61bf48c63b40 https://github.com/facebookexternal/stl_tasks/commit/883aaf478502125554d3c557ce7a30f142e1b403 https://github.com/pytorch/fbgemm/commit/8d508a7726fd621d9cbae584100dbad3cf8bdda3 Reviewed By: jurajh-fb fbshipit-source-id: 38ee27d6721ce8dc22839e8d70b5db22e429bb0b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0a43d06741da..0af03aa6764c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c3c823c6f8d8b3955cf5b531fb81cb6d9e93da3a +Subproject commit c573bb147678127690b995a051e2f072d271887b From 45eef464fe940201871573d5aebd1922b263d667 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 3 Aug 2021 17:22:40 -0700 Subject: [PATCH 0448/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/9f906cfe78a779ddb7aa5f8919a33460248d9b04 https://github.com/facebook/fbthrift/commit/43a6a977a1e512885dd066310e33f286562ff8ef https://github.com/facebook/fbzmq/commit/836a3426a907c332c6e3190376666892aeb81555 https://github.com/facebook/watchman/commit/3195d41f688a0eb1e5761de8faa0efbd2e6e6116 https://github.com/facebookexperimental/rust-shed/commit/2f6b7fb1288e413b53ea83ea47e9c8f191210db9 Reviewed By: jurajh-fb fbshipit-source-id: 0a50938964ee2a4da4ca0b6fe6b91a94ad1eab1a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0af03aa6764c..488a9f5ecdcc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c573bb147678127690b995a051e2f072d271887b +Subproject commit 43a6a977a1e512885dd066310e33f286562ff8ef From 2ce937f2b90b4e6cc713aecf95c617b13b51c6f4 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 3 Aug 2021 18:22:45 -0700 Subject: [PATCH 0449/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7520695d778f620bdcc04b582e63669a84ef4eb0 https://github.com/facebook/folly/commit/d9abea1b5d9537016a03293a1bfa388677f07834 Reviewed By: jurajh-fb fbshipit-source-id: f996cd0431815d959ada3e13ed4f52fb4eebf47d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 488a9f5ecdcc..665d47a4dc3b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 43a6a977a1e512885dd066310e33f286562ff8ef +Subproject commit 7520695d778f620bdcc04b582e63669a84ef4eb0 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 493d960d0bb6..93490330c225 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c9875b79822cccdfe5790e1fe6ab06a2e464d977 +Subproject commit d9abea1b5d9537016a03293a1bfa388677f07834 From 0a1356e1ed42e879ef58885605dd79a836d9894d Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 3 Aug 2021 18:59:07 -0700 Subject: [PATCH 0450/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ac8244d93cc7e674ff67fd49da2abd7252c12e48 https://github.com/facebook/fbthrift/commit/43cdfbd99a425a8bcdd93dd34516374595a7595f https://github.com/facebook/fbzmq/commit/1dd2d2e762d72938394fc4b97aeb8471a4bdae7f https://github.com/facebook/proxygen/commit/31e782ba502fe74a6cfb3618c2e8e65d060b27ee https://github.com/facebook/wangle/commit/467536b50d6cf81d463f13f431dfc66b7b9ee9ab https://github.com/facebook/watchman/commit/2ce937f2b90b4e6cc713aecf95c617b13b51c6f4 https://github.com/facebookexperimental/rust-shed/commit/1e17b889c85e8af3a9ce1c8d884279bef7b38380 https://github.com/facebookincubator/fizz/commit/3e5e4d454f60f8cbe01cd3d8c46087e47096dcd4 https://github.com/facebookincubator/katran/commit/24dae3efb5f1cbfb454262cfce969ec77c292751 https://github.com/facebookincubator/mvfst/commit/cf52fb2d4336d11f5cac5421bbaae828c64eeb41 https://github.com/rsocket/rsocket-cpp/commit/07407836f0e6b5913a257b3b251f71745af5732d Reviewed By: jurajh-fb fbshipit-source-id: 3e7d1eaadd538974947a7b66a96255513868dd0d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 665d47a4dc3b..ab69f8a51b33 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7520695d778f620bdcc04b582e63669a84ef4eb0 +Subproject commit 43cdfbd99a425a8bcdd93dd34516374595a7595f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 375fa7aabcc0..ff4201e7cec9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 07f45512b29ab9b58b16f82b0ef19bff3668f163 +Subproject commit 467536b50d6cf81d463f13f431dfc66b7b9ee9ab From 19a41a68bedc4b43225a1074c67fd17b49433d70 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 3 Aug 2021 19:44:09 -0700 Subject: [PATCH 0451/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/24be29ba9d1a586e82ce1ab3f8b94cdde8f9270f https://github.com/facebook/fbthrift/commit/5ee4450cf3f5b53dffb73c37215ff6c4b86791be https://github.com/facebook/fbzmq/commit/104814762b0b9432f851ccd8bc396378b2416073 https://github.com/facebook/proxygen/commit/132d972d48c3ad4949625080c204a5766f494ce0 https://github.com/facebook/wangle/commit/4430cf6635a69caba2c83974915d614d5a19e6b6 https://github.com/facebook/watchman/commit/0a1356e1ed42e879ef58885605dd79a836d9894d https://github.com/facebookexperimental/rust-shed/commit/450ba7402aba17ed5bfbd98a81d80ba2f2931e62 https://github.com/facebookincubator/katran/commit/9ab3e1696e4d00cfe611b2aacd0c89e5e2dc70ab https://github.com/facebookincubator/mvfst/commit/84c7e7adca77d411ef4c5dd7bef9ce5dc78f872c Reviewed By: jurajh-fb fbshipit-source-id: 87c17f4965255bd29b1e449e555e894f7410d1a2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ab69f8a51b33..e904fc5d8752 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 43cdfbd99a425a8bcdd93dd34516374595a7595f +Subproject commit 5ee4450cf3f5b53dffb73c37215ff6c4b86791be diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ff4201e7cec9..8af0be2ef75f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 467536b50d6cf81d463f13f431dfc66b7b9ee9ab +Subproject commit 4430cf6635a69caba2c83974915d614d5a19e6b6 From f257d75a4a4f3411eccbd7f29734e7dcb6694352 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 3 Aug 2021 20:02:45 -0700 Subject: [PATCH 0452/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/3f3195340d506d3eec6de15c3e5654cc1bfa9e10 https://github.com/facebook/fbthrift/commit/b4e79ec5c777d5dc808fd617c0b3df0f3ac8df7a https://github.com/facebook/fbzmq/commit/9b84a08c7d10995cce2f4e2293381708ff511c4f https://github.com/facebook/proxygen/commit/796f8413cfd689ed42f7a1336e7ca7db84b3d6ec https://github.com/facebook/watchman/commit/19a41a68bedc4b43225a1074c67fd17b49433d70 https://github.com/facebookexperimental/rust-shed/commit/c36dfce67ac72c057e393cb502cbdc168733eef4 Reviewed By: jurajh-fb fbshipit-source-id: 422a10597eda0799f072fec09601ba3352967b55 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e904fc5d8752..a1dbce0525b8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5ee4450cf3f5b53dffb73c37215ff6c4b86791be +Subproject commit b4e79ec5c777d5dc808fd617c0b3df0f3ac8df7a From a707b1632ff63697edd11b74b5a8f3ddaaaed44e Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 3 Aug 2021 21:17:26 -0700 Subject: [PATCH 0453/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/591cd563ec577049db8bebf21872e6bbffe026e7 Reviewed By: jurajh-fb fbshipit-source-id: 649512f5cae3799df6a7d43dad2f73057981f263 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a1dbce0525b8..8f7568c4bd70 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b4e79ec5c777d5dc808fd617c0b3df0f3ac8df7a +Subproject commit 591cd563ec577049db8bebf21872e6bbffe026e7 From 6beb6e1635ada8a057f37b5e8e572964046b446f Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 4 Aug 2021 00:33:05 -0700 Subject: [PATCH 0454/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/37e6bbcc067b70ac8745444d4921926df8416508 Reviewed By: jurajh-fb fbshipit-source-id: c65f3b55e420694b1468716d94e59c741fac1e9b --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 93490330c225..945702576e2b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d9abea1b5d9537016a03293a1bfa388677f07834 +Subproject commit 37e6bbcc067b70ac8745444d4921926df8416508 From dca4f7d23b475f4f4c83eb0a738f76ef81d07a94 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 4 Aug 2021 01:09:52 -0700 Subject: [PATCH 0455/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/fcf1f440f7272a61bd358f7e839409b0af80347f https://github.com/facebook/fbthrift/commit/d3d52bd406e8f9f9a76d975b9d6f2a01d3869ec1 https://github.com/facebook/fbzmq/commit/cc0bae3157e863da56593b4c7bcc6b5dc3ee0c8f https://github.com/facebook/proxygen/commit/6eae73e1707dbbe20319679c3b6ae2154fcc63a3 https://github.com/facebook/wangle/commit/bc0b4f8a6f5f80986dbb6bb70e3aef6a28ec3a61 https://github.com/facebook/watchman/commit/6beb6e1635ada8a057f37b5e8e572964046b446f https://github.com/facebookincubator/fizz/commit/35c0fdeacea479adcc5b80dfc776f8ebd827e2b1 https://github.com/facebookincubator/katran/commit/4f0e6bb451b90c0b6cca3c5ba629555561ea98c6 https://github.com/facebookincubator/mvfst/commit/64400abfa82436799eb02f37937f8f3a3e8a601a https://github.com/rsocket/rsocket-cpp/commit/c568078a67fa75e8357a17470b689be2d7946c45 Reviewed By: jurajh-fb fbshipit-source-id: 6e0e96a48659443fc9f095952d15a7cdc230525c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8f7568c4bd70..b05bfc7fafc8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 591cd563ec577049db8bebf21872e6bbffe026e7 +Subproject commit d3d52bd406e8f9f9a76d975b9d6f2a01d3869ec1 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8af0be2ef75f..a9a2056afb01 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 4430cf6635a69caba2c83974915d614d5a19e6b6 +Subproject commit bc0b4f8a6f5f80986dbb6bb70e3aef6a28ec3a61 From 853bafce61a23c9aad4b8478eb14393b02374514 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 4 Aug 2021 01:44:13 -0700 Subject: [PATCH 0456/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/e96005f930c3c2ee88934dc108c07fddc997e88a https://github.com/facebook/fbthrift/commit/03a56c42591abc82493fe4383a9a0dd1a9d96bc7 https://github.com/facebook/fbzmq/commit/62b117660805b95b70db927bb2867c711d91dc41 https://github.com/facebook/proxygen/commit/ba3931de710ced8e300bc1c438b151adf8840633 https://github.com/facebook/wangle/commit/3edf724cf36783a36801f9c8f6aff253f5a29839 https://github.com/facebook/watchman/commit/dca4f7d23b475f4f4c83eb0a738f76ef81d07a94 https://github.com/facebookexperimental/rust-shed/commit/f2c6a8c3664a5378372a23da9961b3e3cbfd0da3 https://github.com/facebookincubator/katran/commit/01639e5ea414005828ad657d6a9023fec8f8ce71 https://github.com/facebookincubator/mvfst/commit/c516d97d89f44e29d85f55e4e868d0aee6f6b7c2 Reviewed By: jurajh-fb fbshipit-source-id: 065c50f1879f2ad8a2611aad188521317ed016f2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b05bfc7fafc8..f1ca6086d85e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d3d52bd406e8f9f9a76d975b9d6f2a01d3869ec1 +Subproject commit 03a56c42591abc82493fe4383a9a0dd1a9d96bc7 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a9a2056afb01..87dc0eaf39aa 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit bc0b4f8a6f5f80986dbb6bb70e3aef6a28ec3a61 +Subproject commit 3edf724cf36783a36801f9c8f6aff253f5a29839 From 7afa450a8adb878d438bf9b60d96c998cb7a34cc Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 4 Aug 2021 03:19:49 -0700 Subject: [PATCH 0457/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/d84f56c0300bef4adb53503597152f2170748de9 https://github.com/facebook/fbthrift/commit/b7738c07c4366a6a40f386d083c033fdc352bdbc https://github.com/facebook/fbzmq/commit/a600f2aa9aae520755e6bfabdaba77b6f50599f2 https://github.com/facebook/proxygen/commit/c7ba2e553cfadd3f5251ffbff6d000843833d297 https://github.com/facebook/watchman/commit/853bafce61a23c9aad4b8478eb14393b02374514 https://github.com/facebookexperimental/rust-shed/commit/cbe5fce7c7a386d00447ef95213795c507b1c8fc Reviewed By: jurajh-fb fbshipit-source-id: e64262ab4aee2fd00c57ccec92dd820416621f31 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f1ca6086d85e..129ad4f87531 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 03a56c42591abc82493fe4383a9a0dd1a9d96bc7 +Subproject commit b7738c07c4366a6a40f386d083c033fdc352bdbc From 1af08013bac6725db5c7edfb2011a1732e494715 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 4 Aug 2021 05:33:50 -0700 Subject: [PATCH 0458/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/aa7042ba3a3ced385efd25840fce8b64c623298a https://github.com/facebook/litho/commit/6e7368d9f6140601940f8d31b5484fc77727f6c3 Reviewed By: jurajh-fb fbshipit-source-id: fd334aa32c1375851cad985187b0e5b971cf2fab --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 129ad4f87531..53ce48fcfe06 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b7738c07c4366a6a40f386d083c033fdc352bdbc +Subproject commit aa7042ba3a3ced385efd25840fce8b64c623298a From 33e6f8a94c03b56ddab69451f45a31f254b3489a Mon Sep 17 00:00:00 2001 From: Jessica Vandebon Date: Fri, 6 Aug 2021 10:03:27 -0700 Subject: [PATCH 0459/7387] =?UTF-8?q?Add=20a=20Thrift=20method=20to=20tell?= =?UTF-8?q?=20EdenFS=20to=20prefetch=20a=20user=E2=80=99s=20most=20accesse?= =?UTF-8?q?d=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: Added a Thrift method that tells EdenFS to prefetch files from a user's most used directories using an endpoint that talks to the edenfs/edenfs_service SmartPlatform service to get the directory list. The default number of directories is set to 10,000. Reviewed By: genevievehelsel Differential Revision: D29909976 fbshipit-source-id: bfb1a411d50d7355ff604de5bc090a9e2c3100a0 --- eden/fs/service/eden.thrift | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 1fa90743ae87..e1014c0d33e4 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -731,6 +731,10 @@ enum Dtype { WHITEOUT = 14, // DT_WHT } +struct PredictiveFetch { + // number of directories to glob + 1: unsigned64 numTopDirectories; +} /** Params for globFiles(). */ struct GlobParams { 1: PathString mountPoint; @@ -760,6 +764,9 @@ struct GlobParams { 9: PathString searchRoot; // If set, will run the prefetch but will not wait for the result. 10: bool background = false; + // When set, the globs list must be empty and the globbing pattern will be obtained + // from an online service. + 11: optional PredictiveFetch predictiveGlob; } struct Glob { @@ -1115,6 +1122,14 @@ service EdenService extends fb303_core.BaseService { */ Glob globFiles(1: GlobParams params) throws (1: EdenError ex); + /** + * Gets a list of a user's most accessed directories, performs + * prefetching as specified by PredictiveGlobParams, and returns + * a list of files matching the glob patterns. + * There are no duplicate values in the result. + */ + Glob predictiveGlobFiles(1: GlobParams params) throws (1: EdenError ex); + /** * Chowns all files in the requested mount to the requested uid and gid */ From 378b306b0a92e7764cee4ddb5c131d9a97c2c899 Mon Sep 17 00:00:00 2001 From: Johan Schuijt-Li Date: Tue, 10 Aug 2021 10:24:34 -0700 Subject: [PATCH 0460/7387] move to common shared directory Summary: Allow this to be used by more utilities. Reviewed By: DurhamG Differential Revision: D29958512 fbshipit-source-id: b6a1a7017102a4ff4ad252246d3252903bbb793f --- build/fbcode_builder/manifests/eden | 1 + 1 file changed, 1 insertion(+) diff --git a/build/fbcode_builder/manifests/eden b/build/fbcode_builder/manifests/eden index 3174bb3df1b5..700cc82ec6ae 100644 --- a/build/fbcode_builder/manifests/eden +++ b/build/fbcode_builder/manifests/eden @@ -43,6 +43,7 @@ osxfuse libcurl [shipit.pathmap] +fbcode/common/rust/shed/hostcaps = common/rust/shed/hostcaps fbcode/eden/oss = . fbcode/eden = eden fbcode/tools/lfs = tools/lfs From 251e50dad43bcafb3438bbd234088ad5c35a0e81 Mon Sep 17 00:00:00 2001 From: Xavier Deguillard Date: Tue, 10 Aug 2021 18:56:52 -0700 Subject: [PATCH 0461/7387] pool eden thrift connections Summary: Whenever a file is modified in an EdenFS mount and a watchman subscription is active, watchman will be nodified and will issue a getFilesChangedSince Thrift call. In order to do that, Watchman ends up always re-creating a new connection to EdenFS, causing the .eden/socket or .eden/config to be re-read in order to find EdenFS's socket. For workloads with heavy write traffic to EdenFS, this readlink/read can add up. On Windows, writing ~2.5GB worth of data lead Watchman to read over 650MB worth of data from the .eden/config! Reviewed By: kmancini Differential Revision: D29508654 fbshipit-source-id: 60440d645340bc4fe16ea9618d7a5080740e4d87 --- watchman/watcher/eden.cpp | 67 ++++++++++++++++++++++++++++++--------- 1 file changed, 52 insertions(+), 15 deletions(-) diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index 876dec74c933..2c62c0133b90 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -1,7 +1,7 @@ /* Copyright 2016-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ -#include // @manual=fbsource//third-party/cpptoml:cpptoml +#include #include #include #include @@ -9,6 +9,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -153,13 +156,8 @@ folly::SocketAddress getEdenSocketAddress(w_string_piece rootPath) { /** Create a thrift client that will connect to the eden server associated * with the current user. */ std::unique_ptr getEdenClient( - w_string_piece rootPath, - folly::EventBase* eb = folly::EventBaseManager::get()->getEventBase()) { - auto addr = getEdenSocketAddress(rootPath); - - return make_unique( - apache::thrift::HeaderClientChannel::newChannel( - AsyncSocket::newSocket(eb, addr))); + std::shared_ptr channel) { + return make_unique(std::move(channel)); } /** Create a thrift client that will connect to the eden server associated @@ -180,11 +178,15 @@ class EdenFileResult : public FileResult { public: EdenFileResult( const w_string& rootPath, + std::shared_ptr thriftChannel, const w_string& fullName, JournalPosition* position = nullptr, bool isNew = false, DType dtype = DType::Unknown) - : root_path_(rootPath), fullName_(fullName), dtype_(dtype) { + : root_path_(rootPath), + thriftChannel_{std::move(thriftChannel)}, + fullName_(fullName), + dtype_(dtype) { otime_.ticks = ctime_.ticks = 0; otime_.timestamp = ctime_.timestamp = 0; if (position) { @@ -396,7 +398,7 @@ class EdenFileResult : public FileResult { edenFile.clearNeededProperties(); } - auto client = getEdenClient(root_path_); + auto client = getEdenClient(thriftChannel_); loadFileInformation( client.get(), root_path_, @@ -430,6 +432,7 @@ class EdenFileResult : public FileResult { private: w_string root_path_; + std::shared_ptr thriftChannel_; w_string fullName_; Optional stat_; Optional exists_; @@ -701,8 +704,37 @@ std::vector globNameAndDType( } } +namespace { + +/** + * Construct a pooled Thrift channel that will automatically reconnect to + * EdenFS on error. + */ +std::shared_ptr makeThriftChannel( + w_string rootPath, + int numRetries) { + auto channel = apache::thrift::PooledRequestChannel::newChannel( + folly::EventBaseManager::get()->getEventBase(), + folly::getUnsafeMutableGlobalIOExecutor(), + [numRetries, rootPath = std::move(rootPath)](folly::EventBase& eb) { + return apache::thrift::RetryingRequestChannel::newChannel( + eb, + numRetries, + apache::thrift::ReconnectingRequestChannel::newChannel( + eb, [rootPath](folly::EventBase& eb) { + return apache::thrift::HeaderClientChannel::newChannel( + AsyncSocket::newSocket( + &eb, getEdenSocketAddress(rootPath))); + })); + }); + return channel; +} + +} // namespace + class EdenView final : public QueryableView { w_string root_path_; + std::shared_ptr thriftChannel_; // The source control system that we detected during initialization mutable std::unique_ptr scm_; folly::EventBase subscriberEventBase_; @@ -715,6 +747,9 @@ class EdenView final : public QueryableView { public: explicit EdenView(watchman_root* root) : root_path_(root->root_path), + thriftChannel_(makeThriftChannel( + root_path_, + root->config.getInt("eden_retry_connection_count", 3))), scm_(EdenWrappedSCM::wrap(SCM::scmForPath(root->root_path))), mountPoint_(to(root->root_path)), subscribeReadyFuture_(subscribeReadyPromise_.get_future()), @@ -722,7 +757,7 @@ class EdenView final : public QueryableView { root->config.getBool("eden_split_glob_pattern", false)) { // Get the current journal position so that we can keep track of // cookie file changes - auto client = getEdenClient(root_path_); + auto client = getEdenClient(thriftChannel_); client->sync_getCurrentJournalPosition(lastCookiePosition_, mountPoint_); // We don't run an iothread so we never need to crawl and // thus should be considered to have "completed" the initial @@ -736,7 +771,7 @@ class EdenView final : public QueryableView { void timeGenerator(w_query* query, struct w_query_ctx* ctx) const override { ctx->generationStarted(); - auto client = getEdenClient(root_path_); + auto client = getEdenClient(thriftChannel_); FileDelta delta; JournalPosition resultPosition; @@ -943,6 +978,7 @@ class EdenView final : public QueryableView { auto file = make_unique( root_path_, + thriftChannel_, w_string::pathCat({mountPoint_, item.name}), &resultPosition, isNew, @@ -970,7 +1006,7 @@ class EdenView final : public QueryableView { const std::vector& globStrings, w_query* query, struct w_query_ctx* ctx) const { - auto client = getEdenClient(ctx->root->root_path); + auto client = getEdenClient(thriftChannel_); auto includeDotfiles = (query->glob_flags & WM_PERIOD) == 0; auto fileInfo = globNameAndDType( @@ -986,6 +1022,7 @@ class EdenView final : public QueryableView { for (auto& item : fileInfo) { auto file = make_unique( root_path_, + thriftChannel_, w_string::pathCat({mountPoint_, item.name}), /* position=*/nullptr, /*isNew=*/false, @@ -1082,7 +1119,7 @@ class EdenView final : public QueryableView { } ClockPosition getMostRecentRootNumberAndTickValue() const override { - auto client = getEdenClient(root_path_); + auto client = getEdenClient(thriftChannel_); JournalPosition position; client->sync_getCurrentJournalPosition(position, mountPoint_); return ClockPosition( @@ -1127,7 +1164,7 @@ class EdenView final : public QueryableView { // construction). try { FileDelta delta; - auto client = getEdenClient(root_path_); + auto client = getEdenClient(thriftChannel_); client->sync_getFilesChangedSince( delta, mountPoint_, lastCookiePosition_); From 6f39526b0a18c331143a05c46b64454ef695e0a4 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Wed, 11 Aug 2021 12:52:25 -0700 Subject: [PATCH 0462/7387] w_string_contains_cstr_len -> w_string_piece::contains Summary: More modernification. The tests discovered a discrepancy between the Windows and memmem implementations. Reviewed By: kmancini Differential Revision: D30023959 fbshipit-source-id: 4405b4ee3b54d0e5d3e4f65fbad91aea8c14fb7f --- watchman/Cookie.h | 5 ++--- watchman/string.cpp | 30 ++++++------------------------ watchman/tests/string_test.cpp | 10 ++++++++++ watchman/watchman_string.h | 23 ++++++++++++++--------- 4 files changed, 32 insertions(+), 36 deletions(-) diff --git a/watchman/Cookie.h b/watchman/Cookie.h index 2afdab4095e2..cee7fed1af9f 100644 --- a/watchman/Cookie.h +++ b/watchman/Cookie.h @@ -19,9 +19,8 @@ inline constexpr std::string_view kCookiePrefix = ".watchman-cookie-"; * precise cookie prefix is for the current pending list here, so * we do a substring match. Not the most elegant thing in the world. */ -inline bool isPossiblyACookie(const w_string_t* path) { - return w_string_contains_cstr_len( - path, kCookiePrefix.data(), kCookiePrefix.size()); +inline bool isPossiblyACookie(w_string_piece path) { + return path.contains(kCookiePrefix); } } // namespace watchman diff --git a/watchman/string.cpp b/watchman/string.cpp index d87b069e5418..8181462c45c8 100644 --- a/watchman/string.cpp +++ b/watchman/string.cpp @@ -601,32 +601,14 @@ bool w_string_startswith_caseless(w_string_t* str, w_string_t* prefix) { return true; } -bool w_string_contains_cstr_len( - const w_string_t* str, - const char* needle, - uint32_t nlen) { +bool w_string_piece::contains(w_string_piece needle) const { #if HAVE_MEMMEM - return memmem(str->buf, str->len, needle, nlen) != NULL; -#else - // Most likely only for Windows. - // Inspired by http://stackoverflow.com/a/24000056/149111 - const char* haystack = str->buf; - uint32_t hlen = str->len; - const char* limit; - - if (nlen == 0 || hlen < nlen) { - return false; - } - - limit = haystack + hlen - nlen + 1; - while ((haystack = (const char*)memchr( - haystack, needle[0], limit - haystack)) != NULL) { - if (memcmp(haystack, needle, nlen) == 0) { - return true; - } - haystack++; + if (needle.empty()) { + return true; } - return false; + return memmem(data(), size(), needle.data(), needle.size()) != nullptr; +#else + return view().find(needle.view()) != std::string_view::npos; #endif } diff --git a/watchman/tests/string_test.cpp b/watchman/tests/string_test.cpp index f1af24884f99..b4aa28880119 100644 --- a/watchman/tests/string_test.cpp +++ b/watchman/tests/string_test.cpp @@ -427,3 +427,13 @@ TEST(String, truncated_tail) { w_string_piece{"...45678"}, w_string_piece(head, strnlen(head, sizeof(head)))); } + +TEST(String, contains) { + w_string data{"watchman"}; + w_string_piece haystack{data}; + EXPECT_TRUE(haystack.contains("atch")); + EXPECT_FALSE(haystack.contains("maan")); + EXPECT_TRUE(haystack.contains("")); + EXPECT_TRUE(haystack.contains("watchman")); + EXPECT_FALSE(haystack.contains("watchman2")); +} diff --git a/watchman/watchman_string.h b/watchman/watchman_string.h index 2d76491c6c6e..633e38e910ca 100644 --- a/watchman/watchman_string.h +++ b/watchman/watchman_string.h @@ -19,6 +19,7 @@ #include #include #include +#include #include struct watchman_string; @@ -59,10 +60,6 @@ static inline uint32_t w_string_hval(w_string_t* str) { w_string_piece w_string_canon_path(w_string_t* str); int w_string_compare(const w_string_t* a, const w_string_t* b); -bool w_string_contains_cstr_len( - const w_string_t* str, - const char* needle, - uint32_t nlen); bool w_string_equal(const w_string_t* a, const w_string_t* b); bool w_string_equal_cstring(const w_string_t* a, const char* b); @@ -100,7 +97,7 @@ class w_string_piece { w_string_piece(); /* implicit */ w_string_piece(std::nullptr_t); - inline /* implicit */ w_string_piece(w_string_t* str) + /* implicit */ w_string_piece(w_string_t* str) : s_(str->buf), e_(str->buf + str->len) {} /** Construct from a string-like object */ @@ -120,7 +117,7 @@ class w_string_piece { typename String, typename std::enable_if::value, int>:: type = 0> - inline /* implicit */ w_string_piece(const String& str) { + /* implicit */ w_string_piece(const String& str) { if (!str) { s_ = nullptr; e_ = nullptr; @@ -130,11 +127,13 @@ class w_string_piece { } } - inline /* implicit */ w_string_piece(const char* cstr) + /* implicit */ w_string_piece(const char* cstr) : s_(cstr), e_(cstr + strlen(cstr)) {} - /* implicit */ inline w_string_piece(const char* cstr, size_t len) - : s_(cstr), e_(cstr + len) {} + w_string_piece(const char* cstr, size_t len) : s_(cstr), e_(cstr + len) {} + + /* implicit */ w_string_piece(std::string_view sv) + : w_string_piece{sv.data(), sv.size()} {} w_string_piece(const w_string_piece& other) = default; w_string_piece& operator=(const w_string_piece& other) = default; @@ -210,10 +209,16 @@ class w_string_piece { return folly::StringPiece(s_, e_); } + std::string_view view() const { + std::size_t count = e_ - s_; + return std::string_view{s_, count}; + } + bool operator==(w_string_piece other) const; bool operator!=(w_string_piece other) const; bool operator<(w_string_piece other) const; + bool contains(w_string_piece needle) const; bool startsWith(w_string_piece prefix) const; bool startsWithCaseInsensitive(w_string_piece prefix) const; From cb5b0144ad7fcafaa415fd97edd559c3bc529f17 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Wed, 11 Aug 2021 12:52:25 -0700 Subject: [PATCH 0463/7387] move command line options into Options.h Summary: Watchman has a lot of global variables and implicit state. Make this somewhat better by at least moving command-line flags into their own struct and renaming it to Options.cpp and Options.h. Reviewed By: kmancini Differential Revision: D30028689 fbshipit-source-id: ea698a21ea8a454c61c70f30a712b7c64c46979c --- CMakeLists.txt | 2 +- watchman/LogConfig.cpp | 4 +- watchman/LogConfig.h | 4 + watchman/{opt.cpp => Options.cpp} | 226 +++++++++++++++- watchman/{watchman_getopt.h => Options.h} | 53 +++- watchman/cmds/reg.cpp | 4 + watchman/cmds/watch.cpp | 2 +- watchman/main.cpp | 308 ++++------------------ watchman/perf.cpp | 4 +- watchman/root/symlink.cpp | 5 +- watchman/sockname.cpp | 13 +- watchman/state.cpp | 20 +- watchman/watcher/fsevents.cpp | 2 +- watchman/watchman.h | 6 - 14 files changed, 354 insertions(+), 299 deletions(-) rename watchman/{opt.cpp => Options.cpp} (53%) rename watchman/{watchman_getopt.h => Options.h} (54%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bf87bd50eee..4e8a17e498e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -610,6 +610,7 @@ watchman/FlagMap.cpp watchman/FSDetect.cpp watchman/InMemoryView.cpp watchman/LocalFileResult.cpp +watchman/Options.cpp watchman/PendingCollection.cpp watchman/Pipe.cpp watchman/ProcessLock.cpp @@ -631,7 +632,6 @@ watchman/listener-user.cpp watchman/listener.cpp watchman/main.cpp watchman/opendir.cpp -watchman/opt.cpp watchman/perf.cpp watchman/sockname.cpp watchman/spawn.cpp diff --git a/watchman/LogConfig.cpp b/watchman/LogConfig.cpp index 466cb1a07c4a..4fde81286454 100644 --- a/watchman/LogConfig.cpp +++ b/watchman/LogConfig.cpp @@ -3,7 +3,9 @@ #include "watchman/LogConfig.h" #include "watchman/Logging.h" -using namespace watchman; +namespace watchman::logging { int log_level = LogLevel::ERR; std::string log_name; + +} // namespace watchman::logging diff --git a/watchman/LogConfig.h b/watchman/LogConfig.h index 9d134f3b5fad..61b7593cb293 100644 --- a/watchman/LogConfig.h +++ b/watchman/LogConfig.h @@ -5,5 +5,9 @@ #include +namespace watchman::logging { + extern int log_level; extern std::string log_name; + +} // namespace watchman::logging diff --git a/watchman/opt.cpp b/watchman/Options.cpp similarity index 53% rename from watchman/opt.cpp rename to watchman/Options.cpp index 6d592c246c85..6bbdc3644ad3 100644 --- a/watchman/opt.cpp +++ b/watchman/Options.cpp @@ -1,16 +1,217 @@ /* Copyright 2012-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/Options.h" #include -#include "watchman/watchman.h" - -using namespace watchman; +#include +#include "watchman/LogConfig.h" +#include "watchman/Logging.h" +#include "watchman/WatchmanConfig.h" #define IS_REQUIRED(x) (x) == REQ_STRING +namespace watchman { + +Flags flags; + +namespace { +const OptDesc opts[] = { + {"help", + 'h', + "Show this help", + OPT_NONE, + &flags.show_help, + NULL, + NOT_DAEMON}, +#ifndef _WIN32 + {"inetd", + 0, + "Spawning from an inetd style supervisor", + OPT_NONE, + &flags.inetd_style, + NULL, + IS_DAEMON}, +#endif + {"no-site-spawner", + 'S', + "Don't use the site or system spawner", + OPT_NONE, + &flags.no_site_spawner, + NULL, + IS_DAEMON}, + {"version", + 'v', + "Show version number", + OPT_NONE, + &flags.show_version, + NULL, + NOT_DAEMON}, +/* -U / --sockname have legacy meaning; unix domain on unix, + * named pipe path on windows. After we chose this assignment, + * Windows evolved unix domain support which muddies this. + * We need to preserve the sockname/U option here for backwards + * compatibility */ +#ifdef _WIN32 + {"sockname", + 'U', + "DEPRECATED: Specify alternate named pipe path (specifying this will" + " disable unix domain sockets unless `--unix-listener-path` is" + " specified)", + REQ_STRING, + &flags.named_pipe_path, + "PATH", + IS_DAEMON}, +#else + {"sockname", + 'U', + "DEPRECATED: Specify alternate sockname. Use `--unix-listener-path` instead.", + REQ_STRING, + &flags.unix_sock_name, + "PATH", + IS_DAEMON}, +#endif + {"named-pipe-path", + 0, + "Specify alternate named pipe path", + REQ_STRING, + &flags.named_pipe_path, + "PATH", + IS_DAEMON}, + {"unix-listener-path", + 'u', +#ifdef _WIN32 + "Specify alternate unix domain socket path (specifying this will disable" + " named pipes unless `--named-pipe-path` is specified)", +#else + "Specify alternate unix domain socket path", +#endif + REQ_STRING, + &flags.unix_sock_name, + "PATH", + IS_DAEMON}, + {"tcp-listener-enable", + 't', + "Enable listening on TCP; see also tcp-listener-address and tcp-listener-port", + OPT_NONE, + &flags.enable_tcp, + nullptr, + IS_DAEMON}, + {"tcp-listener-address", + 0, + "Specify in
: the address to bind to and listen on when tcp-listener-enable is true", + REQ_STRING, + &flags.tcp_host, + "ADDRESS", + IS_DAEMON}, + {"logfile", + 'o', + "Specify path to logfile", + REQ_STRING, + &watchman::logging::log_name, + "PATH", + IS_DAEMON}, + {"log-level", + 0, + "set the log level (0 = off, default is 1, verbose = 2)", + REQ_INT, + &watchman::logging::log_level, + NULL, + IS_DAEMON}, + {"pidfile", + 0, + "Specify path to pidfile", + REQ_STRING, + &flags.pid_file, + "PATH", + IS_DAEMON}, + {"persistent", + 'p', + "Persist and wait for further responses", + OPT_NONE, + &flags.persistent, + NULL, + NOT_DAEMON}, + {"no-save-state", + 'n', + "Don't save state between invocations", + OPT_NONE, + &flags.dont_save_state, + NULL, + IS_DAEMON}, + {"statefile", + 0, + "Specify path to file to hold watch and trigger state", + REQ_STRING, + &flags.watchman_state_file, + "PATH", + IS_DAEMON}, + {"json-command", + 'j', + "Instead of parsing CLI arguments, take a single " + "json object from stdin", + OPT_NONE, + &flags.json_input_arg, + NULL, + NOT_DAEMON}, + {"output-encoding", + 0, + "CLI output encoding. json (default) or bser", + REQ_STRING, + &flags.output_encoding, + NULL, + NOT_DAEMON}, + {"server-encoding", + 0, + "CLI<->server encoding. bser (default) or json", + REQ_STRING, + &flags.server_encoding, + NULL, + NOT_DAEMON}, + {"foreground", + 'f', + "Run the service in the foreground", + OPT_NONE, + &flags.foreground, + NULL, + NOT_DAEMON}, + {"no-pretty", + 0, + "Don't pretty print JSON", + OPT_NONE, + &flags.no_pretty, + NULL, + NOT_DAEMON}, + {"no-spawn", + 0, + "Don't try to start the service if it is not available", + OPT_NONE, + &flags.no_spawn, + NULL, + NOT_DAEMON}, + {"no-local", + 0, + "When no-spawn is enabled, don't try to handle request" + " in client mode if service is unavailable", + OPT_NONE, + &flags.no_local, + NULL, + NOT_DAEMON}, + // test-state-dir is for testing only and should not be used in production: + // instead, use the compile-time WATCHMAN_STATE_DIR option + {"test-state-dir", + 0, + NULL, + REQ_STRING, + &flags.test_state_dir, + "DIR", + NOT_DAEMON}, + {0, 0, 0, OPT_NONE, 0, 0, 0}, +}; +} // namespace + /* One does not simply use getopt_long() */ -[[noreturn]] void usage(struct watchman_getopt* opts, FILE* where) { +[[noreturn]] void usage(const OptDesc* opts, FILE* where) { int i; size_t len; size_t longest = 0; @@ -87,7 +288,7 @@ using namespace watchman; } bool w_getopt( - struct watchman_getopt* opts, + const OptDesc* opts, int* argcp, char*** argvp, char*** daemon_argvp) { @@ -155,7 +356,7 @@ bool w_getopt( while ((res = getopt_long(argc, argv, shortopts, long_opts, &long_pos)) != -1) { - struct watchman_getopt* o; + const OptDesc* o; switch (res) { case ':': @@ -239,5 +440,18 @@ bool w_getopt( return true; } +void parseOptions(int* argcp, char*** argvp, char*** daemon_argv) { + w_getopt(opts, argcp, argvp, daemon_argv); + if (flags.show_help) { + usage(opts, stdout); + } + if (flags.show_version) { + printf("%s\n", PACKAGE_VERSION); + exit(0); + } +} + +} // namespace watchman + /* vim:ts=2:sw=2:et: */ diff --git a/watchman/watchman_getopt.h b/watchman/Options.h similarity index 54% rename from watchman/watchman_getopt.h rename to watchman/Options.h index cfbee0a18c16..70e4f959d2df 100644 --- a/watchman/watchman_getopt.h +++ b/watchman/Options.h @@ -2,13 +2,45 @@ * Licensed under the Apache License, Version 2.0 */ #pragma once -enum argtype { +#include +#include + +namespace watchman { + +struct Flags { + int show_help = 0; +#ifndef _WIN32 + int inetd_style = 0; +#endif + int no_site_spawner = 0; + int show_version = 0; + std::string named_pipe_path; + std::string unix_sock_name; + int enable_tcp = 0; + std::string tcp_host; + std::string pid_file; + int persistent = 0; + int dont_save_state = 0; + std::string watchman_state_file; + int json_input_arg = 0; + std::string output_encoding; + std::string server_encoding; + int foreground = 0; + int no_pretty = 0; + int no_spawn = 0; + int no_local = 0; + std::string test_state_dir; +}; + +extern Flags flags; + +enum ArgType { OPT_NONE, REQ_STRING, REQ_INT, }; -struct watchman_getopt { +struct OptDesc { /* name of long option: --optname */ const char* optname; /* if non-zero, short option character */ @@ -16,7 +48,7 @@ struct watchman_getopt { /* help text shown in the usage information */ const char* helptext; /* whether we accept an argument */ - enum argtype argtype; + ArgType argtype; /* if an argument was provided, *val will be set to * point to the option value. * Because we only update the option if one was provided @@ -38,10 +70,15 @@ struct watchman_getopt { #define NOT_DAEMON 0 }; -bool w_getopt( - struct watchman_getopt* opts, - int* argcp, - char*** argvp, - char*** daemon_argv); +/** + * Populates the globals in `flags`. + */ +void parseOptions(int* argcp, char*** argvp, char*** daemon_argv); + +// The following are largely for internal use. + +bool w_getopt(OptDesc* opts, int* argcp, char*** argvp, char*** daemon_argv); [[noreturn]] void usage(struct watchman_getopt* opts, FILE* where); void print_command_list_for_help(FILE* where); + +} // namespace watchman diff --git a/watchman/cmds/reg.cpp b/watchman/cmds/reg.cpp index 74f6edd74962..3281f3e9334f 100644 --- a/watchman/cmds/reg.cpp +++ b/watchman/cmds/reg.cpp @@ -12,6 +12,8 @@ using namespace watchman; * that we have done so and provide some advice on how the user can cure us. */ folly::Synchronized poisoned_reason; +namespace watchman { + void print_command_list_for_help(FILE* where) { auto defs = get_all_commands(); std::sort( @@ -27,6 +29,8 @@ void print_command_list_for_help(FILE* where) { } } +} // namespace watchman + command_handler_def* lookup(const json_ref& args, int mode) { const char* cmd_name; diff --git a/watchman/cmds/watch.cpp b/watchman/cmds/watch.cpp index a86f6df28811..8113e54db167 100644 --- a/watchman/cmds/watch.cpp +++ b/watchman/cmds/watch.cpp @@ -210,7 +210,7 @@ static w_string resolve_projpath(const json_ref& args, w_string& relpath) { throw CommandValidationError( "resolve_projpath: error computing root_files configuration value, " "consult your log file at ", - log_name, + logging::log_name, " for more details"); } diff --git a/watchman/main.cpp b/watchman/main.cpp index 1344158ac6f8..4c162196411e 100644 --- a/watchman/main.cpp +++ b/watchman/main.cpp @@ -15,6 +15,7 @@ #include "watchman/ChildProcess.h" #include "watchman/LogConfig.h" #include "watchman/Logging.h" +#include "watchman/Options.h" #include "watchman/ProcessLock.h" #include "watchman/ThreadPool.h" #include "watchman/watchman_opendir.h" @@ -29,35 +30,15 @@ #include // @manual #endif -using watchman::ChildProcess; -using watchman::FileDescriptor; -using Options = ChildProcess::Options; using namespace watchman; +using Options = ChildProcess::Options; -static int show_help = 0; -static int show_version = 0; -static int enable_tcp = 0; -static std::string tcp_host; static enum w_pdu_type server_pdu = is_bser; static enum w_pdu_type output_pdu = is_json_pretty; static uint32_t server_capabilities = 0; static uint32_t output_capabilities = 0; -static std::string server_encoding; -static std::string output_encoding; -static std::string test_state_dir; -static std::string pid_file; static char** daemon_argv = NULL; -static int persistent = 0; -static int foreground = 0; -static int no_pretty = 0; -static int no_spawn = 0; -static int no_local = 0; -static int no_site_spawner = 0; -#ifndef _WIN32 -static int inetd_style = 0; -#endif static struct sockaddr_un un; -static int json_input_arg = 0; #ifdef __APPLE__ #include // @manual @@ -75,8 +56,8 @@ const std::string& get_pid_file() { // We defer computing this path until we're in the server context because // eager evaluation can trigger integration test failures unless all clients // are aware of both the pidfile and the sockpath being used in the tests. - compute_file_name(pid_file, compute_user_name(), "pid", "pidfile"); - return pid_file; + compute_file_name(flags.pid_file, compute_user_name(), "pid", "pidfile"); + return flags.pid_file; } } // namespace @@ -107,7 +88,7 @@ void detect_low_process_priority() { #ifndef _WIN32 // Before we redirect stdin/stdout to the log files, move any inetd-provided // socket to a different descriptor number. - if (inetd_style) { + if (flags.inetd_style) { w_listener_prep_inetd(); } #endif @@ -118,7 +99,7 @@ void detect_low_process_priority() { ignore_result(::dup2(fd, STDIN_FILENO)); ::close(fd); } - fd = open(log_name.c_str(), O_WRONLY | O_APPEND | O_CREAT, 0600); + fd = open(logging::log_name.c_str(), O_WRONLY | O_APPEND | O_CREAT, 0600); if (fd != -1) { ignore_result(::dup2(fd, STDOUT_FILENO)); ignore_result(::dup2(fd, STDERR_FILENO)); @@ -319,7 +300,10 @@ static SpawnResult spawn_win32() { opts.setFlags(POSIX_SPAWN_SETPGROUP); opts.open(STDIN_FILENO, "/dev/null", O_RDONLY, 0666); opts.open( - STDOUT_FILENO, log_name.c_str(), O_WRONLY | O_CREAT | O_APPEND, 0600); + STDOUT_FILENO, + logging::log_name.c_str(), + O_WRONLY | O_CREAT | O_APPEND, + 0600); opts.dup2(STDOUT_FILENO, STDERR_FILENO); opts.chdir("/"); @@ -336,7 +320,7 @@ static SpawnResult spawn_win32() { "Failed to spawn watchman server; it exited with code {}.\n" "Check the log file at {} for more information\n", proc.wait(), - log_name); + logging::log_name); exit(1); } proc.disown(); @@ -462,7 +446,7 @@ static SpawnResult spawn_via_launchd() { "\n"); } - compute_file_name(pid_file, compute_user_name(), "pid", "pidfile"); + compute_file_name(flags.pid_file, compute_user_name(), "pid", "pidfile"); auto plist_content = folly::to( "\n" @@ -481,10 +465,10 @@ static SpawnResult spawn_via_launchd() { "\n" " --foreground\n" " --logfile=", - log_name, + logging::log_name, "\n" " --log-level=", - log_level, + logging::log_level, "\n" // TODO: switch from `--sockname` to `--unix-listener-path` // after a grace period to allow for sane results if we @@ -493,10 +477,10 @@ static SpawnResult spawn_via_launchd() { get_unix_sock_name(), "\n" " --statefile=", - watchman_state_file, + flags.watchman_state_file, "\n" " --pidfile=", - pid_file, + flags.pid_file, "\n" " \n" " KeepAlive\n" @@ -714,8 +698,8 @@ static const std::string& cached_watchman_appdata_path() { #endif static std::string compute_per_user_state_dir(const std::string& user) { - if (!test_state_dir.empty()) { - return folly::to(test_state_dir, "/", user, "-state"); + if (!flags.test_state_dir.empty()) { + return folly::to(flags.test_state_dir, "/", user, "-state"); } #ifdef _WIN32 @@ -859,8 +843,8 @@ static void setup_sock_name() { auto user = compute_user_name(); #ifdef _WIN32 - if (!test_state_dir.empty()) { - watchman_tmp_dir = test_state_dir; + if (!flags.test_state_dir.empty()) { + watchman_tmp_dir = flags.test_state_dir; } else { watchman_tmp_dir = cached_watchman_appdata_path(); } @@ -876,25 +860,29 @@ static void setup_sock_name() { // otherwise break their isolation. // If either option is specified without the other, then we disable // the use of the other. - if (!named_pipe_path.empty() || !unix_sock_name.empty()) { - disable_named_pipe = named_pipe_path.empty(); - disable_unix_socket = unix_sock_name.empty(); + if (!flags.named_pipe_path.empty() || !flags.unix_sock_name.empty()) { + disable_named_pipe = flags.named_pipe_path.empty(); + disable_unix_socket = flags.unix_sock_name.empty(); } - if (named_pipe_path.empty()) { - named_pipe_path = folly::to("\\\\.\\pipe\\watchman-", user); + if (flags.named_pipe_path.empty()) { + flags.named_pipe_path = + folly::to("\\\\.\\pipe\\watchman-", user); } #endif - compute_file_name(unix_sock_name, user, "sock", "sockname"); + compute_file_name(flags.unix_sock_name, user, "sock", "sockname"); - compute_file_name(watchman_state_file, user, "state", "statefile"); - compute_file_name(log_name, user, "log", "logfile"); + compute_file_name(flags.watchman_state_file, user, "state", "statefile"); + compute_file_name(logging::log_name, user, "log", "logfile"); - if (unix_sock_name.size() >= sizeof(un.sun_path) - 1) { - log(FATAL, unix_sock_name, ": path is too long\n"); + if (flags.unix_sock_name.size() >= sizeof(un.sun_path) - 1) { + log(FATAL, flags.unix_sock_name, ": path is too long\n"); } un.sun_family = PF_LOCAL; - memcpy(un.sun_path, unix_sock_name.c_str(), unix_sock_name.size() + 1); + memcpy( + un.sun_path, + flags.unix_sock_name.c_str(), + flags.unix_sock_name.size() + 1); } static bool should_start(int err) { @@ -944,214 +932,28 @@ static bool try_command(json_t* cmd, int timeout) { client.get())) { return false; } - } while (persistent); + } while (flags.persistent); return true; } -static struct watchman_getopt opts[] = { - {"help", 'h', "Show this help", OPT_NONE, &show_help, NULL, NOT_DAEMON}, -#ifndef _WIN32 - {"inetd", - 0, - "Spawning from an inetd style supervisor", - OPT_NONE, - &inetd_style, - NULL, - IS_DAEMON}, -#endif - {"no-site-spawner", - 'S', - "Don't use the site or system spawner", - OPT_NONE, - &no_site_spawner, - NULL, - IS_DAEMON}, - {"version", - 'v', - "Show version number", - OPT_NONE, - &show_version, - NULL, - NOT_DAEMON}, -/* -U / --sockname have legacy meaning; unix domain on unix, - * named pipe path on windows. After we chose this assignment, - * Windows evolved unix domain support which muddies this. - * We need to preserve the sockname/U option here for backwards - * compatibility */ -#ifdef _WIN32 - {"sockname", - 'U', - "DEPRECATED: Specify alternate named pipe path (specifying this will" - " disable unix domain sockets unless `--unix-listener-path` is" - " specified)", - REQ_STRING, - &named_pipe_path, - "PATH", - IS_DAEMON}, -#else - {"sockname", - 'U', - "DEPRECATED: Specify alternate sockname. Use `--unix-listener-path` instead.", - REQ_STRING, - &unix_sock_name, - "PATH", - IS_DAEMON}, -#endif - {"named-pipe-path", - 0, - "Specify alternate named pipe path", - REQ_STRING, - &named_pipe_path, - "PATH", - IS_DAEMON}, - {"unix-listener-path", - 'u', -#ifdef _WIN32 - "Specify alternate unix domain socket path (specifying this will disable" - " named pipes unless `--named-pipe-path` is specified)", -#else - "Specify alternate unix domain socket path", -#endif - REQ_STRING, - &unix_sock_name, - "PATH", - IS_DAEMON}, - {"tcp-listener-enable", - 't', - "Enable listening on TCP; see also tcp-listener-address and tcp-listener-port", - OPT_NONE, - &enable_tcp, - nullptr, - IS_DAEMON}, - {"tcp-listener-address", - 0, - "Specify in
: the address to bind to and listen on when tcp-listener-enable is true", - REQ_STRING, - &tcp_host, - "ADDRESS", - IS_DAEMON}, - {"logfile", - 'o', - "Specify path to logfile", - REQ_STRING, - &log_name, - "PATH", - IS_DAEMON}, - {"log-level", - 0, - "set the log level (0 = off, default is 1, verbose = 2)", - REQ_INT, - &log_level, - NULL, - IS_DAEMON}, - {"pidfile", - 0, - "Specify path to pidfile", - REQ_STRING, - &pid_file, - "PATH", - IS_DAEMON}, - {"persistent", - 'p', - "Persist and wait for further responses", - OPT_NONE, - &persistent, - NULL, - NOT_DAEMON}, - {"no-save-state", - 'n', - "Don't save state between invocations", - OPT_NONE, - &dont_save_state, - NULL, - IS_DAEMON}, - {"statefile", - 0, - "Specify path to file to hold watch and trigger state", - REQ_STRING, - &watchman_state_file, - "PATH", - IS_DAEMON}, - {"json-command", - 'j', - "Instead of parsing CLI arguments, take a single " - "json object from stdin", - OPT_NONE, - &json_input_arg, - NULL, - NOT_DAEMON}, - {"output-encoding", - 0, - "CLI output encoding. json (default) or bser", - REQ_STRING, - &output_encoding, - NULL, - NOT_DAEMON}, - {"server-encoding", - 0, - "CLI<->server encoding. bser (default) or json", - REQ_STRING, - &server_encoding, - NULL, - NOT_DAEMON}, - {"foreground", - 'f', - "Run the service in the foreground", - OPT_NONE, - &foreground, - NULL, - NOT_DAEMON}, - {"no-pretty", - 0, - "Don't pretty print JSON", - OPT_NONE, - &no_pretty, - NULL, - NOT_DAEMON}, - {"no-spawn", - 0, - "Don't try to start the service if it is not available", - OPT_NONE, - &no_spawn, - NULL, - NOT_DAEMON}, - {"no-local", - 0, - "When no-spawn is enabled, don't try to handle request" - " in client mode if service is unavailable", - OPT_NONE, - &no_local, - NULL, - NOT_DAEMON}, - // test-state-dir is for testing only and should not be used in production: - // instead, use the compile-time WATCHMAN_STATE_DIR option - {"test-state-dir", 0, NULL, REQ_STRING, &test_state_dir, "DIR", NOT_DAEMON}, - {0, 0, 0, OPT_NONE, 0, 0, 0}}; - static void parse_cmdline(int* argcp, char*** argvp) { cfg_load_global_config_file(); - w_getopt(opts, argcp, argvp, &daemon_argv); - if (show_help) { - usage(opts, stdout); - } - if (show_version) { - printf("%s\n", PACKAGE_VERSION); - exit(0); - } + + watchman::parseOptions(argcp, argvp, &daemon_argv); watchman::getLog().setStdErrLoggingLevel( - static_cast(log_level)); + static_cast(logging::log_level)); setup_sock_name(); - parse_encoding(server_encoding, &server_pdu); - parse_encoding(output_encoding, &output_pdu); - if (output_encoding.empty()) { - output_pdu = no_pretty ? is_json_compact : is_json_pretty; + parse_encoding(flags.server_encoding, &server_pdu); + parse_encoding(flags.output_encoding, &output_pdu); + if (flags.output_encoding.empty()) { + output_pdu = flags.no_pretty ? is_json_compact : is_json_pretty; } // Prevent integration tests that call the watchman cli from // accidentally spawning a server. if (getenv("WATCHMAN_NO_SPAWN")) { - no_spawn = true; + flags.no_spawn = true; } if (Configuration().getBool("tcp-listener-enable", false)) { @@ -1169,7 +971,7 @@ static void parse_cmdline(int* argcp, char*** argvp) { static json_ref build_command(int argc, char** argv) { // Read blob from stdin - if (json_input_arg) { + if (flags.json_input_arg) { auto err = json_error_t(); w_jbuffer_t buf; @@ -1178,19 +980,19 @@ static json_ref build_command(int argc, char** argv) { if (buf.pdu_type == is_bser) { // If they used bser for the input, select bser for output // unless they explicitly requested something else - if (server_encoding.empty()) { + if (flags.server_encoding.empty()) { server_pdu = is_bser; } - if (output_encoding.empty()) { + if (flags.output_encoding.empty()) { output_pdu = is_bser; } } else if (buf.pdu_type == is_bser_v2) { // If they used bser v2 for the input, select bser v2 for output // unless they explicitly requested something else - if (server_encoding.empty()) { + if (flags.server_encoding.empty()) { server_pdu = is_bser_v2; } - if (output_encoding.empty()) { + if (flags.output_encoding.empty()) { output_pdu = is_bser_v2; } } @@ -1234,7 +1036,7 @@ static SpawnResult try_spawn_watchman() { // communicating errors that are worthy of a retry. #ifndef _WIN32 - if (no_site_spawner) { + if (flags.no_site_spawner) { // The astute reader will notice this we're calling run_service_as_daemon() // here and not the various other platform spawning functions in the block // further below in this function. This is deliberate: we want @@ -1286,7 +1088,7 @@ static int inner_main(int argc, char** argv) { } #endif - if (foreground) { + if (flags.foreground) { run_service_in_foreground(); return 0; } @@ -1297,9 +1099,9 @@ static int inner_main(int argc, char** argv) { bool ran = try_command(cmd, 0); if (!ran && should_start(errno)) { - if (no_spawn) { - if (!no_local) { - ran = try_client_mode_command(cmd, !no_pretty); + if (flags.no_spawn) { + if (!flags.no_local) { + ran = try_client_mode_command(cmd, !flags.no_pretty); } } else { // Failed to run command. Try to spawn a daemon. @@ -1344,7 +1146,7 @@ static int inner_main(int argc, char** argv) { return 0; } - if (!no_spawn) { + if (!flags.no_spawn) { log(ERR, "unable to talk to your watchman on ", get_sock_name_legacy(), diff --git a/watchman/perf.cpp b/watchman/perf.cpp index 5cd3ab0622ac..cb4aedacd261 100644 --- a/watchman/perf.cpp +++ b/watchman/perf.cpp @@ -6,6 +6,7 @@ #include #include "watchman/ChildProcess.h" #include "watchman/Logging.h" +#include "watchman/Options.h" #include "watchman/WatchmanConfig.h" #include "watchman/watchman.h" #include "watchman/watchman_perf.h" @@ -198,7 +199,8 @@ void PerfLogThread::loop() noexcept { w_set_thread_name("perflog"); - auto stateDir = w_string_piece(watchman_state_file).dirName().asWString(); + auto stateDir = + w_string_piece(flags.watchman_state_file).dirName().asWString(); perf_cmd = cfg_get_json("perf_logger_command"); if (perf_cmd.isString()) { diff --git a/watchman/root/symlink.cpp b/watchman/root/symlink.cpp index 143df953223f..ec6be9e95fb6 100644 --- a/watchman/root/symlink.cpp +++ b/watchman/root/symlink.cpp @@ -9,8 +9,7 @@ #include "watchman/watchman.h" #include "watchman/watchman_system.h" -using watchman::readSymbolicLink; -using watchman::realPath; +using namespace watchman; // Given a target of the form "absolute_path/filename", return // realpath(absolute_path) + filename, where realpath(absolute_path) resolves @@ -154,7 +153,7 @@ void watchman_root::processPendingSymlinkTargets() { watchman::ERR, "watch_symlink_target: error computing root_files configuration " "value, consult your log file at ", - log_name, + logging::log_name, " for more details\n"); return; } diff --git a/watchman/sockname.cpp b/watchman/sockname.cpp index aa938a1f955a..44087d826682 100644 --- a/watchman/sockname.cpp +++ b/watchman/sockname.cpp @@ -1,26 +1,25 @@ /* Copyright 2012-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ -#include "watchman/watchman.h" +#include "watchman/Options.h" -std::string unix_sock_name; -std::string named_pipe_path; +using watchman::flags; bool disable_unix_socket = false; bool disable_named_pipe = false; const char* get_sock_name_legacy() { #ifdef _WIN32 - return named_pipe_path.c_str(); + return flags.named_pipe_path.c_str(); #else - return unix_sock_name.c_str(); + return flags.unix_sock_name.c_str(); #endif } const std::string& get_unix_sock_name() { - return unix_sock_name; + return flags.unix_sock_name; } const std::string& get_named_pipe_sock_path() { - return named_pipe_path; + return flags.named_pipe_path; } diff --git a/watchman/state.cpp b/watchman/state.cpp index a49c7703fa35..642fdac35372 100644 --- a/watchman/state.cpp +++ b/watchman/state.cpp @@ -5,13 +5,11 @@ #include #include "watchman/Errors.h" #include "watchman/Logging.h" +#include "watchman/Options.h" #include "watchman/watchman.h" using namespace watchman; -std::string watchman_state_file; -int dont_save_state = 0; - /** The state saving thread is responsible for writing out the * persistent information about the users watches. * It runs in its own thread so that we avoid the possibility @@ -55,7 +53,7 @@ static void state_saver() noexcept { } void w_state_shutdown() { - if (dont_save_state) { + if (flags.dont_save_state) { return; } @@ -64,7 +62,7 @@ void w_state_shutdown() { } bool w_state_load() { - if (dont_save_state) { + if (flags.dont_save_state) { return true; } @@ -72,7 +70,7 @@ bool w_state_load() { json_ref state; try { - state = json_load_file(watchman_state_file.c_str(), 0); + state = json_load_file(flags.watchman_state_file.c_str(), 0); } catch (const std::system_error& exc) { if (exc.code() == watchman::error_code::no_such_file_or_directory) { // No need to alarm anyone if we've never written a state file @@ -81,14 +79,14 @@ bool w_state_load() { logf( ERR, "failed to load json from {}: {}\n", - watchman_state_file, + flags.watchman_state_file, folly::exceptionStr(exc).toStdString()); return false; } catch (const std::exception& exc) { logf( ERR, "failed to parse json from {}: {}\n", - watchman_state_file, + flags.watchman_state_file, folly::exceptionStr(exc).toStdString()); return false; } @@ -151,11 +149,11 @@ static bool do_state_save() { auto state = json_object(); auto file = w_stm_open( - watchman_state_file.c_str(), O_WRONLY | O_TRUNC | O_CREAT, 0600); + flags.watchman_state_file.c_str(), O_WRONLY | O_TRUNC | O_CREAT, 0600); if (!file) { log(ERR, "save_state: unable to open ", - watchman_state_file, + flags.watchman_state_file, " for write: ", folly::errnoStr(errno), "\n"); @@ -177,7 +175,7 @@ static bool do_state_save() { /** Arranges for the state to be saved. * Does not immediately save the state. */ void w_state_save() { - if (dont_save_state) { + if (flags.dont_save_state) { return; } diff --git a/watchman/watcher/fsevents.cpp b/watchman/watcher/fsevents.cpp index e7e7f3985ef6..45c361c4c697 100644 --- a/watchman/watcher/fsevents.cpp +++ b/watchman/watcher/fsevents.cpp @@ -516,7 +516,7 @@ void FSEventsWatcher::FSEventsThread( if (!FSEventStreamStart(stream_->stream)) { root->failure_reason = w_string::build( "FSEventStreamStart failed, look at your log file ", - log_name, + logging::log_name, " for lines mentioning FSEvents and see ", cfg_get_trouble_url(), "#fsevents for more information\n"); diff --git a/watchman/watchman.h b/watchman/watchman.h index 91ea27e2c461..520597071d7c 100644 --- a/watchman/watchman.h +++ b/watchman/watchman.h @@ -40,8 +40,6 @@ void w_request_shutdown(); #include "watchman/watchman_time.h" extern std::string watchman_tmp_dir; -extern std::string watchman_state_file; -extern int dont_save_state; void w_state_shutdown(); void w_state_save(); bool w_state_load(); @@ -60,16 +58,12 @@ namespace watchman { void startSanityCheckThread(); } -#include "watchman_getopt.h" - #ifdef HAVE_SYS_SIGLIST #define w_strsignal(val) sys_siglist[(val)] #else #define w_strsignal(val) strsignal((val)) #endif -extern std::string unix_sock_name; -extern std::string named_pipe_path; extern bool disable_unix_socket; extern bool disable_named_pipe; From faf68c368be75406c2bcba203a95f50e093f2620 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Wed, 11 Aug 2021 12:52:25 -0700 Subject: [PATCH 0464/7387] split options into its own target Summary: Move Options.cpp and Options.h into their own buck target. Reviewed By: kmancini Differential Revision: D30028850 fbshipit-source-id: f034a5a380ca75471798adc6a72a3c39cda79d8a --- watchman/Options.cpp | 16 ++++++++++++++++ watchman/cmds/reg.cpp | 19 ------------------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/watchman/Options.cpp b/watchman/Options.cpp index 6bbdc3644ad3..dcb7c7ce1a50 100644 --- a/watchman/Options.cpp +++ b/watchman/Options.cpp @@ -4,6 +4,7 @@ #include "watchman/Options.h" #include #include +#include "watchman/CommandRegistry.h" #include "watchman/LogConfig.h" #include "watchman/Logging.h" #include "watchman/WatchmanConfig.h" @@ -451,6 +452,21 @@ void parseOptions(int* argcp, char*** argvp, char*** daemon_argv) { } } +void print_command_list_for_help(FILE* where) { + auto defs = get_all_commands(); + std::sort( + defs.begin(), + defs.end(), + [](command_handler_def* A, command_handler_def* B) { + return strcmp(A->name, B->name) < 0; + }); + + fprintf(where, "\n\nAvailable commands:\n\n"); + for (auto& def : defs) { + fprintf(where, " %s\n", def->name); + } +} + } // namespace watchman /* vim:ts=2:sw=2:et: diff --git a/watchman/cmds/reg.cpp b/watchman/cmds/reg.cpp index 3281f3e9334f..b76b43c87752 100644 --- a/watchman/cmds/reg.cpp +++ b/watchman/cmds/reg.cpp @@ -12,25 +12,6 @@ using namespace watchman; * that we have done so and provide some advice on how the user can cure us. */ folly::Synchronized poisoned_reason; -namespace watchman { - -void print_command_list_for_help(FILE* where) { - auto defs = get_all_commands(); - std::sort( - defs.begin(), - defs.end(), - [](command_handler_def* A, command_handler_def* B) { - return strcmp(A->name, B->name) < 0; - }); - - fprintf(where, "\n\nAvailable commands:\n\n"); - for (auto& def : defs) { - fprintf(where, " %s\n", def->name); - } -} - -} // namespace watchman - command_handler_def* lookup(const json_ref& args, int mode) { const char* cmd_name; From a4a1b55f4ea41d0d44c5cb75422fc53dad1a0a5f Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Thu, 12 Aug 2021 10:55:17 -0700 Subject: [PATCH 0465/7387] fix test_hg_failure Summary: test_hg_failure is quite flaky on my machine. It's maybe not even a good test. Add some loops to wait for the appropriate conditions. Reviewed By: fanzeyi Differential Revision: D30267327 fbshipit-source-id: effa8a617a3f4ae4033c4160f345797a6d8f8070 --- .../tests/integration/test_eden_subscribe.py | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/watchman/tests/integration/test_eden_subscribe.py b/watchman/tests/integration/test_eden_subscribe.py index 417c71d83294..87254c2dab51 100644 --- a/watchman/tests/integration/test_eden_subscribe.py +++ b/watchman/tests/integration/test_eden_subscribe.py @@ -10,6 +10,10 @@ import WatchmanEdenTestCase +def possible_cookie(name): + return ".watchman-cookie-" in name + + class TestEdenSubscribe(WatchmanEdenTestCase.WatchmanEdenTestCase): def requiresPersistentSession(self): return True @@ -170,8 +174,8 @@ def populate(repo): dat = self.waitForSub("myname", root=root)[0] self.assertTrue(dat["is_fresh_instance"]) self.assertFileListsEqual( - dat["files"], self.eden_dir_entries + [".eden", ".watchmanconfig", "hello", "welcome"], + dat["files"], ) # Sanity check that the subscription is working @@ -184,15 +188,25 @@ def populate(repo): # Since watchman won't be able to run hg to query the list of files changed # between commits, it will generate a fresh instance result. repo.update(commits[0]) - dat = self.waitForSub("myname", root=root)[0] + + # hg update may issue multiple subscription changes. Wait for the first one that is a fresh instance. + while True: + dat = self.waitForSub("myname", root=root)[0] + if "is_fresh_instance" not in dat: + print("dat", dat) + if dat["is_fresh_instance"]: + break + + self.assertEqual(True, dat["is_fresh_instance"]) self.assertFileListsEqual( - dat["files"], self.eden_dir_entries + [".eden", ".watchmanconfig", "hello", "w0000t"], + [x for x in dat["files"] if not possible_cookie(x)], ) - self.assertEqual(True, dat["is_fresh_instance"]) # Make sure the subscription still delivers normal file update events self.touchRelative(root, "new2") - dat = self.waitForSub("myname", root=root)[0] - self.assertEqual(False, dat["is_fresh_instance"]) - self.assertFileListsEqual(dat["files"], ["new2"]) + while True: + dat = self.waitForSub("myname", root=root)[0] + self.assertEqual(False, dat["is_fresh_instance"]) + if "new2" in dat["files"]: + break From 82e65e7010bf17391d016814510d283cc4b133e7 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Thu, 12 Aug 2021 10:55:17 -0700 Subject: [PATCH 0466/7387] use w_string_piece in CookieSync Summary: w_string_piece is more general than const w_string& and I needed it for debugging. Reviewed By: fanzeyi Differential Revision: D30268713 fbshipit-source-id: d7daabd8583f24a585e0019e5bb5acd55214e1b7 --- watchman/CookieSync.cpp | 10 +++++----- watchman/CookieSync.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/watchman/CookieSync.cpp b/watchman/CookieSync.cpp index 3bc53e3a1a40..3e2e0770dc95 100644 --- a/watchman/CookieSync.cpp +++ b/watchman/CookieSync.cpp @@ -208,21 +208,21 @@ void CookieSync::notifyCookie(const w_string& path) { } } -bool CookieSync::isCookiePrefix(const w_string& path) { +bool CookieSync::isCookiePrefix(w_string_piece path) { auto cookieDirs = cookieDirs_.rlock(); for (const auto& dir : cookieDirs->dirs_) { - if (w_string_startswith(path, dir) && - w_string_startswith(path.baseName(), cookieDirs->cookiePrefix_)) { + if (path.startsWith(dir) && + path.baseName().startsWith(cookieDirs->cookiePrefix_)) { return true; } } return false; } -bool CookieSync::isCookieDir(const w_string& path) { +bool CookieSync::isCookieDir(w_string_piece path) { auto cookieDirs = cookieDirs_.rlock(); for (const auto& dir : cookieDirs->dirs_) { - if (w_string_equal(path, dir)) { + if (path == dir) { return true; } } diff --git a/watchman/CookieSync.h b/watchman/CookieSync.h index 9330fc2e917c..86991cd4bc6c 100644 --- a/watchman/CookieSync.h +++ b/watchman/CookieSync.h @@ -53,10 +53,10 @@ class CookieSync { void abortAllCookies(); // Check if this path matches an actual cookie. - bool isCookiePrefix(const w_string& path); + bool isCookiePrefix(w_string_piece path); // Check if the path matches a cookie directory. - bool isCookieDir(const w_string& path); + bool isCookieDir(w_string_piece path); // Returns the set of prefixes for cookie files std::unordered_set cookiePrefix() const; From 434e3b29a7f81e4aee1893a15a6130ed532ee22b Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Thu, 12 Aug 2021 10:55:17 -0700 Subject: [PATCH 0467/7387] refactor eden watcher Reviewed By: fanzeyi Differential Revision: D30268727 fbshipit-source-id: 9c14176411e846a97d1825e7f025e9beda9b57b2 --- watchman/watcher/eden.cpp | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index 2c62c0133b90..f615733a9860 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -183,7 +183,7 @@ class EdenFileResult : public FileResult { JournalPosition* position = nullptr, bool isNew = false, DType dtype = DType::Unknown) - : root_path_(rootPath), + : rootPath_(rootPath), thriftChannel_{std::move(thriftChannel)}, fullName_(fullName), dtype_(dtype) { @@ -353,13 +353,13 @@ class EdenFileResult : public FileResult { auto relName = edenFile.fullName_.piece(); - if (root_path_ == edenFile.fullName_) { + if (rootPath_ == edenFile.fullName_) { // The root tree inode has changed relName = ""; } else { // Strip off the mount point prefix for the names we're going // to pass to eden. The +1 is its trailing slash. - relName.advance(root_path_.size() + 1); + relName.advance(rootPath_.size() + 1); } if (edenFile.neededProperties() & FileResult::Property::SymlinkTarget) { @@ -401,7 +401,7 @@ class EdenFileResult : public FileResult { auto client = getEdenClient(thriftChannel_); loadFileInformation( client.get(), - root_path_, + rootPath_, getFileInformationNames, getFileInformationFiles, onlyEntryInfoNeeded); @@ -411,7 +411,7 @@ class EdenFileResult : public FileResult { if (!getShaFiles.empty()) { std::vector sha1s; - client->sync_getSHA1(sha1s, to(root_path_), getShaNames); + client->sync_getSHA1(sha1s, to(rootPath_), getShaNames); if (sha1s.size() != getShaFiles.size()) { watchman::log( @@ -431,7 +431,7 @@ class EdenFileResult : public FileResult { } private: - w_string root_path_; + w_string rootPath_; std::shared_ptr thriftChannel_; w_string fullName_; Optional stat_; @@ -733,7 +733,7 @@ std::shared_ptr makeThriftChannel( } // namespace class EdenView final : public QueryableView { - w_string root_path_; + w_string rootPath_; std::shared_ptr thriftChannel_; // The source control system that we detected during initialization mutable std::unique_ptr scm_; @@ -746,9 +746,9 @@ class EdenView final : public QueryableView { public: explicit EdenView(watchman_root* root) - : root_path_(root->root_path), + : rootPath_(root->root_path), thriftChannel_(makeThriftChannel( - root_path_, + rootPath_, root->config.getInt("eden_retry_connection_count", 3))), scm_(EdenWrappedSCM::wrap(SCM::scmForPath(root->root_path))), mountPoint_(to(root->root_path)), @@ -977,7 +977,7 @@ class EdenView final : public QueryableView { bool isNew = createdFileNames.find(item.name) != createdFileNames.end(); auto file = make_unique( - root_path_, + rootPath_, thriftChannel_, w_string::pathCat({mountPoint_, item.name}), &resultPosition, @@ -1000,7 +1000,11 @@ class EdenView final : public QueryableView { void syncToNow( const std::shared_ptr&, - std::chrono::milliseconds) override {} + std::chrono::milliseconds) override { + // TODO: on FUSE and NFS, where all writes give synchronous notifications to + // the EdenFS daemon, cookie files are not necessary, and could be replaced + // with a Thrift call here. + } void executeGlobBasedQuery( const std::vector& globStrings, @@ -1021,7 +1025,7 @@ class EdenView final : public QueryableView { for (auto& item : fileInfo) { auto file = make_unique( - root_path_, + rootPath_, thriftChannel_, w_string::pathCat({mountPoint_, item.name}), /* position=*/nullptr, @@ -1172,7 +1176,7 @@ class EdenView final : public QueryableView { // first, and then add a bulk CookieSync::notifyCookies() method to avoid // locking and unlocking its internal mutex so frequently. for (auto& file : *delta.createdPaths_ref()) { - auto full = w_string::pathCat({root_path_, file}); + auto full = w_string::pathCat({rootPath_, file}); root->cookies.notifyCookie(full); } From 9025a70edeb8800e1a05d420dc9d646814b92cc3 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Thu, 12 Aug 2021 11:41:04 -0700 Subject: [PATCH 0468/7387] fix cppclient test by running it in a temporary directory Summary: On my devserver, running test_cppclient inside the repo is very slow and flaky. Run cppclient inside of a temporary directory instead. Reviewed By: fanzeyi Differential Revision: D30257260 fbshipit-source-id: 75f8e25441dad768ad5e8b12916f3c1e3e9b9236 --- watchman/tests/integration/test_cppclient.py | 24 ++++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/watchman/tests/integration/test_cppclient.py b/watchman/tests/integration/test_cppclient.py index e76ef0a6a0ab..1c3e2698c0e6 100644 --- a/watchman/tests/integration/test_cppclient.py +++ b/watchman/tests/integration/test_cppclient.py @@ -2,23 +2,16 @@ # Copyright 2016-present Facebook, Inc. # Licensed under the Apache License, Version 2.0 -# no unicode literals -from __future__ import absolute_import, division, print_function - import os import os.path import signal import subprocess +import tempfile +import unittest import Interrupt import WatchmanInstance - -try: - import unittest2 as unittest -except ImportError: - import unittest - WATCHMAN_SRC_DIR = os.environ.get("WATCHMAN_SRC_DIR", os.getcwd()) TEST_BINARY = ( os.environ["WATCHMAN_CPPCLIENT_BINARY"] @@ -28,6 +21,13 @@ class TestCppClient(unittest.TestCase): + def setUp(self): + self.tmpDirCtx = tempfile.TemporaryDirectory() # noqa P201 + self.tmpDir = self.tmpDirCtx.__enter__() + + def tearDown(self): + self.tmpDirCtx.__exit__(None, None, None) + @unittest.skipIf(not os.path.isfile(TEST_BINARY), "test binary not built") def test_cppclient(self): env = os.environ.copy() @@ -35,7 +35,11 @@ def test_cppclient(self): WatchmanInstance.getSharedInstance().getSockPath().legacy_sockpath() ) proc = subprocess.Popen( - TEST_BINARY, env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE + TEST_BINARY, + env=env, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + cwd=self.tmpDir, ) (stdout, stderr) = proc.communicate() status = proc.poll() From 5fd4504168c41a8e8851bb01264eefb3429c5f54 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 12 Aug 2021 19:29:26 -0700 Subject: [PATCH 0469/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/4bb31fa94c75dc236b4ba75fc3019612d25562a7 https://github.com/facebook/fbthrift/commit/d7809b9fa26c82546b25c6231f4f7996b265555b https://github.com/facebook/fbzmq/commit/b3d4e4eb20b089793a763998b15aaabf42d9f101 https://github.com/facebook/folly/commit/d365f9e4a4e95d3e5bec6c5b0d481948d3ea67f5 https://github.com/facebook/litho/commit/cb31d715edc8bc4662b43a4d08b2141a89282fb2 https://github.com/facebook/mcrouter/commit/04a9356391619cc2ef5cd6c372ad73d0cc6a8768 https://github.com/facebook/proxygen/commit/855c34db0a0500fb05042266ebc008971d7788cf https://github.com/facebook/rocksdb/commit/74a652a45ff63350640245ba7994bebc748bb0d4 https://github.com/facebook/squangle/commit/54b96ed20746aa8c74b1f520a19deda8a480c76b https://github.com/facebook/wangle/commit/72a39bdf69184b5bc8588bd0e00eb214dfba06f4 https://github.com/facebook/watchman/commit/9025a70edeb8800e1a05d420dc9d646814b92cc3 https://github.com/facebookexperimental/rust-shed/commit/fa57c1143d1da787b2b03d16eda3f0fd7070147b https://github.com/facebookexternal/stl_tasks/commit/c13935815e7df38dc0efb37ab14b67cda2543e57 https://github.com/facebookincubator/conversionsapi-tag-for-googletagmanager/commit/bd3274c1e98b0b2c49813d6a5fd4943ec8aad1ea https://github.com/facebookincubator/eigen-fbplugins/commit/f6817207010f202f8944e87c219ce2b2da478eb7 https://github.com/facebookincubator/fizz/commit/e86e4d421a1645438f755108ef4e2cf96d74ad43 https://github.com/facebookincubator/katran/commit/004390e5f807f108ca7ceb90f604c015250609b7 https://github.com/facebookincubator/mvfst/commit/3632b97656317092a9c4dab2edee63173006d058 https://github.com/facebookresearch/opacus-lab/commit/3d6a0a6fb220a3fb65a3bd80946b5d300a0b33fe https://github.com/facebookresearch/pytorch-biggraph/commit/f8da70040f6aaecd0aa576a1b3b05dfead5658bb https://github.com/pytorch/fbgemm/commit/bf9ed7dfce1fc2386349908950764bfda7089b4a https://github.com/pytorch/kineto/commit/7048221ccf54b32b45e20a5b7badfcf91ded5a99 https://github.com/rsocket/rsocket-cpp/commit/c5d9e4a208b4670ac01d14b1fae74a4c0d7945d2 Reviewed By: bigfootjon fbshipit-source-id: d1f210e15f8b9de835bbfa0ece9117051765ff34 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 53ce48fcfe06..4f53b8364159 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit aa7042ba3a3ced385efd25840fce8b64c623298a +Subproject commit d7809b9fa26c82546b25c6231f4f7996b265555b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 945702576e2b..9532ee368bc1 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 37e6bbcc067b70ac8745444d4921926df8416508 +Subproject commit d365f9e4a4e95d3e5bec6c5b0d481948d3ea67f5 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 87dc0eaf39aa..0e977602f57f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3edf724cf36783a36801f9c8f6aff253f5a29839 +Subproject commit 72a39bdf69184b5bc8588bd0e00eb214dfba06f4 From 9e6fe179cc86fbfbe6beaf8fa9f740d839e71a39 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Fri, 13 Aug 2021 01:28:02 -0700 Subject: [PATCH 0470/7387] move FileResult into its own file Summary: Refactoring. Reviewed By: xavierd Differential Revision: D30005535 fbshipit-source-id: d7303fbe32957f0c03efbb285a5895dc5b55be59 --- watchman/query/FileResult.h | 147 ++++++++++++++++++++++++++++++++++ watchman/query/pcre.cpp | 3 +- watchman/watchman_query.h | 154 +++--------------------------------- 3 files changed, 160 insertions(+), 144 deletions(-) create mode 100644 watchman/query/FileResult.h diff --git a/watchman/query/FileResult.h b/watchman/query/FileResult.h new file mode 100644 index 000000000000..750ba4083a7f --- /dev/null +++ b/watchman/query/FileResult.h @@ -0,0 +1,147 @@ +/* Copyright 2012-present Facebook, Inc. + * Licensed under the Apache License, Version 2.0 */ + +#pragma once + +#include +#include +#include "watchman/Clock.h" +#include "watchman/FileInformation.h" +#include "watchman/watchman_string.h" + +namespace watchman { + +// A View-independent way of accessing file properties in the +// query engine. A FileResult is not intended to be accessed +// concurrently from multiple threads and may be unsafe to +// be used in that manner (there is no implied locking). +class FileResult { + public: + virtual ~FileResult(); + + // Maybe returns the file information. + // Returns folly::none if the file information is not yet known. + virtual folly::Optional stat() = 0; + + // Returns the stat.st_atime field + virtual folly::Optional accessedTime() = 0; + + // Returns the stat.st_mtime field + virtual folly::Optional modifiedTime() = 0; + + // Returns the stat.st_ctime field + virtual folly::Optional changedTime() = 0; + + // Returns the size of the file in bytes, as reported in + // the stat.st_size field. + virtual folly::Optional size() = 0; + + // Returns the name of the file in its containing dir + virtual w_string_piece baseName() = 0; + // Returns the name of the containing dir relative to the + // VFS root + virtual w_string_piece dirName() = 0; + + // Maybe return the file existence status. + // Returns folly::none if the information is not currently known. + virtual folly::Optional exists() = 0; + + // Returns the symlink target + virtual folly::Optional readLink() = 0; + + // Maybe return the change time. + // Returns folly::none if ctime is not currently known + virtual folly::Optional ctime() = 0; + + // Maybe return the observed time. + // Returns folly::none if otime is not currently known + virtual folly::Optional otime() = 0; + + // Returns the SHA-1 hash of the file contents + using ContentHash = std::array; + virtual folly::Optional getContentSha1() = 0; + + // Maybe return the dtype. + // Returns folly::none if the dtype is not currently known. + // Returns DType::Unknown if we have dtype data but it doesn't + // tell us the dtype (this is common on some older filesystems + // on linux). + virtual folly::Optional dtype(); + + // A bitset of Property values + using Properties = uint_least16_t; + + // Represents one of the FileResult fields. + // Values are such that these can be bitwise OR'd to + // produce a value of type `Properties` representing + // multiple properties + enum Property : Properties { + // No specific fields required + None = 0, + // The dirName() and/or baseName() methods will be called + Name = 1 << 0, + // Need the mtime/ctime data returned by stat(2). + StatTimeStamps = 1 << 1, + // Need only enough information to distinguish between + // file types, not the full mode information. + FileDType = 1 << 2, + // The ctime() method will be called + CTime = 1 << 3, + // The otime() method will be called + OTime = 1 << 4, + // The getContentSha1() method will be called + ContentSha1 = 1 << 5, + // The exists() method will be called + Exists = 1 << 6, + // Will need size information. + Size = 1 << 7, + // the readLink() method will be called + SymlinkTarget = 1 << 8, + // Need full stat metadata + FullFileInformation = 1 << 9, + }; + + // Perform a batch fetch to fill in some missing data. + // `files` is the set of FileResult instances that need more + // data; their individual neededProperties_ values describes + // the set of data that is needed. + // `files` are assumed to all be of the same FileResult descendant, + // and this is guaranteed by the current implementation. + // When batchFetchProperties is called, it is invoked on one of + // the elements of `files`. + // The expectation is that the implementation of `batchFetchProperties` + // will perform whatever actions are necessary to ensure that + // a subsequent attempt to evaluate `neededProperties_` against each + // member of `files` will not result in adding any of + // those `FileResult` instances in being added to a deferred + // batch. + // The implementation of batchFetchProperties must clear + // neededProperties_ to None. + virtual void batchFetchProperties( + const std::vector>& files) = 0; + + protected: + // To be called by one of the FileResult accessors when it needs + // to record which properties are required to satisfy the request. + void accessorNeedsProperties(Properties properties) { + neededProperties_ |= properties; + } + + // Clear any recorded needed properties + void clearNeededProperties() { + neededProperties_ = Property::None; + } + + // Return the set of needed properties + Properties neededProperties() const { + return neededProperties_; + } + + private: + // The implementation of FileResult will set appropriate + // bits in neededProperties_ when its accessors are called + // and the associated data is not available. + Properties neededProperties_{Property::None}; +}; + +} // namespace watchman diff --git a/watchman/query/pcre.cpp b/watchman/query/pcre.cpp index 1fb43c82bc20..11cdfadb6fd9 100644 --- a/watchman/query/pcre.cpp +++ b/watchman/query/pcre.cpp @@ -7,8 +7,7 @@ #ifdef HAVE_PCRE_H -using watchman::CaseSensitivity; -using watchman::QueryParseError; +using namespace watchman; class PcreExpr : public QueryExpr { pcre* re; diff --git a/watchman/watchman_query.h b/watchman/watchman_query.h index fd16b2abd25f..f91cafca7495 100644 --- a/watchman/watchman_query.h +++ b/watchman/watchman_query.h @@ -13,159 +13,22 @@ #include #include "watchman/Clock.h" #include "watchman/FileSystem.h" +#include "watchman/query/FileResult.h" -namespace watchman { -struct FileInformation; -} struct watchman_file; - struct w_query; struct w_query_ctx; -class FileResult; struct w_query_field_renderer { w_string name; - folly::Optional (*make)(FileResult* file, const w_query_ctx* ctx); + folly::Optional ( + *make)(watchman::FileResult* file, const w_query_ctx* ctx); }; using w_query_field_list = std::vector; using watchman_root = struct watchman_root; - using w_query_since = watchman::QuerySince; -// A View-independent way of accessing file properties in the -// query engine. A FileResult is not intended to be accessed -// concurrently from multiple threads and may be unsafe to -// be used in that manner (there is no implied locking). -class FileResult { - public: - virtual ~FileResult(); - - // Maybe returns the file information. - // Returns folly::none if the file information is not yet known. - virtual folly::Optional stat() = 0; - - // Returns the stat.st_atime field - virtual folly::Optional accessedTime() = 0; - - // Returns the stat.st_mtime field - virtual folly::Optional modifiedTime() = 0; - - // Returns the stat.st_ctime field - virtual folly::Optional changedTime() = 0; - - // Returns the size of the file in bytes, as reported in - // the stat.st_size field. - virtual folly::Optional size() = 0; - - // Returns the name of the file in its containing dir - virtual w_string_piece baseName() = 0; - // Returns the name of the containing dir relative to the - // VFS root - virtual w_string_piece dirName() = 0; - - // Maybe return the file existence status. - // Returns folly::none if the information is not currently known. - virtual folly::Optional exists() = 0; - - // Returns the symlink target - virtual folly::Optional readLink() = 0; - - // Maybe return the change time. - // Returns folly::none if ctime is not currently known - virtual folly::Optional ctime() = 0; - - // Maybe return the observed time. - // Returns folly::none if otime is not currently known - virtual folly::Optional otime() = 0; - - // Returns the SHA-1 hash of the file contents - using ContentHash = std::array; - virtual folly::Optional getContentSha1() = 0; - - // Maybe return the dtype. - // Returns folly::none if the dtype is not currently known. - // Returns DType::Unknown if we have dtype data but it doesn't - // tell us the dtype (this is common on some older filesystems - // on linux). - virtual folly::Optional dtype(); - - // A bitset of Property values - using Properties = uint_least16_t; - - // Represents one of the FileResult fields. - // Values are such that these can be bitwise OR'd to - // produce a value of type `Properties` representing - // multiple properties - enum Property : Properties { - // No specific fields required - None = 0, - // The dirName() and/or baseName() methods will be called - Name = 1 << 0, - // Need the mtime/ctime data returned by stat(2). - StatTimeStamps = 1 << 1, - // Need only enough information to distinguish between - // file types, not the full mode information. - FileDType = 1 << 2, - // The ctime() method will be called - CTime = 1 << 3, - // The otime() method will be called - OTime = 1 << 4, - // The getContentSha1() method will be called - ContentSha1 = 1 << 5, - // The exists() method will be called - Exists = 1 << 6, - // Will need size information. - Size = 1 << 7, - // the readLink() method will be called - SymlinkTarget = 1 << 8, - // Need full stat metadata - FullFileInformation = 1 << 9, - }; - - // Perform a batch fetch to fill in some missing data. - // `files` is the set of FileResult instances that need more - // data; their individual neededProperties_ values describes - // the set of data that is needed. - // `files` are assumed to all be of the same FileResult descendant, - // and this is guaranteed by the current implementation. - // When batchFetchProperties is called, it is invoked on one of - // the elements of `files`. - // The expectation is that the implementation of `batchFetchProperties` - // will perform whatever actions are necessary to ensure that - // a subsequent attempt to evaluate `neededProperties_` against each - // member of `files` will not result in adding any of - // those `FileResult` instances in being added to a deferred - // batch. - // The implementation of batchFetchProperties must clear - // neededProperties_ to None. - virtual void batchFetchProperties( - const std::vector>& files) = 0; - - protected: - // To be called by one of the FileResult accessors when it needs - // to record which properties are required to satisfy the request. - void accessorNeedsProperties(Properties properties) { - neededProperties_ |= properties; - } - - // Clear any recorded needed properties - void clearNeededProperties() { - neededProperties_ = Property::None; - } - - // Return the set of needed properties - Properties neededProperties() const { - return neededProperties_; - } - - private: - // The implementation of FileResult will set appropriate - // bits in neededProperties_ when its accessors are called - // and the associated data is not available. - Properties neededProperties_{Property::None}; -}; - enum class QueryContextState { NotStarted, WaitingForCookieSync, @@ -177,6 +40,8 @@ enum class QueryContextState { // Holds state for the execution of a query struct w_query_ctx { + using FileResult = watchman::FileResult; + std::chrono::time_point created; folly::stop_watch stopWatch; std::atomic state{QueryContextState::NotStarted}; @@ -308,6 +173,9 @@ enum AggregateOp { using EvaluateResult = folly::Optional; class QueryExpr { + protected: + using FileResult = watchman::FileResult; + public: virtual ~QueryExpr(); virtual EvaluateResult evaluate(w_query_ctx* ctx, FileResult* file) = 0; @@ -324,6 +192,8 @@ class QueryExpr { struct watchman_glob_tree; struct w_query { + using FileResult = watchman::FileResult; + watchman::CaseSensitivity case_sensitive{ watchman::CaseSensitivity::CaseInSensitive}; bool fail_if_no_saved_state{false}; @@ -387,7 +257,7 @@ std::unique_ptr w_query_expr_parse( void w_query_process_file( w_query* query, struct w_query_ctx* ctx, - std::unique_ptr file); + std::unique_ptr file); // Generator callback, used to plug in an alternate // generator when used in triggers or subscriptions @@ -432,7 +302,7 @@ void w_query_legacy_field_list(w_query_field_list* flist); folly::Optional file_result_to_json( const w_query_field_list& fieldList, - const std::unique_ptr& file, + const std::unique_ptr& file, const w_query_ctx* ctx); void w_query_init_all(); From 5bcc3b24280f0e633d872b91e85ef030456a56c5 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Fri, 13 Aug 2021 01:28:02 -0700 Subject: [PATCH 0471/7387] move QueryContext into its own file Summary: Refactoring Differential Revision: D30005541 fbshipit-source-id: c753e712cf07ae746f9420629d2501008215354e --- CMakeLists.txt | 1 + watchman/InMemoryView.cpp | 12 +-- watchman/InMemoryView.h | 15 ++- watchman/QueryableView.cpp | 8 +- watchman/QueryableView.h | 8 +- watchman/query/QueryContext.cpp | 168 ++++++++++++++++++++++++++++++ watchman/query/QueryContext.h | 146 +++++++++++++++++++++++++++ watchman/query/base.cpp | 8 +- watchman/query/dirname.cpp | 2 +- watchman/query/empty.cpp | 6 +- watchman/query/eval.cpp | 158 ++--------------------------- watchman/query/fieldlist.cpp | 75 +++++--------- watchman/query/glob.cpp | 8 +- watchman/query/intcompare.cpp | 2 +- watchman/query/match.cpp | 2 +- watchman/query/name.cpp | 2 +- watchman/query/parse.cpp | 2 +- watchman/query/pcre.cpp | 2 +- watchman/query/since.cpp | 3 +- watchman/query/suffix.cpp | 2 +- watchman/query/type.cpp | 5 +- watchman/root/watchlist.cpp | 1 + watchman/watcher/eden.cpp | 16 +-- watchman/watchman_query.h | 174 +++++--------------------------- watchman/watchman_root.h | 4 +- 25 files changed, 432 insertions(+), 398 deletions(-) create mode 100644 watchman/query/QueryContext.cpp create mode 100644 watchman/query/QueryContext.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e8a17e498e9..1b10a9096099 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -642,6 +642,7 @@ watchman/stream_stdout.cpp # string.cpp (in libstring) watchman/time.cpp watchman/tmp.cpp +watchman/query/QueryContext.cpp watchman/query/base.cpp watchman/query/dirname.cpp watchman/query/empty.cpp diff --git a/watchman/InMemoryView.cpp b/watchman/InMemoryView.cpp index 2b48a9023929..72e8966911a4 100644 --- a/watchman/InMemoryView.cpp +++ b/watchman/InMemoryView.cpp @@ -7,6 +7,7 @@ #include #include #include "watchman/ThreadPool.h" +#include "watchman/query/QueryContext.h" #include "watchman/scm/SCM.h" #include "watchman/watcher/Watcher.h" #include "watchman/watchman.h" @@ -537,8 +538,7 @@ void InMemoryView::ageOut(w_perf_t& sample, std::chrono::seconds minAge) { {"dirs", json_integer(dirs_to_erase.size())}})); } -void InMemoryView::timeGenerator(w_query* query, struct w_query_ctx* ctx) - const { +void InMemoryView::timeGenerator(w_query* query, QueryContext* ctx) const { struct watchman_file* f; // Walk back in time until we hit the boundary @@ -568,8 +568,7 @@ void InMemoryView::timeGenerator(w_query* query, struct w_query_ctx* ctx) } } -void InMemoryView::pathGenerator(w_query* query, struct w_query_ctx* ctx) - const { +void InMemoryView::pathGenerator(w_query* query, QueryContext* ctx) const { w_string_t* relative_root; struct watchman_file* f; @@ -641,7 +640,7 @@ void InMemoryView::pathGenerator(w_query* query, struct w_query_ctx* ctx) void InMemoryView::dirGenerator( w_query* query, - struct w_query_ctx* ctx, + QueryContext* ctx, const watchman_dir* dir, uint32_t depth) const { for (auto& it : dir->files) { @@ -661,8 +660,7 @@ void InMemoryView::dirGenerator( } } -void InMemoryView::allFilesGenerator(w_query* query, struct w_query_ctx* ctx) - const { +void InMemoryView::allFilesGenerator(w_query* query, QueryContext* ctx) const { struct watchman_file* f; auto view = view_.rlock(); ctx->generationStarted(); diff --git a/watchman/InMemoryView.h b/watchman/InMemoryView.h index 8b58319e3feb..11e6a03dd890 100644 --- a/watchman/InMemoryView.h +++ b/watchman/InMemoryView.h @@ -163,14 +163,13 @@ class InMemoryView final : public QueryableView { bool doAnyOfTheseFilesExist( const std::vector& fileNames) const override; - void timeGenerator(w_query* query, struct w_query_ctx* ctx) const override; + void timeGenerator(w_query* query, QueryContext* ctx) const override; - void pathGenerator(w_query* query, struct w_query_ctx* ctx) const override; + void pathGenerator(w_query* query, QueryContext* ctx) const override; - void globGenerator(w_query* query, struct w_query_ctx* ctx) const override; + void globGenerator(w_query* query, QueryContext* ctx) const override; - void allFilesGenerator(w_query* query, struct w_query_ctx* ctx) - const override; + void allFilesGenerator(w_query* query, QueryContext* ctx) const override; std::shared_future waitUntilReadyToQuery( const std::shared_ptr& root) override; @@ -232,15 +231,15 @@ class InMemoryView final : public QueryableView { /** Recursively walks files under a specified dir */ void dirGenerator( w_query* query, - struct w_query_ctx* ctx, + QueryContext* ctx, const watchman_dir* dir, uint32_t depth) const; void globGeneratorTree( - struct w_query_ctx* ctx, + QueryContext* ctx, const struct watchman_glob_tree* node, const struct watchman_dir* dir) const; void globGeneratorDoublestar( - struct w_query_ctx* ctx, + QueryContext* ctx, const struct watchman_dir* dir, const struct watchman_glob_tree* node, const char* dir_name, diff --git a/watchman/QueryableView.cpp b/watchman/QueryableView.cpp index 273d43f8563a..cc3dee5e17d5 100644 --- a/watchman/QueryableView.cpp +++ b/watchman/QueryableView.cpp @@ -9,20 +9,20 @@ QueryableView::~QueryableView() {} /** Perform a time-based (since) query and emit results to the supplied * query context */ -void QueryableView::timeGenerator(w_query*, struct w_query_ctx*) const { +void QueryableView::timeGenerator(w_query*, QueryContext*) const { throw QueryExecError("timeGenerator not implemented"); } /** Walks files that match the supplied set of paths */ -void QueryableView::pathGenerator(w_query*, struct w_query_ctx*) const { +void QueryableView::pathGenerator(w_query*, QueryContext*) const { throw QueryExecError("pathGenerator not implemented"); } -void QueryableView::globGenerator(w_query*, struct w_query_ctx*) const { +void QueryableView::globGenerator(w_query*, QueryContext*) const { throw QueryExecError("globGenerator not implemented"); } -void QueryableView::allFilesGenerator(w_query*, struct w_query_ctx*) const { +void QueryableView::allFilesGenerator(w_query*, QueryContext*) const { throw QueryExecError("allFilesGenerator not implemented"); } diff --git a/watchman/QueryableView.h b/watchman/QueryableView.h index 54788c1bb2d0..577502205981 100644 --- a/watchman/QueryableView.h +++ b/watchman/QueryableView.h @@ -24,16 +24,16 @@ class QueryableView : public std::enable_shared_from_this { * Perform a time-based (since) query and emit results to the supplied * query context. */ - virtual void timeGenerator(w_query* query, struct w_query_ctx* ctx) const; + virtual void timeGenerator(w_query* query, QueryContext* ctx) const; /** * Walks files that match the supplied set of paths. */ - virtual void pathGenerator(w_query* query, struct w_query_ctx* ctx) const; + virtual void pathGenerator(w_query* query, QueryContext* ctx) const; - virtual void globGenerator(w_query* query, struct w_query_ctx* ctx) const; + virtual void globGenerator(w_query* query, QueryContext* ctx) const; - virtual void allFilesGenerator(w_query* query, struct w_query_ctx* ctx) const; + virtual void allFilesGenerator(w_query* query, QueryContext* ctx) const; virtual ClockPosition getMostRecentRootNumberAndTickValue() const = 0; virtual w_string getCurrentClockString() const = 0; diff --git a/watchman/query/QueryContext.cpp b/watchman/query/QueryContext.cpp new file mode 100644 index 000000000000..e21ea0f1e032 --- /dev/null +++ b/watchman/query/QueryContext.cpp @@ -0,0 +1,168 @@ +/* Copyright 2012-present Facebook, Inc. + * Licensed under the Apache License, Version 2.0 */ + +#include "watchman/query/QueryContext.h" + +#include "watchman/watchman_file.h" +#include "watchman/watchman_query.h" +#include "watchman/watchman_root.h" + +using namespace watchman; + +namespace { + +constexpr size_t kMaximumRenderBatchSize = 1024; + +folly::Optional file_result_to_json( + const QueryFieldList& fieldList, + const std::unique_ptr& file, + const QueryContext* ctx) { + if (fieldList.size() == 1) { + return fieldList.front()->make(file.get(), ctx); + } + auto value = json_object_of_size(fieldList.size()); + + for (auto& f : fieldList) { + auto ele = f->make(file.get(), ctx); + if (!ele.has_value()) { + // Need data to be loaded + return folly::none; + } + value.set(f->name, std::move(ele.value())); + } + return value; +} + +} + +w_string QueryContext::computeWholeName(FileResult* file) const { + uint32_t name_start; + + if (query->relative_root) { + // At this point every path should start with the relative root, so this is + // legal + name_start = query->relative_root.size() + 1; + } else { + name_start = root->root_path.size() + 1; + } + + // Record the name relative to the root + auto parent = file->dirName(); + if (name_start > parent.size()) { + return file->baseName().asWString(); + } + parent.advance(name_start); + return w_string::build(parent, "/", file->baseName()); +} + +bool QueryContext::dirMatchesRelativeRoot(w_string_piece fullDirectoryPath) { + if (!query->relative_root) { + return true; + } + + // "matches relative root" here can be either an exact match for + // the relative root, or some path below it, so we compare against + // both. relative_root_slash is a precomputed version of relative_root + // with the trailing slash to make this comparison very slightly cheaper + // and less awkward to express in code. + return fullDirectoryPath == query->relative_root || + fullDirectoryPath.startsWith(query->relative_root_slash); +} + +bool QueryContext::fileMatchesRelativeRoot(w_string_piece fullFilePath) { + // dirName() scans the string contents; avoid it with this cheap test + if (!query->relative_root) { + return true; + } + + return dirMatchesRelativeRoot(fullFilePath.dirName()); +} + +bool QueryContext::fileMatchesRelativeRoot(const watchman_file* f) { + // getFullPath() allocates memory; avoid it with this cheap test + if (!query->relative_root) { + return true; + } + + return dirMatchesRelativeRoot(f->parent->getFullPath()); +} + +QueryContext::QueryContext( + w_query* q, + const std::shared_ptr& root, + bool disableFreshInstance) + : created(std::chrono::steady_clock::now()), + query(q), + root(root), + resultsArray(json_array()), + disableFreshInstance{disableFreshInstance} { + // build a template for the serializer + if (query->fieldList.size() > 1) { + json_array_set_template_new( + resultsArray, field_list_to_json_name_array(query->fieldList)); + } +} + +void QueryContext::addToEvalBatch(std::unique_ptr&& file) { + evalBatch_.emplace_back(std::move(file)); + + // Find a balance between local memory usage, latency in fetching + // and the cost of fetching the data needed to re-evaluate this batch. + // TODO: maybe allow passing this number in via the query? + if (evalBatch_.size() >= 20480) { + fetchEvalBatchNow(); + } +} + +void QueryContext::fetchEvalBatchNow() { + if (evalBatch_.empty()) { + return; + } + evalBatch_.front()->batchFetchProperties(evalBatch_); + + auto toProcess = std::move(evalBatch_); + + for (auto& file : toProcess) { + w_query_process_file(query, this, std::move(file)); + } + + w_assert(evalBatch_.empty(), "should have no files that NeedDataLoad"); +} + +void QueryContext::maybeRender(std::unique_ptr&& file) { + auto maybeRendered = file_result_to_json(query->fieldList, file, this); + if (maybeRendered.has_value()) { + json_array_append_new(resultsArray, std::move(maybeRendered.value())); + return; + } + + addToRenderBatch(std::move(file)); +} + +void QueryContext::addToRenderBatch(std::unique_ptr&& file) { + renderBatch_.emplace_back(std::move(file)); + // TODO: maybe allow passing this number in via the query? + if (renderBatch_.size() >= kMaximumRenderBatchSize) { + fetchRenderBatchNow(); + } +} + +bool QueryContext::fetchRenderBatchNow() { + if (renderBatch_.empty()) { + return true; + } + renderBatch_.front()->batchFetchProperties(renderBatch_); + + auto toProcess = std::move(renderBatch_); + + for (auto& file : toProcess) { + auto maybeRendered = file_result_to_json(query->fieldList, file, this); + if (maybeRendered.has_value()) { + json_array_append_new(resultsArray, std::move(maybeRendered.value())); + } else { + renderBatch_.emplace_back(std::move(file)); + } + } + + return renderBatch_.empty(); +} diff --git a/watchman/query/QueryContext.h b/watchman/query/QueryContext.h new file mode 100644 index 000000000000..e0f233bfb509 --- /dev/null +++ b/watchman/query/QueryContext.h @@ -0,0 +1,146 @@ +/* Copyright 2012-present Facebook, Inc. + * Licensed under the Apache License, Version 2.0 */ + +#pragma once + +#include +#include +#include "watchman/Clock.h" + +struct w_query; +struct watchman_file; +struct watchman_root; + +namespace watchman { + +class FileResult; + +enum class QueryContextState { + NotStarted, + WaitingForCookieSync, + WaitingForViewLock, + Generating, + Rendering, + Completed, +}; + +// Holds state for the execution of a query +struct QueryContext { + std::chrono::time_point created; + folly::stop_watch stopWatch; + std::atomic state{QueryContextState::NotStarted}; + std::atomic cookieSyncDuration{ + std::chrono::milliseconds(0)}; + std::atomic viewLockWaitDuration{ + std::chrono::milliseconds(0)}; + std::atomic generationDuration{ + std::chrono::milliseconds(0)}; + std::atomic renderDuration{ + std::chrono::milliseconds(0)}; + + void generationStarted() { + viewLockWaitDuration = stopWatch.lap(); + state = QueryContextState::Generating; + } + + w_query* query; + std::shared_ptr root; + std::unique_ptr file; + w_string wholename; + QuerySince since; + // root number, ticks at start of query execution + ClockSpec clockAtStartOfQuery; + uint32_t lastAgeOutTickValueAtStartOfQuery; + + // Rendered results + json_ref resultsArray; + + // When deduping the results, set of + // the files held in results + std::unordered_set dedup; + + // When unconditional_log_if_results_contain_file_prefixes is set + // and one of those prefixes matches a file in the generated results, + // that name is added here with the intent that this is passed + // to the perf logger + std::vector namesToLog; + + // How many times we suppressed a result due to dedup checking + uint32_t num_deduped{0}; + + // Disable fresh instance queries + bool disableFreshInstance{false}; + + QueryContext( + w_query* q, + const std::shared_ptr& root, + bool disableFreshInstance); + QueryContext(const QueryContext&) = delete; + QueryContext& operator=(const QueryContext&) = delete; + + // Increment numWalked_ by the specified amount + inline void bumpNumWalked(int64_t amount = 1) { + numWalked_ += amount; + } + + int64_t getNumWalked() const { + return numWalked_; + } + + // Adds `file` to the currently accumulating batch of files + // that require data to be loaded. + // If the batch is large enough, this will trigger `fetchEvalBatchNow()`. + // This is intended to be called for files that still having + // their expression cause evaluated during w_query_process_file(). + void addToEvalBatch(std::unique_ptr&& file); + + // Perform an immediate fetch of data for the items in the + // evalBatch_ set, and then re-evaluate each of them by passing + // them to w_query_process_file(). + void fetchEvalBatchNow(); + + void maybeRender(std::unique_ptr&& file); + void addToRenderBatch(std::unique_ptr&& file); + + // Perform a batch load of the items in the render batch, + // and attempt to render those items again. + // Returns true if the render batch is empty after rendering + // the items, false if still more data is needed. + bool fetchRenderBatchNow(); + + w_string computeWholeName(FileResult* file) const; + + // Returns true if the filename associated with `f` matches + // the relative_root constraint set on the query. + // Delegates to dirMatchesRelativeRoot(). + bool fileMatchesRelativeRoot(const watchman_file* f); + + // Returns true if the path to the specified file matches the + // relative_root constraint set on the query. fullFilePath is + // a fully qualified absolute path to the file. + // Delegates to dirMatchesRelativeRoot. + bool fileMatchesRelativeRoot(w_string_piece fullFilePath); + + // Returns true if the directory path matches the relative_root + // constraint set on the query. fullDirectoryPath is a fully + // qualified absolute path to a directory. + // If relative_root is not set, always returns true. + bool dirMatchesRelativeRoot(w_string_piece fullDirectoryPath); + + private: + // Number of files considered as part of running this query + int64_t numWalked_{0}; + + // Files for which we encountered NeedMoreData and that we + // will re-evaluate once we have enough of them accumulated + // to batch fetch the required data + std::vector> evalBatch_; + + // Similar to needBatchFetch_ above, except that the files + // in this batch have been successfully matched by the + // expression and are just pending data to be loaded + // for rendering the result fields. + std::vector> renderBatch_; +}; + +} // namespace watchman diff --git a/watchman/query/base.cpp b/watchman/query/base.cpp index cf8c07423fc8..efd6bee04192 100644 --- a/watchman/query/base.cpp +++ b/watchman/query/base.cpp @@ -18,7 +18,7 @@ class NotExpr : public QueryExpr { explicit NotExpr(std::unique_ptr other_expr) : expr(std::move(other_expr)) {} - EvaluateResult evaluate(w_query_ctx* ctx, FileResult* file) override { + EvaluateResult evaluate(QueryContext* ctx, FileResult* file) override { auto res = expr->evaluate(ctx, file); if (!res.has_value()) { return res; @@ -44,7 +44,7 @@ W_TERM_PARSER("not", NotExpr::parse) class TrueExpr : public QueryExpr { public: - EvaluateResult evaluate(w_query_ctx*, FileResult*) override { + EvaluateResult evaluate(QueryContext*, FileResult*) override { return true; } @@ -57,7 +57,7 @@ W_TERM_PARSER("true", TrueExpr::parse) class FalseExpr : public QueryExpr { public: - EvaluateResult evaluate(w_query_ctx*, FileResult*) override { + EvaluateResult evaluate(QueryContext*, FileResult*) override { return false; } @@ -76,7 +76,7 @@ class ListExpr : public QueryExpr { ListExpr(bool isAll, std::vector> exprs) : allof(isAll), exprs(std::move(exprs)) {} - EvaluateResult evaluate(w_query_ctx* ctx, FileResult* file) override { + EvaluateResult evaluate(QueryContext* ctx, FileResult* file) override { bool needData = false; for (auto& expr : exprs) { diff --git a/watchman/query/dirname.cpp b/watchman/query/dirname.cpp index 2106262764ab..84a8bda1b988 100644 --- a/watchman/query/dirname.cpp +++ b/watchman/query/dirname.cpp @@ -25,7 +25,7 @@ class DirNameExpr : public QueryExpr { StartsWith startswith) : dirname(dirname), depth(depth), startswith(startswith) {} - EvaluateResult evaluate(w_query_ctx* ctx, FileResult*) override { + EvaluateResult evaluate(QueryContext* ctx, FileResult*) override { auto& str = w_query_ctx_get_wholename(ctx); size_t i; diff --git a/watchman/query/empty.cpp b/watchman/query/empty.cpp index 1bed194aeb45..c3c82556c39e 100644 --- a/watchman/query/empty.cpp +++ b/watchman/query/empty.cpp @@ -5,9 +5,11 @@ #include +using namespace watchman; + class ExistsExpr : public QueryExpr { public: - EvaluateResult evaluate(struct w_query_ctx*, FileResult* file) override { + EvaluateResult evaluate(QueryContext*, FileResult* file) override { return file->exists(); } @@ -19,7 +21,7 @@ W_TERM_PARSER("exists", ExistsExpr::parse) class EmptyExpr : public QueryExpr { public: - EvaluateResult evaluate(struct w_query_ctx*, FileResult* file) override { + EvaluateResult evaluate(QueryContext*, FileResult* file) override { auto exists = file->exists(); auto stat = file->stat(); auto size = file->size(); diff --git a/watchman/query/eval.cpp b/watchman/query/eval.cpp index e632b27c8fad..80aeb3b6cd0b 100644 --- a/watchman/query/eval.cpp +++ b/watchman/query/eval.cpp @@ -6,16 +6,13 @@ #include #include "watchman/Errors.h" #include "watchman/LocalFileResult.h" +#include "watchman/query/QueryContext.h" #include "watchman/saved_state/SavedStateFactory.h" #include "watchman/saved_state/SavedStateInterface.h" #include "watchman/scm/SCM.h" using namespace watchman; -namespace { -constexpr size_t kMaximumRenderBatchSize = 1024; -} - FileResult::~FileResult() {} folly::Optional FileResult::dtype() { @@ -26,27 +23,7 @@ folly::Optional FileResult::dtype() { return statInfo->dtype(); } -w_string w_query_ctx::computeWholeName(FileResult* file) const { - uint32_t name_start; - - if (query->relative_root) { - // At this point every path should start with the relative root, so this is - // legal - name_start = query->relative_root.size() + 1; - } else { - name_start = root->root_path.size() + 1; - } - - // Record the name relative to the root - auto parent = file->dirName(); - if (name_start > parent.size()) { - return file->baseName().asWString(); - } - parent.advance(name_start); - return w_string::build(parent, "/", file->baseName()); -} - -const w_string& w_query_ctx_get_wholename(struct w_query_ctx* ctx) { +const w_string& w_query_ctx_get_wholename(QueryContext* ctx) { if (ctx->wholename) { return ctx->wholename; } @@ -82,7 +59,7 @@ const std::vector& getUnconditionalLogFilePrefixes() { /* Query evaluator */ void w_query_process_file( w_query* query, - struct w_query_ctx* ctx, + QueryContext* ctx, std::unique_ptr file) { ctx->wholename.reset(); ctx->file = std::move(file); @@ -147,49 +124,17 @@ void w_query_process_file( ctx->maybeRender(std::move(ctx->file)); } -bool w_query_ctx::dirMatchesRelativeRoot(w_string_piece fullDirectoryPath) { - if (!query->relative_root) { - return true; - } - - // "matches relative root" here can be either an exact match for - // the relative root, or some path below it, so we compare against - // both. relative_root_slash is a precomputed version of relative_root - // with the trailing slash to make this comparison very slightly cheaper - // and less awkward to express in code. - return fullDirectoryPath == query->relative_root || - fullDirectoryPath.startsWith(query->relative_root_slash); -} - -bool w_query_ctx::fileMatchesRelativeRoot(w_string_piece fullFilePath) { - // dirName() scans the string contents; avoid it with this cheap test - if (!query->relative_root) { - return true; - } - - return dirMatchesRelativeRoot(fullFilePath.dirName()); -} - -bool w_query_ctx::fileMatchesRelativeRoot(const watchman_file* f) { - // getFullPath() allocates memory; avoid it with this cheap test - if (!query->relative_root) { - return true; - } - - return dirMatchesRelativeRoot(f->parent->getFullPath()); -} - void time_generator( w_query* query, const std::shared_ptr& root, - struct w_query_ctx* ctx) { + QueryContext* ctx) { root->view()->timeGenerator(query, ctx); } static void default_generators( w_query* query, const std::shared_ptr& root, - struct w_query_ctx* ctx) { + QueryContext* ctx) { bool generated = false; // Time based query @@ -216,7 +161,7 @@ static void default_generators( } static void execute_common( - struct w_query_ctx* ctx, + QueryContext* ctx, w_perf_t* sample, w_query_res* res, w_query_generator generator) { @@ -292,86 +237,6 @@ static void execute_common( res->dedupedFileNames = std::move(ctx->dedup); } -w_query_ctx::w_query_ctx( - w_query* q, - const std::shared_ptr& root, - bool disableFreshInstance) - : created(std::chrono::steady_clock::now()), - query(q), - root(root), - resultsArray(json_array()), - disableFreshInstance{disableFreshInstance} { - // build a template for the serializer - if (query->fieldList.size() > 1) { - json_array_set_template_new( - resultsArray, field_list_to_json_name_array(query->fieldList)); - } -} - -void w_query_ctx::addToEvalBatch(std::unique_ptr&& file) { - evalBatch_.emplace_back(std::move(file)); - - // Find a balance between local memory usage, latency in fetching - // and the cost of fetching the data needed to re-evaluate this batch. - // TODO: maybe allow passing this number in via the query? - if (evalBatch_.size() >= 20480) { - fetchEvalBatchNow(); - } -} - -void w_query_ctx::fetchEvalBatchNow() { - if (evalBatch_.empty()) { - return; - } - evalBatch_.front()->batchFetchProperties(evalBatch_); - - auto toProcess = std::move(evalBatch_); - - for (auto& file : toProcess) { - w_query_process_file(query, this, std::move(file)); - } - - w_assert(evalBatch_.empty(), "should have no files that NeedDataLoad"); -} - -void w_query_ctx::maybeRender(std::unique_ptr&& file) { - auto maybeRendered = file_result_to_json(query->fieldList, file, this); - if (maybeRendered.has_value()) { - json_array_append_new(resultsArray, std::move(maybeRendered.value())); - return; - } - - addToRenderBatch(std::move(file)); -} - -void w_query_ctx::addToRenderBatch(std::unique_ptr&& file) { - renderBatch_.emplace_back(std::move(file)); - // TODO: maybe allow passing this number in via the query? - if (renderBatch_.size() >= kMaximumRenderBatchSize) { - fetchRenderBatchNow(); - } -} - -bool w_query_ctx::fetchRenderBatchNow() { - if (renderBatch_.empty()) { - return true; - } - renderBatch_.front()->batchFetchProperties(renderBatch_); - - auto toProcess = std::move(renderBatch_); - - for (auto& file : toProcess) { - auto maybeRendered = file_result_to_json(query->fieldList, file, this); - if (maybeRendered.has_value()) { - json_array_append_new(resultsArray, std::move(maybeRendered.value())); - } else { - renderBatch_.emplace_back(std::move(file)); - } - } - - return renderBatch_.empty(); -} - // Capability indicating support for scm-aware since queries W_CAP_REG("scm-since") @@ -457,7 +322,7 @@ w_query_res w_query_execute( generator = [root, modifiedMergebase, requestId]( w_query* q, const std::shared_ptr& r, - struct w_query_ctx* c) { + QueryContext* c) { auto changedFiles = root->view()->getSCM()->getFilesChangedSinceMergeBaseWith( modifiedMergebase, requestId); @@ -507,11 +372,10 @@ w_query_res w_query_execute( // indicated to omit those. To do so, lets just make an empty // generator. if (query->omit_changed_files) { - generator = [](w_query*, - const std::shared_ptr&, - struct w_query_ctx*) {}; + generator = + [](w_query*, const std::shared_ptr&, QueryContext*) {}; } - w_query_ctx ctx(query, root, disableFreshInstance); + QueryContext ctx{query, root, disableFreshInstance}; // Track the query against the root. // This is to enable the `watchman debug-status` diagnostic command. @@ -561,7 +425,7 @@ w_query_res w_query_execute( if (query->bench_iterations > 0) { for (uint32_t i = 0; i < query->bench_iterations; ++i) { - w_query_ctx c(query, root, ctx.disableFreshInstance); + QueryContext c{query, root, ctx.disableFreshInstance}; w_query_res r; c.clockAtStartOfQuery = ctx.clockAtStartOfQuery; c.since = ctx.since; diff --git a/watchman/query/fieldlist.cpp b/watchman/query/fieldlist.cpp index cc0963e9875c..a9f35acbd238 100644 --- a/watchman/query/fieldlist.cpp +++ b/watchman/query/fieldlist.cpp @@ -2,16 +2,17 @@ * Licensed under the Apache License, Version 2.0 */ #include "watchman/Errors.h" +#include "watchman/query/QueryContext.h" #include "watchman/watchman.h" using namespace watchman; using folly::Optional; -static Optional make_name(FileResult* file, const w_query_ctx* ctx) { +static Optional make_name(FileResult* file, const QueryContext* ctx) { return w_string_to_json(ctx->computeWholeName(file)); } -static Optional make_symlink(FileResult* file, const w_query_ctx*) { +static Optional make_symlink(FileResult* file, const QueryContext*) { auto target = file->readLink(); if (!target.has_value()) { return folly::none; @@ -19,7 +20,7 @@ static Optional make_symlink(FileResult* file, const w_query_ctx*) { return *target ? w_string_to_json(*target) : json_null(); } -static Optional make_sha1_hex(FileResult* file, const w_query_ctx*) { +static Optional make_sha1_hex(FileResult* file, const QueryContext*) { try { auto hash = file->getContentSha1(); if (!hash.has_value()) { @@ -53,7 +54,7 @@ static Optional make_sha1_hex(FileResult* file, const w_query_ctx*) { } } -static Optional make_size(FileResult* file, const w_query_ctx*) { +static Optional make_size(FileResult* file, const QueryContext*) { auto size = file->size(); if (!size.has_value()) { return folly::none; @@ -61,7 +62,7 @@ static Optional make_size(FileResult* file, const w_query_ctx*) { return json_integer(size.value()); } -static Optional make_exists(FileResult* file, const w_query_ctx*) { +static Optional make_exists(FileResult* file, const QueryContext*) { auto exists = file->exists(); if (!exists.has_value()) { return folly::none; @@ -69,7 +70,7 @@ static Optional make_exists(FileResult* file, const w_query_ctx*) { return json_boolean(exists.value()); } -static Optional make_new(FileResult* file, const w_query_ctx* ctx) { +static Optional make_new(FileResult* file, const QueryContext* ctx) { bool is_new = false; if (!ctx->since.is_timestamp && ctx->since.clock.is_fresh_instance) { @@ -92,7 +93,7 @@ static Optional make_new(FileResult* file, const w_query_ctx* ctx) { #define MAKE_CLOCK_FIELD(name, member) \ static Optional make_##name( \ - FileResult* file, const w_query_ctx* ctx) { \ + FileResult* file, const QueryContext* ctx) { \ char buf[128]; \ auto clock = file->member(); \ if (!clock.has_value()) { \ @@ -118,20 +119,20 @@ static_assert( sizeof(json_int_t) >= sizeof(time_t), "json_int_t isn't large enough to hold a time_t"); -#define MAKE_INT_FIELD(name, member) \ - static Optional make_##name( \ - FileResult* file, const w_query_ctx*) { \ - auto stat = file->stat(); \ - if (!stat.has_value()) { \ - /* need to load data */ \ - return folly::none; \ - } \ - return json_integer(stat->member); \ +#define MAKE_INT_FIELD(name, member) \ + static Optional make_##name( \ + FileResult* file, const QueryContext*) { \ + auto stat = file->stat(); \ + if (!stat.has_value()) { \ + /* need to load data */ \ + return folly::none; \ + } \ + return json_integer(stat->member); \ } #define MAKE_TIME_INT_FIELD(name, member, scale) \ static Optional make_##name( \ - FileResult* file, const w_query_ctx*) { \ + FileResult* file, const QueryContext*) { \ auto spec = file->member(); \ if (!spec.has_value()) { \ /* need to load data */ \ @@ -144,7 +145,7 @@ static_assert( #define MAKE_TIME_DOUBLE_FIELD(name, member) \ static Optional make_##name( \ - FileResult* file, const w_query_ctx*) { \ + FileResult* file, const QueryContext*) { \ auto spec = file->member(); \ if (!spec.has_value()) { \ /* need to load data */ \ @@ -188,7 +189,7 @@ MAKE_INT_FIELD(nlink, nlink) static Optional make_type_field( FileResult* file, - const w_query_ctx*) { + const QueryContext*) { auto dtype = file->dtype(); if (dtype.has_value()) { switch (*dtype) { @@ -257,10 +258,10 @@ static Optional make_type_field( } // Helper to construct the list of field defs -static std::unordered_map build_defs() { +static std::unordered_map build_defs() { struct { const char* name; - Optional (*make)(FileResult* file, const w_query_ctx* ctx); + Optional (*make)(FileResult* file, const QueryContext* ctx); } defs[] = { {"name", make_name}, {"symlink_target", make_symlink}, @@ -281,10 +282,10 @@ static std::unordered_map build_defs() { {"type", make_type_field}, {"content.sha1hex", make_sha1_hex}, }; - std::unordered_map map; + std::unordered_map map; for (auto& def : defs) { w_string name(def.name, W_STRING_UNICODE); - map.emplace(name, w_query_field_renderer{name, def.make}); + map.emplace(name, QueryFieldRenderer{name, def.make}); } return map; @@ -292,12 +293,12 @@ static std::unordered_map build_defs() { // Meyers singleton to avoid SIOF wrt. static constructors in this module // and the order that w_ctor_fn callbacks are dispatched. -static std::unordered_map& field_defs() { - static std::unordered_map map(build_defs()); +static std::unordered_map& field_defs() { + static std::unordered_map map(build_defs()); return map; } -json_ref field_list_to_json_name_array(const w_query_field_list& fieldList) { +json_ref field_list_to_json_name_array(const QueryFieldList& fieldList) { auto templ = json_array_of_size(fieldList.size()); for (auto& f : fieldList) { @@ -307,27 +308,7 @@ json_ref field_list_to_json_name_array(const w_query_field_list& fieldList) { return templ; } -Optional file_result_to_json( - const w_query_field_list& fieldList, - const std::unique_ptr& file, - const w_query_ctx* ctx) { - if (fieldList.size() == 1) { - return fieldList.front()->make(file.get(), ctx); - } - auto value = json_object_of_size(fieldList.size()); - - for (auto& f : fieldList) { - auto ele = f->make(file.get(), ctx); - if (!ele.has_value()) { - // Need data to be loaded - return folly::none; - } - value.set(f->name, std::move(ele.value())); - } - return value; -} - -void parse_field_list(json_ref field_list, w_query_field_list* selected) { +void parse_field_list(json_ref field_list, QueryFieldList* selected) { uint32_t i; selected->clear(); diff --git a/watchman/query/glob.cpp b/watchman/query/glob.cpp index 2eb5ca1455b2..2477b91d34f6 100644 --- a/watchman/query/glob.cpp +++ b/watchman/query/glob.cpp @@ -5,6 +5,7 @@ #include #include "watchman/Errors.h" #include "watchman/InMemoryView.h" +#include "watchman/query/QueryContext.h" #include "watchman/thirdparty/wildmatch/wildmatch.h" #include "watchman/watchman.h" @@ -307,7 +308,7 @@ namespace watchman { * as any one of them matches the file node. */ void InMemoryView::globGeneratorDoublestar( - struct w_query_ctx* ctx, + QueryContext* ctx, const struct watchman_dir* dir, const struct watchman_glob_tree* node, const char* dir_name, @@ -372,7 +373,7 @@ void InMemoryView::globGeneratorDoublestar( /* Match each child of node against the children of dir */ void InMemoryView::globGeneratorTree( - struct w_query_ctx* ctx, + QueryContext* ctx, const struct watchman_glob_tree* node, const struct watchman_dir* dir) const { if (!node->doublestar_children.empty()) { @@ -473,8 +474,7 @@ void InMemoryView::globGeneratorTree( } } -void InMemoryView::globGenerator(w_query* query, struct w_query_ctx* ctx) - const { +void InMemoryView::globGenerator(w_query* query, QueryContext* ctx) const { w_string relative_root; if (query->relative_root) { diff --git a/watchman/query/intcompare.cpp b/watchman/query/intcompare.cpp index 2bfd557c230b..b2501a909348 100644 --- a/watchman/query/intcompare.cpp +++ b/watchman/query/intcompare.cpp @@ -82,7 +82,7 @@ class SizeExpr : public QueryExpr { public: explicit SizeExpr(w_query_int_compare comp) : comp(comp) {} - EvaluateResult evaluate(struct w_query_ctx*, FileResult* file) override { + EvaluateResult evaluate(QueryContext*, FileResult* file) override { auto exists = file->exists(); auto size = file->size(); diff --git a/watchman/query/match.cpp b/watchman/query/match.cpp index 7fd18394756c..1e4b87027eb9 100644 --- a/watchman/query/match.cpp +++ b/watchman/query/match.cpp @@ -31,7 +31,7 @@ class WildMatchExpr : public QueryExpr { noescape(noescape), includedotfiles(includedotfiles) {} - EvaluateResult evaluate(struct w_query_ctx* ctx, FileResult* file) override { + EvaluateResult evaluate(QueryContext* ctx, FileResult* file) override { w_string_piece str; bool res; diff --git a/watchman/query/name.cpp b/watchman/query/name.cpp index 86370cb64856..2e2c9ff4f735 100644 --- a/watchman/query/name.cpp +++ b/watchman/query/name.cpp @@ -20,7 +20,7 @@ class NameExpr : public QueryExpr { wholename(wholename) {} public: - EvaluateResult evaluate(struct w_query_ctx* ctx, FileResult* file) override { + EvaluateResult evaluate(QueryContext* ctx, FileResult* file) override { if (!set.empty()) { bool matched; w_string str; diff --git a/watchman/query/parse.cpp b/watchman/query/parse.cpp index 159913df878f..908f1f59ac48 100644 --- a/watchman/query/parse.cpp +++ b/watchman/query/parse.cpp @@ -318,7 +318,7 @@ bool w_query::isFieldRequested(w_string_piece name) const { return false; } -void w_query_legacy_field_list(w_query_field_list* flist) { +void w_query_legacy_field_list(QueryFieldList* flist) { static const char* names[] = { "name", "exists", diff --git a/watchman/query/pcre.cpp b/watchman/query/pcre.cpp index 11cdfadb6fd9..9a359f857dfe 100644 --- a/watchman/query/pcre.cpp +++ b/watchman/query/pcre.cpp @@ -27,7 +27,7 @@ class PcreExpr : public QueryExpr { } } - EvaluateResult evaluate(struct w_query_ctx* ctx, FileResult* file) override { + EvaluateResult evaluate(QueryContext* ctx, FileResult* file) override { w_string_piece str; int rc; diff --git a/watchman/query/since.cpp b/watchman/query/since.cpp index 111ad9223395..cf12faccf28c 100644 --- a/watchman/query/since.cpp +++ b/watchman/query/since.cpp @@ -2,6 +2,7 @@ * Licensed under the Apache License, Version 2.0 */ #include "watchman/Errors.h" +#include "watchman/query/QueryContext.h" #include "watchman/watchman.h" #include @@ -28,7 +29,7 @@ class SinceExpr : public QueryExpr { explicit SinceExpr(std::unique_ptr spec, enum since_what field) : spec(std::move(spec)), field(field) {} - EvaluateResult evaluate(struct w_query_ctx* ctx, FileResult* file) override { + EvaluateResult evaluate(QueryContext* ctx, FileResult* file) override { time_t tval = 0; auto since = spec->evaluate( diff --git a/watchman/query/suffix.cpp b/watchman/query/suffix.cpp index 13f537b2106d..ca1c94cfe7f8 100644 --- a/watchman/query/suffix.cpp +++ b/watchman/query/suffix.cpp @@ -15,7 +15,7 @@ class SuffixExpr : public QueryExpr { explicit SuffixExpr(std::unordered_set&& suffixSet) : suffixSet_(std::move(suffixSet)) {} - EvaluateResult evaluate(struct w_query_ctx*, FileResult* file) override { + EvaluateResult evaluate(QueryContext*, FileResult* file) override { if (suffixSet_.size() < 3) { // For small suffix sets, benchmarks indicated that iteration provides // better performance since no suffix allocation is necessary. diff --git a/watchman/query/type.cpp b/watchman/query/type.cpp index 573ef84e8713..ef283db83fdf 100644 --- a/watchman/query/type.cpp +++ b/watchman/query/type.cpp @@ -6,8 +6,7 @@ #include -using watchman::DType; -using watchman::QueryParseError; +using namespace watchman; class TypeExpr : public QueryExpr { char arg; @@ -15,7 +14,7 @@ class TypeExpr : public QueryExpr { public: explicit TypeExpr(char arg) : arg(arg) {} - EvaluateResult evaluate(struct w_query_ctx*, FileResult* file) override { + EvaluateResult evaluate(QueryContext*, FileResult* file) override { auto optionalDtype = file->dtype(); if (!optionalDtype.has_value()) { return folly::none; diff --git a/watchman/root/watchlist.cpp b/watchman/root/watchlist.cpp index 41b7f9a65b1a..c270cfdaa485 100644 --- a/watchman/root/watchlist.cpp +++ b/watchman/root/watchlist.cpp @@ -1,6 +1,7 @@ /* Copyright 2012-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/query/QueryContext.h" #include "watchman/watchman.h" #include diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index f615733a9860..c1edfb83d543 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -23,6 +23,7 @@ #include "watchman/FSDetect.h" #include "watchman/QueryableView.h" #include "watchman/ThreadPool.h" +#include "watchman/query/QueryContext.h" #include "watchman/scm/SCM.h" #include "watchman/thirdparty/wildmatch/wildmatch.h" #include "watchman/watcher/Watcher.h" @@ -572,7 +573,7 @@ static std::string escapeGlobSpecialChars(w_string_piece str) { * We need to respect the ignore_dirs configuration setting and * also remove anything that doesn't match the relative_root constraint * in the query. */ -void filterOutPaths(std::vector& files, w_query_ctx* ctx) { +void filterOutPaths(std::vector& files, QueryContext* ctx) { files.erase( std::remove_if( files.begin(), @@ -769,7 +770,7 @@ class EdenView final : public QueryableView { crawlInfo->crawlFinish = crawlInfo->crawlStart; } - void timeGenerator(w_query* query, struct w_query_ctx* ctx) const override { + void timeGenerator(w_query* query, QueryContext* ctx) const override { ctx->generationStarted(); auto client = getEdenClient(thriftChannel_); @@ -1009,7 +1010,7 @@ class EdenView final : public QueryableView { void executeGlobBasedQuery( const std::vector& globStrings, w_query* query, - struct w_query_ctx* ctx) const { + QueryContext* ctx) const { auto client = getEdenClient(thriftChannel_); auto includeDotfiles = (query->glob_flags & WM_PERIOD) == 0; @@ -1043,7 +1044,7 @@ class EdenView final : public QueryableView { // Helper for computing a relative path prefix piece. // The returned piece is owned by the supplied context object! - w_string_piece computeRelativePathPiece(struct w_query_ctx* ctx) const { + w_string_piece computeRelativePathPiece(QueryContext* ctx) const { w_string_piece rel; if (ctx->query->relative_root) { rel = ctx->query->relative_root; @@ -1053,7 +1054,7 @@ class EdenView final : public QueryableView { } /** Walks files that match the supplied set of paths */ - void pathGenerator(w_query* query, struct w_query_ctx* ctx) const override { + void pathGenerator(w_query* query, QueryContext* ctx) const override { ctx->generationStarted(); // If the query is anchored to a relative_root, use that that // avoid sucking down a massive list of files from eden @@ -1080,7 +1081,7 @@ class EdenView final : public QueryableView { executeGlobBasedQuery(globStrings, query, ctx); } - void globGenerator(w_query* query, struct w_query_ctx* ctx) const override { + void globGenerator(w_query* query, QueryContext* ctx) const override { if (!query->glob_tree) { // If we are called via the codepath in the query evaluator that // just speculatively executes queries then `glob` may not be @@ -1107,8 +1108,7 @@ class EdenView final : public QueryableView { executeGlobBasedQuery(globStrings, query, ctx); } - void allFilesGenerator(w_query* query, struct w_query_ctx* ctx) - const override { + void allFilesGenerator(w_query* query, QueryContext* ctx) const override { ctx->generationStarted(); // If the query is anchored to a relative_root, use that that // avoid sucking down a massive list of files from eden diff --git a/watchman/watchman_query.h b/watchman/watchman_query.h index f91cafca7495..0018095f2b9c 100644 --- a/watchman/watchman_query.h +++ b/watchman/watchman_query.h @@ -4,7 +4,6 @@ #ifndef WATCHMAN_QUERY_H #define WATCHMAN_QUERY_H #include -#include #include #include #include @@ -15,149 +14,23 @@ #include "watchman/FileSystem.h" #include "watchman/query/FileResult.h" +namespace watchman { +struct QueryContext; +} + struct watchman_file; struct w_query; -struct w_query_ctx; -struct w_query_field_renderer { - w_string name; - folly::Optional ( - *make)(watchman::FileResult* file, const w_query_ctx* ctx); -}; +namespace watchman { -using w_query_field_list = std::vector; -using watchman_root = struct watchman_root; -using w_query_since = watchman::QuerySince; - -enum class QueryContextState { - NotStarted, - WaitingForCookieSync, - WaitingForViewLock, - Generating, - Rendering, - Completed, +struct QueryFieldRenderer { + w_string name; + folly::Optional (*make)(FileResult* file, const QueryContext* ctx); }; -// Holds state for the execution of a query -struct w_query_ctx { - using FileResult = watchman::FileResult; +using QueryFieldList = std::vector; - std::chrono::time_point created; - folly::stop_watch stopWatch; - std::atomic state{QueryContextState::NotStarted}; - std::atomic cookieSyncDuration{ - std::chrono::milliseconds(0)}; - std::atomic viewLockWaitDuration{ - std::chrono::milliseconds(0)}; - std::atomic generationDuration{ - std::chrono::milliseconds(0)}; - std::atomic renderDuration{ - std::chrono::milliseconds(0)}; - - void generationStarted() { - viewLockWaitDuration = stopWatch.lap(); - state = QueryContextState::Generating; - } - - struct w_query* query; - std::shared_ptr root; - std::unique_ptr file; - w_string wholename; - w_query_since since; - // root number, ticks at start of query execution - ClockSpec clockAtStartOfQuery; - uint32_t lastAgeOutTickValueAtStartOfQuery; - - // Rendered results - json_ref resultsArray; - - // When deduping the results, set of - // the files held in results - std::unordered_set dedup; - - // When unconditional_log_if_results_contain_file_prefixes is set - // and one of those prefixes matches a file in the generated results, - // that name is added here with the intent that this is passed - // to the perf logger - std::vector namesToLog; - - // How many times we suppressed a result due to dedup checking - uint32_t num_deduped{0}; - - // Disable fresh instance queries - bool disableFreshInstance{false}; - - w_query_ctx( - w_query* q, - const std::shared_ptr& root, - bool disableFreshInstance); - w_query_ctx(const w_query_ctx&) = delete; - w_query_ctx& operator=(const w_query_ctx&) = delete; - - // Increment numWalked_ by the specified amount - inline void bumpNumWalked(int64_t amount = 1) { - numWalked_ += amount; - } - - int64_t getNumWalked() const { - return numWalked_; - } - - // Adds `file` to the currently accumulating batch of files - // that require data to be loaded. - // If the batch is large enough, this will trigger `fetchEvalBatchNow()`. - // This is intended to be called for files that still having - // their expression cause evaluated during w_query_process_file(). - void addToEvalBatch(std::unique_ptr&& file); - - // Perform an immediate fetch of data for the items in the - // evalBatch_ set, and then re-evaluate each of them by passing - // them to w_query_process_file(). - void fetchEvalBatchNow(); - - void maybeRender(std::unique_ptr&& file); - void addToRenderBatch(std::unique_ptr&& file); - - // Perform a batch load of the items in the render batch, - // and attempt to render those items again. - // Returns true if the render batch is empty after rendering - // the items, false if still more data is needed. - bool fetchRenderBatchNow(); - - w_string computeWholeName(FileResult* file) const; - - // Returns true if the filename associated with `f` matches - // the relative_root constraint set on the query. - // Delegates to dirMatchesRelativeRoot(). - bool fileMatchesRelativeRoot(const watchman_file* f); - - // Returns true if the path to the specified file matches the - // relative_root constraint set on the query. fullFilePath is - // a fully qualified absolute path to the file. - // Delegates to dirMatchesRelativeRoot. - bool fileMatchesRelativeRoot(w_string_piece fullFilePath); - - // Returns true if the directory path matches the relative_root - // constraint set on the query. fullDirectoryPath is a fully - // qualified absolute path to a directory. - // If relative_root is not set, always returns true. - bool dirMatchesRelativeRoot(w_string_piece fullDirectoryPath); - - private: - // Number of files considered as part of running this query - int64_t numWalked_{0}; - - // Files for which we encountered NeedMoreData and that we - // will re-evaluate once we have enough of them accumulated - // to batch fetch the required data - std::vector> evalBatch_; - - // Similar to needBatchFetch_ above, except that the files - // in this batch have been successfully matched by the - // expression and are just pending data to be loaded - // for rendering the result fields. - std::vector> renderBatch_; -}; +} // namespace watchman struct w_query_path { w_string name; @@ -175,10 +48,11 @@ using EvaluateResult = folly::Optional; class QueryExpr { protected: using FileResult = watchman::FileResult; + using QueryContext = watchman::QueryContext; public: virtual ~QueryExpr(); - virtual EvaluateResult evaluate(w_query_ctx* ctx, FileResult* file) = 0; + virtual EvaluateResult evaluate(QueryContext* ctx, FileResult* file) = 0; // If OTHER can be aggregated with THIS, returns a new expression instance // representing the combined state. Op provides information on the containing @@ -193,6 +67,8 @@ struct watchman_glob_tree; struct w_query { using FileResult = watchman::FileResult; + using QueryContext = watchman::QueryContext; + using QueryFieldList = watchman::QueryFieldList; watchman::CaseSensitivity case_sensitive{ watchman::CaseSensitivity::CaseInSensitive}; @@ -226,7 +102,7 @@ struct w_query { // The query that we parsed into this struct json_ref query_spec; - w_query_field_list fieldList; + QueryFieldList fieldList; w_string request_id; w_string subscriptionName; @@ -256,7 +132,7 @@ std::unique_ptr w_query_expr_parse( // through the query engine void w_query_process_file( w_query* query, - struct w_query_ctx* ctx, + watchman::QueryContext* ctx, std::unique_ptr file); // Generator callback, used to plug in an alternate @@ -264,11 +140,11 @@ void w_query_process_file( using w_query_generator = std::function& root, - struct w_query_ctx* ctx)>; + watchman::QueryContext* ctx)>; void time_generator( w_query* query, const std::shared_ptr& root, - struct w_query_ctx* ctx); + watchman::QueryContext* ctx); struct w_query_res { bool is_fresh_instance; @@ -288,7 +164,7 @@ w_query_res w_query_execute( // Returns a shared reference to the wholename // of the file. The caller must not delref // the reference. -const w_string& w_query_ctx_get_wholename(struct w_query_ctx* ctx); +const w_string& w_query_ctx_get_wholename(watchman::QueryContext* ctx); // parse the old style since and find queries std::shared_ptr w_query_parse_legacy( @@ -298,12 +174,7 @@ std::shared_ptr w_query_parse_legacy( uint32_t* next_arg, const char* clockspec, json_ref* expr_p); -void w_query_legacy_field_list(w_query_field_list* flist); - -folly::Optional file_result_to_json( - const w_query_field_list& fieldList, - const std::unique_ptr& file, - const w_query_ctx* ctx); +void w_query_legacy_field_list(watchman::QueryFieldList* flist); void w_query_init_all(); @@ -322,8 +193,9 @@ struct w_query_int_compare { void parse_int_compare(const json_ref& term, struct w_query_int_compare* comp); bool eval_int_compare(json_int_t ival, struct w_query_int_compare* comp); -void parse_field_list(json_ref field_list, w_query_field_list* selected); -json_ref field_list_to_json_name_array(const w_query_field_list& fieldList); +void parse_field_list(json_ref field_list, watchman::QueryFieldList* selected); +json_ref field_list_to_json_name_array( + const watchman::QueryFieldList& fieldList); void parse_suffixes(w_query* res, const json_ref& query); void parse_globs(w_query* res, const json_ref& query); diff --git a/watchman/watchman_root.h b/watchman/watchman_root.h index c5cd30121973..0e5dfc014a1b 100644 --- a/watchman/watchman_root.h +++ b/watchman/watchman_root.h @@ -68,6 +68,8 @@ class ClientStateAssertions { } // namespace watchman struct watchman_root : public std::enable_shared_from_this { + using QueryContext = watchman::QueryContext; + /* path to root */ w_string root_path; /* filesystem type name, as returned by w_fstype() */ @@ -160,7 +162,7 @@ struct watchman_root : public std::enable_shared_from_this { // If is only safe to read the query contexts while the queries.rlock() // is held, and even then it is only really safe to read fields that // are not changed by the query exection. - folly::Synchronized> queries; + folly::Synchronized> queries; // Obtain the current view pointer. // This is safe wrt. a concurrent recrawl operation From 521d1e1f0eb3c16b1697411769ab2e9b1741c8f0 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Fri, 13 Aug 2021 01:28:02 -0700 Subject: [PATCH 0472/7387] move QueryResult into the watchman namespace Summary: Refactoring. Reviewed By: kmancini Differential Revision: D30005544 fbshipit-source-id: 9a7670b2f9d4332eb90fc4e2a5e55ad1c01c9960 --- watchman/cmds/query.cpp | 2 +- watchman/cmds/since.cpp | 2 +- watchman/cmds/subscribe.cpp | 6 +++--- watchman/query/eval.cpp | 22 +++++++++++----------- watchman/spawn.cpp | 8 +++----- watchman/watchman_client.h | 7 +++++-- watchman/watchman_query.h | 27 +++++++++++++++------------ 7 files changed, 39 insertions(+), 35 deletions(-) diff --git a/watchman/cmds/query.cpp b/watchman/cmds/query.cpp index a840370e8b25..d2bd65e20568 100644 --- a/watchman/cmds/query.cpp +++ b/watchman/cmds/query.cpp @@ -25,7 +25,7 @@ static void cmd_query(struct watchman_client* client, const json_ref& args) { auto res = w_query_execute(query.get(), root, nullptr); auto response = make_response(); response.set( - {{"is_fresh_instance", json_boolean(res.is_fresh_instance)}, + {{"is_fresh_instance", json_boolean(res.isFreshInstance)}, {"clock", res.clockAtStartOfQuery.toJson()}, {"files", std::move(res.resultsArray)}}); if (res.savedStateInfo) { diff --git a/watchman/cmds/since.cpp b/watchman/cmds/since.cpp index 00195fa41378..02a5112fa30d 100644 --- a/watchman/cmds/since.cpp +++ b/watchman/cmds/since.cpp @@ -30,7 +30,7 @@ static void cmd_since(struct watchman_client* client, const json_ref& args) { auto res = w_query_execute(query.get(), root, nullptr); auto response = make_response(); response.set( - {{"is_fresh_instance", json_boolean(res.is_fresh_instance)}, + {{"is_fresh_instance", json_boolean(res.isFreshInstance)}, {"clock", res.clockAtStartOfQuery.toJson()}, {"files", std::move(res.resultsArray)}}); if (res.savedStateInfo) { diff --git a/watchman/cmds/subscribe.cpp b/watchman/cmds/subscribe.cpp index dadcf8071bd2..a44be4194661 100644 --- a/watchman/cmds/subscribe.cpp +++ b/watchman/cmds/subscribe.cpp @@ -199,7 +199,7 @@ void watchman_client_subscription::processSubscriptionImpl() { } } -void watchman_client_subscription::updateSubscriptionTicks(w_query_res* res) { +void watchman_client_subscription::updateSubscriptionTicks(QueryResult* res) { // create a new spec that will be used the next time query->since_spec = std::make_unique(res->clockAtStartOfQuery); } @@ -263,7 +263,7 @@ json_ref watchman_client_subscription::buildSubscriptionResults( bool mergeBaseChanged = scmAwareQuery && res.clockAtStartOfQuery.scmMergeBase != query->since_spec->scmMergeBase; if (res.resultsArray.array().empty() && !mergeBaseChanged && - !res.is_fresh_instance) { + !res.isFreshInstance) { updateSubscriptionTicks(&res); return nullptr; } @@ -279,7 +279,7 @@ json_ref watchman_client_subscription::buildSubscriptionResults( updateSubscriptionTicks(&res); response.set( - {{"is_fresh_instance", json_boolean(res.is_fresh_instance)}, + {{"is_fresh_instance", json_boolean(res.isFreshInstance)}, {"clock", res.clockAtStartOfQuery.toJson()}, {"files", std::move(res.resultsArray)}, {"root", w_string_to_json(root->root_path)}, diff --git a/watchman/query/eval.cpp b/watchman/query/eval.cpp index 80aeb3b6cd0b..04060463917e 100644 --- a/watchman/query/eval.cpp +++ b/watchman/query/eval.cpp @@ -163,19 +163,19 @@ static void default_generators( static void execute_common( QueryContext* ctx, w_perf_t* sample, - w_query_res* res, - w_query_generator generator) { + QueryResult* res, + QueryGenerator generator) { ctx->stopWatch.reset(); if (ctx->query->dedup_results) { ctx->dedup.reserve(64); } - // is_fresh_instance is also later set by the value in ctx after generator - res->is_fresh_instance = + // isFreshInstance is also later set by the value in ctx after generator + res->isFreshInstance = !ctx->since.is_timestamp && ctx->since.clock.is_fresh_instance; - if (!(res->is_fresh_instance && ctx->query->empty_on_fresh_instance)) { + if (!(res->isFreshInstance && ctx->query->empty_on_fresh_instance)) { if (!generator) { generator = default_generators; } @@ -200,7 +200,7 @@ static void execute_common( // For Eden instances it is possible that when running the query it was // discovered that it is actually a fresh instance [e.g. mount generation // changes or journal truncation]; update res to match - res->is_fresh_instance |= ctx->since.clock.is_fresh_instance; + res->isFreshInstance |= ctx->since.clock.is_fresh_instance; if (sample && !ctx->namesToLog.empty()) { auto nameList = json_array_of_size(ctx->namesToLog.size()); @@ -225,7 +225,7 @@ static void execute_common( sample->add_meta( "query_execute", json_object( - {{"fresh_instance", json_boolean(res->is_fresh_instance)}, + {{"fresh_instance", json_boolean(res->isFreshInstance)}, {"num_deduped", json_integer(ctx->num_deduped)}, {"num_results", json_integer(json_array_size(ctx->resultsArray))}, {"num_walked", json_integer(ctx->getNumWalked())}, @@ -240,11 +240,11 @@ static void execute_common( // Capability indicating support for scm-aware since queries W_CAP_REG("scm-since") -w_query_res w_query_execute( +QueryResult w_query_execute( w_query* query, const std::shared_ptr& root, - w_query_generator generator) { - w_query_res res; + QueryGenerator generator) { + QueryResult res; std::shared_ptr altQuery; ClockSpec resultClock(ClockPosition{}); bool disableFreshInstance{false}; @@ -426,7 +426,7 @@ w_query_res w_query_execute( if (query->bench_iterations > 0) { for (uint32_t i = 0; i < query->bench_iterations; ++i) { QueryContext c{query, root, ctx.disableFreshInstance}; - w_query_res r; + QueryResult r; c.clockAtStartOfQuery = ctx.clockAtStartOfQuery; c.since = ctx.since; execute_common(&c, nullptr, &r, generator); diff --git a/watchman/spawn.cpp b/watchman/spawn.cpp index d7d6f96fa4db..8a7f4049ee7b 100644 --- a/watchman/spawn.cpp +++ b/watchman/spawn.cpp @@ -7,15 +7,13 @@ #include "watchman/watchman.h" #include "watchman/watchman_system.h" -using watchman::ChildProcess; -using watchman::FileDescriptor; +using namespace watchman; using Options = watchman::ChildProcess::Options; using Environment = watchman::ChildProcess::Environment; -using namespace watchman; static std::unique_ptr prepare_stdin( struct watchman_trigger_command* cmd, - w_query_res* res) { + QueryResult* res) { char stdin_file_name[WATCHMAN_NAME_MAX]; if (cmd->stdin_style == trigger_input_style::input_dev_null) { @@ -89,7 +87,7 @@ static std::unique_ptr prepare_stdin( static void spawn_command( const std::shared_ptr& root, struct watchman_trigger_command* cmd, - w_query_res* res, + QueryResult* res, ClockSpec* since_spec) { bool file_overflow = false; diff --git a/watchman/watchman_client.h b/watchman/watchman_client.h index e698818099fe..e8d13fd0399e 100644 --- a/watchman/watchman_client.h +++ b/watchman/watchman_client.h @@ -11,11 +11,12 @@ #include "watchman_pdu.h" struct w_query; -struct w_query_res; struct watchman_client_subscription; namespace watchman { +struct QueryResult; + enum ClientStateDisposition { PendingEnter, Asserted, @@ -109,10 +110,12 @@ struct watchman_client_subscription OnStateTransition onStateTransition); private: + using QueryResult = watchman::QueryResult; + ClockSpec runSubscriptionRules( watchman_user_client* client, const std::shared_ptr& root); - void updateSubscriptionTicks(w_query_res* res); + void updateSubscriptionTicks(QueryResult* res); void processSubscriptionImpl(); }; diff --git a/watchman/watchman_query.h b/watchman/watchman_query.h index 0018095f2b9c..56e6d826ca81 100644 --- a/watchman/watchman_query.h +++ b/watchman/watchman_query.h @@ -135,19 +135,15 @@ void w_query_process_file( watchman::QueryContext* ctx, std::unique_ptr file); -// Generator callback, used to plug in an alternate -// generator when used in triggers or subscriptions -using w_query_generator = std::function& root, - watchman::QueryContext* ctx)>; void time_generator( w_query* query, const std::shared_ptr& root, watchman::QueryContext* ctx); -struct w_query_res { - bool is_fresh_instance; +namespace watchman { + +struct QueryResult { + bool isFreshInstance; json_ref resultsArray; // Only populated if the query was set to dedup_results std::unordered_set dedupedFileNames; @@ -156,10 +152,19 @@ struct w_query_res { json_ref savedStateInfo; }; -w_query_res w_query_execute( +// Generator callback, used to plug in an alternate +// generator when used in triggers or subscriptions +using QueryGenerator = std::function& root, + watchman::QueryContext* ctx)>; + +} // namespace watchman + +watchman::QueryResult w_query_execute( w_query* query, const std::shared_ptr& root, - w_query_generator generator); + watchman::QueryGenerator generator); // Returns a shared reference to the wholename // of the file. The caller must not delref @@ -176,8 +181,6 @@ std::shared_ptr w_query_parse_legacy( json_ref* expr_p); void w_query_legacy_field_list(watchman::QueryFieldList* flist); -void w_query_init_all(); - enum w_query_icmp_op { W_QUERY_ICMP_EQ, W_QUERY_ICMP_NE, From a93252f62c206207b8ec027842012a966c5e1b61 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Fri, 13 Aug 2021 01:28:02 -0700 Subject: [PATCH 0473/7387] return cookies in query debug info Summary: When tracing audit failures with `watchman debug-watcher-info`, it's useful to know which cookie files correspond to the audit query. To that end, add some debug info to query results, including the list of cookie files written by synchronization (if any). Differential Revision: D30290676 fbshipit-source-id: 5a0c2868b78f4f240dd1897879689ee345f37c59 --- watchman/CookieSync.cpp | 11 ++++++++--- watchman/CookieSync.h | 34 +++++++++++++++++++++------------ watchman/InMemoryView.h | 6 ++++-- watchman/QueryableView.h | 3 ++- watchman/cmds/query.cpp | 3 ++- watchman/cmds/since.cpp | 3 ++- watchman/cmds/state.cpp | 8 +++++--- watchman/cmds/subscribe.cpp | 3 ++- watchman/cmds/watch.cpp | 3 ++- watchman/query/QueryContext.cpp | 11 +++++++++++ watchman/query/eval.cpp | 3 +-- watchman/root/sync.cpp | 18 ++++++++++------- watchman/watcher/eden.cpp | 3 ++- watchman/watchman_query.h | 7 +++++++ watchman/watchman_root.h | 4 +++- 15 files changed, 84 insertions(+), 36 deletions(-) diff --git a/watchman/CookieSync.cpp b/watchman/CookieSync.cpp index 3e2e0770dc95..cf836737afa9 100644 --- a/watchman/CookieSync.cpp +++ b/watchman/CookieSync.cpp @@ -65,7 +65,8 @@ std::vector CookieSync::getOutstandingCookieFileList() const { return result; } -folly::Future CookieSync::sync() { +folly::Future CookieSync::sync( + std::vector& cookieFileNames) { auto prefixes = cookiePrefix(); auto serial = serial_++; @@ -81,8 +82,10 @@ folly::Future CookieSync::sync() { CookieMap pendingCookies; std::optional> lastError; + cookieFileNames.reserve(prefixes.size()); for (const auto& prefix : prefixes) { auto path_str = w_string::build(prefix, serial); + cookieFileNames.push_back(path_str); /* then touch the file */ auto file = w_stm_open( @@ -122,13 +125,15 @@ folly::Future CookieSync::sync() { return cookie->promise.getFuture(); } -void CookieSync::syncToNow(std::chrono::milliseconds timeout) { +void CookieSync::syncToNow( + std::chrono::milliseconds timeout, + std::vector& cookieFileNames) { /* compute deadline */ using namespace std::chrono; auto deadline = system_clock::now() + timeout; while (true) { - auto cookie = sync(); + auto cookie = sync(cookieFileNames); if (!cookie.wait(timeout).isReady()) { auto why = folly::to( diff --git a/watchman/CookieSync.h b/watchman/CookieSync.h index 86991cd4bc6c..6681b88a83b1 100644 --- a/watchman/CookieSync.h +++ b/watchman/CookieSync.h @@ -19,19 +19,29 @@ class CookieSync { void addCookieDir(const w_string& dir); void removeCookieDir(const w_string& dir); - /* Ensure that we're synchronized with the state of the + /** + * Ensure that we're synchronized with the state of the * filesystem at the current time. - * We do this by touching a cookie file and waiting to - * observe it via inotify. When we see it we know that + * + * We do this by touching one or more cookie files and waiting to + * observe them via the watcher. When we see it we know that * we've seen everything up to the point in time at which - * we're asking questions. - * Throws a std::system_error with an ETIMEDOUT error if - * the timeout expires before we observe the change, or - * a runtime_error if the root has been deleted or rendered - * inaccessible. */ - void syncToNow(std::chrono::milliseconds timeout); - - /** Touches a cookie file and returns a Future that will + * we're asking questions. (Note: it's unclear if all filesystem watchers + * provide such an ordering guarantee, and it's worth flushing all pending + * notifications to be sure.) + * + * Throws a std::system_error with an ETIMEDOUT + * error if the timeout expires before we observe the change, or a + * runtime_error if the root has been deleted or rendered inaccessible. + * + * cookieFileNames is populated with the names of all cookie files used. + */ + void syncToNow( + std::chrono::milliseconds timeout, + std::vector& cookieFileNames); + + /** + * Touches a cookie file and returns a Future that will * be ready when that cookie file is processed by the IO * thread at some future time. * Important: if you chain a lambda onto the future, it @@ -39,7 +49,7 @@ class CookieSync { * It is recommended that you minimize the actions performed * in that context to avoid holding up the IO thread. **/ - folly::Future sync(); + folly::Future sync(std::vector& cookieFileNames); /* If path is a valid cookie in the map, notify the waiter. * Returns true if the path matches the cookie prefix (not just diff --git a/watchman/InMemoryView.h b/watchman/InMemoryView.h index 11e6a03dd890..b1151aabc9cd 100644 --- a/watchman/InMemoryView.h +++ b/watchman/InMemoryView.h @@ -158,7 +158,8 @@ class InMemoryView final : public QueryableView { void ageOut(w_perf_t& sample, std::chrono::seconds minAge) override; void syncToNow( const std::shared_ptr& root, - std::chrono::milliseconds timeout) override; + std::chrono::milliseconds timeout, + std::vector& cookieFileNames) override; bool doAnyOfTheseFilesExist( const std::vector& fileNames) const override; @@ -200,7 +201,8 @@ class InMemoryView final : public QueryableView { private: void syncToNowCookies( const std::shared_ptr& root, - std::chrono::milliseconds timeout); + std::chrono::milliseconds timeout, + std::vector& cookieFileNames); // Returns the erased file's otime. w_clock_t ageOutFile( diff --git a/watchman/QueryableView.h b/watchman/QueryableView.h index 577502205981..821d84156936 100644 --- a/watchman/QueryableView.h +++ b/watchman/QueryableView.h @@ -42,7 +42,8 @@ class QueryableView : public std::enable_shared_from_this { virtual void ageOut(w_perf_t& sample, std::chrono::seconds minAge); virtual void syncToNow( const std::shared_ptr& root, - std::chrono::milliseconds timeout) = 0; + std::chrono::milliseconds timeout, + std::vector& cookieFileNames) = 0; // Specialized query function that is used to test whether // version control files exist as part of some settling handling. diff --git a/watchman/cmds/query.cpp b/watchman/cmds/query.cpp index d2bd65e20568..dc5a5da7ab1c 100644 --- a/watchman/cmds/query.cpp +++ b/watchman/cmds/query.cpp @@ -27,7 +27,8 @@ static void cmd_query(struct watchman_client* client, const json_ref& args) { response.set( {{"is_fresh_instance", json_boolean(res.isFreshInstance)}, {"clock", res.clockAtStartOfQuery.toJson()}, - {"files", std::move(res.resultsArray)}}); + {"files", std::move(res.resultsArray)}, + {"debug", res.debugInfo.render()}}); if (res.savedStateInfo) { response.set({{"saved-state-info", std::move(res.savedStateInfo)}}); } diff --git a/watchman/cmds/since.cpp b/watchman/cmds/since.cpp index 02a5112fa30d..97888af2421e 100644 --- a/watchman/cmds/since.cpp +++ b/watchman/cmds/since.cpp @@ -32,7 +32,8 @@ static void cmd_since(struct watchman_client* client, const json_ref& args) { response.set( {{"is_fresh_instance", json_boolean(res.isFreshInstance)}, {"clock", res.clockAtStartOfQuery.toJson()}, - {"files", std::move(res.resultsArray)}}); + {"files", std::move(res.resultsArray)}, + {"debug", res.debugInfo.render()}}); if (res.savedStateInfo) { response.set({{"saved-state-info", std::move(res.savedStateInfo)}}); } diff --git a/watchman/cmds/state.cpp b/watchman/cmds/state.cpp index 87dba33ad30a..ebff547b52c8 100644 --- a/watchman/cmds/state.cpp +++ b/watchman/cmds/state.cpp @@ -212,8 +212,9 @@ static void cmd_state_enter( {"state-enter", w_string_to_json(parsed.name)}}); send_and_dispose_response(client, std::move(response)); + std::vector cookieFileNames; root->cookies - .sync() + .sync(cookieFileNames) // Note that it is possible that the sync() // might throw. If that happens the exception will bubble back // to the client as an error PDU. @@ -384,8 +385,9 @@ static void cmd_state_leave( {"state-leave", w_string_to_json(parsed.name)}}); send_and_dispose_response(client, std::move(response)); - root->cookies.sync().thenTry( - [assertion, parsed, root](folly::Try&& result) { + std::vector cookieFileNames; + root->cookies.sync(cookieFileNames) + .thenTry([assertion, parsed, root](folly::Try&& result) { try { result.throwUnlessValue(); } catch (const std::exception& exc) { diff --git a/watchman/cmds/subscribe.cpp b/watchman/cmds/subscribe.cpp index a44be4194661..71c9eeecbf86 100644 --- a/watchman/cmds/subscribe.cpp +++ b/watchman/cmds/subscribe.cpp @@ -389,7 +389,8 @@ static void cmd_flush_subscriptions( } } - root->syncToNow(std::chrono::milliseconds(sync_timeout)); + std::vector cookieFileNames; + root->syncToNow(std::chrono::milliseconds(sync_timeout), cookieFileNames); auto resp = make_response(); auto synced = json_array(); diff --git a/watchman/cmds/watch.cpp b/watchman/cmds/watch.cpp index 8113e54db167..657a87fc5739 100644 --- a/watchman/cmds/watch.cpp +++ b/watchman/cmds/watch.cpp @@ -75,7 +75,8 @@ static void cmd_clock(struct watchman_client* client, const json_ref& args) { auto root = resolveRoot(client, args); if (sync_timeout) { - root->syncToNow(std::chrono::milliseconds(sync_timeout)); + std::vector cookieFileNames; + root->syncToNow(std::chrono::milliseconds(sync_timeout), cookieFileNames); } auto resp = make_response(); diff --git a/watchman/query/QueryContext.cpp b/watchman/query/QueryContext.cpp index e21ea0f1e032..aa9afe06f849 100644 --- a/watchman/query/QueryContext.cpp +++ b/watchman/query/QueryContext.cpp @@ -33,6 +33,17 @@ folly::Optional file_result_to_json( return value; } +} // namespace + +// TODO: Move this into a new QueryResult.cpp file. +json_ref QueryDebugInfo::render() const { + auto arr = json_array(); + for (auto& fn : cookieFileNames) { + json_array_append(arr, w_string_to_json(fn)); + } + return json_object({ + {"cookie_files", arr}, + }); } w_string QueryContext::computeWholeName(FileResult* file) const { diff --git a/watchman/query/eval.cpp b/watchman/query/eval.cpp index 04060463917e..f1e4e7dc0b89 100644 --- a/watchman/query/eval.cpp +++ b/watchman/query/eval.cpp @@ -245,7 +245,6 @@ QueryResult w_query_execute( const std::shared_ptr& root, QueryGenerator generator) { QueryResult res; - std::shared_ptr altQuery; ClockSpec resultClock(ClockPosition{}); bool disableFreshInstance{false}; auto requestId = query->request_id; @@ -388,7 +387,7 @@ QueryResult w_query_execute( ctx.state = QueryContextState::WaitingForCookieSync; ctx.stopWatch.reset(); try { - root->syncToNow(query->sync_timeout); + root->syncToNow(query->sync_timeout, res.debugInfo.cookieFileNames); } catch (const std::exception& exc) { throw QueryExecError("synchronization failed: ", exc.what()); } diff --git a/watchman/root/sync.cpp b/watchman/root/sync.cpp index 274260013148..8cad36216e4f 100644 --- a/watchman/root/sync.cpp +++ b/watchman/root/sync.cpp @@ -9,11 +9,13 @@ using folly::to; using watchman::w_perf_t; -void watchman_root::syncToNow(std::chrono::milliseconds timeout) { +void watchman_root::syncToNow( + std::chrono::milliseconds timeout, + std::vector& cookieFileNames) { w_perf_t sample("sync_to_now"); auto root = shared_from_this(); try { - view()->syncToNow(root, timeout); + view()->syncToNow(root, timeout, cookieFileNames); if (sample.finish()) { sample.add_root_meta(root); sample.add_meta( @@ -52,8 +54,9 @@ namespace watchman { * inaccessible. */ void InMemoryView::syncToNow( const std::shared_ptr& root, - std::chrono::milliseconds timeout) { - syncToNowCookies(root, timeout); + std::chrono::milliseconds timeout, + std::vector& cookieFileNames) { + syncToNowCookies(root, timeout, cookieFileNames); // Some watcher implementations (notably, FSEvents) reorder change events // before they're reported, and cookie files are not sufficient. Instead, the @@ -73,9 +76,10 @@ void InMemoryView::syncToNow( void InMemoryView::syncToNowCookies( const std::shared_ptr& root, - std::chrono::milliseconds timeout) { + std::chrono::milliseconds timeout, + std::vector& cookieFileNames) { try { - cookies_.syncToNow(timeout); + cookies_.syncToNow(timeout, cookieFileNames); } catch (const std::system_error& exc) { auto cookieDirs = cookies_.cookieDirs(); @@ -99,7 +103,7 @@ void InMemoryView::syncToNowCookies( // The cookie dir was a VCS subdir and it got deleted. Let's // focus instead on the parent dir and recursively retry. cookies_.setCookieDir(rootPath_); - return cookies_.syncToNow(timeout); + return cookies_.syncToNow(timeout, cookieFileNames); } } else { // Split watchers have one watch on the root and watches for nested diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index c1edfb83d543..826a7699e203 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -1001,7 +1001,8 @@ class EdenView final : public QueryableView { void syncToNow( const std::shared_ptr&, - std::chrono::milliseconds) override { + std::chrono::milliseconds, + std::vector& /*cookieFileNames*/) override { // TODO: on FUSE and NFS, where all writes give synchronous notifications to // the EdenFS daemon, cookie files are not necessary, and could be replaced // with a Thrift call here. diff --git a/watchman/watchman_query.h b/watchman/watchman_query.h index 56e6d826ca81..2c45a7f0bac9 100644 --- a/watchman/watchman_query.h +++ b/watchman/watchman_query.h @@ -142,6 +142,12 @@ void time_generator( namespace watchman { +struct QueryDebugInfo { + std::vector cookieFileNames; + + json_ref render() const; +}; + struct QueryResult { bool isFreshInstance; json_ref resultsArray; @@ -150,6 +156,7 @@ struct QueryResult { ClockSpec clockAtStartOfQuery; uint32_t stateTransCountAtStartOfQuery; json_ref savedStateInfo; + QueryDebugInfo debugInfo; }; // Generator callback, used to plug in an alternate diff --git a/watchman/watchman_root.h b/watchman/watchman_root.h index 0e5dfc014a1b..e19f5c48e65d 100644 --- a/watchman/watchman_root.h +++ b/watchman/watchman_root.h @@ -173,7 +173,9 @@ struct watchman_root : public std::enable_shared_from_this { void considerAgeOut(); void performAgeOut(std::chrono::seconds min_age); - void syncToNow(std::chrono::milliseconds timeout); + void syncToNow( + std::chrono::milliseconds timeout, + std::vector& cookieFileNames); void scheduleRecrawl(const char* why); void recrawlTriggered(const char* why); From 11467102f33a619e011c4bd6d75516902526d46a Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Fri, 13 Aug 2021 01:28:02 -0700 Subject: [PATCH 0474/7387] audit: print cookie file corresponding to audit query Summary: When tracing audit failures with `watchman debug-watcher-info`, it's useful to know which cookie files correspond to the audit query. Print the cookie files used in the audit output. Differential Revision: D30291620 fbshipit-source-id: c35b278251e1181055c24f59c4a6ff450013d4eb --- watchman/cli/src/audit.rs | 5 +++++ watchman/rust/watchman_client/src/pdu.rs | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/watchman/cli/src/audit.rs b/watchman/cli/src/audit.rs index 39065f4a88cd..c027be91e921 100644 --- a/watchman/cli/src/audit.rs +++ b/watchman/cli/src/audit.rs @@ -209,6 +209,11 @@ impl AuditCmd { result.clock, result.version ); + if let Some(debug) = result.debug { + if let Some(cookie_files) = debug.cookie_files { + eprintln!(" cookie files: {:?}", cookie_files) + } + } let filesystem_state = filesystem_state_handle.await.unwrap(); diff --git a/watchman/rust/watchman_client/src/pdu.rs b/watchman/rust/watchman_client/src/pdu.rs index 6d57459e0c61..70b95d547371 100644 --- a/watchman/rust/watchman_client/src/pdu.rs +++ b/watchman/rust/watchman_client/src/pdu.rs @@ -326,6 +326,11 @@ pub struct QueryRequestCommon { pub request_id: Option, } +#[derive(Deserialize, Clone, Debug)] +pub struct QueryDebugInfo { + pub cookie_files: Option>, +} + /// Holds the result of a query. /// The result is generic over a `F` type that you define. /// The `F` should deserialize the list of fields in your QueryRequestCommon @@ -367,6 +372,8 @@ where /// the save state storage engine. #[serde(rename = "saved-state-info")] pub saved_state_info: Option, + + pub debug: Option, } #[derive(Serialize, Default, Clone, Debug)] From d349328b718c36e4d14f7a31677bacff3b69f41b Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Fri, 13 Aug 2021 12:23:43 -0700 Subject: [PATCH 0475/7387] allow --logfile=- to log to stdout/stderr Summary: Sometimes, like in tests, it's convenient to have the Watchman daemon log sent to stdout/stderr. Allow specifying "-" as the logfile to avoid redirection. Reviewed By: fanzeyi Differential Revision: D30269390 fbshipit-source-id: 060aa036bb606e569af9637f737348b262993f53 --- watchman/Options.cpp | 2 +- watchman/main.cpp | 28 +++++++++++++++++++--------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/watchman/Options.cpp b/watchman/Options.cpp index dcb7c7ce1a50..13390ceefd64 100644 --- a/watchman/Options.cpp +++ b/watchman/Options.cpp @@ -106,7 +106,7 @@ const OptDesc opts[] = { IS_DAEMON}, {"logfile", 'o', - "Specify path to logfile", + "Specify path to logfile ('-' = stdout and stderr)", REQ_STRING, &watchman::logging::log_name, "PATH", diff --git a/watchman/main.cpp b/watchman/main.cpp index 4c162196411e..51157d4a6857 100644 --- a/watchman/main.cpp +++ b/watchman/main.cpp @@ -49,7 +49,8 @@ static void compute_file_name( std::string& str, const std::string& user, const char* suffix, - const char* what); + const char* what, + bool require_absolute = true); namespace { const std::string& get_pid_file() { @@ -99,11 +100,14 @@ void detect_low_process_priority() { ignore_result(::dup2(fd, STDIN_FILENO)); ::close(fd); } - fd = open(logging::log_name.c_str(), O_WRONLY | O_APPEND | O_CREAT, 0600); - if (fd != -1) { - ignore_result(::dup2(fd, STDOUT_FILENO)); - ignore_result(::dup2(fd, STDERR_FILENO)); - ::close(fd); + + if (logging::log_name != "-") { + fd = open(logging::log_name.c_str(), O_WRONLY | O_APPEND | O_CREAT, 0600); + if (fd != -1) { + ignore_result(::dup2(fd, STDOUT_FILENO)); + ignore_result(::dup2(fd, STDERR_FILENO)); + ::close(fd); + } } // If we weren't attached to a tty, check this now that we've opened @@ -720,7 +724,8 @@ static void compute_file_name( std::string& str, const std::string& user, const char* suffix, - const char* what) { + const char* what, + bool require_absolute) { bool str_computed = false; if (str.empty()) { str_computed = true; @@ -745,7 +750,7 @@ static void compute_file_name( str = folly::to(state_dir, "/", suffix); } #ifndef _WIN32 - if (!w_string_piece(str).pathIsAbsolute()) { + if (require_absolute && !w_string_piece(str).pathIsAbsolute()) { log(FATAL, what, " must be an absolute file path but ", @@ -873,7 +878,12 @@ static void setup_sock_name() { compute_file_name(flags.unix_sock_name, user, "sock", "sockname"); compute_file_name(flags.watchman_state_file, user, "state", "statefile"); - compute_file_name(logging::log_name, user, "log", "logfile"); + compute_file_name( + logging::log_name, + user, + "log", + "logfile", + /*require_absolute=*/logging::log_name != "-"); if (flags.unix_sock_name.size() >= sizeof(un.sun_path) - 1) { log(FATAL, flags.unix_sock_name, ": path is too long\n"); From 78fadf453aee21b49c5a99db1ecad1b61434264d Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Fri, 13 Aug 2021 16:53:34 -0700 Subject: [PATCH 0476/7387] minor listener refactoring Reviewed By: xavierd Differential Revision: D30316928 fbshipit-source-id: e2cc79ad33c990e20a185268fbd8da2f2c9c3bd8 --- watchman/listener.cpp | 115 ++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 61 deletions(-) diff --git a/watchman/listener.cpp b/watchman/listener.cpp index addb74b2cfd0..c71e477ca120 100644 --- a/watchman/listener.cpp +++ b/watchman/listener.cpp @@ -324,12 +324,6 @@ static void client_thread( clients.wlock()->erase(client); } -// This is just a placeholder. -// This catches SIGUSR1 so we don't terminate. -// We use this to interrupt blocking syscalls -// on the worker threads -static void wakeme(int) {} - #if defined(HAVE_KQUEUE) || defined(HAVE_FSEVENTS) #ifdef __OpenBSD__ #include // @manual @@ -410,8 +404,6 @@ static FileDescriptor get_listener_tcp_socket() { } static FileDescriptor get_listener_unix_domain_socket(const char* path) { - struct sockaddr_un un {}; - #ifndef _WIN32 mode_t perms = cfg_get_perms( "sock_access", true /* write bits */, false /* execute bits */); @@ -426,6 +418,7 @@ static FileDescriptor get_listener_unix_domain_socket(const char* path) { } #endif + struct sockaddr_un un {}; if (strlen(path) >= sizeof(un.sun_path) - 1) { logf(ERR, "{}: path is too long\n", path); return FileDescriptor(); @@ -438,8 +431,8 @@ static FileDescriptor get_listener_unix_domain_socket(const char* path) { un.sun_family = PF_LOCAL; memcpy(un.sun_path, path, strlen(path) + 1); - unlink(path); + (void)unlink(path); if (::bind(listener_fd.system_handle(), (struct sockaddr*)&un, sizeof(un)) != 0) { logf(ERR, "bind({}): {}\n", path, folly::errnoStr(errno)); @@ -636,9 +629,55 @@ static void named_pipe_accept_loop() { * named pipe style) accept loop that runs in another thread. */ class AcceptLoop { - std::thread thread_; - bool joined_{false}; + public: + /** Start an accept loop thread using the provided socket + * descriptor (`fd`). The `name` parameter is used to name the + * thread */ + AcceptLoop(std::string name, FileDescriptor&& fd) { + fd.setCloExec(); + fd.setNonBlock(); + + std::shared_ptr listener_event(w_event_make_sockets()); + listener_thread_events.push_back(listener_event); + + thread_ = std::thread( + [listener_fd = std::move(fd), name, listener_event]() mutable { + w_set_thread_name(name); + accept_thread(std::move(listener_fd), listener_event); + }); + } + + AcceptLoop(const AcceptLoop&) = delete; + AcceptLoop& operator=(const AcceptLoop&) = delete; + + AcceptLoop(AcceptLoop&& other) { + *this = std::move(other); + } + + AcceptLoop& operator=(AcceptLoop&& other) { + thread_ = std::move(other.thread_); + joined_ = other.joined_; + // Ensure that we don't try to join the source, + // as std::thread::join will std::terminate in that case. + // If it weren't for this we could use the compiler + // default implementation of move. + other.joined_ = true; + return *this; + } + + ~AcceptLoop() { + join(); + } + + void join() { + if (joined_) { + return; + } + thread_.join(); + joined_ = true; + } + private: static void accept_thread( FileDescriptor&& listenerDescriptor, std::shared_ptr listener_event) { @@ -646,7 +685,6 @@ class AcceptLoop { while (!w_is_stopping()) { FileDescriptor client_fd; struct watchman_event_poll pfd[2]; - int bufsize; pfd[0].evt = listener->getEvents(); pfd[1].evt = listener_event.get(); @@ -680,7 +718,7 @@ class AcceptLoop { continue; } client_fd.setCloExec(); - bufsize = WATCHMAN_IO_BUF_SIZE; + int bufsize = WATCHMAN_IO_BUF_SIZE; ::setsockopt( client_fd.system_handle(), SOL_SOCKET, @@ -692,53 +730,8 @@ class AcceptLoop { } } - public: - /** Start an accept loop thread using the provided socket - * descriptor (`fd`). The `name` parameter is used to name the - * thread */ - AcceptLoop(std::string name, FileDescriptor&& fd) { - fd.setCloExec(); - fd.setNonBlock(); - - std::shared_ptr listener_event(w_event_make_sockets()); - listener_thread_events.push_back(listener_event); - - thread_ = std::thread( - [listener_fd = std::move(fd), name, listener_event]() mutable { - w_set_thread_name(name); - accept_thread(std::move(listener_fd), listener_event); - }); - } - - AcceptLoop(const AcceptLoop&) = delete; - AcceptLoop& operator=(const AcceptLoop&) = delete; - - AcceptLoop(AcceptLoop&& other) { - *this = std::move(other); - } - - AcceptLoop& operator=(AcceptLoop&& other) { - thread_ = std::move(other.thread_); - joined_ = other.joined_; - // Ensure that we don't try to join the source, - // as std::thread::join will std::terminate in that case. - // If it weren't for this we could use the compiler - // default implementation of move. - other.joined_ = true; - return *this; - } - - ~AcceptLoop() { - join(); - } - - void join() { - if (joined_) { - return; - } - thread_.join(); - joined_ = true; - } + std::thread thread_; + bool joined_{false}; }; bool w_start_listener() { @@ -819,7 +812,7 @@ bool w_start_listener() { /* allow SIGUSR1 and SIGCHLD to wake up a blocked thread, without restarting * syscalls */ memset(&sa, 0, sizeof(sa)); - sa.sa_handler = wakeme; + sa.sa_handler = [](int) {}; sa.sa_flags = 0; sigaction(SIGUSR1, &sa, NULL); sigaction(SIGCHLD, &sa, NULL); From d0b4d015dc3a2d73066b5efd3a56204587eb5d36 Mon Sep 17 00:00:00 2001 From: Mahesh Balakrishnan Date: Mon, 16 Aug 2021 09:22:21 -0700 Subject: [PATCH 0477/7387] Setting up basic build for delos_core Summary: This diff adds the manifest file for delos_core so we can build using getdeps. Reviewed By: hanm Differential Revision: D26011286 fbshipit-source-id: becb1a665a95f0d593072885c3ddfcf5c4403f51 --- build/fbcode_builder/manifests/delos_core | 25 +++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 build/fbcode_builder/manifests/delos_core diff --git a/build/fbcode_builder/manifests/delos_core b/build/fbcode_builder/manifests/delos_core new file mode 100644 index 000000000000..1de6c3342df4 --- /dev/null +++ b/build/fbcode_builder/manifests/delos_core @@ -0,0 +1,25 @@ +[manifest] +name = delos_core +fbsource_path = fbcode/delos_core +shipit_project = delos_core +shipit_fbcode_builder = true + +[git] +repo_url = https://github.com/facebookincubator/delos_core.git + +[build.os=linux] +builder = cmake + +[build.not(os=linux)] +builder = nop + +[dependencies] +glog +googletest +folly +fbthrift +fb303 +re2 + +[shipit.pathmap] +fbcode/delos_core = . From cdf54f26b3aff60e4dd730ac0183d81c76984253 Mon Sep 17 00:00:00 2001 From: Dead Code Bot <> Date: Mon, 16 Aug 2021 09:24:08 -0700 Subject: [PATCH 0478/7387] Remove dead includes in watchman/query Reviewed By: chadaustin Differential Revision: D30336041 fbshipit-source-id: a2d74700a1463c1bb9cb0be6314785bd49b09d63 --- watchman/query/empty.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/watchman/query/empty.cpp b/watchman/query/empty.cpp index c3c82556c39e..9473a7098d6f 100644 --- a/watchman/query/empty.cpp +++ b/watchman/query/empty.cpp @@ -5,8 +5,6 @@ #include -using namespace watchman; - class ExistsExpr : public QueryExpr { public: EvaluateResult evaluate(QueryContext*, FileResult* file) override { From 95022e3fd224eb851773bd0c7c85a5659ed6d6ba Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 16 Aug 2021 10:38:30 -0700 Subject: [PATCH 0479/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/86ced27eda9f010c92296d2aa378e6d6eae22878 https://github.com/facebook/fbthrift/commit/fb8aa0b9c53c6dcacfccdf85edb9dcab1cae3a91 https://github.com/facebook/fbzmq/commit/5e1ac50d42cdb2bdc7173896bbf901177a249a31 https://github.com/facebook/folly/commit/0d7f79c29fa306b97ff7c35175ef7d9dfba7c50a https://github.com/facebook/litho/commit/6b68544d9c6a097f822a8a3b187447b9f1c10d2c https://github.com/facebook/proxygen/commit/3d22ce8e73e3914ac8513359b04da1211afcfef4 https://github.com/facebook/rocksdb/commit/5de333fd99a2c2797a2035894b2eb81d4e30ad7e https://github.com/facebook/wangle/commit/57e74cf71bcb2fc2910bf2651961626a72c3facf https://github.com/facebook/watchman/commit/cdf54f26b3aff60e4dd730ac0183d81c76984253 https://github.com/facebookexperimental/rust-shed/commit/acfb623807329d738f482dc46af50ecccfccd4ad https://github.com/facebookexternal/stl_tasks/commit/845e28ce500f07d3149acbaa34b52be93ea4edf2 https://github.com/facebookincubator/fizz/commit/7a6b47d9a5678760f0b959513a5e01260eaf937d https://github.com/facebookincubator/katran/commit/e1ae10ff7098bd672f22e0aebccc10a6478a3f74 https://github.com/facebookincubator/mvfst/commit/9dd97ae044b92f0cc437b8430447431cae589f74 https://github.com/facebookincubator/profilo/commit/601b74f75f1ce2058bac8e76f332d69b8bd6734d https://github.com/facebookresearch/pytorch-biggraph/commit/b4bb281e84a8678925533a7e9fd308ff6e5e43a0 https://github.com/rsocket/rsocket-cpp/commit/a6ea9e3646672cd0cf302ef294cb0e364806752c Reviewed By: 2d2d2d2d2d fbshipit-source-id: d93880b11bce8620f20b75e2de9b78fc0c911572 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4f53b8364159..689742dc36eb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d7809b9fa26c82546b25c6231f4f7996b265555b +Subproject commit fb8aa0b9c53c6dcacfccdf85edb9dcab1cae3a91 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9532ee368bc1..a7e6e73217f2 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d365f9e4a4e95d3e5bec6c5b0d481948d3ea67f5 +Subproject commit 0d7f79c29fa306b97ff7c35175ef7d9dfba7c50a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0e977602f57f..0d38a07f1882 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 72a39bdf69184b5bc8588bd0e00eb214dfba06f4 +Subproject commit 57e74cf71bcb2fc2910bf2651961626a72c3facf From 0f6109fbd9417756092d020d4409badb1c04294b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 16 Aug 2021 13:57:13 -0700 Subject: [PATCH 0480/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/8757a6224fc6f0c3d7dd17933c0ad45ad1b714cc https://github.com/facebook/fbthrift/commit/214632d4357d54cb8277202ad23fd28370e3f4e2 https://github.com/facebook/fbzmq/commit/dedd9ec4def7c1dd714cdd0c349e0694c7a3546b https://github.com/facebook/folly/commit/e460690d673d23dc4775361c103dd4eabd2b947e https://github.com/facebook/mcrouter/commit/b4e88ab9716e8c31346b629ea9994db45ad7f4af https://github.com/facebook/proxygen/commit/c4b5bfa778d407ab95c7fbd344bdbdbe7ca9df99 https://github.com/facebook/wangle/commit/41241f8a4d87f897447dcd2a2ddfb343fb6e7243 https://github.com/facebook/watchman/commit/95022e3fd224eb851773bd0c7c85a5659ed6d6ba https://github.com/facebookexperimental/rust-shed/commit/9f166c013275387fbeb0c4ca65bd9789d210fb0a https://github.com/facebookincubator/fizz/commit/be61799c10ea1dcae9964669a18d1f459b5c5dd3 https://github.com/facebookincubator/katran/commit/a1571d9fad51ddd9d1430059ee0191a78e56e2c1 https://github.com/facebookincubator/mvfst/commit/2caf2ff49d40834823c469c1bc3a1200dd1c6db2 https://github.com/rsocket/rsocket-cpp/commit/194c148fa64b333397204c1dc8a4597b7b7ad54d Reviewed By: 2d2d2d2d2d fbshipit-source-id: ed33dbf3d8edff026b1e5fbae0a036ca0a659211 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 689742dc36eb..dac5a4317443 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit fb8aa0b9c53c6dcacfccdf85edb9dcab1cae3a91 +Subproject commit 214632d4357d54cb8277202ad23fd28370e3f4e2 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a7e6e73217f2..7538bb1545b0 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0d7f79c29fa306b97ff7c35175ef7d9dfba7c50a +Subproject commit e460690d673d23dc4775361c103dd4eabd2b947e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0d38a07f1882..fb3286971eef 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 57e74cf71bcb2fc2910bf2651961626a72c3facf +Subproject commit 41241f8a4d87f897447dcd2a2ddfb343fb6e7243 From f36b831b8bda1c2c5a7f28d5cd65d64e585be2bd Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 16 Aug 2021 14:15:27 -0700 Subject: [PATCH 0481/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/624166831e060e073cba0a1546be6ff6f69e32e5 https://github.com/facebook/fbthrift/commit/920a5e714bd296e82836aeec71fb27539352a960 https://github.com/facebook/fbzmq/commit/03c7bc39d07070f09eafba05031378216facc674 https://github.com/facebook/proxygen/commit/dccc081549f549ca3af4ff4eb865740b9451d842 https://github.com/facebook/wangle/commit/20d84a0564de5b135b833fad7fa26f118f3ba4c0 https://github.com/facebook/watchman/commit/0f6109fbd9417756092d020d4409badb1c04294b https://github.com/facebookexperimental/rust-shed/commit/29fcae882432332884a9c531410077a1b0215bf1 https://github.com/facebookincubator/fizz/commit/9bef9f3327d0c8b640cf0c8783204927399b0637 https://github.com/facebookincubator/katran/commit/b9d568d94cddbd2cc30d62ae5bb5234c2e4b1325 https://github.com/facebookincubator/mvfst/commit/813d785309364d9339e028f7f8a4d62f84d0b95c https://github.com/rsocket/rsocket-cpp/commit/681d76765c977f3be5310a0969f591418fc3dcb3 Reviewed By: 2d2d2d2d2d fbshipit-source-id: df5509f7217c0b0d6af81645a3d52124ddd9b0f0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index dac5a4317443..e0229e0a98a8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 214632d4357d54cb8277202ad23fd28370e3f4e2 +Subproject commit 920a5e714bd296e82836aeec71fb27539352a960 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index fb3286971eef..2085b9544835 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 41241f8a4d87f897447dcd2a2ddfb343fb6e7243 +Subproject commit 20d84a0564de5b135b833fad7fa26f118f3ba4c0 From a5485c3b6f75a3141ada5728a6170c503a3a1690 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 16 Aug 2021 14:44:32 -0700 Subject: [PATCH 0482/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/b65aff4a88f5e7ba361c3704908961b33537c727 https://github.com/facebook/fbthrift/commit/2e44c3a1902dfcb4befade6d971e771a7b970ffa https://github.com/facebook/fbzmq/commit/8814a7c5462431681e70c083ecf63b3f278927ed https://github.com/facebook/proxygen/commit/2945b5c1bf5ce9d362487b907bd666ed711a4896 https://github.com/facebook/wangle/commit/95bb09dcbe2a009eb3c69586f97e4bcf23e1a9ce https://github.com/facebook/watchman/commit/f36b831b8bda1c2c5a7f28d5cd65d64e585be2bd https://github.com/facebookexperimental/rust-shed/commit/0d9aa408594b67a2ce41ddb9f01c16c546de2db0 https://github.com/facebookincubator/katran/commit/27f7e4f1226c3207b55dd37d505483f8c1bb8033 https://github.com/facebookincubator/mvfst/commit/c69fba04e0862d80e21965532d40a5866f5a3fc0 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 321ef3122d6c4a6c714d2a7aa70c7ae23396d874 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e0229e0a98a8..57349d431dd2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 920a5e714bd296e82836aeec71fb27539352a960 +Subproject commit 2e44c3a1902dfcb4befade6d971e771a7b970ffa diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2085b9544835..842725a678a8 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 20d84a0564de5b135b833fad7fa26f118f3ba4c0 +Subproject commit 95bb09dcbe2a009eb3c69586f97e4bcf23e1a9ce From 04d777a372e41503d7cbbbbe21ec0e1df0b13976 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 16 Aug 2021 15:04:40 -0700 Subject: [PATCH 0483/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/8757a6224fc6f0c3d7dd17933c0ad45ad1b714cc https://github.com/facebook/fbthrift/commit/214632d4357d54cb8277202ad23fd28370e3f4e2 https://github.com/facebook/fbzmq/commit/dedd9ec4def7c1dd714cdd0c349e0694c7a3546b https://github.com/facebook/proxygen/commit/c4b5bfa778d407ab95c7fbd344bdbdbe7ca9df99 https://github.com/facebook/wangle/commit/41241f8a4d87f897447dcd2a2ddfb343fb6e7243 https://github.com/facebook/watchman/commit/95022e3fd224eb851773bd0c7c85a5659ed6d6ba https://github.com/facebookexperimental/rust-shed/commit/9f166c013275387fbeb0c4ca65bd9789d210fb0a https://github.com/facebookincubator/fizz/commit/be61799c10ea1dcae9964669a18d1f459b5c5dd3 https://github.com/facebookincubator/katran/commit/a1571d9fad51ddd9d1430059ee0191a78e56e2c1 https://github.com/facebookincubator/mvfst/commit/2caf2ff49d40834823c469c1bc3a1200dd1c6db2 https://github.com/rsocket/rsocket-cpp/commit/194c148fa64b333397204c1dc8a4597b7b7ad54d Reviewed By: 2d2d2d2d2d fbshipit-source-id: 992d8e01ffda4848ce10fe9fd9651126c4cafce7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 57349d431dd2..dac5a4317443 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2e44c3a1902dfcb4befade6d971e771a7b970ffa +Subproject commit 214632d4357d54cb8277202ad23fd28370e3f4e2 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 842725a678a8..fb3286971eef 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 95bb09dcbe2a009eb3c69586f97e4bcf23e1a9ce +Subproject commit 41241f8a4d87f897447dcd2a2ddfb343fb6e7243 From cbb471257dc10a2670a0f004f3b4be13df477d14 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 16 Aug 2021 15:23:45 -0700 Subject: [PATCH 0484/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/7de2b9bc864ff51dbea0155940849a8e2d042ceb https://github.com/facebook/fbthrift/commit/8e01979d1dc67cdb9493b9cfada131037573c900 https://github.com/facebook/fbzmq/commit/388cd3dc6f4f695c5ff63afbacdb48e74127f780 https://github.com/facebook/proxygen/commit/f1a9278212a350b887ce0b4420ada872db3521e0 https://github.com/facebook/wangle/commit/3e70900d7a0467894ff57e1fad44afa4f62f19ca https://github.com/facebook/watchman/commit/04d777a372e41503d7cbbbbe21ec0e1df0b13976 https://github.com/facebookexperimental/rust-shed/commit/46ccb158159c601f9c61bd73427a7100d5a35cab https://github.com/facebookincubator/fizz/commit/9bef9f3327d0c8b640cf0c8783204927399b0637 https://github.com/facebookincubator/katran/commit/f28402fb2f4d6133e305a69357041256ab604d03 https://github.com/facebookincubator/mvfst/commit/c5753354c31f80603ab7322603c4b85328545749 https://github.com/rsocket/rsocket-cpp/commit/681d76765c977f3be5310a0969f591418fc3dcb3 Reviewed By: 2d2d2d2d2d fbshipit-source-id: c1c10b8fa441cac0f0aeab32c6d973303273e8ef --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index dac5a4317443..9dedaf9aec3b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 214632d4357d54cb8277202ad23fd28370e3f4e2 +Subproject commit 8e01979d1dc67cdb9493b9cfada131037573c900 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index fb3286971eef..fbd88fb80020 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 41241f8a4d87f897447dcd2a2ddfb343fb6e7243 +Subproject commit 3e70900d7a0467894ff57e1fad44afa4f62f19ca From 55b2173703d416da7ebcf115a0113d3e9f590f2d Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 16 Aug 2021 16:14:07 -0700 Subject: [PATCH 0485/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/fec3f1bd93885f6bad0d8796baf42b4d70d5ec8e https://github.com/facebook/fbthrift/commit/3966cb797393d2b7ee3b0fc37479bcf95dc4b49a https://github.com/facebook/fbzmq/commit/c42d9d0252365d602572c60e0539f5253fd7646b https://github.com/facebook/proxygen/commit/817485f6938b2e1cf6e3fd3ae89f1b95c3c93ee6 https://github.com/facebook/wangle/commit/1736c53473265275ff4b2b94e442022e76c8f29e https://github.com/facebook/watchman/commit/cbb471257dc10a2670a0f004f3b4be13df477d14 https://github.com/facebookexperimental/rust-shed/commit/b37432ecc720aa14b04f8c243a4c3e5e00ceaad0 https://github.com/facebookincubator/katran/commit/c578b008338856cea993b7802d1e2ae0a5b97091 https://github.com/facebookincubator/mvfst/commit/6879041661969d476555c399e15afeb91c1ff3e5 Reviewed By: 2d2d2d2d2d fbshipit-source-id: c362bcfe56d3f7ac9c09cea9db69a884a33525ef --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9dedaf9aec3b..7b7de3f5013b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8e01979d1dc67cdb9493b9cfada131037573c900 +Subproject commit 3966cb797393d2b7ee3b0fc37479bcf95dc4b49a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index fbd88fb80020..b1a05d9f0614 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3e70900d7a0467894ff57e1fad44afa4f62f19ca +Subproject commit 1736c53473265275ff4b2b94e442022e76c8f29e From 7cb26c3623fe06613a191c624ee2fe7b296c03d0 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 16 Aug 2021 16:41:59 -0700 Subject: [PATCH 0486/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/90be2d56cfb09ee54f294c0f660f131407adc3f3 https://github.com/facebook/fbthrift/commit/62104f6c534ec562a3db9adbc489c2e7004277cc https://github.com/facebook/fbzmq/commit/dba6401d94eac0ff38cb158fd09cc739cc3233b8 https://github.com/facebook/proxygen/commit/cd04668409f59d24ab0e95d90b206a13634bb9fe https://github.com/facebook/watchman/commit/55b2173703d416da7ebcf115a0113d3e9f590f2d https://github.com/facebookexperimental/rust-shed/commit/46e0aa29a258c5e70868bd285aa7c076b020620f Reviewed By: 2d2d2d2d2d fbshipit-source-id: c0b202019c423ecfb4bbe85781ed205bd7eed1c4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7b7de3f5013b..0f7a19bc71cc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3966cb797393d2b7ee3b0fc37479bcf95dc4b49a +Subproject commit 62104f6c534ec562a3db9adbc489c2e7004277cc From 5980ae4596a08918e66814d0bb344835653631c0 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 16 Aug 2021 17:05:28 -0700 Subject: [PATCH 0487/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/fec3f1bd93885f6bad0d8796baf42b4d70d5ec8e https://github.com/facebook/fbthrift/commit/3966cb797393d2b7ee3b0fc37479bcf95dc4b49a https://github.com/facebook/fbzmq/commit/c42d9d0252365d602572c60e0539f5253fd7646b https://github.com/facebook/proxygen/commit/817485f6938b2e1cf6e3fd3ae89f1b95c3c93ee6 https://github.com/facebook/watchman/commit/cbb471257dc10a2670a0f004f3b4be13df477d14 https://github.com/facebookexperimental/rust-shed/commit/b37432ecc720aa14b04f8c243a4c3e5e00ceaad0 Reviewed By: 2d2d2d2d2d fbshipit-source-id: d067f8a69d6b125455212aedd2c2c172b3eb0f91 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0f7a19bc71cc..7b7de3f5013b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 62104f6c534ec562a3db9adbc489c2e7004277cc +Subproject commit 3966cb797393d2b7ee3b0fc37479bcf95dc4b49a From e30ca98a25ff0628bcafcc2a481fd149a6257a11 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 16 Aug 2021 17:33:48 -0700 Subject: [PATCH 0488/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/975bd9482461eb76d4f748a00d09ce4e777c1040 https://github.com/facebook/fbthrift/commit/26acaf05957f128f3396487e6c5357146038eac7 https://github.com/facebook/fbzmq/commit/a0a7490eaffb1b507b7a2bb87ae24ffaa90274a8 https://github.com/facebook/proxygen/commit/cd04668409f59d24ab0e95d90b206a13634bb9fe https://github.com/facebook/watchman/commit/5980ae4596a08918e66814d0bb344835653631c0 https://github.com/facebookexperimental/rust-shed/commit/2f57ead52b3fcbf9c5bcc855604f27eb2101ee69 Reviewed By: 2d2d2d2d2d fbshipit-source-id: ed26122e75adc9c2454c8a6e112ab297e5dccd0a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7b7de3f5013b..71e89685421e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3966cb797393d2b7ee3b0fc37479bcf95dc4b49a +Subproject commit 26acaf05957f128f3396487e6c5357146038eac7 From b08e01eea0010b90d33b02270ba4d8ed4b012983 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 16 Aug 2021 18:22:11 -0700 Subject: [PATCH 0489/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/d45ff7a6904c42b9255340c50daf80762aaaebd5 Reviewed By: 2d2d2d2d2d fbshipit-source-id: e72477b97ef4bb96893261c5b00e7066fa64b9a0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 71e89685421e..7a5f10849fad 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 26acaf05957f128f3396487e6c5357146038eac7 +Subproject commit d45ff7a6904c42b9255340c50daf80762aaaebd5 From 8e006e32daa364574272fcb58f3076b12262b71e Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 16 Aug 2021 21:33:01 -0700 Subject: [PATCH 0490/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/2a7f6c1187b835427377e71cccb754949e5c169c https://github.com/facebook/rocksdb/commit/add68bd28a512da751e2bdc612685fdeb7e6dde4 https://github.com/facebookexternal/stl_tasks/commit/e5490838e5af267eff163609f71c02f133c8d296 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 85828f2d8200e420eea920fe446859a90c16af23 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7a5f10849fad..ab0617205c56 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d45ff7a6904c42b9255340c50daf80762aaaebd5 +Subproject commit 2a7f6c1187b835427377e71cccb754949e5c169c From e9ea476b6bb11b1a511cf894fd99623d3a69e555 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Mon, 16 Aug 2021 23:38:56 -0700 Subject: [PATCH 0491/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/14580a7c6a19c8750f36738a38d453b9cbe4b007 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 135caf73277d4947ab148e2d848daedf2e7b662d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ab0617205c56..37197780edda 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2a7f6c1187b835427377e71cccb754949e5c169c +Subproject commit 14580a7c6a19c8750f36738a38d453b9cbe4b007 From 494f17845ac8bab3a9e446f293320ab5ec0324d2 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 17 Aug 2021 00:57:30 -0700 Subject: [PATCH 0492/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/4c37de39d0128826825451a26b298300de10af97 Reviewed By: 2d2d2d2d2d fbshipit-source-id: c9d048a16306f5028655a12666e0737d65af649c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 37197780edda..1f9d1dff639f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 14580a7c6a19c8750f36738a38d453b9cbe4b007 +Subproject commit 4c37de39d0128826825451a26b298300de10af97 From 2076e533351069f1f3d13a2d7255bc6fa6eef318 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 17 Aug 2021 02:23:57 -0700 Subject: [PATCH 0493/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/941570ea74cab3d7805084217da89d4aeccffe77 https://github.com/facebookincubator/fizz/commit/fa2cd1e08f0de84750d1a9ed30c303ea4d4e236d Reviewed By: 2d2d2d2d2d fbshipit-source-id: 697b6c3c44fcc5a46581be27b4469ede2c33c8c0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1f9d1dff639f..06ea27bff60b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4c37de39d0128826825451a26b298300de10af97 +Subproject commit 941570ea74cab3d7805084217da89d4aeccffe77 From 433638b9118961579b1a4486757f8afd7f88971c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 17 Aug 2021 03:05:57 -0700 Subject: [PATCH 0494/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/83c08eae64fecc4997ed6b20c98b958eb859bd5f https://github.com/facebook/fbthrift/commit/57beeb3dbdc56346cd4cd0f945749baa9d148af7 https://github.com/facebook/fbzmq/commit/9cc2911925a9bcd3aee89f8f292c240feed92ccc https://github.com/facebook/proxygen/commit/d8696067b1513a0944ada46b2361e91ae7d5e505 https://github.com/facebook/wangle/commit/9594f141d349119499e37a5a1052318d5c0f44f3 https://github.com/facebook/watchman/commit/2076e533351069f1f3d13a2d7255bc6fa6eef318 https://github.com/facebookexperimental/rust-shed/commit/c5a9bca500b0973c8e302c7038447494e3602584 https://github.com/facebookincubator/katran/commit/79a5ec640dc41ebf72bbce04b6a7be2daf3d2bde https://github.com/facebookincubator/mvfst/commit/359ed2d83ce5e12c960bb1d0681559757a294c04 Reviewed By: 2d2d2d2d2d fbshipit-source-id: f8e6ee943b751edc60860d456f64eb271cd6a94a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 06ea27bff60b..e0f9aa209b21 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 941570ea74cab3d7805084217da89d4aeccffe77 +Subproject commit 57beeb3dbdc56346cd4cd0f945749baa9d148af7 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b1a05d9f0614..e93b5b5a03fb 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1736c53473265275ff4b2b94e442022e76c8f29e +Subproject commit 9594f141d349119499e37a5a1052318d5c0f44f3 From 3edd227f797300867b250239724a08b2a94cb891 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 17 Aug 2021 03:43:06 -0700 Subject: [PATCH 0495/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c0c7d0dd790eee3705609f97c737106c6166b01c https://github.com/facebook/fbthrift/commit/7e70459f0c9d9d63825fc5d067b2bc1161299933 https://github.com/facebook/fbzmq/commit/4ed27b333939e11ba989bb65adedd7fc6af27895 https://github.com/facebook/proxygen/commit/7900a571d45b036547408f6050e978bc41cc0ccf https://github.com/facebook/watchman/commit/433638b9118961579b1a4486757f8afd7f88971c https://github.com/facebookexperimental/rust-shed/commit/103e07a2cc86b7493b246e00b9b5e425516903ee Reviewed By: 2d2d2d2d2d fbshipit-source-id: 2e136abaad45c0fdec3c103064f97b0668022973 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e0f9aa209b21..ab3f75442aa1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 57beeb3dbdc56346cd4cd0f945749baa9d148af7 +Subproject commit 7e70459f0c9d9d63825fc5d067b2bc1161299933 From 0841ce0c4130324af7c375dcac5ab1491eaaea33 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 17 Aug 2021 05:18:17 -0700 Subject: [PATCH 0496/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/9d1f29ff4bedb691e9bcef28dcf086609be09cc3 https://github.com/facebook/litho/commit/56270181abadf8cc82654fa1dbbad402c74b21d2 Reviewed By: 2d2d2d2d2d fbshipit-source-id: c2469023a641421b0b5388204a1f8c7053e9a023 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ab3f75442aa1..c9ea766c2305 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7e70459f0c9d9d63825fc5d067b2bc1161299933 +Subproject commit 9d1f29ff4bedb691e9bcef28dcf086609be09cc3 From 84597fc261957e7f46fd57000a5bd67304ce2ed9 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 17 Aug 2021 08:23:07 -0700 Subject: [PATCH 0497/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8cefc8c0954c4dc89660dd72b8fb11e1c9350a09 Reviewed By: 2d2d2d2d2d fbshipit-source-id: e23265663391657901d84a45d0dec3c0bdcf137f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c9ea766c2305..5c0231b2cbad 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9d1f29ff4bedb691e9bcef28dcf086609be09cc3 +Subproject commit 8cefc8c0954c4dc89660dd72b8fb11e1c9350a09 From 995e2fdd92cf0ba5daf8e50061aed2ed6173c9e3 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 17 Aug 2021 11:29:44 -0700 Subject: [PATCH 0498/7387] thriftformat Summary: Apply automated reformatting to our Thrift files. Reviewed By: zertosh Differential Revision: D30372146 fbshipit-source-id: a2fe363a6a17026078d11540b5e9359d097fb56c --- eden/fs/config/eden_config.thrift | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/eden/fs/config/eden_config.thrift b/eden/fs/config/eden_config.thrift index 0be962423d00..01ebe832e164 100644 --- a/eden/fs/config/eden_config.thrift +++ b/eden/fs/config/eden_config.thrift @@ -17,21 +17,21 @@ namespace py3 eden.fs.config * setting of CommandLine takes precedence over all other settings. */ enum ConfigSource { - Default = 0 - SystemConfig = 1 - UserConfig = 2 - CommandLine = 3 + Default = 0, + SystemConfig = 1, + UserConfig = 2, + CommandLine = 3, } enum ConfigReloadBehavior { // Automatically reload the configuration file from disk if it appears to be // necessary. - AutoReload = 0 + AutoReload = 0, // Do not reload the config from disk, and return the current cached values. - NoReload = 1 + NoReload = 1, // Always attempt to reload the config from disk, even if we have recently // checked to see if it was up-to-date. - ForceReload = 2 + ForceReload = 2, } struct ConfigValue { @@ -40,10 +40,10 @@ struct ConfigValue { // TODO: In the future it may be nice to add a sourceValue field that // contains the original value from before variable interpolation. We don't // currently store this data after performing parsing, however. - 1: string parsedValue - 2: ConfigSource source + 1: string parsedValue; + 2: ConfigSource source; } struct EdenConfigData { - 1: map values + 1: map values; } From 640a81781117d000e88f5a92d1bb6058783c695f Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 17 Aug 2021 12:19:02 -0700 Subject: [PATCH 0499/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/d11ad8f1a9eb36965eee2307c49895a67d76c467 https://github.com/facebook/watchman/commit/995e2fdd92cf0ba5daf8e50061aed2ed6173c9e3 https://github.com/facebookexperimental/rust-shed/commit/1ba165f47803f4830dfc882fa7080c16b2bb0e93 https://github.com/facebookexternal/stl_tasks/commit/4e9759c1fb9a196478e5f1d5487243dcdf1448ab Reviewed By: 2d2d2d2d2d fbshipit-source-id: ab7e551292a32ed42842dabac7f6cc4775a9c86c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5c0231b2cbad..42b8ac198f41 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8cefc8c0954c4dc89660dd72b8fb11e1c9350a09 +Subproject commit d11ad8f1a9eb36965eee2307c49895a67d76c467 From 1f5ead1e185ca5167f33ebb78e089de02be6c9ef Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 17 Aug 2021 12:30:22 -0700 Subject: [PATCH 0500/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8cefc8c0954c4dc89660dd72b8fb11e1c9350a09 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 45729db851f20b69bbc180aaee337312826e870d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 42b8ac198f41..5c0231b2cbad 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d11ad8f1a9eb36965eee2307c49895a67d76c467 +Subproject commit 8cefc8c0954c4dc89660dd72b8fb11e1c9350a09 From 040d31cbf30c4125f36ea49b94ee5c7daf330f80 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 17 Aug 2021 13:58:44 -0700 Subject: [PATCH 0501/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/a5bdb739ff7121e937c953946acd5c782b11aaab https://github.com/facebook/fbthrift/commit/d11ad8f1a9eb36965eee2307c49895a67d76c467 https://github.com/facebook/fbzmq/commit/aba2292268cf9ea3f31a2a72ee44d8afbf18be70 https://github.com/facebook/watchman/commit/1f5ead1e185ca5167f33ebb78e089de02be6c9ef https://github.com/facebookexperimental/rust-shed/commit/f41edf0a86a6dc599832f4e8648f6aa67a152d11 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 34b9b3854488dea4fce0ecc09ea42831a5a58977 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5c0231b2cbad..42b8ac198f41 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8cefc8c0954c4dc89660dd72b8fb11e1c9350a09 +Subproject commit d11ad8f1a9eb36965eee2307c49895a67d76c467 From e6a44e3085725c4d4f9fccd0619f961962bf214c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 17 Aug 2021 14:53:12 -0700 Subject: [PATCH 0502/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/f399ab937be0a7678717ea52657c90828a8928fd https://github.com/facebook/fbthrift/commit/ff527501a411e2d81fcc86f75af51db30e8ef071 https://github.com/facebook/fbzmq/commit/a3eaac65d67fb5f5379b5099d7587a32d504f95d https://github.com/facebook/watchman/commit/040d31cbf30c4125f36ea49b94ee5c7daf330f80 https://github.com/facebookexperimental/rust-shed/commit/c3c7b1d20a83a0a8a3cbcd3892b25f4f85b7af0b Reviewed By: 2d2d2d2d2d fbshipit-source-id: 484be0fb3482917083e9c6bc2cba856d962fcba3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 42b8ac198f41..449580102541 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d11ad8f1a9eb36965eee2307c49895a67d76c467 +Subproject commit ff527501a411e2d81fcc86f75af51db30e8ef071 From 6f4891e7c1880f899b8ca9ea712ddcdb2335a232 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 17 Aug 2021 15:18:23 -0700 Subject: [PATCH 0503/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/9dd683cdb9097374eac0d7005bd95e20cf73d066 https://github.com/facebook/fbthrift/commit/58af1159ba10ec5beb10658e6538c6382d5c8294 https://github.com/facebook/fbzmq/commit/e1b2952b7315e7aaca06cedeb65812baacd79cee https://github.com/facebook/litho/commit/5ad8a3fb54b5b67c6c2d1487d6e65d91d677fc2f https://github.com/facebook/watchman/commit/e6a44e3085725c4d4f9fccd0619f961962bf214c https://github.com/facebookexperimental/rust-shed/commit/30a42d2262c7c970b3cb60b0a57aa1387399ba4d Reviewed By: 2d2d2d2d2d fbshipit-source-id: 299ccac8d6b3fa96cc40579b856319bc58129a2f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 449580102541..a55df7ed20a4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ff527501a411e2d81fcc86f75af51db30e8ef071 +Subproject commit 58af1159ba10ec5beb10658e6538c6382d5c8294 From f238ee8b353bc289ba046f85c3cf9e30e15ba6b9 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 17 Aug 2021 17:03:22 -0700 Subject: [PATCH 0504/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/4f1821202e741e79eae0b4ddc7444094448565cd https://github.com/facebook/fbthrift/commit/f56c23056070e33dfaef2eb2dba0506527e61064 https://github.com/facebook/fbzmq/commit/85a28cd514ed93e273ac0d3b6b6ad4b5d46fe84c https://github.com/facebook/watchman/commit/6f4891e7c1880f899b8ca9ea712ddcdb2335a232 https://github.com/facebookexperimental/rust-shed/commit/32d4467385414ecdeaf102c2299a65ab78fb8905 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 12fafc05315455716551f4aa3485f828fae5dd1b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a55df7ed20a4..b1f266574c91 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 58af1159ba10ec5beb10658e6538c6382d5c8294 +Subproject commit f56c23056070e33dfaef2eb2dba0506527e61064 From 643bd1670c6839b383587a3d306d6b9dde9dc84c Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 17 Aug 2021 18:01:09 -0700 Subject: [PATCH 0505/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/f89bb2c2b512efbe991febe82a8ad1a73570106f https://github.com/facebook/fbthrift/commit/42068a35c3c66a65cfea42895f2d2f9961c5bb6c https://github.com/facebook/fbzmq/commit/f34edb913063f02c6daed0f76bc577f619035888 https://github.com/facebook/rocksdb/commit/6878cedcc316e8ea0719e57422843e584a9c964d https://github.com/facebook/watchman/commit/f238ee8b353bc289ba046f85c3cf9e30e15ba6b9 https://github.com/facebookexperimental/rust-shed/commit/95eaebf52ea9a2697cba4892bf1642d40550fa3d Reviewed By: 2d2d2d2d2d fbshipit-source-id: 3674f8e73ff6d0eadecc077b8aae6b76f143394e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b1f266574c91..a21ee60dd443 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f56c23056070e33dfaef2eb2dba0506527e61064 +Subproject commit 42068a35c3c66a65cfea42895f2d2f9961c5bb6c From 8bcd88f251dfe96af220014e3078dbfb45399774 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 17 Aug 2021 19:07:10 -0700 Subject: [PATCH 0506/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/4f1821202e741e79eae0b4ddc7444094448565cd https://github.com/facebook/fbthrift/commit/f56c23056070e33dfaef2eb2dba0506527e61064 https://github.com/facebook/fbzmq/commit/85a28cd514ed93e273ac0d3b6b6ad4b5d46fe84c https://github.com/facebook/rocksdb/commit/0729b287e9379a3d66f91e5522126c9e512344a1 https://github.com/facebook/watchman/commit/6f4891e7c1880f899b8ca9ea712ddcdb2335a232 https://github.com/facebookexperimental/rust-shed/commit/32d4467385414ecdeaf102c2299a65ab78fb8905 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 29137f42b0594cec72edc20ed016f0387df0834c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a21ee60dd443..b1f266574c91 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 42068a35c3c66a65cfea42895f2d2f9961c5bb6c +Subproject commit f56c23056070e33dfaef2eb2dba0506527e61064 From 937ff5f9072f3ed6d9b06404a30837dbdae3e14b Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 17 Aug 2021 19:15:33 -0700 Subject: [PATCH 0507/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ec63d46c559ac854d9c359dcbf5cb10c410a03f4 https://github.com/facebook/fbthrift/commit/42068a35c3c66a65cfea42895f2d2f9961c5bb6c https://github.com/facebook/fbzmq/commit/ff011df9dd3c48a76a0d7eb0ec029466db251257 https://github.com/facebook/rocksdb/commit/6878cedcc316e8ea0719e57422843e584a9c964d https://github.com/facebook/watchman/commit/643bd1670c6839b383587a3d306d6b9dde9dc84c https://github.com/facebookexperimental/rust-shed/commit/4475637002a36ed749367e1418a7c37af01c7b1d Reviewed By: 2d2d2d2d2d fbshipit-source-id: cce53ee6c9f99ad391d94fba59c5dab6a9f4e61e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b1f266574c91..a21ee60dd443 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f56c23056070e33dfaef2eb2dba0506527e61064 +Subproject commit 42068a35c3c66a65cfea42895f2d2f9961c5bb6c From 5bf4bc8fa2681354768100e7aecdc951c5b6c9bd Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Tue, 17 Aug 2021 19:51:48 -0700 Subject: [PATCH 0508/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/b8716bfa32c8fa402a29ddb7dad5fdefccc2811f https://github.com/facebook/fbthrift/commit/b9a519dc9ba4ccb38bcc2a3f5eaae4f7529579ba https://github.com/facebook/fbzmq/commit/d78dc03c9bdab1bdf3ee588cedddb4f0b3db57a3 https://github.com/facebook/watchman/commit/937ff5f9072f3ed6d9b06404a30837dbdae3e14b https://github.com/facebookexperimental/rust-shed/commit/ce172d2cfeebdfdcb8d3fa896142002152dc73f6 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 7b91837118154df8bf337ce43b727d8f37af202c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a21ee60dd443..0295f3e82ede 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 42068a35c3c66a65cfea42895f2d2f9961c5bb6c +Subproject commit b9a519dc9ba4ccb38bcc2a3f5eaae4f7529579ba From cdf6eb010904343b18321bd0a56ed31a12fba4ab Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 18 Aug 2021 04:22:08 -0700 Subject: [PATCH 0509/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/a277b6c6d1338f7e4e317f20267c8be8c1003ec8 https://github.com/facebookincubator/mvfst/commit/0c88a2fa88d4f4fb493fffab518373e809b7ff94 Reviewed By: 2d2d2d2d2d fbshipit-source-id: b911a1d1183c0d569a5a83ae028bd56d750f8e39 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0295f3e82ede..e80dc0f3900f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b9a519dc9ba4ccb38bcc2a3f5eaae4f7529579ba +Subproject commit a277b6c6d1338f7e4e317f20267c8be8c1003ec8 From aedbc3e4239e8939505279ffecdedd14a59d1944 Mon Sep 17 00:00:00 2001 From: Jessica Vandebon Date: Wed, 18 Aug 2021 06:40:55 -0700 Subject: [PATCH 0510/7387] extend top dirs predictive prefetch option to support optional parameter specification Summary: The SmartPlatform service that queries for a user's most used directories allows optional parameters of: os, startTime, endTime, and sandcastleAlias instead of user. This diff extends the current predictive prefetch option which queries based on the current user, mount repository, and a default numResults, to allow specification of all parameters including the optional ones. If a user and/or repo is not specified these are determined from the server state and mount, respectively. If numResults is not specified, a default value is used (predictivePrefetchProfileSize, currently 10,000). For sandcastle aliases, we check if the SANDCASTLE_ALIAS environment variable is set, and if so, use the value as a parameter. If a sandcastle alias is specified, the smartservice will ignore the user and query based on the alias, otherwise a user is assumed. Differential Revision: D30160507 fbshipit-source-id: 174797f0a6f840bb33f669c8d1bb61d76ff7a309 --- eden/fs/service/eden.thrift | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index e1014c0d33e4..837e59e57d75 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -732,8 +732,18 @@ enum Dtype { } struct PredictiveFetch { - // number of directories to glob - 1: unsigned64 numTopDirectories; + // Number of directories to glob. If not specified, a default value (predictivePrefetchProfileSize in EdenConfig.h) is used. + 1: optional unsigned64 numTopDirectories; + // Fetch the most accessed diectories by user specified. If not specified, user is derived from the server state. + 2: optional string user; + // Fetch the most accessed diectories in repository specified. If not specified, repo is derived from the mount. + 3: optional string repo; + // Optional query parameter: fetch top most accessed directories with specified Operating System + 4: optional string os; + // Optional query parameter: fetch top most accessed directories after startTime + 5: optional unsigned64 startTime; + // Optional query parameter: fetch top most accessed directories before endTime + 6: optional unsigned64 endTime; } /** Params for globFiles(). */ struct GlobParams { From fa7fe62dd9144dbe097b23a3510925d81f3da1cb Mon Sep 17 00:00:00 2001 From: Seth Cook Date: Wed, 18 Aug 2021 10:56:16 -0700 Subject: [PATCH 0511/7387] Updating CLI11 symlinks to include CLI11-2.0.0 Summary: Implements step 13 of ["Adding a new version of an existing project"](https://www.internalfb.com/intern/wiki/Third_Party2/Usage/#adding-a-new-version-of) Steps are: 1. Update `fbcode://third-party2/config.py` to use the new CLI11-2.0.0 version 2. `fbcode $> tp2_update_fbcode CLI11` (updated third-party2 symlink) 3. `fbcode $> tp2_config buckify CLI11` (updated symlink to third-party-buck) 4. `fbcode $> buckify_tp2` (added TARGETS & other metadata files to third-party-buck) Differential Revision: D30286158 fbshipit-source-id: 2a0bd5c92f9022eda2ae3f24b757fd2120bfcd4d --- build/fbcode_builder/manifests/CLI11 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/manifests/CLI11 b/build/fbcode_builder/manifests/CLI11 index ad161bde1c81..14cb2332af45 100644 --- a/build/fbcode_builder/manifests/CLI11 +++ b/build/fbcode_builder/manifests/CLI11 @@ -2,12 +2,12 @@ name = CLI11 [download] -url = https://github.com/CLIUtils/CLI11/archive/v1.9.0.tar.gz -sha256 = 67640f37ec3be9289039930c987a492badc600645b65057023679f7bb99734e4 +url = https://github.com/CLIUtils/CLI11/archive/v2.0.0.tar.gz +sha256 = 2c672f17bf56e8e6223a3bfb74055a946fa7b1ff376510371902adb9cb0ab6a3 [build] builder = cmake -subdir = CLI11-1.9.0 +subdir = CLI11-2.0.0 [cmake.defines] CLI11_BUILD_TESTS = OFF From 8d4ef1838ce4709b07c9394c31fd1150bc80ea1c Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Wed, 18 Aug 2021 11:19:32 -0700 Subject: [PATCH 0512/7387] follow-up from D28952819 Summary: A combination of a mistake by me and some confusing tooling led to code review fixes for D28952819 (https://github.com/facebook/watchman/commit/d1795de4ecab33672a89802318fe6f0122462194) not landing. Importantly, one of these is a bug fix to query synchronization in FSEvents: a watcher sync would not necessarily wake the iothread. Reviewed By: genevievehelsel Differential Revision: D29171158 fbshipit-source-id: b5c6f46a5ba313fe58d96aa221aeacb6c758aa38 --- watchman/PendingCollection.cpp | 2 +- watchman/PendingCollection.h | 2 +- watchman/root/iothread.cpp | 6 +++++- watchman/root/notifythread.cpp | 2 +- watchman/root/sync.cpp | 12 +++++++++++- watchman/tests/PendingCollectionTest.cpp | 4 ++-- watchman/watcher/fsevents.cpp | 5 ++++- 7 files changed, 25 insertions(+), 8 deletions(-) diff --git a/watchman/PendingCollection.cpp b/watchman/PendingCollection.cpp index dedf1c07853a..6a9c5702b37c 100644 --- a/watchman/PendingCollection.cpp +++ b/watchman/PendingCollection.cpp @@ -147,7 +147,7 @@ bool PendingChanges::empty() const { return 0 == tree_.size() && syncs_.empty(); } -uint32_t PendingChanges::size() const { +uint32_t PendingChanges::getPendingItemCount() const { return tree_.size(); } diff --git a/watchman/PendingCollection.h b/watchman/PendingCollection.h index 0bc3fbcb7257..3ff2f0fe7fd1 100644 --- a/watchman/PendingCollection.h +++ b/watchman/PendingCollection.h @@ -148,7 +148,7 @@ class PendingChanges { * Returns the number of unique pending items in the collection. Does not * include sync requests. */ - uint32_t size() const; + uint32_t getPendingItemCount() const; protected: art_tree, w_string> tree_; diff --git a/watchman/root/iothread.cpp b/watchman/root/iothread.cpp index af2586ccb7b6..09b4a8450206 100644 --- a/watchman/root/iothread.cpp +++ b/watchman/root/iothread.cpp @@ -243,7 +243,11 @@ InMemoryView::IsDesynced InMemoryView::processAllPending( std::vector>> allSyncs; while (!coll.empty()) { - logf(DBG, "processing {} events in {}\n", coll.size(), rootPath_); + logf( + DBG, + "processing {} events in {}\n", + coll.getPendingItemCount(), + rootPath_); auto pending = coll.stealItems(); auto syncs = coll.stealSyncs(); diff --git a/watchman/root/notifythread.cpp b/watchman/root/notifythread.cpp index c6a0901f07a3..a69a625adf8f 100644 --- a/watchman/root/notifythread.cpp +++ b/watchman/root/notifythread.cpp @@ -45,7 +45,7 @@ void InMemoryView::notifyThread(const std::shared_ptr& root) { if (!resultFlags.addedPending) { break; } - if (fromWatcher.size() >= WATCHMAN_BATCH_LIMIT) { + if (fromWatcher.getPendingItemCount() >= WATCHMAN_BATCH_LIMIT) { break; } if (!watcher_->waitNotify(0)) { diff --git a/watchman/root/sync.cpp b/watchman/root/sync.cpp index 8cad36216e4f..46551d5a1098 100644 --- a/watchman/root/sync.cpp +++ b/watchman/root/sync.cpp @@ -70,7 +70,17 @@ void InMemoryView::syncToNow( // everything prior. // // Would be nice to use a deadline rather than a timeout here. - std::move(result).get(timeout); + + try { + std::move(result).get(timeout); + } catch (folly::FutureTimeout&) { + auto why = folly::to( + "syncToNow: timed out waiting for pending watcher events to be flushed within ", + timeout.count(), + " milliseconds"); + log(ERR, why, "\n"); + throw std::system_error(ETIMEDOUT, std::generic_category(), why); + } } } diff --git a/watchman/tests/PendingCollectionTest.cpp b/watchman/tests/PendingCollectionTest.cpp index 94ac04047b06..ddaadd729708 100644 --- a/watchman/tests/PendingCollectionTest.cpp +++ b/watchman/tests/PendingCollectionTest.cpp @@ -179,7 +179,7 @@ class NaivePendingCollection { head_ = p; } - size_t size() const { + size_t getPendingItemCount() const { size_t i = 0; for (auto p = head_; p; p = p->next) { ++i; @@ -354,7 +354,7 @@ TYPED_TEST(PendingCollectionFixture, real_example) { this->coll.add( w_string{"/home/chadaustin/tmp/watchmanroots/test-root/f"}, this->now, 3); - EXPECT_EQ(3, this->coll.size()); + EXPECT_EQ(3, this->coll.getPendingItemCount()); auto item = this->coll.stealItems(); ASSERT_NE(nullptr, item); diff --git a/watchman/watcher/fsevents.cpp b/watchman/watcher/fsevents.cpp index 45c361c4c697..895d6a087881 100644 --- a/watchman/watcher/fsevents.cpp +++ b/watchman/watcher/fsevents.cpp @@ -697,6 +697,7 @@ Watcher::ConsumeNotifyRet FSEventsWatcher::consumeNotify( char flags_label[128]; std::vector> items; std::vector> syncs; + bool addedPending = false; bool cancelSelf = false; { @@ -782,14 +783,16 @@ Watcher::ConsumeNotifyRet FSEventsWatcher::consumeNotify( } coll.add(item.path, now, flags); + addedPending = true; } } for (auto& sync : syncs) { coll.addSync(std::move(sync)); + addedPending = true; } - return {!items.empty(), cancelSelf}; + return {addedPending, cancelSelf}; } void FSEventsWatcher::signalThreads() { From e1a28c59bb16719b5706eb40fc41aeb54b9d4204 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Wed, 18 Aug 2021 11:19:32 -0700 Subject: [PATCH 0513/7387] remove addedPending Summary: ConsumeNotifyRet's addedPending looks redundant with PendingCollection's empty() state, and they did not always agree. Remove addedPending. Reviewed By: genevievehelsel Differential Revision: D29173677 fbshipit-source-id: 925b0a278c5526ef12fd56f00c85fd7afdb2e925 --- watchman/root/notifythread.cpp | 11 +++-------- watchman/watcher/Watcher.h | 12 +++++------- watchman/watcher/fsevents.cpp | 5 +---- watchman/watcher/inotify.cpp | 4 ++-- watchman/watcher/kqueue.cpp | 6 +++--- watchman/watcher/kqueue_and_fsevents.cpp | 10 ++++------ watchman/watcher/win32.cpp | 2 +- 7 files changed, 19 insertions(+), 31 deletions(-) diff --git a/watchman/root/notifythread.cpp b/watchman/root/notifythread.cpp index a69a625adf8f..7e83f86f76dd 100644 --- a/watchman/root/notifythread.cpp +++ b/watchman/root/notifythread.cpp @@ -35,23 +35,18 @@ void InMemoryView::notifyThread(const std::shared_ptr& root) { if (!watcher_->waitNotify(86400)) { continue; } - while (true) { + do { auto resultFlags = watcher_->consumeNotify(root, fromWatcher); if (resultFlags.cancelSelf) { root->cancel(); break; } - if (!resultFlags.addedPending) { - break; - } if (fromWatcher.getPendingItemCount() >= WATCHMAN_BATCH_LIMIT) { break; } - if (!watcher_->waitNotify(0)) { - break; - } - } + } while (watcher_->waitNotify(0)); + if (!fromWatcher.empty()) { auto lock = pending_.lock(); lock->append(fromWatcher.stealItems(), fromWatcher.stealSyncs()); diff --git a/watchman/watcher/Watcher.h b/watchman/watcher/Watcher.h index 271bb596a88a..6333fcd377ba 100644 --- a/watchman/watcher/Watcher.h +++ b/watchman/watcher/Watcher.h @@ -78,13 +78,6 @@ class Watcher : public std::enable_shared_from_this { // Signal any threads to terminate. Do not join them here. virtual void signalThreads() {} - struct ConsumeNotifyRet { - // Were events added to the collection? - bool addedPending; - // Should the watch be cancelled? - bool cancelSelf; - }; - /** * Wait for an inotify event to become available. * Returns true if events are available or false if signalThreads() has been @@ -92,6 +85,11 @@ class Watcher : public std::enable_shared_from_this { */ virtual bool waitNotify(int timeoutms) = 0; + struct ConsumeNotifyRet { + // Should the watch be cancelled? + bool cancelSelf; + }; + /** * Consume any available notifications. If there are none pending, * does not block. diff --git a/watchman/watcher/fsevents.cpp b/watchman/watcher/fsevents.cpp index 895d6a087881..7563812b252c 100644 --- a/watchman/watcher/fsevents.cpp +++ b/watchman/watcher/fsevents.cpp @@ -697,7 +697,6 @@ Watcher::ConsumeNotifyRet FSEventsWatcher::consumeNotify( char flags_label[128]; std::vector> items; std::vector> syncs; - bool addedPending = false; bool cancelSelf = false; { @@ -783,16 +782,14 @@ Watcher::ConsumeNotifyRet FSEventsWatcher::consumeNotify( } coll.add(item.path, now, flags); - addedPending = true; } } for (auto& sync : syncs) { coll.addSync(std::move(sync)); - addedPending = true; } - return {addedPending, cancelSelf}; + return {cancelSelf}; } void FSEventsWatcher::signalThreads() { diff --git a/watchman/watcher/inotify.cpp b/watchman/watcher/inotify.cpp index cc65ff5bf33a..b188d5414c31 100644 --- a/watchman/watcher/inotify.cpp +++ b/watchman/watcher/inotify.cpp @@ -398,7 +398,7 @@ Watcher::ConsumeNotifyRet InotifyWatcher::consumeNotify( int n = read(infd.fd(), &ibuf, sizeof(ibuf)); if (n == -1) { if (errno == EINTR) { - return {false, false}; + return {false}; } logf( FATAL, @@ -450,7 +450,7 @@ Watcher::ConsumeNotifyRet InotifyWatcher::consumeNotify( } } - return {true, cancel}; + return {cancel}; } bool InotifyWatcher::waitNotify(int timeoutms) { diff --git a/watchman/watcher/kqueue.cpp b/watchman/watcher/kqueue.cpp index 99906940ea65..ee8fe5817830 100644 --- a/watchman/watcher/kqueue.cpp +++ b/watchman/watcher/kqueue.cpp @@ -235,7 +235,7 @@ Watcher::ConsumeNotifyRet KQueueWatcher::consumeNotify( n, folly::errnoStr(errno)); if (root->inner.cancelled) { - return {0, false}; + return {false}; } auto now = std::chrono::system_clock::now(); @@ -271,7 +271,7 @@ Watcher::ConsumeNotifyRet KQueueWatcher::consumeNotify( "root dir {} has been (re)moved [code {:x}], canceling watch\n", root->root_path, fflags); - return {0, true}; + return {true}; } // Remove our watch bits @@ -287,7 +287,7 @@ Watcher::ConsumeNotifyRet KQueueWatcher::consumeNotify( path, now, is_dir ? 0 : (W_PENDING_RECURSIVE | W_PENDING_VIA_NOTIFY)); } - return {n > 0, false}; + return {false}; } bool KQueueWatcher::waitNotify(int timeoutms) { diff --git a/watchman/watcher/kqueue_and_fsevents.cpp b/watchman/watcher/kqueue_and_fsevents.cpp index 200d296a4d11..5c6388c505bd 100644 --- a/watchman/watcher/kqueue_and_fsevents.cpp +++ b/watchman/watcher/kqueue_and_fsevents.cpp @@ -222,7 +222,6 @@ bool KQueueAndFSEventsWatcher::startWatchFile(struct watchman_file* file) { Watcher::ConsumeNotifyRet KQueueAndFSEventsWatcher::consumeNotify( const std::shared_ptr& root, PendingChanges& coll) { - bool ret = false; { auto guard = injectedRecrawl_.wlock(); if (guard->has_value()) { @@ -237,22 +236,21 @@ Watcher::ConsumeNotifyRet KQueueAndFSEventsWatcher::consumeNotify( guard->reset(); } } + { auto fseventWatches = fseventWatchers_.wlock(); for (auto& [watchpath, fsevent] : *fseventWatches) { - auto [addedPending, cancelSelf] = fsevent->consumeNotify(root, coll); + auto [cancelSelf] = fsevent->consumeNotify(root, coll); if (cancelSelf) { fsevent->signalThreads(); root->cookies.removeCookieDir(watchpath); fseventWatches->erase(watchpath); continue; } - ret |= addedPending; } } - auto [addedPending, cancelSelf] = kqueueWatcher_->consumeNotify(root, coll); - ret |= addedPending; - return {ret, cancelSelf}; + + return kqueueWatcher_->consumeNotify(root, coll); } bool KQueueAndFSEventsWatcher::waitNotify(int timeoutms) { diff --git a/watchman/watcher/win32.cpp b/watchman/watcher/win32.cpp index 21f2799da14e..a4c61743b4d1 100644 --- a/watchman/watcher/win32.cpp +++ b/watchman/watcher/win32.cpp @@ -388,7 +388,7 @@ Watcher::ConsumeNotifyRet WinWatcher::consumeNotify( } // The readChangesThread cancels itself. - return {!items.empty(), false}; + return {false}; } bool WinWatcher::waitNotify(int timeoutms) { From de679c7dda7376eea32ddc8819a8a2af3f59f67b Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Wed, 18 Aug 2021 11:19:32 -0700 Subject: [PATCH 0514/7387] move sockname into its own target Summary: Move sockname into its own target. This helps break apart watchman.h. Reviewed By: genevievehelsel Differential Revision: D30358556 fbshipit-source-id: dcab3ab6a65cdeb037d3ae07f242ce64b1fac1b1 --- watchman/cmds/info.cpp | 8 ++++++- watchman/cmds/trigger.cpp | 7 +++++- watchman/listener.cpp | 5 ++++- watchman/main.cpp | 1 + watchman/perf.cpp | 4 +++- watchman/scm/Mercurial.cpp | 4 +++- watchman/sockname.cpp | 6 ++++- watchman/sockname.h | 29 ++++++++++++++++++++++++ watchman/stream.cpp | 2 +- watchman/watchman.h | 19 ---------------- watchman/watchman_cmd.h | 7 +++++- watchman/watchman_pdu.h | 45 +++++++++++++++++++++---------------- watchman/watchman_trigger.h | 3 +++ 13 files changed, 94 insertions(+), 46 deletions(-) create mode 100644 watchman/sockname.h diff --git a/watchman/cmds/info.cpp b/watchman/cmds/info.cpp index ce71effcad73..2d10ab3edb87 100644 --- a/watchman/cmds/info.cpp +++ b/watchman/cmds/info.cpp @@ -1,7 +1,13 @@ /* Copyright 2013-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ -#include "watchman/watchman.h" +#include "watchman/CommandRegistry.h" +#include "watchman/Logging.h" +#include "watchman/sockname.h" +#include "watchman/thirdparty/jansson/jansson.h" +#include "watchman/watchman_cmd.h" +#include "watchman/watchman_root.h" +#include "watchman/watchman_stream.h" using namespace watchman; diff --git a/watchman/cmds/trigger.cpp b/watchman/cmds/trigger.cpp index 4fc8fb829c65..814b1c757def 100644 --- a/watchman/cmds/trigger.cpp +++ b/watchman/cmds/trigger.cpp @@ -1,10 +1,15 @@ /* Copyright 2013-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ -#include "watchman/watchman.h" +#include "watchman/CommandRegistry.h" +#include "watchman/sockname.h" +#include "watchman/watchman_trigger.h" #include +// TODO: remove +#include "watchman/watchman.h" + using namespace watchman; bool watchman_trigger_command::waitNoIntr() { diff --git a/watchman/listener.cpp b/watchman/listener.cpp index c71e477ca120..20b29db52d8c 100644 --- a/watchman/listener.cpp +++ b/watchman/listener.cpp @@ -12,7 +12,10 @@ #include #include #include "SignalHandler.h" -#include "watchman/watchman.h" +#include "watchman/sockname.h" + +// TODO: remove +#include "watchman.h" using namespace watchman; diff --git a/watchman/main.cpp b/watchman/main.cpp index 51157d4a6857..6841ca983352 100644 --- a/watchman/main.cpp +++ b/watchman/main.cpp @@ -18,6 +18,7 @@ #include "watchman/Options.h" #include "watchman/ProcessLock.h" #include "watchman/ThreadPool.h" +#include "watchman/sockname.h" #include "watchman/watchman_opendir.h" #ifdef _WIN32 diff --git a/watchman/perf.cpp b/watchman/perf.cpp index cb4aedacd261..44163f0e5566 100644 --- a/watchman/perf.cpp +++ b/watchman/perf.cpp @@ -8,12 +8,14 @@ #include "watchman/Logging.h" #include "watchman/Options.h" #include "watchman/WatchmanConfig.h" -#include "watchman/watchman.h" +#include "watchman/sockname.h" #include "watchman/watchman_perf.h" #include "watchman/watchman_root.h" #include "watchman/watchman_system.h" #include "watchman/watchman_time.h" +using namespace watchman; + namespace watchman { namespace { class PerfLogThread { diff --git a/watchman/scm/Mercurial.cpp b/watchman/scm/Mercurial.cpp index af0e5de6fa4a..d36fbe567885 100644 --- a/watchman/scm/Mercurial.cpp +++ b/watchman/scm/Mercurial.cpp @@ -6,8 +6,10 @@ #include #include #include "watchman/ChildProcess.h" +#include "watchman/CommandRegistry.h" +#include "watchman/FileSystem.h" #include "watchman/Logging.h" -#include "watchman/watchman.h" +#include "watchman/sockname.h" // Capability indicating support for the mercurial SCM W_CAP_REG("scm-hg") diff --git a/watchman/sockname.cpp b/watchman/sockname.cpp index 44087d826682..8827501689a2 100644 --- a/watchman/sockname.cpp +++ b/watchman/sockname.cpp @@ -3,7 +3,9 @@ #include "watchman/Options.h" -using watchman::flags; +using namespace watchman; + +namespace watchman { bool disable_unix_socket = false; bool disable_named_pipe = false; @@ -23,3 +25,5 @@ const std::string& get_unix_sock_name() { const std::string& get_named_pipe_sock_path() { return flags.named_pipe_path; } + +} // namespace watchman diff --git a/watchman/sockname.h b/watchman/sockname.h new file mode 100644 index 000000000000..ebb8b6288a9b --- /dev/null +++ b/watchman/sockname.h @@ -0,0 +1,29 @@ +/* Copyright 2012-present Facebook, Inc. + * Licensed under the Apache License, Version 2.0 */ + +#pragma once + +#include + +namespace watchman { + +/** Returns the legacy socket name. + * It is legacy because its meaning is system dependent and + * a little confusing, but needs to be retained for backwards + * compatibility reasons as it is exported into the environment + * in a number of scenarios. + * You should prefer to use get_unix_sock_name() or + * get_named_pipe_sock_path() instead + */ +const char* get_sock_name_legacy(); + +/** Returns the configured unix domain socket path. */ +const std::string& get_unix_sock_name(); + +/** Returns the configured named pipe socket path */ +const std::string& get_named_pipe_sock_path(); + +extern bool disable_unix_socket; +extern bool disable_named_pipe; + +} // namespace watchman diff --git a/watchman/stream.cpp b/watchman/stream.cpp index a4e983eb7b65..e930dec63b0e 100644 --- a/watchman/stream.cpp +++ b/watchman/stream.cpp @@ -2,7 +2,7 @@ * Licensed under the Apache License, Version 2.0 */ #include "watchman/WatchmanConfig.h" -#include "watchman/watchman.h" +#include "watchman/sockname.h" #include "watchman/watchman_stream.h" using namespace watchman; diff --git a/watchman/watchman.h b/watchman/watchman.h index 520597071d7c..e28103a899a3 100644 --- a/watchman/watchman.h +++ b/watchman/watchman.h @@ -64,25 +64,6 @@ void startSanityCheckThread(); #define w_strsignal(val) strsignal((val)) #endif -extern bool disable_unix_socket; -extern bool disable_named_pipe; - -/** Returns the legacy socket name. - * It is legacy because its meaning is system dependent and - * a little confusing, but needs to be retained for backwards - * compatibility reasons as it is exported into the environment - * in a number of scenarios. - * You should prefer to use get_unix_sock_name() or - * get_named_pipe_sock_path() instead - */ -const char* get_sock_name_legacy(); - -/** Returns the configured unix domain socket path. */ -const std::string& get_unix_sock_name(); - -/** Returns the configured named pipe socket path */ -const std::string& get_named_pipe_sock_path(); - #ifndef _WIN32 /** * Gets the group struct for the given group name. The return value may point diff --git a/watchman/watchman_cmd.h b/watchman/watchman_cmd.h index 2a77777df989..c4ca07336692 100644 --- a/watchman/watchman_cmd.h +++ b/watchman/watchman_cmd.h @@ -5,6 +5,11 @@ #include #include "watchman/CommandRegistry.h" +#include "watchman/watchman_pdu.h" +#include "watchman/watchman_preprocessor.h" +#include "watchman/watchman_system.h" + +struct watchman_root; // For commands that take the root dir as the second parameter, // realpath's that parameter on the client side and updates the @@ -25,7 +30,7 @@ bool find_project_root( void preprocess_command( json_ref& args, - enum w_pdu_type output_pdu, + w_pdu_type output_pdu, uint32_t output_capabilities); bool dispatch_command( struct watchman_client* client, diff --git a/watchman/watchman_pdu.h b/watchman/watchman_pdu.h index e13f07fac7a0..3da61d85afff 100644 --- a/watchman/watchman_pdu.h +++ b/watchman/watchman_pdu.h @@ -2,6 +2,11 @@ * Licensed under the Apache License, Version 2.0 */ #pragma once +#include +#include "watchman/thirdparty/jansson/jansson.h" + +class watchman_stream; + enum w_pdu_type { need_data, is_json_compact, @@ -14,7 +19,7 @@ struct watchman_json_buffer { char* buf; uint32_t allocd; uint32_t rpos, wpos; - enum w_pdu_type pdu_type; + w_pdu_type pdu_type; uint32_t capabilities; ~watchman_json_buffer(); @@ -23,45 +28,47 @@ struct watchman_json_buffer { watchman_json_buffer& operator=(const watchman_json_buffer&) = delete; void clear(); - bool jsonEncodeToStream(const json_ref& json, w_stm_t stm, int flags); + bool + jsonEncodeToStream(const json_ref& json, watchman_stream* stm, int flags); bool bserEncodeToStream( uint32_t bser_version, uint32_t bser_capabilities, const json_ref& json, - w_stm_t stm); + watchman_stream* stm); bool pduEncodeToStream( - enum w_pdu_type pdu_type, + w_pdu_type pdu_type, uint32_t capabilities, const json_ref& json, - w_stm_t stm); + watchman_stream* stm); - json_ref decodeNext(w_stm_t stm, json_error_t* jerr); + json_ref decodeNext(watchman_stream* stm, json_error_t* jerr); bool passThru( - enum w_pdu_type output_pdu, + w_pdu_type output_pdu, uint32_t output_capabilities, watchman_json_buffer* output_pdu_buf, - w_stm_t stm); + watchman_stream* stm); private: - bool readAndDetectPdu(w_stm_t stm, json_error_t* jerr); + bool readAndDetectPdu(watchman_stream* stm, json_error_t* jerr); inline uint32_t shuntDown(); - bool fillBuffer(w_stm_t stm); - inline enum w_pdu_type detectPdu(); - json_ref readJsonPrettyPdu(w_stm_t stm, json_error_t* jerr); - json_ref readJsonPdu(w_stm_t stm, json_error_t* jerr); - json_ref readBserPdu(w_stm_t stm, uint32_t bser_version, json_error_t* jerr); - json_ref decodePdu(w_stm_t stm, json_error_t* jerr); + bool fillBuffer(watchman_stream* stm); + inline w_pdu_type detectPdu(); + json_ref readJsonPrettyPdu(watchman_stream* stm, json_error_t* jerr); + json_ref readJsonPdu(watchman_stream* stm, json_error_t* jerr); + json_ref + readBserPdu(watchman_stream* stm, uint32_t bser_version, json_error_t* jerr); + json_ref decodePdu(watchman_stream* stm, json_error_t* jerr); bool decodePduInfo( - w_stm_t stm, + watchman_stream* stm, uint32_t bser_version, json_int_t* len, json_int_t* bser_capabilities, json_error_t* jerr); - bool streamPdu(w_stm_t stm, json_error_t* jerr); - bool streamUntilNewLine(w_stm_t stm); - bool streamN(w_stm_t stm, json_int_t len, json_error_t* jerr); + bool streamPdu(watchman_stream* stm, json_error_t* jerr); + bool streamUntilNewLine(watchman_stream* stm); + bool streamN(watchman_stream* stm, json_int_t len, json_error_t* jerr); }; typedef struct watchman_json_buffer w_jbuffer_t; diff --git a/watchman/watchman_trigger.h b/watchman/watchman_trigger.h index a9494c619e1b..1be81dd753a6 100644 --- a/watchman/watchman_trigger.h +++ b/watchman/watchman_trigger.h @@ -3,9 +3,12 @@ #pragma once #include #include "watchman/ChildProcess.h" +#include "watchman/watchman_root.h" enum trigger_input_style { input_dev_null, input_json, input_name_list }; +class watchman_event; + struct watchman_trigger_command { w_string triggername; std::shared_ptr query; From 6dfc1d93b29f3e03bc2fb430139a57471d7d72bf Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Wed, 18 Aug 2021 11:19:32 -0700 Subject: [PATCH 0515/7387] autodeps tweaks Summary: Small, minor refactorings in preparation for later ones. Differential Revision: D30386236 fbshipit-source-id: 6c1b14d60ceae136f8976dd9a9410aec88fa6db7 --- watchman/watchman.h | 2 -- watchman/watchman_client.h | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/watchman/watchman.h b/watchman/watchman.h index e28103a899a3..1f0a2265a69f 100644 --- a/watchman/watchman.h +++ b/watchman/watchman.h @@ -8,8 +8,6 @@ #include "watchman/thirdparty/jansson/jansson.h" #include "watchman/watchman_string.h" -#include "watchman_hash.h" -#include "watchman_stream.h" struct watchman_file; struct watchman_dir; diff --git a/watchman/watchman_client.h b/watchman/watchman_client.h index e8d13fd0399e..d9ccbbbd59e1 100644 --- a/watchman/watchman_client.h +++ b/watchman/watchman_client.h @@ -7,8 +7,9 @@ #include #include "watchman/Clock.h" #include "watchman/Logging.h" +#include "watchman/watchman_pdu.h" #include "watchman/watchman_perf.h" -#include "watchman_pdu.h" +#include "watchman/watchman_stream.h" struct w_query; struct watchman_client_subscription; From 746b0618bb0de37e13bd382bbe4cd2853aa5346d Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Wed, 18 Aug 2021 11:19:32 -0700 Subject: [PATCH 0516/7387] split out a util target Summary: These are small, standalone headers, so they can live alone. Differential Revision: D30386271 fbshipit-source-id: b467242c6a36953b0d44f4375fd419001c290e48 --- watchman/ContentHash.h | 2 +- watchman/SymlinkTargets.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/watchman/ContentHash.h b/watchman/ContentHash.h index b3ffe94f0012..17bf60f628c5 100644 --- a/watchman/ContentHash.h +++ b/watchman/ContentHash.h @@ -2,7 +2,7 @@ * Licensed under the Apache License, Version 2.0 */ #pragma once #include -#include "LRUCache.h" +#include "watchman/LRUCache.h" #include "watchman/watchman_string.h" #include "watchman/watchman_system.h" diff --git a/watchman/SymlinkTargets.h b/watchman/SymlinkTargets.h index f583d2327644..b2fd4dae4716 100644 --- a/watchman/SymlinkTargets.h +++ b/watchman/SymlinkTargets.h @@ -1,7 +1,7 @@ #pragma once #include -#include "LRUCache.h" #include "watchman/Clock.h" +#include "watchman/LRUCache.h" #include "watchman/thirdparty/jansson/jansson.h" #include "watchman/watchman_string.h" #include "watchman/watchman_system.h" From b34b74ac8853c7da2120f4f78e769b49e10631a8 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 18 Aug 2021 11:56:47 -0700 Subject: [PATCH 0517/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/85fb7073093f0975da1824902d5bc25ca14377c6 https://github.com/facebook/fbthrift/commit/7e5414d554d145b05b8b15f4bd2c866c614e4464 https://github.com/facebook/fbzmq/commit/0a17dc93c5094093aa6d7a35ff2f7637643f69ec https://github.com/facebook/folly/commit/8522192e76c784065d2b3da3759ddc84a790d5c9 https://github.com/facebook/litho/commit/712a807a9ecc33de7891eac00ef379723441c514 https://github.com/facebook/proxygen/commit/85ddf1485fb572aa970f8ad8b8c7c0dfd72ee2b6 https://github.com/facebook/rocksdb/commit/b6269b078a58155e5dfe26d6af087ab10d5eba00 https://github.com/facebook/wangle/commit/70a9b63839ad16d1d2fa23b0657067868f6a9c45 https://github.com/facebook/watchman/commit/746b0618bb0de37e13bd382bbe4cd2853aa5346d https://github.com/facebookexperimental/rust-shed/commit/702d6c5126508bebc874b0507f69c1c0d2f9e22b https://github.com/facebookincubator/fizz/commit/f2d3c44f4615c6464121b1e60d759c9c707bd90f https://github.com/facebookincubator/katran/commit/46162024a3998d0988b7919e2d56b703e7d16700 https://github.com/facebookincubator/mvfst/commit/62f2201835549a466ab7e7300670c8b33e8905df https://github.com/rsocket/rsocket-cpp/commit/515d0fe7803f81a453fdb79b96fffa74f60c3209 Reviewed By: 2d2d2d2d2d fbshipit-source-id: d6ec9fb6980de7f20f7bb9876ccd6393e49af4f5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e80dc0f3900f..f6b654ff014c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a277b6c6d1338f7e4e317f20267c8be8c1003ec8 +Subproject commit 7e5414d554d145b05b8b15f4bd2c866c614e4464 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7538bb1545b0..f36cc759504c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e460690d673d23dc4775361c103dd4eabd2b947e +Subproject commit 8522192e76c784065d2b3da3759ddc84a790d5c9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e93b5b5a03fb..c0391d9827e2 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9594f141d349119499e37a5a1052318d5c0f44f3 +Subproject commit 70a9b63839ad16d1d2fa23b0657067868f6a9c45 From 5f3d683c3589e33f3c07f406d65d4ecc69e85cd9 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 18 Aug 2021 12:27:07 -0700 Subject: [PATCH 0518/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/b64ec808448edb90c1a2baa8494f8f38039de0a7 https://github.com/facebook/fbthrift/commit/f3e84322f9aa0ceea628f5d6934db9180d1f5ac8 https://github.com/facebook/fbzmq/commit/d3cd51de178c0c3bbb4b5277493cde4862825842 https://github.com/facebook/proxygen/commit/9f68b2dd00d597d12f7814de468db6087a390850 https://github.com/facebook/wangle/commit/3e4f60f6660618a1ed0e33793844a067d98b219e https://github.com/facebook/watchman/commit/b34b74ac8853c7da2120f4f78e769b49e10631a8 https://github.com/facebookexperimental/rust-shed/commit/c045bfc88a9adb9b93a3c5c2d512ff0c9f44c239 https://github.com/facebookincubator/fizz/commit/325d83e0e6ac5d53d8bd461c519d86928592d668 https://github.com/facebookincubator/katran/commit/652abdba183123f82108f98d43cd1b5dfbb9f6f3 https://github.com/facebookincubator/mvfst/commit/d8b23cb55334d2eef54d56e507bd7b5448776ad5 https://github.com/rsocket/rsocket-cpp/commit/d0b7b88b84358871e211c38efe0c98e2cafafbe6 Reviewed By: 2d2d2d2d2d fbshipit-source-id: d04aa1e8589993b971ad4a606032b5b66accd0ae --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f6b654ff014c..cea5a50b45e2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7e5414d554d145b05b8b15f4bd2c866c614e4464 +Subproject commit f3e84322f9aa0ceea628f5d6934db9180d1f5ac8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c0391d9827e2..58d136708f2a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 70a9b63839ad16d1d2fa23b0657067868f6a9c45 +Subproject commit 3e4f60f6660618a1ed0e33793844a067d98b219e From d007ed0ad4d9f436c6bca863796bb7851566c720 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 18 Aug 2021 13:06:05 -0700 Subject: [PATCH 0519/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/03386933910aa546ee3c08c95692bdafcde466d3 https://github.com/facebook/fbthrift/commit/a1d5f0deb1adabd322fdfff74fffe2ae4a066a37 https://github.com/facebook/fbzmq/commit/2d3a7e056742037140ea48f4b04eb79276fb7725 https://github.com/facebook/proxygen/commit/e6ffb90816062ecfe3bd9e21eb0c6e8a5a7bace9 https://github.com/facebook/wangle/commit/e9fa25082f4f4fa0ee6fa3f2a3a9c1beb2033656 https://github.com/facebook/watchman/commit/5f3d683c3589e33f3c07f406d65d4ecc69e85cd9 https://github.com/facebookexperimental/rust-shed/commit/78ea475f68b1d2ad6e0e40c9ff04ba34b2d66e22 https://github.com/facebookincubator/katran/commit/db83d1a1e81d0b83848dd47b3e5b61618f0983af https://github.com/facebookincubator/mvfst/commit/18c0eacd2d39e363068900f9337b63d6efaee0e7 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 7e61e7d0e63a38d53a423e14496c021dd072f857 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cea5a50b45e2..71890de24aef 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f3e84322f9aa0ceea628f5d6934db9180d1f5ac8 +Subproject commit a1d5f0deb1adabd322fdfff74fffe2ae4a066a37 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 58d136708f2a..0182f0720a90 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3e4f60f6660618a1ed0e33793844a067d98b219e +Subproject commit e9fa25082f4f4fa0ee6fa3f2a3a9c1beb2033656 From d4f6984027afa36e3b7db374f61a50ca7fd545cf Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Wed, 18 Aug 2021 15:42:56 -0700 Subject: [PATCH 0520/7387] move constants from watchman.h to Constants.h Summary: A small step towards eliminating the uberheader watchman.h. Reviewed By: fanzeyi Differential Revision: D30386292 fbshipit-source-id: 39bc5af2a3ef423225a8c030c22644f3b071c519 --- watchman/CommandRegistry.h | 2 ++ watchman/Constants.h | 16 ++++++++++++++++ watchman/json.cpp | 6 +++++- watchman/listener.cpp | 4 +++- watchman/root/notifythread.cpp | 3 ++- watchman/stream_unix.cpp | 1 + watchman/watcher/inotify.cpp | 1 + watchman/watcher/kqueue.h | 2 +- watchman/watchman.h | 3 --- 9 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 watchman/Constants.h diff --git a/watchman/CommandRegistry.h b/watchman/CommandRegistry.h index a326f76ec15e..d0b44f6a663a 100644 --- a/watchman/CommandRegistry.h +++ b/watchman/CommandRegistry.h @@ -7,6 +7,8 @@ #include #include +#include "watchman/watchman_preprocessor.h" + class json_ref; struct watchman_client; diff --git a/watchman/Constants.h b/watchman/Constants.h new file mode 100644 index 000000000000..255987386841 --- /dev/null +++ b/watchman/Constants.h @@ -0,0 +1,16 @@ +/* Copyright 2012-present Facebook, Inc. + * Licensed under the Apache License, Version 2.0 */ + +#pragma once + +#include + +namespace watchman { + +inline constexpr uint32_t kIoBufSize = 1024 * 1024; +inline constexpr uint32_t kBatchLimit = 16 * 1024; + +} // namespace watchman + +#define WATCHMAN_IO_BUF_SIZE (::watchman::kIoBufSize) +#define WATCHMAN_BATCH_LIMIT (::watchman::kBatchLimit) diff --git a/watchman/json.cpp b/watchman/json.cpp index 5d40f1d8d5b2..e09f954152da 100644 --- a/watchman/json.cpp +++ b/watchman/json.cpp @@ -3,8 +3,12 @@ #include #include +#include "watchman/CommandRegistry.h" +#include "watchman/Constants.h" +#include "watchman/Logging.h" #include "watchman/bser.h" -#include "watchman/watchman.h" +#include "watchman/watchman_pdu.h" +#include "watchman/watchman_stream.h" using namespace watchman; diff --git a/watchman/listener.cpp b/watchman/listener.cpp index 20b29db52d8c..ba4fc8df3748 100644 --- a/watchman/listener.cpp +++ b/watchman/listener.cpp @@ -12,10 +12,12 @@ #include #include #include "SignalHandler.h" +#include "watchman/Constants.h" #include "watchman/sockname.h" +#include "watchman/watchman.h" // TODO: remove -#include "watchman.h" +//#include "watchman.h" using namespace watchman; diff --git a/watchman/root/notifythread.cpp b/watchman/root/notifythread.cpp index 7e83f86f76dd..4308197d9fd3 100644 --- a/watchman/root/notifythread.cpp +++ b/watchman/root/notifythread.cpp @@ -1,9 +1,10 @@ /* Copyright 2012-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/Constants.h" #include "watchman/InMemoryView.h" #include "watchman/watcher/Watcher.h" -#include "watchman/watchman.h" +#include "watchman/watchman_root.h" namespace watchman { diff --git a/watchman/stream_unix.cpp b/watchman/stream_unix.cpp index 8c0a98e56048..38488e2cb6a9 100644 --- a/watchman/stream_unix.cpp +++ b/watchman/stream_unix.cpp @@ -14,6 +14,7 @@ #include #include #include +#include "watchman/Constants.h" #include "watchman/FileDescriptor.h" #include "watchman/Pipe.h" diff --git a/watchman/watcher/inotify.cpp b/watchman/watcher/inotify.cpp index b188d5414c31..64e85c1751f3 100644 --- a/watchman/watcher/inotify.cpp +++ b/watchman/watcher/inotify.cpp @@ -4,6 +4,7 @@ #include #include #include +#include "watchman/Constants.h" #include "watchman/Errors.h" #include "watchman/FSDetect.h" #include "watchman/FileDescriptor.h" diff --git a/watchman/watcher/kqueue.h b/watchman/watcher/kqueue.h index 61accc1bed5d..2f66b82848d7 100644 --- a/watchman/watcher/kqueue.h +++ b/watchman/watcher/kqueue.h @@ -1,10 +1,10 @@ /* Copyright 2012-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/Constants.h" #include "watchman/FileDescriptor.h" #include "watchman/Pipe.h" #include "watchman/watcher/Watcher.h" -#include "watchman/watchman.h" #ifdef HAVE_KQUEUE diff --git a/watchman/watchman.h b/watchman/watchman.h index 1f0a2265a69f..4192f107ca43 100644 --- a/watchman/watchman.h +++ b/watchman/watchman.h @@ -17,9 +17,6 @@ struct watchman_trigger_command; #include "watchman/watchman_dir.h" #include "watchman/watchman_file.h" -#define WATCHMAN_IO_BUF_SIZE 1048576 -#define WATCHMAN_BATCH_LIMIT (16 * 1024) - #include "watchman/watchman_perf.h" #include "watchman_client.h" #include "watchman_pdu.h" From 785e42981f31881aaf99382d23b45a38a0bad7b6 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Wed, 18 Aug 2021 15:42:56 -0700 Subject: [PATCH 0521/7387] split stream into its own target Summary: The stream abstraction is small and standalone, so split it out. At some point, it might make sense to merge it with the "fd" target. Reviewed By: fanzeyi Differential Revision: D30386313 fbshipit-source-id: 1a8b07f75ea79b02f99e8ab21ba5668d18df9b09 --- watchman/ContentHash.cpp | 15 ++++++++------- watchman/stream_stdout.cpp | 3 ++- watchman/stream_unix.cpp | 16 +++++++++------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/watchman/ContentHash.cpp b/watchman/ContentHash.cpp index e0524e235f2a..87fbe5e36823 100644 --- a/watchman/ContentHash.cpp +++ b/watchman/ContentHash.cpp @@ -1,9 +1,14 @@ /* Copyright 2017-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ -#include "ContentHash.h" +#include "watchman/ContentHash.h" +#include +#include +#include "watchman/FileSystem.h" +#include "watchman/Logging.h" #include "watchman/ThreadPool.h" -#include "watchman_hash.h" -#include "watchman_stream.h" +#include "watchman/watchman_hash.h" +#include "watchman/watchman_stream.h" + #ifdef __APPLE__ #define COMMON_DIGEST_FOR_OPENSSL #include "CommonCrypto/CommonDigest.h" // @manual @@ -12,10 +17,6 @@ #else #include #endif -#include -#include -#include "watchman/FileSystem.h" -#include "watchman/Logging.h" using folly::to; diff --git a/watchman/stream_stdout.cpp b/watchman/stream_stdout.cpp index 1e11bf13657a..ff967e92f600 100644 --- a/watchman/stream_stdout.cpp +++ b/watchman/stream_stdout.cpp @@ -1,6 +1,7 @@ /* Copyright 2014-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ -#include "watchman/watchman.h" +#include "watchman/Logging.h" +#include "watchman/watchman_stream.h" using watchman::FileDescriptor; using namespace watchman; diff --git a/watchman/stream_unix.cpp b/watchman/stream_unix.cpp index 38488e2cb6a9..cf82486ba0e0 100644 --- a/watchman/stream_unix.cpp +++ b/watchman/stream_unix.cpp @@ -1,7 +1,15 @@ /* Copyright 2014-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ -#include "watchman/watchman.h" +#include +#include +#include +#include "watchman/Constants.h" +#include "watchman/FileDescriptor.h" +#include "watchman/Logging.h" +#include "watchman/Pipe.h" +#include "watchman/watchman_stream.h" + #ifdef HAVE_UCRED_H #include // @manual #endif @@ -11,12 +19,6 @@ #ifdef HAVE_SYS_SOCKET_H #include // @manual #endif -#include -#include -#include -#include "watchman/Constants.h" -#include "watchman/FileDescriptor.h" -#include "watchman/Pipe.h" using watchman::FileDescriptor; using watchman::Pipe; From 4f453977c2cb0541daaebc4d18fa672e99788bfb Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Wed, 18 Aug 2021 15:42:56 -0700 Subject: [PATCH 0522/7387] split scm into its own target Summary: Several components depend on the SCM interface, so split it into its own target. Reviewed By: fanzeyi Differential Revision: D30386628 fbshipit-source-id: acfad255725d5e620ba7cd3c70abb634f5440041 --- watchman/tests/MercurialTest.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/watchman/tests/MercurialTest.cpp b/watchman/tests/MercurialTest.cpp index 7d0af9d38205..8c6c472f854b 100644 --- a/watchman/tests/MercurialTest.cpp +++ b/watchman/tests/MercurialTest.cpp @@ -3,7 +3,6 @@ #include "watchman/scm/Mercurial.h" #include -#include "watchman/watchman.h" using namespace std::chrono; From 6c316fdedce24c6eea8812f31e0b677cc09f711e Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Wed, 18 Aug 2021 15:42:56 -0700 Subject: [PATCH 0523/7387] break a dependency from watchman_perf_sample onto watchman_root Summary: I want watchman_perf to stand alone, so the dependency should be watchman_root onto watchman_perf instead. Reviewed By: fanzeyi Differential Revision: D30386703 fbshipit-source-id: 4cb54d4517c18bef236454ee156da180f8552c38 --- watchman/listener-user.cpp | 2 +- watchman/perf.cpp | 22 ---------------------- watchman/query/eval.cpp | 2 +- watchman/root/ageout.cpp | 2 +- watchman/root/init.cpp | 20 ++++++++++++++++++++ watchman/root/iothread.cpp | 2 +- watchman/root/sync.cpp | 4 ++-- watchman/root/threading.cpp | 2 +- watchman/watcher/fsevents.cpp | 2 +- watchman/watchman_perf.h | 5 ----- watchman/watchman_query.h | 1 + watchman/watchman_root.h | 7 ++++++- 12 files changed, 35 insertions(+), 36 deletions(-) diff --git a/watchman/listener-user.cpp b/watchman/listener-user.cpp index c65e19bebd1d..b997ab6a744a 100644 --- a/watchman/listener-user.cpp +++ b/watchman/listener-user.cpp @@ -75,7 +75,7 @@ std::shared_ptr doResolveOrCreateRoot( } if (client->perf_sample) { - client->perf_sample->add_root_meta(root); + root->addPerfSampleMetadata(*client->perf_sample); } return root; diff --git a/watchman/perf.cpp b/watchman/perf.cpp index 44163f0e5566..ea3909ef855d 100644 --- a/watchman/perf.cpp +++ b/watchman/perf.cpp @@ -10,7 +10,6 @@ #include "watchman/WatchmanConfig.h" #include "watchman/sockname.h" #include "watchman/watchman_perf.h" -#include "watchman/watchman_root.h" #include "watchman/watchman_system.h" #include "watchman/watchman_time.h" @@ -165,27 +164,6 @@ void watchman_perf_sample::add_meta(const char* key, json_ref&& val) { meta_data.set(key, std::move(val)); } -void watchman_perf_sample::add_root_meta( - const std::shared_ptr& root) { - // Note: if the root lock isn't held, we may read inaccurate numbers for - // some of these properties. We're ok with that, and don't want to force - // the root lock to be re-acquired just for this. - auto meta = json_object( - {{"path", w_string_to_json(root->root_path)}, - {"recrawl_count", json_integer(root->recrawlInfo.rlock()->recrawlCount)}, - {"case_sensitive", - json_boolean(root->case_sensitive == CaseSensitivity::CaseSensitive)}}); - - // During recrawl, the view may be re-assigned. Protect against - // reading a nullptr. - auto view = root->view(); - if (view) { - meta.set({{"watcher", w_string_to_json(view->getName())}}); - } - - add_meta("root", std::move(meta)); -} - void watchman_perf_sample::set_wall_time_thresh(double thresh) { wall_time_elapsed_thresh = thresh; } diff --git a/watchman/query/eval.cpp b/watchman/query/eval.cpp index f1e4e7dc0b89..34f19449dd40 100644 --- a/watchman/query/eval.cpp +++ b/watchman/query/eval.cpp @@ -221,7 +221,7 @@ static void execute_common( } if (sample && sample->finish()) { - sample->add_root_meta(ctx->root); + ctx->root->addPerfSampleMetadata(*sample); sample->add_meta( "query_execute", json_object( diff --git a/watchman/root/ageout.cpp b/watchman/root/ageout.cpp index 447a2089cf91..79bf029b1127 100644 --- a/watchman/root/ageout.cpp +++ b/watchman/root/ageout.cpp @@ -40,7 +40,7 @@ void watchman_root::performAgeOut(std::chrono::seconds min_age) { } } if (sample.finish()) { - sample.add_root_meta(shared_from_this()); + addPerfSampleMetadata(sample); sample.log(); } } diff --git a/watchman/root/init.cpp b/watchman/root/init.cpp index bbb729ab146d..c200b3715b3d 100644 --- a/watchman/root/init.cpp +++ b/watchman/root/init.cpp @@ -92,5 +92,25 @@ watchman_root::~watchman_root() { --live_roots; } +void watchman_root::addPerfSampleMetadata(watchman_perf_sample& sample) const { + // Note: if the root lock isn't held, we may read inaccurate numbers for + // some of these properties. We're ok with that, and don't want to force + // the root lock to be re-acquired just for this. + auto meta = json_object( + {{"path", w_string_to_json(root_path)}, + {"recrawl_count", json_integer(recrawlInfo.rlock()->recrawlCount)}, + {"case_sensitive", + json_boolean(case_sensitive == CaseSensitivity::CaseSensitive)}}); + + // During recrawl, the view may be re-assigned. Protect against + // reading a nullptr. + auto view = this->view(); + if (view) { + meta.set({{"watcher", w_string_to_json(view->getName())}}); + } + + sample.add_meta("root", std::move(meta)); +} + /* vim:ts=2:sw=2:et: */ diff --git a/watchman/root/iothread.cpp b/watchman/root/iothread.cpp index 09b4a8450206..d07bf095b0a1 100644 --- a/watchman/root/iothread.cpp +++ b/watchman/root/iothread.cpp @@ -84,7 +84,7 @@ void InMemoryView::fullCrawl( root->cookies.abortAllCookies(); - sample.add_root_meta(root); + root->addPerfSampleMetadata(sample); sample.finish(); sample.force_log(); diff --git a/watchman/root/sync.cpp b/watchman/root/sync.cpp index 46551d5a1098..2dbe78a20ef0 100644 --- a/watchman/root/sync.cpp +++ b/watchman/root/sync.cpp @@ -17,7 +17,7 @@ void watchman_root::syncToNow( try { view()->syncToNow(root, timeout, cookieFileNames); if (sample.finish()) { - sample.add_root_meta(root); + root->addPerfSampleMetadata(sample); sample.add_meta( "sync_to_now", json_object( @@ -28,7 +28,7 @@ void watchman_root::syncToNow( } catch (const std::exception& exc) { sample.force_log(); sample.finish(); - sample.add_root_meta(root); + root->addPerfSampleMetadata(sample); sample.add_meta( "sync_to_now", json_object( diff --git a/watchman/root/threading.cpp b/watchman/root/threading.cpp index 9fc7959bda34..6630602feaff 100644 --- a/watchman/root/threading.cpp +++ b/watchman/root/threading.cpp @@ -3,7 +3,7 @@ #include "watchman/watchman.h" -std::shared_ptr watchman_root::view() { +std::shared_ptr watchman_root::view() const { // We grab a read lock on the recrawl info to ensure that we // can't race with scheduleRecrawl and observe a nullptr for // the view_. diff --git a/watchman/watcher/fsevents.cpp b/watchman/watcher/fsevents.cpp index 7563812b252c..c18f36191816 100644 --- a/watchman/watcher/fsevents.cpp +++ b/watchman/watcher/fsevents.cpp @@ -107,7 +107,7 @@ static void log_drop_event( const std::shared_ptr& root, bool isKernel) { w_perf_t sample(isKernel ? "KernelDropped" : "UserDropped"); - sample.add_root_meta(root); + root->addPerfSampleMetadata(sample); sample.finish(); sample.force_log(); sample.log(); diff --git a/watchman/watchman_perf.h b/watchman/watchman_perf.h index d0ebc185efa0..b57ae1c4aa09 100644 --- a/watchman/watchman_perf.h +++ b/watchman/watchman_perf.h @@ -5,8 +5,6 @@ #include "watchman/thirdparty/jansson/jansson.h" -struct watchman_root; - // Performance metrics sampling namespace watchman { @@ -55,9 +53,6 @@ struct watchman_perf_sample { // Annotate the sample with metadata void add_meta(const char* key, json_ref&& val); - // Annotate the sample with some standard metadata taken from a root. - void add_root_meta(const std::shared_ptr& root); - // Force the sample to go to the log void force_log(); diff --git a/watchman/watchman_query.h b/watchman/watchman_query.h index 2c45a7f0bac9..38a34747673b 100644 --- a/watchman/watchman_query.h +++ b/watchman/watchman_query.h @@ -19,6 +19,7 @@ struct QueryContext; } struct watchman_file; +struct watchman_root; struct w_query; namespace watchman { diff --git a/watchman/watchman_root.h b/watchman/watchman_root.h index e19f5c48e65d..cbc342db0d28 100644 --- a/watchman/watchman_root.h +++ b/watchman/watchman_root.h @@ -29,6 +29,8 @@ constexpr std::chrono::milliseconds DEFAULT_QUERY_SYNC_MS(60000); struct watchman_trigger_command; namespace watchman { + +struct watchman_perf_sample; class ClientStateAssertion; class ClientStateAssertions { @@ -166,7 +168,7 @@ struct watchman_root : public std::enable_shared_from_this { // Obtain the current view pointer. // This is safe wrt. a concurrent recrawl operation - std::shared_ptr view(); + std::shared_ptr view() const; explicit watchman_root(const w_string& root_path, const w_string& fs_type); ~watchman_root(); @@ -198,6 +200,9 @@ struct watchman_root : public std::enable_shared_from_this { static json_ref getStatusForAllRoots(); json_ref getStatus() const; + // Annotate the sample with some standard metadata taken from a root. + void addPerfSampleMetadata(watchman::watchman_perf_sample& sample) const; + private: void applyIgnoreConfiguration(); }; From 6a0067f08314d63c0fbed18f62d53f2f50f8516a Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Wed, 18 Aug 2021 15:42:56 -0700 Subject: [PATCH 0524/7387] w_perf_t -> PerfSample Summary: watchman_perf_sample and w_perf_t are C-isms. We can just have a watchman::PerfSample class. Split it into its own target, and enable autodeps on the PerfSample tests. Reviewed By: fanzeyi Differential Revision: D30386713 fbshipit-source-id: fb768ab2038e3c15dfe220c86d17aadc35b12cd3 --- CMakeLists.txt | 2 +- watchman/InMemoryView.cpp | 2 +- watchman/InMemoryView.h | 4 ++-- watchman/{perf.cpp => PerfSample.cpp} | 15 ++++++------ watchman/{watchman_perf.h => PerfSample.h} | 23 +++++++++++++------ watchman/QueryableView.cpp | 2 +- watchman/QueryableView.h | 4 ++-- watchman/checksock.cpp | 2 +- watchman/cmds/reg.cpp | 2 +- watchman/query/eval.cpp | 4 ++-- watchman/root/ageout.cpp | 2 +- watchman/root/init.cpp | 2 +- watchman/root/iothread.cpp | 2 +- watchman/root/sync.cpp | 4 ++-- .../{perf_test.cpp => PerfSampleTest.cpp} | 4 ++-- watchman/watcher/fsevents.cpp | 2 +- watchman/watchman.h | 1 - watchman/watchman_client.h | 4 ++-- watchman/watchman_root.h | 4 ++-- 19 files changed, 46 insertions(+), 39 deletions(-) rename watchman/{perf.cpp => PerfSample.cpp} (95%) rename watchman/{watchman_perf.h => PerfSample.h} (81%) rename watchman/tests/{perf_test.cpp => PerfSampleTest.cpp} (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b10a9096099..9639193cf2b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -612,6 +612,7 @@ watchman/InMemoryView.cpp watchman/LocalFileResult.cpp watchman/Options.cpp watchman/PendingCollection.cpp +watchman/PerfSample.cpp watchman/Pipe.cpp watchman/ProcessLock.cpp # PubSub.cpp (in liblog) @@ -632,7 +633,6 @@ watchman/listener-user.cpp watchman/listener.cpp watchman/main.cpp watchman/opendir.cpp -watchman/perf.cpp watchman/sockname.cpp watchman/spawn.cpp watchman/state.cpp diff --git a/watchman/InMemoryView.cpp b/watchman/InMemoryView.cpp index 72e8966911a4..ac42b33f3bb4 100644 --- a/watchman/InMemoryView.cpp +++ b/watchman/InMemoryView.cpp @@ -485,7 +485,7 @@ w_clock_t InMemoryView::ageOutFile( return ageOutOtime; } -void InMemoryView::ageOut(w_perf_t& sample, std::chrono::seconds minAge) { +void InMemoryView::ageOut(PerfSample& sample, std::chrono::seconds minAge) { uint32_t num_aged_files = 0; uint32_t num_walked = 0; std::unordered_set dirs_to_erase; diff --git a/watchman/InMemoryView.h b/watchman/InMemoryView.h index b1151aabc9cd..0dc137ee1933 100644 --- a/watchman/InMemoryView.h +++ b/watchman/InMemoryView.h @@ -9,12 +9,12 @@ #include "watchman/ContentHash.h" #include "watchman/CookieSync.h" #include "watchman/PendingCollection.h" +#include "watchman/PerfSample.h" #include "watchman/QueryableView.h" #include "watchman/RingBuffer.h" #include "watchman/SymlinkTargets.h" #include "watchman/WatchmanConfig.h" #include "watchman/watchman_opendir.h" -#include "watchman/watchman_perf.h" #include "watchman/watchman_query.h" #include "watchman/watchman_string.h" #include "watchman/watchman_system.h" @@ -155,7 +155,7 @@ class InMemoryView final : public QueryableView { }; } - void ageOut(w_perf_t& sample, std::chrono::seconds minAge) override; + void ageOut(PerfSample& sample, std::chrono::seconds minAge) override; void syncToNow( const std::shared_ptr& root, std::chrono::milliseconds timeout, diff --git a/watchman/perf.cpp b/watchman/PerfSample.cpp similarity index 95% rename from watchman/perf.cpp rename to watchman/PerfSample.cpp index ea3909ef855d..ee8c5ab6f46d 100644 --- a/watchman/perf.cpp +++ b/watchman/PerfSample.cpp @@ -1,6 +1,7 @@ /* Copyright 2016-present Facebook, Inc. * Licensed under the Apache License, Version 2.0 */ +#include "watchman/PerfSample.h" #include #include #include @@ -9,7 +10,6 @@ #include "watchman/Options.h" #include "watchman/WatchmanConfig.h" #include "watchman/sockname.h" -#include "watchman/watchman_perf.h" #include "watchman/watchman_system.h" #include "watchman/watchman_time.h" @@ -103,15 +103,14 @@ void processSamples( } } -watchman_perf_sample::watchman_perf_sample(const char* description) - : description(description) { +PerfSample::PerfSample(const char* description) : description(description) { gettimeofday(&time_begin, nullptr); #ifdef HAVE_SYS_RESOURCE_H getrusage(RUSAGE_SELF, &usage_begin); #endif } -bool watchman_perf_sample::finish() { +bool PerfSample::finish() { gettimeofday(&time_end, nullptr); w_timeval_sub(time_end, time_begin, &duration); #ifdef HAVE_SYS_RESOURCE_H @@ -160,15 +159,15 @@ bool watchman_perf_sample::finish() { return will_log; } -void watchman_perf_sample::add_meta(const char* key, json_ref&& val) { +void PerfSample::add_meta(const char* key, json_ref&& val) { meta_data.set(key, std::move(val)); } -void watchman_perf_sample::set_wall_time_thresh(double thresh) { +void PerfSample::set_wall_time_thresh(double thresh) { wall_time_elapsed_thresh = thresh; } -void watchman_perf_sample::force_log() { +void PerfSample::force_log() { will_log = true; } @@ -297,7 +296,7 @@ void PerfLogThread::loop() noexcept { } } -void watchman_perf_sample::log() { +void PerfSample::log() { if (!will_log) { return; } diff --git a/watchman/watchman_perf.h b/watchman/PerfSample.h similarity index 81% rename from watchman/watchman_perf.h rename to watchman/PerfSample.h index b57ae1c4aa09..735952cae21e 100644 --- a/watchman/watchman_perf.h +++ b/watchman/PerfSample.h @@ -3,13 +3,16 @@ #pragma once +#include +#include #include "watchman/thirdparty/jansson/jansson.h" // Performance metrics sampling namespace watchman { -struct watchman_perf_sample { +class PerfSample { + public: // What we're sampling across const char* description; @@ -18,7 +21,9 @@ struct watchman_perf_sample { json_ref meta_data{json_object()}; // Measure the wall time - struct timeval time_begin, time_end, duration; + timeval time_begin; + timeval time_end; + timeval duration; // If set to true, the sample should be sent to the logging // mechanism @@ -34,13 +39,18 @@ struct watchman_perf_sample { // action being sampled because there can be multiple // watched roots and these metrics include the usage from // all of them. - struct rusage usage_begin, usage_end, usage; + struct rusage usage_begin; + struct rusage usage_end; + struct rusage usage; #endif // Initialize and mark the start of a sample - watchman_perf_sample(const char* description); - watchman_perf_sample(const watchman_perf_sample&) = delete; - watchman_perf_sample(watchman_perf_sample&&) = delete; + explicit PerfSample(const char* description); + + PerfSample(const PerfSample&) = delete; + PerfSample(PerfSample&&) = delete; + PerfSample& operator=(const PerfSample&) = delete; + PerfSample& operator=(PerfSample&&) = delete; // Augment any configuration policy and cause this sample to be logged if the // walltime exceeds the specified number of seconds (fractions are supported) @@ -59,7 +69,6 @@ struct watchman_perf_sample { // If will_log is set, arranges to send the sample to the log void log(); }; -typedef struct watchman_perf_sample w_perf_t; void perf_shutdown(); diff --git a/watchman/QueryableView.cpp b/watchman/QueryableView.cpp index cc3dee5e17d5..0b752738708f 100644 --- a/watchman/QueryableView.cpp +++ b/watchman/QueryableView.cpp @@ -35,7 +35,7 @@ std::chrono::system_clock::time_point QueryableView::getLastAgeOutTimeStamp() return std::chrono::system_clock::time_point{}; } -void QueryableView::ageOut(w_perf_t&, std::chrono::seconds) {} +void QueryableView::ageOut(PerfSample&, std::chrono::seconds) {} bool QueryableView::isVCSOperationInProgress() const { static const std::vector lockFiles{".hg/wlock", ".git/index.lock"}; diff --git a/watchman/QueryableView.h b/watchman/QueryableView.h index 821d84156936..8018b33b7ddc 100644 --- a/watchman/QueryableView.h +++ b/watchman/QueryableView.h @@ -4,7 +4,7 @@ #include #include -#include "watchman/watchman_perf.h" +#include "watchman/PerfSample.h" #include "watchman/watchman_string.h" #include "watchman_query.h" @@ -39,7 +39,7 @@ class QueryableView : public std::enable_shared_from_this { virtual w_string getCurrentClockString() const = 0; virtual uint32_t getLastAgeOutTickValue() const; virtual std::chrono::system_clock::time_point getLastAgeOutTimeStamp() const; - virtual void ageOut(w_perf_t& sample, std::chrono::seconds minAge); + virtual void ageOut(PerfSample& sample, std::chrono::seconds minAge); virtual void syncToNow( const std::shared_ptr& root, std::chrono::milliseconds timeout, diff --git a/watchman/checksock.cpp b/watchman/checksock.cpp index dfc98cb389b9..abe06d536866 100644 --- a/watchman/checksock.cpp +++ b/watchman/checksock.cpp @@ -143,7 +143,7 @@ void do_clock_check(watchman_stream* client) { try { auto roots = get_watch_list(client); for (auto& r : roots.array()) { - w_perf_t sample("clock-test"); + PerfSample sample("clock-test"); sample.add_meta("root", json_object({{"path", r}})); try { check_clock_command(client, r); diff --git a/watchman/cmds/reg.cpp b/watchman/cmds/reg.cpp index b76b43c87752..e733c52e127a 100644 --- a/watchman/cmds/reg.cpp +++ b/watchman/cmds/reg.cpp @@ -99,7 +99,7 @@ bool dispatch_command( logf(DBG, "dispatch_command: {}\n", def->name); snprintf( sample_name, sizeof(sample_name), "dispatch_command:%s", def->name); - w_perf_t sample(sample_name); + PerfSample sample(sample_name); client->perf_sample = &sample; SCOPE_EXIT { client->perf_sample = nullptr; diff --git a/watchman/query/eval.cpp b/watchman/query/eval.cpp index 34f19449dd40..ec2cbc3de338 100644 --- a/watchman/query/eval.cpp +++ b/watchman/query/eval.cpp @@ -162,7 +162,7 @@ static void default_generators( static void execute_common( QueryContext* ctx, - w_perf_t* sample, + PerfSample* sample, QueryResult* res, QueryGenerator generator) { ctx->stopWatch.reset(); @@ -249,7 +249,7 @@ QueryResult w_query_execute( bool disableFreshInstance{false}; auto requestId = query->request_id; - w_perf_t sample("query_execute"); + PerfSample sample("query_execute"); if (requestId && !requestId.empty()) { log(DBG, "request_id = ", requestId, "\n"); sample.add_meta("request_id", w_string_to_json(requestId)); diff --git a/watchman/root/ageout.cpp b/watchman/root/ageout.cpp index 79bf029b1127..0e978a51aff1 100644 --- a/watchman/root/ageout.cpp +++ b/watchman/root/ageout.cpp @@ -23,7 +23,7 @@ void watchman_root::performAgeOut(std::chrono::seconds min_age) { // large number of creates and deletes for many unique filenames in // a given dir (eg: temporary/randomized filenames generated as part // of build tooling or atomic renames) - watchman::w_perf_t sample("age_out"); + watchman::PerfSample sample("age_out"); view()->ageOut(sample, std::chrono::seconds(min_age)); diff --git a/watchman/root/init.cpp b/watchman/root/init.cpp index c200b3715b3d..e7b44059085e 100644 --- a/watchman/root/init.cpp +++ b/watchman/root/init.cpp @@ -92,7 +92,7 @@ watchman_root::~watchman_root() { --live_roots; } -void watchman_root::addPerfSampleMetadata(watchman_perf_sample& sample) const { +void watchman_root::addPerfSampleMetadata(PerfSample& sample) const { // Note: if the root lock isn't held, we may read inaccurate numbers for // some of these properties. We're ok with that, and don't want to force // the root lock to be re-acquired just for this. diff --git a/watchman/root/iothread.cpp b/watchman/root/iothread.cpp index d07bf095b0a1..1260bea966b1 100644 --- a/watchman/root/iothread.cpp +++ b/watchman/root/iothread.cpp @@ -36,7 +36,7 @@ void InMemoryView::fullCrawl( PendingChanges& pending) { root->recrawlInfo.wlock()->crawlStart = std::chrono::steady_clock::now(); - w_perf_t sample("full-crawl"); + PerfSample sample("full-crawl"); auto view = view_.wlock(); // Ensure that we observe these files with a new, distinct clock, diff --git a/watchman/root/sync.cpp b/watchman/root/sync.cpp index 2dbe78a20ef0..a43828dc92b8 100644 --- a/watchman/root/sync.cpp +++ b/watchman/root/sync.cpp @@ -7,12 +7,12 @@ #include "watchman/watchman.h" using folly::to; -using watchman::w_perf_t; +using namespace watchman; void watchman_root::syncToNow( std::chrono::milliseconds timeout, std::vector& cookieFileNames) { - w_perf_t sample("sync_to_now"); + PerfSample sample("sync_to_now"); auto root = shared_from_this(); try { view()->syncToNow(root, timeout, cookieFileNames); diff --git a/watchman/tests/perf_test.cpp b/watchman/tests/PerfSampleTest.cpp similarity index 97% rename from watchman/tests/perf_test.cpp rename to watchman/tests/PerfSampleTest.cpp index 383f4099c3c5..a80fc9ea355a 100644 --- a/watchman/tests/perf_test.cpp +++ b/watchman/tests/PerfSampleTest.cpp @@ -1,7 +1,7 @@ /* Copyright (c) Facebook, Inc. and its affiliates. * Licensed under the Apache License, Version 2.0. */ -#include "watchman/watchman_perf.h" +#include "watchman/PerfSample.h" #include #include @@ -19,7 +19,7 @@ TEST(Perf, thread_shutdown) { cfg_shutdown(); }; - watchman_perf_sample sample("test"); + PerfSample sample("test"); sample.force_log(); auto logged = sample.finish(); EXPECT_TRUE(logged); diff --git a/watchman/watcher/fsevents.cpp b/watchman/watcher/fsevents.cpp index c18f36191816..b879c04a3776 100644 --- a/watchman/watcher/fsevents.cpp +++ b/watchman/watcher/fsevents.cpp @@ -106,7 +106,7 @@ std::shared_ptr watcherFromRoot( static void log_drop_event( const std::shared_ptr& root, bool isKernel) { - w_perf_t sample(isKernel ? "KernelDropped" : "UserDropped"); + PerfSample sample(isKernel ? "KernelDropped" : "UserDropped"); root->addPerfSampleMetadata(sample); sample.finish(); sample.force_log(); diff --git a/watchman/watchman.h b/watchman/watchman.h index 4192f107ca43..f6eaaa59ebd9 100644 --- a/watchman/watchman.h +++ b/watchman/watchman.h @@ -17,7 +17,6 @@ struct watchman_trigger_command; #include "watchman/watchman_dir.h" #include "watchman/watchman_file.h" -#include "watchman/watchman_perf.h" #include "watchman_client.h" #include "watchman_pdu.h" #include "watchman_query.h" diff --git a/watchman/watchman_client.h b/watchman/watchman_client.h index d9ccbbbd59e1..8ad5af006106 100644 --- a/watchman/watchman_client.h +++ b/watchman/watchman_client.h @@ -7,8 +7,8 @@ #include #include "watchman/Clock.h" #include "watchman/Logging.h" +#include "watchman/PerfSample.h" #include "watchman/watchman_pdu.h" -#include "watchman/watchman_perf.h" #include "watchman/watchman_stream.h" struct w_query; @@ -56,7 +56,7 @@ struct watchman_client : public std::enable_shared_from_this { // The command currently being processed by dispatch_command json_ref current_command; - watchman::w_perf_t* perf_sample{nullptr}; + watchman::PerfSample* perf_sample{nullptr}; // Queue of things to send to the client. std::deque responses; diff --git a/watchman/watchman_root.h b/watchman/watchman_root.h index cbc342db0d28..02250f876f47 100644 --- a/watchman/watchman_root.h +++ b/watchman/watchman_root.h @@ -30,8 +30,8 @@ struct watchman_trigger_command; namespace watchman { -struct watchman_perf_sample; class ClientStateAssertion; +class PerfSample; class ClientStateAssertions { public: @@ -201,7 +201,7 @@ struct watchman_root : public std::enable_shared_from_this { json_ref getStatus() const; // Annotate the sample with some standard metadata taken from a root. - void addPerfSampleMetadata(watchman::watchman_perf_sample& sample) const; + void addPerfSampleMetadata(watchman::PerfSample& sample) const; private: void applyIgnoreConfiguration(); From 39797a10b9fbee8ec01bc7c360a2401ba00d1c00 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 18 Aug 2021 15:43:30 -0700 Subject: [PATCH 0525/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/030f6eccb8baf6b5261b47e9ef32bced0fc509ac https://github.com/facebook/fbthrift/commit/f5a6831a752c84c26be1fd84a980822ddc462063 https://github.com/facebook/fbzmq/commit/16d9a839083444ce5b71ab42cb3cc6d632168ce5 https://github.com/facebook/litho/commit/415f512d3d3c49671200ad3043869d09ba640e10 https://github.com/facebook/proxygen/commit/41da54d7cc51ccfbecf8842ae08e248717147b2d https://github.com/facebook/watchman/commit/d007ed0ad4d9f436c6bca863796bb7851566c720 https://github.com/facebookexperimental/rust-shed/commit/7e607d3502227dee3774308dd2bf3c926cc35362 https://github.com/facebookexternal/stl_tasks/commit/44624f3b3e5254a6f2030f14c1f05588f360c985 https://github.com/facebookincubator/profilo/commit/264952ea3c10b204f3031faec646a7fdde44654b Reviewed By: 2d2d2d2d2d fbshipit-source-id: 3bcef41e322ca208e227be4d7519e044c0d40e14 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 71890de24aef..bcdde845c9ea 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a1d5f0deb1adabd322fdfff74fffe2ae4a066a37 +Subproject commit f5a6831a752c84c26be1fd84a980822ddc462063 From 687fb2276d3c8d9f9febae3380826303ae782139 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 18 Aug 2021 16:12:44 -0700 Subject: [PATCH 0526/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/080a84718ff4390e975084761eae1beedd173c77 https://github.com/facebook/fbthrift/commit/e696284650f632095ce200f5799ae31c08e224c2 https://github.com/facebook/fbzmq/commit/4d48cea46fadf644f8c7aedc3ea5d40d5355a0b0 https://github.com/facebook/watchman/commit/39797a10b9fbee8ec01bc7c360a2401ba00d1c00 https://github.com/facebookexperimental/rust-shed/commit/3c282d6883ba7f78b8c6fa7672471ff4f6fab79c Reviewed By: 2d2d2d2d2d fbshipit-source-id: c55dfcc4835a0df7177db1d8c868c1f5870e3555 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bcdde845c9ea..f8e7c7dfaeb2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f5a6831a752c84c26be1fd84a980822ddc462063 +Subproject commit e696284650f632095ce200f5799ae31c08e224c2 From 244df695fb7f4f6b81c850ac2594301d2b8f76f8 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Wed, 18 Aug 2021 19:05:25 -0700 Subject: [PATCH 0527/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/54fa64fa0ea15746b2375e4def30718a3fab74c9 Reviewed By: 2d2d2d2d2d fbshipit-source-id: 20d372938ac1b5ff847b983f30a5ee15eba88db0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f8e7c7dfaeb2..08dca7b54630 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e696284650f632095ce200f5799ae31c08e224c2 +Subproject commit 54fa64fa0ea15746b2375e4def30718a3fab74c9 From afea7edb4ccd9357576aac94146baa7f1c4d5203 Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 19 Aug 2021 01:35:03 -0700 Subject: [PATCH 0528/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/030496257bca8ea247a5e8fc1cb7c1646654d771 Reviewed By: 2d2d2d2d2d fbshipit-source-id: c99364e65b98033705c35e2118fd2e79d382731c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 08dca7b54630..ff8df61de1d9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 54fa64fa0ea15746b2375e4def30718a3fab74c9 +Subproject commit 030496257bca8ea247a5e8fc1cb7c1646654d771 From 954b54252884a35efb918b361cae8bd48868dd8f Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 19 Aug 2021 06:14:27 -0700 Subject: [PATCH 0529/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/306a6fb61579553f68853f0a963847ca37fe7ef3 Reviewed By: 2d2d2d2d2d fbshipit-source-id: b39d408e209497357efb37187ee9d8f4dac015ba --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ff8df61de1d9..c8872d24786f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 030496257bca8ea247a5e8fc1cb7c1646654d771 +Subproject commit 306a6fb61579553f68853f0a963847ca37fe7ef3 From 2210efca0f74b7beb1dad4266e41f0ea65625f0e Mon Sep 17 00:00:00 2001 From: svcscm svcscm Date: Thu, 19 Aug 2021 08:02:56 -0700 Subject: [PATCH 0530/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/c4595041a5b63f0b5ab5cbdb1cdd811b977d7d40 https://github.com/facebook/litho/commit/4bcd88863d0e12cb66f37982d468733b1ef7b131 Reviewed By: 2d2d2d2d2d fbshipit-source-id: df705e2909e3ca0bbf14784f4bc5f268b67b8b34 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c8872d24786f..6f8621e5173b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 306a6fb61579553f68853f0a963847ca37fe7ef3 +Subproject commit c4595041a5b63f0b5ab5cbdb1cdd811b977d7d40 From 54fa2b5f703825339b8b478d6b41a451f533c9d1 Mon Sep 17 00:00:00 2001 From: Daniel Jang Date: Fri, 20 Aug 2021 01:06:07 +0900 Subject: [PATCH 0531/7387] Improvements to the website (#938) * Remove an empty `
` * Fix a bug with the website on Chrome ... by explicitly setting the `width` of `.wrapper` Co-authored-by: Chad Austin --- website/_includes/nav_docs.html | 2 -- website/_sass/_base.scss | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/_includes/nav_docs.html b/website/_includes/nav_docs.html index 650650830762..19930d29a769 100644 --- a/website/_includes/nav_docs.html +++ b/website/_includes/nav_docs.html @@ -1,5 +1,3 @@ -
-
- diff --git a/website-old/_includes/blog_pagination.html b/website-old/_includes/blog_pagination.html deleted file mode 100644 index 150f553a28c4..000000000000 --- a/website-old/_includes/blog_pagination.html +++ /dev/null @@ -1,29 +0,0 @@ - -{% if paginator.total_pages > 1 %} -
- -
-{% endif %} - diff --git a/website-old/_includes/content/gridblocks.html b/website-old/_includes/content/gridblocks.html deleted file mode 100644 index 7bdca6ef88fe..000000000000 --- a/website-old/_includes/content/gridblocks.html +++ /dev/null @@ -1,6 +0,0 @@ -
-{% for item in {{include.data_source}} %} - {% include content/items/gridblock.html item=item gridtype=include.grid_type %} - {% cycle '', '
' %} -{% endfor %} -
\ No newline at end of file diff --git a/website-old/_includes/content/items/gridblock.html b/website-old/_includes/content/items/gridblock.html deleted file mode 100644 index 908974a9ebab..000000000000 --- a/website-old/_includes/content/items/gridblock.html +++ /dev/null @@ -1,7 +0,0 @@ -
- {% if item.image %} - {{ item.title }} - {% endif %} -

{{ item.title }}

- {{ item.text | markdownify }} -
\ No newline at end of file diff --git a/website-old/_includes/doc.html b/website-old/_includes/doc.html deleted file mode 100644 index 0c1a443c00bf..000000000000 --- a/website-old/_includes/doc.html +++ /dev/null @@ -1,22 +0,0 @@ -
-
-

{% if include.truncate %}{{ page.title }}{% else %}{{ page.title }}{% endif %}

-
- -
- {% if include.truncate %} - {% if page.content contains '' %} - {{ page.content | split:'' | first }} -
- - ...Read More - -
- {% else %} - {{ page.content }} - {% endif %} - {% else %} - {{ content }} - {% endif %} -
-
diff --git a/website-old/_includes/doc_paging.html b/website-old/_includes/doc_paging.html deleted file mode 100644 index 75b53b0aeb95..000000000000 --- a/website-old/_includes/doc_paging.html +++ /dev/null @@ -1,41 +0,0 @@ -{% assign doc_groups = site.docs | group_by: "section" %} -{% for group in doc_groups %} - {% assign gindex = forloop.index0 %} - {% assign gitems = group.items | sort: "id" %} - {% for doc_hash in gitems %} - {% if doc_hash.id == page.id %} - {% assign index = forloop.index0 %} - {% assign groupindex = gindex %} - {% break %} - {% endif %} - {% endfor %} - {% if index %} - {% break %} - {% endif %} -{% endfor %} -{% if index %} -
- {% assign next = index | plus: 1 %}{% assign prev = index | minus: 1 %} - {% assign nextgroup = groupindex | plus: 1 %}{% assign prevgroup = groupindex | minus: 1 %} - {% assign groupitems = doc_groups[groupindex].items | sort: "id" %} - {% if doc_groups[prevgroup].items %} - {% assign prevgroupitems = doc_groups[prevgroup].items | sort: "id" %} - {% endif %} - {% if doc_groups[nextgroup].items %} - {% assign nextgroupitems = doc_groups[nextgroup].items | sort: "id" %} - {% endif %} - {% assign prevdoc = groupitems[prev] %}{% assign nextdoc = groupitems[next] %} - {% if prevdoc and prev >= 0 %} -
‹ Previous{{ prevdoc.title }}
- {% elsif prevgroupitems and prevgroup >= 0 %} - {% assign prevdoc = prevgroupitems.last %} -
‹ Previous{{ prevdoc.title }}
- {% endif %} - {% if nextdoc %} -
{{ nextdoc.title }}Next ›
- {% elsif nextgroupitems %} - {% assign nextdoc = nextgroupitems.first %} -
{{ nextdoc.title }}Next ›
- {% endif %} -
-{% endif %} diff --git a/website-old/_includes/footer.html b/website-old/_includes/footer.html deleted file mode 100644 index fd375e58f00b..000000000000 --- a/website-old/_includes/footer.html +++ /dev/null @@ -1,34 +0,0 @@ -
- -
-{% include anchor_links.html %} - - diff --git a/website-old/_includes/head.html b/website-old/_includes/head.html deleted file mode 100644 index c3c03141eee9..000000000000 --- a/website-old/_includes/head.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - {% seo %} - - - - - - - - {% comment %} - For our RSS feed.xml - https://help.github.com/articles/atom-rss-feeds-for-github-pages/ - {% endcomment %} - {% feed_meta %} - diff --git a/website-old/_includes/header.html b/website-old/_includes/header.html deleted file mode 100644 index dd0765c771e3..000000000000 --- a/website-old/_includes/header.html +++ /dev/null @@ -1,19 +0,0 @@ -
-
-
- -

{{ site.title }}

-

{{ site.tagline }}

- -
-

{% if page.excerpt %}{{ page.excerpt | strip_html }}{% else %}{{ site.description }}{% endif %}

-
-
- {% for promo in site.data.promo %} - {% include plugins/{{promo.type}}.html button_href=promo.href button_text=promo.text %} -
- {% endfor %} -
-
-
-
diff --git a/website-old/_includes/hero.html b/website-old/_includes/hero.html deleted file mode 100644 index c7423f75ef33..000000000000 --- a/website-old/_includes/hero.html +++ /dev/null @@ -1,9 +0,0 @@ -
-
-
-

An image management library

-
- Get Started -
-
-
diff --git a/website-old/_includes/katex_import.html b/website-old/_includes/katex_import.html deleted file mode 100644 index 6d6b7cf44a37..000000000000 --- a/website-old/_includes/katex_import.html +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/website-old/_includes/katex_render.html b/website-old/_includes/katex_render.html deleted file mode 100644 index 56e2e89743d0..000000000000 --- a/website-old/_includes/katex_render.html +++ /dev/null @@ -1,210 +0,0 @@ - diff --git a/website-old/_includes/nav.html b/website-old/_includes/nav.html deleted file mode 100644 index 01601f934264..000000000000 --- a/website-old/_includes/nav.html +++ /dev/null @@ -1,110 +0,0 @@ -
-
- Support Ukraine 🇺🇦 - - Help Provide Humanitarian Aid to Ukraine. -
-
-
-
-

{{ site.title }}

 - - -
- - -
diff --git a/website-old/_includes/nav_blog.html b/website-old/_includes/nav_blog.html deleted file mode 100644 index b205a3d0d147..000000000000 --- a/website-old/_includes/nav_blog.html +++ /dev/null @@ -1,76 +0,0 @@ - - - diff --git a/website-old/_includes/nav_docs.html b/website-old/_includes/nav_docs.html deleted file mode 100644 index 51f6df11244c..000000000000 --- a/website-old/_includes/nav_docs.html +++ /dev/null @@ -1,100 +0,0 @@ - - - diff --git a/website-old/_includes/plugins/all_share.html b/website-old/_includes/plugins/all_share.html deleted file mode 100644 index 59b00d615fd1..000000000000 --- a/website-old/_includes/plugins/all_share.html +++ /dev/null @@ -1,3 +0,0 @@ -
- {% include plugins/like_button.html %}{% include plugins/twitter_share.html %}{% include plugins/google_share.html %} -
\ No newline at end of file diff --git a/website-old/_includes/plugins/ascii_cinema.html b/website-old/_includes/plugins/ascii_cinema.html deleted file mode 100644 index f78a490aebfe..000000000000 --- a/website-old/_includes/plugins/ascii_cinema.html +++ /dev/null @@ -1,2 +0,0 @@ -
- \ No newline at end of file diff --git a/website-old/_includes/plugins/button.html b/website-old/_includes/plugins/button.html deleted file mode 100644 index 0f54034ee204..000000000000 --- a/website-old/_includes/plugins/button.html +++ /dev/null @@ -1 +0,0 @@ -{{ include.button_text }} \ No newline at end of file diff --git a/website-old/_includes/plugins/fb_pagelike.html b/website-old/_includes/plugins/fb_pagelike.html deleted file mode 100644 index 6fd487f714ea..000000000000 --- a/website-old/_includes/plugins/fb_pagelike.html +++ /dev/null @@ -1,20 +0,0 @@ -
-
{{ include.button_text }}
-
- \ No newline at end of file diff --git a/website-old/_includes/plugins/github_star.html b/website-old/_includes/plugins/github_star.html deleted file mode 100644 index 390c116b00d2..000000000000 --- a/website-old/_includes/plugins/github_star.html +++ /dev/null @@ -1,4 +0,0 @@ -
- Star -
- \ No newline at end of file diff --git a/website-old/_includes/plugins/github_watch.html b/website-old/_includes/plugins/github_watch.html deleted file mode 100644 index b54ef44f83ef..000000000000 --- a/website-old/_includes/plugins/github_watch.html +++ /dev/null @@ -1,4 +0,0 @@ -
- Watch -
- \ No newline at end of file diff --git a/website-old/_includes/plugins/google_share.html b/website-old/_includes/plugins/google_share.html deleted file mode 100644 index 1b557db86c53..000000000000 --- a/website-old/_includes/plugins/google_share.html +++ /dev/null @@ -1,5 +0,0 @@ -
-
-
- - diff --git a/website-old/_includes/plugins/group_join.html b/website-old/_includes/plugins/group_join.html deleted file mode 100644 index da4ca649a64a..000000000000 --- a/website-old/_includes/plugins/group_join.html +++ /dev/null @@ -1 +0,0 @@ -{{ include.button_text }} \ No newline at end of file diff --git a/website-old/_includes/plugins/like_button.html b/website-old/_includes/plugins/like_button.html deleted file mode 100644 index 2ae5ff28da71..000000000000 --- a/website-old/_includes/plugins/like_button.html +++ /dev/null @@ -1,18 +0,0 @@ -
- \ No newline at end of file diff --git a/website-old/_includes/plugins/post_social_plugins.html b/website-old/_includes/plugins/post_social_plugins.html deleted file mode 100644 index 0041cdad0bd7..000000000000 --- a/website-old/_includes/plugins/post_social_plugins.html +++ /dev/null @@ -1,34 +0,0 @@ -
- -
-
- - - diff --git a/website-old/_includes/plugins/slideshow.html b/website-old/_includes/plugins/slideshow.html deleted file mode 100644 index ae692752b576..000000000000 --- a/website-old/_includes/plugins/slideshow.html +++ /dev/null @@ -1,87 +0,0 @@ -
- - \ No newline at end of file diff --git a/website-old/_includes/plugins/twitter_follow.html b/website-old/_includes/plugins/twitter_follow.html deleted file mode 100644 index 773e0b41cc60..000000000000 --- a/website-old/_includes/plugins/twitter_follow.html +++ /dev/null @@ -1,5 +0,0 @@ -
- -
- - \ No newline at end of file diff --git a/website-old/_includes/plugins/twitter_share.html b/website-old/_includes/plugins/twitter_share.html deleted file mode 100644 index 3ea8bc5897b4..000000000000 --- a/website-old/_includes/plugins/twitter_share.html +++ /dev/null @@ -1,4 +0,0 @@ -
- -
- \ No newline at end of file diff --git a/website-old/_includes/post.html b/website-old/_includes/post.html deleted file mode 100644 index ac761e5997a5..000000000000 --- a/website-old/_includes/post.html +++ /dev/null @@ -1,33 +0,0 @@ -
- {% assign author = site.data.authors[page.author] %} -
- {% if author.fbid %} -
- {{ author.fullname }} -
- {% endif %} - {% if author.full_name %} -

{{ author.full_name }}

- {% endif %} -

{% if include.truncate %}{{ page.title }}{% else %}{{ page.title }}{% endif %}

-

Posted {{ page.date | date: '%B %d, %Y' }}{% if page.meta %} • {{ page.meta }}{% endif %}

-
- -
- {% if include.truncate %} - {% if page.content contains '' %} - {{ page.content | split:'' | first }} -
- - ...Read More - -
- {% else %} - {{ page.content }} - {% endif %} - {% else %} - {{ content }} - {% endif %} -
- {% include plugins/all_share.html %} -
\ No newline at end of file diff --git a/website-old/_includes/social_plugins.html b/website-old/_includes/social_plugins.html deleted file mode 100644 index 6c6af4ac5e77..000000000000 --- a/website-old/_includes/social_plugins.html +++ /dev/null @@ -1,24 +0,0 @@ - -
- -
- - - diff --git a/website-old/_includes/ui/button.html b/website-old/_includes/ui/button.html deleted file mode 100644 index 729ccc33b935..000000000000 --- a/website-old/_includes/ui/button.html +++ /dev/null @@ -1 +0,0 @@ -{{ include.button_text }} \ No newline at end of file diff --git a/website-old/_layouts/blog.html b/website-old/_layouts/blog.html deleted file mode 100644 index 3602555b3a82..000000000000 --- a/website-old/_layouts/blog.html +++ /dev/null @@ -1,11 +0,0 @@ ---- -layout: default -sectionid: blog ---- -
-
- {% include nav_blog.html %} - {{ content }} -
-
- diff --git a/website-old/_layouts/default.html b/website-old/_layouts/default.html deleted file mode 100644 index 58214a584a35..000000000000 --- a/website-old/_layouts/default.html +++ /dev/null @@ -1,12 +0,0 @@ - - - {% include head.html %} - - {% include nav.html alwayson=true %} -
- {{ content }} - {% include footer.html %} -
- - - diff --git a/website-old/_layouts/doc_page.html b/website-old/_layouts/doc_page.html deleted file mode 100644 index 79bc7fcc97ef..000000000000 --- a/website-old/_layouts/doc_page.html +++ /dev/null @@ -1,11 +0,0 @@ ---- -layout: default ---- - -
-
- {% include nav_docs.html %} - {{ content }} -
-
- diff --git a/website-old/_layouts/docs.html b/website-old/_layouts/docs.html deleted file mode 100644 index 749dafabbe46..000000000000 --- a/website-old/_layouts/docs.html +++ /dev/null @@ -1,5 +0,0 @@ ---- -layout: doc_page ---- - -{% include doc.html %} \ No newline at end of file diff --git a/website-old/_layouts/home.html b/website-old/_layouts/home.html deleted file mode 100644 index f988f43ff6d1..000000000000 --- a/website-old/_layouts/home.html +++ /dev/null @@ -1,17 +0,0 @@ - - - {% include head.html %} - - {% include nav.html alwayson=true %} -
- {% include header.html %} -
-
- {{ content }} -
-
- {% include footer.html %} -
- - - diff --git a/website-old/_layouts/page.html b/website-old/_layouts/page.html deleted file mode 100644 index b27134d13405..000000000000 --- a/website-old/_layouts/page.html +++ /dev/null @@ -1,10 +0,0 @@ ---- -layout: default ---- -
-
- {% include nav_blog.html %} - {{ content }} -
-
- diff --git a/website-old/_layouts/plain.html b/website-old/_layouts/plain.html deleted file mode 100644 index fccc02ce17e9..000000000000 --- a/website-old/_layouts/plain.html +++ /dev/null @@ -1,10 +0,0 @@ ---- -layout: default ---- - -
-
- {{ content }} -
-
- diff --git a/website-old/_layouts/post.html b/website-old/_layouts/post.html deleted file mode 100644 index 5c18d6a90b4c..000000000000 --- a/website-old/_layouts/post.html +++ /dev/null @@ -1,6 +0,0 @@ ---- -layout: page ---- - -{% include post.html %} - diff --git a/website-old/_layouts/redirect.html b/website-old/_layouts/redirect.html deleted file mode 100644 index aa1b7d2ff6c0..000000000000 --- a/website-old/_layouts/redirect.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - -

Redirecting...

-Click here if you are not redirected. - - - - diff --git a/website-old/_layouts/support.html b/website-old/_layouts/support.html deleted file mode 100644 index fccc02ce17e9..000000000000 --- a/website-old/_layouts/support.html +++ /dev/null @@ -1,10 +0,0 @@ ---- -layout: default ---- - -
-
- {{ content }} -
-
- diff --git a/website-old/_sass/_base.scss b/website-old/_sass/_base.scss deleted file mode 100644 index 743e6a574d97..000000000000 --- a/website-old/_sass/_base.scss +++ /dev/null @@ -1,985 +0,0 @@ -body { - background: $footer-bg; - color: $text; - font: 300 #{$base-font-size}/#{$base-line-height} $base-font-family; - text-align: center; - text-rendering: optimizeLegibility; - - display: flex; - flex-direction: column; -} - -img { - max-width: 100%; -} - -a { - border-bottom: 1px dotted $primary-bg; - color: $text; - text-decoration: none; - -webkit-transition: background 0.3s, color 0.3s; - transition: background 0.3s, color 0.3s; -} - -#fb_oss a { - border: 0; -} - -h1, h2, h3, h4 { - font-family: $header-font-family; -} - -.navPusher { - top: 30px; - - ol { - list-style: decimal; - } - - ul { - list-style: disc; - } - - ol, ul { - padding-left: 24px; - - li { - padding-bottom: 4px; - padding-left: 6px; - } - } - - strong { - font-weight: bold; - } -} - -.fixedHeaderContainer { - background: $nav-bg; - color: $header-text; - height: $header-height; - opacity: 0.0; - padding: $header-ptop 0 $header-pbot; - -webkit-transition: opacity 0.2s ease-in-out; - transition: opacity 0.2s ease-in-out; - width: 100%; - top: 60px; - - &.visible { - opacity: 1.0; - } - - a { - border: 0; - color: $header-text; - } - - header { - height: $header-height; - margin: 0 auto; - max-width: $content-width; - padding: 0 10px; - position: relative; - text-align: left; - - img { - height: 30px; - margin-right: 10px; - } - - h2 { - display: inline; - font-family: $header-font-family; - font-size: 16px; - letter-spacing: -0.02em; - line-height: 18px; - position: relative; - top: -9px; - } - } - - .navigationWrapper { - display: inline-block; - font-family: $header-font-family; - - &.navigationFull { - display: none; - } - - &.navigationSlider { - position: absolute; - right: 12px; - - .navSlideout { - cursor: pointer; - font-size: 24px; - padding-top: 2px; - -webkit-transition: -webkit-transform 0.3s; - transition: transform 0.3s; - - &.navSlideoutActive { - transform: rotate(90deg); - -webkit-transform: rotate(90deg); - } - } - - .slidingNav { - background: #222; - box-sizing: border-box; - height: 100vh; - opacity: 0; - overflow: hidden; - padding: 0; - position: absolute; - z-index: 100; - right: -12px; - top: $header-height + $header-pbot; - -webkit-transition: opacity 0.5s, width 0.5s; - transition: opacity 0.5s, width 0.5s; - width: 0; - - &.slidingNavActive { - opacity: 1; - width: 75vw; - } - - ul { - list-style: none; - padding-left: 0; - - li { - padding: 0; - a { - border-bottom: 1px solid #111; - display:block; - padding: 4vw 12px; - -webkit-transition: background-color 0.3s; - transition: background-color 0.3s; - - &:focus, - &:hover { - background: $primary-bg; - } - } - } - } - } - } - } -} - -.navPusher { - height: 100%; - - &::after { - position: absolute; - top: 0; - right: 0; - width: 0; - height: 0; - background: rgba(0,0,0,0.4); - content: ''; - opacity: 0; - -webkit-transition: opacity 0.5s, width 0.1s 0.5s, height 0.1s 0.5s; - transition: opacity 0.5s, width 0.1s 0.5s, height 0.1s 0.5s; - } - - .sliderActive &::after { - width: 100%; - height: 100%; - opacity: 1; - -webkit-transition: opacity 0.5s; - transition: opacity 0.5s; - } -} - -.headerContainer { - background: $primary-bg; - color: $header-text; - - a { - color: $header-text; - } - - .headerWrapper { - padding-top: 2em; - - h1#project_title { - font-family: $header-font-family; - font-size: 300%; - letter-spacing: -0.08em; - line-height: 1em; - margin-bottom: 80px; - } - - h2#project_tagline { - font-family: $header-font-family; - font-size: 200%; - letter-spacing: -0.04em; - line-height: 1em; - } - } -} - -.wrapper { - margin: 0px auto; - max-width: $content-width; - padding: 0 20px; -} - -.footerContainer { - background: $footer-bg; - - .footerWrapper { - padding-top: 4vh; - padding-bottom: 4vh; - } -} - -img.projectLogo { - height: 100px; - margin-bottom: 0px; -} - -section#intro { - margin: 70px 0; -} - -.fbossFontLight { - font-family: $base-font-family; - font-weight: 300; - font-style: normal; -} - -.fb-like { - display: block; - margin-bottom: 50px; - width: 100%; -} - -a.blockButton { - background: $primary-bg; - border-radius: 4px; - border: 2px solid transparent; - clear: both; - color: $header-text; - display: inline-block; - font-family: $header-font-family; - font-size: 120%; - padding: 10px 20px; - position: relative; - -webkit-transition: background-color 0.2s, color 0.2s, border 0.2s; - transition: background-color 0.2s, color 0.2s, border 0.2s; - - .mainContainer .mainWrapper &:hover, - .mainContainer .mainWrapper &:focus { - background: $secondary-bg; - border: 2px solid $primary-bg; - color: $primary-bg; - } - - .headerContainer &{ - background: $light-color; - color: $light-text-color; - - &:hover, - &:focus { - background: $primary-bg; - border: 2px solid $light-color; - color: $light-text-color; - } - } -} - - -.promoSection { - margin: -25px 0 0; - text-align: center; - - .pluginBlock { - display: inline-block; - margin: 25px 0; - - &.fb_iframe_widget_fluid { - display: inline-block; - } - - &:last-of-type:not(.slideshowBlock) { - margin-bottom: 50px; - } - - &.allShareBlock { - .pluginBlock { - margin: 0 12px; - width: auto; - - &.fb-like { - top: -5px; - } - } - } - } -} - -.center { - display: block; - text-align: center; -} - -.mainContainer { - background: $secondary-bg; - overflow: auto; - padding: 0 4vw; - - .mainWrapper { - padding-bottom: 4vh; - padding-top: 4vh; - text-align: left; - - &.homeWrapper { - font-size: 120%; - } - - .blockButton { - margin: 4vh 0; - - &.marginsmall { - margin: 1vh 0; - } - } - - .allShareBlock { - margin: -12px; - padding: 1vh 0; - - .pluginBlock { - margin: 12px; - padding: 0; - } - } - - a { - &:hover, - &:focus { - background: $primary-bg; - color: $header-text; - } - } - - em { - font-style: italic; - } - - strong, b { - font-weight: bold; - } - - h1 { - font-size: 300%; - line-height: 1em; - padding: 1.4em 0 1em; - text-align: center; - } - - h2 { - font-size: 250%; - line-height: 1em; - padding: 1.4em 0 1em; - text-align: left; - } - - h3 { - font-size: 150%; - line-height: 1em; - padding: 1em 0 0.8em; - } - - h2 a.header-link, h3 a.header-link { - font-size: 80%; - margin-left: 0.5em; - color: $nav-text; - border: none; - } - - p { - padding: 0.8em 0; - } - - nav.toc { - position: relative; - section { - background: $primary-bg; - color: $header-text; - margin-bottom: 2vh; - padding: 12px 24px; - - .navGroup { - h3 { - display: none; - } - - &:not(.navGroupActive) { - display: none; - } - } - } - - .toggleNav { - position: relative; - } - - .navToggle { - background: $primary-bg; - color: $header-text; - height: 24px; - position: absolute; - right: 24px; - text-align: center; - top: 20px; - width: 24px; - - i { - cursor: pointer; - -webkit-transition: -webkit-transform 0.5s; - transition: transform 0.5s; - } - - &.navToggleActive i { - transform: rotate(180deg); - -webkit-transform: rotate(180deg); - } - } - - .toggleNavActive { - section { - .navGroup { - display: block; - - h3 { - display: block; - } - - ul li { - display: block; - } - } - - ul li { - display: block; - padding-bottom: 4px; - } - } - } - - h3 { - font-size: 125%; - padding-right: 24px; - padding-top: 0.4em; - } - - ul { - padding-left: 0; - padding-right: 24px; - - li { - list-style-type: none; - padding-bottom: 0; - padding-left: 0; - - &:not(.navListItemActive) { - display: none; - } - - a { - border-bottom: none; - border-left: 4px solid transparent; - color: $header-text; - display: inline-block; - margin-bottom: 0.6vh; - padding: 1vh 0 0.4vh 8px; - -webkit-transition: border-color 0.3s; - transition: border-color 0.3s; - - &:hover, - &:focus { - border-left: 4px solid $nav-text; - } - - &.navItemActive { - border-left: 4px solid $header-text; - } - } - } - } - } - - .post { - background: #fff; - padding: 6vw 6vw 8vh; - position: relative; - - a { - color: $link-color; - - &:hover, - &:focus { - color: #fff; - } - } - - h2 { - border-bottom: 4px solid $primary-bg; - font-size: 130%; - } - - h3 { - border-bottom: 1px solid $primary-bg; - font-size: 110%; - } - - .authorPhoto { - border-radius: 50%; - height: 50px; - left: 50%; - margin-left: -25px; - overflow: hidden; - position: absolute; - top: -25px; - width: 50px; - } - - .post-header { - padding: 0 0 1em; - text-align: center; - - h1 { - font-size: 150%; - line-height: 1em; - padding: 0.4em 0 0; - - a { - border: none; - } - } - - .post-authorName { - color: $primary-bg; - font-family: $header-font-family; - margin-top: -2vw; - text-align: center; - } - - .post-meta { - color: $primary-bg; - font-family: $header-font-family; - text-align: center; - } - } - - .postSocialPlugins { - padding-top: 1em; - } - - .docPagination { - background: $primary-bg; - bottom: 0px; - left: 0px; - position: absolute; - right: 0px; - - .pager { - display: inline-block; - width: 50%; - } - - .pagingNext { - float: right; - text-align: right; - } - - a { - border: none; - color: $header-text; - display: block; - padding: 4px 12px; - - &:hover { - background-color: $secondary-bg; - color: $text; - } - - .pagerLabel { - display: inline; - } - - .pagerTitle { - display: none; - } - } - } - } - - .posts { - .post { - margin-bottom: 6vh; - } - } - } -} - -.gridBlock { - margin: 20px 0; - padding: 2vh 0; - - .twoByGridBlock { - padding: 0; - - img { - margin-top: 6vh; - max-width: 100%; - } - - &.featureBlock h3 { - font-size: 150%; - margin: 20px 0; - padding-bottom: 0; - } - } - - .gridClear { - clear: both; - } - - .leftBlock { - padding: 40px 0; - text-align: left; - } -} - -#integrations_title { - font-size: 250%; - margin: 80px 0; -} - -.ytVideo { - height: 0; - overflow: hidden; - padding-bottom: 53.4%; /* 16:9 */ - padding-top: 25px; - position: relative; -} - -.ytVideo iframe, -.ytVideo object, -.ytVideo embed { - height: 100%; - left: 0; - position: absolute; - top: 0; - width: 100%; -} - -@media only screen and (min-width: 480px) { - h1#project_title { - font-size: 500%; - } - - h2#project_tagline { - font-size: 250%; - } - - img.projectLogo { - margin-bottom: 10px; - height: 200px; - } - - .fixedHeaderContainer { - .navigationWrapper { - &.navigationSlider { - - .slidingNav { - right: -22px; - - &.slidingNavActive { - width: 50vw; - } - - ul { - li { - a { - padding: 1vw 12px; - } - } - } - } - } - } - } - - .headerWrapper { - padding-top: 8em; - } - - .gridBlock { - margin: -20px; - overflow: auto; - padding: 1vh 0; - - .twoByGridBlock { - box-sizing: border-box; - float: left; - padding: 20px; - text-align: center; - width: 50%; - } - - .leftBlock { - padding: 40px 20px; - } - } - - .mainContainer { - .mainWrapper { - nav.toc { - h3 { - padding-top: 0.4em; - } - - ul li a { - margin-bottom: 0; - padding-bottom: 0.2vh; - padding-top: 0; - } - - .navToggle { - top: 12px; - } - } - - .post { - padding: 4vw 4vw 4em; - - h2 { - font-size: 180%; - } - - h3 { - font-size: 120%; - } - - .post-header { - padding: 1em 0; - } - - .docPagination { - a { - .pagerLabel { - display: none; - } - .pagerTitle { - display: inline; - } - } - } - } - } - } -} - -@media only screen and (min-width: 900px) { - .fixedHeaderContainer { - .navigationWrapper { - - nav { - padding: 0 1em; - position: relative; - top: -9px; - - ul { - margin: 0 -0.4em; - li { - padding: 0 0.4em; - display: inline-block; - - a { - border: 0; - color: $nav-text; - - &:hover { - color: $header-text; - } - } - - &.navItemActive { - a { - color: $header-text; - } - } - } - } - } - - &.navigationFull { - display: inline-block; - } - - &.navigationSlider { - display: none; - } - } - } - - .navPusher::after { - display: none; - } -} - -@media only screen and (min-width: 1024px) { - .mainContainer { - .mainWrapper { - nav.toc { - box-sizing: border-box; - display: inline-block; - border-right: 12px solid $secondary-bg; - width: 285px; - vertical-align: top; - - .navToggle { - display: none; - } - - .toggleNav { - section { - .navGroup { - display: block; - - h3 { - display: block; - } - - ul li { - display: block; - } - } - - ul li { - display: block; - padding-bottom: 4px; - } - } - } - ul li a { - // TODO: increase accessibility of /docs/ side nav bar - font-size: 14px; - padding-bottom: 0.1vh; - } - } - - .post { - box-sizing: border-box; - display: inline-block; - padding: 2vw 24px 4em; - width: 590px; - - .post-header { - h1 { - font-size: 250%; - } - } - } - - .posts { - display: inline-block; - width: 590px; - - .post { - margin-bottom: 4vh; - width: 100%; - } - } - } - } -} - -@media only screen and (min-width: 1040px) { - .mainContainer { - .mainWrapper { - nav.toc { - width: 300px; - } - } - } -} - -@media only screen and (min-width: 1200px) { - .fixedHeaderContainer { - header { - max-width: 1100px; - } - } - - .wrapper { - max-width: 1100px; - width: 1100px; - } - - .homeWrapper { - max-width: 900px; - } - - .headerWrapper { - max-width: 900px; - } - - .mainContainer .mainWrapper { - .post, .posts { - width: 760px; - } - } -} - -@media only screen and (min-width: 1500px) { - .fixedHeaderContainer { - header { - max-width: 1400px; - } - } - - .wrapper { - max-width: 1400px; - width: 1400px; - } - - .homeWrapper { - max-width: 900px; - } - - .headerWrapper { - max-width: 900px; - } - - .mainContainer .mainWrapper { - .post, .posts { - width: 1035px; - } - } -} - -/* Social Banner */ -.socialBanner { - font-weight: bold; - font-size: 20px; - padding: 20px 0; - max-width: 768px; - margin: 0 auto; - text-align: center; - color: white; - height: 30px; - min-width: 100%; - background: #1F242A; - - a { - color: #f2f2f2; - border-bottom-color: #d9deff; - } -} diff --git a/website-old/_sass/_reset.scss b/website-old/_sass/_reset.scss deleted file mode 100644 index 0e5f2e0c1d30..000000000000 --- a/website-old/_sass/_reset.scss +++ /dev/null @@ -1,43 +0,0 @@ -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -b, u, i, center, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, embed, -figure, figcaption, footer, header, hgroup, -menu, nav, output, ruby, section, summary, -time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; -} -/* HTML5 display-role reset for older browsers */ -article, aside, details, figcaption, figure, -footer, header, hgroup, menu, nav, section { - display: block; -} -body { - line-height: 1; -} -ol, ul { - list-style: none; -} -blockquote, q { - quotes: none; -} -blockquote:before, blockquote:after, -q:before, q:after { - content: ''; - content: none; -} -table { - border-collapse: collapse; - border-spacing: 0; -} diff --git a/website-old/_sass/_slideshow.scss b/website-old/_sass/_slideshow.scss deleted file mode 100644 index cd98a6cdbaf5..000000000000 --- a/website-old/_sass/_slideshow.scss +++ /dev/null @@ -1,48 +0,0 @@ -.slideshow { - position: relative; - - .slide { - display: none; - - img { - display: block; - margin: 0 auto; - } - - &.slideActive { - display: block; - } - - a { - border: none; - display: block; - } - } - - .pagination { - display: block; - margin: -10px; - padding: 1em 0; - text-align: center; - width: 100%; - - .pager { - background: transparent; - border: 2px solid rgba(255, 255, 255, 0.5); - border-radius: 50%; - cursor: pointer; - display: inline-block; - height: 12px; - margin: 10px; - transition: background-color 0.3s, border-color 0.3s; - width: 12px; - - &.pagerActive { - background: rgba(255, 255, 255, 0.5); - border-width: 4px; - height: 8px; - width: 8px; - } - } - } -} diff --git a/website-old/_sass/_syntax-highlighting.scss b/website-old/_sass/_syntax-highlighting.scss deleted file mode 100644 index 253187d80043..000000000000 --- a/website-old/_sass/_syntax-highlighting.scss +++ /dev/null @@ -1,127 +0,0 @@ -.rougeHighlight { background-color: $code-bg; color: #4153d9 } -.rougeHighlight .c { color: #586e75 } /* Comment */ -.rougeHighlight .err { color: #606e6e } /* Error */ -.rougeHighlight .g { color: #606e6e } /* Generic */ -.rougeHighlight .k { color: #2a5547 } /* Keyword */ -.rougeHighlight .l { color: #606e6e } /* Literal */ -.rougeHighlight .n { color: #606e6e } /* Name */ -.rougeHighlight .o { color: #2a5547 } /* Operator */ -.rougeHighlight .x { color: #c0392b } /* Other */ -.rougeHighlight .p { color: #606e6e } /* Punctuation */ -.rougeHighlight .cm { color: #586e75 } /* Comment.Multiline */ -.rougeHighlight .cp { color: #2a5547 } /* Comment.Preproc */ -.rougeHighlight .c1 { color: #008000; } /* Comment.Single */ -.rougeHighlight .cs { color: #2a5547 } /* Comment.Special */ -.rougeHighlight .gd { color: #1d706a } /* Generic.Deleted */ -.rougeHighlight .ge { color: #606e6e; font-style: italic } /* Generic.Emph */ -.rougeHighlight .gr { color: #d50000 } /* Generic.Error */ -.rougeHighlight .gh { color: #c0392b } /* Generic.Heading */ -.rougeHighlight .gi { color: #2a5547 } /* Generic.Inserted */ -.rougeHighlight .go { color: #606e6e } /* Generic.Output */ -.rougeHighlight .gp { color: #606e6e } /* Generic.Prompt */ -.rougeHighlight .gs { color: #606e6e; font-weight: bold } /* Generic.Strong */ -.rougeHighlight .gu { color: #c0392b } /* Generic.Subheading */ -.rougeHighlight .gt { color: #606e6e } /* Generic.Traceback */ -.rougeHighlight .kc { color: #c0392b } /* Keyword.Constant */ -.rougeHighlight .kd { color: #1460aa } /* Keyword.Declaration */ -.rougeHighlight .kn { color: #2a5547 } /* Keyword.Namespace */ -.rougeHighlight .kp { color: #2a5547 } /* Keyword.Pseudo */ -.rougeHighlight .kr { color: #1460aa } /* Keyword.Reserved */ -.rougeHighlight .kt { color: #d50000 } /* Keyword.Type */ -.rougeHighlight .ld { color: #606e6e } /* Literal.Date */ -.rougeHighlight .m { color: #1d706a } /* Literal.Number */ -.rougeHighlight .s { color: #1d706a } /* Literal.String */ -.rougeHighlight .na { color: #606e6e } /* Name.Attribute */ -.rougeHighlight .nb { color: #8d6708 } /* Name.Builtin */ -.rougeHighlight .nc { color: #1460aa } /* Name.Class */ -.rougeHighlight .no { color: #c0392b } /* Name.Constant */ -.rougeHighlight .nd { color: #1460aa } /* Name.Decorator */ -.rougeHighlight .ni { color: #c0392b } /* Name.Entity */ -.rougeHighlight .ne { color: #c0392b } /* Name.Exception */ -.rougeHighlight .nf { color: #1460aa } /* Name.Function */ -.rougeHighlight .nl { color: #606e6e } /* Name.Label */ -.rougeHighlight .nn { color: #606e6e } /* Name.Namespace */ -.rougeHighlight .nx { color: #606e6e } /* Name.Other */ -.rougeHighlight .py { color: #606e6e } /* Name.Property */ -.rougeHighlight .nt { color: #1460aa } /* Name.Tag */ -.rougeHighlight .nv { color: #1460aa } /* Name.Variable */ -.rougeHighlight .ow { color: #2a5547 } /* Operator.Word */ -.rougeHighlight .w { color: #606e6e } /* Text.Whitespace */ -.rougeHighlight .mf { color: #1d706a } /* Literal.Number.Float */ -.rougeHighlight .mh { color: #1d706a } /* Literal.Number.Hex */ -.rougeHighlight .mi { color: #1d706a } /* Literal.Number.Integer */ -.rougeHighlight .mo { color: #1d706a } /* Literal.Number.Oct */ -.rougeHighlight .sb { color: #586e75 } /* Literal.String.Backtick */ -.rougeHighlight .sc { color: #1d706a } /* Literal.String.Char */ -.rougeHighlight .sd { color: #606e6e } /* Literal.String.Doc */ -.rougeHighlight .s2 { color: #1d706a } /* Literal.String.Double */ -.rougeHighlight .se { color: #c0392b } /* Literal.String.Escape */ -.rougeHighlight .sh { color: #606e6e } /* Literal.String.Heredoc */ -.rougeHighlight .si { color: #1d706a } /* Literal.String.Interpol */ -.rougeHighlight .sx { color: #1d706a } /* Literal.String.Other */ -.rougeHighlight .sr { color: #d50000 } /* Literal.String.Regex */ -.rougeHighlight .s1 { color: #1d706a } /* Literal.String.Single */ -.rougeHighlight .ss { color: #1d706a } /* Literal.String.Symbol */ -.rougeHighlight .bp { color: #1460aa } /* Name.Builtin.Pseudo */ -.rougeHighlight .vc { color: #1460aa } /* Name.Variable.Class */ -.rougeHighlight .vg { color: #1460aa } /* Name.Variable.Global */ -.rougeHighlight .vi { color: #1460aa } /* Name.Variable.Instance */ -.rougeHighlight .il { color: #1d706a } /* Literal.Number.Integer.Long */ - -.highlighter-rouge { - color: #ab2626; - font: 12px/1.5em Hack, monospace; - max-width: 100%; - - .rougeHighlight { - border-radius: 3px; - margin: 20px 0; - padding: 0px; - -webkit-overflow-scrolling: touch; - - table { - background: none; - border: none; - - tbody { - tr { - background: none; - display: flex; - flex-flow: row nowrap; - - td { - display: block; - flex: 1 1; - - &.gutter { - display: none; /* Remove if you want a gutter with line nums */ - border-right: 1px solid lighten(black, 10%); - color: lighten(black, 15%); - margin-right: 10px; - max-width: 40px; - padding-right: 10px; - - pre { - max-width: 20px; - } - } - } - } - } - } - } -} - -p > .highlighter-rouge, -li > .highlighter-rouge, -a > .highlighter-rouge { - font-size: 16px; - font-weight: 400; - line-height: inherit; -} - -a:hover { - .highlighter-rouge { - color: white; - } -} diff --git a/website-old/blog/all.html b/website-old/blog/all.html deleted file mode 100644 index bac8eccedf80..000000000000 --- a/website-old/blog/all.html +++ /dev/null @@ -1,20 +0,0 @@ ---- -id: all -layout: blog -category: blog ---- - -
-
-

All Posts

- {% for post in site.posts %} - {% assign author = site.data.authors[post.author] %} -

- - {{ post.title }} - - on {{ post.date | date: "%B %e, %Y" }} by {{ author.display_name }} -

- {% endfor %} -
-
diff --git a/website-old/blog/index.html b/website-old/blog/index.html deleted file mode 100644 index 9f6b25d03cdf..000000000000 --- a/website-old/blog/index.html +++ /dev/null @@ -1,12 +0,0 @@ ---- -id: blog -title: Blog -layout: blog -category: blog ---- - -
- {% for page in site.posts %} - {% include post.html truncate=true %} - {% endfor %} -
diff --git a/website-old/css/main.scss b/website-old/css/main.scss deleted file mode 100644 index 28b70a282c4c..000000000000 --- a/website-old/css/main.scss +++ /dev/null @@ -1,57 +0,0 @@ ---- -# Only the main Sass file needs front matter (the dashes are enough) ---- -@charset "utf-8"; - - - -// Our variables -$base-font-family: "Segoe UI", Helvetica, sans-serif; -$header-font-family: "Gotham Rounded A", "Gotham Rounded B", 'Helvetica Neue', Arial, sans-serif; -$base-font-size: 16px; -$small-font-size: $base-font-size * 0.875; -$base-line-height: 1.4em; - -$spacing-unit: 12px; - -$text: {{ site.color.bodytext }}; -$header-text: {{ site.color.headertext }}; -$primary-bg: {{ site.color.primary }}; -$secondary-bg: {{ site.color.secondary }}; -$light-color: {{ site.color.light }}; -$light-text-color: {{ site.color.lighttext }}; -$nav-bg: {{ site.color.nav }}; -$nav-text: {{ site.color.navtext }}; -$footer-bg: #1F242A; -$link-color: {{ site.color.link }}; -$code-bg: #f0f0f0; - -$header-height: 34px; -$header-ptop: 10px; -$header-pbot: 8px; - -// Width of the content area -$content-width: 900px; - -// Using media queries with like this: -// @include media-query($on-palm) { -// .wrapper { -// padding-right: $spacing-unit / 2; -// padding-left: $spacing-unit / 2; -// } -// } -@mixin media-query($device) { - @media screen and (max-width: $device) { - @content; - } -} - - - -// Import partials from `sass_dir` (defaults to `_sass`) -@import - "reset", - "base", - "slideshow", - "syntax-highlighting" -; diff --git a/website-old/feed.xml b/website-old/feed.xml deleted file mode 100644 index a6628bd842af..000000000000 --- a/website-old/feed.xml +++ /dev/null @@ -1,30 +0,0 @@ ---- -layout: null ---- - - - - {{ site.title | xml_escape }} - {{ site.description | xml_escape }} - {{ site.url }}{{ site.baseurl }}/ - - {{ site.time | date_to_rfc822 }} - {{ site.time | date_to_rfc822 }} - Jekyll v{{ jekyll.version }} - {% for post in site.posts limit:10 %} - - {{ post.title | xml_escape }} - {{ post.content | xml_escape }} - {{ post.date | date_to_rfc822 }} - {{ post.url | prepend: site.baseurl | prepend: site.url }} - {{ post.url | prepend: site.baseurl | prepend: site.url }} - {% for tag in post.tags %} - {{ tag | xml_escape }} - {% endfor %} - {% for cat in post.categories %} - {{ cat | xml_escape }} - {% endfor %} - - {% endfor %} - - diff --git a/website-old/index.markdown b/website-old/index.markdown deleted file mode 100644 index 96e880a3923f..000000000000 --- a/website-old/index.markdown +++ /dev/null @@ -1,38 +0,0 @@ ---- -title: Watchman | A file watching service -layout: home -permalink: index.html ---- - -Watchman exists to watch files and record when they change. It can -also trigger actions (such as rebuilding assets) when matching files change. - -### Concepts - - * Watchman can recursively watch one or more directory trees - (we call them *roots*). - * Watchman does not follow symlinks. It knows they exist, but they show up - the same as any other file in its reporting. - * Watchman waits for a *root* to settle down before it will start - to trigger notifications or command execution. - * Watchman is conservative, preferring to err on the side of caution; - it considers files to be freshly changed when you start to - watch them or when it is unsure. - * You can query a root for file changes since you last checked, or the - current state of the tree - * You can subscribe to file changes that occur in a root - -### Quickstart - -These two lines establish a watch on a source directory and then set up a -trigger named `buildme` that will run a tool named `minify-css` whenever a CSS -file is changed. The tool will be passed a list of the changed filenames. - -~~~bash -$ watchman watch ~/src -# the single quotes around '*.css' are important! -$ watchman -- trigger ~/src buildme '*.css' -- minify-css -~~~ - -The output for buildme will land in the Watchman log file unless you send it -somewhere else. diff --git a/website-old/publish.sh b/website-old/publish.sh deleted file mode 100755 index 2c2b0e056d26..000000000000 --- a/website-old/publish.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -# stop running if any of these steps fail -set -e -WATCHMAN=$(hg root)/fbcode/watchman - -if test ! -d /tmp/watchman-gh-pages ; then - git clone -b gh-pages git@github.com:facebook/watchman.git /tmp/watchman-gh-pages -fi -cd /tmp/watchman-gh-pages - -git checkout -- . -git clean -dfx -git fetch -git rebase origin/gh-pages -cd "$WATCHMAN/oss/website" -docker run --volume "$PWD:/srv/jekyll" --volume "/tmp/watchman-gh-pages:/tmp/jekyll-out" --rm jekyll/jekyll:3 jekyll build -d /tmp/jekyll-out - -cd /tmp/watchman-gh-pages -git add --all -git commit -m "update website" -git push origin gh-pages diff --git a/website-old/src/watchman/css/watchman.css b/website-old/src/watchman/css/watchman.css deleted file mode 100644 index 5e6a3b1bfcbf..000000000000 --- a/website-old/src/watchman/css/watchman.css +++ /dev/null @@ -1,979 +0,0 @@ -/** - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -html { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-family: proxima-nova, "Helvetica Neue", Helvetica, Arial, sans-serif; - font-weight: 300; - color: #484848; - line-height: 1.28; -} - -body { - background-color: #fefaf6; -} - -p { - margin: 0 0 10px; -} - -.subHeader { - font-size: 21px; - font-weight: 200; - line-height: 30px; - margin-bottom: 10px; -} - -em { - font-style: italic; -} - -h1, h2, h3, h4, h5, h6 { - margin: 10px 0; - font-family: inherit; - font-weight: bold; - line-height: 20px; - color: inherit; - text-rendering: optimizelegibility; -} - -h1 small, h2 small, h3 small, h4 small, h5 small, h6 small { - font-weight: normal; - color: #7b7b7b; -} - -h1, h2, h3 { - line-height: 40px; -} - -h1 { - font-size: 39px; -} - -h2 { - font-size: 31px; -} - -h3 { - font-size: 23px; -} - -h4 { - font-size: 17px; -} - -h5 { - font-size: 14px; -} - -h6 { - font-size: 11px; -} - -h1 small { - font-size: 24px; -} - -h2 small { - font-size: 18px; -} - -h3 small { - font-size: 16px; -} - -h4 small { - font-size: 14px; -} - -ul, ol { - margin: 0 0 10px 25px; - padding: 0; -} - -ul ul, ul ol, ol ol, ol ul { - margin-bottom: 0; -} - -li { - line-height: 20px; -} - -a { - color: #B7244E; - text-decoration: none; -} - -a:hover, a:focus { - color: #B7244E; - text-decoration: underline; -} - -a:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -.center { - text-align: center; -} - -html * { - color-profile: sRGB; - rendering-intent: auto; -} - -.prism { - white-space: pre-wrap; - font-family: 'source-code-pro', Menlo, 'Courier New', Consolas, monospace; - font-size: 13px; - line-height: 20px; - border-left: 4px solid #B7244E; - padding: 5px 10px; - margin-left: 20px; - background-color: rgba(183, 36, 78, 0.07); -} - -.prism + .prism { - margin-top: 10px; -} - -.token.keyword { - color: #1990B8; -} - -.token.string, .token.regex { - color: #2F9C0A; -} - -.token.boolean, .token.number { - color: #C92C2C; -} - -.token.comment { - color: #7D8B99; -} - -.side-by-side { - overflow: hidden; -} - -.side-by-side > div { - width: 460; - margin-left: 0; - float: left; -} - -* { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - border: none; - margin: 0; - padding: 0; -} - -html { - background: #f9f9f9; -} - -.left { - float: left; -} - -.right { - float: right; -} - -.container { - padding-top: 50px; - min-width: 960px; -} - -.wrap { - width: 960px; - margin-left: auto; - margin-right: auto; - padding-left: 20px; - padding-right: 20px; -} - -.skinnyWrap { - width: 690px; - margin-left: auto; - margin-right: auto; - padding-left: 20px; - padding-right: 20px; -} - -hr { - height: 0; - border-top: 1px solid #ccc; - border-bottom: 1px solid #eee; -} - -ul, li { - margin-left: 20px; -} - -h1 .anchor, h2 .anchor, h3 .anchor, h4 .anchor, h5 .anchor, h6 .anchor { - margin-top: -50px; - position: absolute; -} - -h1:hover .hash-link, h2:hover .hash-link, h3:hover .hash-link, h4:hover .hash-link, h5:hover .hash-link, h6:hover .hash-link { - visibility: visible; -} - -.hash-link { - color: #aaa; - visibility: hidden; -} - -.nav-main { - *zoom: 1; - background: #3B3738; - color: #fafafa; - position: fixed; - top: 0; - height: 50px; - box-shadow: 0 0 5px rgba(0, 0, 0, 0.5); - width: 100%; - z-index: 100; -} - -.nav-main:before, .nav-main:after { - content: " "; - display: table; -} - -.nav-main:after { - clear: both; -} - -.nav-main a { - color: #e9e9e9; - text-decoration: none; -} - -.nav-main .nav-site { - float: right; - margin: 0; -} - -.nav-main .nav-site li { - margin: 0; -} - -.nav-main .nav-site a { - padding: 0 8px; - text-transform: uppercase; - letter-spacing: 1px; - line-height: 50px; - display: inline-block; - height: 50px; - color: #aaa; -} - -.nav-main .nav-site a:hover { - color: #fafafa; -} - -.nav-main .nav-site a.active { - color: #fafafa; - border-bottom: 3px solid #B7244E; - background: #333; -} - -.nav-main .nav-home { - font-size: 24px; - line-height: 50px; -} - -.nav-home img { - vertical-align: -7px; - margin-right: 7px; - width: 25px; - height: 27px; -} - -.nav-main ul { - display: inline; -} - -.nav-main li { - display: inline; -} - -.hero { - background: #7D1935; - padding: 50px 0; - color: #FDF3E7; - font-weight: 300; -} - -.hero .text { - font-size: 64px; - text-align: center; -} - -.hero .minitext { - font-size: 16px; - text-align: center; - text-transform: uppercase; -} - -.hero strong { - font-weight: 400; -} - -.buttons-unit { - margin-top: 60px; - text-align: center; -} - -.buttons-unit a { - color: #FA6900; -} - -.buttons-unit .button { - font-size: 24px; - background: #C63D0F; - color: #fafafa; -} - -.buttons-unit .button:active { - background: #c5695c; -} - -.buttons-unit.downloads { - margin: 30px 0; -} - -.nav-docs { - color: #2d2d2d; - font-size: 14px; - float: left; - width: 210px; -} - -.nav-docs ul { - list-style: none; - margin: 0; -} - -.nav-docs ul ul { - margin-left: 20px; -} - -.nav-docs li { - margin: 0; -} - -.nav-docs h3 { - text-transform: uppercase; - font-size: 14px; -} - -.nav-docs a { - color: #666; - display: block; -} - -.nav-docs a:hover { - text-decoration: none; - color: #B7244E; -} - -.nav-docs a.active { - color: #B7244E; -} - -.nav-docs .nav-docs-section { - border-bottom: 1px solid #ccc; - border-top: 1px solid #eee; - padding: 12px 0; -} - -.nav-docs .nav-docs-section:first-child { - padding-top: 0; - border-top: 0; -} - -.nav-docs .nav-docs-section:last-child { - padding-bottom: 0; - border-bottom: 0; -} - -.nav-blog li { - margin-bottom: 5px; -} - -.home-section { - margin: 50px 0; -} - -.home-divider { - border-top-color: #bbb; - margin: 0 auto; - width: 400px; -} - -.marketing-row { - *zoom: 1; - margin: 50px 0; -} - -.marketing-row:before, .marketing-row:after { - content: " "; - display: table; -} - -.marketing-row:after { - clear: both; -} - -.marketing-col { - float: left; - margin-left: 40px; - width: 280px; -} - -.marketing-col h3 { - color: #2d2d2d; - font-size: 24px; - font-weight: normal; - text-transform: uppercase; -} - -.marketing-col p { - font-size: 16px; -} - -.marketing-col:first-child { - margin-left: 0; -} - -#examples h3, .home-presentation h3 { - color: #2d2d2d; - font-size: 24px; - font-weight: normal; - margin-bottom: 5px; -} - -#examples p { - margin: 0 0 25px 0; - max-width: 600px; -} - -#examples .example { - margin-top: 60px; -} - -#examples #todoExample { - font-size: 14px; -} - -#examples #todoExample ul { - list-style-type: square; - margin: 0 0 10px 0; -} - -#examples #todoExample input { - border: 1px solid #ccc; - font: 14px proxima-nova, "Helvetica Neue", Helvetica, Arial, sans-serif; - padding: 3px; - width: 150px; -} - -#examples #todoExample button { - font: 14px proxima-nova, "Helvetica Neue", Helvetica, Arial, sans-serif; - margin-left: 5px; - padding: 4px 10px; -} - -#examples #markdownExample textarea { - border: 1px solid #ccc; - font: 14px proxima-nova, "Helvetica Neue", Helvetica, Arial, sans-serif; - margin-bottom: 10px; - padding: 5px; -} - -.home-bottom-section { - margin-bottom: 100px; -} - -.docs-nextprev { - *zoom: 1; -} - -.docs-nextprev:before, .docs-nextprev:after { - content: " "; - display: table; -} - -.docs-nextprev:after { - clear: both; -} - -.docs-prev { - float: left; -} - -.docs-next { - float: right; -} - -footer { - font-size: 13px; - font-weight: 600; - padding-top: 36px; - padding-bottom: 18px; - overflow: auto; -} - -section.black content { - padding-bottom: 18px; -} - -.blogContent { - *zoom: 1; - padding-top: 20px; -} - -.blogContent:before, .blogContent:after { - content: " "; - display: table; -} - -.blogContent:after { - clear: both; -} - -.blogContent blockquote { - padding: 5px 15px; - margin: 20px 0; - background-color: #f8f5ec; - border-left: 5px solid #f7ebc6; -} - -.documentationContent { - *zoom: 1; - padding-top: 20px; -} - -.documentationContent:before, .documentationContent:after { - content: " "; - display: table; -} - -.documentationContent:after { - clear: both; -} - -.documentationContent .subHeader { - font-size: 24px; -} - -.documentationContent h2 { - margin-top: 30px; -} - -.documentationContent blockquote { - padding: 15px 30px 15px 15px; - margin: 20px 0; - background-color: rgba(204, 122, 111, 0.1); - border-left: 5px solid rgba(191, 87, 73, 0.2); -} - -.documentationContent blockquote h4 { - margin-top: 0; -} - -.documentationContent blockquote p { - margin-bottom: 0; -} - -.documentationContent blockquote p:first-child { - font-weight: bold; - font-size: 17.5px; - line-height: 20px; - margin-top: 0; - text-rendering: optimizelegibility; -} - -.documentationContent table { - border-spacing: 20px 0; - border-collapse: separate; -} - -.docs-prevnext { - padding-top: 40px; - padding-bottom: 40px; -} - -.button { - background: -webkit-linear-gradient( #9a9a9a, #646464); - background: linear-gradient( #9a9a9a, #646464); - border-radius: 4px; - padding: 8px 16px; - font-size: 18px; - font-weight: 400; - margin: 0 12px; - display: inline-block; - color: #fafafa; - text-decoration: none; - text-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - text-decoration: none; -} - -.button:hover { - text-decoration: none; -} - -.button:active { - box-shadow: none; -} - -.hero .button { - box-shadow: 1px 3px 3px rgba(0, 0, 0, 0.3); -} - -.button.blue { - background: -webkit-linear-gradient( #77a3d2, #4783c2); - background: linear-gradient( #77a3d2, #4783c2); -} - -.row { - padding-bottom: 4px; -} - -.row .span4 { - width: 33.33%; - display: table-cell; -} - -.row .span8 { - width: 66.66%; - display: table-cell; -} - -.row .span6 { - width: 50%; - display: table-cell; -} - -p { - margin: 10px 0; -} - -.highlight { - padding: 10px; - margin-bottom: 20px; -} - -figure { - text-align: center; -} - -.inner-content { - float: right; - width: 650px; -} - -.nosidebar .inner-content { - float: none; - margin: 0 auto; -} - -.post-list-item+.post-list-item { - margin-top: 60px; -} - -small code, li code, p code { - color: #555; - background-color: rgba(0, 0, 0, 0.04); - padding: 1px 3px; -} - -.playground { - *zoom: 1; -} - -.playground:before, .playground:after { - content: " "; - display: table; -} - -.playground:after { - clear: both; -} - -.playground-tab { - border-bottom: none !important; - border-radius: 3px 3px 0 0; - padding: 6px 8px; - font-size: 12px; - font-weight: bold; - color: #c2c0bc; - background-color: #f1ede4; - display: inline-block; - cursor: pointer; -} - -.playgroundCode, .playground-tab, .playgroundPreview { - border: 1px solid rgba(16, 16, 16, 0.1); -} - -.playground-tab-active { - color: #222; -} - -.playgroundCode { - border-radius: 0 3px 3px 3px; - float: left; - overflow: hidden; - width: 600px; -} - -.playgroundPreview { - background-color: white; - border-radius: 3px; - float: right; - padding: 15px 20px; - width: 280px; -} - -.playgroundError { - color: #c5695c; - font-size: 15px; -} - -.MarkdownEditor textarea { - width: 100%; - height: 100px; -} - -.hll { - background-color: #f7ebc6; - border-left: 5px solid #f7d87c; - display: block; - margin-left: -14px; - margin-right: -14px; - padding-left: 9px; -} - -.highlight .javascript .err { - background-color: transparent; - color: inherit; -} - -.highlight { - position: relative; - margin-bottom: 14px; - padding: 30px 14px 14px; - border: none; - border-radius: 0; - overflow: auto; -} - -.highlight pre { - padding: 0; - margin-top: 0; - margin-bottom: 0; - background-color: transparent; - border: 0; -} - -.highlight pre code { - background: none; - font-size: inherit; - padding: 0; -} - -.highlight pre .lineno { - display: inline-block; - width: 22px; - padding-right: 5px; - margin-right: 10px; - color: #bebec5; - text-align: right; -} - -.highlight:after { - position: absolute; - top: 0; - right: 0; - left: 0; - padding: 3px 7px; - font-size: 12px; - font-weight: bold; - color: #c2c0bc; - background-color: #f1ede4; - content: "Code"; -} - -.downloadCenter { - text-align: center; - margin-top: 20px; - margin-bottom: 25px; -} - -.downloadSection:hover { - text-decoration: none !important; -} - -@media screen and (max-width: 960px) { - .nav-main { - position: static; - } - - .container { - padding-top: 0; - } -} - -.post { - margin-bottom: 30px; -} - -.pagination { - margin-bottom: 30px; - width: 100%; - overflow: hidden; -} - -.pagination .next { - float: right; -} - -div[data-twttr-id] iframe { - margin: 10px auto !important; -} - -.three-column { - *zoom: 1; -} - -.three-column:before, .three-column:after { - content: " "; - display: table; -} - -.three-column:after { - clear: both; -} - -.three-column>ul { - float: left; - margin-left: 30px; - width: 190px; -} - -.three-column > ul:first-child { - margin-left: 20px; -} - -.home-why { - margin-top: 25px; -} - -.home-why h3 { - text-align: center; -} - -.home-why .blurb { - margin-bottom: 20px; - text-align: center; -} - -.home-why .list { - margin: 0 auto; - max-width: 460px; -} - -.home-getting-started { - width: 500px; - margin: 20px auto 40px auto; -} - -.home-getting-started h3 { - text-align: center; -} - -#content { - display: none; -} - -@media only screen and (max-device-width : 1024px) { - #content { - display: inline; - } - - .container { - min-width: 0; - overflow: scroll; - } - .wrap { - width: auto; - } - .home-getting-started { - width: auto; - } - .inner-content { - width: auto; - float: none; - } - .marketing-col { - margin-left: 0; - float: none; - margin-bottom: 30px; - text-align: center; - } - .home-section, .marketing-row { - margin: 0; - } - .nav-main .nav-site a { - padding: 0 4px; - } - .nav-main .wrap { - padding: 0 2px 0 4px; - } - .home-divider { - display: none; - } - .hero { - padding: 10px 0 30px 0; - } - .prism { - padding: 4px 8px; - margin-left: -12px; - font-size: 11px; - } - .nav-docs .nav-docs-section { - border: none; - padding: 0; - } - .nav-docs h3 { - margin: 0; - } - .nav-docs { - float: none; - width: auto; - margin-top: -20px; - margin-bottom: 20px; - } - h1 { - font-size: 30px; - line-height: 30px; - } - ol { - margin: 0; - } -} diff --git a/website-old/src/watchman/img/favicon.png b/website-old/src/watchman/img/favicon.png deleted file mode 100644 index 32c26250cc975ad9117562de7d41d09fe0893933..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5087 zcmZ`*byO7Gwx1a~1e7irkPwBTL8Lo{0Ridm?vyTpL7IV~q`PF0?hu5J0clVWVdw^_ z5qQlKD;jIf+1I3AoSzEMbLFhScXm=EiKt{~XfiecD=##wCN?22FG*>vfs zAOPsg$J5hSx#|F3ifps-E%rj^IDQ2R+QYb05CA`YP_)yNB;i`rJ|Ey;X15WK9j9Vh zc7Hz00lht9dvntC^4gN`Y5Ks6wKx9isB-(b~wzlNua3UI+{n8VoAouLary5LHq*J?D6z<^U6 z0CFYw>|u9z=_Aj0iaPmJhg_ShjtPpphuD*TZOrGSkB zx~#lRO@4fwm;{cpzP%*-z1}P8@Ym=7S8hQs^-1)$uGV%sK~$W5N3?jjelo1CKT&&xyj`#|#i0EedT_!5eXt0LVSUVs(`Y1O@LIk?|3Zba&dRkZ%F#8|ml{mfwe${)=orpM0Nt!UGPmLG2 z67GN>aZE;8BvX}4RYICAJ4Z%uh#w#)1ARt;H6$08OqMErJ;`1{^CYsWP!1|_{>YoI z9p5DK<{jQ7SP=IX7#wv!3p8zUZvpTjY_UO%0bi+q?3=tlWiB3d@A8^zE0rWkOF#7* z{V{+m+N?hfUwQ-|Yf4ccpZ-K%Hd&t)c%RuRg{1^kseni(DWPvmR8H~Oz`~6!w8)~N z8m3*3HGr*I>RHTLs`AceS!L;|Q*R2}k_m)gN0eI5HkRpg)JXXf2;a|1-9kDK>j>K$xVOfB;@|mXh2kiJw9o6<@-=fe zVJJiB!__3F;U11;0z+)42vX)uFsn1G4jCQ(7XEG2{eD5M@Cr?DmKd^tL1RnK#=>WM>?RyojGx}9o?RkcpUGl-I!8}T70`N2V`er4$#ZF!(sDZSJ1nXQzWPIkI9;BzbT1@ifl%@Qx8l1K?=I&Ej@oN2r3oWO?7#t8iw z&48vuH+|B^?dLVW640hCg{8qdU`c0!n{B9d)Ut5BgX!;1&W!6Pu1{WPuw>X~05g)R z)OFovDQ5GkT&gr@cpcdtEgTmeF|&~BL{vG-FCUd>Cir{fXY6i6dt6}ajpL7jU5VW^ zIs{!e9W9+M9b9l&h!)|B7)78FTY?{v_J%~w*oJ7st!7i+jO@d49b2}h1ku9Ux`T4= zDan$r)e^N<6;1kf#Trc$ zsb{!pJf}R?S{Xc3Al49=nZJACjP7#Ay5Zi<_>1|(E#EQeM@!q+VJcIUbcuK9`J>Oq3+=_U*0?=DD)C1>O4Id_9{#-nyB` zXktIZt|8baEWuX9*29w|;wN~32uAm0j=Q3#8 zP=p!6z-1CtO!SmNtiGO=m!H3?#jfvvCtN>-2pDHJ?Js#YqbtWyb;)LZ1|Cly(larx zlKqY&@2^Cw*PWZS`Ju7r(>h`?sawNOw-QfGu55m$V8f%{M@`AY2TkIvRO(bHRn|e8 zGR@z7-kY6mTi;OTI=GTFd}gta;9`X_-fl!>$nVOF`fEhIrcsNyC&P0)V)=M;8)jQ$1kD| zx=JrfF@E2C@%_Gh-DyA5&$cu$U7W1@W>SkDKP@_K>3Fr@t!H86VNU9hWSxZMuXx|3 zTJNYdTfSSe8%~#m*zDR3YB|VT`nWvbv+5E$4NSxu!jpVR!O$5xatU>+m2nxe__9_r zfZ8kCZSS!QH4BwLP(DdPDMc%le(X>3nH8Iv7pV|Q7w%6?9d2Cr_~>@~?T1_tdG!ud zpt$V{`x&$7$@h;}Oh@^|;)?Aa?9A0mF z(&kyY+=cn63$M1T6EzVF&I|53h`CLid)SemX|^BYu+x0x(zWB>bep+e`?eb=cO>gXyVp`>RerH_QYYyO`Dp5}rk&3%YwMr=1HSB9(7z{qW z9^J$F>%(QnRCPg!AEwLBa&++6X=*Q9N_C~8Tl8k`!ez^Pdt=(q;i#-UexLUEM z5My=zF=c08^GY+LAW_QiHNnqQe|8t!&DG1OGYtQ8gOIyFC4sxLffoQkME++30f<~0 z005Zdprh}t|3dw_m75F1!rIN!2IBAHeuoAC#QmS&i7qzY7GQrDXIHQ1{t_&IBc9*M zf7CoI;J+c>P7*BoFQ8yKH%}X|5JV8d%OXh#27|>tt! z=jR9U6M(pR+VSv-ii+~^^7HWXbKfDjy#idlE&RD%y&nDJG__b_i4vsi%QD%e~%w>Sr0@%((aZN{aB=?GJb@95TWx ztNho*)d7a7!lR@62fSVus~8FN)LvSN7_b?)ubzAD`z516pz#>Rc{WPWcn?kz?W3zr z)jyXbG7#!3us(sE=>5gYC96Arnu)Kt)^I6M5CVDIUTS@KCc;!kWkib;q3id&8sQDbvzN%IvQv0S~J9bb;Vq|2rOBX(%0fd$vkxtQ!5O9wE%6v3# zU#J(lv>Pwt&6Qis_$J~Jx(1&3%1KV-i2sp}9I!W6BqwKvpjyRXZIT>KI|%SPnpinWFzReTO+@gE2jk7SfozQuuvx90OD0F!<6 zH^q}sKt$vLgL-4xQw< z6vsS%_IWDyB<*4Yh74n*LT6H|gfd5!Zy^Cs425v)`(|z)54CQlQ+uo6JKlAbeNoE>X4ZV0>ZUCrw z^O<@QGbS{wUTast-EchfrGFc_9X3S{CXO)(;iF`sSaQ>kwQmMM?^p9k6P4M{7}}7X zFNB`@k(P2i(^XYJ#MO@t61bd7-Ow&kWZxqSOCv0^g*|wrTB)|N;$5xg8_D>?+d4=% zim!f&$EdP*ju}w{)EPujy^E-%ZH9;~N>`43`tCXD-$vhqNe-!4tkiZdiD;KG&CPBB zKyyGkyouu>37fWAZq^P&kEZt*K1z^nA$~s7sm_10`#kEm&e1ydjf)ivWa}FEXwsT-ped6`fMAl3C#XVuubpRt54UioBgOGU zXcX1A6Y4Oe77;!Vj-{XlCxQ=3XRjMZSaw(H1d;&`p$5%@(!|K3@Q%l`|57`jo zPhfo!Xn7#hORJdqN21X^2aj4NN zxjb@fSw5{Lp2mf-L>9D1Rx8jW)*>ao-+T0KS9ZNR24R3t!zjr+XKWw`(w?{NHe4-CPINv59w7TYx7;43x(uU2qUSi$tlU zYGL0jk~ktHJK3XK`%!YbE32TW#XG^sV$eD3A9_ z1M*xy87afKe~kNcTF}a2;nocsR>sE_9Z?_&_}@8i+j0mPR=*{bCZtriF@@PT1Y-z! z5^W8CM5ZdfYb@^3r z$&_qw0#PLP8pGW@JTAxSU50V$!zw-y4|A4iA^~(hKpIhJ{>1_^bFI)08%gzGA_4?c zg8OAdSAUZZv^WbWet*3sC=*1wtpN$)QVqV29FT9>SutPJNldt1WMh1L307*1S{axZ y-R9Q|iFxn*zkH(?{zvjZIj0_oU$ZDAaM-vDuJ=6*aPCziC2-zf+^MF@BHv>eem%m;5{!F-y4oWfcV}7 zOW*+?L`4S%6ZxnTAu`BJ5=>#Th%647%3!hRtQABWg~|XaZlD{5M04ZPDO@^@`0)a8 zZ%VO*8!GVq=nH@20r427;DTUEN(wo}jf^Tcfm9BM15#)pjYh&PNUE)J3{sQis-@Em z0z?HXr3y@n%83R>NQ5S1JOEevAq1HsFz^$xT=g+gc*;OEqyVX83Mi8q;(Bkb!a|Y% z%lNFdDtxN~0YecLnyiHJdPtT|gYn$`y(5Dmu7(?=l;TB!5(OxnEJNg&zkmneU&vyq zn2XR@3>w6dki;yeh{R#iVG@VJqL3I=s)z-_95*_fG0pQiynyB_;4|4wI*sW=rTQ>9 zbQVh>pfM;EUlx_Y_nyZ3%T*X8hmmRDQr!1PEaPvnT)q;4FjN_iqKVU85FC$Us45;+ z5c&M~RVO+{N#$ZRMdfTL(}$=9h*G)*5&J4p8S#Cdxzf*Qps>X(2%$qHF-<}z!7yDy z;!q(riAiHf7#tddNi)R%0Wbbb{yy|6euBrLn3ltJW4WJ-`_r)fG#L2Hr_n;>_&h1`!I`DEuptmkT>S-J;p)4M z2c(JN5mv45YJZ}3>${4Ie8j77T6)e{w!_p|D7tyXk6>bwVPaIjyKc@gE1_Aa@qGCE zfmzi~jxHHqA*1Ggo?DzdgX4wS-Up=aW%{Yf2d!To#!6;Bc4)T9KQ~_f?)-S^h`w-- z&edD9&}*RWpIs#w5DDZfLp^o*9&O-Jmja*D_IscDF3iii65UZ8T{tCnOxpidoz99` zuZ}i)cRJXb%|FiQYi#O1VNE4=2~P&9vJwAVn4+b%R#p*J*#r}Uq5}N@m}LyV9!5j%JK!$C0T)LFoE0J9`pLu zyzTDV3j=p@wHoh;U6HQ#B#vdrXy?*oA7@>;5`G&aIodffyxxMwEP$2=ok}U4;orSt zc2zgJCA_~giK@?NSU$>D|2l7bpH5|;Zd;Z;QNP)KV@^Yy*7N>^JD{B!d3f0*S5v>4 z0#;eE)=XXpMl5B~e^xJYA7h8S%nNy3a4yZ795)PkdmDfATkLLH8X;{w0v^5LICt^J zD^ty}>VIt~4PFxG?kVa6hcj&`<2=_h;;Wvm^P?MTj0<(1IWU&CdDg+InkU8D>x3t@ zD|SBsA7;Oy7JGDS9}AHbcWcRsH>7LeXk}jZRo?_fpJvUS{{J58AwBG)vP2D$yZJ2> z+4s2~z6&lc>35uSaETyfm$j-(TUbysd3>VDMB}QM>$8Nq_zdfzD zYv@!mr@8lR(syCe=9a#DTtlXM^)Bq#8FPnvW}2SgwJme~^#SNk=c|IQgt7myMLJe5orE3tRq}bNj5KvbxeVDq-<_EuDRB88cFrU|R*TH{t44M0&J8%M6b@*I(Mbysz;vnX#OWzQ~*v)5`u3Nj7 zH*@evPh42k8po!qwfQCOLz6YnE{AQ1N-y8*z&dnsfvFvu#_hQt-ljFR zC-=ws0!|gng;&N2x~n0zp)9Pr8s&d6zuG~U?tCcIk-czVcl%Lyp^MAd&PH8F^}cSa zoBG@XeqdKfddIE7bFte@DuOEpe~$Pf=kB|ia|vCY!@|rQt-axA#ouSG;0N!G8UF*= CaKT*w diff --git a/website-old/static/logo.png b/website-old/static/logo.png deleted file mode 100644 index 89be4d710cc2b1938984bdacb403fc036bcb1b4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19086 zcmaI7by$>9^FNFTQVL56NG;v5bR)}xOLv!ahcrkDtAxbT-QBqek`ht^f`F9LQqtY; z?eqOUzxVy)cfDNKUhIAL%$zxM=A1M4%zPr%RbM^BeSwRHhW1PW4%0+KdsGB`3bCI6 zEtU%AF~C0xPdR;0Ems>)A9HtWG#M*b3u~}~v$?IcrnR}1-F;PMYDF(C1(xs?0~k14dzyoNot<1f#C#>`|HD@d`2Me%haUW&E}o8( z^#3E2zKS|n*45n_EXXayWyvcf3>FsUh6oA^3kY+9`FJ6MJiPoo{JdOz{9*#UVgh{N z|NWx}Msv5a5z~ap|L<79lO(;Jr>C13508(J54R6Lx2wA?4@6W{l!up(hmVg7=)vXT z=i+JZ%jM$1@LvuvYY$6zdpA#eR~PUZV9Z14a0wl0p0!o5A?4i zAdQ%syFIWd=1wqIOD|_@7f%J4Bt7s8x0St>m^GiUAfLIY4VRU$kOh~hkbotZD6cRt zmmmaUA#83b$}b=y_+LK%H+o?~d5Elth^zpgkQ@XeCkPdm<(1(V5fT;T7ZMg0=KC+L zf{TZzxr?Rsf5)~5#{OSg=>IRRn5?_Cxu>hUwyUetf2}~>&ehY^!_L(WEGzq;RR^=` z*}GV|`gpMYTc-b+HO$)G-rL$r-rdz1{2x7w+5cZ;;DuP4n_E~}a`A~+if}tYEfgEQAe5fn0xI{E^)>ppkb;^=9^Te>izeUR zyy?&CrULb$rGXx&$;rscX~P&9-n@3d-7nvS|MID7~4k6g%kjk)2$5 zoQh3H$RJx?JTK&6G!XpDxY~X(qu-2wt+w1j^k~V}=~PN(DnZ!q;LL&a$V{)YT8BfA zL!CpDBldy9X;i+JV>+d>THUB5WqbryAded!f{12B2{}+tijsL&iHWE41Q|F6=pZg?pS&2W!J*xW29Gpr^R^~e0se8kG zze}Xb0+pdJ+JF6V7Y!A*TKlU{s*=u&Ma}u4g{ixBh6=UqkXsh`oQw;4+jwoI{`e>@ zd$q?S&rq%Y(@KH}XH6YFw{mVpV3CllFSpzlU3?j5$SRFmZOi3LMDw3I-zNolSbZw1 z78n}W`py~i;TEs3h@b?K2z1z|Gu>U{;9@k)@P?KP0VWqvB|AP|J~%!vr1yN^;chxM z_AQK&>h;G16_oJQZ^A!{gt$aUbl8pimEKu~()FK0;g=mOPJ10C=M}tDS?b7$aH|2y zJmR(5R;q--&?pkKvW|lDhS^pP1n`>%vdRxJUv5E*uyu#Sp9Pekht7)#O1;L$j1&=m z)i;JCX0nH2@5@F-B+1?%JM-3bkEwq5mJra)*^>!3+lp)k?-~$Y%%hbx%W3(_z_Asu zAmJJasq&{c-eIj@s;D#30!Bs8(%B+Izt4$M+IA+!B`U{R$9<-Eqq4_U|Cm%$l(P@i zR{4v}>{O!EJEBeuD<3TPLIN$8NW9dlb6!RBt+hQ=IV3NQ&Oxicrt!iDvhd=c;Nve_ z&M_^>W?%^n(B?#diDjK&KLst!zy5r0{{ zNh4^d#)zIQsw3gAXZ8M8<6Dj74mv7BG5oD1^Ut*c;*-D9<%0=>Lva@((qvz$J9+U& zry!E|`hS1;z?-dRUH~S12+4}Yu^{^-kcbBa2^;4J7B7~1I!EV5{{H7t zBC^b1S?#0Aqg9c8d|;Muo7CT`J2%hUw|_u5z1FLL%b!2utcH(;8JYIjU~kasL2i$J zrBjp+Ro^xL%Hq`@uXQ(o%H#FT3Q7INQ2fx?Bs*g2**f=K_sxe;SXO@KJeGy9xMj8| zbcev3h)5hy_Uc<9IQ}|pnrbW(snj>gh7h31>Y&%Ankc*R5MhN|jl6!luY9#6s(~Ah z0KJ-f^*0Yo0N09w3s}bY)KkAT-tu*3Fd)*5F7pk*!w%2>jX(GhLgtB@_i^YDr9!mG zbJQ1fmV6cS5_QRy9j4)RyZBAtaH))P0!yq(A%f};lEhV zz5U4m&9FKBEf$j9!!=)d1@&Db!cD+pth~$Q;DVwnS=g?bpuDN@aW&Ot$hY4*2;*H8 z;NXabM+P=~QiX?xk_dq0qom|GZ)D-Vvxing3l%PI!jg#mU%RY85fTLK0~HG5aPhH29LfsM z31$6kG{ubbX$w1&JvHK2ev0G>&^jT&4SOJRnII(cI@h^TBp-yy9HXt1m_J;y;$zY= zsw$z_EOHr$aT7SGc)Wiqq&(0eoN(Ro3GHtXhsKeiR%wpYrq6G96G2diHO~4v0 zGSO$cVru2Tm?e1Vfz{W>e>GQUB1%HSSZYUTwtX8TD}!CmvQQaVFq0}PBjdm+!g9^o zIZ1~=en6I`l+xmPDR}y0kcIH%+B-(NK85d* z=WonE+2LwZi@y51S~f?83ypXLdMB*G^%3AYPo+2TYsU(hLmwDk@ruY<3*c(6Rag2E zxlh=0X9A57KUL4HXnqE$z3GTtg3)`DgAUO$L}Ni_v)2vG!Q63Q0fi?*icLrJ4*uJ| zC*n68kEp;nM@u~H;xS#H<@|sg+oXwIAv@gO!Sekt8XUU&{Fqr=MH5!|1W{q?lDX$Um3LClhbHyx<_a_7QeL?B11`3 zA^wWa;7w6FMsQQ?M@_4Og90!d?iu)UPhiXy3h%b#@Rkd2CMj|Y!F~FTpB{mcjPKz3 zF|ZjXgUkD~?2dMmpN?@kZ}%@_{aX$VB>Lc$!zT|KVkopH$e}hO`!iGq7lgeVq^{4J z3?kyj*Lq7|HQvmNOQcIUC}@F)1BH`Q6bL1Rt_Oo?A_H}WI_VLJ^bsb+=9)PXBP_3- zi7*02hXBxmSr9O+EQS>cduiN+2W~}zF*PW>uluMEhNH0RM2@j- zWvpj9WXj*duVQ%Z9q_TVvAWa5Q z2OcG~Fse{yc$vlp!I&^W%bCp>B6twW2p8`&(Rcy@K?hU57)l3F7Qiki9AwVH)(7(`ekJ2kep2u6VP z?5n+nF}H)k%=d3rbgAhOzF*QEUTGqoYKXmqnGhfzKm7nC?=A}Ll^k-m3q~M8lQMhP ztawC0=L{C9uUHVERW3LD^N0#?cC9zsCK?^$GBl|raXFpa_bkk);@8(*HEg<0i(ph^ zAu}Ar(98f(Jgm%}%;Cw*4=77i!!I(|MTqjlq}UyyM+#(-H&erOq)oeS@Y(VJ_gQj4cuBbIs`_F(zGF_ z2@;9%mcEt=c+PM_1!I{Y)k8yLF0knsFY_ud&Sgl8!ltheUl2jztZ?GCdf9IzOyBdkM3=a$cid7m&&U^v0)n2@_|7Da{8k@s&+u)F0JOb4@QV6oc#3+wYV3 z*T*00l!29nz2E&!y>R_Ue(M8-V4FRP5NL`T(bne6_UC_v0h3nO3KaeL^8@02QWE3P zNQ{EFZi1C9vx1F{G9P~eBbT5;f+t04PD+!x>*uQW`D+h#Qw^?Uooid`YeP0oePbp} z%;|>CIz`-%6-8w&8DUC2FueNS?pIgx$fW$9pjV6`FZI1=x#h%Ma@narDJ3^MYZj?g zTG_YiG{ooX>1%W0rDzZK^phUn6yRQY1+{*=LK)*~*J0zZ>Xm8nUH_`DrtFw^Xaa9z zeR*p<>PsNK-5ucw8VK z^e9^@$CN%dz<@q?oE0@zhJn|A9=2U1l`QZ15t{g0x$3u2v2&$c}m#v_h=Fo~2 z=Mzs@dN}j>xITIjwZ7@Mk@d9CQMbam(o{2jmnNZ8BW3n18v6|?>?`$eey!_^(FE0n zQh9&Q>$9M`CQsfKWO)tZ6ic6bjgfhRoc4zyM3n5l$8WDqA)4UNg=Jw!x5E^WI zVsi%46Fx=hG-U3GZ{*o0Y4c!gBlqWvC4HYc1buDlNjgc9?UZWm9uJ-3g;dUXC2R+S zzV}HPh--D__@E`;QGmvWB$9^;!(Gu z-vz@HDfQ?VjPhuA$24x5$nQC~ksktZqBK1z+@Y~qf`haR9=>@&hxYXWCxPh)Z}IZo zucSq#dPpj&pNo1O$j{%u?Reetw~9rdi#3^yp!M$lKgZ;kMWs`K(bgtw%;x+toS^f zI22LWfr`1)Bq=^j%;Iz(TW02S3-MX-I3d#+G&&$NpdmyD^}vWtiqAz^wYYDMh{vTz zMj3t%HjPs-t3oRHH!CIoAi&x5F=f9MHKLvb;*TXca-VbCJ^K9}mTku0#qsP;pMljP zj@w>W2ajhw)6}m~Jtr6i_UuukB4ap=ohMYqCTeh2^WIU?OzOd$f1fMLs;4S3Pg!fX zSOiTMC{|D5jd37p2d_M8_1etYNh4?KjuPzB2-VhMTC;#` zVni0eY6o$0{Omj0k9FfoNZh@0d_$;$wVQ2a7>Sw5w$E6t2uhG{SE7EZ9|>oToNWp* zwl{?FYQIk(z)Phm)qAOiT)@B4SEol&hnnKN!Yq z5|3)hj-l$&4)i6uzgT4^AC_x?li(p}0X0hf;7L-v{0?55`9ZJ{g!y_R#ChsO)x#{U zF7TqlU#ZMnhE;w!)KT}(c(z&RbepA-o{%mwXexCKd!?9Fj?xK>?$e;kS5;1RjwG+$ zR>7a@arWQQT$_(+f^4#NK19HbqPcj?b~8`%V~AbFx_mXv~eHyFE#Z?p`p!c|Mv*8M7)*JjO|L`QRaaxGv_m=N#;E z1dgg+sM&5fi7lTDS|G7+RB2eZ>StsTx48>6@Iy_9q9=bL<0`Ks^6a|G*A6mTRwE$r zQ+|vb@CDFL_v6_>*Jiyc!xprZ9VN))9sOzB-aH^;@??ryAx zHe^qXZ~StDbSwlP-zLzw+4XNJk`^A^v&-YC>dL%W0?CM>o!ELvrxlP$Az%C5Z|^%z zsN7WbIbesM69l1C?66QLGL+`7|MeTuTS_q`wDV=XiA)poW6kp0Ioi+WkrbVAahB;} zl7DCqJWFX_pw*HQ>k^WgHzrQ$ZN7Xd!&MpYNJUoM_fjKiv4527^FWT7?fW-3qYO~$ z&aP}HW_ssb$w{soixS))NzmPC0&Sg0iKA8j%G(4Zt_{MopY8Sy?IQWz^M4rk-yEf@ zv;()q<)3?Z51L7n)MUnqHToQbyFd?Gv zunpG83>Q!~yZ?bCfU6BX2#kC*s5Fy3tGLIgp{U6=Lu}15ERI$>Uhldz@J9^>e~Y^^8qL%UiK2N7`-09>*Db7K)+;itX(1s@TZT1HRNFVK zN)rin4eQlmj}vsSYTl(42wmwA0ac6ZhecnMxYtvS(Yy4c=pIK-vMiSp?1snBUc|>W z71V?xbQ`%SPksO!?QtbzRf;md|2KcXBf($^yr)UV6i%1zTX%7Ly;ldD zzQH2F`s2zJ-&vHrce9>nI7ZkYfP?UQH5!wY=7ZTv>?eW0f2NPmE|iPT-jn}o{5nkQ z8Iq}utf~D7em0W|iB&OlKxQP}d;Ad;W=19EEJSL<}yd1VW5k6(Pd&hQkXjJ_EkYlsShZDya8_cK22_ zqSpfBaQUmb_jC%zHhj3bK|0${Q-|}v81b(ySx5&Pq}vyup=dG@V7LaR zsD!0q}%h`rd<&#%g9(FxLeYQnt-J;zS=Y7jK8A`(hWkd&uMq6Feaim(+9Z&My^;_jcB# z5A0~$Pq3NJ?@fNm(8NyQeLS-(aS1(;33#F{C%k>;+UV6#HCme>t;=V|)@^~Yd>f!w z8D12M(VyY$zP!aok(0)a!LxX^Y?ywWFYHI(_L{Q6wV70MQ_w8ftT`W_a%UN}AY|Ze zm%DSd=^p?X%k~+xyzJ1X-mUvLh5L#0H!O)oe)gr|xdQTZLIyJS%Ee+KCy!78m{|_L zWQfQQa_{_;1qBT7{pqAL!x^P6d}8<^%iH30KX#R-W4)+MMnk!UM$+xGF@pV0 zbB;pk-jAv^B4kj^W8&DcbI*X_%kpoZMJWwqURY;*pR_!D^Ba%2hT%AE@j0{b3#p#B z!P{r(1`QG~HWleWg%}IvTxBZAlr1GkVd)q)4ga%hsNZ3^TW!W-L=mO;3HxqUA6MPR z`_Nh!ZS+~92S2-Nox>>{LzHs!&ej*p!;JXC?wSKxms%jS28|Z)1-iy+ksBNw)nW#!4N9c~L!*)Jn|1i+(T)9bTH#{K-yB^` zxbU90`IsX5hXOw}Ax(VFg~~|@{_e_G)&D8c0_)j*t>nI_DqUGK+d{O3{P*@xu~u7;HL)-SZpxERUzF+!ilD48+ti zlFu1J@J@YILOnl|mwkV!;f{ZL1o0aTUi;;^UQMt#%Cj>|H;qbpk{KF6jXiN8?f0o8 z%-=J2oD=nj*|7Xz_Di67&s}^<3L}4)$9Q44Hyx3^27#-vtWneKbLW&)PU&0Y{fbX& zkP0&W$ln@?V3P`-?Dl)WyXy)K3!=haQ(wf0Q2)I44t1Q3rSrM|Zg$A}0Ij;Awj(eG zRjjp_xH&aEt+T_GJScpfj@Z1kF!vf!^jfnihzRQzTG%6mOla@Wk}ej7jc)jj&V<7R$o z2L%DbTUxZC*irgmJ9WnBO1s$l-i)h_kiCO#=~kUtZ>ecG@t|$VblZJb(1!BWYQW*g z^e+a;3?c^3LG|mASEt%HR$<{JwdNOQx4(IEkvT*(iuT9L&Ro%Zjnd+s-3}ptHlF?L ze=i%j7|{FBXxMq({4KEp^VuUz$9RPJO{)9Qu(ErxDXl}_=zZ&AqH#{Y630f&MHG{4 zhpg5KwLMXAS*d_e=L5qbaPm4&+ee3xzq5B(asd_DekJq#Zf3UeNsYoK4A z2Zy|`9FOXuw?)B}hN;W9*_%Si-e*3w@#D5hiheH(L+J1$1~V%!(Em7PI)B5}l9x|V z_9}T~)S-~YVQtkH{r02TYorBbIy4{UY(NFtexqlM|Q*9?dAOw zrlCxKFQjn4U+YKT7fIvDIBZ@}LU0SLc0k171bmL3+q3%!fr=_m7aV+7Z0qA+6=KU+ z>XX>sR<)e1*XXt#+wIH{Gv8F&Kn?m$v&P9|?6~c{0Cj?j1_sD1ffrAlB>hMlIcDAq z|F&)%%~`o2Z3WQsz+ev_R`X%JF;4#7*@at5WI3K4wX~l@JXN4?im{)I=~m}b?a4^> z$yk))O};Y}+d_d}EzZnU@a_a1re*5ieDag~Wwq#hAF7O=4!#%0C)3NSSmK|7*0M7z zjZewye0rSu9{Tr$hD0gwq=TMA?-|aNIlB4vp~ay?frvAG@hWQQea)u1Of}G}M7MwAa>CGEDAYfYQCg|B!91eOlY^?u;k^A?;@`U{;U44F3FHU9 zv{GDqrmvQmj~0!8`BM>Ji2JO6i^nPP5NU|z=bk}QjQ14QVP(TOv>`^JLiHUzDJcEi zFA_v#^PO+)bmYD+)KJ-Nv|ojb=PQCdoi*~g8w6eV83aSH3Hy3o*;CZhe>#3v)q`D+ zPMkyGL(XI$+(c|Kt+w5S6_4x{%V|0+vv`DK<4fsramBnc22Bo2nK5K6pT3BsaCDNH z4qn~MD|*MRX!Hr5q7^#|VU{l(sA~M2Ks2cz6&0pMO1ZKe(Op?q)_m|5|KE z>RKcEYnLhc6G#HWGAY3=nN{%*%sw+^h|eyB0s_@070V`CC7J%RI|(L`ZXB!72w!(E zl}Vjh*VhbV_^G}>ltg}2J_%#6PX-m0n14>cWmXh#QcE6?Pn#osHiuv=(g648m$ev< zQLhG|h#9L(w|+Eq{vM>eu^sHn(5BjF8FLI2z>+v8P{lRQIfU6V94acQ?}FGGJ$-O&<4(9_x8=&_xqJugmQN`66HC{An4p(Vxn=f`{G6J%G7;{Mwn zWprogx>TkH6yhKu3Mx7+3ouG7u&RLXJbN%x=k-sNv(qxZ_%UU}q#QO2-2YuHhyY|`xxzS$ee{s>SaI1v3RfP^79 zo@hfM@^NpHRs4zCg<9TZ`cOmx}u;1XVpCu>j+yI)qIJzw}i?zbmbeVef#ZjZjD&UR9J5Do= zAr=fen#Bh@OY_f40{wO)FOe2hPYz%>iASO)#npzg5c)ojxu2qSnFUOWul zxr+=6cJmj#=(F2mQ;D7`nI~_mfhRm<8_C6di)K_6T2+50QeW`Ap_`23U9&kIAh|~k*(j95_!fCn0Ha&so1 z%*Z0?sj&%!eD+%`0W>ZtrlkIiUrL+etD7w9-S9Ml1jPFO?x*9u&5w1g zq_2*j0vC1C@?~K|HI{7OO(F7$y6M;nYJSVZt;E>ljn-1|7%Z+NBAc!HeRvb|KWiqB z5eCA@e+dm{Hb>#ML~L|1)*-(yO8T&=?NlNrhwd5*-TmA=wb2Rex%$iA+@73I^W9O3 z3#~JTv#770be{UZ<1`q1PKppf0B;-BS<=LL`_wy2&VT1bRXhemSHZk*su74nB3SmuW z$2{$>=CWFH*@j}5Q^E^H)~xu;NqQenqyb&5>qcp=NfeQiFxd97e);E2kg=qRMz`P1 z|8bvvmmV+)YQRKFy%WGCzFl&z+-Rf_wEdPwQk>Ysp*TVu+LUCmo<+{|vLBN;aq{{q zRWSKJaJDlPIp1>nSHhCufTPBY$tSig4RmKYI^w~y77tup%!X;+^pyV@rE#z+2D^$~H6IyrE@um=^7~zIJ+S*Gfa5 z!id4WG5m`h;0^YwNIyCL0%4e9Ket{c%P=l71 z0@DX-7>*!&_HVJL`K$)7Ue)^yG=CMw9sP8iNX|qqUf->++y_C#g&2bjEeCJ-b;wjDm=~`1%gdGX zm?qY?dK=e)>o_`cVhgfsbrtn>0}Z%_gF0mC6lYXT3M~IZQQ4u~@?}oT0>UxIKkOii zXcwQGstiAvYy~unbc!n?JC1epIgK@eT;rot2wy!lKC?1+0#?qqREKbO2$SK6NJpSg zf2-e&!P$Cwzf5Nmp3ph+xn}e|Zo+S=+r>GHtuz6UC~>!VfV-8_oQLoq_V~lF*K}GI zrxo0P)n7HtuQY^|NHB4_$B78kZG)3>2-protu&)c0$ob@v0yH5yA36W9UkDfEZW_6r6;drd_`w<$UwOu^Pcr^xWuAR2b zIqMJH_UtS))W5&EP+1)ONX~gZWj7%)hifeM<@;jL$~1cAe3ZR%G6h~4tFv2#W+*#c z=6NB8$7bpX{~BIVgJv{_rEyv1V2K~ZFF^USr-xusxVHgFW{vc*$?-XQr^B+>t?HlC zmFzV8jRFy$^{yv3GkA&+wzcr-XE*$Om_0pml>tFd?Dun7oJTK2E1A@^u~t zeB`j8pqWkMdb3!ixS?SFY}4Rzx?W;9LVWIGqo|ir9_PFI-tU2v;(~^Ghi{t#1JvnU zL-mY)&hGiQorAQ5zPq>;RDoTc;Z}y{*KKmTW&5>V;bv)I*Z@sD7x0o>1=7*IuKcp} z+C=-AB-78?n_bBelU}I; z3u9aFPLC%{lvCm; zsw*=L#ePndn(h2573GxU^mj8rsB!9OvF*Cy?WVxhLbtJKMJmNae+st*gS1qhO4KAz zmyZ5L$ar_qMi&qr(MLA_NDTs9h{N9TjpKn~_U-!GbSxo>I_6eL`jJWb+EB0;=7N1` zZqn}X_`KJq00%l3klhb5(l^Hm0&UGn_RbH>cn4Re41Eoz!M{l5tUUdDQ}A@`S+Fbf z!Y5&mte73V3(0sMx&Hf(`w|#V;8Y!d!)))a(c{J``DsQtwyAWc#X2qMc`S}+OFpBX zlcPDR!`&;n%5d#I~j@@&As~_mQsL_b*z=nFSkql9}n}X%_At)an4%@V#}C;D!C!0-D;T0r^x;( zN-2)VEUr21 zIJ^suD$k~8`AjZ?7908d@?$v3MFPnFlPs`d`g$F!*N5^#zwPpL3ax!*nYH}sxof<= zFlSxk|5TrNv8-OfuCwViGpn3EKSq}n_X z+Y*c=YsHO2uK8;^?UPwFdENUZFf27*7$=_qGbm{A4Vvxqw`+HM5snJ(_ zJAGWq4gPo!6dq82gu#B3eh$b;+dW%pq+rs$Y+NuB8qNGVMLa4vzfH2Vi$gkhMmHph zSIZ(h&RVsE+5>v;F~33&?-! z7Ss&E#y^J`2A5rJ_Mf9DPe|iE0VhSZ=V?WDrikm=%cMF6VIbTK6r>re{5&UQm5;H! zIsd%6pXe+AUfv^!s^XKtPCQ3nUs^Vos_VMg6OfM`P8HsH!#v?$Y2_Gnv(mV9XV=+& z)hWEmCXy?=o~O``JDkrd2-N=aOtHh?Xk05BSIoYIxIZD8>(kG`PFza6p&9>#7~*Jl z&bE*%xauEy*=OTSlbG8sPC^j4)TBr1Vz-#Y#? zdJ}^H?=O2zOfsLbmXa+mV*Ri6bA6i zb*18e3V3JM*XMCgdFcu9-+SD94LES13r3|86`y>lPV&Qxjv}Jp&8XCIRzN=am|X>f z;DXCYVxv}=Wh@{P7`2WoS4^6tuFKzCZz+G{5O$waHE%12F2CP2Wkc#XvNHsBJZ4wa z0t#Y2*Y3nPDIk&IryTvPEiEWMx%6~07T+%0IOClAz{YCDS&b*z?*>%Z51V#iZ_iBQ zr1=(n6B_j*+k+VY=lz}0uD~-9ck;}Lq^O1UE}w^sP5z7Zg0tp&k>xjOa`h^rf+maP zi%RXuWJ6`6p6mS05mVFfPc^8xl*J&j278rv)Qe$eu+%L1@T<2$l4{#Jfx#aq zx$tToq^=V?JeZw2X*vA}bMLe`PD`2sCyRwj1#%o(+sT#OfE(Z8E&O)yw`K0rq2cHu zVd*5rEvk03M{YgmLIrF7}N0Mx);jX6$%>N{0GXPAhgM=hp24jRp-X zLMkYEcG&$_R&iU892z$jvCBe!1&qH)KTp4?)R(9;2PtVkIh0*DvaDSjaeY4gBDaZ* z7Rc7=X!Hu0GTUN3!+uiH{Fp_uxbJO;NPTzYybo$e$=S#oRDn7~rv!qEFGXX1Uh&El z%bi$JxCg{?=%5C6`sBXLqT;Ue%mw54nX?2jaj2FV0v6Wj(cqScu*1cB>J)fdPLs$(&5cYi|=$v_MsD#5B@);kUp7T-0_XD3rqB7Ip81^;Fi6xB z;8N5dig9sXp?ih<^JiS;>bg}tkcqBB1C@Tc=)d@SaX|_A5|%ofvDZC_0_|Xp7iT?U zZ0x_QSOd!~rUHp$%2UB!Q>kXG@)N67GOc{;7#H)*c^q6(@2;7u{Itw>rWv$ix3ihr zd|ZrMT4={3h^V|@m!LrQe|@Srg4n(*X}Ieq?FUK(dpxWQkro9D>LXVlzNlR{5cjhh zwoLr;(E9%R*>q-Qz`WmQdsF4}-;yThi;^m0O)5HZd;d{oFRJ;F0?}MXpI)0!4Mt7Mu)}GEb&=m~&JRcmx8gH0tgP4CGzvM(JkW|G z`S>jo;^P^UNvAcnHJ#7okBuU3N?yXTXfyW|i{Hmw9TZ+2&)l?k-MuUYs?Ao!jft7E zDD#6%tSvFiQ#;$$AW_^dI&Xfb)pmUvPnEh3)zDKV(hA2{n3zrRBF5m(qxYM7OLi6W zORRKAQrKnV1FK}Ig{S|sYfV=fsMrlIN+L?b^Ivh6XscQ5k?vIH>LywUc*R;@eB?nr zDd`=M?iVx!v_iQ0RZU1o`6$2ir$H-Q-$Tnpd^7Xy3wmk{x?}buGJ+x;AjyCGp0piA zNXm4o)bbHaCV%#rL62R(>1t&W21~au9mTu&=>(Xj_}q_DCc0dhgl;Fd4R36$SZps`XTYC)8!2@B0Nw z7#c(;H51o?pid2{Lv;*~P0H}Pz1;C!^rX7K%J#N``_>~0-J572YuG#oK8a#g^jg+L z0YEcGUKwY!{s^bYz|SQ{mFJHyMh|Zr!NZ%s;-aj^7TwLfYO8s$HMc%1Wl;U*|1n*G zn|UHX!M;$dBN$N&D@V=qm15e1{?PSDOp%^`7d>cV?!1x^S$bKp_t$I~olX^$&z(KF z-n~yzbH*@FbP((mz7#ASzH*`Q2ycY4*2RsYo~euR-U;eT`KdTX7K ztl7oqNjNg-<7L^Z5c)G~prDK|&$XG#{pE)PsfAlP(&Jxo)+u)awZ64y}xGX z@UI1;5W^gQZ&;W_hptT{mu#*3s-PtX1`4{d>d2Q#t9@+mXE^9$K*g3*zXjOf%igF5 zfYVp>@s+7H_bTqOXJ-j+xPacVaG-t^~1+0%cf&Qq(*<#v=zU6g^G8&_Cd zA+H}M`g0(v@zm2!;!W!RoYph!iauo~ZN(REP-OQj2T9?(UY3CxpyDx~JpRMGlcYz1 z4Xn!Cp}(Fs#g&2x!{y2w=ha+rCg&XDw4x($Kz<*%Q6$Wb(9>a~_t9Al%rG41VSn>V>6!F@_Hi)iN4Z+%o!9|blR4MHP+nEPsL-PUqBZNP@t#*q-1;!m^#1#HU z8$*p*m<)<;awsM*kjmS0lAld~G>t1&nW_Wn)nRARRZL=?=ve2Fpxdh;@8z)elIEAy zlC?N*GNTmZ)wtq-BsDo~mjX?B>Ip!R> z%I<^ej9wO`3o@^?8FK#~MDg#vTbDNfd&GCZurF0_s$jZR7T<)9FdL`6wFt_8TdZED znB1xm9(+=dp}g+%0S5#e)cmUxr}$6p={OtwwfO!Cg#*9RHV&b*drs6u*%OEGlTec2 zwVOT{9i@m``%lhMfAdX$>^mIh7`klaMlG-|ifyL4?{eDxxv=ItxNy$_C>u4aJ8(7Y zi9?fCm$4|zz4Lny6e89*jg8Icb`R#|U?&-UR;ARM)_`k1X@8?_|C8CE**TdWIGN<7 z2PQX?8(vBe95_giqTWKdZo(Ga7}Xb-)FBl(0}@3o^O7vyDcp4Luw;n1GFX%n7a1KF z2!6SGG$e55E2=0o5P55@jqqqobyp`*`7}o?=OdJ4`icu>JAYc+mE%fHzWT(9{BRBKrsuc&C@W*q; zO>u}wF3sBa0n7|XCy2nO&VnZB=+%_e<{1ErF$*Db-TWACduxhI)Om{8BL*OqRMNY2UKc$ zm^E({bP0y!J{^2(!D8_b`V(jEkb1Mx+ZQ0f+dK8#EePP{_`1?X5Oce>ip=E~AvD6M zot2wR?O6i&ozE1_9|-`zRhUQmy+7zi9YTvgB|R1NCje+;cultBbTpxxor{T+A8w0H zY=cABhe1%Ta=wQ3@yfGXU2R)vj1m|yNz~#1dXwR0Au8jKFkLOJs|7Rp04}W8|i?6EP*uk zk(3rXa*YCSFvPU@TyT?=4l#vC75G%whyp=CNg~6pD{jD*djc5d&Nq|;E#^k=S9F28 zu8KPqeM10uvx7d2ekTm46?tCwC@0UGY?A^&D5jWAjp5FtOFi#?_W|#kW|I=&iCyt4 zi}jJjDs}-_ry`r)8!iGM4j&%HVZWkW!aV97Ko{HMn2IH(wWR`}TUd(~=kDs#0i4~B zAF44Jn{z-=<7F?@ZrClR#iK4X9?Uy*K+}(3f7};9vEwFuS}Zu1*kqt%ELg@~v%`_e zu_4D`n{e9k7*qNOh7y_{-VZJ6AiRnGcMJa7 zw}3tOj7d*_MQr2sL%rYq`T9%mLl`l%=UcCX4`NTLAL^UG+)4kYIpO~aWCxr0bCwVi zLJ-7tX&Ap)ETk7~qS__G93?_XxOiXeAg)j@xMLx{aA@lHPtIRLNJyBjc7oVJT%jZu z@(YMP);l?m2_XSzwpu?4c~7`l1TG}1gFnjoOb7`mC?tJ^L?D7V3W9`lq>F{s90(!7 z0|~FaB_xTj6eJrQ0HP%OIL>cENI+PscDO_+;Xf9kiwjXg@xfO(&j}$uXGL6$evZJQl%=jgZNc=_wIHe8_UOUJ}rbuN0()i_##qv7G;e z5TCF_?NGHJqB;Pv2w(gPwIOQH@jf7gc+5hzL)7L(c@Sa|p9BbWI8&IXL#lDTf?ECAZ?D(YR9V;awrHP26$3!fUuD$1*wiq5<4-C?a&D!PI9x_ zIbtX26ADtDLFd^X!pIjwNaMjV0FDE$6P{C3kQxZY=m52kITVDD27(?&$Ec0sP*9K> z%Sy4!zcYcB5K>=$Q#(*?GKYeKw!cKU6c7c;EVrwjs8+zC zAcSm&r^GIj`Ui)Cf@G3c#XeVJumd4vQ&1!GGPSeB-dQ0OB;$Oq)?Mu6HbMviNE1P_ z>-`)G3X;rM9oyR1O6N$t#dsfIx@-YO6RLghY}D)OxD@&Y_?n z`GGg$tD~5S340s?UD15E9 zx7tXxDh>w)DNGcrT_N^19?K39;$O5K(U}|$LOf@k+9hfS(<`DNMU}7P+XBPlB1H&spGj)Fsy!$?E21Dp z9BkX&rM8>edmIizTw}S~V6_2ar)dxh5{WZU?9%mTi`_Pz5Ml;Ix;~-SMQtpHgMvhA zzfqo4+ga@)VbB91PJ=UB^K_XiKH_F9g2R(em;UJ{ZVAtV%u?wPp&f%aS zk@|z6heOm(6=sPO(h!hSbhlb3wa0`(3lt>MD6ow;My<2jwQ6fQB!tun)SW~0+~0ZM zP>_hTAT0cj_(~7wOHA4$q-MTQ>m_z&ZdOI1AQ6LLFC6Dfh!8?^Fm6E*VuOU%6V(n- zo66y!AQAV#$`9?6QRd`z4hM-azpI@oc1f;RgawQ#NW?Q{sr8Sq3g6;zkO+Z5A2iF` zN$qK|+r1D967c~DWj$K#QbccXI7o<@FLnqw&QsA&yo^IaK_dQSx>`T6^DVG_!80Zj z7Jd>tp%os{V-z9^5(y4y3Wx(<1V22^o0kN9k(HRsDEY$(QwkCZ@TzjC+V*NAg!vdG z7{IfCQ|&OZx1s6nQ;^!?&)Q%Cmp(UXpk%-*zScNh= ziFnN~V)q5(f+@nJa0ntxVoLRU5B1T5Xyze~2Cuhk%Hk&vB#J z=S&D4$9_Ezj)^J0Q@cW~jo8WEQz=G-9uld^YkDhgt;EiLN0@CV4h?A}1#08s-q2?p z4pI|IhYwuBQ6QV0BWee!ogsFy%4QrAQjY}=w&GB8@g=o&91=o7B2JO6c9hyFVwWq* zb5hk)IMboDDIFnoy8PC_vuZ z9%{YS4p!@_)|A8I8z44ci@g>1zSt3R1soPaK_XEA+k0K(;)Kxh{nfVRu($@wNX=CH zSnZ?u>v|3gp&$`r13|(W6guE`SL>$Mgu~Kk5QH#CZHCy}aIo*=e@+MmiIBR?QMDb^ z_KF(>3Vm@{bFX%gfcm4_H)3zW;T7e2ia0dH&oIi4_#Nc9{2I5HHv042xG?Ri)>&<5 zwH@P@5s`60sP){q&53(FcwNA0LnuguxChQUzKGkV9u*?{I>x=I?c%?08~=Sf3C0#6 zl8~3HEmT_^e}&Ne78fAAmT(#n3KAjy_8b<*tv296A^dzBv5Uy!*UiO__}kbr5LPUzZAVd`JZOe*p#ndIlh3 TOxC1Ofy}fRG>|!QE+~vEc6R!JS4Lw-6ix1P|`+?hrh9aEAbC92$qF zkvaK4_qj87t-IbeYv#jy*R0_~pYC(2>QwE$Ys+u%B1}m^5(|R}Skh8rDvusL zt$Ot6iR<$xz?~oD2bjR+EmT|!stPfOx*0i{JrXvB7@NJ9wllIYQ!z6#^>7?Cp9TVBq`T z+brbo|7ilX5g`B9q_pIf-itz<%-(Y`gP2TMLEP`Td70U`xVbsG8Q-(BvT?DnablHK&>G5@BfZyWDIeE3XlUc{nrxg9OUKy zb6|Vt{~#1VG8T6u2NpJFRu((Ezw7#^wKG)3?Ejp`f7{ww&BMWrMa9e+;^Jfi@WY(q z-<<*4{jXp2w;?bau%eR{z!W1}F^GwaotZsUT1aEfqkF zbF+)_im`J2yRWppGt|i5#O&YiwgTS$AAQCCmwmyaPG&|>h?5!wV*76?P_l$TAd5}oCS~I=+5k`Kk%3+0C z3w=CMkVvkQbzdevM!tKf`?ol4{#jd4YFgS0^SCbC*;IKLwQBO9mMwc?8lq8(F`FN- zM1WP&fugDv3#b!8>iZ>&XT#RSFP(o&6Fl(n79ZTM*n&dkEIIMtTr|&;RR`9f0`|cl z*V321K164q#aE5UFn_3iU9~`@T*WJlj3!A*R*-WyGFVU4BQcx5M=9eFS`hpa=mSWu z{C5;CL89$Xke_?LJ>SI_+7qzuq67d|_66Qv;3tYnPq}e%w?kS*~Zc z<6{0GpN3L8|CZaLQR>8*`fb6EtOD`*LYw5j2F3ERw?s)_>E>d#(>0YN7-ZGCeRIJJ zqYB#?umzna0t*DT_;k`N*YW~W4V4=DtW^GqswiOBrp^}hQ00u zCYf8>nHFc8#snEcLjAH@FF6lK5pBn|L9G#8bfDFf55H;4ZN5i%g*Y=~XcQ&d4E)I?kUc0Pzcw1b(N$4-+fe@YnkPVDVs>u_oUa~B6dZmmHJlf{4em;@H+dA+KwUm*hk=8BKHy)VkUwI1BgQn{V zw5VXu{Nh2|_eSHTyCwmi08&#P8v2E~MQbQqBGJg)8;t>0H)T(a{kPsi&C{} zbLj{urU4WK(0ZGnFnTPnYtcf41t$jmpUFNQ(!XV*^5VScj-W(MFU2D^1(r2 zvL%o`T+XMc{;~aPJKcZWjZ(Jqe$IjQsze`}{_mD!O0@NyZnm_*JYHh{yP^Fr#0w?b z>3C65$Fn0q`jxPOVV{a*^%WA1W2zCc3}qWNBhL%}x_*E-M-(`sPqc_DVPic^WI6pq z9pC{VEw5#=r&~C_$x#F!Ht5W`{+l3S%k4;~7u@vRl^GcM95A5mFC8{)v@vy^Ifwe$ zOeafI3^%x7&_XKh^G5{z(MJv!F#Q>8SV1|B(2Y0EvnPLNGH4R6vcKi>81@T4^QDeo zxvZs!)hqGGA9vQc4-kbCT7Ga6;;fmXEuXqb=l7BRG+&+QS3k!v-@$NE&-UW{LxYD7qnGQeG_RZ+Z599YT9vEOr=~hm z*DmyF>s!(mn*QZ1XAH+ofTfB~W9Vd#3AKsxzHjoJ!Nf(iRX|y%p__VRE7^5^-SjUf zSNNE&=Zcqw;XXXB;>dSkx(|UcW3srSUYoe8(Dl;xdsyE_scgTap;0K!6g zzq{t-%0k~=NRFkGd-2UbCXMSK)}e0gO$3Qpz6P|I%;r?M;it9L>{zNzNw?#3Te@2N zuf#LLHKrrSZz2owy@L&1lFxfdezBCPzoSVvL8)l1S^E9>r8o6I(xK|?8ey!{X8vbu zp`DpC3Ca;UQI?69*4(Ai%6Z9Fid5q+2W#=1R?b?l(mXckZ z&qH6wXd*8$E-oC)+bBD;Y%f}xG+YDSchW5QJsSv4vhLS`rTjK|{K%ogMColBM_t7_ zM*gMVf^OVkaox0@o;5uaN76o%swwS#sVr-1`p5>%GEFay;HW~zg0PQQZS?oXM05R^ zDug{*vrN$Q>;j}u)#`?hfjyaDKmdYwU=fp;xgkFL8p-5~9C(}^W$+W08@Mf7a@N;S z^p4M|*HE^lb7zkHvnVxXF~X(pD8+t}iSRNsM(cb)OvwkS}mtnpJU-5l} z&jxtm6Ki1sv10z4S8*?_cKautY6}&14~y|}Y}R`&it9J}+}~h5D?fds+p-r*iHl(( z+3>KDx-!~o(u1}{menV^z1*m|(~w@6;<(011ar_f(C^rj+UMi{DzQ7LJsFFd{S1)M z&{?@nk|LGX`jIM1r>yzvWp7p2sEGmDnc7t6Ow2Sd=xjsu^o$*y+7MDD%4xf5xpwIKzAh=cVg$WTT^Yg9FMI}m5HL+5fDgt+)?uSIyOP3@VpJQ zIO~jBL&ksUGDFvR?qA_)%Kczl}4Y&JbUz` z`HQfb1NP2Bu3ajq>x2f2UL7<1OZTpt$%a)=&`MpUz$WqzO&Dhtre4Zv*(y;O!3@nf z`Fw>#_H@j5xzQ(3qHVSAMeh8!oW65be5779L-v2n_jHz3~ex>IgW@A3=Q z|6_Hqasegh@Qs;A>0-3)M-i(HwQYlKo(h=Yb#gSxT*%YXHSaO_z8gwEmRspP9nAA= zSFJ}#a>(tF0qNBV+y1fcR4rD?t(nn(&xj&r1G z4Ov0V-y0jYsdI?`URHx7v9RVyKOoi2BKRluM@5;jq!+)nXWrz=e-!N4iG_vy6_MX0 zB4i?UP!q{}UEWQ2>5aMX??~0DO~t+39xhaqIMxe4a68+?I6%;`@h zf+9+h>0iwMWv!MVIbHNK&@oZ22=pe^l3NUQc#u2af=Cj}$?M#pa^6y2J(~Y@rD1i2 z``Oqe#mUW=CvmkJ>stl*6BDuT7*2B+1}*DMhwnm${d5d=Hp};xg*ncR=Nx;MMZO%W zJ!xsBdzXB`^T z5UAWBa3z5q>FY5TO#NZiGn2V)}kdoB!njl(u@L(yxw)xq9C48t@gNoF6TRKB2NQ892TsyG|A&CFbN8i6P!j=`! zs4&H;Z(Td`g^WxrL=uLIn|i$&g@vjrhuz4Yu6Wmv9rfHV>VjM(wn%X-ZclZqBO-Eq z;``SmsWNQJuJvQlL!pT$g z`{4EP0a<-qf_^0ALjvt{zrrg#UuZ6nI8=8BVXbZps3)RMaYQoA)-SeX+3_h3+O$wd zMcVCsq$M_l9tLyxACEsBpa7p1`ZXdQ^RKZ~N+ zM%sDj3#i7OEGfdI0vmJq?yk3yTk1Q{)=SFmKZ&7+7#PD1cU0+Lebwq~RXLj+DfoVN zTc;U7HdHYmeRjt5c|MWTy#ItkV7jssf*y#oyh}A2cvfaI@y*#uXtIxyl z$uSd;(0olAHr0r(=HW?OK2Gpp%@zLrxr=ldA_9&%Ys=WY=^4#O zY*4$gm=Y|qx#0~81$`p&_Aa^ObiZrg4J*W|X6w?XBdXP2qmOQTc=$Lj46Pq|lV;0DUAxIVP>TcR$b2$mT4aC4q|CbFPLGOR(mPVsly*j#~@ z69a`RhYUFirhKy0-i3Rf-Kc4qN~YPTPR`5HJy{WYem9gq?TPpunr>&&rYt&QOxTl6 zayf}2<;$}|RR%ULB;ux4xIOQWg@5P9wNqLt;VL^XKD50Cr160?!@6Fiw|nE2vv}sm zYETTTNiLVMVul~X_M+FM>k(ZXTtcmBtF+mF>gZH3-T3EE_F`g75Oy_j{zJZSwU>In z@NkwOb-vF2k`7KskL2M<;aq&Vgd|Q9_Cn2(oEPALr@k5*wmbUr^rn?tyL5s%{mD}B zJPGk`vbelZ3D#f3l*0u?NBA=3Qj*Nf;Xhd~h~e9#$Yp!K?yTUUKw~V#vw}d?;8to6 z?-SS0TFtj?naqseIk|j>4b8}_JUnP46LLOTC5L`VL`Q{mu5Pwop;++$UTKhbNjL_K zfFzAqgcc7Bq?kMLibDK*S!j^)=&HdGwsOi{$PmPX^{)QP=@8qI*C%}LHt9CKKD;UJ z=7yWBzCc*{d$eM894bd`B)1%b1&gR09s^+ze3JA)U4Gh9pVmB?WImj>KLBqZ*3ev2>PfM5enChcupT3#Z&{s3|y{h$& z5y|wMF7&e4%?mOKX?FQKA$V;&d*5RgbI57zw+G_u?zCc^VD%}PyK|G7`lJzc(qFtw z6U!K+$F>f@CsX0kKg>#_zIZUQ?oI;xaXNkeY&$(z$oU=6p>% z-~3-fMpmZhk<_lX(+*aCeK0Jd=RG3r#yPj--9BGXT<(4Ct?MT(IZM?rUIt8YL`-so zzfv$Cp!!2u_=g*I^1hO7Y>3$&9j&A?+D5C$Z2 zZXZux00Ldy(Ec5d)9)6y3K)mD)b>Kf*>jEv)Bbkfocp|U>(-z6oa>HK60L`h=-4 z%62Iz;DYg0Ri@Lwk3q>yjf;!54~?7+#WdchF020nDEifmA!6n$T&pS*xdde;e)f~P ze9i3E)O4M;pRA)JAwKp^dX2veyJ0rrv8towuHi|H22B%x{_N%KOdB}wxFaI3@`W4< zw;$}|3+h8%_Y4IwQ!Z_1a|pzhjjXu|gQ^qPRA=X2xv2=<8Nku(T5T|z5e2D7!&Uf@ zK>3rB>5Z6hj-HJ=kz%VLBu;_LK8c#gdLUc1JnnNU>2Xu`hYkbqIxh>q;e$Dh{rz(**9`Jo@@$lM6vOiqdZOG7T6;yb-7`zx6Qh3>!B^laOW?1ELHA`Ap;&+v__xhu}W(kCm!mJMS&>)TLspbThE*@^4Ojhz&~8 zL%PW5P;{84x4IrqE-@JD+bv{V|1cSbMSJ^PYDq)&svO3baT-9@$@~w~p(nX^!Ebz! z?M#M#osDA*=jYJZFmFWfSoVhu7u}wT&EyDQgvD-24;QwxCoDhRg5T*9%V)j*;#7{- zAl*GO(#Mj?!1Fkt8#E2G(Ou{CbVo8U?^0Ii?YCW|Eyu3S4TOnAl={T_na%DDahPsx zC&{-Rm2Ma#Pinl9vi2*F47U46Hn8;122RNQ1gjoC=?GxnF3<$)gDXt>{2;AvC;s%a zyzU=+%j1|2Cd!!woW#G}Ijv^|giP%pFRusW+BY>IpRFuTA3m!Tj+>j`-!GKk7Th(H;od8W!M!xK0RSH zGe(d~tXv&YP;07F-=cA(#Ke`z_K=^8vw9TSQG>m6*v~*;K^e&ud7b^64aL2XOE&~m z;d5p*Csz0)*EQATHAdza=o(1R^g}khowb@{KiHc(B{ObNR{5Oq3Ohj$> zobJVy|0&ESqP5?8300N>;dSMJjip?vr>UZ2eR-;sOhWrKzq`0>neHg>e%-5$tYbid zsO>QOt6i(ilBCrEwy8DkIA{IpNB2GGDpMS@+Pnq<43>1XnmXxDOv=mX*^8SBO3w7H z-`{cc;=(bnH9fug{OBqu;*x8%!-|XE(Wrc4p5%DEqp2ZpTB)&q#m6f%DT9>jc*8*v zXB!Mp$gEt-x_^l`0A*yJAQMc{)~9#({_gJ3=eN{wq6O%%1hU@;W%s8641E{&CS*Dr z>{pd5gZ1sT4hw+_l_NyXeZ2~R<=U@x(Ik{lit?Y+TdfD8yp7`JwB<=1(oE%-7Nriu zLtodJ7ipq5fVe@CpWpo^ARvcge|1VLU!^YkvK2r}e}9T@N2<#1>)>o=JNtTU(GG?@ z^pDc~LGs)5hYq@3VquqTrh#)zE1L3Z6}H>#w&?~kXFl}%U2;%BT2H!vzmEndCD2+p zx?dw(;frz0MR-3#8#iaR2lT)lCh4-$4sLS>^Autv{>;pKD@YYNbwAA&7aRB(>9|C_ z0_l?uq?Mm`bM<161Y)m@&H7?tAFW)YzF{&;kHGWtxd)oH> zjG4YzH5?NA5u5W?|6TYart@EFyZ9J<@+tBbi;6mnQDfuj4?%TkF;dXAF=yzqvg2Uk zTxv8`{2G9%L^PrZKqsfxuhDz*=yrj~2O2urv!tT5AuWJs zHirGtxH!{lyI?}j*NOcv3mKP8!`{=KB8bMm$(2C zN_^;g2LRZds~uSHa6eS|(z76Ju67U7TA)`%d^LA0n2@HkM1zgVD&b3cy$nGCpB%@u}9#0(eV7dX%G0OV5c7j%xyb)dM{UZ< zvwhm0RKNFhL{Y2~R6e{7Tv!<$3mKVy&_AD89&TB5#VF!PZ@tVezU#wSdRo5)7pv1a z{~#ud6=>a9a&I~s_|l^P`%CHFRbAVG?U{08%i?bM);6M&RdGkEoKixdy$2KYW~AezYuz^hO zktNlnkK0x2VLxW6pPapcm6Nrwii&}+k+!dJ^0n0Qxx?k9Q}tJwR~yBpAeS}Io*?qQ zPJWBcH80{%N8ef@`#x8PJ|#Cc);dPUDo0^)%^uJ4pFJ~^$ki^KYH79V_0>VcE7=Rn z$QXl+yhCc$Zrw664;m3%}DH}3xTSOvh*v!HAw#Tk!9*BGZvhFQ#c9vy?7mKW~ zuQRUB?ntdUR9pEWGuw@m1e4tmBT2J^1JV_9OP*e2Cu6hMRlRxqj zLS)>AhI2qpqQo;iG|Ab31lh9zq-@R#SH}H^9thyM)dkF_8_1zg$Tzum$k!GY7rHFb z`%4UUC0wD#iu?%-*wfwJr#Z&$G8d3R$zWt1=0yqh>BYgz)0OQxK~59cnp_VGkQ903 zuLRQ=H7rkNWfZ#`YSTMe@Pn7v$nkWx@a{9EpJ2!h7Waq1FFofC>gP2hFbq>t_xJXu zsio8>td0+oBIjFbb4=>eQ{&g}befKna(vK+#s1j%nU^WIjxv^4|C*EB-OiPh0rB7I zT;j-LR(8s9?>ePZF77TfF_|P)G9}hw6R->os{-I7;(F=Jb=*y(1p=`I(zPSZxkpT8 zg=7rtw0Gq7B>Ov1CM!8oV}ITl!*+qPH*w%CHx2Y9fr zUnj^`6w*XR{`IyZtDEnAmZTRMDh#~ZQU+LbUBq5Jm&A(jeV8JRtcGlOT7K+gmCn*> zWb4picsW<&Y(S(b&oy`CL$~CbvDhkfA!e*#u2J3I%8OAQTao_d=G=Cv)A0LB5yxGZ z|6%T(d1prlHp^N1Rbx2jNdz)Dtn}lQUty=T-Xge^Dgk|v4k0~=*wdM%E#WGO3*&|R z)ri{W_oE?^&Fz=B->uER6s@qFZx|VPvA?X&)DXEY6 z8!u;H(F`B;3!)Xo)h^e56lBG*q$II@L+N0G%l-OW5qhqPxIx0Lx_AGWk5BjARFXQ^ z=TR?+fiZU+KHd{Y$TJsm0bOf>*?<)KdO)ZuN znF0ldnXc*r@7GPEcr4rwWM1*^L2K@+{dyKX2E-8I2`>%^&AG+@;!#ngw`879`4rpY z<;iviV@YIsR&IYv0G8R#LyhN-rlbdFB0rHVtv=+e9!lUuH!P9#tmq>r_>$zkjDvXC zniEm{af=M!tIgtaFed-HkfTn6yw#D9MQ7TK>L7&nOmlir<6E&Z48#L=)45=62Jdj$ z$Y=d9?W%Jm+OqKE7hTEQByk9m>u&tzT^x(Wp^)BDv8qmCdQmlAZv7(D4@D~9SBk{u zZLxPNmEvwIJC1`=jYHK+x>g%r(&$C%3M*ji1~_x;K~&w9;R$?oaBFB@wD9&%^8R-Y-xSLlGpFHr)R;L(wndV!{bvo z;BhrYN?-)$njMOll9567qr_gK&~tC{JFm~s5`3o!7L)BRnQxq2Jb%|#bT;6t(SZ#{E|3rlA8pRqFX0$X!`XZ%77B)w#Am22LaaU>qz1c$ zYX`4|CbeL@ZT7pQAnwn;iw}poY zcwub6a?kb3t{rw5+4tD*&~9xwWZmbXToyJe)`ubVa078vnt2o6`?$(RvE~}_dx})k za21xZgyb1c(GW!TR@Hs&KJ=rSDfE7Fw<6@eT~nomyzuHQ7q}d*5#@Rv|Ebu4FQL_5 zw2e0B0}45HR765u8*Ymm*8NtT&C&OorpF3xu!255yiyiSa& zw~Sg%x^02F_Dw(RQC1oa-}()&L|}tXzmI-w~~(M!-HGo8~Nj+Z<<2aZQ&vQf1rz);^8BuXm#hAp-W-=3|NlnQ|S z>=S1y{(?v793&2#;TNyuzN1V1@#*|{r=KPZa1{Bu17In5BUFly+)0*vVHjdx=Bp&r zoRf2^NO;h4vjsoEK1HlAC54lycno4HM#mQlSND}d46g4B`K;B&HS}@_3&#_i0LPS5A6V#~%zzztpT6>o&68uhVF*daR9~RuPfp=>pXR z>h;0pNP<2;!<@6VCb3x5zI#JIBo52yf>OvJCAU4V5+U+_bR zvOX`03%6FY@_h6RvnsKQBxh^DR1T|ho1=J3=4VovJxn})Bf!3ZG>y$JnrFlS_@8@n z;{`cMaqLXz7zH3kI>i1zvFoNa$toK=1c*^aOKf_$fcxjekT$4lDG zlP9j=1)vzN+lmo(a2EFL0AZ1QwfOkGo}MPH+azmv{1yhrleN%)i0<`1pmE-SJ8(lm-c_KKqJk$(I0l-8uL+9dp zWac6b>IlD|E{fa$m0@w5+HJuKLoo^9P=5iD$RMt?(;=+n`-#Q#V>xT#JOUa%5#l_juMMLv# z3eeztoo}F7VN2u@3Kv%7(d=3^; z(R_jQK~sVGS>yd-LqrKil~GcZYL%+DBQ|(aW&e;}3i6wn35a$iOjy1;F&QOuoP1xR zGUn;zp01giqQhz~h8!Xt+`y}WH0=*uFDj1Eo=l&04%5`V5u_XfYsJrR^ju+myS*q! z=x+H|mEW6POcE3KYSU@E3pav#_Bg@&lFlq~gF=#(4> zvhQ`n_+s#09XJli3ox*FpYN()9I)xGA5VNGhTke1)O#tzf0d+Ipa7`%2b63syq0GA z?!}S}cQ)NWZ#}4Q%?+|LqxYcU>zmxSX!?|PUsICp(m1IOrP4Y~yyVkMuT#<|OyBxb z*Q9%nNqQ)DS{JUYq{s0acz0jH@60s6I{RIIAVZ)W`GL=p)cZ(H4!(X=ol2d#@uC^)LA%6+{E)Zglo_nT(rusuPl}Fzs+zKf{;5Lkz=(+s+PQuc4Da-ihVgcl2?FL* zb9H(CH#|O+JMQRqJyR6K5nw1-Jw;{VnVXJhaTNmBqlV)&xbJqMkr^7y;8M6Grp2<5 z*R6or(6)D(>FF~Oy;a9D-0wSX>=k>kZ^-!(%hm{6IFL|rjVj-yWYE-~g)Iz(WZb>} zN#Aj}+9y5(8h1^5-gBxfEryN%;h~u(SUSihA)U>|}FwOAHE@5T2OJAb!P+H;#ZUP)6Cob<_YO~mh7?NhlOpgset@Z(FfKgx~N z)F-Eula|3*)MX-7WPLqcYSYZEoUhJ|0`hJ z^uDI12;1s-1fV|3`e5&J?m#|)_Nk!D1zVP3Q)=p{5AHzf(x7f+6w&Lc&&bzrk0_eK za{LMVpGGs9-eB3#lvmvT8P+HBZK#b|ExWy~(WQAfpR-S`kSDLJ!#a`UNuKJC=5$=3 zC;M^{l8MuH-XGk*v;){E?<-L&tQmjN-6;M>RojoSWDY+=va2zqF0ly>Jhfxw)3>Nf zuF;0{l1<|!q^80O`8Q6f)biF{7T_r`io}I=g9@bgZ`syf?5a*W55|vG*x-jdssOWqE75Ryw zM7?DNP_Bgi$S9n?4-hWv^y0GYOS`l(PlpBikP@`Mi{+Ulml#I9n$u&n%tOnAE1T0g zs@N9~v$C6uL7w%0Ol$!s0df9yAJp4>A$0j$uI=V7Wt$a8?Q5n=o0Z?4VaILPl-hLr5=9fVAq!)VwJdZZt+Nh`!crTl663)- zW=5>v#caPZ+WyEk`$H$Lcg1rmCe6WA$f24Twhu4x7(QxwNV@$}yE30c?$f%UKsldd zSzn^fkq2ZgD7R)^Uxk8^E{JRf`|Hbkw|nnB#9C$RArdTycD18gO5}ngt|P@yRnF34 zY`lF_=Dg-VjhbAhc$9wCkWxaLZadaCTAxzi=Sb$;p<3BkEPpuv;YXKmpQ0eU*5r>R zOHO$YcdIFqK$ebO!8@zOyXGSp<7a60MGGCr{!D+1fU=evGi2E3a+5pP;UqR7 zvTnDAJ)kY3lHx8L@Lpi;L5A*jJ^@$6W&L;2T;7HYLzVgH3OP(mcvP5Fcq31qiu_oY zQ`IELyYVc=z>o(35-kJ!hSnpdRvEmwNPl1Y+~QrgD(NA(oD8O2u1>GnIMKP%r{ zow-R^YpP1F#xxxEeLOB##USoiqh=A1pT3)8M2EmUHw((c>UDae^raJQdeX+~6yvt5 z!EabF+hsL*)pDKI1nwwhI}k>dZNY`gq&(jnKCK@m`dL0h-2rNAQ%%>G;C98^=da|Y z5A5)4#l;w<_jf?T?@m4XNhz6^6{$fRj}iN)^fY_78>#&QjD9h8H$XUU-NC?yFdmE* zm1HNeC0qS$b$OB;slwoUZ7G3*J*gWBe|?z581v!{DsU_ZEqU)&E@5aFFqMXi+t1*r z;dK;#pGDTsfl>oB_$e4F2VtEpW>;CyvtEd+E{#`sCcYIY*5k#3SaXUTJ2CPQ)+|U{gpoPVl}Ch4EsgT$&<^RhYVKgTJK+NF&FPn z^bS%@y@_%s&RcDHIma2qh%JP0T;2cD;G(-^VR*Mv zM##FLe17(94;3f$8>4qMn&o^RF@K4N>73S~rZdX4b>TErG~F-;(S{zl!EV1IVWruQZnDP*Y!1Og%34;IheJ!! zSqicQ==t#tYPWCul80BbRJV0DO77X3yB*G8ERZuw*iS8NJW4$SHU8Ngnwmn?pieqJ zU;EyQAOUmvYPEF^Hq?8h)}88!rGv|8nA#o2@8c!z$( z&03$CL_CkzxBC~B#@T4wN5$wA9Qbx2a@jeq@MoYI%-oD=Jeb;sy+m!gLZDEGYBIe# zZ~AuK=5eF`w({m?YpC3{{U@tpUW#G00Xa)hnh@GnEWzY#Y`QVZV(@gSSwUV@b(2`9 znV0@i)Ua-3xGb*pRp(*~tHz?i`5cT3C|TtT{qj6;^r9lHh%u9}0@h^fO*80|2^bF0 z&{m>tbxlnK662V@4j{)y8(Xn*aO_5>p_Z)mtI^eAHr{C{n zMnr9f$ItD1zIKHSc6|I4U3Uhhfyt~5Xo=akwDHv!Zv?~^8=2_(curg5g&Jkia1Lgb z`5w$3y2({F6!h7%5#AVqeusigWQIn!MJ+f?xoY&mi>~i)orlo}pZjCiELlT;{`h-; zrX=`9m4~OW(L#Y8SBN^|Q6Ye9S`RtW{pqmokX<6uXRpZR;%*!k1(zZOh(&>YnI$`2-`-gos z)gx~`?}oBtf%Lz%_C@}`Vo~v4q#GX;c9A8$Zoe@&>dwT>^rX_gUmhs*>^vzmG;gT3 zcPxV8@{wg0%~|3bj$*a#h*<2ZtEHUuBPU(SXj>n4M>?-$TY;Uk1BQz~Ec2VV+S_4v z>4lv8D(F`0EM}+*hShF*>f@4IvFMEc4CIPkQzcW6W{wg?laK+EmLn)CZeq^MQ7g1w?D1VUm266T6j<;>>to`wcl?uic7}1P7?ko} zx8C}H*RM1T*>@Tsvn?k+m|pdjoybfil+R2jAS&y~intsm!z4>KE6g}fkzL;IG%Y5_ zE0)$Tl$&o0h@!_=kjc--CGVMDYbX1aTYJ7pOV{Uc_opr%YSL-IOdU66H^nZ-9?x%n zjvIrHQsZo$1lZ8_W)MV!p-K%jYpKNt$7Z_+G#D*Vkbc8SvjjlDX?m&QO-K4)0C;S_ z0px*Klh0sn&$72wuschoRa0e!dQ~dnSZyHq+FSO0C+^z4W-LWJr!IDD!ly|3Vb@2* z0HEFF@#m6D1IrZu0b+RC5pBpJ^`nHv<%SzXY|TB6;kUk4A* znpGq_dqk{iO5KFJt9_WM-dn0er_rwox`3I zyzCF((+UgEfXtY5MK-C`-fXq#X9*K$qBOY?`8ahA&i0GZ#rtx4LRScd_J&mM@@p!J z(xR}&?{;2uqQz=Fd~-*tt%DoF(qRVdiot&pp)_!Cphzp^=lY8yjZF2kVM-E6^nw zbLY|O`GKB^SW&+Nb<^9g4`$s~Z@ung%)5cInpK|(p`LZQo!@*jLqBP@h&XDP%O#NK zFD_2&nk@`7FLN|(W(S`brBi3(j>qbCl|jo$O+qY%24ku1%hVG9EJ1hKtx9F0SvAXa z-T$@22ZM+oswLy2Om-WQLl%B)GpA0SgDS})AMU6Jtx7i7Q%7Qlq)iC$;1c53)?D<` zUu4ED?^Agk(HC};u^d`I2zA!&x^?_?eXlJ&_xDf;4=%@7F7B;jsem=L1k}uN4D4%e ztb61$s|G#pP&r!TNgz#6-YK0y@G9@-=%^;zTdy(f6rf+7) zTOR9gHZm>irmf%@CQ;^1`@J;E`Zw7c)oGWp;53+Tz?&9_rty~2uK z-n_VE6hdqzR?u}AS$j$s^R|^s1z1$RC`(qdT~txLj;?cD418&SW^g_ZWyAxYD%1-y z%t__OWLE03Xs4DENtdAQFBnYk!P^I8*L4B(I#CXNClml}Dbg9;Y`5y3FGvN;ujT!! z=*??O1br}a_!g2U3{h4_oCF>?@95Doa3m&hUsS2Y;taOvl@W63j&Dy+QZE99at>7* z^lj+Kh+sFj~F*j*0(;X_z%HbsZ zVKOU3#aC91F)U1tOty+MZ`t`HQ3$_4eC7yx(;YY($mHEV;S2k@*l-5Fa|I*L_jmap z%=}Kyvk6<%6u3h3EZCP6q2V0LtaLN9IVKOQ%)mZB?kc^%^IX{d?a1Htd%dDg_X&;I z0cXl~`;OZKslh3lcW2(Qe<4Rbk@(Vkbr`1>FJ1~`GOG_jdI?xSB zs~vR;rMFw#*&?+Bs){$3Uj+7dTT^pX&0_WUTXxjXL5{Z*X7aoIII<_`=;h)PjQ|A6 zZpEC>E+oTee!E=z-s4$89)9kvJyhwlbyxH=B+dfawb3WCBpgG`>z(?~kA3tM(m`o5 zY~LCBME32v|8VApIs<27*Zle(YPnHR^-Vh~ALfJzjs(=U4)fy!rPsB-d;k);Fh2jJ z=z0#*pGdDc_RWekS{+xL(OG!~1>iin;ct=NUK`AeSfO8p598BV!=@v9t%m&Km$7N;j zAND3ciIZSpDK|IM74jz|dS3Av`f4gVJeV7NvLv3#Hi0QL911M2;2XmpQZr6^Ch0r5 zLi7$!chf%O7@l?Rh$O{HCu-3)(0;MBZejZ{@vA+~_2|sku#=d_+9AOXAx7lAyR!U9 zNF63$8lU*sHmY}5@`VEec9vzIegKvI4&t!6?X>MKvqT%5hJ zHYH_I)*+pIi_Ji?0PG+xEUb;`F{h&wr|i*~bNgCVgU9dZxb~nW=cvb+IpG;9;1;HJ zeht0_j!|})5SWBB3#xMONDqSY*F%`j!&6vV1&wEVff>oW7DS*=&!T>s}lD4vbMZ z$f{gbayq-)9dA$G+|0*cugxhAlM0}F+kY;%xvAPNohb<*vKd zUFYdP=Xqw$-ZQ(*o;|xTHHD3KTcS9)Jg5JDS=#r`t^B#ByWB6ml(`Hl5}OmN z$$wFES$q9FUeo3qVa4bb9^^-*93W6XzH6&mT>Sf{{=lsM$lHOh!>k7z7pmU6Q3I^x zZf^QzTDL8`mTP<^gCo$TLLn!09F{RteIK|LHDA{fle`X$M;MU3yGMhQr53;X>%>oN zCN!1SzBkS&Ycy1+{51as4a%MPTxf7gjn4x>oR9D}{v#&!LmJy=g!sG5Lf~T_AvU(N zeVvQKBnQ6@YD@!V=2h{~qx(VJ{P_L1&N5YR9}_C;_{u|O_h@Ho<}ut2$1#Xx*mcg^rz6O7`F-o)qil*sPZ{a1j3D)k>z_4p7LC{X?pyex0KTAxUOK4x&F+dX(ZvMV3l9#@t_1qr)V;y-Cf@r zF#V%dV@!#VqMw!+OwwR?morg-2iF)(xeYI1Y#amCQWQ=<#g#SaYHnX=Fg5Xb+IZaS z(c_Y9rtf`zI>OuF>OHid>yFpy>6Qh4#H7AJ?Vvr&1gfgJW(7(FGUU5)nQUhxm2q{! zvPU0iK|7~mAG^2uUJI>U>5TG9jNAW`ZCCAJW<;|yJx4D3@@nZ%%I%@Q%l^*KYGW7b z7m=KYDs~~j>g1oR9jvT1{ACHEuvNEa*wAQiK?-M^rGfNiYObT7b^XRcZ-MW$^bhiJ z6K~fQVFOHkOPa+63Q#8^8TnQzaPU{Aw6&ihTsvyN^P>o1q*I-mSJK@rk*N%Lc_#NN zCkSzppZPHoFm}IZmh^1Z2I^EgZyBqDp#JoOcGF6gcy#8=QP1)!0`9r(*?5qds$RTu z@mJ(<_6{^@l<6VFJChq#a2eIeW*F%t*1`>Szbd}leEilmVM#1tWcbG26sJ}_t%jz9 zMrme_p345Ml1G)9t~3Jj7&rf4gU>z0-B7Dg`7V~Z!M|l{IB-Lv=90r*Q%8FV&`?*& zG~IXceak9e;jwzLlguSgEgUP}+3J3~dYeTLsu5U|BI%m-F8moar9H#z1udvrhM^<7 zs-Wdb@LeX?-JCTM*TDva>#oNo8ATNRD_7|lYM4R>If0ym;7Qv)I%>F}qNv29fEehJ zGm%b^%KQ{*e{XY8c2lheHg{mYy4)!xhcC^U9Jdr8?tZS75vMJk>x<{*g^X&)V(0GE*c7NsWVVP@_=WItgzO3Bq z9BHeIY_tQTvY|hHXmUK(88Z_mONK^cV)NyElr4J|wzjsqIWJMGHrPsibvEz39iQ++ zjDc3>8As{w5307^yVaY9&7!p%l*3x)066q`bBCHI{I?X(-m4Op=%qtPN9Q$UO|RmQ zsuxB)Or^Fpb;}T_lj^SjDh9p%tJQ|oU4Z@!q6&u|<~H3)ac=9F+t{SUn_s%mrj*01 zd6;w32)XkaY2f=}-DdmK#KkSV{<)u(4$QpFbZhXYWWu|rKMx#3Dt~{_TFetauaMaB zQdxs#x%T$SrCnEWs-!5ZJ)?fKYU`#XfTcUCyYe%ZFDTSKV3?-bdf6HqUlgv3lszwL z>Ngf*;ftO)jCnC2GKCVTGo4Ppp~jbH^PT)J)&*1TlOOFF zf?qDcT0xO`JXrl~bRWMozx$g@t&DN07sF)t?X<5D=mg;>SpG%_rBHNC? z813Q-SmTFEXxOM(nU@DS4sA&Lxp11a|HxXjOCA=?&8)ZfvPCt&Yr_m@&1Pyk9S}@} zZZB@m`!8tMUHL$D<58m$Wu3#VS01I>y)n>{`Vd*1ow})V%4(S3M3QwnIG=1_-j&}B z-&^Whbs1LD!SglU@cc|-y(I$k?K;YBT;Qpi3tx=A7TzlSTQIu$$NOAfUc#%KmyZA~ z7ez%Q=K@0tb>O54583mp>e>M#N|SlGwS(<8U*7;Q@4heT9?H8T!0YRhKI*D=i=CjR3 z9BBB&O6fYs#P^8O($pd2>DhXQpMd~&czSYLqN$0^R;Fg_FKe&6ca(p8Z*=yfBUFWd zE1OLJt`Un#j_0!F8hv95O>x_WMS^^d!e4qE`P}D-UcW2*Nan$VjZHf?GIiwivS>!E z!VkzM(9DTU&Qe{=n98pbsSmOMXgZP$$60CPVesL{MlJ!S-K9{sopY;=_&}C(V*g?& zj}XW!K>y~?HoC%seDLt+ct}Z}biKDLz|CzqP<)HB%tHc`&{l{RcAn7;ztboZ#fa&( z3qIrJ7G?nge=HdIW~!sLp1#BD(ai0JumQ#Vo-*|Bjk&tPhf_B{Ab-u}fDeCX%=F<6 z;yDtT{cf+1jl-&k8r!pFi0#bJJ+P#u0XC4t&KO{9Q|5t$@$>7ro9wdQPY4MCRrc-O zi>Z5LDM=%(_};zh`-!IQP0m`30~@>%G*GVDo@*D?e`oEi&G&pnwm7RHTIS+q%*Ra) zx%{05xT#e{TnC!0_r`=}m1S~PLI?3mvSf^VB~Nq1Kt7v4{YBrd{VCun5IaRQtSE2B za{RWPWEiJo#AwhQOMeu2V2?aKwtb zg9C?$SxkXzQHGhLXHT1R^-b`Q^6L0iQA+91cgCK0wBbUbpzoOkmDeol8(k*%am_FM zb!O})1M$sV_WE4qUg(7Cz1Jq=Viu;OduvIvR%g#sGm|H8F&5sqI|%ZQRzUxC>0Z^+ zT)_5a%Yml-uGCzBkH=%Ne>nQFcUA6}mF7|e&_cvH@oQ|N?x(L2WP&bwN6W%+X5Jfs zy+`L?j6m4cOESH){cJQQbA(DH@>)k|9WI?ezkk&7Ye7%gjE>8kv&g*`LiR%Tfr$ek zQpd(%&VQWSeH~w_+}2ONM^~R@3fxr^ae9J=RiE#^c{3M2 zq1@lKqwMsW1nGq=+t+bsHtlpflrZ1oQ@Q$JM4j z!1YwLF3efilKM{ml1?%|8L_o;3RBq&JB7e^|?7{w3y+Vd0xDH7D7A?0(|8WJU<9q&S(b@*t#yBiwRp-u|mn1Be& z)E4oFoX_hH)V*z+z44V_Kmf{}f;nuyebuWq?^T=8nmB@t#4mdZ6$w(V38>!3Jli4q z>FhdqH6v^Dq!mMgEMMl}#{SVy_g*fiQrQhz8?uzFmhMs+C$WNKk&p}Q-%JahXo-Lu zu*>qh2OaFm+64o2F0SIn-n6r`FZo+MNFregCNIKC*NaXAe!uO;u0^B`Zs4$ z^W?g`JP}1V7fVy<%Zs$o$%Kb@;q@MqF$|}SH#%aT>z}|3cDqp=8Phxsn;_=2gC7;$Z^{CLJ$t_{C2%N8*MK|) z1NuxlQSH$9>fw8&V0t+*^V^{Tdx1##*6EmMA!i#m917k!J7$48=5UfyX6L&TFCR_n z{@I+M`0Qh4xfyl0a#vQ`khQ$HyKvK2x5(2;D@zbdZ|uogI$k(SKHu$V3NV%3Z^ayZ z8sBXaexv=eS9h_snj= zQb5Oy_kBuZclE&(XCKD0(4a_*n=;7~v9#Fn3}j!3yahVjfG!Hyh8|u0WGBv+4SB*D zZ_Ojpfg!#kkT)_tA+Ltfupmq>pCvaSN?D^JGHNNhj>edDq|?=_-M>ES?a`%E!0UX(z&cX)Sy*c$;ghO`^Je4uy4qPfrVpiZplaFAf^fx~YhQqs) z*=-0qjQN2R3fG^C{jMv`%2~K|R##sDKAwSZ;LW1llZ>7+*b!e#Pd!%E53w|Q`AJ=e zaUBNFm=O_ID&4FImTebJee5%o&nDMkv~%d=z|pXE(0ScmQANA+WO}kD^Fa?sKSv+e z;pE>HOHg)rRtgiMj8o>m!0L;BvxlOd$++D)wPrsIduV3{0Z5jy3kqC?x8`sR8nc;v;M7H#CRi7N-^+@%E{078Wz*IrwP zkbw-;YJ6>u=LGJuFlcf=7u!~mZlHW{*!0lQN)ST}N3~ZK^kC`>bui?r3IY z)7&$&$vd&p+pE2koGD4QR(EHjmOixbsDdt?bH2Dvxf!O>me^*q{Pa`(lz!sW{b?-g zulX)AHP~G`%lwYiy35%UaR6?`EPeKMxu4V2D=q1n!_%*<{cJW9LIdWewtj0Mug(`Q zbgq)I2~tc4U+@&%hCZHnXPNl5CP3NuT8xmMZb`ZUyGn(ba6c~hL8PH7TPW5MnbA*> z^_r3e_9b`D?pBIhd-sED=Hz!OV%65Tn&^ltUbfKeAd>zP@dyWh?~Gm?)=0N?C-=vV z4K&No|4U?ximXj}$|hOXl(m~vI}tyM4>dTkDP_NfZL9LWO^Q#x+`m9Nj)g`)%MvH* z+-znI&0T#JEprL0W9K3}sy|n}XsWEW$79%kRZ+lcao2t_@cg){8r&o|@4cTG4GPG7 zr*6M;gboHdCxk_{0o^e&N_HV9gQcoXR(|5At4akPzr~?xCv`M*XLz8%gE#c2V*`dB zAu;$Gaka1~=R0$wq3~0BIn`T%7rb?K*IVYZXX~SXE!p@Eshgbz==-)$_4%2OPEiMHhErk=Z!VC;zSkD??x=S+VUC7;9B4dVDjJ_Q zQD_E3&p`|f0@h?hhI_;nmP6+~WMhW82u(JYrc!T%s%0*Q--KT^ThZL=7LEQ@B9aEU z=Mj5y%eeoJ+;K6UYt~=)ekU71XtjL#H&#K;meih#|D;gqzg9N=GT;b>{AH-N`uiTF zeyx{#)=EKvmSLT;%QK*Yop3VqnDbp5?Vw2p0+oP1%SuvjJEu;Gk#yBN7tVR7kPWUz zXNSycYKtwT{>|hOV#5;M&iMH!bOz+)Uc}o1ack@H$71g%HR90wktb~%G(=$N;or!e zn!tGs2=VpnAQB8-loMByUS-?(ZWuOLo(*mxkwWlYj~A{N%KqynO?BnFBWPHAa{bDXF z+c<@EOwT(0sSg^qlP4^uayUT9Vu!e`Z=&+&>oy~``8TiQqso365mTU6)M`z{Uy0z_|6$Yd>5N~79ys;CCehHV1R{aOte zEq)RvR0(qdA%jlr>_vU!?Pm?(^8ojzm~XV%A*#ovM^XmtB;0wRd5JhejSPH#cE~*| zn@(^5qHgb(j3-3 zF=D_?J{jS;T*vZyD}X$q!N?IbXF&pEPq2G-A*=1dazdy?yTSz1ycJ=F{uK{ zrTor&paGxF4OtmuY&dTr2noAG9#ejwh-dn@eq6ZKSPxM>cy*SlVs+F$0F@{8gz^OJ zeq%)wkClSe>R0VrIu_!4w~SM4jt*d6Xjkhqm}=m{`#*Hd>(V>lTaK<&n`wr+MBnIB z+=^=&IPF&5aQ%tqU+W(@?+DEHapAah&%*{JZEYdh;0KKmiK%A2%J!ke%!+Y3zu=+d zMxSG0#^}B`AG3g{YiBThxc8ZyrD}%E5iWU!1uF|W=Jnk_5C&6{mX^@B`7u=1Q44C6 zayUvKNg04wdeVQVcY2qXz%@qN)u7`FUH+V!UI*D6fMlLRZZuDCisw|7t`!)vE&s`Te0!@jD~+^0w)Rnjjwfv4J&?28vl*ldZZS1zqf9$g zj(a_7z^(~&;N|H06+!p~3BTj1E@Rk0D$1!RLZYCsaJ#{5{yXCUxz(r5m(J^WeUZ;F z>?Wk}=JC6h^u2w&O6auyl4awJ+{AW7XXE8l<2l>Cow%_BHb80FtVd5g``8xsMams` zIJh7>xF~nYY99*Ot8iotzgcZk>*g4;x-fcZ%c_}P5U9Bqn$pS`gteo$yx!V4_P|Qj zwX$rbOo*}De)Jj zx7~^$664~kvQ#9a7`wW;M)^+KoYdMsK7#;zIGG<-k43@<49&e4z+`mT=0xg7&P(6& z;RvnTYEN?1et38cZ~6BjBEn`Qbj^Qbwn1;Lx2gkwJ>~qj{Un<;@tLCu&Xfj>T?~KY zgFD~r(_6eu!o)X>yN@S}SsK-I!Mlwu;9#fcZsTGbEeDJ|a1{@2(*R7$4*N?} z+k}z;!ibHNp4xPf^nIezh*y+u}U+uwltj$LIEr- zbzgpopbZ${8ujZbjI0?Fkk9s3ymjSifEi0W{&-!gKffGMSg}mDIqZPqcBrZ`0`&dl z-qf^v*ib>ZQH7r+`Vm)Yo4wyF%(ck`wWwVRU?4{=k=iG zN1o0%t`>%LWSrLF!WUlXGqlea=DZ5A)csuA;y|xvPrXM;xDi4oyOr7*_qM&=ai+6a z(}^F<&iD6fzlP`8-%4TA|L`h#p`9(Mw{>-xpYFEg3xhNH&wIjR532HmuQYQUm_5x| ze%9yad&Z>KYfM-2V72b45^=P}s}g^{oKN3BiJyk?P&U>$_QL0bT9&?%NnYbO>>8T4 zQd{%*eriw(TWrD%YsMu#6pww*EC;vaXKEs6)rg&9jE(1QCoR>a*3;7Q zsge|}0WSot8e^+dgNv)H5(T;dl+&*#Kt}?dqQ(IO?-A6OHQ5hMneY?u^O|Lm2n17Z zfQiF0O+kCI2 z$FWZ5A5TOyb5jku7Sa|xU%g5FjY)=je zaO93_PZHBk*@keX_#*$*;XBZ@~i^52=?F8k5w5|gAEXr$w+@B8R< z1j}4p!l!nYeKk@unah68sm~&i>Pk@~|3&&c+PQfc%myv9vO6ZG_dIN@|M9I{QdIP7 z(nv7pK-slim;EXhg4*GnXrKY;JOX8Pr*F}?r3Se1Mb+gAbV^$~s4H-WfHB}^V=!GW zL5ioTIsi2_Yu(2UBnZH`fiHp12+CR|&#dqGXj&y^XF`e=NyG*2XN3jqd|8PECK9<- zBozYw`LFh3)lqPB_(-E=y`V8n-@ovzRmm+v$@C-7_sJq~i?^k$<9jGLH@q4w&xH21n2y zua6hH>$o2A8TJNmcm0}e7npcWdx+<5+}w}ZRm(nI&(WImO6KA8=xQTSgeV`g9HT(iB1g<%pV)6~Gcb zk8-&d-qxnOyA`S;BVfM$>Aa7%ani3siLf;-^JwlWGutdV8q$z|pUZT=rIS2o^aeJc zps_IMAbseVj+)8wlNB`yAV0|}wz#ML}Kj2DLB1Gena|JNRBAw(<)_lb?K=4Uv7xv-0xu%7roBy$F|%#^AOBQ zHL?o|K1{vU9=q4#0o@)eF{65^8!lN`o$oO&6zH2=)=buev5DH%6;)JJ1G6Q55GDBh zI^s4}-Uc1Nr_55FbK4l1CLgraZCwNcAu3Wl_1c<61kq^H?#JfQJ8wQGG>{JG*c?_+ zd6aQHYgth#S+n)V6}rQoY=Q-xZhspC;xU2~*3&C9?FgG;KHv~nXr)JNf9A+B$86~6 z$2UsbEYjuyrfY9>ce5C(|MAx6pE!vS^~Nr?vIxudr8R&%cf8me$q|6iP^eD8)>P5M zyEq&q(lW3ipJ(osMd3SQ&QD7LZQ=wQ3+WeW)D0K>-n4U@P>)+7ekDwTtFRQ zfb~klweg!3=^sZ~P3l(xg^?v@CF+VCq^~KQ4U5&z^q17H;BHEpIPy@J;2y(Xe8un= z?-hG96XTzG^=}hb%4s&;VtZl>EU0D7!*2%Ik2xNMi&WjMM$+;q63R4Y6YJjgdE)Ck#eK5xE|elY_nBIL{?fhB zT<@bzZGgHHfrhGXru}SzRfytZ{{TQAEhn|`I(1pgDn$L;k;B8@dug-B`iwYA^fh-O zm>DF@?0E_IpN%lInh5jBa7xzWlCl(n0zvUWRC;mus%9%^ndcu6(#-LuW+}bb&C0sh zWo2bVLjyxxkA~oz`|fjLT!mClhp?<`eSbX}|Bp+-sFT%8-fUq$dtZmuxPl9p@6;}=@fa4jpM!))%vWHCl zH@I`Y25+#_j7ZY@|DcH)s_&kH1F6?AANHv`wF8>^6~I?p7AjidTDq2|mW5!~Ok%YI zJ1y58szTFlfuH5&g}DEVzMo#2H3$a1h7B0%;8Ngo!a;d?j?qSv)5PGd?x)&f{l8iM3({jEda=ymB)LmPC`Ft=shxb;JaS|tY zPF~(iBj2T4%|s&6#mFd6m7@rWEQ3aUAA<8<{0=nXIj?CIy>#IZC+m&bgYxzka;Oar z{z2S-_osiw6>80CDvE#D;ZH?>b!ywB_q^1e15f^RPU8L3(&^@h|DV(Ti=h66_6`HX2TuZxJpcdz diff --git a/website-old/static/oss_logo.png b/website-old/static/oss_logo.png deleted file mode 100644 index a4699e118003d53dee11f27e9f5234ac34369ed0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21192 zcmeI4c|4Ts`^N_n3ZYWAG`3323^UA(p)iI?)@0v?8H{Gk7<<;r$*xecW~~%SWKV=p zBBX?Dhay=MD#>rOoaS^oU+0hCpXT*yT;2EexvuMZ-^=s3U#~~Ffu0r@rywT)0N}!E zqm2LnCSkg5!Olkib~*hk0Ko?WH}t3 zVo#9sAyetz008Qc4;ANdg5V)$PjDi-ssLxIYJg%yyb911rVG}kY7m@>+9zp*V<+{D z9ZsHbK;VIgR5?*TNO}M=!2>7eLngVpBYjkWU*jU__F6LtDE8IGq`o zX@tgnPe=cs3eefZgNg)!yuH2UycOgqG$#-Qfk1%3@*sJ6S-OX;yRWMU&PUeOUHn^+ zA92tGcLy4g>OrKqimk=P*;70{RDi&>M1Ot0Ul*CGtNT|fSNHGq=o~>lI4TGt2L_SJ zpx-IoJ&XuHi~Oz9-Po5(02vY7DV{V30^MEw_klFM=+%9{+W!zp(~IEh@!L@JG5gjoG zzsd+c#D9^k^?Z|kom1b28bybqtBcg95$V$(M?zB^JlC!Zi&mv~$l-~2q>>^5swfXv zl9h+z?PUoFsG_Vr0R3K zgsNk}Pz^Xl0}WMIz`&FcKf*Ie{}C4J>h6Jabs&7NoJg-623B$;;0Q{x4vsjytbzkn zUe+E)z{?WsA&xkNBNPsncl;5WLH>`>XabGsMZjZd6!O;vL&eeD32T#A1^8q3{J~{N?hAmjuG7c-uk11MEs8&|Ds9X1CTg}wJl549Y-IFwXzx7 zewO@Av6kqY!*7P*zfFsO$p1Zuw==<2mA;3=WWi8b2-p~+h=f3pUb-FgGRv7Cx$VFLi#V4^Q+`%T|c7{ z&^QmmchU;7@`}b_C=#ZKRDfH2t>s(FZ%)6+bt!nFqc4N}w*$3S1B2(UG3YmTJkA66 zpQ14OGQ`0tU)1BX!NoOstPF3@0uA@Yqy5A z&73}ma9>vo1O@s>+pqp+Yr7c9^Q*s-Jed9gLDs&%OBuU=m74!=DP#Aq(x1xXu0#)2 z`S00&X=YHZ-M^4uVH~4Bvk_DkVK4<43iNC9uL=XA4}oNcCem+f?rZypJRJI6^lQ&= zmF7Q{2s)9k*}e)HI=&0PEfR*utFLS5TPywHjsDyS`s=~*@5}42UF-kZ_<2SD&w&}k zZ6sl&v97&=Yh6T)4jZ@_X{>8+;93_Eqr(O+MjGqd8@Sd*#OSbri;>2<_6DwX5ivS! z;9{h)uDyY4T||ry8@L#0tZQ%JS{D(c!v-!!8td8{xYk9)=&*r{k;c0A2Cj7xF*)IQ*)8+;93_Eqr(O+MjGqd8@Sd*#OSbri;>2<_W#7i`SVpwf-C*~ zOKh;J=`VN&p9L^&CIbN8xd4DR4}giwjQ)P7H~_GHw^BIZ zDFCo528&iR_UWBW3%VeD{9@Cg_^o`}Vrjv=+X{K-1S%B^GxEjKG+8??#zdw*$OgMv z2Nj(!k31C1ao}`@URGgV^YqqT+d|-HvR7vSMJ7t<7_n5VBa z%ORdv#zYtr9h$G5zE_1pA%(2T62qxmQ#apjaQmWsbgB(eD-$yH_`r z1IizIr-z10r~b5l7&H&P-1>b7M`5E%(=g8n0fD+)=eE-BSL`5>SC-?H}K_RPo-5~{T zpxecd2=P4va;$9_?@|;Bb(LxO?x564V9dM{lP%!vv4o&8=a+1eIe*~D4&O%`tC}C-48v@nV0JKI*(O;Ch0>{qWTUJ3KHR=$Z65-h*V@g@d z`j_-*%U?K-AKfzqw`Eo3emNd`I#g>J3twhhCB{WYl1ws66)%;lEf-*96P~bMj)2=T z2X6A;@=T3R`A&F<`%ahDqT-Ry8CclT9ipXe*n#N5r$fo}QK^>~H0tXeXzXM7F5By) z@Kv3Z=E14+ihC$6xkV$N&tURd0)2dZCgF96hI=0puCgo3cj^t zXZ=j^rEKQ3QB5M zGe2eDEmWp*Q>6sS?a!WXnfxd!DvIE1+g*z4ede|jT`GM2wOJ^zaF>sGA^&W-$SKh) zLJR4=BGIw#Td2D$MbZVh)xG<7BHAdL7~4Lm|T=SU&*CSCnQ)Fw}!M4OQa;q+>u zSv_MdV}Pi9ToSH)Ga3z|KSuSWNFbz$C6oVX?0mW3t>MKjs33YF>u- zvzHFRgH$H!UqL?R0nZQh%oxmBy?q@GFOXEP;ccC9_a7Lp-Ct{nIgmmMFWP)V z;vQE?($HFykOTj zMzvqedbC=w|9OGDAQrb5EPq_^85e1&LK#+;rPfM$IEV1dtWt048>~^PZWgu#-qZ?6 z%}O}H)9ZFd)>luHYl~7w!B+moCCyyrdO~fo@Wfr-52jF?C#)#%GS_;ECCi6wxXx2P z)dFECsTAtO+}@$-)JH+06I#b1MwXE$qrI~udYhv01!6XUf|(u(jrcz@#GpMTDicpr;j&Z zrfhOg*X7iK2ON)k9FpA2%_mWt>)E1yY z%yLX}l>43bn-;bn+U+A*$o=g8XVwpvLnXOyA86idN!$0Lb4hb?$;Iy$f98pZ#U*r9 z(Ie;C&n3D2CNM{p2(OvQ$pPNZsm=?h941$ZE&DS*6*&aAnqXkBs#>#CF|P#1gZuMQ z98SAuxy6&4I>^&mv2Evhb!8m>w2D3uto#FS+z!!n& zGsOTdUAHpcj-Ja7mlgJ6$m$1+m!1)tn4Wv|#=PPsn>$WfX*k56&X8mE^D?zoPUxXUgrU(_vA)hGD+_g(3^x#`$_W$*5up;E1OusHb{GcY3PKFVeGS>Fi|{*H;yf z_E{)5ijWH${L9poF_va}J&*P|P1ckmi}>2M3bBhTW>U7t&V)CAA$K+V0%=!tFI)t^ zbKtEwg08%V7=DkGDm+2Gb$g6kD^*A!_Wp$hYHVU2_X>AitQ7uf)KFY$_UL%%-A6<; zTm-8KjPu2MZco1aiWds*w(3JzbYs+C!Udl=u~mw!N?T5+wGX#s62_-(UuGM5uku;G zZZL%E4e6m?IApDKUeKv5dIR~h3#U2mYd9kw11xo!ntu2qCL>i+_JDMoyvtsZgsozE zogYdvnW~js63dVpzEzo)V^uGhTpZ>lCUTM%Ulp(vFb_mpAP)U;w(f(?X8tzzhX zl2UtlUhU(8k@!vP=-MxWMkMddosZ6CGzO#?p+>Z7vALS>q`E}xnPAc#dJ?I35*nLA z?iFCSc?Kjk?mwN3g&%*}At3ZDNCMNJ%-ap|lqf~vRL%m~!MA8u_+#={=F!sJy$3^z zc_s>GL$Km++hyl+eD=HC;%%r)vh&kI-LBj@Rh}|>JHE+4yx~%x{9D%C0E26MZN`W1 zOBr-}JV~)MzH}$C?=;OSu60u-e;Kusx9woODziL0vyn}t=&ld;omzF=-_yOc;+jEIIN-9h2vQBb1Bz%FA+53N{uH5Gzum1a{L`-9&xnWUMt?MzN1qG zTBeh16cW!`#T1&1pU;0ot~AuRo}MMz%kyIH#M?0Cs3Aw8o@kb!cxs{7Fz?X_4rqeA zRXN+zLf1>)PCi@7P{p)_pc-s&xIHpp z=?uPqfTOpwevxx2XDau_vSn`;jk(+klF+*xS@d!-gujjimC?v3PKtKD(iE?0{Zb<8o)mux>C8#QbXta{;`m7Na_E)V!#o|NKR3PNQA$i~?KLV| z)(UG=PRJ2iF=;f|(n3@eV16)Xr`OWC9}D*re26;HaJwVtQu&MEvwQlV6l>OPDLs zJ4w}P8rpR~zb!M>u68j|H1m*p6JN}AOS0G>#)ix16>i=oc#efqo5pSm#vX*cal$ry ze87Dj4}*zUF;$f+Wyv~lJqqiK2@mt`yg_RW6X47djGOKa?7pFcem?&)v5|s4V*#r_ zm3#f;PVt!N+R%=vw;1^2=>XyAwxyO3K5pmn@a#$Rstk^ge>T{u@_bP4nx%*e-mr%@ z2Hd)CsYfa#3>#}e(EE-Th3f7z?E9n_QFvKe_EF|T<%HWJ=8u|-Q)3$O+HgZm0CqUO zqlC>@?<_|VK`8gNL1?U^v(~^X52%zz=)A{xg|$R+KL@yJnqTHb)Y?B>#V z`box@W7wyQa)-q^P7BVH7p*JO#xIYV23BUi1YUo_-$rM~f5Y!hY0#2lwc1NP>)^&J zuF_{^v6RX|Jv8reJ(Dn#2@^w}H%!Q`HM`yXS6OuJ@+dAX*LuIdvYF#XFpPZ2n zrwphHafRQ05a!5zBYyxIy-ek}@nIT5bc9qc^9r9DHY+T#nyU{~es5UJVqvlLWoMtC zwK_SnFZ+yyaJ%un%~>ZCuSLOk_Fj5%5$0~|@zx^&tE9XeH=q)|d}}bw5m2T%!S1qb zR2mM`zB@Ji=Cr7I{FU}Pv;)Q$7aik5GiDRfbv-28SM`SJxzbVEF^9{>S4rLM zm7e!PdD~3HQ+AJ+dclTiE(fMuSxrjZ9y&B=SD#Ccj*u3)Xm-|qTk|d#u-Uto8xQxU zijAAtHI(fr5sislHaIbC+IQ(A(el6)A*WdOeJUAqr0;0ae!x<;-eqiIbZ@D@K>V0a z!j2uw2S7U7g8Uc*N%70EL{;A-nFM1iV-@mI?qQU!Eb4)Y<<8cbJ{~;Sl%j0oK2&L=YVID zcpc&WmB%&)QAq<*4-JcuI=KaE)n~RN{*Vf=JaT>xctE+q$2#TY+fRkUhGWA9BJo`a z{~5vMRiE6cS9gmPNhJi``w0h_h0}}jb?J*Hr6a?VCu^EB2%PZwVw#ZJh~TyRDIIW> zSTdTcbt>6(p`wfL z5i4QS{oJ$1?w)}N9jhMYH@zC_A2+zeNSnA&)5=x7N?80NV6K7zPHa^Mp29WWHQu5* zdI|WB%v)iCb`^*{(+A$urV6AL2XGbKxkb97F>l1>)XcPFL2{Cev#*deG0}gF_A?|~ z^Jj~`+FDV08t>71Z`3WP+(f!2GUcgEu2#BA-piae<%6eiCUtL0nS%t6$S+y*_S}kY zzA6S}Nyw*Mk$k&c8aDYdGbCP%?=FT#ai)P*&GBeFJl9sCjuTY#9B;<<$0g@8CNs3t zkmnPl-dGN&at=fNBh2;rRZz=Qt6*N21X;sHz&#h8#D|SS!8(R1>7k_16ShN~T{r9M zqY0z&X0Do#<QPIWx0wIe>i=j8pCJL}xIR{K zM4S&t*?mhGF3oPafu^xv$~b9}3Kz+Ktx?joee~3phOEkm&&O3N!P_gnb2LZrSr7ee z5^yh#kG-FQ_*w`Car*3Pb*-q)i70WV76hRKG74ZE4whSNW|f1zv%(ji_q;1;nPheZ z$efD28axWYsD3e!T&^o{HB>p%f8}z>lJ1>1etU|r!XauRM=J7+&zWfEktB%%+DWxw zicVkTDTVfZftxd#+S1i-MmRC;fnmoIh0{M;7@vDjG!F6rO>C>Y7W;(K(HuB-YzwjD zjZPYKk2_x)=8IaUVmEIS&BgMK+c_7Znq`jo^KU&h9Y#|=yK0qOIX^t$5^>L3R1+U>vOz*$wJG;JdAj zbI23n*=917;!Itb>65>v-Fn2gj&1SE)iL7hzV{{`T9YiLq?3RW;Q@i;7CbE1SZs^u zeTVGC%e#`s;}5|8;m_By(3EfL#@D>R+5Nb-+I9zCa%=KuIkAkV z_Rqz)#67P-i*jsz5WVB|$c1Yiy}ZD8T)Y*>(1Cc98kyETZ}oU9%+N6kc@5@XlTM9c zwmV~$(W6(}0}eqWTU+>d={!*J+8H}9csJb(>@vx-`^FB34_pr*Id8eF6$VCojhdIP z#BQv(=GHYDt980L zK&9S!_+pD?_8EjtWuYNjk8&UFd(C`#U@uSuBWjv-<=xHKW<8Xq48++lUDM|Kfq79G z^xw3IKzW6+PYWTb-C46MibXloH{C-fZ({|7b=2EJPS_u99@v(-7?N*N|H?!?o>KnM zjw|(0x0&^k%u{9@&txMmSm?qH+d>0OZhi7Dmtr&TuEJgrAx}kONh_XH`$Mf*k3g)1 zI?KH-XoPg~pHvEn@neyHlUG$ns=+2+I4z{l7rQKYw9rp;^d>_8g0<$TI7Xr@3H1CT zkXGXPm}hd=oxuY7Z)9Q3pvSty`8&1kv@Ac$k+#J?AdkzK+-dWS9nIBER%d2*_dTTJ zOk33Ue;Q=E!X|VcZOi<0*?wz!o?{5?MXf?0SSo49q{#C!Pn6njrk-<1)ceTHC4R~M z(Ng0n7|)o#X~~#MSJQKHyc}=cRayPF!ZIT3V6|hxel#ns8fKqMH;GP$k%00YFqw3s zvi>|daz&u_cur*KNF7scPpzNOc-FnG{!Fb-1Jg%ZjY3X?9~tVw zoYwD^>(D5jcRSGr`anv-%ZWFiFceB(P7-xS!$n1twrRqd2H5?X;m_Ry)3C~y=%;JT zNoa-oM6amNBfRO%{*4m(`(8RW_^m*N_%BmY7H2UDjY_-Uyx*3F#Rc`fyI0M$|H=c6 z+=nZZ^*G$w_6cvrfz?tN+?>|~)!geV zQ?)6=-Bu*>hhC^Cf8Lxq2TBTu-SG#Ix_3h2O`Q|@`ZK*i9UVjOh%}Kg%Hfrp({mbi z^wUDgRB&T({3(6|5v}cQY9jjv``M=QGUm?L{3(`F6@}8D#g7bk1oG*rsM>Wto~KJO zJD!wH4S9)>_*xIa+YW^vz<}Oq)YfOavv2lLdP5RaX0|y!5iIKJ=J#6Ye%iC4^yy>!N*9w~#S*89j!tj?zKI>wl%9dT1X2<>OI11TID2N8Pz!Khi zPlU>hPZxM*U(?5BvhTB*uP3*>dcnm}>{ffX2RV=B?QaRkKjR)Pi1#i3;?s{^7QzklUddZr8Kpem>U7MMk65KL04S`yX zOX@yCJY%0=jhQcF+N1T9&5wR!wcBwrW9&1hZq$-!XxD8amsfs5vk77I6hL5tP>V#F=x)t4FhpsZop^mqMlhKD(t{$T0oKWO^-c}>PW zOF!i{+fdi~!B_MHb^7_c)m_p4QdQ*Zh2!z(1Ba@fd_9x*XD{I!7<3C1Pj-4#B~CxE zt$WDYpF8!qX(F)ZMe{hvAVF00GWA`fOvejYu^~%c`f|ZLI=IiP0QIpi` Date: Fri, 24 Mar 2023 12:49:07 -0700 Subject: [PATCH 5849/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8e730b60a8dd4d491525ea8b00b55b214a8de048 https://github.com/facebookincubator/katran/commit/465b1c834266c72432a58d87dde5d6f204ed176d https://github.com/pytorch/fbgemm/commit/d62b5cf5a311578fd47485b9fe3cbb6e66640e19 https://github.com/pytorch/kineto/commit/e64df4dc31285a6129a74d26d67365cedf7aa6d1 Reviewed By: bigfootjon fbshipit-source-id: b66f46597d97299959190d21c0bda3e367cbc606 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 60a9a6a5b252..eaafdbdb6434 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a634f909a0371853396cb7ea176c4306aa70243c +Subproject commit 8e730b60a8dd4d491525ea8b00b55b214a8de048 From 8c63f61491ce132060301271192a395b2abf4cc4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 24 Mar 2023 13:40:07 -0700 Subject: [PATCH 5850/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/b66501baf0ba9cbe63cfeb48b38cbee1c33ac2e8 https://github.com/facebook/watchman/commit/0ad64cc899b752cf83bb7543f09d290448df6ef1 https://github.com/facebookexperimental/rust-shed/commit/9da814ace448dacb28fc1487751a1ca64ed06003 https://github.com/facebookincubator/velox/commit/7fa08144feda489ae1e7f27783be5275511826fe Reviewed By: bigfootjon fbshipit-source-id: cd11023db19837639b52c185c6501db275173f78 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index eaafdbdb6434..9ebe46ff1fb7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8e730b60a8dd4d491525ea8b00b55b214a8de048 +Subproject commit b66501baf0ba9cbe63cfeb48b38cbee1c33ac2e8 From 3bf12050c2c23340d0c31c96235547d9d344b8bd Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 24 Mar 2023 15:38:23 -0700 Subject: [PATCH 5851/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/bbae00269845b7cc7cebe8ff454e625aa30f63ba https://github.com/facebook/folly/commit/77e08c29d9f3b60b55dd74c1ceede35a8297e586 Reviewed By: bigfootjon fbshipit-source-id: 8d44124423ef0527ac78dbaba9df225c79272cb1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9ebe46ff1fb7..64d842c3344f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b66501baf0ba9cbe63cfeb48b38cbee1c33ac2e8 +Subproject commit bbae00269845b7cc7cebe8ff454e625aa30f63ba diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index de656a90ce75..ea39bb87f820 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 918bc9df900c71cd4da36b699738cd222e2c11c2 +Subproject commit 77e08c29d9f3b60b55dd74c1ceede35a8297e586 From 3f8712ad39a547703a4db138387faacaef39bea0 Mon Sep 17 00:00:00 2001 From: "Zeyi (Rice) Fan" Date: Fri, 24 Mar 2023 15:51:34 -0700 Subject: [PATCH 5852/7387] set up Algolia search and update yarn packages Reviewed By: MichaelCuevas Differential Revision: D44384456 fbshipit-source-id: 76a287b6451fa2986d86d52e9c0903c317548027 --- website/docusaurus.config.js | 5 + website/src/pages/support.md | 2 +- website/yarn.lock | 6121 +++++++++++----------------------- 3 files changed, 2031 insertions(+), 4097 deletions(-) diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index f1c924553412..5d057572ef7f 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -234,6 +234,11 @@ module.exports = { theme: lightCodeTheme, darkTheme: darkCodeTheme, }, + algolia: { + appId: '6E2EXVACEQ', + apiKey: '739597f672974b121d44f4c6aebe13d3', + indexName: 'watchman', + }, }, customFields: { diff --git a/website/src/pages/support.md b/website/src/pages/support.md index f24e502ee7c4..0832e8d39c96 100644 --- a/website/src/pages/support.md +++ b/website/src/pages/support.md @@ -5,7 +5,7 @@ title: Need help? # Need help? If you're having trouble or otherwise have questions about Watchman, and -[the troubleshooting guide](/watchman/docs/troubleshooting.html) didn't resolve +[the troubleshooting guide](./docs/troubleshooting) didn't resolve your issue, you can try reaching out to the maintainers in one of the following ways: diff --git a/website/yarn.lock b/website/yarn.lock index 6d697e552909..73f41bf92f62 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -2,239 +2,135 @@ # yarn lockfile v1 -"@algolia/autocomplete-core@1.7.1": - version "1.7.1" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.7.1.tgz#025538b8a9564a9f3dd5bcf8a236d6951c76c7d1" - integrity sha512-eiZw+fxMzNQn01S8dA/hcCpoWCOCwcIIEUtHHdzN5TGB3IpzLbuhqFeTfh2OUhhgkE8Uo17+wH+QJ/wYyQmmzg== - dependencies: - "@algolia/autocomplete-shared" "1.7.1" - -"@algolia/autocomplete-preset-algolia@1.7.1": - version "1.7.1" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.7.1.tgz#7dadc5607097766478014ae2e9e1c9c4b3f957c8" - integrity sha512-pJwmIxeJCymU1M6cGujnaIYcY3QPOVYZOXhFkWVM7IxKzy272BwCvMFMyc5NpG/QmiObBxjo7myd060OeTNJXg== - dependencies: - "@algolia/autocomplete-shared" "1.7.1" - -"@algolia/autocomplete-shared@1.7.1": - version "1.7.1" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.7.1.tgz#95c3a0b4b78858fed730cf9c755b7d1cd0c82c74" - integrity sha512-eTmGVqY3GeyBTT8IWiB2K5EuURAqhnumfktAEoHxfDY2o7vg2rSnO16ZtIG0fMgt3py28Vwgq42/bVEuaQV7pg== - -"@algolia/cache-browser-local-storage@4.10.3": - version "4.10.3" - resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.10.3.tgz#3bf81e0f66a4a1079a75914a987eb1ef432c7c68" - integrity sha512-TD1N7zg5lb56/PLjjD4bBl2eccEvVHhC7yfgFu2r9k5tf+gvbGxEZ3NhRZVKu2MObUIcEy2VR4LVLxOQu45Hlg== - dependencies: - "@algolia/cache-common" "4.10.3" - -"@algolia/cache-browser-local-storage@4.13.1": - version "4.13.1" - resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.13.1.tgz#ffacb9230119f77de1a6f163b83680be999110e4" - integrity sha512-UAUVG2PEfwd/FfudsZtYnidJ9eSCpS+LW9cQiesePQLz41NAcddKxBak6eP2GErqyFagSlnVXe/w2E9h2m2ttg== - dependencies: - "@algolia/cache-common" "4.13.1" - -"@algolia/cache-common@4.10.3": - version "4.10.3" - resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.10.3.tgz#311b2b5ae06d55300f4230944c99bc39ad15847d" - integrity sha512-q13cPPUmtf8a2suBC4kySSr97EyulSXuxUkn7l1tZUCX/k1y5KNheMp8npBy8Kc8gPPmHpacxddRSfOncjiKFw== - -"@algolia/cache-common@4.13.1": - version "4.13.1" - resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.13.1.tgz#c933fdec9f73b4f7c69d5751edc92eee4a63d76b" - integrity sha512-7Vaf6IM4L0Jkl3sYXbwK+2beQOgVJ0mKFbz/4qSxKd1iy2Sp77uTAazcX+Dlexekg1fqGUOSO7HS4Sx47ZJmjA== - -"@algolia/cache-in-memory@4.10.3": - version "4.10.3" - resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.10.3.tgz#697e4994538426272ea29ccf2b32b46ea4c48862" - integrity sha512-JhPajhOXAjUP+TZrZTh6KJpF5VKTKyWK2aR1cD8NtrcVHwfGS7fTyfXfVm5BqBqkD9U0gVvufUt/mVyI80aZww== - dependencies: - "@algolia/cache-common" "4.10.3" - -"@algolia/cache-in-memory@4.13.1": - version "4.13.1" - resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.13.1.tgz#c19baa67b4597e1a93e987350613ab3b88768832" - integrity sha512-pZzybCDGApfA/nutsFK1P0Sbsq6fYJU3DwIvyKg4pURerlJM4qZbB9bfLRef0FkzfQu7W11E4cVLCIOWmyZeuQ== +"@algolia/autocomplete-core@1.7.4": + version "1.7.4" + resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.7.4.tgz#85ff36b2673654a393c8c505345eaedd6eaa4f70" + integrity sha512-daoLpQ3ps/VTMRZDEBfU8ixXd+amZcNJ4QSP3IERGyzqnL5Ch8uSRFt/4G8pUvW9c3o6GA4vtVv4I4lmnkdXyg== dependencies: - "@algolia/cache-common" "4.13.1" + "@algolia/autocomplete-shared" "1.7.4" -"@algolia/client-account@4.10.3": - version "4.10.3" - resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.10.3.tgz#f2cbefb1abce74c341115607d6af199df1b056ae" - integrity sha512-S/IsJB4s+e1xYctdpW3nAbwrR2y3pjSo9X21fJGoiGeIpTRdvQG7nydgsLkhnhcgAdLnmqBapYyAqMGmlcyOkg== +"@algolia/autocomplete-preset-algolia@1.7.4": + version "1.7.4" + resolved "https://registry.yarnpkg.com/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.7.4.tgz#610ee1d887962f230b987cba2fd6556478000bc3" + integrity sha512-s37hrvLEIfcmKY8VU9LsAXgm2yfmkdHT3DnA3SgHaY93yjZ2qL57wzb5QweVkYuEBZkT2PIREvRoLXC2sxTbpQ== dependencies: - "@algolia/client-common" "4.10.3" - "@algolia/client-search" "4.10.3" - "@algolia/transporter" "4.10.3" + "@algolia/autocomplete-shared" "1.7.4" -"@algolia/client-account@4.13.1": - version "4.13.1" - resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.13.1.tgz#fea591943665477a23922ab31863ad0732e26c66" - integrity sha512-TFLiZ1KqMiir3FNHU+h3b0MArmyaHG+eT8Iojio6TdpeFcAQ1Aiy+2gb3SZk3+pgRJa/BxGmDkRUwE5E/lv3QQ== - dependencies: - "@algolia/client-common" "4.13.1" - "@algolia/client-search" "4.13.1" - "@algolia/transporter" "4.13.1" +"@algolia/autocomplete-shared@1.7.4": + version "1.7.4" + resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.7.4.tgz#78aea1140a50c4d193e1f06a13b7f12c5e2cbeea" + integrity sha512-2VGCk7I9tA9Ge73Km99+Qg87w0wzW4tgUruvWAn/gfey1ZXgmxZtyIRBebk35R1O8TbK77wujVtCnpsGpRy1kg== -"@algolia/client-analytics@4.10.3": - version "4.10.3" - resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.10.3.tgz#43d934ef8df0cf551c78e6b2e9f2452e7fb27d93" - integrity sha512-vlHTbBqJktRgclh3v7bPQLfZvFIqY4erNFIZA5C7nisCj9oLeTgzefoUrr+R90+I+XjfoLxnmoeigS1Z1yg1vw== +"@algolia/cache-browser-local-storage@4.16.0": + version "4.16.0" + resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.16.0.tgz#ccd31ab9df10781a69a653e9d994d0be974952ba" + integrity sha512-jVrk0YB3tjOhD5/lhBtYCVCeLjZmVpf2kdi4puApofytf/R0scjWz0GdozlW4HhU+Prxmt/c9ge4QFjtv5OAzQ== dependencies: - "@algolia/client-common" "4.10.3" - "@algolia/client-search" "4.10.3" - "@algolia/requester-common" "4.10.3" - "@algolia/transporter" "4.10.3" + "@algolia/cache-common" "4.16.0" -"@algolia/client-analytics@4.13.1": - version "4.13.1" - resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.13.1.tgz#5275956b2d0d16997148f2085f1701b6c39ecc32" - integrity sha512-iOS1JBqh7xaL5x00M5zyluZ9+9Uy9GqtYHv/2SMuzNW1qP7/0doz1lbcsP3S7KBbZANJTFHUOfuqyRLPk91iFA== - dependencies: - "@algolia/client-common" "4.13.1" - "@algolia/client-search" "4.13.1" - "@algolia/requester-common" "4.13.1" - "@algolia/transporter" "4.13.1" +"@algolia/cache-common@4.16.0": + version "4.16.0" + resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.16.0.tgz#0ef4726653d3891805c3348153067b292df1d68d" + integrity sha512-4iHjkSYQYw46pITrNQgXXhvUmcekI8INz1m+SzmqLX8jexSSy4Ky4zfGhZzhhhLHXUP3+x/PK/c0qPjxEvRwKQ== -"@algolia/client-common@4.10.3": - version "4.10.3" - resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.10.3.tgz#c4257dd5c57c5c8ec4bd48a7b1897573e372d403" - integrity sha512-uFyP2Z14jG2hsFRbAoavna6oJf4NTXaSDAZgouZUZlHlBp5elM38sjNeA5HR9/D9J/GjwaB1SgB7iUiIWYBB4w== +"@algolia/cache-in-memory@4.16.0": + version "4.16.0" + resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.16.0.tgz#b9aecfc4054f2307caeea255aace65061040f680" + integrity sha512-p7RYykvA6Ip6QENxrh99nOD77otVh1sJRivcgcVpnjoZb5sIN3t33eUY1DpB9QSBizcrW+qk19rNkdnZ43a+PQ== dependencies: - "@algolia/requester-common" "4.10.3" - "@algolia/transporter" "4.10.3" + "@algolia/cache-common" "4.16.0" -"@algolia/client-common@4.13.1": - version "4.13.1" - resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.13.1.tgz#3bf9e3586f20ef85bbb56ccca390f7dbe57c8f4f" - integrity sha512-LcDoUE0Zz3YwfXJL6lJ2OMY2soClbjrrAKB6auYVMNJcoKZZ2cbhQoFR24AYoxnGUYBER/8B+9sTBj5bj/Gqbg== +"@algolia/client-account@4.16.0": + version "4.16.0" + resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.16.0.tgz#3164e28df1b6428a60f43b8a97ea669d6bbbce9e" + integrity sha512-eydcfpdIyuWoKgUSz5iZ/L0wE/Wl7958kACkvTHLDNXvK/b8Z1zypoJavh6/km1ZNQmFpeYS2jrmq0kUSFn02w== dependencies: - "@algolia/requester-common" "4.13.1" - "@algolia/transporter" "4.13.1" + "@algolia/client-common" "4.16.0" + "@algolia/client-search" "4.16.0" + "@algolia/transporter" "4.16.0" -"@algolia/client-personalization@4.10.3": - version "4.10.3" - resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.10.3.tgz#58c800f90ab8ab4aa29abdf29a97e89e6bda419e" - integrity sha512-NS7Nx8EJ/nduGXT8CFo5z7kLF0jnFehTP3eC+z+GOEESH3rrs7uR12IZHxv5QhQswZa9vl925zCOZDcDVoENCg== +"@algolia/client-analytics@4.16.0": + version "4.16.0" + resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.16.0.tgz#afa72be54a28fdfe00505d6ab3c179ef2c9bc796" + integrity sha512-cONWXH3BfilgdlCofUm492bJRWtpBLVW/hsUlfoFtiX1u05xoBP7qeiDwh9RR+4pSLHLodYkHAf5U4honQ55Qg== dependencies: - "@algolia/client-common" "4.10.3" - "@algolia/requester-common" "4.10.3" - "@algolia/transporter" "4.10.3" + "@algolia/client-common" "4.16.0" + "@algolia/client-search" "4.16.0" + "@algolia/requester-common" "4.16.0" + "@algolia/transporter" "4.16.0" -"@algolia/client-personalization@4.13.1": - version "4.13.1" - resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.13.1.tgz#438a1f58576ef19c4ad4addb8417bdacfe2fce2e" - integrity sha512-1CqrOW1ypVrB4Lssh02hP//YxluoIYXAQCpg03L+/RiXJlCs+uIqlzC0ctpQPmxSlTK6h07kr50JQoYH/TIM9w== +"@algolia/client-common@4.16.0": + version "4.16.0" + resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.16.0.tgz#670f4b2286755090a6389c55d79402716e4556ac" + integrity sha512-QVdR4019ukBH6f5lFr27W60trRxQF1SfS1qo0IP6gjsKhXhUVJuHxOCA6ArF87jrNkeuHEoRoDU+GlvaecNo8g== dependencies: - "@algolia/client-common" "4.13.1" - "@algolia/requester-common" "4.13.1" - "@algolia/transporter" "4.13.1" + "@algolia/requester-common" "4.16.0" + "@algolia/transporter" "4.16.0" -"@algolia/client-search@4.10.3": - version "4.10.3" - resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.10.3.tgz#aa6b02c2d528cb264830f276739b7f68b58988ef" - integrity sha512-Zwnp2G94IrNFKWCG/k7epI5UswRkPvL9FCt7/slXe2bkjP2y/HA37gzRn+9tXoLVRwd7gBzrtOA4jFKIyjrtVw== +"@algolia/client-personalization@4.16.0": + version "4.16.0" + resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.16.0.tgz#927728c069b42f39fc83ce61a1fdcc79cd38b842" + integrity sha512-irtLafssDGPuhYqIwxqOxiWlVYvrsBD+EMA1P9VJtkKi3vSNBxiWeQ0f0Tn53cUNdSRNEssfoEH84JL97SV2SQ== dependencies: - "@algolia/client-common" "4.10.3" - "@algolia/requester-common" "4.10.3" - "@algolia/transporter" "4.10.3" + "@algolia/client-common" "4.16.0" + "@algolia/requester-common" "4.16.0" + "@algolia/transporter" "4.16.0" -"@algolia/client-search@4.13.1": - version "4.13.1" - resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.13.1.tgz#5501deed01e23c33d4aaa9f9eb96a849f0fce313" - integrity sha512-YQKYA83MNRz3FgTNM+4eRYbSmHi0WWpo019s5SeYcL3HUan/i5R09VO9dk3evELDFJYciiydSjbsmhBzbpPP2A== +"@algolia/client-search@4.16.0": + version "4.16.0" + resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.16.0.tgz#19a76bc6cfa495aa9011b32dd85305baa2579589" + integrity sha512-xsfrAE1jO/JDh1wFrRz+alVyW+aA6qnkzmbWWWZWEgVF3EaFqzIf9r1l/aDtDdBtNTNhX9H3Lg31+BRtd5izQA== dependencies: - "@algolia/client-common" "4.13.1" - "@algolia/requester-common" "4.13.1" - "@algolia/transporter" "4.13.1" + "@algolia/client-common" "4.16.0" + "@algolia/requester-common" "4.16.0" + "@algolia/transporter" "4.16.0" "@algolia/events@^4.0.1": version "4.0.1" resolved "https://registry.yarnpkg.com/@algolia/events/-/events-4.0.1.tgz#fd39e7477e7bc703d7f893b556f676c032af3950" integrity sha512-FQzvOCgoFXAbf5Y6mYozw2aj5KCJoA3m4heImceldzPSMbdyS4atVjJzXKMsfX3wnZTFYwkkt8/z8UesLHlSBQ== -"@algolia/logger-common@4.10.3": - version "4.10.3" - resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.10.3.tgz#6773d2e38581bf9ac57e2dda02f0c4f1bc72ce94" - integrity sha512-M6xi+qov2bkgg1H9e1Qtvq/E/eKsGcgz8RBbXNzqPIYoDGZNkv+b3b8YMo3dxd4Wd6M24HU1iqF3kmr1LaXndg== - -"@algolia/logger-common@4.13.1": - version "4.13.1" - resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.13.1.tgz#4221378e701e3f1eacaa051bcd4ba1f25ddfaf4d" - integrity sha512-L6slbL/OyZaAXNtS/1A8SAbOJeEXD5JcZeDCPYDqSTYScfHu+2ePRTDMgUTY4gQ7HsYZ39N1LujOd8WBTmM2Aw== - -"@algolia/logger-console@4.10.3": - version "4.10.3" - resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.10.3.tgz#bd8bdc1f9dba89db37be25d673ac1f2e68de7913" - integrity sha512-vVgRI7b4PHjgBdRkv/cRz490twvkLoGdpC4VYzIouSrKj8SIVLRhey3qgXk7oQXi3xoxVAv6NrklHfpO8Bpx0w== - dependencies: - "@algolia/logger-common" "4.10.3" - -"@algolia/logger-console@4.13.1": - version "4.13.1" - resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.13.1.tgz#423d358e4992dd4bceab0d9a4e99d1fd68107043" - integrity sha512-7jQOTftfeeLlnb3YqF8bNgA2GZht7rdKkJ31OCeSH2/61haO0tWPoNRjZq9XLlgMQZH276pPo0NdiArcYPHjCA== - dependencies: - "@algolia/logger-common" "4.13.1" - -"@algolia/requester-browser-xhr@4.10.3": - version "4.10.3" - resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.10.3.tgz#81ae8f6caf562a28f96102f03da7f4b19bba568c" - integrity sha512-4WIk1zreFbc1EF6+gsfBTQvwSNjWc20zJAAExRWql/Jq5yfVHmwOqi/CajA53/cXKFBqo80DAMRvOiwP+hOLYw== - dependencies: - "@algolia/requester-common" "4.10.3" +"@algolia/logger-common@4.16.0": + version "4.16.0" + resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.16.0.tgz#8d83ebe5d798b84cf0026ae68d47b6dc8f542b61" + integrity sha512-U9H8uCzSDuePJmbnjjTX21aPDRU6x74Tdq3dJmdYu2+pISx02UeBJm4kSgc9RW5jcR5j35G9gnjHY9Q3ngWbyQ== -"@algolia/requester-browser-xhr@4.13.1": - version "4.13.1" - resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.13.1.tgz#f8ea79233cf6f0392feaf31e35a6b40d68c5bc9e" - integrity sha512-oa0CKr1iH6Nc7CmU6RE7TnXMjHnlyp7S80pP/LvZVABeJHX3p/BcSCKovNYWWltgTxUg0U1o+2uuy8BpMKljwA== +"@algolia/logger-console@4.16.0": + version "4.16.0" + resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.16.0.tgz#e125d63268a6cab64c625e867596a8c8201850d2" + integrity sha512-+qymusiM+lPZKrkf0tDjCQA158eEJO2IU+Nr/sJ9TFyI/xkFPjNPzw/Qbc8Iy/xcOXGlc6eMgmyjtVQqAWq6UA== dependencies: - "@algolia/requester-common" "4.13.1" + "@algolia/logger-common" "4.16.0" -"@algolia/requester-common@4.10.3": - version "4.10.3" - resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.10.3.tgz#c3112393cff97be79863bc28de76f9c69b2f5a95" - integrity sha512-PNfLHmg0Hujugs3rx55uz/ifv7b9HVdSFQDb2hj0O5xZaBEuQCNOXC6COrXR8+9VEfqp2swpg7zwgtqFxh+BtQ== - -"@algolia/requester-common@4.13.1": - version "4.13.1" - resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.13.1.tgz#daea143d15ab6ed3909c4c45877f1b6c36a16179" - integrity sha512-eGVf0ID84apfFEuXsaoSgIxbU3oFsIbz4XiotU3VS8qGCJAaLVUC5BUJEkiFENZIhon7hIB4d0RI13HY4RSA+w== - -"@algolia/requester-node-http@4.10.3": - version "4.10.3" - resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.10.3.tgz#75ea7805ac0ba25a1124989d8632ef39c31441c1" - integrity sha512-A9ZcGfEvgqf0luJApdNcIhsRh6MShn2zn2tbjwjGG1joF81w+HUY+BWuLZn56vGwAA9ZB9n00IoJJpxibbfofg== +"@algolia/requester-browser-xhr@4.16.0": + version "4.16.0" + resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.16.0.tgz#742090e53301889ae01581eedcc5bfc2c6dd7660" + integrity sha512-gK+kvs6LHl/PaOJfDuwjkopNbG1djzFLsVBklGBsSU6h6VjFkxIpo6Qq80IK14p9cplYZfhfaL12va6Q9p3KVQ== dependencies: - "@algolia/requester-common" "4.10.3" + "@algolia/requester-common" "4.16.0" -"@algolia/requester-node-http@4.13.1": - version "4.13.1" - resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.13.1.tgz#32c63d4c009f22d97e396406de7af9b66fb8e89d" - integrity sha512-7C0skwtLdCz5heKTVe/vjvrqgL/eJxmiEjHqXdtypcE5GCQCYI15cb+wC4ytYioZDMiuDGeVYmCYImPoEgUGPw== - dependencies: - "@algolia/requester-common" "4.13.1" +"@algolia/requester-common@4.16.0": + version "4.16.0" + resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.16.0.tgz#a24eb9fc9062f76c2e06599c678542e78c8bce1c" + integrity sha512-3Zmcs/iMubcm4zqZ3vZG6Zum8t+hMWxGMzo0/uY2BD8o9q5vMxIYI0c4ocdgQjkXcix189WtZNkgjSOBzSbkdw== -"@algolia/transporter@4.10.3": - version "4.10.3" - resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.10.3.tgz#0aeee752923957cffe63e4cf1c7a22ca48d96dde" - integrity sha512-n1lRyKDbrckbMEgm7QXtj3nEWUuzA3aKLzVQ43/F/RCFib15j4IwtmYhXR6OIBRSc7+T0Hm48S0J6F+HeYCQkw== +"@algolia/requester-node-http@4.16.0": + version "4.16.0" + resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.16.0.tgz#0723929863c201d12888c2751043b872a04bb6d9" + integrity sha512-L8JxM2VwZzh8LJ1Zb8TFS6G3icYsCKZsdWW+ahcEs1rGWmyk9SybsOe1MLnjonGBaqPWJkn9NjS7mRdjEmBtKA== dependencies: - "@algolia/cache-common" "4.10.3" - "@algolia/logger-common" "4.10.3" - "@algolia/requester-common" "4.10.3" + "@algolia/requester-common" "4.16.0" -"@algolia/transporter@4.13.1": - version "4.13.1" - resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.13.1.tgz#509e03e9145102843d5be4a031c521f692d4e8d6" - integrity sha512-pICnNQN7TtrcYJqqPEXByV8rJ8ZRU2hCiIKLTLRyNpghtQG3VAFk6fVtdzlNfdUGZcehSKGarPIZEHlQXnKjgw== +"@algolia/transporter@4.16.0": + version "4.16.0" + resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.16.0.tgz#5e6ca73c8a72d91b7dd75b00b5e45e8538bad8b6" + integrity sha512-H9BVB2EAjT65w7XGBNf5drpsW39x2aSZ942j4boSAAJPPlLmjtj5IpAP7UAtsV8g9Beslonh0bLa1XGmE/P0BA== dependencies: - "@algolia/cache-common" "4.13.1" - "@algolia/logger-common" "4.13.1" - "@algolia/requester-common" "4.13.1" + "@algolia/cache-common" "4.16.0" + "@algolia/logger-common" "4.16.0" + "@algolia/requester-common" "4.16.0" -"@ampproject/remapping@^2.1.0": +"@ampproject/remapping@^2.2.0": version "2.2.0" resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== @@ -242,46 +138,17 @@ "@jridgewell/gen-mapping" "^0.1.0" "@jridgewell/trace-mapping" "^0.3.9" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" - integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== - dependencies: - "@babel/highlight" "^7.14.5" - -"@babel/code-frame@^7.16.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.8.3": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" - integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== - dependencies: - "@babel/highlight" "^7.16.7" - -"@babel/code-frame@^7.18.6": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.8.3": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== dependencies: "@babel/highlight" "^7.18.6" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176" - integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA== - -"@babel/compat-data@^7.17.10": - version "7.17.10" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.10.tgz#711dc726a492dfc8be8220028b1b92482362baab" - integrity sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw== - -"@babel/compat-data@^7.17.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2" - integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ== - -"@babel/compat-data@^7.18.8", "@babel/compat-data@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.0.tgz#2a592fd89bacb1fcde68de31bee4f2f2dacb0e86" - integrity sha512-y5rqgTTPTmaF5e2nVhOxw+Ur9HDJLsWb6U/KpgUzRZEdPfE6VOubXBKLdbcUTijzRptednSBDQbYZBOSqJxpJw== +"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1", "@babel/compat-data@^7.20.5": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.0.tgz#c241dc454e5b5917e40d37e525e2f4530c399298" + integrity sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g== "@babel/core@7.12.9": version "7.12.9" @@ -305,98 +172,37 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.15.5": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.2.tgz#87b2fcd7cce9becaa7f5acebdc4f09f3dd19d876" - integrity sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ== - dependencies: - "@ampproject/remapping" "^2.1.0" - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.18.2" - "@babel/helper-compilation-targets" "^7.18.2" - "@babel/helper-module-transforms" "^7.18.0" - "@babel/helpers" "^7.18.2" - "@babel/parser" "^7.18.0" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.18.2" - "@babel/types" "^7.18.2" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.2.1" - semver "^6.3.0" - -"@babel/core@^7.18.6": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.0.tgz#d2f5f4f2033c00de8096be3c9f45772563e150c3" - integrity sha512-reM4+U7B9ss148rh2n1Qs9ASS+w94irYXga7c2jaQv9RVzpS7Mv1a9rnYYwuDa45G+DkORt9g6An2k/V4d9LbQ== +"@babel/core@^7.18.6", "@babel/core@^7.19.6": + version "7.21.3" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.3.tgz#cf1c877284a469da5d1ce1d1e53665253fae712e" + integrity sha512-qIJONzoa/qiHghnm0l1n4i/6IIziDpzqc36FBs4pzMhDUraHqponwJLiAKm1hGLP3OSB/TVNz6rMwVGpwxxySw== dependencies: - "@ampproject/remapping" "^2.1.0" + "@ampproject/remapping" "^2.2.0" "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.19.0" - "@babel/helper-compilation-targets" "^7.19.0" - "@babel/helper-module-transforms" "^7.19.0" - "@babel/helpers" "^7.19.0" - "@babel/parser" "^7.19.0" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.19.0" - "@babel/types" "^7.19.0" + "@babel/generator" "^7.21.3" + "@babel/helper-compilation-targets" "^7.20.7" + "@babel/helper-module-transforms" "^7.21.2" + "@babel/helpers" "^7.21.0" + "@babel/parser" "^7.21.3" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.21.3" + "@babel/types" "^7.21.3" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" - json5 "^2.2.1" + json5 "^2.2.2" semver "^6.3.0" -"@babel/generator@^7.12.5", "@babel/generator@^7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz#a7d0c172e0d814974bad5aa77ace543b97917f15" - integrity sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ== - dependencies: - "@babel/types" "^7.15.0" - jsesc "^2.5.1" - source-map "^0.5.0" - -"@babel/generator@^7.17.9": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.9.tgz#f4af9fd38fa8de143c29fce3f71852406fc1e2fc" - integrity sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ== +"@babel/generator@^7.12.5", "@babel/generator@^7.18.7", "@babel/generator@^7.21.3": + version "7.21.3" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.3.tgz#232359d0874b392df04045d72ce2fd9bb5045fce" + integrity sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA== dependencies: - "@babel/types" "^7.17.0" - jsesc "^2.5.1" - source-map "^0.5.0" - -"@babel/generator@^7.18.2": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.2.tgz#33873d6f89b21efe2da63fe554460f3df1c5880d" - integrity sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw== - dependencies: - "@babel/types" "^7.18.2" - "@jridgewell/gen-mapping" "^0.3.0" - jsesc "^2.5.1" - -"@babel/generator@^7.18.7", "@babel/generator@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.0.tgz#785596c06425e59334df2ccee63ab166b738419a" - integrity sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg== - dependencies: - "@babel/types" "^7.19.0" + "@babel/types" "^7.21.3" "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" -"@babel/helper-annotate-as-pure@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz#7bf478ec3b71726d56a8ca5775b046fc29879e61" - integrity sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA== - dependencies: - "@babel/types" "^7.14.5" - -"@babel/helper-annotate-as-pure@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862" - integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw== - dependencies: - "@babel/types" "^7.16.7" - "@babel/helper-annotate-as-pure@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb" @@ -404,14 +210,6 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b" - integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA== - dependencies: - "@babel/helper-explode-assignable-expression" "^7.16.7" - "@babel/types" "^7.16.7" - "@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb" @@ -420,122 +218,43 @@ "@babel/helper-explode-assignable-expression" "^7.18.6" "@babel/types" "^7.18.9" -"@babel/helper-compilation-targets@^7.13.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz#973df8cbd025515f3ff25db0c05efc704fa79818" - integrity sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A== - dependencies: - "@babel/compat-data" "^7.15.0" - "@babel/helper-validator-option" "^7.14.5" - browserslist "^4.16.6" - semver "^6.3.0" - -"@babel/helper-compilation-targets@^7.16.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46" - integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w== +"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb" + integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ== dependencies: - "@babel/compat-data" "^7.17.7" - "@babel/helper-validator-option" "^7.16.7" - browserslist "^4.17.5" - semver "^6.3.0" - -"@babel/helper-compilation-targets@^7.17.10", "@babel/helper-compilation-targets@^7.18.2": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz#67a85a10cbd5fc7f1457fec2e7f45441dc6c754b" - integrity sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ== - dependencies: - "@babel/compat-data" "^7.17.10" - "@babel/helper-validator-option" "^7.16.7" - browserslist "^4.20.2" - semver "^6.3.0" - -"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.0.tgz#537ec8339d53e806ed422f1e06c8f17d55b96bb0" - integrity sha512-Ai5bNWXIvwDvWM7njqsG3feMlL9hCVQsPYXodsZyLwshYkZVJt59Gftau4VrE8S9IT9asd2uSP1hG6wCNw+sXA== - dependencies: - "@babel/compat-data" "^7.19.0" + "@babel/compat-data" "^7.20.5" "@babel/helper-validator-option" "^7.18.6" - browserslist "^4.20.2" + browserslist "^4.21.3" + lru-cache "^5.1.1" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.17.12", "@babel/helper-create-class-features-plugin@^7.18.0": - version "7.18.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz#fac430912606331cb075ea8d82f9a4c145a4da19" - integrity sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.16.7" - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.17.9" - "@babel/helper-member-expression-to-functions" "^7.17.7" - "@babel/helper-optimise-call-expression" "^7.16.7" - "@babel/helper-replace-supers" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" - -"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz#bfd6904620df4e46470bae4850d66be1054c404b" - integrity sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw== +"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.0.tgz#64f49ecb0020532f19b1d014b03bccaa1ab85fb9" + integrity sha512-Q8wNiMIdwsv5la5SPxNYzzkPnjgC0Sy0i7jLkVOCdllu/xcVNkr3TeZzbHBJrj+XXRqzX5uCyCoV9eu6xUG7KQ== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.19.0" - "@babel/helper-member-expression-to-functions" "^7.18.9" + "@babel/helper-function-name" "^7.21.0" + "@babel/helper-member-expression-to-functions" "^7.21.0" "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-replace-supers" "^7.18.9" + "@babel/helper-replace-supers" "^7.20.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" "@babel/helper-split-export-declaration" "^7.18.6" -"@babel/helper-create-regexp-features-plugin@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz#c7d5ac5e9cf621c26057722fb7a8a4c5889358c4" - integrity sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A== - dependencies: - "@babel/helper-annotate-as-pure" "^7.14.5" - regexpu-core "^4.7.1" - -"@babel/helper-create-regexp-features-plugin@^7.16.7": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1" - integrity sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA== - dependencies: - "@babel/helper-annotate-as-pure" "^7.16.7" - regexpu-core "^5.0.1" - -"@babel/helper-create-regexp-features-plugin@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz#bb37ca467f9694bbe55b884ae7a5cc1e0084e4fd" - integrity sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.16.7" - regexpu-core "^5.0.1" - -"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz#7976aca61c0984202baca73d84e2337a5424a41b" - integrity sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw== +"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.0.tgz#53ff78472e5ce10a52664272a239787107603ebb" + integrity sha512-N+LaFW/auRSWdx7SHD/HiARwXQju1vXTW4fKr4u5SgBUTm51OKEjKgj+cs00ggW3kEvNqwErnlwuq7Y3xBe4eg== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" - regexpu-core "^5.1.0" + regexpu-core "^5.3.1" -"@babel/helper-define-polyfill-provider@^0.3.1": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz#52411b445bdb2e676869e5a74960d2d3826d2665" - integrity sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA== - dependencies: - "@babel/helper-compilation-targets" "^7.13.0" - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/traverse" "^7.13.0" - debug "^4.1.1" - lodash.debounce "^4.0.8" - resolve "^1.14.2" - semver "^6.1.2" - -"@babel/helper-define-polyfill-provider@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz#bd10d0aca18e8ce012755395b05a79f45eca5073" - integrity sha512-r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg== +"@babel/helper-define-polyfill-provider@^0.3.3": + version "0.3.3" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a" + integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww== dependencies: "@babel/helper-compilation-targets" "^7.17.7" "@babel/helper-plugin-utils" "^7.16.7" @@ -544,30 +263,11 @@ resolve "^1.14.2" semver "^6.1.2" -"@babel/helper-environment-visitor@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7" - integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag== - dependencies: - "@babel/types" "^7.16.7" - -"@babel/helper-environment-visitor@^7.18.2": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz#8a6d2dedb53f6bf248e31b4baf38739ee4a637bd" - integrity sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ== - "@babel/helper-environment-visitor@^7.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== -"@babel/helper-explode-assignable-expression@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a" - integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ== - dependencies: - "@babel/types" "^7.16.7" - "@babel/helper-explode-assignable-expression@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096" @@ -575,51 +275,13 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-function-name@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4" - integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ== - dependencies: - "@babel/helper-get-function-arity" "^7.14.5" - "@babel/template" "^7.14.5" - "@babel/types" "^7.14.5" - -"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.17.9": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12" - integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg== - dependencies: - "@babel/template" "^7.16.7" - "@babel/types" "^7.17.0" - -"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" - integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w== - dependencies: - "@babel/template" "^7.18.10" - "@babel/types" "^7.19.0" - -"@babel/helper-get-function-arity@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815" - integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg== - dependencies: - "@babel/types" "^7.14.5" - -"@babel/helper-hoist-variables@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d" - integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ== - dependencies: - "@babel/types" "^7.14.5" - -"@babel/helper-hoist-variables@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246" - integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg== +"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4" + integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg== dependencies: - "@babel/types" "^7.16.7" + "@babel/template" "^7.20.7" + "@babel/types" "^7.21.0" "@babel/helper-hoist-variables@^7.18.6": version "7.18.6" @@ -628,40 +290,12 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-member-expression-to-functions@^7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz#0ddaf5299c8179f27f37327936553e9bba60990b" - integrity sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg== - dependencies: - "@babel/types" "^7.15.0" - -"@babel/helper-member-expression-to-functions@^7.16.7", "@babel/helper-member-expression-to-functions@^7.17.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4" - integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw== - dependencies: - "@babel/types" "^7.17.0" - -"@babel/helper-member-expression-to-functions@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815" - integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg== - dependencies: - "@babel/types" "^7.18.9" - -"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3" - integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ== - dependencies: - "@babel/types" "^7.14.5" - -"@babel/helper-module-imports@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" - integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== +"@babel/helper-member-expression-to-functions@^7.20.7", "@babel/helper-member-expression-to-functions@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz#319c6a940431a133897148515877d2f3269c3ba5" + integrity sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q== dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.21.0" "@babel/helper-module-imports@^7.18.6": version "7.18.6" @@ -670,61 +304,19 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-module-transforms@^7.12.1": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz#679275581ea056373eddbe360e1419ef23783b08" - integrity sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg== - dependencies: - "@babel/helper-module-imports" "^7.14.5" - "@babel/helper-replace-supers" "^7.15.0" - "@babel/helper-simple-access" "^7.14.8" - "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/helper-validator-identifier" "^7.14.9" - "@babel/template" "^7.14.5" - "@babel/traverse" "^7.15.0" - "@babel/types" "^7.15.0" - -"@babel/helper-module-transforms@^7.18.0": - version "7.18.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz#baf05dec7a5875fb9235bd34ca18bad4e21221cd" - integrity sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA== - dependencies: - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-module-imports" "^7.16.7" - "@babel/helper-simple-access" "^7.17.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/helper-validator-identifier" "^7.16.7" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.18.0" - "@babel/types" "^7.18.0" - -"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz#309b230f04e22c58c6a2c0c0c7e50b216d350c30" - integrity sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ== +"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2": + version "7.21.2" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2" + integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ== dependencies: "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-simple-access" "^7.18.6" + "@babel/helper-simple-access" "^7.20.2" "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/helper-validator-identifier" "^7.18.6" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.19.0" - "@babel/types" "^7.19.0" - -"@babel/helper-optimise-call-expression@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c" - integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA== - dependencies: - "@babel/types" "^7.14.5" - -"@babel/helper-optimise-call-expression@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2" - integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w== - dependencies: - "@babel/types" "^7.16.7" + "@babel/helper-validator-identifier" "^7.19.1" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.21.2" + "@babel/types" "^7.21.2" "@babel/helper-optimise-call-expression@^7.18.6": version "7.18.6" @@ -738,36 +330,12 @@ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" - integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ== - -"@babel/helper-plugin-utils@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" - integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA== - -"@babel/helper-plugin-utils@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz#86c2347da5acbf5583ba0a10aed4c9bf9da9cf96" - integrity sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA== - -"@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz#4796bb14961521f0f8715990bee2fb6e51ce21bf" - integrity sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw== - -"@babel/helper-remap-async-to-generator@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3" - integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.16.7" - "@babel/helper-wrap-function" "^7.16.8" - "@babel/types" "^7.16.8" - -"@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9": +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" + integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== + +"@babel/helper-remap-async-to-generator@^7.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519" integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA== @@ -777,104 +345,31 @@ "@babel/helper-wrap-function" "^7.18.9" "@babel/types" "^7.18.9" -"@babel/helper-replace-supers@^7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz#ace07708f5bf746bf2e6ba99572cce79b5d4e7f4" - integrity sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.15.0" - "@babel/helper-optimise-call-expression" "^7.14.5" - "@babel/traverse" "^7.15.0" - "@babel/types" "^7.15.0" - -"@babel/helper-replace-supers@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1" - integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw== - dependencies: - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-member-expression-to-functions" "^7.16.7" - "@babel/helper-optimise-call-expression" "^7.16.7" - "@babel/traverse" "^7.16.7" - "@babel/types" "^7.16.7" - -"@babel/helper-replace-supers@^7.18.2": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz#41fdfcc9abaf900e18ba6e5931816d9062a7b2e0" - integrity sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q== - dependencies: - "@babel/helper-environment-visitor" "^7.18.2" - "@babel/helper-member-expression-to-functions" "^7.17.7" - "@babel/helper-optimise-call-expression" "^7.16.7" - "@babel/traverse" "^7.18.2" - "@babel/types" "^7.18.2" - -"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz#1092e002feca980fbbb0bd4d51b74a65c6a500e6" - integrity sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ== +"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331" + integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A== dependencies: "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-member-expression-to-functions" "^7.18.9" + "@babel/helper-member-expression-to-functions" "^7.20.7" "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/traverse" "^7.18.9" - "@babel/types" "^7.18.9" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.7" + "@babel/types" "^7.20.7" -"@babel/helper-simple-access@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz#82e1fec0644a7e775c74d305f212c39f8fe73924" - integrity sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg== +"@babel/helper-simple-access@^7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" + integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== dependencies: - "@babel/types" "^7.14.8" + "@babel/types" "^7.20.2" -"@babel/helper-simple-access@^7.17.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367" - integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA== +"@babel/helper-skip-transparent-expression-wrappers@^7.20.0": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684" + integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg== dependencies: - "@babel/types" "^7.17.0" - -"@babel/helper-simple-access@^7.18.2": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz#4dc473c2169ac3a1c9f4a51cfcd091d1c36fcff9" - integrity sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ== - dependencies: - "@babel/types" "^7.18.2" - -"@babel/helper-simple-access@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea" - integrity sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-skip-transparent-expression-wrappers@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" - integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw== - dependencies: - "@babel/types" "^7.16.0" - -"@babel/helper-skip-transparent-expression-wrappers@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz#778d87b3a758d90b471e7b9918f34a9a02eb5818" - integrity sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw== - dependencies: - "@babel/types" "^7.18.9" - -"@babel/helper-split-export-declaration@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a" - integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA== - dependencies: - "@babel/types" "^7.14.5" - -"@babel/helper-split-export-declaration@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" - integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw== - dependencies: - "@babel/types" "^7.16.7" + "@babel/types" "^7.20.0" "@babel/helper-split-export-declaration@^7.18.6": version "7.18.6" @@ -883,105 +378,39 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-string-parser@^7.18.10": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56" - integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw== - -"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9": - version "7.14.9" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48" - integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g== - -"@babel/helper-validator-identifier@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" - integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== - -"@babel/helper-validator-identifier@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076" - integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g== +"@babel/helper-string-parser@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" + integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== -"@babel/helper-validator-option@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" - integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow== +"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": + version "7.19.1" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" + integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== -"@babel/helper-validator-option@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" - integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ== - -"@babel/helper-validator-option@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" - integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== - -"@babel/helper-wrap-function@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200" - integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw== - dependencies: - "@babel/helper-function-name" "^7.16.7" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.16.8" - "@babel/types" "^7.16.8" +"@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180" + integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ== "@babel/helper-wrap-function@^7.18.9": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz#89f18335cff1152373222f76a4b37799636ae8b1" - integrity sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg== + version "7.20.5" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz#75e2d84d499a0ab3b31c33bcfe59d6b8a45f62e3" + integrity sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q== dependencies: "@babel/helper-function-name" "^7.19.0" "@babel/template" "^7.18.10" - "@babel/traverse" "^7.19.0" - "@babel/types" "^7.19.0" - -"@babel/helpers@^7.12.5": - version "7.15.3" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.3.tgz#c96838b752b95dcd525b4e741ed40bb1dc2a1357" - integrity sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g== - dependencies: - "@babel/template" "^7.14.5" - "@babel/traverse" "^7.15.0" - "@babel/types" "^7.15.0" - -"@babel/helpers@^7.18.2": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.2.tgz#970d74f0deadc3f5a938bfa250738eb4ac889384" - integrity sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg== - dependencies: - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.18.2" - "@babel/types" "^7.18.2" + "@babel/traverse" "^7.20.5" + "@babel/types" "^7.20.5" -"@babel/helpers@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.0.tgz#f30534657faf246ae96551d88dd31e9d1fa1fc18" - integrity sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg== +"@babel/helpers@^7.12.5", "@babel/helpers@^7.21.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e" + integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA== dependencies: - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.19.0" - "@babel/types" "^7.19.0" - -"@babel/highlight@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" - integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== - dependencies: - "@babel/helper-validator-identifier" "^7.14.5" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/highlight@^7.16.7": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.9.tgz#61b2ee7f32ea0454612def4fccdae0de232b73e3" - integrity sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg== - dependencies: - "@babel/helper-validator-identifier" "^7.16.7" - chalk "^2.0.0" - js-tokens "^4.0.0" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.21.0" + "@babel/types" "^7.21.0" "@babel/highlight@^7.18.6": version "7.18.6" @@ -992,32 +421,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.12.7", "@babel/parser@^7.14.5", "@babel/parser@^7.15.0": - version "7.15.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.3.tgz#3416d9bea748052cfcb63dbcc27368105b1ed862" - integrity sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA== - -"@babel/parser@^7.16.7", "@babel/parser@^7.17.9": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.9.tgz#9c94189a6062f0291418ca021077983058e171ef" - integrity sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg== - -"@babel/parser@^7.18.0": - version "7.18.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.4.tgz#6774231779dd700e0af29f6ad8d479582d7ce5ef" - integrity sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow== - -"@babel/parser@^7.18.10", "@babel/parser@^7.18.8", "@babel/parser@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.0.tgz#497fcafb1d5b61376959c1c338745ef0577aa02c" - integrity sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw== - -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz#1dca338caaefca368639c9ffb095afbd4d420b1e" - integrity sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" +"@babel/parser@^7.12.7", "@babel/parser@^7.18.8", "@babel/parser@^7.20.7", "@babel/parser@^7.21.3": + version "7.21.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.3.tgz#1d285d67a19162ff9daa358d4cb41d50c06220b3" + integrity sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": version "7.18.6" @@ -1026,51 +433,25 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz#0d498ec8f0374b1e2eb54b9cb2c4c78714c77753" - integrity sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" - "@babel/plugin-proposal-optional-chaining" "^7.17.12" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz#a11af19aa373d68d561f08e0a57242350ed0ec50" - integrity sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" - "@babel/plugin-proposal-optional-chaining" "^7.18.9" - -"@babel/plugin-proposal-async-generator-functions@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz#094a417e31ce7e692d84bab06c8e2a607cbeef03" - integrity sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz#d9c85589258539a22a901033853101a6198d4ef1" + integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ== dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/helper-remap-async-to-generator" "^7.16.8" - "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" + "@babel/plugin-proposal-optional-chaining" "^7.20.7" -"@babel/plugin-proposal-async-generator-functions@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.0.tgz#cf5740194f170467df20581712400487efc79ff1" - integrity sha512-nhEByMUTx3uZueJ/QkJuSlCfN4FGg+xy+vRsfGQGzSauq5ks2Deid2+05Q3KhfaUjvec1IGhw/Zm3cFm8JigTQ== +"@babel/plugin-proposal-async-generator-functions@^7.20.1": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326" + integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA== dependencies: "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/helper-remap-async-to-generator" "^7.18.9" "@babel/plugin-syntax-async-generators" "^7.8.4" -"@babel/plugin-proposal-class-properties@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz#84f65c0cc247d46f40a6da99aadd6438315d80a4" - integrity sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.17.12" - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/plugin-proposal-class-properties@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3" @@ -1079,32 +460,15 @@ "@babel/helper-create-class-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-proposal-class-static-block@^7.18.0": - version "7.18.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz#7d02253156e3c3793bdb9f2faac3a1c05f0ba710" - integrity sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.18.0" - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - "@babel/plugin-proposal-class-static-block@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz#8aa81d403ab72d3962fc06c26e222dacfc9b9020" - integrity sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw== + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d" + integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw== dependencies: - "@babel/helper-create-class-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-create-class-features-plugin" "^7.21.0" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-class-static-block" "^7.14.5" -"@babel/plugin-proposal-dynamic-import@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2" - integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-proposal-dynamic-import@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94" @@ -1113,14 +477,6 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-proposal-export-namespace-from@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz#b22864ccd662db9606edb2287ea5fd1709f05378" - integrity sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-proposal-export-namespace-from@^7.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203" @@ -1129,14 +485,6 @@ "@babel/helper-plugin-utils" "^7.18.9" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-proposal-json-strings@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz#f4642951792437233216d8c1af370bb0fbff4664" - integrity sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-proposal-json-strings@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b" @@ -1145,30 +493,14 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-proposal-logical-assignment-operators@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz#c64a1bcb2b0a6d0ed2ff674fd120f90ee4b88a23" - integrity sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - "@babel/plugin-proposal-logical-assignment-operators@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz#8148cbb350483bf6220af06fa6db3690e14b2e23" - integrity sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83" + integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug== dependencies: - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-proposal-nullish-coalescing-operator@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz#1e93079bbc2cbc756f6db6a1925157c4a92b94be" - integrity sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1" @@ -1177,14 +509,6 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" -"@babel/plugin-proposal-numeric-separator@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9" - integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - "@babel/plugin-proposal-numeric-separator@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75" @@ -1202,35 +526,16 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.0" "@babel/plugin-transform-parameters" "^7.12.1" -"@babel/plugin-proposal-object-rest-spread@^7.18.0": - version "7.18.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz#79f2390c892ba2a68ec112eb0d895cfbd11155e8" - integrity sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw== - dependencies: - "@babel/compat-data" "^7.17.10" - "@babel/helper-compilation-targets" "^7.17.10" - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.17.12" - -"@babel/plugin-proposal-object-rest-spread@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz#f9434f6beb2c8cae9dfcf97d2a5941bbbf9ad4e7" - integrity sha512-kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q== +"@babel/plugin-proposal-object-rest-spread@^7.20.2": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a" + integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg== dependencies: - "@babel/compat-data" "^7.18.8" - "@babel/helper-compilation-targets" "^7.18.9" - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/compat-data" "^7.20.5" + "@babel/helper-compilation-targets" "^7.20.7" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.18.8" - -"@babel/plugin-proposal-optional-catch-binding@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf" - integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-transform-parameters" "^7.20.7" "@babel/plugin-proposal-optional-catch-binding@^7.18.6": version "7.18.6" @@ -1240,32 +545,15 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-proposal-optional-chaining@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz#f96949e9bacace3a9066323a5cf90cfb9de67174" - integrity sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ== +"@babel/plugin-proposal-optional-chaining@^7.18.9", "@babel/plugin-proposal-optional-chaining@^7.20.7": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea" + integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA== dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-proposal-optional-chaining@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz#e8e8fe0723f2563960e4bf5e9690933691915993" - integrity sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - -"@babel/plugin-proposal-private-methods@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz#c2ca3a80beb7539289938da005ad525a038a819c" - integrity sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.17.12" - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/plugin-proposal-private-methods@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea" @@ -1274,35 +562,17 @@ "@babel/helper-create-class-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-proposal-private-property-in-object@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz#b02efb7f106d544667d91ae97405a9fd8c93952d" - integrity sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.16.7" - "@babel/helper-create-class-features-plugin" "^7.17.12" - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" - "@babel/plugin-proposal-private-property-in-object@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz#a64137b232f0aca3733a67eb1a144c192389c503" - integrity sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw== + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz#19496bd9883dd83c23c7d7fc45dcd9ad02dfa1dc" + integrity sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-create-class-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-create-class-features-plugin" "^7.21.0" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" -"@babel/plugin-proposal-unicode-property-regex@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz#3dbd7a67bd7f94c8238b394da112d86aaf32ad4d" - integrity sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.17.12" - "@babel/helper-plugin-utils" "^7.17.12" - -"@babel/plugin-proposal-unicode-property-regex@^7.18.6": +"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e" integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w== @@ -1310,14 +580,6 @@ "@babel/helper-create-regexp-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz#0f95ee0e757a5d647f378daa0eca7e93faa8bbe8" - integrity sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" @@ -1353,19 +615,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-import-assertions@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz#58096a92b11b2e4e54b24c6a0cc0e5e607abcedd" - integrity sha512-n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - -"@babel/plugin-syntax-import-assertions@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz#cd6190500a4fa2fe31990a963ffab4b63e4505e4" - integrity sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ== +"@babel/plugin-syntax-import-assertions@^7.20.0": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4" + integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.19.0" "@babel/plugin-syntax-json-strings@^7.8.3": version "7.8.3" @@ -1381,13 +636,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-jsx@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.17.12.tgz#834035b45061983a491f60096f61a2e7c5674a47" - integrity sha512-spyY3E3AURfxh/RHtjx5j6hs8am5NbUBGfcZ2vB3uShSpZdQyXSf5rR5Mk76vbtlAZOelyVQ71Fg0x9SG4fsog== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/plugin-syntax-jsx@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0" @@ -1451,58 +699,28 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-typescript@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.12.tgz#b54fc3be6de734a56b87508f99d6428b5b605a7b" - integrity sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - -"@babel/plugin-syntax-typescript@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz#1c09cd25795c7c2b8a4ba9ae49394576d4133285" - integrity sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-arrow-functions@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz#dddd783b473b1b1537ef46423e3944ff24898c45" - integrity sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA== +"@babel/plugin-syntax-typescript@^7.20.0": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz#4e9a0cfc769c85689b77a2e642d24e9f697fc8c7" + integrity sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ== dependencies: - "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-plugin-utils" "^7.19.0" "@babel/plugin-transform-arrow-functions@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz#19063fcf8771ec7b31d742339dac62433d0611fe" - integrity sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551" + integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-async-to-generator@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz#dbe5511e6b01eee1496c944e35cdfe3f58050832" - integrity sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ== - dependencies: - "@babel/helper-module-imports" "^7.16.7" - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/helper-remap-async-to-generator" "^7.16.8" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-transform-async-to-generator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz#ccda3d1ab9d5ced5265fdb13f1882d5476c71615" - integrity sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz#dfee18623c8cb31deb796aa3ca84dda9cea94354" + integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q== dependencies: "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/helper-remap-async-to-generator" "^7.18.6" - -"@babel/plugin-transform-block-scoped-functions@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620" - integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-remap-async-to-generator" "^7.18.9" "@babel/plugin-transform-block-scoped-functions@^7.18.6": version "7.18.6" @@ -1511,86 +729,44 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-block-scoping@^7.17.12": - version "7.18.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.4.tgz#7988627b3e9186a13e4d7735dc9c34a056613fb9" - integrity sha512-+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw== +"@babel/plugin-transform-block-scoping@^7.20.2": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz#e737b91037e5186ee16b76e7ae093358a5634f02" + integrity sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ== dependencies: - "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-plugin-utils" "^7.20.2" -"@babel/plugin-transform-block-scoping@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz#f9b7e018ac3f373c81452d6ada8bd5a18928926d" - integrity sha512-5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-classes@^7.17.12": - version "7.18.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.4.tgz#51310b812a090b846c784e47087fa6457baef814" - integrity sha512-e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A== - dependencies: - "@babel/helper-annotate-as-pure" "^7.16.7" - "@babel/helper-environment-visitor" "^7.18.2" - "@babel/helper-function-name" "^7.17.9" - "@babel/helper-optimise-call-expression" "^7.16.7" - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/helper-replace-supers" "^7.18.2" - "@babel/helper-split-export-declaration" "^7.16.7" - globals "^11.1.0" - -"@babel/plugin-transform-classes@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz#0e61ec257fba409c41372175e7c1e606dc79bb20" - integrity sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A== +"@babel/plugin-transform-classes@^7.20.2": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz#f469d0b07a4c5a7dbb21afad9e27e57b47031665" + integrity sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-compilation-targets" "^7.19.0" + "@babel/helper-compilation-targets" "^7.20.7" "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.19.0" + "@babel/helper-function-name" "^7.21.0" "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-plugin-utils" "^7.19.0" - "@babel/helper-replace-supers" "^7.18.9" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-replace-supers" "^7.20.7" "@babel/helper-split-export-declaration" "^7.18.6" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz#bca616a83679698f3258e892ed422546e531387f" - integrity sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/plugin-transform-computed-properties@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz#2357a8224d402dad623caf6259b611e56aec746e" - integrity sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-destructuring@^7.18.0": - version "7.18.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz#dc4f92587e291b4daa78aa20cc2d7a63aa11e858" - integrity sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - -"@babel/plugin-transform-destructuring@^7.18.13": - version "7.18.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz#9e03bc4a94475d62b7f4114938e6c5c33372cbf5" - integrity sha512-TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa" + integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/template" "^7.20.7" -"@babel/plugin-transform-dotall-regex@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241" - integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ== +"@babel/plugin-transform-destructuring@^7.20.2": + version "7.21.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz#73b46d0fd11cd6ef57dea8a381b1215f4959d401" + integrity sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.20.2" -"@babel/plugin-transform-dotall-regex@^7.18.6": +"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8" integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg== @@ -1598,21 +774,6 @@ "@babel/helper-create-regexp-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz#2f6bf76e46bdf8043b4e7e16cf24532629ba0c7a" - integrity sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.14.5" - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-duplicate-keys@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz#a09aa709a3310013f8e48e0e23bc7ace0f21477c" - integrity sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/plugin-transform-duplicate-keys@^7.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e" @@ -1620,14 +781,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-exponentiation-operator@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b" - integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA== - dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-transform-exponentiation-operator@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd" @@ -1636,28 +789,12 @@ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-for-of@^7.18.1": - version "7.18.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz#ed14b657e162b72afbbb2b4cdad277bf2bb32036" - integrity sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/plugin-transform-for-of@^7.18.8": - version "7.18.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1" - integrity sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-function-name@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf" - integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA== + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz#964108c9988de1a60b4be2354a7d7e245f36e86e" + integrity sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ== dependencies: - "@babel/helper-compilation-targets" "^7.16.7" - "@babel/helper-function-name" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-transform-function-name@^7.18.9": version "7.18.9" @@ -1668,13 +805,6 @@ "@babel/helper-function-name" "^7.18.9" "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-literals@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz#97131fbc6bbb261487105b4b3edbf9ebf9c830ae" - integrity sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/plugin-transform-literals@^7.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc" @@ -1682,13 +812,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-member-expression-literals@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384" - integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-transform-member-expression-literals@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e" @@ -1696,73 +819,32 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-modules-amd@^7.18.0": - version "7.18.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz#7ef1002e67e36da3155edc8bf1ac9398064c02ed" - integrity sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA== - dependencies: - "@babel/helper-module-transforms" "^7.18.0" - "@babel/helper-plugin-utils" "^7.17.12" - babel-plugin-dynamic-import-node "^2.3.3" - -"@babel/plugin-transform-modules-amd@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz#8c91f8c5115d2202f277549848874027d7172d21" - integrity sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg== - dependencies: - "@babel/helper-module-transforms" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - babel-plugin-dynamic-import-node "^2.3.3" - -"@babel/plugin-transform-modules-commonjs@^7.18.2": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz#1aa8efa2e2a6e818b6a7f2235fceaf09bdb31e9e" - integrity sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ== - dependencies: - "@babel/helper-module-transforms" "^7.18.0" - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/helper-simple-access" "^7.18.2" - babel-plugin-dynamic-import-node "^2.3.3" - -"@babel/plugin-transform-modules-commonjs@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz#afd243afba166cca69892e24a8fd8c9f2ca87883" - integrity sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q== +"@babel/plugin-transform-modules-amd@^7.19.6": + version "7.20.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz#3daccca8e4cc309f03c3a0c4b41dc4b26f55214a" + integrity sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g== dependencies: - "@babel/helper-module-transforms" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/helper-simple-access" "^7.18.6" - babel-plugin-dynamic-import-node "^2.3.3" + "@babel/helper-module-transforms" "^7.20.11" + "@babel/helper-plugin-utils" "^7.20.2" -"@babel/plugin-transform-modules-systemjs@^7.18.0": - version "7.18.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.4.tgz#3d6fd9868c735cce8f38d6ae3a407fb7e61e6d46" - integrity sha512-lH2UaQaHVOAeYrUUuZ8i38o76J/FnO8vu21OE+tD1MyP9lxdZoSfz+pDbWkq46GogUrdrMz3tiz/FYGB+bVThg== +"@babel/plugin-transform-modules-commonjs@^7.19.6": + version "7.21.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz#6ff5070e71e3192ef2b7e39820a06fb78e3058e7" + integrity sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA== dependencies: - "@babel/helper-hoist-variables" "^7.16.7" - "@babel/helper-module-transforms" "^7.18.0" - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/helper-validator-identifier" "^7.16.7" - babel-plugin-dynamic-import-node "^2.3.3" + "@babel/helper-module-transforms" "^7.21.2" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-simple-access" "^7.20.2" -"@babel/plugin-transform-modules-systemjs@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz#5f20b471284430f02d9c5059d9b9a16d4b085a1f" - integrity sha512-x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A== +"@babel/plugin-transform-modules-systemjs@^7.19.6": + version "7.20.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz#467ec6bba6b6a50634eea61c9c232654d8a4696e" + integrity sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw== dependencies: "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-module-transforms" "^7.19.0" - "@babel/helper-plugin-utils" "^7.19.0" - "@babel/helper-validator-identifier" "^7.18.6" - babel-plugin-dynamic-import-node "^2.3.3" - -"@babel/plugin-transform-modules-umd@^7.18.0": - version "7.18.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz#56aac64a2c2a1922341129a4597d1fd5c3ff020f" - integrity sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA== - dependencies: - "@babel/helper-module-transforms" "^7.18.0" - "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-module-transforms" "^7.20.11" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-validator-identifier" "^7.19.1" "@babel/plugin-transform-modules-umd@^7.18.6": version "7.18.6" @@ -1772,28 +854,13 @@ "@babel/helper-module-transforms" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-named-capturing-groups-regex@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz#9c4a5a5966e0434d515f2675c227fd8cc8606931" - integrity sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.17.12" - "@babel/helper-plugin-utils" "^7.17.12" - -"@babel/plugin-transform-named-capturing-groups-regex@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.0.tgz#58c52422e4f91a381727faed7d513c89d7f41ada" - integrity sha512-HDSuqOQzkU//kfGdiHBt71/hkDTApw4U/cMVgKgX7PqfB3LOaK+2GtCEsBu1dL9CkswDm0Gwehht1dCr421ULQ== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.19.0" - "@babel/helper-plugin-utils" "^7.19.0" - -"@babel/plugin-transform-new-target@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz#10842cd605a620944e81ea6060e9e65c265742e3" - integrity sha512-CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w== +"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1": + version "7.20.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8" + integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA== dependencies: - "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-create-regexp-features-plugin" "^7.20.5" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-transform-new-target@^7.18.6": version "7.18.6" @@ -1802,14 +869,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-object-super@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94" - integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-replace-supers" "^7.16.7" - "@babel/plugin-transform-object-super@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c" @@ -1818,33 +877,12 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/helper-replace-supers" "^7.18.6" -"@babel/plugin-transform-parameters@^7.12.1": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz#49662e86a1f3ddccac6363a7dfb1ff0a158afeb3" - integrity sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-parameters@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz#eb467cd9586ff5ff115a9880d6fdbd4a846b7766" - integrity sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA== +"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.20.1", "@babel/plugin-transform-parameters@^7.20.7": + version "7.21.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz#18fc4e797cf6d6d972cb8c411dbe8a809fa157db" + integrity sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ== dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - -"@babel/plugin-transform-parameters@^7.18.8": - version "7.18.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz#ee9f1a0ce6d78af58d0956a9378ea3427cccb48a" - integrity sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-property-literals@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55" - integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-transform-property-literals@^7.18.6": version "7.18.6" @@ -1853,19 +891,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-react-constant-elements@^7.14.5": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.17.12.tgz#cc580857696b6dd9e5e3d079e673d060a0657f37" - integrity sha512-maEkX2xs2STuv2Px8QuqxqjhV2LsFobT1elCgyU5704fcyTu9DyD/bJXxD/mrRiVyhpHweOQ00OJ5FKhHq9oEw== +"@babel/plugin-transform-react-constant-elements@^7.18.12": + version "7.21.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.21.3.tgz#b32a5556100d424b25e388dd689050d78396884d" + integrity sha512-4DVcFeWe/yDYBLp0kBmOGFJ6N2UYg7coGid1gdxb4co62dy/xISDMaYBXBVXEDhfgMk7qkbcYiGtwd5Q/hwDDQ== dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - -"@babel/plugin-transform-react-display-name@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz#7b6d40d232f4c0f550ea348593db3b21e2404340" - integrity sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-transform-react-display-name@^7.18.6": version "7.18.6" @@ -1874,13 +905,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-react-jsx-development@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz#43a00724a3ed2557ed3f276a01a929e6686ac7b8" - integrity sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A== - dependencies: - "@babel/plugin-transform-react-jsx" "^7.16.7" - "@babel/plugin-transform-react-jsx-development@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz#dbe5c972811e49c7405b630e4d0d2e1380c0ddc5" @@ -1888,66 +912,32 @@ dependencies: "@babel/plugin-transform-react-jsx" "^7.18.6" -"@babel/plugin-transform-react-jsx@^7.16.7", "@babel/plugin-transform-react-jsx@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.12.tgz#2aa20022709cd6a3f40b45d60603d5f269586dba" - integrity sha512-Lcaw8bxd1DKht3thfD4A12dqo1X16he1Lm8rIv8sTwjAYNInRS1qHa9aJoqvzpscItXvftKDCfaEQzwoVyXpEQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.16.7" - "@babel/helper-module-imports" "^7.16.7" - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/plugin-syntax-jsx" "^7.17.12" - "@babel/types" "^7.17.12" - "@babel/plugin-transform-react-jsx@^7.18.6": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz#b3cbb7c3a00b92ec8ae1027910e331ba5c500eb9" - integrity sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg== + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.21.0.tgz#656b42c2fdea0a6d8762075d58ef9d4e3c4ab8a2" + integrity sha512-6OAWljMvQrZjR2DaNhVfRz6dkCAVV+ymcLUmaf8bccGOHn2v5rHJK3tTpij0BuhdYWP4LLaqj5lwcdlpAAPuvg== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-jsx" "^7.18.6" - "@babel/types" "^7.19.0" - -"@babel/plugin-transform-react-pure-annotations@^7.16.7": - version "7.18.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.0.tgz#ef82c8e310913f3522462c9ac967d395092f1954" - integrity sha512-6+0IK6ouvqDn9bmEG7mEyF/pwlJXVj5lwydybpyyH3D0A7Hftk+NCTdYjnLNZksn261xaOV5ksmp20pQEmc2RQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.16.7" - "@babel/helper-plugin-utils" "^7.17.12" + "@babel/types" "^7.21.0" "@babel/plugin-transform-react-pure-annotations@^7.18.6": version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz#561af267f19f3e5d59291f9950fd7b9663d0d844" - integrity sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-regenerator@^7.18.0": - version "7.18.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz#44274d655eb3f1af3f3a574ba819d3f48caf99d5" - integrity sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - regenerator-transform "^0.15.0" - -"@babel/plugin-transform-regenerator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz#585c66cb84d4b4bf72519a34cfce761b8676ca73" - integrity sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ== + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz#561af267f19f3e5d59291f9950fd7b9663d0d844" + integrity sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ== dependencies: + "@babel/helper-annotate-as-pure" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" - regenerator-transform "^0.15.0" -"@babel/plugin-transform-reserved-words@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz#7dbd349f3cdffba751e817cf40ca1386732f652f" - integrity sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA== +"@babel/plugin-transform-regenerator@^7.18.6": + version "7.20.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz#57cda588c7ffb7f4f8483cc83bdcea02a907f04d" + integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ== dependencies: - "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-plugin-utils" "^7.20.2" + regenerator-transform "^0.15.1" "@babel/plugin-transform-reserved-words@^7.18.6": version "7.18.6" @@ -1957,24 +947,17 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-runtime@^7.18.6": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.10.tgz#37d14d1fa810a368fd635d4d1476c0154144a96f" - integrity sha512-q5mMeYAdfEbpBAgzl7tBre/la3LeCxmDO1+wMXRdPWbcoMjR3GiXlCLk7JBZVVye0bqTGNMbt0yYVXX1B1jEWQ== + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.0.tgz#2a884f29556d0a68cd3d152dcc9e6c71dfb6eee8" + integrity sha512-ReY6pxwSzEU0b3r2/T/VhqMKg/AkceBT19X0UptA3/tYi5Pe2eXgEUH+NNMC5nok6c6XQz5tyVTUpuezRfSMSg== dependencies: "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.9" - babel-plugin-polyfill-corejs2 "^0.3.2" - babel-plugin-polyfill-corejs3 "^0.5.3" - babel-plugin-polyfill-regenerator "^0.4.0" + "@babel/helper-plugin-utils" "^7.20.2" + babel-plugin-polyfill-corejs2 "^0.3.3" + babel-plugin-polyfill-corejs3 "^0.6.0" + babel-plugin-polyfill-regenerator "^0.4.1" semver "^6.3.0" -"@babel/plugin-transform-shorthand-properties@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a" - integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-transform-shorthand-properties@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9" @@ -1982,28 +965,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-spread@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz#c112cad3064299f03ea32afed1d659223935d1f5" - integrity sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" - "@babel/plugin-transform-spread@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz#dd60b4620c2fec806d60cfaae364ec2188d593b6" - integrity sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w== - dependencies: - "@babel/helper-plugin-utils" "^7.19.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" - -"@babel/plugin-transform-sticky-regex@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660" - integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e" + integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw== dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" "@babel/plugin-transform-sticky-regex@^7.18.6": version "7.18.6" @@ -2012,13 +980,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-template-literals@^7.18.2": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz#31ed6915721864847c48b656281d0098ea1add28" - integrity sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/plugin-transform-template-literals@^7.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e" @@ -2026,13 +987,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-typeof-symbol@^7.17.12": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz#0f12f57ac35e98b35b4ed34829948d42bd0e6889" - integrity sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/plugin-transform-typeof-symbol@^7.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0" @@ -2040,30 +994,15 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-typescript@^7.17.12": - version "7.18.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.4.tgz#587eaf6a39edb8c06215e550dc939faeadd750bf" - integrity sha512-l4vHuSLUajptpHNEOUDEGsnpl9pfRLsN1XUoDQDD/YBuXTM+v37SHGS+c6n4jdcZy96QtuUuSvZYMLSSsjH8Mw== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.18.0" - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/plugin-syntax-typescript" "^7.17.12" - -"@babel/plugin-transform-typescript@^7.18.6": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.19.0.tgz#50c3a68ec8efd5e040bde2cd764e8e16bc0cbeaf" - integrity sha512-DOOIywxPpkQHXijXv+s9MDAyZcLp12oYRl3CMWZ6u7TjSoCBq/KqHR/nNFR3+i2xqheZxoF0H2XyL7B6xeSRuA== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.19.0" - "@babel/helper-plugin-utils" "^7.19.0" - "@babel/plugin-syntax-typescript" "^7.18.6" - -"@babel/plugin-transform-unicode-escapes@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3" - integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q== +"@babel/plugin-transform-typescript@^7.21.0": + version "7.21.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.3.tgz#316c5be579856ea890a57ebc5116c5d064658f2b" + integrity sha512-RQxPz6Iqt8T0uw/WsJNReuBpWpBqs/n7mNo18sKLoTbMp+UrEekhH+pKSVC7gWz+DNjo9gryfV8YzCiT45RgMw== dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-create-class-features-plugin" "^7.21.0" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-syntax-typescript" "^7.20.0" "@babel/plugin-transform-unicode-escapes@^7.18.10": version "7.18.10" @@ -2072,14 +1011,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-unicode-regex@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2" - integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-transform-unicode-regex@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca" @@ -2088,99 +1019,18 @@ "@babel/helper-create-regexp-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/preset-env@^7.15.6": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.2.tgz#f47d3000a098617926e674c945d95a28cb90977a" - integrity sha512-PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q== - dependencies: - "@babel/compat-data" "^7.17.10" - "@babel/helper-compilation-targets" "^7.18.2" - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/helper-validator-option" "^7.16.7" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.17.12" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.17.12" - "@babel/plugin-proposal-async-generator-functions" "^7.17.12" - "@babel/plugin-proposal-class-properties" "^7.17.12" - "@babel/plugin-proposal-class-static-block" "^7.18.0" - "@babel/plugin-proposal-dynamic-import" "^7.16.7" - "@babel/plugin-proposal-export-namespace-from" "^7.17.12" - "@babel/plugin-proposal-json-strings" "^7.17.12" - "@babel/plugin-proposal-logical-assignment-operators" "^7.17.12" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.17.12" - "@babel/plugin-proposal-numeric-separator" "^7.16.7" - "@babel/plugin-proposal-object-rest-spread" "^7.18.0" - "@babel/plugin-proposal-optional-catch-binding" "^7.16.7" - "@babel/plugin-proposal-optional-chaining" "^7.17.12" - "@babel/plugin-proposal-private-methods" "^7.17.12" - "@babel/plugin-proposal-private-property-in-object" "^7.17.12" - "@babel/plugin-proposal-unicode-property-regex" "^7.17.12" - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-class-properties" "^7.12.13" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-import-assertions" "^7.17.12" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" - "@babel/plugin-syntax-top-level-await" "^7.14.5" - "@babel/plugin-transform-arrow-functions" "^7.17.12" - "@babel/plugin-transform-async-to-generator" "^7.17.12" - "@babel/plugin-transform-block-scoped-functions" "^7.16.7" - "@babel/plugin-transform-block-scoping" "^7.17.12" - "@babel/plugin-transform-classes" "^7.17.12" - "@babel/plugin-transform-computed-properties" "^7.17.12" - "@babel/plugin-transform-destructuring" "^7.18.0" - "@babel/plugin-transform-dotall-regex" "^7.16.7" - "@babel/plugin-transform-duplicate-keys" "^7.17.12" - "@babel/plugin-transform-exponentiation-operator" "^7.16.7" - "@babel/plugin-transform-for-of" "^7.18.1" - "@babel/plugin-transform-function-name" "^7.16.7" - "@babel/plugin-transform-literals" "^7.17.12" - "@babel/plugin-transform-member-expression-literals" "^7.16.7" - "@babel/plugin-transform-modules-amd" "^7.18.0" - "@babel/plugin-transform-modules-commonjs" "^7.18.2" - "@babel/plugin-transform-modules-systemjs" "^7.18.0" - "@babel/plugin-transform-modules-umd" "^7.18.0" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.17.12" - "@babel/plugin-transform-new-target" "^7.17.12" - "@babel/plugin-transform-object-super" "^7.16.7" - "@babel/plugin-transform-parameters" "^7.17.12" - "@babel/plugin-transform-property-literals" "^7.16.7" - "@babel/plugin-transform-regenerator" "^7.18.0" - "@babel/plugin-transform-reserved-words" "^7.17.12" - "@babel/plugin-transform-shorthand-properties" "^7.16.7" - "@babel/plugin-transform-spread" "^7.17.12" - "@babel/plugin-transform-sticky-regex" "^7.16.7" - "@babel/plugin-transform-template-literals" "^7.18.2" - "@babel/plugin-transform-typeof-symbol" "^7.17.12" - "@babel/plugin-transform-unicode-escapes" "^7.16.7" - "@babel/plugin-transform-unicode-regex" "^7.16.7" - "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.18.2" - babel-plugin-polyfill-corejs2 "^0.3.0" - babel-plugin-polyfill-corejs3 "^0.5.0" - babel-plugin-polyfill-regenerator "^0.3.0" - core-js-compat "^3.22.1" - semver "^6.3.0" - -"@babel/preset-env@^7.18.6": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.19.0.tgz#fd18caf499a67d6411b9ded68dc70d01ed1e5da7" - integrity sha512-1YUju1TAFuzjIQqNM9WsF4U6VbD/8t3wEAlw3LFYuuEr+ywqLRcSXxFKz4DCEj+sN94l/XTDiUXYRrsvMpz9WQ== +"@babel/preset-env@^7.18.6", "@babel/preset-env@^7.19.4": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.20.2.tgz#9b1642aa47bb9f43a86f9630011780dab7f86506" + integrity sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg== dependencies: - "@babel/compat-data" "^7.19.0" - "@babel/helper-compilation-targets" "^7.19.0" - "@babel/helper-plugin-utils" "^7.19.0" + "@babel/compat-data" "^7.20.1" + "@babel/helper-compilation-targets" "^7.20.0" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/helper-validator-option" "^7.18.6" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9" - "@babel/plugin-proposal-async-generator-functions" "^7.19.0" + "@babel/plugin-proposal-async-generator-functions" "^7.20.1" "@babel/plugin-proposal-class-properties" "^7.18.6" "@babel/plugin-proposal-class-static-block" "^7.18.6" "@babel/plugin-proposal-dynamic-import" "^7.18.6" @@ -2189,7 +1039,7 @@ "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6" "@babel/plugin-proposal-numeric-separator" "^7.18.6" - "@babel/plugin-proposal-object-rest-spread" "^7.18.9" + "@babel/plugin-proposal-object-rest-spread" "^7.20.2" "@babel/plugin-proposal-optional-catch-binding" "^7.18.6" "@babel/plugin-proposal-optional-chaining" "^7.18.9" "@babel/plugin-proposal-private-methods" "^7.18.6" @@ -2200,7 +1050,7 @@ "@babel/plugin-syntax-class-static-block" "^7.14.5" "@babel/plugin-syntax-dynamic-import" "^7.8.3" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-import-assertions" "^7.18.6" + "@babel/plugin-syntax-import-assertions" "^7.20.0" "@babel/plugin-syntax-json-strings" "^7.8.3" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" @@ -2213,10 +1063,10 @@ "@babel/plugin-transform-arrow-functions" "^7.18.6" "@babel/plugin-transform-async-to-generator" "^7.18.6" "@babel/plugin-transform-block-scoped-functions" "^7.18.6" - "@babel/plugin-transform-block-scoping" "^7.18.9" - "@babel/plugin-transform-classes" "^7.19.0" + "@babel/plugin-transform-block-scoping" "^7.20.2" + "@babel/plugin-transform-classes" "^7.20.2" "@babel/plugin-transform-computed-properties" "^7.18.9" - "@babel/plugin-transform-destructuring" "^7.18.13" + "@babel/plugin-transform-destructuring" "^7.20.2" "@babel/plugin-transform-dotall-regex" "^7.18.6" "@babel/plugin-transform-duplicate-keys" "^7.18.9" "@babel/plugin-transform-exponentiation-operator" "^7.18.6" @@ -2224,14 +1074,14 @@ "@babel/plugin-transform-function-name" "^7.18.9" "@babel/plugin-transform-literals" "^7.18.9" "@babel/plugin-transform-member-expression-literals" "^7.18.6" - "@babel/plugin-transform-modules-amd" "^7.18.6" - "@babel/plugin-transform-modules-commonjs" "^7.18.6" - "@babel/plugin-transform-modules-systemjs" "^7.19.0" + "@babel/plugin-transform-modules-amd" "^7.19.6" + "@babel/plugin-transform-modules-commonjs" "^7.19.6" + "@babel/plugin-transform-modules-systemjs" "^7.19.6" "@babel/plugin-transform-modules-umd" "^7.18.6" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.0" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.1" "@babel/plugin-transform-new-target" "^7.18.6" "@babel/plugin-transform-object-super" "^7.18.6" - "@babel/plugin-transform-parameters" "^7.18.8" + "@babel/plugin-transform-parameters" "^7.20.1" "@babel/plugin-transform-property-literals" "^7.18.6" "@babel/plugin-transform-regenerator" "^7.18.6" "@babel/plugin-transform-reserved-words" "^7.18.6" @@ -2243,11 +1093,11 @@ "@babel/plugin-transform-unicode-escapes" "^7.18.10" "@babel/plugin-transform-unicode-regex" "^7.18.6" "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.19.0" - babel-plugin-polyfill-corejs2 "^0.3.2" - babel-plugin-polyfill-corejs3 "^0.5.3" - babel-plugin-polyfill-regenerator "^0.4.0" - core-js-compat "^3.22.1" + "@babel/types" "^7.20.2" + babel-plugin-polyfill-corejs2 "^0.3.3" + babel-plugin-polyfill-corejs3 "^0.6.0" + babel-plugin-polyfill-regenerator "^0.4.1" + core-js-compat "^3.25.1" semver "^6.3.0" "@babel/preset-modules@^0.1.5": @@ -2261,18 +1111,6 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" -"@babel/preset-react@^7.14.5": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.17.12.tgz#62adbd2d1870c0de3893095757ed5b00b492ab3d" - integrity sha512-h5U+rwreXtZaRBEQhW1hOJLMq8XNJBQ/9oymXiCXTuT/0uOwpbT0gUt+sXeOqoXBgNuUKI7TaObVwoEyWkpFgA== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/helper-validator-option" "^7.16.7" - "@babel/plugin-transform-react-display-name" "^7.16.7" - "@babel/plugin-transform-react-jsx" "^7.17.12" - "@babel/plugin-transform-react-jsx-development" "^7.16.7" - "@babel/plugin-transform-react-pure-annotations" "^7.16.7" - "@babel/preset-react@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.18.6.tgz#979f76d6277048dc19094c217b507f3ad517dd2d" @@ -2285,206 +1123,97 @@ "@babel/plugin-transform-react-jsx-development" "^7.18.6" "@babel/plugin-transform-react-pure-annotations" "^7.18.6" -"@babel/preset-typescript@^7.15.0": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.17.12.tgz#40269e0a0084d56fc5731b6c40febe1c9a4a3e8c" - integrity sha512-S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg== - dependencies: - "@babel/helper-plugin-utils" "^7.17.12" - "@babel/helper-validator-option" "^7.16.7" - "@babel/plugin-transform-typescript" "^7.17.12" - "@babel/preset-typescript@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz#ce64be3e63eddc44240c6358daefac17b3186399" - integrity sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/helper-validator-option" "^7.18.6" - "@babel/plugin-transform-typescript" "^7.18.6" - -"@babel/runtime-corejs3@^7.18.6": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.19.0.tgz#0df75cb8e5ecba3ca9e658898694e5326d52397f" - integrity sha512-JyXXoCu1N8GLuKc2ii8y5RGma5FMpFeO2nAQIe0Yzrbq+rQnN+sFj47auLblR5ka6aHNGPDgv8G/iI2Grb0ldQ== - dependencies: - core-js-pure "^3.20.2" - regenerator-runtime "^0.13.4" - -"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.12.1", "@babel/runtime@^7.8.4": - version "7.15.3" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b" - integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA== - dependencies: - regenerator-runtime "^0.13.4" - -"@babel/runtime@^7.12.13": - version "7.18.3" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4" - integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug== - dependencies: - regenerator-runtime "^0.13.4" - -"@babel/runtime@^7.12.5": - version "7.17.2" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.2.tgz#66f68591605e59da47523c631416b18508779941" - integrity sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw== + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.21.0.tgz#bcbbca513e8213691fe5d4b23d9251e01f00ebff" + integrity sha512-myc9mpoVA5m1rF8K8DgLEatOYFDpwC+RkMkjZ0Du6uI62YvDe8uxIEYVs/VCdSJ097nlALiU/yBC7//3nI+hNg== dependencies: - regenerator-runtime "^0.13.4" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-validator-option" "^7.21.0" + "@babel/plugin-transform-typescript" "^7.21.0" -"@babel/runtime@^7.18.6": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.0.tgz#22b11c037b094d27a8a2504ea4dcff00f50e2259" - integrity sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA== - dependencies: - regenerator-runtime "^0.13.4" +"@babel/regjsgen@^0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" + integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/template@^7.12.7", "@babel/template@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" - integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g== +"@babel/runtime-corejs3@^7.18.6": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.21.0.tgz#6e4939d9d9789ff63e2dc58e88f13a3913a24eba" + integrity sha512-TDD4UJzos3JJtM+tHX+w2Uc+KWj7GV+VKKFdMVd2Rx8sdA19hcc3P3AHFYd5LVOw+pYuSd5lICC3gm52B6Rwxw== dependencies: - "@babel/code-frame" "^7.14.5" - "@babel/parser" "^7.14.5" - "@babel/types" "^7.14.5" + core-js-pure "^3.25.1" + regenerator-runtime "^0.13.11" -"@babel/template@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" - integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w== +"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.6", "@babel/runtime@^7.20.13", "@babel/runtime@^7.8.4": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673" + integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw== dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/parser" "^7.16.7" - "@babel/types" "^7.16.7" + regenerator-runtime "^0.13.11" -"@babel/template@^7.18.10": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71" - integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA== +"@babel/template@^7.12.7", "@babel/template@^7.18.10", "@babel/template@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" + integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== dependencies: "@babel/code-frame" "^7.18.6" - "@babel/parser" "^7.18.10" - "@babel/types" "^7.18.10" - -"@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz#4cca838fd1b2a03283c1f38e141f639d60b3fc98" - integrity sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw== - dependencies: - "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.15.0" - "@babel/helper-function-name" "^7.14.5" - "@babel/helper-hoist-variables" "^7.14.5" - "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/parser" "^7.15.0" - "@babel/types" "^7.15.0" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.9.tgz#1f9b207435d9ae4a8ed6998b2b82300d83c37a0d" - integrity sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw== - dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.9" - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.17.9" - "@babel/helper-hoist-variables" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.17.9" - "@babel/types" "^7.17.0" - debug "^4.1.0" - globals "^11.1.0" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" -"@babel/traverse@^7.18.0", "@babel/traverse@^7.18.2": - version "7.18.2" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.2.tgz#b77a52604b5cc836a9e1e08dca01cba67a12d2e8" - integrity sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA== - dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.18.2" - "@babel/helper-environment-visitor" "^7.18.2" - "@babel/helper-function-name" "^7.17.9" - "@babel/helper-hoist-variables" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.18.0" - "@babel/types" "^7.18.2" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/traverse@^7.18.8", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.0.tgz#eb9c561c7360005c592cc645abafe0c3c4548eed" - integrity sha512-4pKpFRDh+utd2mbRC8JLnlsMUii3PMHjpL6a0SZ4NMZy7YFP9aXORxEhdMVOc9CpWtDF09IkciQLEhK7Ml7gRA== +"@babel/traverse@^7.12.9", "@babel/traverse@^7.18.8", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.3": + version "7.21.3" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.3.tgz#4747c5e7903d224be71f90788b06798331896f67" + integrity sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ== dependencies: "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.19.0" + "@babel/generator" "^7.21.3" "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.19.0" + "@babel/helper-function-name" "^7.21.0" "@babel/helper-hoist-variables" "^7.18.6" "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.19.0" - "@babel/types" "^7.19.0" + "@babel/parser" "^7.21.3" + "@babel/types" "^7.21.3" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.12.7", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.15.0", "@babel/types@^7.4.4": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz#61af11f2286c4e9c69ca8deb5f4375a73c72dcbd" - integrity sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ== - dependencies: - "@babel/helper-validator-identifier" "^7.14.9" - to-fast-properties "^2.0.0" - -"@babel/types@^7.15.6", "@babel/types@^7.17.12", "@babel/types@^7.18.0", "@babel/types@^7.18.2": - version "7.18.4" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.4.tgz#27eae9b9fd18e9dccc3f9d6ad051336f307be354" - integrity sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw== - dependencies: - "@babel/helper-validator-identifier" "^7.16.7" - to-fast-properties "^2.0.0" - -"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b" - integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw== - dependencies: - "@babel/helper-validator-identifier" "^7.16.7" - to-fast-properties "^2.0.0" - -"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.0.tgz#75f21d73d73dc0351f3368d28db73465f4814600" - integrity sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA== +"@babel/types@^7.12.7", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.3", "@babel/types@^7.4.4": + version "7.21.3" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.3.tgz#4865a5357ce40f64e3400b0f3b737dc6d4f64d05" + integrity sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg== dependencies: - "@babel/helper-string-parser" "^7.18.10" - "@babel/helper-validator-identifier" "^7.18.6" + "@babel/helper-string-parser" "^7.19.4" + "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" "@braintree/sanitize-url@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-6.0.0.tgz#fe364f025ba74f6de6c837a84ef44bdb1d61e68f" - integrity sha512-mgmE7XBYY/21erpzhexk4Cj1cyTQ9LzvnTxtzM17BJ7ERMNE6W72mQRo0I1Ud8eFJ+RVVIcBNhLFZ3GX4XFz5w== + version "6.0.2" + resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-6.0.2.tgz#6110f918d273fe2af8ea1c4398a88774bb9fc12f" + integrity sha512-Tbsj02wXCbqGmzdnXNk0SOF19ChhRU70BsroIi4Pm6Ehp56in6vch94mfbdQ17DozxkL3BAVjbZ4Qc1a0HFRAg== "@colors/colors@1.5.0": version "1.5.0" resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@docsearch/css@3.2.1": - version "3.2.1" - resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-3.2.1.tgz#c05d7818b0e43b42f9efa2d82a11c36606b37b27" - integrity sha512-gaP6TxxwQC+K8D6TRx5WULUWKrcbzECOPA2KCVMuI+6C7dNiGUk5yXXzVhc5sld79XKYLnO9DRTI4mjXDYkh+g== +"@discoveryjs/json-ext@0.5.7": + version "0.5.7" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" + integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== + +"@docsearch/css@3.3.3": + version "3.3.3" + resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-3.3.3.tgz#f9346c9e24602218341f51b8ba91eb9109add434" + integrity sha512-6SCwI7P8ao+se1TUsdZ7B4XzL+gqeQZnBc+2EONZlcVa0dVrk0NjETxozFKgMv0eEGH8QzP1fkN+A1rH61l4eg== "@docsearch/react@^3.1.1": - version "3.2.1" - resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-3.2.1.tgz#112ad88db07367fa6fd933d67d58421d8d8289aa" - integrity sha512-EzTQ/y82s14IQC5XVestiK/kFFMe2aagoYFuTAIfIb/e+4FU7kSMKonRtLwsCiLQHmjvNQq+HO+33giJ5YVtaQ== + version "3.3.3" + resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-3.3.3.tgz#907b6936a565f880b4c0892624b4f7a9f132d298" + integrity sha512-pLa0cxnl+G0FuIDuYlW+EBK6Rw2jwLw9B1RHIeS4N4s2VhsfJ/wzeCi3CWcs5yVfxLd5ZK50t//TMA5e79YT7Q== dependencies: - "@algolia/autocomplete-core" "1.7.1" - "@algolia/autocomplete-preset-algolia" "1.7.1" - "@docsearch/css" "3.2.1" + "@algolia/autocomplete-core" "1.7.4" + "@algolia/autocomplete-preset-algolia" "1.7.4" + "@docsearch/css" "3.3.3" algoliasearch "^4.0.0" "@docusaurus/core@2.1.0": @@ -2885,9 +1614,9 @@ webpack "^5.73.0" "@hapi/hoek@^9.0.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.0.tgz#f3933a44e365864f4dad5db94158106d511e8131" - integrity sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug== + version "9.3.0" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb" + integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ== "@hapi/topo@^5.0.0": version "5.1.0" @@ -2896,6 +1625,25 @@ dependencies: "@hapi/hoek" "^9.0.0" +"@jest/schemas@^29.4.3": + version "29.4.3" + resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.3.tgz#39cf1b8469afc40b6f5a2baaa146e332c4151788" + integrity sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg== + dependencies: + "@sinclair/typebox" "^0.25.16" + +"@jest/types@^29.5.0": + version "29.5.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.5.0.tgz#f59ef9b031ced83047c67032700d8c807d6e1593" + integrity sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog== + dependencies: + "@jest/schemas" "^29.4.3" + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^17.0.8" + chalk "^4.0.0" + "@jridgewell/gen-mapping@^0.1.0": version "0.1.1" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" @@ -2904,16 +1652,7 @@ "@jridgewell/set-array" "^1.0.0" "@jridgewell/sourcemap-codec" "^1.4.10" -"@jridgewell/gen-mapping@^0.3.0": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz#cf92a983c83466b8c0ce9124fadeaf09f7c66ea9" - integrity sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg== - dependencies: - "@jridgewell/set-array" "^1.0.0" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/gen-mapping@^0.3.2": +"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": version "0.3.2" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== @@ -2922,17 +1661,12 @@ "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/resolve-uri@^3.0.3": - version "3.0.7" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz#30cd49820a962aff48c8fffc5cd760151fca61fe" - integrity sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA== - -"@jridgewell/set-array@^1.0.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz#36a6acc93987adcf0ba50c66908bd0b70de8afea" - integrity sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ== +"@jridgewell/resolve-uri@3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" + integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== -"@jridgewell/set-array@^1.0.1": +"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": version "1.1.2" resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== @@ -2945,26 +1679,18 @@ "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/sourcemap-codec@^1.4.10": - version "1.4.13" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c" - integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w== - -"@jridgewell/trace-mapping@^0.3.14": - version "0.3.15" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz#aba35c48a38d3fd84b37e66c9c0423f9744f9774" - integrity sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g== - dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" +"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.14" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" + integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== -"@jridgewell/trace-mapping@^0.3.9": - version "0.3.13" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea" - integrity sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w== +"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": + version "0.3.17" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" + integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g== dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/resolve-uri" "3.1.0" + "@jridgewell/sourcemap-codec" "1.4.14" "@leichtgewicht/ip-codec@^2.0.1": version "2.0.4" @@ -2997,15 +1723,15 @@ unist-util-visit "2.0.3" "@mdx-js/mdx@^2.1.1": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-2.1.1.tgz#6d8b9b75456d7685a52c3812b1c3e4830c7458fb" - integrity sha512-SXC18cChut3F2zkVXwsb2no0fzTQ1z6swjK13XwFbF5QU/SFQM0orAItPypSdL3GvqYyzVJtz8UofzJhPEQtMw== + version "2.3.0" + resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-2.3.0.tgz#d65d8c3c28f3f46bb0e7cb3bf7613b39980671a9" + integrity sha512-jLuwRlz8DQfQNiUCJR50Y09CGPq3fLtmtUQfVrj79E0JWu3dvsVcxVIcfhR5h0iXu+/z++zDrYeiJqifRynJkA== dependencies: - "@types/estree-jsx" "^0.0.1" + "@types/estree-jsx" "^1.0.0" "@types/mdx" "^2.0.0" - astring "^1.6.0" estree-util-build-jsx "^2.0.0" estree-util-is-identifier-name "^2.0.0" + estree-util-to-js "^1.1.0" estree-walker "^3.0.0" hast-util-to-estree "^2.0.0" markdown-extensions "^1.0.0" @@ -3050,10 +1776,10 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@polka/url@^1.0.0-next.15": - version "1.0.0-next.15" - resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.15.tgz#6a9d143f7f4f49db2d782f9e1c8839a29b43ae23" - integrity sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA== +"@polka/url@^1.0.0-next.20": + version "1.0.0-next.21" + resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" + integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== "@sideway/address@^4.1.3": version "4.1.4" @@ -3062,16 +1788,21 @@ dependencies: "@hapi/hoek" "^9.0.0" -"@sideway/formula@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c" - integrity sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg== +"@sideway/formula@^3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f" + integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg== "@sideway/pinpoint@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df" integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ== +"@sinclair/typebox@^0.25.16": + version "0.25.24" + resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.24.tgz#8c7688559979f7079aacaf31aa881c3aa410b718" + integrity sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ== + "@sindresorhus/is@^0.14.0": version "0.14.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" @@ -3086,109 +1817,111 @@ p-map "^4.0.0" webpack-sources "^3.2.2" -"@svgr/babel-plugin-add-jsx-attribute@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.0.0.tgz#bd6d1ff32a31b82b601e73672a789cc41e84fe18" - integrity sha512-MdPdhdWLtQsjd29Wa4pABdhWbaRMACdM1h31BY+c6FghTZqNGT7pEYdBoaGeKtdTOBC/XNFQaKVj+r/Ei2ryWA== - -"@svgr/babel-plugin-remove-jsx-attribute@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-6.0.0.tgz#58654908beebfa069681a83332544b17e5237e89" - integrity sha512-aVdtfx9jlaaxc3unA6l+M9YRnKIZjOhQPthLKqmTXC8UVkBLDRGwPKo+r8n3VZN8B34+yVajzPTZ+ptTSuZZCw== - -"@svgr/babel-plugin-remove-jsx-empty-expression@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-6.0.0.tgz#d06dd6e8a8f603f92f9979bb9990a1f85a4f57ba" - integrity sha512-Ccj42ApsePD451AZJJf1QzTD1B/BOU392URJTeXFxSK709i0KUsGtbwyiqsKu7vsYxpTM0IA5clAKDyf9RCZyA== - -"@svgr/babel-plugin-replace-jsx-attribute-value@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.0.0.tgz#0b85837577b02c31c09c758a12932820f5245cee" - integrity sha512-88V26WGyt1Sfd1emBYmBJRWMmgarrExpKNVmI9vVozha4kqs6FzQJ/Kp5+EYli1apgX44518/0+t9+NU36lThQ== - -"@svgr/babel-plugin-svg-dynamic-title@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.0.0.tgz#28236ec26f7ab9d486a487d36ae52d58ba15676f" - integrity sha512-F7YXNLfGze+xv0KMQxrl2vkNbI9kzT9oDK55/kUuymh1ACyXkMV+VZWX1zEhSTfEKh7VkHVZGmVtHg8eTZ6PRg== - -"@svgr/babel-plugin-svg-em-dimensions@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-6.0.0.tgz#40267c5dea1b43c4f83a0eb6169e08b43d8bafce" - integrity sha512-+rghFXxdIqJNLQK08kwPBD3Z22/0b2tEZ9lKiL/yTfuyj1wW8HUXu4bo/XkogATIYuXSghVQOOCwURXzHGKyZA== - -"@svgr/babel-plugin-transform-react-native-svg@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-6.0.0.tgz#eb688d0a5f539e34d268d8a516e81f5d7fede7c9" - integrity sha512-VaphyHZ+xIKv5v0K0HCzyfAaLhPGJXSk2HkpYfXIOKb7DjLBv0soHDxNv6X0vr2titsxE7klb++u7iOf7TSrFQ== +"@svgr/babel-plugin-add-jsx-attribute@^6.5.1": + version "6.5.1" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.5.1.tgz#74a5d648bd0347bda99d82409d87b8ca80b9a1ba" + integrity sha512-9PYGcXrAxitycIjRmZB+Q0JaN07GZIWaTBIGQzfaZv+qr1n8X1XUEJ5rZ/vx6OVD9RRYlrNnXWExQXcmZeD/BQ== -"@svgr/babel-plugin-transform-svg-component@^6.2.0": - version "6.2.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.2.0.tgz#7ba61d9fc1fb42b0ba1a04e4630019fa7e993c4f" - integrity sha512-bhYIpsORb++wpsp91fymbFkf09Z/YEKR0DnFjxvN+8JHeCUD2unnh18jIMKnDJTWtvpTaGYPXELVe4OOzFI0xg== +"@svgr/babel-plugin-remove-jsx-attribute@*": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-7.0.0.tgz#91da77a009dc38e8d30da45d9b62ef8736f2d90a" + integrity sha512-iiZaIvb3H/c7d3TH2HBeK91uI2rMhZNwnsIrvd7ZwGLkFw6mmunOCoVnjdYua662MqGFxlN9xTq4fv9hgR4VXQ== -"@svgr/babel-preset@^6.2.0": - version "6.2.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-6.2.0.tgz#1d3ad8c7664253a4be8e4a0f0e6872f30d8af627" - integrity sha512-4WQNY0J71JIaL03DRn0vLiz87JXx0b9dYm2aA8XHlQJQoixMl4r/soYHm8dsaJZ3jWtkCiOYy48dp9izvXhDkQ== - dependencies: - "@svgr/babel-plugin-add-jsx-attribute" "^6.0.0" - "@svgr/babel-plugin-remove-jsx-attribute" "^6.0.0" - "@svgr/babel-plugin-remove-jsx-empty-expression" "^6.0.0" - "@svgr/babel-plugin-replace-jsx-attribute-value" "^6.0.0" - "@svgr/babel-plugin-svg-dynamic-title" "^6.0.0" - "@svgr/babel-plugin-svg-em-dimensions" "^6.0.0" - "@svgr/babel-plugin-transform-react-native-svg" "^6.0.0" - "@svgr/babel-plugin-transform-svg-component" "^6.2.0" - -"@svgr/core@^6.2.1": - version "6.2.1" - resolved "https://registry.yarnpkg.com/@svgr/core/-/core-6.2.1.tgz#195de807a9f27f9e0e0d678e01084b05c54fdf61" - integrity sha512-NWufjGI2WUyrg46mKuySfviEJ6IxHUOm/8a3Ph38VCWSp+83HBraCQrpEM3F3dB6LBs5x8OElS8h3C0oOJaJAA== - dependencies: - "@svgr/plugin-jsx" "^6.2.1" +"@svgr/babel-plugin-remove-jsx-empty-expression@*": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-7.0.0.tgz#5154ff1213509e36ab315974c8c2fd48dafb827b" + integrity sha512-sQQmyo+qegBx8DfFc04PFmIO1FP1MHI1/QEpzcIcclo5OAISsOJPW76ZIs0bDyO/DBSJEa/tDa1W26pVtt0FRw== + +"@svgr/babel-plugin-replace-jsx-attribute-value@^6.5.1": + version "6.5.1" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.5.1.tgz#fb9d22ea26d2bc5e0a44b763d4c46d5d3f596c60" + integrity sha512-8DPaVVE3fd5JKuIC29dqyMB54sA6mfgki2H2+swh+zNJoynC8pMPzOkidqHOSc6Wj032fhl8Z0TVn1GiPpAiJg== + +"@svgr/babel-plugin-svg-dynamic-title@^6.5.1": + version "6.5.1" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.5.1.tgz#01b2024a2b53ffaa5efceaa0bf3e1d5a4c520ce4" + integrity sha512-FwOEi0Il72iAzlkaHrlemVurgSQRDFbk0OC8dSvD5fSBPHltNh7JtLsxmZUhjYBZo2PpcU/RJvvi6Q0l7O7ogw== + +"@svgr/babel-plugin-svg-em-dimensions@^6.5.1": + version "6.5.1" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-6.5.1.tgz#dd3fa9f5b24eb4f93bcf121c3d40ff5facecb217" + integrity sha512-gWGsiwjb4tw+ITOJ86ndY/DZZ6cuXMNE/SjcDRg+HLuCmwpcjOktwRF9WgAiycTqJD/QXqL2f8IzE2Rzh7aVXA== + +"@svgr/babel-plugin-transform-react-native-svg@^6.5.1": + version "6.5.1" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-6.5.1.tgz#1d8e945a03df65b601551097d8f5e34351d3d305" + integrity sha512-2jT3nTayyYP7kI6aGutkyfJ7UMGtuguD72OjeGLwVNyfPRBD8zQthlvL+fAbAKk5n9ZNcvFkp/b1lZ7VsYqVJg== + +"@svgr/babel-plugin-transform-svg-component@^6.5.1": + version "6.5.1" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.5.1.tgz#48620b9e590e25ff95a80f811544218d27f8a250" + integrity sha512-a1p6LF5Jt33O3rZoVRBqdxL350oge54iZWHNI6LJB5tQ7EelvD/Mb1mfBiZNAan0dt4i3VArkFRjA4iObuNykQ== + +"@svgr/babel-preset@^6.5.1": + version "6.5.1" + resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-6.5.1.tgz#b90de7979c8843c5c580c7e2ec71f024b49eb828" + integrity sha512-6127fvO/FF2oi5EzSQOAjo1LE3OtNVh11R+/8FXa+mHx1ptAaS4cknIjnUA7e6j6fwGGJ17NzaTJFUwOV2zwCw== + dependencies: + "@svgr/babel-plugin-add-jsx-attribute" "^6.5.1" + "@svgr/babel-plugin-remove-jsx-attribute" "*" + "@svgr/babel-plugin-remove-jsx-empty-expression" "*" + "@svgr/babel-plugin-replace-jsx-attribute-value" "^6.5.1" + "@svgr/babel-plugin-svg-dynamic-title" "^6.5.1" + "@svgr/babel-plugin-svg-em-dimensions" "^6.5.1" + "@svgr/babel-plugin-transform-react-native-svg" "^6.5.1" + "@svgr/babel-plugin-transform-svg-component" "^6.5.1" + +"@svgr/core@^6.5.1": + version "6.5.1" + resolved "https://registry.yarnpkg.com/@svgr/core/-/core-6.5.1.tgz#d3e8aa9dbe3fbd747f9ee4282c1c77a27410488a" + integrity sha512-/xdLSWxK5QkqG524ONSjvg3V/FkNyCv538OIBdQqPNaAta3AsXj/Bd2FbvR87yMbXO2hFSWiAe/Q6IkVPDw+mw== + dependencies: + "@babel/core" "^7.19.6" + "@svgr/babel-preset" "^6.5.1" + "@svgr/plugin-jsx" "^6.5.1" camelcase "^6.2.0" cosmiconfig "^7.0.1" -"@svgr/hast-util-to-babel-ast@^6.2.1": - version "6.2.1" - resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.2.1.tgz#ae065567b74cbe745afae617053adf9a764bea25" - integrity sha512-pt7MMkQFDlWJVy9ULJ1h+hZBDGFfSCwlBNW1HkLnVi7jUhyEXUaGYWi1x6bM2IXuAR9l265khBT4Av4lPmaNLQ== +"@svgr/hast-util-to-babel-ast@^6.5.1": + version "6.5.1" + resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.5.1.tgz#81800bd09b5bcdb968bf6ee7c863d2288fdb80d2" + integrity sha512-1hnUxxjd83EAxbL4a0JDJoD3Dao3hmjvyvyEV8PzWmLK3B9m9NPlW7GKjFyoWE8nM7HnXzPcmmSyOW8yOddSXw== dependencies: - "@babel/types" "^7.15.6" - entities "^3.0.1" + "@babel/types" "^7.20.0" + entities "^4.4.0" -"@svgr/plugin-jsx@^6.2.1": - version "6.2.1" - resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-6.2.1.tgz#5668f1d2aa18c2f1bb7a1fc9f682d3f9aed263bd" - integrity sha512-u+MpjTsLaKo6r3pHeeSVsh9hmGRag2L7VzApWIaS8imNguqoUwDq/u6U/NDmYs/KAsrmtBjOEaAAPbwNGXXp1g== +"@svgr/plugin-jsx@^6.5.1": + version "6.5.1" + resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-6.5.1.tgz#0e30d1878e771ca753c94e69581c7971542a7072" + integrity sha512-+UdQxI3jgtSjCykNSlEMuy1jSRQlGC7pqBCPvkG/2dATdWo082zHTTK3uhnAju2/6XpE6B5mZ3z4Z8Ns01S8Gw== dependencies: - "@babel/core" "^7.15.5" - "@svgr/babel-preset" "^6.2.0" - "@svgr/hast-util-to-babel-ast" "^6.2.1" - svg-parser "^2.0.2" + "@babel/core" "^7.19.6" + "@svgr/babel-preset" "^6.5.1" + "@svgr/hast-util-to-babel-ast" "^6.5.1" + svg-parser "^2.0.4" -"@svgr/plugin-svgo@^6.2.0": - version "6.2.0" - resolved "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-6.2.0.tgz#4cbe6a33ccccdcae4e3b63ded64cc1cbe1faf48c" - integrity sha512-oDdMQONKOJEbuKwuy4Np6VdV6qoaLLvoY86hjvQEgU82Vx1MSWRyYms6Sl0f+NtqxLI/rDVufATbP/ev996k3Q== +"@svgr/plugin-svgo@^6.5.1": + version "6.5.1" + resolved "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-6.5.1.tgz#0f91910e988fc0b842f88e0960c2862e022abe84" + integrity sha512-omvZKf8ixP9z6GWgwbtmP9qQMPX4ODXi+wzbVZgomNFsUIlHA1sf4fThdwTWSsZGgvGAG6yE+b/F5gWUkcZ/iQ== dependencies: cosmiconfig "^7.0.1" deepmerge "^4.2.2" - svgo "^2.5.0" + svgo "^2.8.0" "@svgr/webpack@^6.2.1": - version "6.2.1" - resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-6.2.1.tgz#ef5d51c1b6be4e7537fb9f76b3f2b2e22b63c58d" - integrity sha512-h09ngMNd13hnePwgXa+Y5CgOjzlCvfWLHg+MBnydEedAnuLRzUHUJmGS3o2OsrhxTOOqEsPOFt5v/f6C5Qulcw== - dependencies: - "@babel/core" "^7.15.5" - "@babel/plugin-transform-react-constant-elements" "^7.14.5" - "@babel/preset-env" "^7.15.6" - "@babel/preset-react" "^7.14.5" - "@babel/preset-typescript" "^7.15.0" - "@svgr/core" "^6.2.1" - "@svgr/plugin-jsx" "^6.2.1" - "@svgr/plugin-svgo" "^6.2.0" + version "6.5.1" + resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-6.5.1.tgz#ecf027814fc1cb2decc29dc92f39c3cf691e40e8" + integrity sha512-cQ/AsnBkXPkEK8cLbv4Dm7JGXq2XrumKnL1dRpJD9rIO2fTIlJI9a1uCciYG1F2aUsox/hJQyNGbt3soDxSRkA== + dependencies: + "@babel/core" "^7.19.6" + "@babel/plugin-transform-react-constant-elements" "^7.18.12" + "@babel/preset-env" "^7.19.4" + "@babel/preset-react" "^7.18.6" + "@babel/preset-typescript" "^7.18.6" + "@svgr/core" "^6.5.1" + "@svgr/plugin-jsx" "^6.5.1" + "@svgr/plugin-svgo" "^6.5.1" "@szmarczak/http-timer@^1.1.2": version "1.1.2" @@ -3254,66 +1987,61 @@ "@types/ms" "*" "@types/eslint-scope@^3.7.3": - version "3.7.3" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224" - integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g== + version "3.7.4" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16" + integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA== dependencies: "@types/eslint" "*" "@types/estree" "*" "@types/eslint@*": - version "7.28.0" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a" - integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A== + version "8.21.3" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.21.3.tgz#5794b3911f0f19e34e3a272c49cbdf48d6f543f2" + integrity sha512-fa7GkppZVEByMWGbTtE5MbmXWJTVbrjjaS8K6uQj+XtuuUv1fsuPAxhygfqLmsb/Ufb3CV8deFCpiMfAgi00Sw== dependencies: "@types/estree" "*" "@types/json-schema" "*" -"@types/estree-jsx@^0.0.1": - version "0.0.1" - resolved "https://registry.yarnpkg.com/@types/estree-jsx/-/estree-jsx-0.0.1.tgz#c36d7a1afeb47a95a8ee0b7bc8bc705db38f919d" - integrity sha512-gcLAYiMfQklDCPjQegGn0TBAn9it05ISEsEhlKQUddIk7o2XDokOcTN7HBO8tznM0D9dGezvHEfRZBfZf6me0A== +"@types/estree-jsx@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/estree-jsx/-/estree-jsx-1.0.0.tgz#7bfc979ab9f692b492017df42520f7f765e98df1" + integrity sha512-3qvGd0z8F2ENTGr/GG1yViqfiKmRfrXVx5sJyHGFu3z7m5g5utCQtGp/g29JnjflhtQJBv1WDQukHiT58xPcYQ== dependencies: "@types/estree" "*" -"@types/estree@*", "@types/estree@^0.0.50": - version "0.0.50" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" - integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw== - -"@types/estree@^0.0.46": - version "0.0.46" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe" - integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg== +"@types/estree@*", "@types/estree@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" + integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== "@types/estree@^0.0.51": version "0.0.51" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== -"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": - version "4.17.28" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8" - integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig== +"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33": + version "4.17.33" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz#de35d30a9d637dc1450ad18dd583d75d5733d543" + integrity sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA== dependencies: "@types/node" "*" "@types/qs" "*" "@types/range-parser" "*" "@types/express@*", "@types/express@^4.17.13": - version "4.17.13" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" - integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== + version "4.17.17" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.17.tgz#01d5437f6ef9cfa8668e616e13c2f2ac9a491ae4" + integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q== dependencies: "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.18" + "@types/express-serve-static-core" "^4.17.33" "@types/qs" "*" "@types/serve-static" "*" "@types/hast@^2.0.0": - version "2.3.2" - resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.2.tgz#236201acca9e2695e42f713d7dd4f151dc2982e4" - integrity sha512-Op5W7jYgZI7AWKY5wQ0/QNMzQM7dGQPyW1rXKNiymVCy5iTfdPuGu4HhYNOM2sIv8gUfIuIdcYlXmAepwaowow== + version "2.3.4" + resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.4.tgz#8aa5ef92c117d20d974a82bdfb6a648b08c0bafc" + integrity sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g== dependencies: "@types/unist" "*" @@ -3323,23 +2051,37 @@ integrity sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA== "@types/html-minifier-terser@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.0.0.tgz#563c1c6c132cd204e71512f9c0b394ff90d3fae7" - integrity sha512-NZwaaynfs1oIoLAV1vg18e7QMVDvw+6SQrdJc8w3BwUaoroVSf6EBj/Sk4PBWGxsq0dzhA2drbsuMC1/6C6KgQ== + version "6.1.0" + resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35" + integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg== "@types/http-proxy@^1.17.8": - version "1.17.9" - resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.9.tgz#7f0e7931343761efde1e2bf48c40f02f3f75705a" - integrity sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw== + version "1.17.10" + resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.10.tgz#e576c8e4a0cc5c6a138819025a88e167ebb38d6c" + integrity sha512-Qs5aULi+zV1bwKAg5z1PWnDXWmsn+LxIvUGv6E2+OOMYhclZMO+OXd9pYVf2gLykf2I7IV2u7oTHwChPNsvJ7g== dependencies: "@types/node" "*" -"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": - version "7.0.9" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" - integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== +"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44" + integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g== + +"@types/istanbul-lib-report@*": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686" + integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== + dependencies: + "@types/istanbul-lib-coverage" "*" -"@types/json-schema@^7.0.4": +"@types/istanbul-reports@^3.0.0": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" + integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw== + dependencies: + "@types/istanbul-lib-report" "*" + +"@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.11" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== @@ -3352,26 +2094,21 @@ "@types/lodash" "*" "@types/lodash@*": - version "4.14.184" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.184.tgz#23f96cd2a21a28e106dc24d825d4aa966de7a9fe" - integrity sha512-RoZphVtHbxPZizt4IcILciSWiC6dcn+eZ8oX9IWEYfDMcocdd42f7NPI6fQj+6zI8y4E0L7gu2pcZKLGTRaV9Q== + version "4.14.191" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.191.tgz#09511e7f7cba275acd8b419ddac8da9a6a79e2fa" + integrity sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ== "@types/mdast@^3.0.0": - version "3.0.7" - resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.7.tgz#cba63d0cc11eb1605cea5c0ad76e02684394166b" - integrity sha512-YwR7OK8aPmaBvMMUi+pZXBNoW2unbVbfok4YRqGMJBe1dpDlzpRkJrYEYmvjxgs5JhuQmKfDexrN98u941Zasg== + version "3.0.11" + resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.11.tgz#dc130f7e7d9306124286f6d6cee40cf4d14a3dc0" + integrity sha512-Y/uImid8aAwrEA24/1tcRZwpxX3pIFTSilcNDKSPn+Y2iDywSEachzRuvgAYYLR3wpGXAsMbv5lvKLDZLeYPAw== dependencies: "@types/unist" "*" -"@types/mdurl@^1.0.0": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9" - integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA== - "@types/mdx@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/mdx/-/mdx-2.0.1.tgz#e4c05d355d092d7b58db1abfe460e53f41102ac8" - integrity sha512-JPEv4iAl0I+o7g8yVWDwk30es8mfVrjkvh5UeVR2sYPpZCK44vrAPsbJpIS+rJAUxLgaSAMKTEH5Vn5qd9XsrQ== + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/mdx/-/mdx-2.0.3.tgz#43fd32414f17fcbeced3578109a6edd877a2d96e" + integrity sha512-IgHxcT3RC8LzFLhKwP3gbMPeaK7BM9eBH46OdapPA7yvuIUJ8H6zHZV53J8hGZcTSnt95jANt+rTBNUUc22ACQ== "@types/mermaid@^8.2.9": version "8.2.9" @@ -3383,25 +2120,20 @@ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10" integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA== -"@types/mime@^1": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" - integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== - "@types/ms@*": version "0.7.31" resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "16.6.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.6.0.tgz#0d5685f85066f94e97f19e8a67fe003c5fadacc4" - integrity sha512-OyiZPohMMjZEYqcVo/UJ04GyAxXOJEZO/FpzyXxcH4r/ArrVoXHf4MbUrkLp0Tz7/p1mMKpo5zJ6ZHl8XBNthQ== + version "18.15.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.7.tgz#33514fca9bdf136f77027358850c0fb9cd93c669" + integrity sha512-LFmUbFunqmBn26wJZgZPYZPrDR1RwGOu2v79Mgcka1ndO6V0/cwjivPTc4yoK6n9kmw4/ls1r8cLrvh2iMibFA== "@types/node@^17.0.5": - version "17.0.36" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.36.tgz#c0d5f2fe76b47b63e0e0efc3d2049a9970d68794" - integrity sha512-V3orv+ggDsWVHP99K3JlwtH20R7J4IhI1Kksgc+64q5VxgfRkQG8Ws3MFm/FZOKDYGy9feGFlZ70/HpCNe9QaA== + version "17.0.45" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190" + integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw== "@types/parse-json@^4.0.0": version "4.0.0" @@ -3454,17 +2186,17 @@ "@types/react-router" "*" "@types/react-router@*": - version "5.1.18" - resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.18.tgz#c8851884b60bc23733500d86c1266e1cfbbd9ef3" - integrity sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g== + version "5.1.20" + resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.20.tgz#88eccaa122a82405ef3efbcaaa5dcdd9f021387c" + integrity sha512-jGjmu/ZqS7FjSH6owMcD5qpq19+1RS9DeVRqfl1FeBMxTDQAGwlMWOcs52NDoXaNKyG3d1cYQFMs9rCrb88o9Q== dependencies: "@types/history" "^4.7.11" "@types/react" "*" "@types/react@*": - version "18.0.9" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.9.tgz#d6712a38bd6cd83469603e7359511126f122e878" - integrity sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw== + version "18.0.29" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.29.tgz#4cead505172c0020c5b51940199e31fc6ff2f63a" + integrity sha512-wXHktgUABxplw1+UnljseDq4+uztQyp2tlWZRIxHlpchsCFqiYkvaDS8JR7eKOQm8wziTH/el5qL7D6gYNkYcw== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -3476,16 +2208,16 @@ integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== "@types/sax@^1.2.1": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@types/sax/-/sax-1.2.3.tgz#b630ac1403ebd7812e0bf9a10de9bf5077afb348" - integrity sha512-+QSw6Tqvs/KQpZX8DvIl3hZSjNFLW/OqE5nlyHXtTwODaJvioN2rOWpBNEWZp2HZUFhOh+VohmJku/WxEXU2XA== + version "1.2.4" + resolved "https://registry.yarnpkg.com/@types/sax/-/sax-1.2.4.tgz#8221affa7f4f3cb21abd22f244cfabfa63e6a69e" + integrity sha512-pSAff4IAxJjfAXUG6tFkO7dsSbTmf8CtUpfhhZ5VhkRpC4628tJhh3+V6H1E+/Gs9piSzYKT5yzHO5M4GG9jkw== dependencies: "@types/node" "*" "@types/scheduler@*": - version "0.16.2" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" - integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== + version "0.16.3" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.3.tgz#cef09e3ec9af1d63d2a6cc5b383a737e24e6dcf5" + integrity sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ== "@types/serve-index@^1.9.1": version "1.9.1" @@ -3494,18 +2226,10 @@ dependencies: "@types/express" "*" -"@types/serve-static@*": - version "1.13.10" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" - integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ== - dependencies: - "@types/mime" "^1" - "@types/node" "*" - -"@types/serve-static@^1.13.10": - version "1.15.0" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.0.tgz#c7930ff61afb334e121a9da780aac0d9b8f34155" - integrity sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg== +"@types/serve-static@*", "@types/serve-static@^1.13.10": + version "1.15.1" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.1.tgz#86b1753f0be4f9a1bee68d459fcda5be4ea52b5d" + integrity sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ== dependencies: "@types/mime" "*" "@types/node" "*" @@ -3523,12 +2247,24 @@ integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ== "@types/ws@^8.5.1": - version "8.5.3" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d" - integrity sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w== + version "8.5.4" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.4.tgz#bb10e36116d6e570dd943735f86c933c1587b8a5" + integrity sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg== dependencies: "@types/node" "*" +"@types/yargs-parser@*": + version "21.0.0" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" + integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== + +"@types/yargs@^17.0.8": + version "17.0.23" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.23.tgz#a7db3a2062c95ca1a5e0d5d5ddb6521cbc649e35" + integrity sha512-yuogunc04OnzGQCrfHx+Kk883Q4X0aSwmYZhKjI21m+SVYzjIbrWl8dOOwSv5hf2Um2pdCOXWo9isteZTNXUZQ== + dependencies: + "@types/yargs-parser" "*" + "@webassemblyjs/ast@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" @@ -3660,15 +2396,7 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -accepts@~1.3.4, accepts@~1.3.5: - version "1.3.7" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" - integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== - dependencies: - mime-types "~2.1.24" - negotiator "0.6.2" - -accepts@~1.3.8: +accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== @@ -3677,9 +2405,9 @@ accepts@~1.3.8: negotiator "0.6.3" acorn-import-assertions@^1.7.6: - version "1.7.6" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz#580e3ffcae6770eebeec76c3b9723201e9d01f78" - integrity sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA== + version "1.8.0" + resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" + integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== acorn-jsx@^5.0.0: version "5.3.2" @@ -3687,34 +2415,19 @@ acorn-jsx@^5.0.0: integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== acorn-walk@^8.0.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.1.1.tgz#3ddab7f84e4a7e2313f6c414c5b7dac85f4e3ebc" - integrity sha512-FbJdceMlPHEAWJOILDk1fXD8lnTlEIWFkqtfk+MvmL5q/qlHfN7GEHcsFZWt/Tea9jRNPWUZG4G976nqAAmU9w== - -acorn@^8.0.0, acorn@^8.0.4: - version "8.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c" - integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA== - -acorn@^8.5.0: - version "8.7.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" - integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== - -acorn@^8.7.1: - version "8.8.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" - integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w== + version "8.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" + integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== -address@^1.0.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" - integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA== +acorn@^8.0.0, acorn@^8.0.4, acorn@^8.5.0, acorn@^8.7.1: + version "8.8.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" + integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== -address@^1.1.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/address/-/address-1.2.0.tgz#d352a62c92fee90f89a693eccd2a8b2139ab02d9" - integrity sha512-tNEZYz5G/zYunxFm7sfhAxkXEuLj3K6BKwv6ZURlsF6yiUQ65z0Q2wZW9L5cPUl9ocofGvXOdFYbFHp0+6MOig== +address@^1.0.1, address@^1.1.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/address/-/address-1.2.2.tgz#2b5248dac5485a6390532c6a517fda2e3faac89e" + integrity sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA== aggregate-error@^3.0.0: version "3.1.0" @@ -3754,9 +2467,9 @@ ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: uri-js "^4.2.2" ajv@^8.0.0, ajv@^8.8.0: - version "8.8.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb" - integrity sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw== + version "8.12.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" + integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -3764,60 +2477,33 @@ ajv@^8.0.0, ajv@^8.8.0: uri-js "^4.2.2" algoliasearch-helper@^3.10.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/algoliasearch-helper/-/algoliasearch-helper-3.11.0.tgz#c4355056d97748a92f6ff0d4fce153b96b561ddb" - integrity sha512-TLl/MSjtQ98mgkd8hngWkzSjE+dAWldZ1NpJtv2mT+ZoFJ2P2zDE85oF9WafJOXWN9FbVRmyxpO5H+qXcNaFng== + version "3.12.0" + resolved "https://registry.yarnpkg.com/algoliasearch-helper/-/algoliasearch-helper-3.12.0.tgz#0fe39d49b0290e4aa5e1fe733bd24d857d258e94" + integrity sha512-/j1U3PEwdan0n6P/QqSnSpNSLC5+cEMvyljd5CnmNmUjDlGrys+vFEOwjVEnqELIiAGMHEA/Nl3CiKVFBUYqyQ== dependencies: "@algolia/events" "^4.0.1" -algoliasearch@^4.0.0: - version "4.10.3" - resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.10.3.tgz#22df4bb02fbf13a765b18b85df8745ee9c04f00a" - integrity sha512-OLY0AWlPKGLbSaw14ivMB7BT5fPdp8VdzY4L8FtzZnqmLKsyes24cltGlf7/X96ACkYEcT390SReCDt/9SUIRg== - dependencies: - "@algolia/cache-browser-local-storage" "4.10.3" - "@algolia/cache-common" "4.10.3" - "@algolia/cache-in-memory" "4.10.3" - "@algolia/client-account" "4.10.3" - "@algolia/client-analytics" "4.10.3" - "@algolia/client-common" "4.10.3" - "@algolia/client-personalization" "4.10.3" - "@algolia/client-search" "4.10.3" - "@algolia/logger-common" "4.10.3" - "@algolia/logger-console" "4.10.3" - "@algolia/requester-browser-xhr" "4.10.3" - "@algolia/requester-common" "4.10.3" - "@algolia/requester-node-http" "4.10.3" - "@algolia/transporter" "4.10.3" - -algoliasearch@^4.13.1: - version "4.13.1" - resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.13.1.tgz#54195c41c9e4bd13ed64982248cf49d4576974fe" - integrity sha512-dtHUSE0caWTCE7liE1xaL+19AFf6kWEcyn76uhcitWpntqvicFHXKFoZe5JJcv9whQOTRM6+B8qJz6sFj+rDJA== - dependencies: - "@algolia/cache-browser-local-storage" "4.13.1" - "@algolia/cache-common" "4.13.1" - "@algolia/cache-in-memory" "4.13.1" - "@algolia/client-account" "4.13.1" - "@algolia/client-analytics" "4.13.1" - "@algolia/client-common" "4.13.1" - "@algolia/client-personalization" "4.13.1" - "@algolia/client-search" "4.13.1" - "@algolia/logger-common" "4.13.1" - "@algolia/logger-console" "4.13.1" - "@algolia/requester-browser-xhr" "4.13.1" - "@algolia/requester-common" "4.13.1" - "@algolia/requester-node-http" "4.13.1" - "@algolia/transporter" "4.13.1" - -ansi-align@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb" - integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw== - dependencies: - string-width "^3.0.0" - -ansi-align@^3.0.1: +algoliasearch@^4.0.0, algoliasearch@^4.13.1: + version "4.16.0" + resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.16.0.tgz#2807f1aee8a574fa8480f39a09b16e407d4cc1a6" + integrity sha512-HAjKJ6bBblaXqO4dYygF4qx251GuJ6zCZt+qbJ+kU7sOC+yc84pawEjVpJByh+cGP2APFCsao2Giz50cDlKNPA== + dependencies: + "@algolia/cache-browser-local-storage" "4.16.0" + "@algolia/cache-common" "4.16.0" + "@algolia/cache-in-memory" "4.16.0" + "@algolia/client-account" "4.16.0" + "@algolia/client-analytics" "4.16.0" + "@algolia/client-common" "4.16.0" + "@algolia/client-personalization" "4.16.0" + "@algolia/client-search" "4.16.0" + "@algolia/logger-common" "4.16.0" + "@algolia/logger-console" "4.16.0" + "@algolia/requester-browser-xhr" "4.16.0" + "@algolia/requester-common" "4.16.0" + "@algolia/requester-node-http" "4.16.0" + "@algolia/transporter" "4.16.0" + +ansi-align@^3.0.0, ansi-align@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== @@ -3829,16 +2515,6 @@ ansi-html-community@^0.0.8: resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== -ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== - -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== - ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" @@ -3864,22 +2540,22 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: color-convert "^2.0.1" ansi-styles@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.1.0.tgz#87313c102b8118abd57371afab34618bf7350ed3" - integrity sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ== + version "6.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" + integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== anymatch@~3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" - integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + version "3.1.3" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" + integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" arg@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.0.tgz#a20e2bb5710e82950a516b3f933fee5ed478be90" - integrity sha512-4P8Zm2H+BRS+c/xX1LrHw0qKpEhdlZjLCgWy+d78T9vqa2Z2SiD2wMrYuWIAFy5IZUD7nnNXroRttz+0RzlrzQ== + version "5.0.2" + resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c" + integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg== argparse@^1.0.7: version "1.0.10" @@ -3896,7 +2572,7 @@ argparse@^2.0.1: array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== array-flatten@^2.1.2: version "2.1.2" @@ -3911,7 +2587,7 @@ array-union@^2.1.0: asap@~2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" - integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= + integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== assert@^2.0.0: version "2.0.0" @@ -3923,44 +2599,32 @@ assert@^2.0.0: object-is "^1.0.1" util "^0.12.0" -astring@^1.6.0: - version "1.8.1" - resolved "https://registry.yarnpkg.com/astring/-/astring-1.8.1.tgz#a91c4afd4af3523e11f31242a3d5d9af62bb6cc6" - integrity sha512-Aj3mbwVzj7Vve4I/v2JYOPFkCGM2YS7OqQTNSxmUR+LECRpokuPgAYghePgr6SALDo5bD5DlfbSaYjOzGJZOLQ== +astring@^1.8.0: + version "1.8.4" + resolved "https://registry.yarnpkg.com/astring/-/astring-1.8.4.tgz#6d4c5d8de7be2ead9e4a3cc0e2efb8d759378904" + integrity sha512-97a+l2LBU3Op3bBQEff79i/E4jMD2ZLFD8rHx9B6mXyB2uQwhJQYfiDqUwtfjF4QA1F2qs//N6Cw8LetMbQjcw== at-least-node@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -autoprefixer@^10.3.7: - version "10.4.4" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.4.tgz#3e85a245b32da876a893d3ac2ea19f01e7ea5a1e" - integrity sha512-Tm8JxsB286VweiZ5F0anmbyGiNI3v3wGv3mz9W+cxEDYB/6jbnj6GM9H9mK3wIL8ftgl+C07Lcwb8PG5PCCPzA== - dependencies: - browserslist "^4.20.2" - caniuse-lite "^1.0.30001317" - fraction.js "^4.2.0" - normalize-range "^0.1.2" - picocolors "^1.0.0" - postcss-value-parser "^4.2.0" - -autoprefixer@^10.4.7: - version "10.4.7" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.7.tgz#1db8d195f41a52ca5069b7593be167618edbbedf" - integrity sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA== +autoprefixer@^10.4.12, autoprefixer@^10.4.7: + version "10.4.14" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.14.tgz#e28d49902f8e759dd25b153264e862df2705f79d" + integrity sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ== dependencies: - browserslist "^4.20.3" - caniuse-lite "^1.0.30001335" + browserslist "^4.21.5" + caniuse-lite "^1.0.30001464" fraction.js "^4.2.0" normalize-range "^0.1.2" picocolors "^1.0.0" postcss-value-parser "^4.2.0" -available-typed-arrays@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz#9e0ae84ecff20caae6a94a1c3bc39b955649b7a9" - integrity sha512-SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA== +available-typed-arrays@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" + integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== axios@^0.25.0: version "0.25.0" @@ -3970,9 +2634,9 @@ axios@^0.25.0: follow-redirects "^1.14.7" babel-loader@^8.2.5: - version "8.2.5" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e" - integrity sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ== + version "8.3.0" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8" + integrity sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q== dependencies: find-cache-dir "^3.3.1" loader-utils "^2.0.0" @@ -4001,53 +2665,29 @@ babel-plugin-extract-import-names@1.6.22: dependencies: "@babel/helper-plugin-utils" "7.10.4" -babel-plugin-polyfill-corejs2@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5" - integrity sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w== - dependencies: - "@babel/compat-data" "^7.13.11" - "@babel/helper-define-polyfill-provider" "^0.3.1" - semver "^6.1.1" - -babel-plugin-polyfill-corejs2@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz#e4c31d4c89b56f3cf85b92558954c66b54bd972d" - integrity sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q== +babel-plugin-polyfill-corejs2@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122" + integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q== dependencies: "@babel/compat-data" "^7.17.7" - "@babel/helper-define-polyfill-provider" "^0.3.2" + "@babel/helper-define-polyfill-provider" "^0.3.3" semver "^6.1.1" -babel-plugin-polyfill-corejs3@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz#aabe4b2fa04a6e038b688c5e55d44e78cd3a5f72" - integrity sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.1" - core-js-compat "^3.21.0" - -babel-plugin-polyfill-corejs3@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz#d7e09c9a899079d71a8b670c6181af56ec19c5c7" - integrity sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.2" - core-js-compat "^3.21.0" - -babel-plugin-polyfill-regenerator@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz#2c0678ea47c75c8cc2fbb1852278d8fb68233990" - integrity sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A== +babel-plugin-polyfill-corejs3@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a" + integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA== dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.1" + "@babel/helper-define-polyfill-provider" "^0.3.3" + core-js-compat "^3.25.1" -babel-plugin-polyfill-regenerator@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz#8f51809b6d5883e07e71548d75966ff7635527fe" - integrity sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw== +babel-plugin-polyfill-regenerator@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747" + integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw== dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.2" + "@babel/helper-define-polyfill-provider" "^0.3.3" bail@^1.0.0: version "1.0.5" @@ -4067,7 +2707,7 @@ balanced-match@^1.0.0: base16@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/base16/-/base16-1.0.0.tgz#e297f60d7ec1014a7a971a39ebc8a98c0b681e70" - integrity sha1-4pf2DX7BAUp6lxo568ipjAtoHnA= + integrity sha512-pNdYkNPiJUnEhnfXV56+sQy8+AaPcG3POZAUnwr4EeqCUZFz4u2PePbo3e5Gj4ziYPCWGUZT9RHisvJKnwFuBQ== base64-js@^1.3.1: version "1.5.1" @@ -4077,7 +2717,7 @@ base64-js@^1.3.1: batch@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" - integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY= + integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw== big.js@^5.2.2: version "5.2.2" @@ -4089,10 +2729,10 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== -body-parser@1.20.0: - version "1.20.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5" - integrity sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg== +body-parser@1.20.1: + version "1.20.1" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668" + integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== dependencies: bytes "3.1.2" content-type "~1.0.4" @@ -4102,36 +2742,36 @@ body-parser@1.20.0: http-errors "2.0.0" iconv-lite "0.4.24" on-finished "2.4.1" - qs "6.10.3" + qs "6.11.0" raw-body "2.5.1" type-is "~1.6.18" unpipe "1.0.0" bonjour-service@^1.0.11: - version "1.0.12" - resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.0.12.tgz#28fbd4683f5f2e36feedb833e24ba661cac960c3" - integrity sha512-pMmguXYCu63Ug37DluMKEHdxc+aaIf/ay4YbF8Gxtba+9d3u+rmEWy61VK3Z3hp8Rskok3BunHYnG0dUHAsblw== + version "1.1.1" + resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.1.1.tgz#960948fa0e0153f5d26743ab15baf8e33752c135" + integrity sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg== dependencies: array-flatten "^2.1.2" dns-equal "^1.0.0" fast-deep-equal "^3.1.3" - multicast-dns "^7.2.4" + multicast-dns "^7.2.5" boolbase@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" - integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= + integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== boxen@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.0.1.tgz#657528bdd3f59a772b8279b831f27ec2c744664b" - integrity sha512-49VBlw+PrWEF51aCmy7QIteYPIFZxSpvqBdP/2itCPPlJ49kj9zg/XPRFrdkne2W+CfwXUls8exMvu1RysZpKA== + version "5.1.2" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" + integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ== dependencies: ansi-align "^3.0.0" camelcase "^6.2.0" chalk "^4.1.0" cli-boxes "^2.2.1" - string-width "^4.2.0" + string-width "^4.2.2" type-fest "^0.20.2" widest-line "^3.1.0" wrap-ansi "^7.0.0" @@ -4158,45 +2798,22 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -braces@^3.0.1, braces@^3.0.2, braces@~3.0.2: +braces@^3.0.2, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== dependencies: fill-range "^7.0.1" -browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6: - version "4.16.8" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.8.tgz#cb868b0b554f137ba6e33de0ecff2eda403c4fb0" - integrity sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ== - dependencies: - caniuse-lite "^1.0.30001251" - colorette "^1.3.0" - electron-to-chromium "^1.3.811" - escalade "^3.1.1" - node-releases "^1.1.75" - -browserslist@^4.17.5, browserslist@^4.20.2: - version "4.20.2" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88" - integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA== - dependencies: - caniuse-lite "^1.0.30001317" - electron-to-chromium "^1.4.84" - escalade "^3.1.1" - node-releases "^2.0.2" - picocolors "^1.0.0" - -browserslist@^4.18.1, browserslist@^4.20.3: - version "4.20.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.3.tgz#eb7572f49ec430e054f56d52ff0ebe9be915f8bf" - integrity sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg== +browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.18.1, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5: + version "4.21.5" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7" + integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w== dependencies: - caniuse-lite "^1.0.30001332" - electron-to-chromium "^1.4.118" - escalade "^3.1.1" - node-releases "^2.0.3" - picocolors "^1.0.0" + caniuse-lite "^1.0.30001449" + electron-to-chromium "^1.4.284" + node-releases "^2.0.8" + update-browserslist-db "^1.0.10" buble@0.19.6: version "0.19.6" @@ -4226,7 +2843,7 @@ buffer@^6.0.3: bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" - integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= + integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw== bytes@3.1.2: version "3.1.2" @@ -4273,9 +2890,9 @@ camelcase-css@2.0.1: integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA== camelcase@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" - integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== + version "6.3.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" + integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-api@^3.0.0: version "3.0.0" @@ -4287,20 +2904,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001251: - version "1.0.30001251" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz#6853a606ec50893115db660f82c094d18f096d85" - integrity sha512-HOe1r+9VkU4TFmnU70z+r7OLmtR+/chB1rdcJUeQlAinjEeb0cKL20tlAtOagNZhbrtLnCvV19B4FmF1rgzl6A== - -caniuse-lite@^1.0.30001317: - version "1.0.30001332" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001332.tgz#39476d3aa8d83ea76359c70302eafdd4a1d727dd" - integrity sha512-10T30NYOEQtN6C11YGg411yebhvpnC6Z102+B95eAsN0oB6KUs01ivE8u+G6FMIRtIrVlYXhL+LUwQ3/hXwDWw== - -caniuse-lite@^1.0.30001332, caniuse-lite@^1.0.30001335: - version "1.0.30001344" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001344.tgz#8a1e7fdc4db9c2ec79a05e9fd68eb93a761888bb" - integrity sha512-0ZFjnlCaXNOAYcV7i+TtdKBp0L/3XEU2MF/x6Du1lrh+SRX4IfzIVL4HNJg5pB2PmFb8rszIGyOvsZnqqRoc2g== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001464: + version "1.0.30001469" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001469.tgz#3dd505430c8522fdc9f94b4a19518e330f5c945a" + integrity sha512-Rcp7221ScNqQPP3W+lVOYDyjdR6dC+neEQCttoNr5bAyz54AboB4iwpnWgyi8P4YUsPybVzT4LgWiBbI3drL4g== ccount@^1.0.0: version "1.1.0" @@ -4321,7 +2928,7 @@ chalk@^2.0.0, chalk@^2.4.1: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.1.0, chalk@^4.1.2: +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -4350,9 +2957,9 @@ character-entities@^1.0.0: integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw== character-entities@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-2.0.1.tgz#98724833e1e27990dee0bd0f2b8a859c3476aac7" - integrity sha512-OzmutCf2Kmc+6DrFrrPS8/tDh2+DpnrfzdICHWhcVC9eOd0N1PXmQEE1a8iM4IziIAG+8tmTq3K+oo0ubH6RRQ== + version "2.0.2" + resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-2.0.2.tgz#2d09c2e72cd9523076ccb21157dff66ad43fcc22" + integrity sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ== character-reference-invalid@^1.0.0: version "1.1.4" @@ -4414,17 +3021,15 @@ ci-info@^2.0.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== -clean-css@^5.1.5: - version "5.1.5" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.1.5.tgz#3b0af240dcfc9a3779a08c2332df3ebd4474f232" - integrity sha512-9dr/cU/LjMpU57PXlSvDkVRh0rPxJBXiBtD0+SgYt8ahTCsXtfKjCkNYgIoTC6mBg8CFr5EKhW3DKCaGMUbUfQ== - dependencies: - source-map "~0.6.0" +ci-info@^3.2.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" + integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== clean-css@^5.2.2, clean-css@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.0.tgz#ad3d8238d5f3549e83d5f87205189494bc7cbb59" - integrity sha512-YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ== + version "5.3.2" + resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.2.tgz#70ecc7d4d4114921f5d298349ff86a31a9975224" + integrity sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww== dependencies: source-map "~0.6.0" @@ -4444,9 +3049,9 @@ cli-boxes@^3.0.0: integrity sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g== cli-table3@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.2.tgz#aaf5df9d8b5bf12634dc8b3040806a0c07120d2a" - integrity sha512-QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw== + version "0.6.3" + resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2" + integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg== dependencies: string-width "^4.2.0" optionalDependencies: @@ -4462,18 +3067,13 @@ clone-deep@^4.0.1: shallow-clone "^3.0.0" clone-response@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" - integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= + version "1.0.3" + resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz#af2032aa47816399cf5f0a1d0db902f517abb8c3" + integrity sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA== dependencies: mimic-response "^1.0.0" -clsx@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188" - integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA== - -clsx@^1.2.1: +clsx@^1.1.1, clsx@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12" integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== @@ -4500,7 +3100,7 @@ color-convert@^2.0.1: color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== color-name@~1.1.4: version "1.1.4" @@ -4508,19 +3108,14 @@ color-name@~1.1.4: integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== colord@^2.9.1: - version "2.9.2" - resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz#25e2bacbbaa65991422c07ea209e2089428effb1" - integrity sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ== - -colorette@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af" - integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w== + version "2.9.3" + resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43" + integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw== colorette@^2.0.10: - version "2.0.16" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" - integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g== + version "2.0.19" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" + integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== combine-promises@^1.1.0: version "1.1.0" @@ -4533,26 +3128,26 @@ comma-separated-tokens@^1.0.0: integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw== comma-separated-tokens@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.2.tgz#d4c25abb679b7751c880be623c1179780fe1dd98" - integrity sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg== - -commander@2, commander@^2.20.0: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + version "2.0.3" + resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz#4e89c9458acb61bc8fef19f4529973b2392839ee" + integrity sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg== commander@7, commander@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== +commander@^2.20.0: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + commander@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== -commander@^8.1.0, commander@^8.3.0: +commander@^8.3.0: version "8.3.0" resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== @@ -4560,17 +3155,17 @@ commander@^8.1.0, commander@^8.3.0: commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= + integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== component-props@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/component-props/-/component-props-1.1.1.tgz#f9b7df9b9927b6e6d97c9bd272aa867670f34944" - integrity sha1-+bffm5kntubZfJvScqqGdnDzSUQ= + integrity sha512-69pIRJs9fCCHRqCz3390YF2LV1Lu6iEMZ5zuVqqUn+G20V9BNXlMs0cWawWeW9g4Ynmg29JmkG6R7/lUJoGd1Q== component-xor@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/component-xor/-/component-xor-0.0.4.tgz#c55d83ccc1b94cd5089a4e93fa7891c7263e59aa" - integrity sha1-xV2DzMG5TNUImk6T+niRxyY+Wao= + integrity sha512-ZIt6sla8gfo+AFVRZoZOertcnD5LJaY2T9CKE2j13NJxQt/mUafD69Bl7/Y4AnpI2LGjiXH7cOfJDx/n2G9edA== compressible@~2.0.16: version "2.0.18" @@ -4595,7 +3190,7 @@ compression@^1.7.4: concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== configstore@^5.0.1: version "5.0.1" @@ -4622,7 +3217,7 @@ consola@^2.15.3: content-disposition@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" - integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ= + integrity sha512-kRGRZw3bLlFISDBgwTSA1TMBFN6J6GWDeubmDE3AF+3+yXL8hTWv8r5rkLbqYXY4RjPk/EzHnClI3zQf1cFmHA== content-disposition@0.5.4: version "0.5.4" @@ -4632,21 +3227,19 @@ content-disposition@0.5.4: safe-buffer "5.2.1" content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== + version "1.0.5" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" + integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== convert-source-map@^1.7.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" - integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== - dependencies: - safe-buffer "~5.1.1" + version "1.9.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" + integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= + integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== cookie@0.5.0: version "0.5.0" @@ -4654,9 +3247,9 @@ cookie@0.5.0: integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== copy-text-to-clipboard@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c" - integrity sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q== + version "3.1.0" + resolved "https://registry.yarnpkg.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.1.0.tgz#6bf40deef0a51ac6858efb0d76ded2c6d6a15059" + integrity sha512-PFM6BnjLnOON/lB3ta/Jg7Ywsv+l9kQGD4TWDCSlRBGmqnnTM5MrDkhAFgw+8HZt0wW6Q2BBE4cmy9sq+s9Qng== copy-webpack-plugin@^11.0.0: version "11.0.0" @@ -4670,41 +3263,41 @@ copy-webpack-plugin@^11.0.0: schema-utils "^4.0.0" serialize-javascript "^6.0.0" -core-js-compat@^3.21.0: - version "3.22.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.1.tgz#47b9c5e79efbf13935f637449fa1cdec8cd9515f" - integrity sha512-CWbNqTluLMvZg1cjsQUbGiCM91dobSHKfDIyCoxuqxthdjGuUlaMbCsSehP3CBiVvG0C7P6UIrC1v0hgFE75jw== +core-js-compat@^3.25.1: + version "3.29.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.29.1.tgz#15c0fb812ea27c973c18d425099afa50b934b41b" + integrity sha512-QmchCua884D8wWskMX8tW5ydINzd8oSJVx38lx/pVkFGqztxt73GYre3pm/hyYq8bPf+MW5In4I/uRShFDsbrA== dependencies: - browserslist "^4.20.2" - semver "7.0.0" + browserslist "^4.21.5" -core-js-compat@^3.22.1: - version "3.22.7" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.7.tgz#8359eb66ecbf726dd0cfced8e48d5e73f3224239" - integrity sha512-uI9DAQKKiiE/mclIC5g4AjRpio27g+VMRhe6rQoz+q4Wm4L6A/fJhiLtBw+sfOpDG9wZ3O0pxIw7GbfOlBgjOA== - dependencies: - browserslist "^4.20.3" - semver "7.0.0" +core-js-pure@^3.25.1: + version "3.29.1" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.29.1.tgz#1be6ca2b8772f6b4df7fc4621743286e676c6162" + integrity sha512-4En6zYVi0i0XlXHVz/bi6l1XDjCqkKRq765NXuX+SnaIatlE96Odt5lMLjdxUiNI1v9OXI5DSLWYPlmTfkTktg== -core-js-pure@^3.20.2: - version "3.22.1" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.1.tgz#4d94e0c9a7b710da20dadd727fe98b43543119f0" - integrity sha512-TChjCtgcMDc8t12RiwAsThjqrS/VpBlEvDgL009ot4HESzBo3h2FSZNa6ZS1nWKZEPDoulnszxUll9n0/spflQ== +core-js@^3.14.0, core-js@^3.23.3: + version "3.29.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.29.1.tgz#40ff3b41588b091aaed19ca1aa5cb111803fa9a6" + integrity sha512-+jwgnhg6cQxKYIIjGtAHq2nwUOolo9eoFZ4sHfUH09BLXBgxnH4gA0zEd+t+BO2cNB8idaBtZFcFTRjQJRJmAw== -core-js@^3.14.0: - version "3.16.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.1.tgz#f4485ce5c9f3c6a7cb18fa80488e08d362097249" - integrity sha512-AAkP8i35EbefU+JddyWi12AWE9f2N/qr/pwnDtWz4nyUIBGMJPX99ANFFRSw6FefM374lDujdtLDyhN2A/btHw== +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== -core-js@^3.23.3: - version "3.25.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.0.tgz#be71d9e0dd648ffd70c44a7ec2319d039357eceb" - integrity sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA== +cose-base@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/cose-base/-/cose-base-1.0.3.tgz#650334b41b869578a543358b80cda7e0abe0a60a" + integrity sha512-s9whTXInMSgAp/NVXVNuVxVKzGH2qck3aQlVHxDCdAEPgtMKwc4Wq6/QKhgdEdgbLSi9rBTAcPoRa6JpiG4ksg== + dependencies: + layout-base "^1.0.0" -core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= +cose-base@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/cose-base/-/cose-base-2.2.0.tgz#1c395c35b6e10bb83f9769ca8b817d614add5c01" + integrity sha512-AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g== + dependencies: + layout-base "^2.0.0" cosmiconfig@^6.0.0: version "6.0.0" @@ -4717,10 +3310,10 @@ cosmiconfig@^6.0.0: path-type "^4.0.0" yaml "^1.7.2" -cosmiconfig@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3" - integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA== +cosmiconfig@^7.0.1: + version "7.1.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6" + integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA== dependencies: "@types/parse-json" "^4.0.0" import-fresh "^3.2.1" @@ -4728,23 +3321,22 @@ cosmiconfig@^7.0.0: path-type "^4.0.0" yaml "^1.10.0" -cosmiconfig@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" - integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== +cosmiconfig@^8.0.0: + version "8.1.3" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.1.3.tgz#0e614a118fcc2d9e5afc2f87d53cd09931015689" + integrity sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw== dependencies: - "@types/parse-json" "^4.0.0" import-fresh "^3.2.1" + js-yaml "^4.1.0" parse-json "^5.0.0" path-type "^4.0.0" - yaml "^1.10.0" -cross-fetch@^3.0.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.4.tgz#9723f3a3a247bf8b89039f3a380a9244e8fa2f39" - integrity sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ== +cross-fetch@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" + integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== dependencies: - node-fetch "2.6.1" + node-fetch "2.6.7" cross-spawn@^7.0.3: version "7.0.3" @@ -4760,52 +3352,47 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== -css-declaration-sorter@^6.2.2: - version "6.2.2" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.2.2.tgz#bfd2f6f50002d6a3ae779a87d3a0c5d5b10e0f02" - integrity sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg== - -css-declaration-sorter@^6.3.0: - version "6.3.1" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz#be5e1d71b7a992433fb1c542c7a1b835e45682ec" - integrity sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w== +css-declaration-sorter@^6.3.1: + version "6.4.0" + resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz#630618adc21724484b3e9505bce812def44000ad" + integrity sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew== css-loader@^6.7.1: - version "6.7.1" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.1.tgz#e98106f154f6e1baf3fc3bc455cb9981c1d5fd2e" - integrity sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw== + version "6.7.3" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.3.tgz#1e8799f3ccc5874fdd55461af51137fcc5befbcd" + integrity sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ== dependencies: icss-utils "^5.1.0" - postcss "^8.4.7" + postcss "^8.4.19" postcss-modules-extract-imports "^3.0.0" postcss-modules-local-by-default "^4.0.0" postcss-modules-scope "^3.0.0" postcss-modules-values "^4.0.0" postcss-value-parser "^4.2.0" - semver "^7.3.5" + semver "^7.3.8" css-minimizer-webpack-plugin@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-4.0.0.tgz#e11800388c19c2b7442c39cc78ac8ae3675c9605" - integrity sha512-7ZXXRzRHvofv3Uac5Y+RkWRNo0ZMlcg8e9/OtrqUYmwDWJo+qs67GvdeFrXLsFb7czKNwjQhPkM0avlIYl+1nA== + version "4.2.2" + resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-4.2.2.tgz#79f6199eb5adf1ff7ba57f105e3752d15211eb35" + integrity sha512-s3Of/4jKfw1Hj9CxEO1E5oXhQAxlayuHO2y/ML+C6I9sQ7FdzfEV6QgMLN3vI+qFsjJGIAFLKtQK7t8BOXAIyA== dependencies: cssnano "^5.1.8" - jest-worker "^27.5.1" - postcss "^8.4.13" + jest-worker "^29.1.2" + postcss "^8.4.17" schema-utils "^4.0.0" serialize-javascript "^6.0.0" source-map "^0.6.1" css-select@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067" - integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA== + version "4.3.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b" + integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ== dependencies: boolbase "^1.0.0" - css-what "^5.0.0" - domhandler "^4.2.0" - domutils "^2.6.0" - nth-check "^2.0.0" + css-what "^6.0.1" + domhandler "^4.3.1" + domutils "^2.8.0" + nth-check "^2.0.1" css-select@^5.1.0: version "5.1.0" @@ -4826,12 +3413,7 @@ css-tree@^1.1.2, css-tree@^1.1.3: mdn-data "2.0.14" source-map "^0.6.1" -css-what@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.1.tgz#3efa820131f4669a8ac2408f9c32e7c7de9f4cad" - integrity sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg== - -css-what@^6.1.0: +css-what@^6.0.1, css-what@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== @@ -4842,71 +3424,36 @@ cssesc@^3.0.0: integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== cssnano-preset-advanced@^5.3.8: - version "5.3.8" - resolved "https://registry.yarnpkg.com/cssnano-preset-advanced/-/cssnano-preset-advanced-5.3.8.tgz#027b1d05ef896d908178c483f0ec4190cb50ef9a" - integrity sha512-xUlLLnEB1LjpEik+zgRNlk8Y/koBPPtONZjp7JKbXigeAmCrFvq9H0pXW5jJV45bQWAlmJ0sKy+IMr0XxLYQZg== + version "5.3.10" + resolved "https://registry.yarnpkg.com/cssnano-preset-advanced/-/cssnano-preset-advanced-5.3.10.tgz#25558a1fbf3a871fb6429ce71e41be7f5aca6eef" + integrity sha512-fnYJyCS9jgMU+cmHO1rPSPf9axbQyD7iUhLO5Df6O4G+fKIOMps+ZbU0PdGFejFBBZ3Pftf18fn1eG7MAPUSWQ== dependencies: - autoprefixer "^10.3.7" - cssnano-preset-default "^5.2.12" + autoprefixer "^10.4.12" + cssnano-preset-default "^5.2.14" postcss-discard-unused "^5.1.0" postcss-merge-idents "^5.1.1" postcss-reduce-idents "^5.2.0" postcss-zindex "^5.1.0" -cssnano-preset-default@^5.2.10: - version "5.2.10" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.10.tgz#6dfffe6cc3b13f3bb356a42c49a334a98700ef45" - integrity sha512-H8TJRhTjBKVOPltp9vr9El9I+IfYsOMhmXdK0LwdvwJcxYX9oWkY7ctacWusgPWAgQq1vt/WO8v+uqpfLnM7QA== - dependencies: - css-declaration-sorter "^6.2.2" - cssnano-utils "^3.1.0" - postcss-calc "^8.2.3" - postcss-colormin "^5.3.0" - postcss-convert-values "^5.1.2" - postcss-discard-comments "^5.1.2" - postcss-discard-duplicates "^5.1.0" - postcss-discard-empty "^5.1.1" - postcss-discard-overridden "^5.1.0" - postcss-merge-longhand "^5.1.5" - postcss-merge-rules "^5.1.2" - postcss-minify-font-values "^5.1.0" - postcss-minify-gradients "^5.1.1" - postcss-minify-params "^5.1.3" - postcss-minify-selectors "^5.2.1" - postcss-normalize-charset "^5.1.0" - postcss-normalize-display-values "^5.1.0" - postcss-normalize-positions "^5.1.0" - postcss-normalize-repeat-style "^5.1.0" - postcss-normalize-string "^5.1.0" - postcss-normalize-timing-functions "^5.1.0" - postcss-normalize-unicode "^5.1.0" - postcss-normalize-url "^5.1.0" - postcss-normalize-whitespace "^5.1.1" - postcss-ordered-values "^5.1.1" - postcss-reduce-initial "^5.1.0" - postcss-reduce-transforms "^5.1.0" - postcss-svgo "^5.1.0" - postcss-unique-selectors "^5.1.1" - -cssnano-preset-default@^5.2.12: - version "5.2.12" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.12.tgz#ebe6596ec7030e62c3eb2b3c09f533c0644a9a97" - integrity sha512-OyCBTZi+PXgylz9HAA5kHyoYhfGcYdwFmyaJzWnzxuGRtnMw/kR6ilW9XzlzlRAtB6PLT/r+prYgkef7hngFew== +cssnano-preset-default@^5.2.14: + version "5.2.14" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz#309def4f7b7e16d71ab2438052093330d9ab45d8" + integrity sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A== dependencies: - css-declaration-sorter "^6.3.0" + css-declaration-sorter "^6.3.1" cssnano-utils "^3.1.0" postcss-calc "^8.2.3" - postcss-colormin "^5.3.0" - postcss-convert-values "^5.1.2" + postcss-colormin "^5.3.1" + postcss-convert-values "^5.1.3" postcss-discard-comments "^5.1.2" postcss-discard-duplicates "^5.1.0" postcss-discard-empty "^5.1.1" postcss-discard-overridden "^5.1.0" - postcss-merge-longhand "^5.1.6" - postcss-merge-rules "^5.1.2" + postcss-merge-longhand "^5.1.7" + postcss-merge-rules "^5.1.4" postcss-minify-font-values "^5.1.0" postcss-minify-gradients "^5.1.1" - postcss-minify-params "^5.1.3" + postcss-minify-params "^5.1.4" postcss-minify-selectors "^5.2.1" postcss-normalize-charset "^5.1.0" postcss-normalize-display-values "^5.1.0" @@ -4914,11 +3461,11 @@ cssnano-preset-default@^5.2.12: postcss-normalize-repeat-style "^5.1.1" postcss-normalize-string "^5.1.0" postcss-normalize-timing-functions "^5.1.0" - postcss-normalize-unicode "^5.1.0" + postcss-normalize-unicode "^5.1.1" postcss-normalize-url "^5.1.0" postcss-normalize-whitespace "^5.1.1" postcss-ordered-values "^5.1.3" - postcss-reduce-initial "^5.1.0" + postcss-reduce-initial "^5.1.2" postcss-reduce-transforms "^5.1.0" postcss-svgo "^5.1.0" postcss-unique-selectors "^5.1.1" @@ -4928,21 +3475,12 @@ cssnano-utils@^3.1.0: resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861" integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA== -cssnano@^5.1.12: - version "5.1.13" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.13.tgz#83d0926e72955332dc4802a7070296e6258efc0a" - integrity sha512-S2SL2ekdEz6w6a2epXn4CmMKU4K3KpcyXLKfAYc9UQQqJRkD/2eLUG0vJ3Db/9OvO5GuAdgXw3pFbR6abqghDQ== - dependencies: - cssnano-preset-default "^5.2.12" - lilconfig "^2.0.3" - yaml "^1.10.2" - -cssnano@^5.1.8: - version "5.1.10" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.10.tgz#fc6ddd9a4d7d238f320634326ed814cf0abf6e1c" - integrity sha512-ACpnRgDg4m6CZD/+8SgnLcGCgy6DDGdkMbOawwdvVxNietTNLe/MtWcenp6qT0PRt5wzhGl6/cjMWCdhKXC9QA== +cssnano@^5.1.12, cssnano@^5.1.8: + version "5.1.15" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.15.tgz#ded66b5480d5127fcb44dac12ea5a983755136bf" + integrity sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw== dependencies: - cssnano-preset-default "^5.2.10" + cssnano-preset-default "^5.2.14" lilconfig "^2.0.3" yaml "^1.10.2" @@ -4954,43 +3492,44 @@ csso@^4.2.0: css-tree "^1.1.2" csstype@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.0.tgz#4ddcac3718d787cf9df0d1b7d15033925c8f29f2" - integrity sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA== + version "3.1.1" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9" + integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw== -d3-array@1, d3-array@^1.1.1, d3-array@^1.2.0: - version "1.2.4" - resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f" - integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw== +cytoscape-cose-bilkent@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/cytoscape-cose-bilkent/-/cytoscape-cose-bilkent-4.1.0.tgz#762fa121df9930ffeb51a495d87917c570ac209b" + integrity sha512-wgQlVIUJF13Quxiv5e1gstZ08rnZj2XaLHGoFMYXz7SkNfCDOOteKBE6SYRfA9WxxI/iBc3ajfDoc6hb/MRAHQ== + dependencies: + cose-base "^1.0.0" -"d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@3: - version "3.1.6" - resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.1.6.tgz#0342c835925826f49b4d16eb7027aec334ffc97d" - integrity sha512-DCbBBNuKOeiR9h04ySRBMW52TFVc91O9wJziuyXw6Ztmy8D3oZbmCkOO3UHKC7ceNJsN2Mavo9+vwV8EAEUXzA== +cytoscape-fcose@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/cytoscape-fcose/-/cytoscape-fcose-2.2.0.tgz#e4d6f6490df4fab58ae9cea9e5c3ab8d7472f471" + integrity sha512-ki1/VuRIHFCzxWNrsshHYPs6L7TvLu3DL+TyIGEsRcvVERmxokbf5Gdk7mFxZnTdiGtnA4cfSmjZJMviqSuZrQ== dependencies: - internmap "1 - 2" + cose-base "^2.2.0" + +cytoscape@^3.23.0: + version "3.23.0" + resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.23.0.tgz#054ee05a6d0aa3b4f139382bbf2f4e5226df3c6d" + integrity sha512-gRZqJj/1kiAVPkrVFvz/GccxsXhF3Qwpptl32gKKypO4IlqnKBjTOu+HbXtEggSGzC5KCaHp3/F7GgENrtsFkA== + dependencies: + heap "^0.2.6" + lodash "^4.17.21" -d3-axis@1: - version "1.0.12" - resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.12.tgz#cdf20ba210cfbb43795af33756886fb3638daac9" - integrity sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ== +"d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@3, d3-array@^3.2.0: + version "3.2.3" + resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.2.3.tgz#39f1f4954e4a09ff69ac597c2d61906b04e84740" + integrity sha512-JRHwbQQ84XuAESWhvIPaUV4/1UYTBOLiOPGWqgFDHZS1D5QN9c57FbH3QpEnQMYiOXNzKUQyGTZf+EVO7RT5TQ== + dependencies: + internmap "1 - 2" d3-axis@3: version "3.0.0" resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-3.0.0.tgz#c42a4a13e8131d637b745fc2973824cfeaf93322" integrity sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw== -d3-brush@1: - version "1.1.6" - resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.6.tgz#b0a22c7372cabec128bdddf9bddc058592f89e9b" - integrity sha512-7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA== - dependencies: - d3-dispatch "1" - d3-drag "1" - d3-interpolate "1" - d3-selection "1" - d3-transition "1" - d3-brush@3: version "3.0.0" resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-3.0.0.tgz#6f767c4ed8dcb79de7ede3e1c0f89e63ef64d31c" @@ -5002,14 +3541,6 @@ d3-brush@3: d3-selection "3" d3-transition "3" -d3-chord@1: - version "1.0.6" - resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-1.0.6.tgz#309157e3f2db2c752f0280fedd35f2067ccbb15f" - integrity sha512-JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA== - dependencies: - d3-array "1" - d3-path "1" - d3-chord@3: version "3.0.1" resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-3.0.1.tgz#d156d61f485fce8327e6abf339cb41d8cbba6966" @@ -5017,34 +3548,17 @@ d3-chord@3: dependencies: d3-path "1 - 3" -d3-collection@1: - version "1.0.7" - resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e" - integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A== - -d3-color@1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a" - integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q== - "d3-color@1 - 3", d3-color@3: version "3.1.0" resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2" integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA== -d3-contour@1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-1.3.2.tgz#652aacd500d2264cb3423cee10db69f6f59bead3" - integrity sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg== - dependencies: - d3-array "^1.1.1" - -d3-contour@3: - version "3.0.1" - resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-3.0.1.tgz#2c64255d43059599cd0dba8fe4cc3d51ccdd9bbd" - integrity sha512-0Oc4D0KyhwhM7ZL0RMnfGycLN7hxHB8CMmwZ3+H26PWAG0ozNuYG5hXSDNgmP1SgJkQMrlG6cP20HoaSbvcJTQ== +d3-contour@4: + version "4.0.2" + resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-4.0.2.tgz#bb92063bc8c5663acb2422f99c73cbb6c6ae3bcc" + integrity sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA== dependencies: - d3-array "2 - 3" + d3-array "^3.2.0" d3-delaunay@6: version "6.0.2" @@ -5053,24 +3567,11 @@ d3-delaunay@6: dependencies: delaunator "5" -d3-dispatch@1: - version "1.0.6" - resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.6.tgz#00d37bcee4dd8cd97729dd893a0ac29caaba5d58" - integrity sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA== - "d3-dispatch@1 - 3", d3-dispatch@3: version "3.0.1" resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-3.0.1.tgz#5fc75284e9c2375c36c839411a0cf550cbfc4d5e" integrity sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg== -d3-drag@1: - version "1.2.5" - resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.5.tgz#2537f451acd39d31406677b7dc77c82f7d988f70" - integrity sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w== - dependencies: - d3-dispatch "1" - d3-selection "1" - "d3-drag@2 - 3", d3-drag@3: version "3.0.0" resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-3.0.0.tgz#994aae9cd23c719f53b5e10e3a0a6108c69607ba" @@ -5079,15 +3580,6 @@ d3-drag@1: d3-dispatch "1 - 3" d3-selection "3" -d3-dsv@1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.2.0.tgz#9d5f75c3a5f8abd611f74d3f5847b0d4338b885c" - integrity sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g== - dependencies: - commander "2" - iconv-lite "0.4" - rw "1" - "d3-dsv@1 - 3", d3-dsv@3: version "3.0.1" resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-3.0.1.tgz#c63af978f4d6a0d084a52a673922be2160789b73" @@ -5097,23 +3589,11 @@ d3-dsv@1: iconv-lite "0.6" rw "1" -d3-ease@1: - version "1.0.7" - resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.7.tgz#9a834890ef8b8ae8c558b2fe55bd57f5993b85e2" - integrity sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ== - "d3-ease@1 - 3", d3-ease@3: version "3.0.1" resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-3.0.1.tgz#9658ac38a2140d59d346160f1f6c30fda0bd12f4" integrity sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w== -d3-fetch@1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.2.0.tgz#15ce2ecfc41b092b1db50abd2c552c2316cf7fc7" - integrity sha512-yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA== - dependencies: - d3-dsv "1" - d3-fetch@3: version "3.0.1" resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-3.0.1.tgz#83141bff9856a0edb5e38de89cdcfe63d0a60a22" @@ -5121,16 +3601,6 @@ d3-fetch@3: dependencies: d3-dsv "1 - 3" -d3-force@1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.2.1.tgz#fd29a5d1ff181c9e7f0669e4bd72bdb0e914ec0b" - integrity sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg== - dependencies: - d3-collection "1" - d3-dispatch "1" - d3-quadtree "1" - d3-timer "1" - d3-force@3: version "3.0.0" resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-3.0.0.tgz#3e2ba1a61e70888fe3d9194e30d6d14eece155c4" @@ -5140,47 +3610,23 @@ d3-force@3: d3-quadtree "1 - 3" d3-timer "1 - 3" -d3-format@1: - version "1.4.5" - resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.5.tgz#374f2ba1320e3717eb74a9356c67daee17a7edb4" - integrity sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ== - "d3-format@1 - 3", d3-format@3: version "3.1.0" resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-3.1.0.tgz#9260e23a28ea5cb109e93b21a06e24e2ebd55641" integrity sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA== -d3-geo@1: - version "1.12.1" - resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.12.1.tgz#7fc2ab7414b72e59fbcbd603e80d9adc029b035f" - integrity sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg== - dependencies: - d3-array "1" - d3-geo@3: - version "3.0.1" - resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-3.0.1.tgz#4f92362fd8685d93e3b1fae0fd97dc8980b1ed7e" - integrity sha512-Wt23xBych5tSy9IYAM1FR2rWIBFWa52B/oF/GYe5zbdHrg08FU8+BuI6X4PvTwPDdqdAdq04fuWJpELtsaEjeA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-3.1.0.tgz#74fd54e1f4cebd5185ac2039217a98d39b0a4c0e" + integrity sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA== dependencies: d3-array "2.5.0 - 3" -d3-hierarchy@1: - version "1.1.9" - resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz#2f6bee24caaea43f8dc37545fa01628559647a83" - integrity sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ== - d3-hierarchy@3: version "3.1.2" resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz#b01cd42c1eed3d46db77a5966cf726f8c09160c6" integrity sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA== -d3-interpolate@1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987" - integrity sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA== - dependencies: - d3-color "1" - "d3-interpolate@1 - 3", "d3-interpolate@1.2.0 - 3", d3-interpolate@3: version "3.0.1" resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz#3c47aa5b32c5b3dfb56ef3fd4342078a632b400d" @@ -5188,54 +3634,26 @@ d3-interpolate@1: dependencies: d3-color "1 - 3" -d3-path@1: - version "1.0.9" - resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.9.tgz#48c050bb1fe8c262493a8caf5524e3e9591701cf" - integrity sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg== - -"d3-path@1 - 3", d3-path@3: - version "3.0.1" - resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-3.0.1.tgz#f09dec0aaffd770b7995f1a399152bf93052321e" - integrity sha512-gq6gZom9AFZby0YLduxT1qmrp4xpBA1YZr19OI717WIdKE2OM5ETq5qrHLb301IgxhLwcuxvGZVLeeWc/k1I6w== - -d3-polygon@1: - version "1.0.6" - resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.6.tgz#0bf8cb8180a6dc107f518ddf7975e12abbfbd38e" - integrity sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ== +"d3-path@1 - 3", d3-path@3, d3-path@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-3.1.0.tgz#22df939032fb5a71ae8b1800d61ddb7851c42526" + integrity sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ== d3-polygon@3: version "3.0.1" resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-3.0.1.tgz#0b45d3dd1c48a29c8e057e6135693ec80bf16398" integrity sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg== -d3-quadtree@1: - version "1.0.7" - resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.7.tgz#ca8b84df7bb53763fe3c2f24bd435137f4e53135" - integrity sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA== - "d3-quadtree@1 - 3", d3-quadtree@3: version "3.0.1" resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-3.0.1.tgz#6dca3e8be2b393c9a9d514dabbd80a92deef1a4f" integrity sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw== -d3-random@1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-1.1.2.tgz#2833be7c124360bf9e2d3fd4f33847cfe6cab291" - integrity sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ== - d3-random@3: version "3.0.1" resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-3.0.1.tgz#d4926378d333d9c0bfd1e6fa0194d30aebaa20f4" integrity sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ== -d3-scale-chromatic@1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz#54e333fc78212f439b14641fb55801dd81135a98" - integrity sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg== - dependencies: - d3-color "1" - d3-interpolate "1" - d3-scale-chromatic@3: version "3.0.0" resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz#15b4ceb8ca2bb0dcb6d1a641ee03d59c3b62376a" @@ -5244,18 +3662,6 @@ d3-scale-chromatic@3: d3-color "1 - 3" d3-interpolate "1 - 3" -d3-scale@2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-2.2.2.tgz#4e880e0b2745acaaddd3ede26a9e908a9e17b81f" - integrity sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw== - dependencies: - d3-array "^1.2.0" - d3-collection "1" - d3-format "1" - d3-interpolate "1" - d3-time "1" - d3-time-format "2" - d3-scale@4: version "4.0.2" resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-4.0.2.tgz#82b38e8e8ff7080764f8dcec77bd4be393689396" @@ -5267,36 +3673,17 @@ d3-scale@4: d3-time "2.1.1 - 3" d3-time-format "2 - 4" -d3-selection@1, d3-selection@^1.1.0: - version "1.4.2" - resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz#dcaa49522c0dbf32d6c1858afc26b6094555bc5c" - integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg== - "d3-selection@2 - 3", d3-selection@3: version "3.0.0" resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-3.0.0.tgz#c25338207efa72cc5b9bd1458a1a41901f1e1b31" integrity sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ== -d3-shape@1: - version "1.3.7" - resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.7.tgz#df63801be07bc986bc54f63789b4fe502992b5d7" - integrity sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw== - dependencies: - d3-path "1" - d3-shape@3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-3.1.0.tgz#c8a495652d83ea6f524e482fca57aa3f8bc32556" - integrity sha512-tGDh1Muf8kWjEDT/LswZJ8WF85yDZLvVJpYU9Nq+8+yW1Z5enxrmXOhTArlkaElU+CTn0OTVNli+/i+HP45QEQ== - dependencies: - d3-path "1 - 3" - -d3-time-format@2: - version "2.3.0" - resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.3.0.tgz#107bdc028667788a8924ba040faf1fbccd5a7850" - integrity sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ== + version "3.2.0" + resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-3.2.0.tgz#a1a839cbd9ba45f28674c69d7f855bcf91dfc6a5" + integrity sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA== dependencies: - d3-time "1" + d3-path "^3.1.0" "d3-time-format@2 - 4", d3-time-format@4: version "4.1.0" @@ -5305,40 +3692,18 @@ d3-time-format@2: dependencies: d3-time "1 - 3" -d3-time@1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.1.0.tgz#b1e19d307dae9c900b7e5b25ffc5dcc249a8a0f1" - integrity sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA== - "d3-time@1 - 3", "d3-time@2.1.1 - 3", d3-time@3: - version "3.0.0" - resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-3.0.0.tgz#65972cb98ae2d4954ef5c932e8704061335d4975" - integrity sha512-zmV3lRnlaLI08y9IMRXSDshQb5Nj77smnfpnd2LrBa/2K281Jijactokeak14QacHs/kKq0AQ121nidNYlarbQ== + version "3.1.0" + resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-3.1.0.tgz#9310db56e992e3c0175e1ef385e545e48a9bb5c7" + integrity sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q== dependencies: d3-array "2 - 3" -d3-timer@1: - version "1.0.10" - resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.10.tgz#dfe76b8a91748831b13b6d9c793ffbd508dd9de5" - integrity sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw== - "d3-timer@1 - 3", d3-timer@3: version "3.0.1" resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-3.0.1.tgz#6284d2a2708285b1abb7e201eda4380af35e63b0" integrity sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA== -d3-transition@1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.3.2.tgz#a98ef2151be8d8600543434c1ca80140ae23b398" - integrity sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA== - dependencies: - d3-color "1" - d3-dispatch "1" - d3-ease "1" - d3-interpolate "1" - d3-selection "^1.1.0" - d3-timer "1" - "d3-transition@2 - 3", d3-transition@3: version "3.0.1" resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-3.0.1.tgz#6869fdde1448868077fdd5989200cb61b2a1645f" @@ -5350,22 +3715,6 @@ d3-transition@1: d3-interpolate "1 - 3" d3-timer "1 - 3" -d3-voronoi@1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.4.tgz#dd3c78d7653d2bb359284ae478645d95944c8297" - integrity sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg== - -d3-zoom@1: - version "1.8.3" - resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.8.3.tgz#b6a3dbe738c7763121cd05b8a7795ffe17f4fc0a" - integrity sha512-VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ== - dependencies: - d3-dispatch "1" - d3-drag "1" - d3-interpolate "1" - d3-selection "1" - d3-transition "1" - d3-zoom@3: version "3.0.0" resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-3.0.0.tgz#d13f4165c73217ffeaa54295cd6969b3e7aee8f3" @@ -5377,54 +3726,17 @@ d3-zoom@3: d3-selection "2 - 3" d3-transition "2 - 3" -d3@^5.14: - version "5.16.0" - resolved "https://registry.yarnpkg.com/d3/-/d3-5.16.0.tgz#9c5e8d3b56403c79d4ed42fbd62f6113f199c877" - integrity sha512-4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw== - dependencies: - d3-array "1" - d3-axis "1" - d3-brush "1" - d3-chord "1" - d3-collection "1" - d3-color "1" - d3-contour "1" - d3-dispatch "1" - d3-drag "1" - d3-dsv "1" - d3-ease "1" - d3-fetch "1" - d3-force "1" - d3-format "1" - d3-geo "1" - d3-hierarchy "1" - d3-interpolate "1" - d3-path "1" - d3-polygon "1" - d3-quadtree "1" - d3-random "1" - d3-scale "2" - d3-scale-chromatic "1" - d3-selection "1" - d3-shape "1" - d3-time "1" - d3-time-format "2" - d3-timer "1" - d3-transition "1" - d3-voronoi "1" - d3-zoom "1" - -d3@^7.0.0: - version "7.4.4" - resolved "https://registry.yarnpkg.com/d3/-/d3-7.4.4.tgz#bfbf87487c37d3196efebd5a63e3a0ed8299d8ff" - integrity sha512-97FE+MYdAlV3R9P74+R3Uar7wUKkIFu89UWMjEaDhiJ9VxKvqaMxauImy8PC2DdBkdM2BxJOIoLxPrcZUyrKoQ== +d3@^7.4.0, d3@^7.8.2: + version "7.8.2" + resolved "https://registry.yarnpkg.com/d3/-/d3-7.8.2.tgz#2bdb3c178d095ae03b107a18837ae049838e372d" + integrity sha512-WXty7qOGSHb7HR7CfOzwN1Gw04MUOzN8qh9ZUsvwycIMb4DYMpY9xczZ6jUorGtO6bR9BPMPaueIKwiDxu9uiQ== dependencies: d3-array "3" d3-axis "3" d3-brush "3" d3-chord "3" d3-color "3" - d3-contour "3" + d3-contour "4" d3-delaunay "6" d3-dispatch "3" d3-drag "3" @@ -5450,23 +3762,18 @@ d3@^7.0.0: d3-transition "3" d3-zoom "3" -dagre-d3@^0.6.4: - version "0.6.4" - resolved "https://registry.yarnpkg.com/dagre-d3/-/dagre-d3-0.6.4.tgz#0728d5ce7f177ca2337df141ceb60fbe6eeb7b29" - integrity sha512-e/6jXeCP7/ptlAM48clmX4xTZc5Ek6T6kagS7Oz2HrYSdqcLZFLqpAfh7ldbZRFfxCZVyh61NEPR08UQRVxJzQ== +dagre-d3-es@7.0.9: + version "7.0.9" + resolved "https://registry.yarnpkg.com/dagre-d3-es/-/dagre-d3-es-7.0.9.tgz#aca12fccd9d09955a4430029ba72ee6934542a8d" + integrity sha512-rYR4QfVmy+sR44IBDvVtcAmOReGBvRCWDpO2QjYwqgh9yijw6eSHBqaPG/LIOEy7aBsniLvtMW6pg19qJhq60w== dependencies: - d3 "^5.14" - dagre "^0.8.5" - graphlib "^2.1.8" - lodash "^4.17.15" + d3 "^7.8.2" + lodash-es "^4.17.21" -dagre@^0.8.5: - version "0.8.5" - resolved "https://registry.yarnpkg.com/dagre/-/dagre-0.8.5.tgz#ba30b0055dac12b6c1fcc247817442777d06afee" - integrity sha512-/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw== - dependencies: - graphlib "^2.1.8" - lodash "^4.17.15" +dayjs@^1.11.7: + version "1.11.7" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" + integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== debug@2.6.9, debug@^2.6.0: version "2.6.9" @@ -5475,24 +3782,24 @@ debug@2.6.9, debug@^2.6.0: dependencies: ms "2.0.0" -debug@^4.0.0, debug@^4.1.0, debug@^4.1.1: - version "4.3.2" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== +debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" decode-named-character-reference@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/decode-named-character-reference/-/decode-named-character-reference-1.0.1.tgz#57b2bd9112659cacbc449d3577d7dadb8e1f3d1b" - integrity sha512-YV/0HQHreRwKb7uBopyIkLG17jG6Sv2qUchk9qSoVJ2f+flwRsPNBO0hAnjt6mTNYUT+vw9Gy2ihXg4sUWPi2w== + version "1.0.2" + resolved "https://registry.yarnpkg.com/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz#daabac9690874c394c81e4162a0304b35d824f0e" + integrity sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg== dependencies: character-entities "^2.0.0" decompress-response@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" - integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= + integrity sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA== dependencies: mimic-response "^1.0.0" @@ -5502,9 +3809,9 @@ deep-extend@^0.6.0: integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== deepmerge@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" - integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== + version "4.3.1" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" + integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== default-gateway@^6.0.3: version "6.0.3" @@ -5523,12 +3830,13 @@ define-lazy-prop@^2.0.0: resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== -define-properties@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" - integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== +define-properties@^1.1.3, define-properties@^1.1.4: + version "1.2.0" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" + integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== dependencies: - object-keys "^1.0.12" + has-property-descriptors "^1.0.0" + object-keys "^1.1.1" del@^6.1.1: version "6.1.1" @@ -5559,12 +3867,12 @@ depd@2.0.0: depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== dequal@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.2.tgz#85ca22025e3a87e65ef75a7a437b35284a7e319d" - integrity sha512-q9K8BlJVxK7hQYqa6XISGmBZbtQQWVXSrRrWreHC94rMt1QL/Impruc+7p2CYSYuVIUr+YCt6hjrs1kkdJRTug== + version "2.0.3" + resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be" + integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA== destroy@1.2.0: version "1.2.0" @@ -5592,17 +3900,17 @@ detect-port-alt@^1.1.6: debug "^2.6.0" detect-port@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/detect-port/-/detect-port-1.3.0.tgz#d9c40e9accadd4df5cac6a782aefd014d573d1f1" - integrity sha512-E+B1gzkl2gqxt1IhUzwjrxBKRqx1UzC3WLONHinn8S3T6lwV/agVCyitiFOsGJ/eYuEUBvD71MZHy3Pv1G9doQ== + version "1.5.1" + resolved "https://registry.yarnpkg.com/detect-port/-/detect-port-1.5.1.tgz#451ca9b6eaf20451acb0799b8ab40dff7718727b" + integrity sha512-aBzdj76lueB6uUst5iAs7+0H/oOjqI5D16XUWxlWMIMROhcM0rfsNVk93zTngq1dDNpoXRr++Sus7ETAExppAQ== dependencies: address "^1.0.1" - debug "^2.6.0" + debug "4" diff@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" - integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== + version "5.1.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40" + integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw== dir-glob@^3.0.1: version "3.0.1" @@ -5614,12 +3922,12 @@ dir-glob@^3.0.1: dns-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" - integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= + integrity sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg== dns-packet@^5.2.2: - version "5.3.1" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.3.1.tgz#eb94413789daec0f0ebe2fcc230bdc9d7c91b43d" - integrity sha512-spBwIj0TK0Ey3666GwIdWVfUpLyubpU53BTCu8iPn4r4oXd9O14Hjg3EHw3ts2oed77/SeckunUYCyRlSngqHw== + version "5.4.0" + resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.4.0.tgz#1f88477cf9f27e78a213fb6d118ae38e759a879b" + integrity sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g== dependencies: "@leichtgewicht/ip-codec" "^2.0.1" @@ -5666,9 +3974,9 @@ dom-iterator@^1.0.0: component-xor "0.0.4" dom-serializer@^1.0.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" - integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== + version "1.4.1" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30" + integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag== dependencies: domelementtype "^2.0.1" domhandler "^4.2.0" @@ -5683,20 +3991,15 @@ dom-serializer@^2.0.0: domhandler "^5.0.2" entities "^4.2.0" -domelementtype@^2.0.1, domelementtype@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" - integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== - -domelementtype@^2.3.0: +domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== -domhandler@^4.0.0, domhandler@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059" - integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA== +domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" + integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ== dependencies: domelementtype "^2.2.0" @@ -5707,15 +4010,15 @@ domhandler@^5.0.1, domhandler@^5.0.2, domhandler@^5.0.3: dependencies: domelementtype "^2.3.0" -dompurify@2.3.10: - version "2.3.10" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.10.tgz#901f7390ffe16a91a5a556b94043314cd4850385" - integrity sha512-o7Fg/AgC7p/XpKjf/+RC3Ok6k4St5F7Q6q6+Nnm3p2zGWioAY6dh0CbbuwOhH2UcSzKsdniE/YnE2/92JcsA+g== +dompurify@2.4.3: + version "2.4.3" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.3.tgz#f4133af0e6a50297fc8874e2eaedc13a3c308c03" + integrity sha512-q6QaLcakcRjebxjg8/+NP+h0rPfatOgOzc46Fst9VAA3jF2ApfKBNKMzdP4DYTqtUMXSCd5pRS/8Po/OmoCHZQ== -domutils@^2.5.2, domutils@^2.6.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.7.0.tgz#8ebaf0c41ebafcf55b0b72ec31c56323712c5442" - integrity sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg== +domutils@^2.5.2, domutils@^2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" + integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== dependencies: dom-serializer "^1.0.1" domelementtype "^2.2.0" @@ -5746,9 +4049,9 @@ dot-prop@^5.2.0: is-obj "^2.0.0" duplexer3@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" - integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= + version "0.1.5" + resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e" + integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA== duplexer@^0.1.2: version "0.1.2" @@ -5763,27 +4066,17 @@ eastasianwidth@^0.2.0: ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= - -electron-to-chromium@^1.3.811: - version "1.3.813" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.813.tgz#751a007d71c00faed8b5e9edaf3634c14b9c5a1f" - integrity sha512-YcSRImHt6JZZ2sSuQ4Bzajtk98igQ0iKkksqlzZLzbh4p0OIyJRSvUbsgqfcR8txdfsoYCc4ym306t4p2kP/aw== - -electron-to-chromium@^1.4.118: - version "1.4.142" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.142.tgz#70cc8871f7c0122b29256089989e67cee637b40d" - integrity sha512-ea8Q1YX0JRp4GylOmX4gFHIizi0j9GfRW4EkaHnkZp0agRCBB4ZGeCv17IEzIvBkiYVwfoKVhKZJbTfqCRdQdg== + integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -electron-to-chromium@^1.4.84: - version "1.4.114" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.114.tgz#d85ec0808dd50b0cf6e6b262480ffd385f71c873" - integrity sha512-gRwLpVYWHGbERPU6o8pKfR168V6enWEXzZc6zQNNXbgJ7UJna+9qzAIHY94+9KOv71D/CH+QebLA9pChD2q8zA== +electron-to-chromium@^1.4.284: + version "1.4.340" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.340.tgz#3a6d7414c1fc2dbf84b6f7af3ec24270606c85b8" + integrity sha512-zx8hqumOqltKsv/MF50yvdAlPF9S/4PXbyfzJS6ZGhbddGkRegdwImmfSVqCkEziYzrIGZ/TlrzBND4FysfkDg== -emoji-regex@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" - integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== +elkjs@^0.8.2: + version "0.8.2" + resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.8.2.tgz#c37763c5a3e24e042e318455e0147c912a7c248e" + integrity sha512-L6uRgvZTH+4OF5NE/MBbzQx/WYpru1xCBE9respNj6qznEewGUIfhzmm7horWWxbNO2M0WckQypGctR8lH79xQ== emoji-regex@^8.0.0: version "8.0.0" @@ -5808,7 +4101,7 @@ emoticon@^3.2.0: encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== end-of-stream@^1.1.0: version "1.4.4" @@ -5818,9 +4111,9 @@ end-of-stream@^1.1.0: once "^1.4.0" enhanced-resolve@^5.10.0: - version "5.10.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6" - integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ== + version "5.12.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634" + integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -5830,15 +4123,10 @@ entities@^2.0.0: resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== -entities@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4" - integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q== - -entities@^4.2.0, entities@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-4.3.0.tgz#62915f08d67353bb4eb67e3d62641a4059aec656" - integrity sha512-/iP1rZrSEJ0DTlPiX+jbzlA3eVkY/e8L8SozroF395fIqE3TYF/Nz7YOMAawta+vLmyJ/hkGNNPcSbMADCCXbg== +entities@^4.2.0, entities@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" + integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== error-ex@^1.3.1: version "1.3.2" @@ -5847,47 +4135,15 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.18.5: - version "1.18.5" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.5.tgz#9b10de7d4c206a3581fd5b2124233e04db49ae19" - integrity sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA== - dependencies: - call-bind "^1.0.2" - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - get-intrinsic "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.2" - internal-slot "^1.0.3" - is-callable "^1.2.3" - is-negative-zero "^2.0.1" - is-regex "^1.1.3" - is-string "^1.0.6" - object-inspect "^1.11.0" - object-keys "^1.1.1" - object.assign "^4.1.2" - string.prototype.trimend "^1.0.4" - string.prototype.trimstart "^1.0.4" - unbox-primitive "^1.0.1" - es-module-lexer@^0.9.0: version "0.9.3" resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== -es-to-primitive@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" - integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== - dependencies: - is-callable "^1.1.4" - is-date-object "^1.0.1" - is-symbol "^1.0.2" - es6-object-assign@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c" - integrity sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw= + integrity sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw== escalade@^3.1.1: version "3.1.1" @@ -5902,12 +4158,12 @@ escape-goat@^2.0.0: escape-html@^1.0.3, escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== escape-string-regexp@^4.0.0: version "4.0.0" @@ -5945,43 +4201,54 @@ estraverse@^4.1.1: integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== estraverse@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" - integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== estree-util-attach-comments@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/estree-util-attach-comments/-/estree-util-attach-comments-2.0.0.tgz#2c06d484dfcf841b5946bcb84d5412cbcd544e22" - integrity sha512-kT9YVRvlt2ewPp9BazfIIgXMGsXOEpOm57bK8aa4F3eOEndMml2JAETjWaG3SZYHmC6axSNIzHGY718dYwIuVg== + version "2.1.1" + resolved "https://registry.yarnpkg.com/estree-util-attach-comments/-/estree-util-attach-comments-2.1.1.tgz#ee44f4ff6890ee7dfb3237ac7810154c94c63f84" + integrity sha512-+5Ba/xGGS6mnwFbXIuQiDPTbuTxuMCooq3arVv7gPZtYpjp+VXH/NkHAP35OOefPhNG/UGqU3vt/LTABwcHX0w== dependencies: - "@types/estree" "^0.0.46" + "@types/estree" "^1.0.0" estree-util-build-jsx@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/estree-util-build-jsx/-/estree-util-build-jsx-2.0.0.tgz#4903e2a923ebc791f86e78ec3687d01715dec902" - integrity sha512-d49hPGqBCJF/bF06g1Ywg7zjH1mrrUdPPrixBlKBxcX4WvMYlUUJ8BkrwlzWc8/fm6XqGgk5jilhgeZBDEGwOQ== + version "2.2.2" + resolved "https://registry.yarnpkg.com/estree-util-build-jsx/-/estree-util-build-jsx-2.2.2.tgz#32f8a239fb40dc3f3dca75bb5dcf77a831e4e47b" + integrity sha512-m56vOXcOBuaF+Igpb9OPAy7f9w9OIkb5yhjsZuaPm7HoGi4oTOQi0h2+yZ+AtKklYFZ+rPC4n0wYCJCEU1ONqg== dependencies: - "@types/estree-jsx" "^0.0.1" + "@types/estree-jsx" "^1.0.0" estree-util-is-identifier-name "^2.0.0" estree-walker "^3.0.0" estree-util-is-identifier-name@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.0.0.tgz#e2d3d2ae3032c017b2112832bfc5d8ba938c8010" - integrity sha512-aXXZFVMnBBDRP81vS4YtAYJ0hUkgEsXea7lNKWCOeaAquGb1Jm2rcONPB5fpzwgbNxulTvrWuKnp9UElUGAKeQ== + version "2.1.0" + resolved "https://registry.yarnpkg.com/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.1.0.tgz#fb70a432dcb19045e77b05c8e732f1364b4b49b2" + integrity sha512-bEN9VHRyXAUOjkKVQVvArFym08BTWB0aJPppZZr0UNyAqWsLaVfAqP7hbaTJjzHifmB5ebnR8Wm7r7yGN/HonQ== + +estree-util-to-js@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/estree-util-to-js/-/estree-util-to-js-1.2.0.tgz#0f80d42443e3b13bd32f7012fffa6f93603f4a36" + integrity sha512-IzU74r1PK5IMMGZXUVZbmiu4A1uhiPgW5hm1GjcOfr4ZzHaMPpLNJjR7HjXiIOzi25nZDrgFTobHTkV5Q6ITjA== + dependencies: + "@types/estree-jsx" "^1.0.0" + astring "^1.8.0" + source-map "^0.7.0" estree-util-visit@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/estree-util-visit/-/estree-util-visit-1.1.0.tgz#c0ea7942c40ac7889a77b57a11e92f987744bc6f" - integrity sha512-3lXJ4Us9j8TUif9cWcQy81t9p5OLasnDuuhrFiqb+XstmKC1d1LmrQWYsY49/9URcfHE64mPypDBaNK9NwWDPQ== + version "1.2.1" + resolved "https://registry.yarnpkg.com/estree-util-visit/-/estree-util-visit-1.2.1.tgz#8bc2bc09f25b00827294703835aabee1cc9ec69d" + integrity sha512-xbgqcrkIVbIG+lI/gzbvd9SGTJL4zqJKBFttUl5pP27KhAjtMKbX/mQXJ7qgyXpMgVy/zvpm0xoQQaGL8OloOw== dependencies: - "@types/estree-jsx" "^0.0.1" + "@types/estree-jsx" "^1.0.0" "@types/unist" "^2.0.0" estree-walker@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-3.0.1.tgz#c2a9fb4a30232f5039b7c030b37ead691932debd" - integrity sha512-woY0RUD87WzMBUiZLx8NsYr23N5BKsOMZHhu2hoNRVh6NXGfoiT1KOL8G3UHlJAnEDGmfa5ubNA/AacfG+Kb0g== + version "3.0.3" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-3.0.3.tgz#67c3e549ec402a487b4fc193d1953a524752340d" + integrity sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g== + dependencies: + "@types/estree" "^1.0.0" esutils@^2.0.2: version "2.0.3" @@ -5989,14 +4256,14 @@ esutils@^2.0.2: integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== eta@^1.12.3: - version "1.12.3" - resolved "https://registry.yarnpkg.com/eta/-/eta-1.12.3.tgz#2982d08adfbef39f9fa50e2fbd42d7337e7338b1" - integrity sha512-qHixwbDLtekO/d51Yr4glcaUJCIjGVJyTzuqV4GPlgZo1YpgOKG+avQynErZIYrfM6JIJdtiG2Kox8tbb+DoGg== + version "1.14.2" + resolved "https://registry.yarnpkg.com/eta/-/eta-1.14.2.tgz#5e6181a26ec13d8444c559ce51f7b3090cebbdd1" + integrity sha512-wZmJAV7EFUG5W8XNXSazIdichnWEhGB1OWg4tnXWPj0CPNUcFdgorGNO6N9p6WBUgoUe4P0OziJYn1+6zxP2aQ== etag@~1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== eval@^0.1.8: version "0.1.8" @@ -6037,13 +4304,13 @@ exenv@^1.2.0: integrity sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw== express@^4.17.3: - version "4.18.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz#7797de8b9c72c857b9cd0e14a5eea80666267caf" - integrity sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q== + version "4.18.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" + integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== dependencies: accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.20.0" + body-parser "1.20.1" content-disposition "0.5.4" content-type "~1.0.4" cookie "0.5.0" @@ -6062,7 +4329,7 @@ express@^4.17.3: parseurl "~1.3.3" path-to-regexp "0.1.7" proxy-addr "~2.0.7" - qs "6.10.3" + qs "6.11.0" range-parser "~1.2.1" safe-buffer "5.2.1" send "0.18.0" @@ -6076,7 +4343,7 @@ express@^4.17.3: extend-shallow@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= + integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug== dependencies: is-extendable "^0.1.0" @@ -6090,21 +4357,10 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.1.1: - version "3.2.7" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" - integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== - dependencies: - "@nodelib/fs.stat" "^2.0.2" - "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.2" - merge2 "^1.3.0" - micromatch "^4.0.4" - fast-glob@^3.2.11, fast-glob@^3.2.9: - version "3.2.11" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" - integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== + version "3.2.12" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" + integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -6120,14 +4376,14 @@ fast-json-stable-stringify@^2.0.0: fast-url-parser@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" - integrity sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0= + integrity sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ== dependencies: punycode "^1.3.2" fastq@^1.6.0: - version "1.11.1" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.1.tgz#5d8175aae17db61947f8b162cfc7f63264d22807" - integrity sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw== + version "1.15.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a" + integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw== dependencies: reusify "^1.0.4" @@ -6150,18 +4406,18 @@ fbjs-css-vars@^1.0.0: resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz#216551136ae02fe255932c3ec8775f18e2c078b8" integrity sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ== -fbjs@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.0.tgz#0907067fb3f57a78f45d95f1eacffcacd623c165" - integrity sha512-dJd4PiDOFuhe7vk4F80Mba83Vr2QuK86FoxtgPmzBqEJahncp+13YCmfoa53KHCo6OnlXLG7eeMWPfB5CrpVKg== +fbjs@^3.0.0, fbjs@^3.0.1: + version "3.0.4" + resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.4.tgz#e1871c6bd3083bac71ff2da868ad5067d37716c6" + integrity sha512-ucV0tDODnGV3JCnnkmoszb5lf4bNpzjv80K41wd4k798Etq+UYD0y0TIfalLjZoKgjive6/adkRnszwapiDgBQ== dependencies: - cross-fetch "^3.0.4" + cross-fetch "^3.1.5" fbjs-css-vars "^1.0.0" loose-envify "^1.0.0" object-assign "^4.1.0" promise "^7.1.1" setimmediate "^1.0.5" - ua-parser-js "^0.7.18" + ua-parser-js "^0.7.30" feed@^4.2.2: version "4.2.2" @@ -6204,9 +4460,9 @@ finalhandler@1.2.0: unpipe "~1.0.0" find-cache-dir@^3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" - integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== + version "3.3.2" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" + integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== dependencies: commondir "^1.0.1" make-dir "^3.0.2" @@ -6236,32 +4492,29 @@ find-up@^5.0.0: path-exists "^4.0.0" flux@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/flux/-/flux-4.0.1.tgz#7843502b02841d4aaa534af0b373034a1f75ee5c" - integrity sha512-emk4RCvJ8RzNP2lNpphKnG7r18q8elDYNAPx7xn+bDeOIo9FFfxEfIQ2y6YbQNmnsGD3nH1noxtLE64Puz1bRQ== + version "4.0.4" + resolved "https://registry.yarnpkg.com/flux/-/flux-4.0.4.tgz#9661182ea81d161ee1a6a6af10d20485ef2ac572" + integrity sha512-NCj3XlayA2UsapRpM7va6wU1+9rE5FIL7qoMcmxWHRzbp0yujihMBm9BBHZ1MDIk5h5o2Bl6eGiCe8rYELAmYw== dependencies: fbemitter "^3.0.0" - fbjs "^3.0.0" - -follow-redirects@^1.0.0: - version "1.14.7" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" - integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== + fbjs "^3.0.1" -follow-redirects@^1.14.7: - version "1.15.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" - integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== +follow-redirects@^1.0.0, follow-redirects@^1.14.7: + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== -foreach@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" - integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k= +for-each@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" + integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== + dependencies: + is-callable "^1.1.3" fork-ts-checker-webpack-plugin@^6.5.0: - version "6.5.2" - resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.2.tgz#4f67183f2f9eb8ba7df7177ce3cf3e75cdafb340" - integrity sha512-m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA== + version "6.5.3" + resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.3.tgz#eda2eff6e22476a2688d10661688c47f611b37f3" + integrity sha512-SbH/l9ikmMWycd5puHJKTkZJKddF4iRLyW3DeZ08HTI7NGyLS38MXd/KGgeWumQO7YNQbW2u/NtPT2YowbPaGQ== dependencies: "@babel/code-frame" "^7.8.3" "@types/json-schema" "^7.0.5" @@ -6290,7 +4543,7 @@ fraction.js@^4.2.0: fresh@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== fs-extra@^10.1.0: version "10.1.0" @@ -6311,7 +4564,7 @@ fs-extra@^9.0.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-monkey@1.0.3: +fs-monkey@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q== @@ -6319,7 +4572,7 @@ fs-monkey@1.0.3: fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== fsevents@~2.3.2: version "2.3.2" @@ -6336,14 +4589,14 @@ gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2: resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== -get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" - integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== +get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" + integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== dependencies: function-bind "^1.1.1" has "^1.0.3" - has-symbols "^1.0.1" + has-symbols "^1.0.3" get-own-enumerable-property-symbols@^3.0.0: version "3.0.2" @@ -6370,9 +4623,9 @@ get-stream@^6.0.0: integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== github-slugger@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" - integrity sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ== + version "1.5.0" + resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.5.0.tgz#17891bbc73232051474d68bd867a34625c955f7d" + integrity sha512-wIh+gKBI9Nshz2o46B0B3f5k/W+WI9ZAv6y5Dn5WJ5SK1t0TnDimB4WE5rmTD05ZAIn8HALCZVmCsvj0w0v0lw== glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" @@ -6391,21 +4644,9 @@ glob-parent@^6.0.1: glob-to-regexp@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" - integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== - -glob@^7.0.0, glob@^7.1.3: - version "7.1.7" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" + integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -glob@^7.1.6: +glob@^7.0.0, glob@^7.1.3, glob@^7.1.6: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -6418,9 +4659,9 @@ glob@^7.1.6: path-is-absolute "^1.0.0" global-dirs@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" - integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA== + version "3.0.1" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.1.tgz#0c488971f066baceda21447aecb1a8b911d22485" + integrity sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA== dependencies: ini "2.0.0" @@ -6445,19 +4686,7 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globby@^11.0.1, globby@^11.0.4: - version "11.0.4" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" - integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== - dependencies: - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.1.1" - ignore "^5.1.4" - merge2 "^1.3.0" - slash "^3.0.0" - -globby@^11.1.0: +globby@^11.0.1, globby@^11.0.4, globby@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -6470,9 +4699,9 @@ globby@^11.1.0: slash "^3.0.0" globby@^13.1.1: - version "13.1.1" - resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.1.tgz#7c44a93869b0b7612e38f22ed532bfe37b25ea6f" - integrity sha512-XMzoDZbGZ37tufiv7g0N4F/zp3zkwdFtVbV3EHsVl1KQr4RPLfNoT068/97RPshz2J5xYNEjLKKBKaGHifBd3Q== + version "13.1.3" + resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.3.tgz#f62baf5720bcb2c1330c8d4ef222ee12318563ff" + integrity sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw== dependencies: dir-glob "^3.0.1" fast-glob "^3.2.11" @@ -6480,6 +4709,13 @@ globby@^13.1.1: merge2 "^1.4.1" slash "^4.0.0" +gopd@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" + integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== + dependencies: + get-intrinsic "^1.1.3" + got@^9.6.0: version "9.6.0" resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" @@ -6497,22 +4733,10 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: - version "4.2.8" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" - integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== - -graceful-fs@^4.2.6, graceful-fs@^4.2.9: - version "4.2.10" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" - integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== - -graphlib@^2.1.8: - version "2.1.8" - resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.8.tgz#5761d414737870084c92ec7b5dbcb0592c9d35da" - integrity sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A== - dependencies: - lodash "^4.17.15" +graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== gray-matter@^4.0.3: version "4.0.3" @@ -6536,25 +4760,27 @@ handle-thing@^2.0.0: resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== -has-bigints@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" - integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== - has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== has-flag@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-symbols@^1.0.1, has-symbols@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" - integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== +has-property-descriptors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" + integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== + dependencies: + get-intrinsic "^1.1.1" + +has-symbols@^1.0.2, has-symbols@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== has-tostringtag@^1.0.0: version "1.0.0" @@ -6622,11 +4848,12 @@ hast-util-raw@6.0.1: zwitch "^1.0.0" hast-util-to-estree@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/hast-util-to-estree/-/hast-util-to-estree-2.0.2.tgz#79c5bf588915610b3f0d47ca83a74dc0269c7dc2" - integrity sha512-UQrZVeBj6A9od0lpFvqHKNSH9zvDrNoyWKbveu1a2oSCXEDUI+3bnd6BoiQLPnLrcXXn/jzJ6y9hmJTTlvf8lQ== + version "2.3.2" + resolved "https://registry.yarnpkg.com/hast-util-to-estree/-/hast-util-to-estree-2.3.2.tgz#11ab0cd2e70ecf0305151af56e636b1cdfbba0bf" + integrity sha512-YYDwATNdnvZi3Qi84iatPIl1lWpXba1MeNrNbDfJfVzEBZL8uUmtR7mt7bxKBC8kuAuvb0bkojXYZzsNHyHCLg== dependencies: - "@types/estree-jsx" "^0.0.1" + "@types/estree" "^1.0.0" + "@types/estree-jsx" "^1.0.0" "@types/hast" "^2.0.0" "@types/unist" "^2.0.0" comma-separated-tokens "^2.0.0" @@ -6637,7 +4864,7 @@ hast-util-to-estree@^2.0.0: mdast-util-mdxjs-esm "^1.0.0" property-information "^6.0.0" space-separated-tokens "^2.0.0" - style-to-object "^0.3.0" + style-to-object "^0.4.1" unist-util-position "^4.0.0" zwitch "^2.0.0" @@ -6653,9 +4880,9 @@ hast-util-to-parse5@^6.0.0: zwitch "^1.0.0" hast-util-whitespace@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-2.0.0.tgz#4fc1086467cc1ef5ba20673cb6b03cec3a970f1c" - integrity sha512-Pkw+xBHuV6xFeJprJe2BBEoDV+AvQySaz3pPDRUs5PNZEMQjpXJJueqrpcHIXxnWTcAGi/UOCgVShlkY6kLoqg== + version "2.0.1" + resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-2.0.1.tgz#0ec64e257e6fc216c7d14c8a1b74d27d650b4557" + integrity sha512-nAxA0v8+vXSBDt3AnRUNjyRIQ0rD+ntpbAp4LnPkumc5M9yUbSMa4XDU9Q6etY4f1Wp4bNgvc1yjiZtsTTrSng== hastscript@^6.0.0: version "6.0.0" @@ -6673,6 +4900,11 @@ he@^1.2.0: resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== +heap@^0.2.6: + version "0.2.7" + resolved "https://registry.yarnpkg.com/heap/-/heap-0.2.7.tgz#1e6adf711d3f27ce35a81fe3b7bd576c2260a8fc" + integrity sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg== + history@^4.9.0: version "4.10.1" resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" @@ -6695,7 +4927,7 @@ hoist-non-react-statics@^3.1.0: hpack.js@^2.1.6: version "2.1.6" resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" - integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI= + integrity sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ== dependencies: inherits "^2.0.1" obuf "^1.0.0" @@ -6707,20 +4939,7 @@ html-entities@^2.3.2: resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46" integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA== -html-minifier-terser@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-6.0.2.tgz#14059ad64b69bf9f8b8a33f25b53411d8321e75d" - integrity sha512-AgYO3UGhMYQx2S/FBJT3EM0ZYcKmH6m9XL9c1v77BeK/tYJxGPxT1/AtsdUi4FcP8kZGmqqnItCcjFPcX9hk6A== - dependencies: - camel-case "^4.1.2" - clean-css "^5.1.5" - commander "^8.1.0" - he "^1.2.0" - param-case "^3.0.4" - relateurl "^0.2.7" - terser "^5.7.2" - -html-minifier-terser@^6.1.0: +html-minifier-terser@^6.0.2, html-minifier-terser@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#bfc818934cc07918f6b3669f5774ecdfd48f32ab" integrity sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw== @@ -6765,24 +4984,24 @@ htmlparser2@^6.1.0: entities "^2.0.0" htmlparser2@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010" - integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA== + version "8.0.2" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.2.tgz#f002151705b383e62433b5cf466f5b716edaec21" + integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA== dependencies: domelementtype "^2.3.0" - domhandler "^5.0.2" + domhandler "^5.0.3" domutils "^3.0.1" - entities "^4.3.0" + entities "^4.4.0" http-cache-semantics@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" - integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== + version "4.1.1" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" + integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== http-deceiver@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" - integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc= + integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw== http-errors@2.0.0: version "2.0.0" @@ -6798,7 +5017,7 @@ http-errors@2.0.0: http-errors@~1.6.2: version "1.6.3" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" - integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= + integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A== dependencies: depd "~1.1.2" inherits "2.0.3" @@ -6806,9 +5025,9 @@ http-errors@~1.6.2: statuses ">= 1.4.0 < 2" http-parser-js@>=0.5.1: - version "0.5.3" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9" - integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg== + version "0.5.8" + resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3" + integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q== http-proxy-middleware@^2.0.3: version "2.0.6" @@ -6835,7 +5054,7 @@ human-signals@^2.1.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== -iconv-lite@0.4, iconv-lite@0.4.24: +iconv-lite@0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -6859,27 +5078,22 @@ ieee754@^1.2.1: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -ignore@^5.1.4: - version "5.1.8" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" - integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== - ignore@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" - integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== + version "5.2.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" + integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== image-size@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.0.1.tgz#86d6cfc2b1d19eab5d2b368d4b9194d9e48541c5" - integrity sha512-VAwkvNSNGClRw9mDHhc5Efax8PLlsOGcUTh0T/LIriC8vPA3U5PdqXWqkz406MoYHMKW8Uf9gWr05T/rYB44kQ== + version "1.0.2" + resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.0.2.tgz#d778b6d0ab75b2737c1556dd631652eb963bc486" + integrity sha512-xfOoWjceHntRb3qFCrh5ZFORYH8XCdYpASltMhZ/Q0KZiOwjdE/Yl2QCiWdwD+lygV5bMCvauzgu5PxBX/Yerg== dependencies: queue "6.0.2" immer@^9.0.7: - version "9.0.14" - resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.14.tgz#e05b83b63999d26382bb71676c9d827831248a48" - integrity sha512-ubBeqQutOSLIFCUBN03jGeOS6a3DoYlSYwYJTa+gSKEZKU5redJIqkIdZ3JVv/4RZpfcXdAWH5zCNLWPRv2WDw== + version "9.0.21" + resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.21.tgz#1e025ea31a40f24fb064f1fef23e931496330176" + integrity sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA== import-fresh@^3.1.0, import-fresh@^3.2.1, import-fresh@^3.3.0: version "3.3.0" @@ -6892,12 +5106,12 @@ import-fresh@^3.1.0, import-fresh@^3.2.1, import-fresh@^3.3.0: import-lazy@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" - integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= + integrity sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A== imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== indent-string@^4.0.0: version "4.0.0" @@ -6912,7 +5126,7 @@ infima@0.2.0-alpha.42: inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== dependencies: once "^1.3.0" wrappy "1" @@ -6925,7 +5139,7 @@ inherits@2, inherits@2.0.4, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, i inherits@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== ini@2.0.0: version "2.0.0" @@ -6942,15 +5156,6 @@ inline-style-parser@0.1.1: resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1" integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q== -internal-slot@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" - integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== - dependencies: - get-intrinsic "^1.1.0" - has "^1.0.3" - side-channel "^1.0.4" - "internmap@1 - 2": version "2.0.3" resolved "https://registry.yarnpkg.com/internmap/-/internmap-2.0.3.tgz#6685f23755e43c524e251d29cbc97248e3061009" @@ -7015,14 +5220,7 @@ is-arguments@^1.0.4: is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= - -is-bigint@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" - integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== - dependencies: - has-bigints "^1.0.1" + integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== is-binary-path@~2.1.0: version "2.1.0" @@ -7031,23 +5229,15 @@ is-binary-path@~2.1.0: dependencies: binary-extensions "^2.0.0" -is-boolean-object@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" - integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - is-buffer@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== -is-callable@^1.1.4, is-callable@^1.2.3: - version "1.2.4" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" - integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== +is-callable@^1.1.3: + version "1.2.7" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" + integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== is-ci@^2.0.0: version "2.0.0" @@ -7056,20 +5246,13 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-core-module@^2.2.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491" - integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg== +is-core-module@^2.9.0: + version "2.11.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" + integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== dependencies: has "^1.0.3" -is-date-object@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" - integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== - dependencies: - has-tostringtag "^1.0.0" - is-decimal@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" @@ -7088,17 +5271,12 @@ is-docker@^2.0.0, is-docker@^2.1.1: is-extendable@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= + integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw== is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== is-fullwidth-code-point@^3.0.0: version "3.0.0" @@ -7112,14 +5290,7 @@ is-generator-function@^1.0.7: dependencies: has-tostringtag "^1.0.0" -is-glob@^4.0.1, is-glob@~4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== - dependencies: - is-extglob "^2.1.1" - -is-glob@^4.0.3: +is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== @@ -7152,23 +5323,11 @@ is-nan@^1.2.1: call-bind "^1.0.0" define-properties "^1.1.3" -is-negative-zero@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" - integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== - is-npm@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA== -is-number-object@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" - integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== - dependencies: - has-tostringtag "^1.0.0" - is-number@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" @@ -7177,7 +5336,7 @@ is-number@^7.0.0: is-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" - integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= + integrity sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg== is-obj@^2.0.0: version "2.0.0" @@ -7205,9 +5364,9 @@ is-plain-obj@^3.0.0: integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA== is-plain-obj@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.0.0.tgz#06c0999fd7574edf5a906ba5644ad0feb3a84d22" - integrity sha512-NXRbBtUdBioI73y/HmOhogw/U5msYPC9DAtGkJXeFcFWSFZw0mCUsPxk/snTuJHzNKA8kLBK4rH97RMB1BfCXw== + version "4.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.1.0.tgz#d65025edec3657ce032fd7db63c97883eaed71f0" + integrity sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg== is-plain-object@^2.0.4: version "2.0.4" @@ -7217,24 +5376,16 @@ is-plain-object@^2.0.4: isobject "^3.0.1" is-reference@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-3.0.0.tgz#b1380c03d96ddf7089709781e3208fceb0c92cd6" - integrity sha512-Eo1W3wUoHWoCoVM4GVl/a+K0IgiqE5aIo4kJABFyMum1ZORlPkC+UC357sSQUL5w5QCE5kCC9upl75b7+7CY/Q== + version "3.0.1" + resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-3.0.1.tgz#d400f4260f7e55733955e60d361d827eb4d3b831" + integrity sha512-baJJdQLiYaJdvFbJqXrcGv3WU3QCzBlUcI5QhbesIm6/xPsvmO+2CDoi/GMOFBQEQm+PXkwOPrp9KK5ozZsp2w== dependencies: "@types/estree" "*" -is-regex@^1.1.3: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" - integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - is-regexp@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" - integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= + integrity sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA== is-root@^2.1.0: version "2.1.0" @@ -7246,35 +5397,21 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== -is-string@^1.0.5, is-string@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" - integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== - dependencies: - has-tostringtag "^1.0.0" - -is-symbol@^1.0.2, is-symbol@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" - integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== - dependencies: - has-symbols "^1.0.2" - -is-typed-array@^1.1.3, is-typed-array@^1.1.6: - version "1.1.7" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.7.tgz#881ddc660b13cb8423b2090fa88c0fe37a83eb2f" - integrity sha512-VxlpTBGknhQ3o7YiVjIhdLU6+oD8dPz/79vvvH4F+S/c8608UCVa9fgDpa1kZgFoUST2DCgacc70UszKgzKuvA== +is-typed-array@^1.1.10, is-typed-array@^1.1.3: + version "1.1.10" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f" + integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A== dependencies: - available-typed-arrays "^1.0.4" + available-typed-arrays "^1.0.5" call-bind "^1.0.2" - es-abstract "^1.18.5" - foreach "^2.0.5" + for-each "^0.3.3" + gopd "^1.0.1" has-tostringtag "^1.0.0" is-typedarray@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== is-whitespace-character@^1.0.0: version "1.0.4" @@ -7301,33 +5438,36 @@ is-yarn-global@^0.3.0: isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= + integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== isobject@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= + integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== -jest-worker@^27.0.2: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.6.tgz#a5fdb1e14ad34eb228cfe162d9f729cdbfa28aed" - integrity sha512-qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA== +jest-util@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.5.0.tgz#24a4d3d92fc39ce90425311b23c27a6e0ef16b8f" + integrity sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ== dependencies: + "@jest/types" "^29.5.0" "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^8.0.0" + chalk "^4.0.0" + ci-info "^3.2.0" + graceful-fs "^4.2.9" + picomatch "^2.2.3" -jest-worker@^27.4.5, jest-worker@^27.5.1: +jest-worker@^27.4.5: version "27.5.1" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== @@ -7336,15 +5476,25 @@ jest-worker@^27.4.5, jest-worker@^27.5.1: merge-stream "^2.0.0" supports-color "^8.0.0" +jest-worker@^29.1.2: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.5.0.tgz#bdaefb06811bd3384d93f009755014d8acb4615d" + integrity sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA== + dependencies: + "@types/node" "*" + jest-util "^29.5.0" + merge-stream "^2.0.0" + supports-color "^8.0.0" + joi@^17.6.0: - version "17.6.0" - resolved "https://registry.yarnpkg.com/joi/-/joi-17.6.0.tgz#0bb54f2f006c09a96e75ce687957bd04290054b2" - integrity sha512-OX5dG6DTbcr/kbMFj0KGYxuew69HPcAE3K/sZpEV2nP6e/j/C0HV+HNiBPCASxdx5T7DMoa0s8UeHWMnb6n2zw== + version "17.9.1" + resolved "https://registry.yarnpkg.com/joi/-/joi-17.9.1.tgz#74899b9fa3646904afa984a11df648eca66c9018" + integrity sha512-FariIi9j6QODKATGBrEX7HZcja8Bsh3rfdGYy/Sb65sGlZWK/QWesU1ghk7aJWDj95knjXlQfSmzFSPPkLVsfw== dependencies: "@hapi/hoek" "^9.0.0" "@hapi/topo" "^5.0.0" "@sideway/address" "^4.1.3" - "@sideway/formula" "^3.0.0" + "@sideway/formula" "^3.0.1" "@sideway/pinpoint" "^2.0.0" "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: @@ -7375,12 +5525,12 @@ jsesc@^2.5.1: jsesc@~0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= + integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA== json-buffer@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" - integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= + integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ== json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: version "2.3.1" @@ -7397,17 +5547,10 @@ json-schema-traverse@^1.0.0: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== -json5@^2.1.2: - version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" - integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== - dependencies: - minimist "^1.2.5" - -json5@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== +json5@^2.1.2, json5@^2.2.2: + version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== jsonfile@^6.0.1: version "6.1.0" @@ -7441,14 +5584,14 @@ kleur@^3.0.3: integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== kleur@^4.0.3: - version "4.1.4" - resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.4.tgz#8c202987d7e577766d039a8cd461934c01cda04d" - integrity sha512-8QADVssbrFjivHWQU7KkMgptGTl6WAcSdlbBPY4uNF+mWr6DGcKrvY2w4FQJoXch7+fKMjj0dRrL75vk3k23OA== + version "4.1.5" + resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780" + integrity sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ== -klona@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" - integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ== +klona@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22" + integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA== latest-version@^5.1.0: version "5.1.0" @@ -7457,39 +5600,57 @@ latest-version@^5.1.0: dependencies: package-json "^6.3.0" +launch-editor@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.0.tgz#4c0c1a6ac126c572bd9ff9a30da1d2cae66defd7" + integrity sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ== + dependencies: + picocolors "^1.0.0" + shell-quote "^1.7.3" + +layout-base@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/layout-base/-/layout-base-1.0.2.tgz#1291e296883c322a9dd4c5dd82063721b53e26e2" + integrity sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg== + +layout-base@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/layout-base/-/layout-base-2.0.1.tgz#d0337913586c90f9c2c075292069f5c2da5dd285" + integrity sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg== + leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== lilconfig@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.3.tgz#68f3005e921dafbd2a2afb48379986aa6d2579fd" - integrity sha512-EHKqr/+ZvdKCifpNrJCKxBTgk5XupZA3y/aCPY9mxfgBzmgh93Mt/WqjjQ38oMxXuvDokaKiM3lAgvSH2sjtHg== + version "2.1.0" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52" + integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== lines-and-columns@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" - integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + version "1.2.4" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" + integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== loader-runner@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" - integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== + version "4.3.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" + integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== loader-utils@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" - integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== + version "2.0.4" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c" + integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw== dependencies: big.js "^5.2.2" emojis-list "^3.0.0" json5 "^2.1.2" loader-utils@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.0.tgz#bcecc51a7898bee7473d4bc6b845b23af8304d4f" - integrity sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ== + version "3.2.1" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.1.tgz#4fb104b599daafd82ef3e1a41fb9265f87e1f576" + integrity sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw== locate-path@^3.0.0: version "3.0.0" @@ -7513,40 +5674,45 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" +lodash-es@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" + integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== + lodash.curry@^4.0.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.curry/-/lodash.curry-4.1.1.tgz#248e36072ede906501d75966200a86dab8b23170" - integrity sha1-JI42By7ekGUB11lmIAqG2riyMXA= + integrity sha512-/u14pXGviLaweY5JI0IUzgzF2J6Ne8INyzAZjImcryjgkZ+ebruBxy2/JaOOkTqScddcYtakjhSaeemV8lR0tA== lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= + integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== lodash.flow@^3.3.0: version "3.5.0" resolved "https://registry.yarnpkg.com/lodash.flow/-/lodash.flow-3.5.0.tgz#87bf40292b8cf83e4e8ce1a3ae4209e20071675a" - integrity sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o= + integrity sha512-ff3BX/tSioo+XojX4MOsOMhJw0nZoUEF011LX8g8d3gvjVbxd89cCio4BCXronjxcTUIJUoqKEUA+n4CqvvRPw== lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" - integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= + integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag== lodash.uniq@4.5.0, lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" - integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= + integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ== -lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: +lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== longest-streak@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-3.0.1.tgz#c97315b7afa0e7d9525db9a5a2953651432bdc5d" - integrity sha512-cHlYSUpL2s7Fb3394mYxwTYj8niTaNHUCLr0qdiCXQfSjfuA7CKofpX2uSwEfFDQ0EB7JcnMnm+GjbqqoinYYg== + version "3.1.0" + resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-3.1.0.tgz#62fa67cd958742a1574af9f39866364102d90cd4" + integrity sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g== loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: version "1.4.0" @@ -7572,6 +5738,13 @@ lowercase-keys@^2.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== +lru-cache@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" + integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== + dependencies: + yallist "^3.0.2" + lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" @@ -7580,11 +5753,11 @@ lru-cache@^6.0.0: yallist "^4.0.0" magic-string@^0.25.0, magic-string@^0.25.1: - version "0.25.7" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" - integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA== + version "0.25.9" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c" + integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ== dependencies: - sourcemap-codec "^1.4.4" + sourcemap-codec "^1.4.8" make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: version "3.1.0" @@ -7604,9 +5777,9 @@ markdown-extensions@^1.0.0: integrity sha512-WWC0ZuMzCyDHYCasEGs4IPvLyTGftYwh6wIEOULOF0HXcqZlhwRzrK0w2VUlxWA98xnvb/jszw4ZSkJ6ADpM6Q== markdown-table@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-3.0.2.tgz#9b59eb2c1b22fe71954a65ff512887065a7bb57c" - integrity sha512-y8j3a5/DkJCmS5x4dMCQL+OR0+2EAq3DOtio1COSHsmW2BGXnNCK3v12hJt1LrUz5iZH5g0LmuYOjDdI+czghA== + version "3.0.3" + resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-3.0.3.tgz#e6331d30e493127e031dd385488b5bd326e4a6bd" + integrity sha512-Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw== mdast-squeeze-paragraphs@^4.0.0: version "4.0.0" @@ -7623,27 +5796,28 @@ mdast-util-definitions@^4.0.0: unist-util-visit "^2.0.0" mdast-util-definitions@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-5.1.0.tgz#b6d10ef00a3c4cf191e8d9a5fa58d7f4a366f817" - integrity sha512-5hcR7FL2EuZ4q6lLMUK5w4lHT2H3vqL9quPvYZ/Ku5iifrirfMHiGdhxdXMUbUkDmz5I+TYMd7nbaxUhbQkfpQ== + version "5.1.2" + resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-5.1.2.tgz#9910abb60ac5d7115d6819b57ae0bcef07a3f7a7" + integrity sha512-8SVPMuHqlPME/z3gqVwWY4zVXn8lqKv/pAhC57FuJ40ImXyBpmO5ukh98zB2v7Blql2FiHjHv9LVztSIqjY+MA== dependencies: "@types/mdast" "^3.0.0" "@types/unist" "^2.0.0" - unist-util-visit "^3.0.0" + unist-util-visit "^4.0.0" mdast-util-find-and-replace@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.1.0.tgz#69728acd250749f8aac6e150e07d1fd15619e829" - integrity sha512-1w1jbqAd13oU78QPBf5223+xB+37ecNtQ1JElq2feWols5oEYAl+SgNDnOZipe7NfLemoEt362yUS15/wip4mw== + version "2.2.2" + resolved "https://registry.yarnpkg.com/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.2.2.tgz#cc2b774f7f3630da4bd592f61966fecade8b99b1" + integrity sha512-MTtdFRz/eMDHXzeK6W3dO7mXUlF82Gom4y0oOgvHhh/HXZAGvIQDUvQ0SuUx+j2tv44b8xTHOm8K/9OoRFnXKw== dependencies: + "@types/mdast" "^3.0.0" escape-string-regexp "^5.0.0" unist-util-is "^5.0.0" - unist-util-visit-parents "^4.0.0" + unist-util-visit-parents "^5.0.0" -mdast-util-from-markdown@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-1.2.0.tgz#84df2924ccc6c995dec1e2368b2b208ad0a76268" - integrity sha512-iZJyyvKD1+K7QX1b5jXdE7Sc5dtoTry1vzV28UZZe8Z1xVnB/czKntJ7ZAkG0tANqRnBF6p3p7GpU1y19DTf2Q== +mdast-util-from-markdown@^1.0.0, mdast-util-from-markdown@^1.1.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-1.3.0.tgz#0214124154f26154a2b3f9d401155509be45e894" + integrity sha512-HN3W1gRIuN/ZW295c7zi7g9lVBllMgZE40RxCX37wrTPWXCWtpvOZdfnuK+1WNpvZje6XuJeI3Wnb4TJEUem+g== dependencies: "@types/mdast" "^3.0.0" "@types/unist" "^2.0.0" @@ -7659,9 +5833,9 @@ mdast-util-from-markdown@^1.0.0: uvu "^0.5.0" mdast-util-gfm-autolink-literal@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-1.0.2.tgz#4032dcbaddaef7d4f2f3768ed830475bb22d3970" - integrity sha512-FzopkOd4xTTBeGXhXSBU0OCDDh5lUj2rd+HQqG92Ld+jL4lpUfgX2AT2OHAVP9aEeDKp7G92fuooSZcYJA3cRg== + version "1.0.3" + resolved "https://registry.yarnpkg.com/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-1.0.3.tgz#67a13abe813d7eba350453a5333ae1bc0ec05c06" + integrity sha512-My8KJ57FYEy2W2LyNom4n3E7hKTuQk/0SES0u16tjA9Z3oFkF4RrC/hPAPgjlSpezsOvI8ObcXcElo92wn5IGA== dependencies: "@types/mdast" "^3.0.0" ccount "^2.0.0" @@ -7669,69 +5843,75 @@ mdast-util-gfm-autolink-literal@^1.0.0: micromark-util-character "^1.0.0" mdast-util-gfm-footnote@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.1.tgz#11d2d40a1a673a399c459e467fa85e00223191fe" - integrity sha512-p+PrYlkw9DeCRkTVw1duWqPRHX6Ywh2BNKJQcZbCwAuP/59B0Lk9kakuAd7KbQprVO4GzdW8eS5++A9PUSqIyw== + version "1.0.2" + resolved "https://registry.yarnpkg.com/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.2.tgz#ce5e49b639c44de68d5bf5399877a14d5020424e" + integrity sha512-56D19KOGbE00uKVj3sgIykpwKL179QsVFwx/DCW0u/0+URsryacI4MAdNJl0dh+u2PSsD9FtxPFbHCzJ78qJFQ== dependencies: "@types/mdast" "^3.0.0" mdast-util-to-markdown "^1.3.0" micromark-util-normalize-identifier "^1.0.0" mdast-util-gfm-strikethrough@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.1.tgz#a4a74c36864ec6a6e3bbd31e1977f29beb475789" - integrity sha512-zKJbEPe+JP6EUv0mZ0tQUyLQOC+FADt0bARldONot/nefuISkaZFlmVK4tU6JgfyZGrky02m/I6PmehgAgZgqg== + version "1.0.3" + resolved "https://registry.yarnpkg.com/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.3.tgz#5470eb105b483f7746b8805b9b989342085795b7" + integrity sha512-DAPhYzTYrRcXdMjUtUjKvW9z/FNAMTdU0ORyMcbmkwYNbKocDpdk+PX1L1dQgOID/+vVs1uBQ7ElrBQfZ0cuiQ== dependencies: "@types/mdast" "^3.0.0" mdast-util-to-markdown "^1.3.0" mdast-util-gfm-table@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.3.tgz#5f880aa6ecd1a9307cd7127f3d94c631ea88da07" - integrity sha512-B/tgpJjND1qIZM2WZst+NYnb0notPE6m0J+YOe3NOHXyEmvK38ytxaOsgz4BvrRPQQcNbRrTzSHMPnBkj1fCjg== + version "1.0.7" + resolved "https://registry.yarnpkg.com/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.7.tgz#3552153a146379f0f9c4c1101b071d70bbed1a46" + integrity sha512-jjcpmNnQvrmN5Vx7y7lEc2iIOEytYv7rTvu+MeyAsSHTASGCCRA79Igg2uKssgOs1i1po8s3plW0sTu1wkkLGg== dependencies: + "@types/mdast" "^3.0.0" markdown-table "^3.0.0" + mdast-util-from-markdown "^1.0.0" mdast-util-to-markdown "^1.3.0" mdast-util-gfm-task-list-item@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.1.tgz#6f35f09c6e2bcbe88af62fdea02ac199cc802c5c" - integrity sha512-KZ4KLmPdABXOsfnM6JHUIjxEvcx2ulk656Z/4Balw071/5qgnhz+H1uGtf2zIGnrnvDC8xR4Fj9uKbjAFGNIeA== + version "1.0.2" + resolved "https://registry.yarnpkg.com/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.2.tgz#b280fcf3b7be6fd0cc012bbe67a59831eb34097b" + integrity sha512-PFTA1gzfp1B1UaiJVyhJZA1rm0+Tzn690frc/L8vNX1Jop4STZgOE6bxUhnzdVSB+vm2GU1tIsuQcA9bxTQpMQ== dependencies: "@types/mdast" "^3.0.0" mdast-util-to-markdown "^1.3.0" mdast-util-gfm@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/mdast-util-gfm/-/mdast-util-gfm-2.0.0.tgz#2545856bc18a66d5cc63fbef0b097a020a8e9e3d" - integrity sha512-wMwejlTN3EQADPFuvxe8lmGsay3+f6gSJKdAHR6KBJzpcxvsjJSILB9K6u6G7eQLC7iOTyVIHYGui9uBc9r1Tg== + version "2.0.2" + resolved "https://registry.yarnpkg.com/mdast-util-gfm/-/mdast-util-gfm-2.0.2.tgz#e92f4d8717d74bdba6de57ed21cc8b9552e2d0b6" + integrity sha512-qvZ608nBppZ4icQlhQQIAdc6S3Ffj9RGmzwUKUWuEICFnd1LVkN3EktF7ZHAgfcEdvZB5owU9tQgt99e2TlLjg== dependencies: + mdast-util-from-markdown "^1.0.0" mdast-util-gfm-autolink-literal "^1.0.0" mdast-util-gfm-footnote "^1.0.0" mdast-util-gfm-strikethrough "^1.0.0" mdast-util-gfm-table "^1.0.0" mdast-util-gfm-task-list-item "^1.0.0" + mdast-util-to-markdown "^1.0.0" mdast-util-mdx-expression@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/mdast-util-mdx-expression/-/mdast-util-mdx-expression-1.2.0.tgz#3e927afe27943956dc5d1c64cb949652062f71ff" - integrity sha512-wb36oi09XxqO9RVqgfD+xo8a7xaNgS+01+k3v0GKW0X0bYbeBmUZz22Z/IJ8SuphVlG+DNgNo9VoEaUJ3PKfJQ== + version "1.3.2" + resolved "https://registry.yarnpkg.com/mdast-util-mdx-expression/-/mdast-util-mdx-expression-1.3.2.tgz#d027789e67524d541d6de543f36d51ae2586f220" + integrity sha512-xIPmR5ReJDu/DHH1OoIT1HkuybIfRGYRywC+gJtI7qHjCJp/M9jrmBEJW22O8lskDWm562BX2W8TiAwRTb0rKA== dependencies: - "@types/estree-jsx" "^0.0.1" + "@types/estree-jsx" "^1.0.0" "@types/hast" "^2.0.0" "@types/mdast" "^3.0.0" mdast-util-from-markdown "^1.0.0" mdast-util-to-markdown "^1.0.0" mdast-util-mdx-jsx@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-2.0.1.tgz#03d003c8b0b4bd94ab092d876c0f92d2b0c83b0b" - integrity sha512-oPC7/smPBf7vxnvIYH5y3fPo2lw1rdrswFfSb4i0GTAXRUQv7JUU/t/hbp07dgGdUFTSDOHm5DNamhNg/s2Hrg== + version "2.1.2" + resolved "https://registry.yarnpkg.com/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-2.1.2.tgz#694a46164db10c0e9d674a3772b8748dfddd0817" + integrity sha512-o9vBCYQK5ZLGEj3tCGISJGjvafyHRVJlZmfJzSE7xjiogSzIeph/Z4zMY65q4WGRMezQBeAwPlrdymDYYYx0tA== dependencies: - "@types/estree-jsx" "^0.0.1" + "@types/estree-jsx" "^1.0.0" "@types/hast" "^2.0.0" "@types/mdast" "^3.0.0" + "@types/unist" "^2.0.0" ccount "^2.0.0" + mdast-util-from-markdown "^1.1.0" mdast-util-to-markdown "^1.3.0" parse-entities "^4.0.0" stringify-entities "^4.0.0" @@ -7740,25 +5920,35 @@ mdast-util-mdx-jsx@^2.0.0: vfile-message "^3.0.0" mdast-util-mdx@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/mdast-util-mdx/-/mdast-util-mdx-2.0.0.tgz#dd4f6c993cf27da32725e50a04874f595b7b63fb" - integrity sha512-M09lW0CcBT1VrJUaF/PYxemxxHa7SLDHdSn94Q9FhxjCQfuW7nMAWKWimTmA3OyDMSTH981NN1csW1X+HPSluw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/mdast-util-mdx/-/mdast-util-mdx-2.0.1.tgz#49b6e70819b99bb615d7223c088d295e53bb810f" + integrity sha512-38w5y+r8nyKlGvNjSEqWrhG0w5PmnRA+wnBvm+ulYCct7nsGYhFVb0lljS9bQav4psDAS1eGkP2LMVcZBi/aqw== dependencies: + mdast-util-from-markdown "^1.0.0" mdast-util-mdx-expression "^1.0.0" mdast-util-mdx-jsx "^2.0.0" mdast-util-mdxjs-esm "^1.0.0" + mdast-util-to-markdown "^1.0.0" mdast-util-mdxjs-esm@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-1.2.0.tgz#eca8b985f091c2d65a72c19d2740cefbc209aa63" - integrity sha512-IPpX9GBzAIbIRCjbyeLDpMhACFb0wxTIujuR3YElB8LWbducUdMgRJuqs/Vg8xQ1bIAMm7lw8L+YNtua0xKXRw== + version "1.3.1" + resolved "https://registry.yarnpkg.com/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-1.3.1.tgz#645d02cd607a227b49721d146fd81796b2e2d15b" + integrity sha512-SXqglS0HrEvSdUEfoXFtcg7DRl7S2cwOXc7jkuusG472Mmjag34DUDeOJUZtl+BVnyeO1frIgVpHlNRWc2gk/w== dependencies: - "@types/estree-jsx" "^0.0.1" + "@types/estree-jsx" "^1.0.0" "@types/hast" "^2.0.0" "@types/mdast" "^3.0.0" mdast-util-from-markdown "^1.0.0" mdast-util-to-markdown "^1.0.0" +mdast-util-phrasing@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/mdast-util-phrasing/-/mdast-util-phrasing-3.0.1.tgz#c7c21d0d435d7fb90956038f02e8702781f95463" + integrity sha512-WmI1gTXUBJo4/ZmSk79Wcb2HcjPJBzM1nlI/OUWA8yk2X9ik3ffNbBGsU+09BFmXaL1IBb9fiuvq6/KMiNycSg== + dependencies: + "@types/mdast" "^3.0.0" + unist-util-is "^5.0.0" + mdast-util-to-hast@10.0.1: version "10.0.1" resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.0.1.tgz#0cfc82089494c52d46eb0e3edb7a4eb2aea021eb" @@ -7774,29 +5964,28 @@ mdast-util-to-hast@10.0.1: unist-util-visit "^2.0.0" mdast-util-to-hast@^12.1.0: - version "12.1.1" - resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-12.1.1.tgz#89a2bb405eaf3b05eb8bf45157678f35eef5dbca" - integrity sha512-qE09zD6ylVP14jV4mjLIhDBOrpFdShHZcEsYvvKGABlr9mGbV7mTlRWdoFxL/EYSTNDiC9GZXy7y8Shgb9Dtzw== + version "12.3.0" + resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-12.3.0.tgz#045d2825fb04374e59970f5b3f279b5700f6fb49" + integrity sha512-pits93r8PhnIoU4Vy9bjW39M2jJ6/tdHyja9rrot9uujkN7UTU9SDnE6WNJz/IGyQk3XHX6yNNtrBH6cQzm8Hw== dependencies: "@types/hast" "^2.0.0" "@types/mdast" "^3.0.0" - "@types/mdurl" "^1.0.0" mdast-util-definitions "^5.0.0" - mdurl "^1.0.0" - micromark-util-sanitize-uri "^1.0.0" - unist-builder "^3.0.0" + micromark-util-sanitize-uri "^1.1.0" + trim-lines "^3.0.0" unist-util-generated "^2.0.0" unist-util-position "^4.0.0" unist-util-visit "^4.0.0" mdast-util-to-markdown@^1.0.0, mdast-util-to-markdown@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-1.3.0.tgz#38b6cdc8dc417de642a469c4fc2abdf8c931bd1e" - integrity sha512-6tUSs4r+KK4JGTTiQ7FfHmVOaDrLQJPmpjD6wPMlHGUVXoG9Vjc3jIeP+uyBWRf8clwB2blM+W7+KrlMYQnftA== + version "1.5.0" + resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-1.5.0.tgz#c13343cb3fc98621911d33b5cd42e7d0731171c6" + integrity sha512-bbv7TPv/WC49thZPg3jXuqzuvI45IL2EVAr/KxF0BSdHsU0ceFHOmwQn6evxAh1GaoK/6GQ1wp4R4oW2+LFL/A== dependencies: "@types/mdast" "^3.0.0" "@types/unist" "^2.0.0" longest-streak "^3.0.0" + mdast-util-phrasing "^3.0.0" mdast-util-to-string "^3.0.0" micromark-util-decode-string "^1.0.0" unist-util-visit "^4.0.0" @@ -7808,9 +5997,11 @@ mdast-util-to-string@^2.0.0: integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w== mdast-util-to-string@^3.0.0, mdast-util-to-string@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz#56c506d065fbf769515235e577b5a261552d56e9" - integrity sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA== + version "3.1.1" + resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.1.1.tgz#db859050d79d48cf9896d294de06f3ede7474d16" + integrity sha512-tGvhT94e+cVnQt8JWE9/b3cUQZWS732TJxXHktvP+BYo62PpYD53Ls/6cC60rW21dW+txxiM4zMdc6abASvZKA== + dependencies: + "@types/mdast" "^3.0.0" mdn-data@2.0.14: version "2.0.14" @@ -7820,24 +6011,24 @@ mdn-data@2.0.14: mdurl@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" - integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4= + integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g== media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== memfs@^3.1.2, memfs@^3.4.3: - version "3.4.4" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.4.tgz#e8973cd8060548916adcca58a248e7805c715e89" - integrity sha512-W4gHNUE++1oSJVn8Y68jPXi+mkx3fXR5ITE/Ubz6EQ3xRpCN5k2CQ4AUR8094Z7211F876TyoBACGsIveqgiGA== + version "3.4.13" + resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.13.tgz#248a8bd239b3c240175cd5ec548de5227fc4f345" + integrity sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg== dependencies: - fs-monkey "1.0.3" + fs-monkey "^1.0.3" merge-descriptors@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= + integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== merge-stream@^2.0.0: version "2.0.0" @@ -7850,24 +6041,31 @@ merge2@^1.3.0, merge2@^1.4.1: integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== mermaid@^9.1.3: - version "9.1.6" - resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-9.1.6.tgz#e34d5ad632455df014784d7c77af21fd51388341" - integrity sha512-oBuQk7s55wQgEgH/AK0GYY8U0kBqOIGK9QlJL+VYxh+1kZQtU9tNwoy0gWCfBJDaFIRdfpc/fm9PagaIXg6XFQ== + version "9.4.3" + resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-9.4.3.tgz#62cf210c246b74972ea98c19837519b6f03427f2" + integrity sha512-TLkQEtqhRSuEHSE34lh5bCa94KATCyluAXmFnNI2PRZwOpXFeqiJWwZl+d2CcemE1RS6QbbueSSq9QIg8Uxcyw== dependencies: "@braintree/sanitize-url" "^6.0.0" - d3 "^7.0.0" - dagre "^0.8.5" - dagre-d3 "^0.6.4" - dompurify "2.3.10" - graphlib "^2.1.8" + cytoscape "^3.23.0" + cytoscape-cose-bilkent "^4.1.0" + cytoscape-fcose "^2.1.0" + d3 "^7.4.0" + dagre-d3-es "7.0.9" + dayjs "^1.11.7" + dompurify "2.4.3" + elkjs "^0.8.2" khroma "^2.0.0" - moment-mini "2.24.0" - stylis "^4.0.10" + lodash-es "^4.17.21" + non-layered-tidy-tree-layout "^2.0.2" + stylis "^4.1.2" + ts-dedent "^2.2.0" + uuid "^9.0.0" + web-worker "^1.2.0" methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== micromark-core-commonmark@^1.0.0, micromark-core-commonmark@^1.0.1: version "1.0.6" @@ -7903,9 +6101,9 @@ micromark-extension-gfm-autolink-literal@^1.0.0: uvu "^0.5.0" micromark-extension-gfm-footnote@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-1.0.3.tgz#5280b29667e4ecb8687f369829aa3322caca7d11" - integrity sha512-bn62pC5y39rIo2g1RqZk1NhF7T7cJLuJlbevunQz41U0iPVCdVOFASe5/L1kke+DFKSgfCRhv24+o42cZ1+ADw== + version "1.0.4" + resolved "https://registry.yarnpkg.com/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-1.0.4.tgz#cbfd8873b983e820c494498c6dac0105920818d5" + integrity sha512-E/fmPmDqLiMUP8mLJ8NbJWJ4bTw6tS+FEQS8CcuDtZpILuOb2kjLqPEeAePF1djXROHXChM/wPJw0iS4kHCcIg== dependencies: micromark-core-commonmark "^1.0.0" micromark-factory-space "^1.0.0" @@ -7913,6 +6111,7 @@ micromark-extension-gfm-footnote@^1.0.0: micromark-util-normalize-identifier "^1.0.0" micromark-util-sanitize-uri "^1.0.0" micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" uvu "^0.5.0" micromark-extension-gfm-strikethrough@^1.0.0: @@ -7971,9 +6170,9 @@ micromark-extension-gfm@^2.0.0: micromark-util-types "^1.0.0" micromark-extension-mdx-expression@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-1.0.3.tgz#cd3843573921bf55afcfff4ae0cd2e857a16dcfa" - integrity sha512-TjYtjEMszWze51NJCZmhv7MEBcgYRgb3tJeMAJ+HQCAaZHHRBaDCccqQzGizR/H4ODefP44wRTgOn2vE5I6nZA== + version "1.0.4" + resolved "https://registry.yarnpkg.com/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-1.0.4.tgz#33fe2c6ee214738255de175a084281c11894ddda" + integrity sha512-TCgLxqW6ReQ3AJgtj1P0P+8ZThBTloLbeb7jNaqr6mCOLDpxUiBFE/9STgooMZttEwOQu5iEcCCa3ZSDhY9FGw== dependencies: micromark-factory-mdx-expression "^1.0.0" micromark-factory-space "^1.0.0" @@ -8006,9 +6205,9 @@ micromark-extension-mdx-md@^1.0.0: micromark-util-types "^1.0.0" micromark-extension-mdxjs-esm@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/micromark-extension-mdxjs-esm/-/micromark-extension-mdxjs-esm-1.0.2.tgz#df0c48743a0b1988119489c68314160b7942ffa6" - integrity sha512-bIaxblNIM+CCaJvp3L/V+168l79iuNmxEiTU6i3vB0YuDW+rumV64BFMxvhfRDxaJxQE1zD5vTPdyLBbW4efGA== + version "1.0.3" + resolved "https://registry.yarnpkg.com/micromark-extension-mdxjs-esm/-/micromark-extension-mdxjs-esm-1.0.3.tgz#630d9dc9db2c2fd470cac8c1e7a824851267404d" + integrity sha512-2N13ol4KMoxb85rdDwTAC6uzs8lMX0zeqpcyx7FhS7PxXomOnLactu8WI8iBNXW8AVyea3KIJd/1CKnUmwrK9A== dependencies: micromark-core-commonmark "^1.0.0" micromark-util-character "^1.0.0" @@ -8053,9 +6252,9 @@ micromark-factory-label@^1.0.0: uvu "^0.5.0" micromark-factory-mdx-expression@^1.0.0: - version "1.0.6" - resolved "https://registry.yarnpkg.com/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-1.0.6.tgz#917e17d16e6e9c2551f3a862e6a9ebdd22056476" - integrity sha512-WRQIc78FV7KrCfjsEf/sETopbYjElh3xAmNpLkd1ODPqxEngP42eVRGbiPEQWpRV27LzqW+XVTvQAMIIRLPnNA== + version "1.0.7" + resolved "https://registry.yarnpkg.com/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-1.0.7.tgz#e38298dc1f7eaf6ba1d9f210531ceae17155c00f" + integrity sha512-QAdFbkQagTZ/eKb8zDGqmjvgevgJH3+aQpvvKrXWxNJp3o8/l2cAbbrBd0E04r0Gx6nssPpqWIjnbHFvZu5qsQ== dependencies: micromark-factory-space "^1.0.0" micromark-util-character "^1.0.0" @@ -8150,21 +6349,22 @@ micromark-util-encode@^1.0.0: integrity sha512-U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA== micromark-util-events-to-acorn@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/micromark-util-events-to-acorn/-/micromark-util-events-to-acorn-1.0.4.tgz#07d26cd675dbca8c38b8d9aff2d4cdc91c9997aa" - integrity sha512-dpo8ecREK5s/KMph7jJ46RLM6g7N21CMc9LAJQbDLdbQnTpijigkSJPTIfLXZ+h5wdXlcsQ+b6ufAE9v76AdgA== + version "1.2.1" + resolved "https://registry.yarnpkg.com/micromark-util-events-to-acorn/-/micromark-util-events-to-acorn-1.2.1.tgz#d5b9dfbc589ece7917de24de0a57b909c0d36583" + integrity sha512-mkg3BaWlw6ZTkQORrKVBW4o9ICXPxLtGz51vml5mQpKFdo9vqIX68CAx5JhTOdjQyAHH7JFmm4rh8toSPQZUmg== dependencies: "@types/acorn" "^4.0.0" - "@types/estree" "^0.0.50" + "@types/estree" "^1.0.0" estree-util-visit "^1.0.0" micromark-util-types "^1.0.0" uvu "^0.5.0" + vfile-location "^4.0.0" vfile-message "^3.0.0" micromark-util-html-tag-name@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.0.0.tgz#75737e92fef50af0c6212bd309bc5cb8dbd489ed" - integrity sha512-NenEKIshW2ZI/ERv9HtFNsrn3llSPZtY337LID/24WeLqMzeZhBEE6BQ0vS2ZBjshm5n40chKtJ3qjAbVV8S0g== + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.1.0.tgz#eb227118befd51f48858e879b7a419fc0df20497" + integrity sha512-BKlClMmYROy9UiV03SwNmckkjn8QHVaWkqoAqzivabvdGcwNGMMMH/5szAnywmsTBUzDsU57/mFi0sp4BQO6dA== micromark-util-normalize-identifier@^1.0.0: version "1.0.0" @@ -8180,10 +6380,10 @@ micromark-util-resolve-all@^1.0.0: dependencies: micromark-util-types "^1.0.0" -micromark-util-sanitize-uri@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.0.0.tgz#27dc875397cd15102274c6c6da5585d34d4f12b2" - integrity sha512-cCxvBKlmac4rxCGx6ejlIviRaMKZc0fWm5HdCHEeDWRSkn44l6NdYVRyU+0nT1XC72EQJMZV8IPHF+jTr56lAg== +micromark-util-sanitize-uri@^1.0.0, micromark-util-sanitize-uri@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.1.0.tgz#f12e07a85106b902645e0364feb07cf253a85aee" + integrity sha512-RoxtuSCX6sUNtxhbmsEFQfWzs8VN7cTctmBPvYivo98xb/kDEoTCtJQX5wyzIYEmk/lvNFTat4hL8oW0KndFpg== dependencies: micromark-util-character "^1.0.0" micromark-util-encode "^1.0.0" @@ -8210,9 +6410,9 @@ micromark-util-types@^1.0.0, micromark-util-types@^1.0.1: integrity sha512-DCfg/T8fcrhrRKTPjRrw/5LLvdGV7BHySf/1LOZx7TzWZdYRjogNtyNq885z3nNallwr3QUKARjqvHqX1/7t+w== micromark@^3.0.0: - version "3.0.10" - resolved "https://registry.yarnpkg.com/micromark/-/micromark-3.0.10.tgz#1eac156f0399d42736458a14b0ca2d86190b457c" - integrity sha512-ryTDy6UUunOXy2HPjelppgJ2sNfcPz1pLlMdA6Rz9jPzhLikWXv/irpWV/I2jd68Uhmny7hHxAlAhk4+vWggpg== + version "3.1.0" + resolved "https://registry.yarnpkg.com/micromark/-/micromark-3.1.0.tgz#eeba0fe0ac1c9aaef675157b52c166f125e89f62" + integrity sha512-6Mj0yHLdUZjHnOPgr5xfWIMqMWS12zDN6iws9SLuSz76W8jTtAv24MN4/CL7gJrl5vtxGInkkqDv/JIoRsQOvA== dependencies: "@types/debug" "^4.0.0" debug "^4.0.0" @@ -8232,7 +6432,7 @@ micromark@^3.0.0: micromark-util-types "^1.0.1" uvu "^0.5.0" -micromatch@^4.0.2, micromatch@^4.0.5: +micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== @@ -8240,20 +6440,7 @@ micromatch@^4.0.2, micromatch@^4.0.5: braces "^3.0.2" picomatch "^2.3.1" -micromatch@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" - integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== - dependencies: - braces "^3.0.1" - picomatch "^2.2.3" - -mime-db@1.49.0, "mime-db@>= 1.43.0 < 2": - version "1.49.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed" - integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA== - -mime-db@1.52.0: +mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": version "1.52.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== @@ -8270,14 +6457,7 @@ mime-types@2.1.18: dependencies: mime-db "~1.33.0" -mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.24: - version "2.1.32" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5" - integrity sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A== - dependencies: - mime-db "1.49.0" - -mime-types@^2.1.31, mime-types@~2.1.34: +mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== @@ -8289,11 +6469,6 @@ mime@1.6.0: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== -mime@^2.3.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" - integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== - mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" @@ -8304,18 +6479,10 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== -mini-create-react-context@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" - integrity sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ== - dependencies: - "@babel/runtime" "^7.12.1" - tiny-warning "^1.0.3" - mini-css-extract-plugin@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz#9a1251d15f2035c342d99a468ab9da7a0451b71e" - integrity sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg== + version "2.7.5" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.5.tgz#afbb344977659ec0f1f6e050c7aea456b121cfc5" + integrity sha512-9HaR++0mlgom81s95vvNjxkg52n2b5s//3ZTI1EtzFb98awsLSivs2LMsVqnQ3ay0PVhqWcGNyDaTE961FOcjQ== dependencies: schema-utils "^4.0.0" @@ -8324,14 +6491,7 @@ minimalistic-assert@^1.0.0: resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== -minimatch@3.0.4, minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - -minimatch@^3.1.1: +minimatch@3.1.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== @@ -8339,24 +6499,24 @@ minimatch@^3.1.1: brace-expansion "^1.1.7" minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== - -moment-mini@2.24.0: - version "2.24.0" - resolved "https://registry.yarnpkg.com/moment-mini/-/moment-mini-2.24.0.tgz#fa68d98f7fe93ae65bf1262f6abb5fb6983d8d18" - integrity sha512-9ARkWHBs+6YJIvrIp0Ik5tyTTtP9PoV0Ssu2Ocq5y9v8+NOOpWiRshAp8c4rZVWTOe+157on/5G+zj5pwIQFEQ== + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== mri@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b" integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA== +mrmime@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27" + integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw== + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== ms@2.1.2: version "2.1.2" @@ -8368,7 +6528,7 @@ ms@2.1.3: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -multicast-dns@^7.2.4: +multicast-dns@^7.2.5: version "7.2.5" resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced" integrity sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg== @@ -8376,21 +6536,11 @@ multicast-dns@^7.2.4: dns-packet "^5.2.2" thunky "^1.0.2" -nanoid@^3.3.1: - version "3.3.3" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" - integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== - nanoid@^3.3.4: version "3.3.4" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== -negotiator@0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== - negotiator@0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" @@ -8416,11 +6566,6 @@ node-emoji@^1.10.0: dependencies: lodash "^4.17.21" -node-fetch@2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" - integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== - node-fetch@2.6.7: version "2.6.7" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" @@ -8433,20 +6578,15 @@ node-forge@^1: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== -node-releases@^1.1.75: - version "1.1.75" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe" - integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw== +node-releases@^2.0.8: + version "2.0.10" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f" + integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w== -node-releases@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.3.tgz#225ee7488e4a5e636da8da52854844f9d716ca96" - integrity sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw== - -node-releases@^2.0.3: - version "2.0.5" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.5.tgz#280ed5bc3eba0d96ce44897d8aee478bfb3d9666" - integrity sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q== +non-layered-tidy-tree-layout@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/non-layered-tidy-tree-layout/-/non-layered-tidy-tree-layout-2.0.2.tgz#57d35d13c356643fc296a55fb11ac15e74da7804" + integrity sha512-gkXMxRzUH+PB0ax9dUN0yYF0S25BqeAYqhgMaLUFmpXLEk7Fcu8f4emJuOAY0V8kjDICxROIKsTAKsV/v355xw== normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" @@ -8456,7 +6596,7 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: normalize-range@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" - integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= + integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA== normalize-url@^4.1.0: version "4.5.1" @@ -8478,14 +6618,7 @@ npm-run-path@^4.0.1: nprogress@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/nprogress/-/nprogress-0.2.0.tgz#cb8f34c53213d895723fcbab907e9422adbcafb1" - integrity sha1-y480xTIT2JVyP8urkH6UIq28r7E= - -nth-check@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125" - integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q== - dependencies: - boolbase "^1.0.0" + integrity sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA== nth-check@^2.0.1: version "2.1.1" @@ -8497,12 +6630,12 @@ nth-check@^2.0.1: object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== -object-inspect@^1.11.0, object-inspect@^1.9.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" - integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== +object-inspect@^1.9.0: + version "1.12.3" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" + integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== object-is@^1.0.1: version "1.1.5" @@ -8512,19 +6645,19 @@ object-is@^1.0.1: call-bind "^1.0.2" define-properties "^1.1.3" -object-keys@^1.0.12, object-keys@^1.1.1: +object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -object.assign@^4.1.0, object.assign@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" - integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== +object.assign@^4.1.0: + version "4.1.4" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" + integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - has-symbols "^1.0.1" + call-bind "^1.0.2" + define-properties "^1.1.4" + has-symbols "^1.0.3" object-keys "^1.1.1" obuf@^1.0.0, obuf@^1.1.2: @@ -8547,7 +6680,7 @@ on-headers@~1.0.2: once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== dependencies: wrappy "1" @@ -8559,9 +6692,9 @@ onetime@^5.1.2: mimic-fn "^2.1.0" open@^8.0.9, open@^8.4.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" - integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== + version "8.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9" + integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ== dependencies: define-lazy-prop "^2.0.0" is-docker "^2.1.1" @@ -8575,7 +6708,7 @@ opener@^1.5.2: os-homedir@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= + integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ== p-cancelable@^1.0.0: version "1.1.0" @@ -8589,7 +6722,7 @@ p-limit@^2.0.0, p-limit@^2.2.0: dependencies: p-try "^2.0.0" -p-limit@^3.0.2, p-limit@^3.1.0: +p-limit@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== @@ -8675,9 +6808,9 @@ parse-entities@^2.0.0: is-hexadecimal "^1.0.0" parse-entities@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-4.0.0.tgz#f67c856d4e3fe19b1a445c3fabe78dcdc1053eeb" - integrity sha512-5nk9Fn03x3rEhGaX1FU6IDwG/k+GxLXlFAkgrbM1asuAFl3BhdQWvASaIsmwWypRNcZKHPYnIuOSfIWEyEQnPQ== + version "4.0.1" + resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-4.0.1.tgz#4e2a01111fb1c986549b944af39eeda258fc9e4e" + integrity sha512-SWzvYcSJh4d/SGLIOQfZ/CoNv6BTlI6YEQ7Nj82oDVnRpwe/Z/F1EMx42x3JAOwGBlCjeCH0BRJQbQ/opHL17w== dependencies: "@types/unist" "^2.0.0" character-entities "^2.0.0" @@ -8717,11 +6850,11 @@ parse5@^6.0.0: integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== parse5@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.0.0.tgz#51f74a5257f5fcc536389e8c2d0b3802e1bfa91a" - integrity sha512-y/t8IXSPWTuRZqXc0ajH/UwDj4mnqLEbSttNbThcFhGrZuOyoyvNBO85PBp2jQa55wY9d07PBNjsK8ZP3K5U6g== + version "7.1.2" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" + integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== dependencies: - entities "^4.3.0" + entities "^4.4.0" parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" @@ -8744,7 +6877,7 @@ path-browserify@^1.0.1: path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= + integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ== path-exists@^4.0.0: version "4.0.0" @@ -8754,19 +6887,19 @@ path-exists@^4.0.0: path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== path-is-inside@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" - integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= + integrity sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w== path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -path-parse@^1.0.6: +path-parse@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== @@ -8774,19 +6907,19 @@ path-parse@^1.0.6: path-root-regex@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d" - integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0= + integrity sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ== path-root@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7" - integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc= + integrity sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg== dependencies: path-root-regex "^0.1.0" path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== path-to-regexp@2.2.1: version "2.2.1" @@ -8806,10 +6939,11 @@ path-type@^4.0.0: integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== periscopic@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/periscopic/-/periscopic-3.0.4.tgz#b3fbed0d1bc844976b977173ca2cd4a0ef4fa8d1" - integrity sha512-SFx68DxCv0Iyo6APZuw/AKewkkThGwssmU0QWtTlvov3VAtPX+QJ4CadwSaz8nrT5jPIuxdvJWB4PnD2KNDxQg== + version "3.1.0" + resolved "https://registry.yarnpkg.com/periscopic/-/periscopic-3.1.0.tgz#7e9037bf51c5855bd33b48928828db4afa79d97a" + integrity sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw== dependencies: + "@types/estree" "^1.0.0" estree-walker "^3.0.0" is-reference "^3.0.0" @@ -8818,12 +6952,7 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" - integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== - -picomatch@^2.3.1: +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== @@ -8850,22 +6979,22 @@ postcss-calc@^8.2.3: postcss-selector-parser "^6.0.9" postcss-value-parser "^4.2.0" -postcss-colormin@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.0.tgz#3cee9e5ca62b2c27e84fce63affc0cfb5901956a" - integrity sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg== +postcss-colormin@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.1.tgz#86c27c26ed6ba00d96c79e08f3ffb418d1d1988f" + integrity sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ== dependencies: - browserslist "^4.16.6" + browserslist "^4.21.4" caniuse-api "^3.0.0" colord "^2.9.1" postcss-value-parser "^4.2.0" -postcss-convert-values@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.2.tgz#31586df4e184c2e8890e8b34a0b9355313f503ab" - integrity sha512-c6Hzc4GAv95B7suy4udszX9Zy4ETyMCgFPUDtWjdFTKH1SE9eFY/jEpHSwTH1QPuwxHpWslhckUQWbNRM4ho5g== +postcss-convert-values@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz#04998bb9ba6b65aa31035d669a6af342c5f9d393" + integrity sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA== dependencies: - browserslist "^4.20.3" + browserslist "^4.21.4" postcss-value-parser "^4.2.0" postcss-discard-comments@^5.1.2: @@ -8896,13 +7025,13 @@ postcss-discard-unused@^5.1.0: postcss-selector-parser "^6.0.5" postcss-loader@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.0.0.tgz#367d10eb1c5f1d93700e6b399683a6dc7c3af396" - integrity sha512-IDyttebFzTSY6DI24KuHUcBjbAev1i+RyICoPEWcAstZsj03r533uMXtDn506l6/wlsRYiS5XBdx7TpccCsyUg== + version "7.1.0" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.1.0.tgz#3ba0dfddff06043f3eac7690a1d8b432264bb866" + integrity sha512-vTD2DJ8vJD0Vr1WzMQkRZWRjcynGh3t7NeoLg+Sb1TeuK7etiZfL/ZwHbaVa3M+Qni7Lj/29voV9IggnIUjlIw== dependencies: - cosmiconfig "^7.0.0" - klona "^2.0.5" - semver "^7.3.7" + cosmiconfig "^8.0.0" + klona "^2.0.6" + semver "^7.3.8" postcss-merge-idents@^5.1.1: version "5.1.1" @@ -8912,28 +7041,20 @@ postcss-merge-idents@^5.1.1: cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" -postcss-merge-longhand@^5.1.5: - version "5.1.5" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.5.tgz#b0e03bee3b964336f5f33c4fc8eacae608e91c05" - integrity sha512-NOG1grw9wIO+60arKa2YYsrbgvP6tp+jqc7+ZD5/MalIw234ooH2C6KlR6FEn4yle7GqZoBxSK1mLBE9KPur6w== +postcss-merge-longhand@^5.1.7: + version "5.1.7" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz#24a1bdf402d9ef0e70f568f39bdc0344d568fb16" + integrity sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ== dependencies: postcss-value-parser "^4.2.0" - stylehacks "^5.1.0" + stylehacks "^5.1.1" -postcss-merge-longhand@^5.1.6: - version "5.1.6" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.6.tgz#f378a8a7e55766b7b644f48e5d8c789ed7ed51ce" - integrity sha512-6C/UGF/3T5OE2CEbOuX7iNO63dnvqhGZeUnKkDeifebY0XqkkvrctYSZurpNE902LDf2yKwwPFgotnfSoPhQiw== - dependencies: - postcss-value-parser "^4.2.0" - stylehacks "^5.1.0" - -postcss-merge-rules@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.2.tgz#7049a14d4211045412116d79b751def4484473a5" - integrity sha512-zKMUlnw+zYCWoPN6yhPjtcEdlJaMUZ0WyVcxTAmw3lkkN/NDMRkOkiuctQEoWAOvH7twaxUUdvBWl0d4+hifRQ== +postcss-merge-rules@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz#2f26fa5cacb75b1402e213789f6766ae5e40313c" + integrity sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g== dependencies: - browserslist "^4.16.6" + browserslist "^4.21.4" caniuse-api "^3.0.0" cssnano-utils "^3.1.0" postcss-selector-parser "^6.0.5" @@ -8954,12 +7075,12 @@ postcss-minify-gradients@^5.1.1: cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" -postcss-minify-params@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.3.tgz#ac41a6465be2db735099bbd1798d85079a6dc1f9" - integrity sha512-bkzpWcjykkqIujNL+EVEPOlLYi/eZ050oImVtHU7b4lFS82jPnsCb44gvC6pxaNt38Els3jWYDHTjHKf0koTgg== +postcss-minify-params@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz#c06a6c787128b3208b38c9364cfc40c8aa5d7352" + integrity sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw== dependencies: - browserslist "^4.16.6" + browserslist "^4.21.4" cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" @@ -9010,13 +7131,6 @@ postcss-normalize-display-values@^5.1.0: dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-positions@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz#902a7cb97cf0b9e8b1b654d4a43d451e48966458" - integrity sha512-8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ== - dependencies: - postcss-value-parser "^4.2.0" - postcss-normalize-positions@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz#ef97279d894087b59325b45c47f1e863daefbb92" @@ -9024,13 +7138,6 @@ postcss-normalize-positions@^5.1.1: dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-repeat-style@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz#f6d6fd5a54f51a741cc84a37f7459e60ef7a6398" - integrity sha512-IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw== - dependencies: - postcss-value-parser "^4.2.0" - postcss-normalize-repeat-style@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz#e9eb96805204f4766df66fd09ed2e13545420fb2" @@ -9052,12 +7159,12 @@ postcss-normalize-timing-functions@^5.1.0: dependencies: postcss-value-parser "^4.2.0" -postcss-normalize-unicode@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz#3d23aede35e160089a285e27bf715de11dc9db75" - integrity sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ== +postcss-normalize-unicode@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz#f67297fca3fea7f17e0d2caa40769afc487aa030" + integrity sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA== dependencies: - browserslist "^4.16.6" + browserslist "^4.21.4" postcss-value-parser "^4.2.0" postcss-normalize-url@^5.1.0: @@ -9075,14 +7182,6 @@ postcss-normalize-whitespace@^5.1.1: dependencies: postcss-value-parser "^4.2.0" -postcss-ordered-values@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.1.tgz#0b41b610ba02906a3341e92cab01ff8ebc598adb" - integrity sha512-7lxgXF0NaoMIgyihL/2boNAEZKiW0+HkMhdKMTD93CjW8TdCy2hSdj8lsAo+uwm7EDG16Da2Jdmtqpedl0cMfw== - dependencies: - cssnano-utils "^3.1.0" - postcss-value-parser "^4.2.0" - postcss-ordered-values@^5.1.3: version "5.1.3" resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz#b6fd2bd10f937b23d86bc829c69e7732ce76ea38" @@ -9098,12 +7197,12 @@ postcss-reduce-idents@^5.2.0: dependencies: postcss-value-parser "^4.2.0" -postcss-reduce-initial@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz#fc31659ea6e85c492fb2a7b545370c215822c5d6" - integrity sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw== +postcss-reduce-initial@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz#798cd77b3e033eae7105c18c9d371d989e1382d6" + integrity sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg== dependencies: - browserslist "^4.16.6" + browserslist "^4.21.4" caniuse-api "^3.0.0" postcss-reduce-transforms@^5.1.0: @@ -9113,28 +7212,20 @@ postcss-reduce-transforms@^5.1.0: dependencies: postcss-value-parser "^4.2.0" -postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5: - version "6.0.6" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" - integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg== - dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" - -postcss-selector-parser@^6.0.9: - version "6.0.10" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d" - integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w== +postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9: + version "6.0.11" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc" + integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" postcss-sort-media-queries@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/postcss-sort-media-queries/-/postcss-sort-media-queries-4.2.1.tgz#a99bae69ef1098ee3b64a5fa94d258ec240d0355" - integrity sha512-9VYekQalFZ3sdgcTjXMa0dDjsfBVHXlraYJEMiOJ/2iMmI2JGCMavP16z3kWOaRu8NSaJCTgVpB/IVpH5yT9YQ== + version "4.3.0" + resolved "https://registry.yarnpkg.com/postcss-sort-media-queries/-/postcss-sort-media-queries-4.3.0.tgz#f48a77d6ce379e86676fc3f140cf1b10a06f6051" + integrity sha512-jAl8gJM2DvuIJiI9sL1CuiHtKM4s5aEIomkU8G3LFvbP+p8i7Sz8VV63uieTgoewGqKbi+hxBTiOKJlB35upCg== dependencies: - sort-css-media-queries "2.0.4" + sort-css-media-queries "2.1.0" postcss-svgo@^5.1.0: version "5.1.0" @@ -9151,12 +7242,7 @@ postcss-unique-selectors@^5.1.1: dependencies: postcss-selector-parser "^6.0.5" -postcss-value-parser@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" - integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== - -postcss-value-parser@^4.2.0: +postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== @@ -9166,19 +7252,10 @@ postcss-zindex@^5.1.0: resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-5.1.0.tgz#4a5c7e5ff1050bd4c01d95b1847dfdcc58a496ff" integrity sha512-fgFMf0OtVSBR1va1JNHYgMxYk73yhn/qb4uQDq1DLGYolz8gHCyr/sesEuGUaYs58E3ZJRcpoGuPVoB7Meiq9A== -postcss@^8.3.11: - version "8.4.12" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.12.tgz#1e7de78733b28970fa4743f7da6f3763648b1905" - integrity sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg== - dependencies: - nanoid "^3.3.1" - picocolors "^1.0.0" - source-map-js "^1.0.2" - -postcss@^8.4.13, postcss@^8.4.14, postcss@^8.4.7: - version "8.4.14" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf" - integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig== +postcss@^8.3.11, postcss@^8.4.14, postcss@^8.4.17, postcss@^8.4.19: + version "8.4.21" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4" + integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg== dependencies: nanoid "^3.3.4" picocolors "^1.0.0" @@ -9187,7 +7264,7 @@ postcss@^8.4.13, postcss@^8.4.14, postcss@^8.4.7: prepend-http@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" - integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= + integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA== pretty-error@^4.0.0: version "4.0.0" @@ -9202,25 +7279,15 @@ pretty-time@^1.1.0: resolved "https://registry.yarnpkg.com/pretty-time/-/pretty-time-1.1.0.tgz#ffb7429afabb8535c346a34e41873adf3d74dd0e" integrity sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA== -prism-react-renderer@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.2.1.tgz#392460acf63540960e5e3caa699d851264e99b89" - integrity sha512-w23ch4f75V1Tnz8DajsYKvY5lF7H1+WvzvLUcF0paFxkTHSp42RS0H5CttdN2Q8RR3DRGZ9v5xD/h3n8C8kGmg== - -prism-react-renderer@^1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.3.3.tgz#9b5a4211a6756eee3c96fee9a05733abc0b0805c" - integrity sha512-Viur/7tBTCH2HmYzwCHmt2rEFn+rdIWNIINXyg0StiISbDiIhHKhrFuEK8eMkKgvsIYSjgGqy/hNyucHp6FpoQ== - -prism-react-renderer@^1.3.5: +prism-react-renderer@^1.2.1, prism-react-renderer@^1.3.3, prism-react-renderer@^1.3.5: version "1.3.5" resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.3.5.tgz#786bb69aa6f73c32ba1ee813fbe17a0115435085" integrity sha512-IJ+MSwBWKG+SM3b2SUfdrhC+gu01QkV2KmRQgREThBfSQRoufqRfxfHUxpG1WcaFjP+kojcFyO9Qqtpgt3qLCg== prismjs@^1.28.0: - version "1.28.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.28.0.tgz#0d8f561fa0f7cf6ebca901747828b149147044b6" - integrity sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw== + version "1.29.0" + resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.29.0.tgz#f113555a8fa9b57c35e637bba27509dcf802dd12" + integrity sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q== process-nextick-args@~2.0.0: version "2.0.1" @@ -9243,13 +7310,13 @@ prompts@^2.4.2: sisteransi "^1.0.5" prop-types@^15.6.2, prop-types@^15.7.2: - version "15.7.2" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" - integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== + version "15.8.1" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" + integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== dependencies: loose-envify "^1.4.0" object-assign "^4.1.1" - react-is "^16.8.1" + react-is "^16.13.1" property-information@^5.0.0, property-information@^5.3.0: version "5.6.0" @@ -9259,9 +7326,9 @@ property-information@^5.0.0, property-information@^5.3.0: xtend "^4.0.0" property-information@^6.0.0: - version "6.1.1" - resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.1.1.tgz#5ca85510a3019726cb9afed4197b7b8ac5926a22" - integrity sha512-hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w== + version "6.2.0" + resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.2.0.tgz#b74f522c31c097b5149e3c3cb8d7f3defd986a1d" + integrity sha512-kma4U7AFCTwpqq5twzC1YVIDXSqg6qQK6JN0smOw8fgRy1OkMi0CYSzFmsy6dnqSenamAtj0CyXMUJ1Mf6oROg== proxy-addr@~2.0.7: version "2.0.7" @@ -9282,12 +7349,12 @@ pump@^3.0.0: punycode@^1.3.2: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= + integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ== punycode@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + version "2.3.0" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" + integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== pupa@^2.1.1: version "2.1.1" @@ -9299,12 +7366,12 @@ pupa@^2.1.1: pure-color@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/pure-color/-/pure-color-1.3.0.tgz#1fe064fb0ac851f0de61320a8bf796836422f33e" - integrity sha1-H+Bk+wrIUfDeYTIKi/eWg2Qi8z4= + integrity sha512-QFADYnsVoBMw1srW7OVKEYjG+MbIa49s54w1MA1EDY6r2r/sTcKKYqRX1f4GYvnXP7eN/Pe9HFcX+hwzmrXRHA== -qs@6.10.3: - version "6.10.3" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e" - integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ== +qs@6.11.0: + version "6.11.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== dependencies: side-channel "^1.0.4" @@ -9330,7 +7397,7 @@ randombytes@^2.1.0: range-parser@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" - integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4= + integrity sha512-kA5WQoNVo4t9lNx2kQNFCxKeBl5IbbSNBl1M/tLkw9WCn+hxNBAW5Qh8gdhs63CJnhjJ2zQWFoqPJP2sK1AV5A== range-parser@^1.2.1, range-parser@~1.2.1: version "1.2.1" @@ -9347,7 +7414,7 @@ raw-body@2.5.1: iconv-lite "0.4.24" unpipe "1.0.0" -rc@^1.2.8: +rc@1.2.8, rc@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -9360,7 +7427,7 @@ rc@^1.2.8: react-base16-styling@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/react-base16-styling/-/react-base16-styling-0.6.0.tgz#ef2156d66cf4139695c8a167886cb69ea660792c" - integrity sha1-7yFW1mz0E5aVyKFniGy2nqZgeSw= + integrity sha512-yvh/7CArceR/jNATXOKDlvTnPKPmGZz7zsenQ3jUwLzHkNUR0CvY3yGYJbWJ/nnxsL8Sgmt5cO3/SILVuPO6TQ== dependencies: base16 "^1.0.0" lodash.curry "^4.0.1" @@ -9412,9 +7479,9 @@ react-error-overlay@^6.0.11: integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg== react-fast-compare@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" - integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA== + version "3.2.1" + resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.1.tgz#53933d9e14f364281d6cba24bfed7a4afb808b5f" + integrity sha512-xTYf9zFim2pEif/Fw16dBiXpe0hoy5PxcD8+OwBnTtNLfIm3g6WxhKNurY+6OmdH1u6Ta/W/Vl6vjbYP1MFnDg== react-helmet-async@*, react-helmet-async@^1.3.0: version "1.3.0" @@ -9427,7 +7494,7 @@ react-helmet-async@*, react-helmet-async@^1.3.0: react-fast-compare "^3.2.0" shallowequal "^1.1.0" -react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1: +react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -9448,9 +7515,9 @@ react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4: integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== react-live@^2.2.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/react-live/-/react-live-2.3.0.tgz#09fbac361903970e7cf51cee60729eeb164a5d87" - integrity sha512-b+Nc7x/bLu2sPX/If1uncrmUvYtXTqxY8QpzBw/X76SA3QJ1ggU0Ld6X5phLXZ469+XWO5lOU7OpAt0JoTyZPQ== + version "2.4.1" + resolved "https://registry.yarnpkg.com/react-live/-/react-live-2.4.1.tgz#65e674ff9ca9a9a95f83117acc21ffd968aca619" + integrity sha512-r+32f7oV/kBs3QZBRvaT+9vOkQW47UZrDpgwUe5FiIMOl7sdo5pmISgb7Zpj5PGHgY6XQaiXs3FEh+IWw3KbRg== dependencies: "@types/buble" "^0.20.0" buble "0.19.6" @@ -9486,28 +7553,27 @@ react-router-config@^5.1.1: "@babel/runtime" "^7.1.2" react-router-dom@^5.3.3: - version "5.3.3" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.3.tgz#8779fc28e6691d07afcaf98406d3812fe6f11199" - integrity sha512-Ov0tGPMBgqmbu5CDmN++tv2HQ9HlWDuWIIqn4b88gjlAN5IHI+4ZUZRcpz9Hl0azFIwihbLDYw1OiHGRo7ZIng== + version "5.3.4" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.4.tgz#2ed62ffd88cae6db134445f4a0c0ae8b91d2e5e6" + integrity sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ== dependencies: "@babel/runtime" "^7.12.13" history "^4.9.0" loose-envify "^1.3.1" prop-types "^15.6.2" - react-router "5.3.3" + react-router "5.3.4" tiny-invariant "^1.0.2" tiny-warning "^1.0.0" -react-router@5.3.3, react-router@^5.3.3: - version "5.3.3" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.3.3.tgz#8e3841f4089e728cf82a429d92cdcaa5e4a3a288" - integrity sha512-mzQGUvS3bM84TnbtMYR8ZjKnuPJ71IjSzR+DE6UkUqvN4czWIqEs17yLL8xkAycv4ev0AiN+IGrWu88vJs/p2w== +react-router@5.3.4, react-router@^5.3.3: + version "5.3.4" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.3.4.tgz#8ca252d70fcc37841e31473c7a151cf777887bb5" + integrity sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA== dependencies: "@babel/runtime" "^7.12.13" history "^4.9.0" hoist-non-react-statics "^3.1.0" loose-envify "^1.3.1" - mini-create-react-context "^0.4.0" path-to-regexp "^1.7.0" prop-types "^15.6.2" react-is "^16.6.0" @@ -9515,18 +7581,18 @@ react-router@5.3.3, react-router@^5.3.3: tiny-warning "^1.0.0" react-simple-code-editor@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/react-simple-code-editor/-/react-simple-code-editor-0.11.0.tgz#bb57c7c29b570f2ab229872599eac184f5bc673c" - integrity sha512-xGfX7wAzspl113ocfKQAR8lWPhavGWHL3xSzNLeseDRHysT+jzRBi/ExdUqevSMos+7ZtdfeuBOXtgk9HTwsrw== + version "0.11.3" + resolved "https://registry.yarnpkg.com/react-simple-code-editor/-/react-simple-code-editor-0.11.3.tgz#6e5af1c2e51588aded2c89b86e98fac144212f61" + integrity sha512-7bVI4Yd1aNCeuldErXUt8ksaAG5Fi+GZ6vp3mtFBnckKdzsQtrgkDvdwMFXIhwTGG+mUYmk5ZpMo0axSW9JBzA== react-textarea-autosize@^8.3.2: - version "8.3.3" - resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.3.tgz#f70913945369da453fd554c168f6baacd1fa04d8" - integrity sha512-2XlHXK2TDxS6vbQaoPbMOfQ8GK7+irc2fVK6QFIcC8GOnH3zI/v481n+j1L0WaPVvKxwesnY93fEfH++sus2rQ== + version "8.4.1" + resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.4.1.tgz#bcfc5462727014b808b14ee916c01e275e8a8335" + integrity sha512-aD2C+qK6QypknC+lCMzteOdIjoMbNlgSFmJjCV+DrfTPwp59i/it9mMNf2HDzvRjQgKAyBDPyLJhcrzElf2U4Q== dependencies: - "@babel/runtime" "^7.10.2" - use-composed-ref "^1.0.0" - use-latest "^1.0.0" + "@babel/runtime" "^7.20.13" + use-composed-ref "^1.3.0" + use-latest "^1.2.1" react@^17.0.2: version "17.0.2" @@ -9537,9 +7603,9 @@ react@^17.0.2: object-assign "^4.1.1" readable-stream@^2.0.1: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + version "2.3.8" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" + integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== dependencies: core-util-is "~1.0.0" inherits "~2.0.3" @@ -9550,9 +7616,9 @@ readable-stream@^2.0.1: util-deprecate "~1.0.1" readable-stream@^3.0.6: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== dependencies: inherits "^2.0.3" string_decoder "^1.1.1" @@ -9573,90 +7639,78 @@ reading-time@^1.5.0: rechoir@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" - integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= + integrity sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw== dependencies: resolve "^1.1.6" recursive-readdir@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f" - integrity sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg== + version "2.2.3" + resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.3.tgz#e726f328c0d69153bcabd5c322d3195252379372" + integrity sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA== dependencies: - minimatch "3.0.4" + minimatch "^3.0.5" -regenerate-unicode-properties@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56" - integrity sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw== +regenerate-unicode-properties@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c" + integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ== dependencies: regenerate "^1.4.2" -regenerate-unicode-properties@^8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec" - integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA== +regenerate-unicode-properties@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" + integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA== dependencies: - regenerate "^1.4.0" + regenerate "^1.4.2" -regenerate@^1.4.0, regenerate@^1.4.2: +regenerate@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== -regenerator-runtime@^0.13.4: - version "0.13.9" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" - integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== +regenerator-runtime@^0.13.11: + version "0.13.11" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" + integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== -regenerator-transform@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537" - integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg== +regenerator-transform@^0.15.1: + version "0.15.1" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56" + integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg== dependencies: "@babel/runtime" "^7.8.4" -regexpu-core@^4.2.0, regexpu-core@^4.7.1: - version "4.7.1" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6" - integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ== - dependencies: - regenerate "^1.4.0" - regenerate-unicode-properties "^8.2.0" - regjsgen "^0.5.1" - regjsparser "^0.6.4" - unicode-match-property-ecmascript "^1.0.4" - unicode-match-property-value-ecmascript "^1.2.0" - -regexpu-core@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz#c531122a7840de743dcf9c83e923b5560323ced3" - integrity sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw== +regexpu-core@^4.2.0: + version "4.8.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" + integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg== dependencies: regenerate "^1.4.2" - regenerate-unicode-properties "^10.0.1" - regjsgen "^0.6.0" - regjsparser "^0.8.2" + regenerate-unicode-properties "^9.0.0" + regjsgen "^0.5.2" + regjsparser "^0.7.0" unicode-match-property-ecmascript "^2.0.0" unicode-match-property-value-ecmascript "^2.0.0" -regexpu-core@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.1.0.tgz#2f8504c3fd0ebe11215783a41541e21c79942c6d" - integrity sha512-bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA== +regexpu-core@^5.3.1: + version "5.3.2" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b" + integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ== dependencies: + "@babel/regjsgen" "^0.8.0" regenerate "^1.4.2" - regenerate-unicode-properties "^10.0.1" - regjsgen "^0.6.0" - regjsparser "^0.8.2" + regenerate-unicode-properties "^10.1.0" + regjsparser "^0.9.1" unicode-match-property-ecmascript "^2.0.0" - unicode-match-property-value-ecmascript "^2.0.0" + unicode-match-property-value-ecmascript "^2.1.0" registry-auth-token@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" - integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw== + version "4.2.2" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz#f02d49c3668884612ca031419491a13539e21fac" + integrity sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg== dependencies: - rc "^1.2.8" + rc "1.2.8" registry-url@^5.0.0: version "5.1.0" @@ -9665,34 +7719,29 @@ registry-url@^5.0.0: dependencies: rc "^1.2.8" -regjsgen@^0.5.1: +regjsgen@^0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== -regjsgen@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d" - integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA== - -regjsparser@^0.6.4: - version "0.6.9" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6" - integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ== +regjsparser@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968" + integrity sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ== dependencies: jsesc "~0.5.0" -regjsparser@^0.8.2: - version "0.8.4" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f" - integrity sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA== +regjsparser@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709" + integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ== dependencies: jsesc "~0.5.0" relateurl@^0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" - integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= + integrity sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog== remark-emoji@^2.2.0: version "2.2.0" @@ -9738,9 +7787,9 @@ remark-mdx@1.6.22: unified "9.2.0" remark-mdx@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/remark-mdx/-/remark-mdx-2.1.1.tgz#14021be9ecbc9ad0310f4240980221328aa7ed55" - integrity sha512-0wXdEITnFyjLquN3VvACNLzbGzWM5ujzTvfgOkONBZgSFJ7ezLLDaTWqf6H9eUgVITEP8asp6LJ0W/X090dXBg== + version "2.3.0" + resolved "https://registry.yarnpkg.com/remark-mdx/-/remark-mdx-2.3.0.tgz#efe678025a8c2726681bde8bf111af4a93943db4" + integrity sha512-g53hMkpM0I98MU266IzDFMrTD980gNF3BJnkyFcmN+dD873mQeD5rdMO3Y2X+x8umQfbSE0PcoEDl7ledSA+2g== dependencies: mdast-util-mdx "^2.0.0" micromark-extension-mdxjs "^1.0.0" @@ -9807,7 +7856,7 @@ renderkid@^3.0.0: repeat-string@^1.5.4: version "1.6.1" resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= + integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== require-from-string@^2.0.2: version "2.0.2" @@ -9817,19 +7866,19 @@ require-from-string@^2.0.2: "require-like@>= 0.1.1": version "0.1.2" resolved "https://registry.yarnpkg.com/require-like/-/require-like-0.1.2.tgz#ad6f30c13becd797010c468afa775c0c0a6b47fa" - integrity sha1-rW8wwTvs15cBDEaK+ndcDAprR/o= + integrity sha512-oyrU88skkMtDdauHDuKVrgR+zuItqr6/c//FXzvmxRGMexSDc6hNvJInGW3LL46n+8b50RykrvwSUIIQH2LQ5A== requires-port@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= + integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -resolve-package-path@^4.0.0: +resolve-package-path@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-4.0.3.tgz#31dab6897236ea6613c72b83658d88898a9040aa" integrity sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA== @@ -9842,17 +7891,18 @@ resolve-pathname@^3.0.0: integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng== resolve@^1.1.6, resolve@^1.14.2, resolve@^1.3.2: - version "1.20.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" - integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + version "1.22.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" + integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== dependencies: - is-core-module "^2.2.0" - path-parse "^1.0.6" + is-core-module "^2.9.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" responselike@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" - integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= + integrity sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ== dependencies: lowercase-keys "^1.0.0" @@ -9903,12 +7953,12 @@ run-parallel@^1.1.9: rw@1: version "1.3.3" resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" - integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q= + integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ== rxjs@^7.5.4: - version "7.5.5" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.5.tgz#2ebad89af0f560f460ad5cc4213219e1f7dd4e9f" - integrity sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw== + version "7.8.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4" + integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg== dependencies: tslib "^2.1.0" @@ -9924,7 +7974,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0: +safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -9995,12 +8045,12 @@ section-matter@^1.0.0: select-hose@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" - integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= + integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg== -selfsigned@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.1.tgz#8b2df7fa56bf014d19b6007655fff209c0ef0a56" - integrity sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ== +selfsigned@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61" + integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ== dependencies: node-forge "^1" @@ -10011,11 +8061,6 @@ semver-diff@^3.1.1: dependencies: semver "^6.3.0" -semver@7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" - integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== - semver@^5.4.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -10026,17 +8071,10 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== - dependencies: - lru-cache "^6.0.0" - -semver@^7.3.7: - version "7.3.7" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" - integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== +semver@^7.3.2, semver@^7.3.4, semver@^7.3.7, semver@^7.3.8: + version "7.3.8" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" + integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== dependencies: lru-cache "^6.0.0" @@ -10059,23 +8097,23 @@ send@0.18.0: range-parser "~1.2.1" statuses "2.0.1" -serialize-javascript@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" - integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== +serialize-javascript@^6.0.0, serialize-javascript@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" + integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w== dependencies: randombytes "^2.1.0" serve-handler@^6.1.3: - version "6.1.3" - resolved "https://registry.yarnpkg.com/serve-handler/-/serve-handler-6.1.3.tgz#1bf8c5ae138712af55c758477533b9117f6435e8" - integrity sha512-FosMqFBNrLyeiIDvP1zgO6YoTzFYHxLDEIavhlmQ+knB2Z7l1t+kGLHkZIDN7UVWqQAmKI3D20A6F6jo3nDd4w== + version "6.1.5" + resolved "https://registry.yarnpkg.com/serve-handler/-/serve-handler-6.1.5.tgz#a4a0964f5c55c7e37a02a633232b6f0d6f068375" + integrity sha512-ijPFle6Hwe8zfmBxJdE+5fta53fdIY0lHISJvuikXB3VYFafRjMRpOffSPvCYsbKyBA7pvy9oYr/BT1O3EArlg== dependencies: bytes "3.0.0" content-disposition "0.5.2" fast-url-parser "1.1.3" mime-types "2.1.18" - minimatch "3.0.4" + minimatch "3.1.2" path-is-inside "1.0.2" path-to-regexp "2.2.1" range-parser "1.2.0" @@ -10083,7 +8121,7 @@ serve-handler@^6.1.3: serve-index@^1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" - integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk= + integrity sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw== dependencies: accepts "~1.3.4" batch "0.6.1" @@ -10106,7 +8144,7 @@ serve-static@1.15.0: setimmediate@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= + integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA== setprototypeof@1.1.0: version "1.1.0" @@ -10143,9 +8181,9 @@ shebang-regex@^3.0.0: integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== shell-quote@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" - integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw== + version "1.8.0" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.0.tgz#20d078d0eaf71d54f43bd2ba14a1b5b9bfa5c8ba" + integrity sha512-QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ== shelljs@^0.8.5: version "0.8.5" @@ -10166,17 +8204,17 @@ side-channel@^1.0.4: object-inspect "^1.9.0" signal-exit@^3.0.2, signal-exit@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" - integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== sirv@^1.0.7: - version "1.0.12" - resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.12.tgz#d816c882b35489b3c63290e2f455ae3eccd5f652" - integrity sha512-+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg== + version "1.0.19" + resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49" + integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ== dependencies: - "@polka/url" "^1.0.0-next.15" - mime "^2.3.1" + "@polka/url" "^1.0.0-next.20" + mrmime "^1.0.0" totalist "^1.0.0" sisteransi@^1.0.5: @@ -10213,28 +8251,20 @@ sockjs@^0.3.24: uuid "^8.3.2" websocket-driver "^0.7.4" -sort-css-media-queries@2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/sort-css-media-queries/-/sort-css-media-queries-2.0.4.tgz#b2badfa519cb4a938acbc6d3aaa913d4949dc908" - integrity sha512-PAIsEK/XupCQwitjv7XxoMvYhT7EAfyzI3hsy/MyDgTvc+Ft55ctdkctJLOy6cQejaIC+zjpUL4djFVm2ivOOw== +sort-css-media-queries@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/sort-css-media-queries/-/sort-css-media-queries-2.1.0.tgz#7c85e06f79826baabb232f5560e9745d7a78c4ce" + integrity sha512-IeWvo8NkNiY2vVYdPa27MCQiR0MN0M80johAYFVxWWXQ44KU84WNxjslwBHmc/7ZL2ccwkM7/e6S5aiKZXm7jA== source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== -source-map-support@~0.5.19: - version "0.5.19" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" - integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - source-map-support@~0.5.20: - version "0.5.20" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" - integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw== + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" @@ -10242,19 +8272,19 @@ source-map-support@~0.5.20: source-map@^0.5.0: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@~0.7.2: - version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" - integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== +source-map@^0.7.0: + version "0.7.4" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" + integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== -sourcemap-codec@^1.4.4: +sourcemap-codec@^1.4.8: version "1.4.8" resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== @@ -10265,9 +8295,9 @@ space-separated-tokens@^1.0.0: integrity sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA== space-separated-tokens@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.1.tgz#43193cec4fb858a2ce934b7f98b7f2c18107098b" - integrity sha512-ekwEbFp5aqSPKaqeY1PGrlGQxPNaq+Cnx4+bE2D8sciBQrHpbwoBbawqTN2+6jPs9IdWxxiUcN0K2pkczD3zmw== + version "2.0.2" + resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz#1ecd9d2350a3844572c3f4a312bceb018348859f" + integrity sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q== spdy-transport@^3.0.0: version "3.0.0" @@ -10295,7 +8325,7 @@ spdy@^4.0.2: sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== stable@^0.1.8: version "0.1.8" @@ -10315,30 +8345,21 @@ statuses@2.0.1: "statuses@>= 1.4.0 < 2": version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== std-env@^3.0.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.1.1.tgz#1f19c4d3f6278c52efd08a94574a2a8d32b7d092" - integrity sha512-/c645XdExBypL01TpFKiG/3RAa/Qmu+zRi0MwAmrdEkwHNuN0ebo8ccAXBBDa5Z0QOJgBskUIbuCK91x0sCVEw== - -string-width@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" + version "3.3.2" + resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.3.2.tgz#af27343b001616015534292178327b202b9ee955" + integrity sha512-uUZI65yrV2Qva5gqE0+A7uVAvO40iPo6jGhs7s8keRfHCmtg+uB2X6EiLGCI9IgL1J17xGhvoOqSz79lzICPTA== -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" - integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== +string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" + strip-ansi "^6.0.1" string-width@^5.0.1: version "5.1.2" @@ -10349,22 +8370,6 @@ string-width@^5.0.1: emoji-regex "^9.2.2" strip-ansi "^7.0.1" -string.prototype.trimend@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" - integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -string.prototype.trimstart@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" - integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -10380,9 +8385,9 @@ string_decoder@~1.1.1: safe-buffer "~5.1.0" stringify-entities@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-4.0.2.tgz#13d113dc7449dc8ae4cb22c28883ee3fff8753e3" - integrity sha512-MTxTVcEkorNtBbNpoFJPEh0kKdM6+QbMjLbaxmvaPMmayOXdr/AIVIIJX7FReUVweRBFJfZepK4A4AKgwuFpMQ== + version "4.0.3" + resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-4.0.3.tgz#cfabd7039d22ad30f3cc435b0ca2c1574fc88ef8" + integrity sha512-BP9nNHMhhfcMbiuQKCqMjhDP5yBCAxsPu4pHFFzJ6Alo9dZgY4VLDPutXqIjpRiMoKdp7Av85Gr73Q5uH9k7+g== dependencies: character-entities-html4 "^2.0.0" character-entities-legacy "^3.0.0" @@ -10396,21 +8401,7 @@ stringify-object@^3.3.0: is-obj "^1.0.1" is-regexp "^1.0.0" -strip-ansi@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" - integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== - dependencies: - ansi-regex "^4.1.0" - -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== - dependencies: - ansi-regex "^5.0.0" - -strip-ansi@^6.0.1: +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -10427,7 +8418,7 @@ strip-ansi@^7.0.1: strip-bom-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92" - integrity sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI= + integrity sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g== strip-final-newline@^2.0.0: version "2.0.0" @@ -10442,7 +8433,7 @@ strip-json-comments@^3.1.1: strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== style-to-object@0.3.0, style-to-object@^0.3.0: version "0.3.0" @@ -10451,18 +8442,25 @@ style-to-object@0.3.0, style-to-object@^0.3.0: dependencies: inline-style-parser "0.1.1" -stylehacks@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.0.tgz#a40066490ca0caca04e96c6b02153ddc39913520" - integrity sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q== +style-to-object@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.4.1.tgz#53cf856f7cf7f172d72939d9679556469ba5de37" + integrity sha512-HFpbb5gr2ypci7Qw+IOhnP2zOU7e77b+rzM+wTzXzfi1PrtBCX0E7Pk4wL4iTLnhzZ+JgEGAhX81ebTg/aYjQw== + dependencies: + inline-style-parser "0.1.1" + +stylehacks@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.1.tgz#7934a34eb59d7152149fa69d6e9e56f2fc34bcc9" + integrity sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw== dependencies: - browserslist "^4.16.6" + browserslist "^4.21.4" postcss-selector-parser "^6.0.4" -stylis@^4.0.10: - version "4.1.1" - resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.1.1.tgz#e46c6a9bbf7c58db1e65bb730be157311ae1fe12" - integrity sha512-lVrM/bNdhVX2OgBFNa2YJ9Lxj7kPzylieHd3TNjuGE0Re9JB7joL5VUKOVH1kdNNJTgGPpT8hmwIAPLaSyEVFQ== +stylis@^4.1.2: + version "4.1.3" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.1.3.tgz#fd2fbe79f5fed17c55269e16ed8da14c84d069f7" + integrity sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA== supports-color@^5.3.0: version "5.5.0" @@ -10485,12 +8483,17 @@ supports-color@^8.0.0: dependencies: has-flag "^4.0.0" -svg-parser@^2.0.2: +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + +svg-parser@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5" integrity sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ== -svgo@^2.5.0, svgo@^2.7.0: +svgo@^2.7.0, svgo@^2.8.0: version "2.8.0" resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg== @@ -10509,75 +8512,35 @@ tapable@^1.0.0: integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b" - integrity sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw== - -terser-webpack-plugin@^5.1.3: - version "5.1.4" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.4.tgz#c369cf8a47aa9922bd0d8a94fe3d3da11a7678a1" - integrity sha512-C2WkFwstHDhVEmsmlCxrXUtVklS+Ir1A7twrYzrDrQQOIMOaVAYykaoo/Aq1K0QRkMoY2hhvDQY1cm4jnIMFwA== - dependencies: - jest-worker "^27.0.2" - p-limit "^3.1.0" - schema-utils "^3.0.0" - serialize-javascript "^6.0.0" - source-map "^0.6.1" - terser "^5.7.0" + version "2.2.1" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" + integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== -terser-webpack-plugin@^5.3.3: - version "5.3.6" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c" - integrity sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ== +terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.3.3: + version "5.3.7" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz#ef760632d24991760f339fe9290deb936ad1ffc7" + integrity sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw== dependencies: - "@jridgewell/trace-mapping" "^0.3.14" + "@jridgewell/trace-mapping" "^0.3.17" jest-worker "^27.4.5" schema-utils "^3.1.1" - serialize-javascript "^6.0.0" - terser "^5.14.1" - -terser@^5.10.0: - version "5.14.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.0.tgz#eefeec9af5153f55798180ee2617f390bdd285e2" - integrity sha512-JC6qfIEkPBd9j1SMO3Pfn+A6w2kQV54tv+ABQLgZr7dA3k/DL/OBoYSWxzVpZev3J+bUHXfr55L8Mox7AaNo6g== - dependencies: - "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" - commander "^2.20.0" - source-map-support "~0.5.20" + serialize-javascript "^6.0.1" + terser "^5.16.5" -terser@^5.14.1: - version "5.15.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.15.0.tgz#e16967894eeba6e1091509ec83f0c60e179f2425" - integrity sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA== +terser@^5.10.0, terser@^5.16.5: + version "5.16.8" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.8.tgz#ccde583dabe71df3f4ed02b65eb6532e0fae15d5" + integrity sha512-QI5g1E/ef7d+PsDifb+a6nnVgC4F22Bg6T0xrBrz6iloVB4PUkkunp6V8nzoOOZJIzjWVdAGqCdlKlhLq/TbIA== dependencies: "@jridgewell/source-map" "^0.3.2" acorn "^8.5.0" commander "^2.20.0" source-map-support "~0.5.20" -terser@^5.7.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.1.tgz#2dc7a61009b66bb638305cb2a824763b116bf784" - integrity sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg== - dependencies: - commander "^2.20.0" - source-map "~0.7.2" - source-map-support "~0.5.19" - -terser@^5.7.2: - version "5.9.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.9.0.tgz#47d6e629a522963240f2b55fcaa3c99083d2c351" - integrity sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ== - dependencies: - commander "^2.20.0" - source-map "~0.7.2" - source-map-support "~0.5.20" - text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== thunky@^1.0.2: version "1.1.0" @@ -10585,11 +8548,11 @@ thunky@^1.0.2: integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== tiny-invariant@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz#634c5f8efdc27714b7f386c35e6760991d230875" - integrity sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw== + version "1.3.1" + resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642" + integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw== -tiny-warning@^1.0.0, tiny-warning@^1.0.3: +tiny-warning@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== @@ -10597,7 +8560,7 @@ tiny-warning@^1.0.0, tiny-warning@^1.0.3: to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== to-readable-stream@^1.0.0: version "1.0.0" @@ -10624,7 +8587,12 @@ totalist@^1.0.0: tr46@~0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== + +trim-lines@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-3.0.1.tgz#d802e332a07df861c48802c04321017b1bd87338" + integrity sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg== trim-trailing-lines@^1.0.0: version "1.1.4" @@ -10634,7 +8602,7 @@ trim-trailing-lines@^1.0.0: trim@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" - integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0= + integrity sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ== trough@^1.0.0: version "1.0.5" @@ -10642,24 +8610,19 @@ trough@^1.0.0: integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== trough@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/trough/-/trough-2.0.2.tgz#94a3aa9d5ce379fc561f6244905b3f36b7458d96" - integrity sha512-FnHq5sTMxC0sk957wHDzRnemFnNBvt/gSY99HzK8F7UP5WAbvP70yX5bd7CjEQkN+TjdxwI7g7lJ6podqrG2/w== - -ts-essentials@^2.0.3: - version "2.0.12" - resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz#c9303f3d74f75fa7528c3d49b80e089ab09d8745" - integrity sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w== + version "2.1.0" + resolved "https://registry.yarnpkg.com/trough/-/trough-2.1.0.tgz#0f7b511a4fde65a46f18477ab38849b22c554876" + integrity sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g== -tslib@^2.0.3, tslib@^2.1.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" - integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== +ts-dedent@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-2.2.0.tgz#39e4bd297cd036292ae2394eb3412be63f563bb5" + integrity sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ== -tslib@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" - integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== +tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" + integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== type-fest@^0.20.2: version "0.20.2" @@ -10667,9 +8630,9 @@ type-fest@^0.20.2: integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== type-fest@^2.5.0: - version "2.13.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.13.0.tgz#d1ecee38af29eb2e863b22299a3d68ef30d2abfb" - integrity sha512-lPfAm42MxE4/456+QyIaaVBAwgpJb6xZ8PRu09utnhPdWwcyj9vgy6Sq0Z5yNbJ21EdxB5dRU/Qg8bsyAMtlcw== + version "2.19.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b" + integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA== type-is@~1.6.18: version "1.6.18" @@ -10686,20 +8649,10 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -ua-parser-js@^0.7.18: - version "0.7.28" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31" - integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g== - -unbox-primitive@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" - integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== - dependencies: - function-bind "^1.1.1" - has-bigints "^1.0.1" - has-symbols "^1.0.2" - which-boxed-primitive "^1.0.2" +ua-parser-js@^0.7.30: + version "0.7.34" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.34.tgz#afb439e2e3e394bdc90080acb661a39c685b67d7" + integrity sha512-cJMeh/eOILyGu0ejgTKB95yKT3zOenSe9UGE3vj6WfiOwgGYnmATUsnDixMFvdU+rNMvWih83hrUP8VwhF9yXQ== unescape@^1.0.1: version "1.0.1" @@ -10716,24 +8669,11 @@ unherit@^1.0.4: inherits "^2.0.0" xtend "^4.0.0" -unicode-canonical-property-names-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" - integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ== - unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ== -unicode-match-property-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c" - integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg== - dependencies: - unicode-canonical-property-names-ecmascript "^1.0.4" - unicode-property-aliases-ecmascript "^1.0.4" - unicode-match-property-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" @@ -10742,25 +8682,15 @@ unicode-match-property-ecmascript@^2.0.0: unicode-canonical-property-names-ecmascript "^2.0.0" unicode-property-aliases-ecmascript "^2.0.0" -unicode-match-property-value-ecmascript@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531" - integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ== - -unicode-match-property-value-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" - integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw== - -unicode-property-aliases-ecmascript@^1.0.4: - version "1.1.0" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4" - integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg== +unicode-match-property-value-ecmascript@^2.0.0, unicode-match-property-value-ecmascript@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0" + integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA== unicode-property-aliases-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" - integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ== + version "2.1.0" + resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd" + integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w== unified@9.2.0: version "9.2.0" @@ -10775,9 +8705,9 @@ unified@9.2.0: vfile "^4.0.0" unified@^10.0.0: - version "10.1.1" - resolved "https://registry.yarnpkg.com/unified/-/unified-10.1.1.tgz#345e349e3ab353ab612878338eb9d57b4dea1d46" - integrity sha512-v4ky1+6BN9X3pQrOdkFIPWAaeDsHPE1svRDxq7YpTc2plkIqFMwukfqM+l0ewpP9EfwARlt9pPFAeWYhHm8X9w== + version "10.1.2" + resolved "https://registry.yarnpkg.com/unified/-/unified-10.1.2.tgz#b1d64e55dafe1f0b98bb6c719881103ecf6c86df" + integrity sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q== dependencies: "@types/unist" "^2.0.0" bail "^2.0.0" @@ -10811,22 +8741,15 @@ unist-builder@2.0.3, unist-builder@^2.0.0: resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436" integrity sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw== -unist-builder@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-3.0.0.tgz#728baca4767c0e784e1e64bb44b5a5a753021a04" - integrity sha512-GFxmfEAa0vi9i5sd0R2kcrI9ks0r82NasRq5QHh2ysGngrc6GiqD5CDf1FjPenY4vApmFASBIIlk/jj5J5YbmQ== - dependencies: - "@types/unist" "^2.0.0" - unist-util-generated@^1.0.0: version "1.1.6" resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b" integrity sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg== unist-util-generated@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-2.0.0.tgz#86fafb77eb6ce9bfa6b663c3f5ad4f8e56a60113" - integrity sha512-TiWE6DVtVe7Ye2QxOVW9kqybs6cZexNwTwSMVgkfjEReqy/xwGpAXb99OxktoWwmL+Z+Epb0Dn8/GNDYP1wnUw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-2.0.1.tgz#e37c50af35d3ed185ac6ceacb6ca0afb28a85cae" + integrity sha512-qF72kLmPxAw0oN2fwpWIqbXAVyEqUzDHMsbtPvOudIlUzXYFIeQIuxXQCRCFh22B7cixvU0MG7m3MW8FTq/S+A== unist-util-is@^4.0.0: version "4.1.0" @@ -10834,14 +8757,16 @@ unist-util-is@^4.0.0: integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg== unist-util-is@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-5.1.1.tgz#e8aece0b102fa9bc097b0fef8f870c496d4a6236" - integrity sha512-F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ== + version "5.2.1" + resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-5.2.1.tgz#b74960e145c18dcb6226bc57933597f5486deae9" + integrity sha512-u9njyyfEh43npf1M+yGKDGVPbY/JWEemg5nH05ncKPfi+kBbKBJoTdsogMu33uhytuLlv9y0O7GH7fEdwLdLQw== + dependencies: + "@types/unist" "^2.0.0" unist-util-position-from-estree@^1.0.0, unist-util-position-from-estree@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unist-util-position-from-estree/-/unist-util-position-from-estree-1.1.1.tgz#96f4d543dfb0428edc01ebb928570b602d280c4c" - integrity sha512-xtoY50b5+7IH8tFbkw64gisG9tMSpxDjhX9TmaJJae/XuxQ9R/Kc8Nv1eOsf43Gt4KV/LkriMy9mptDr7XLcaw== + version "1.1.2" + resolved "https://registry.yarnpkg.com/unist-util-position-from-estree/-/unist-util-position-from-estree-1.1.2.tgz#8ac2480027229de76512079e377afbcabcfcce22" + integrity sha512-poZa0eXpS+/XpoQwGwl79UUdea4ol2ZuCYguVaJS4qzIOMDzbqz8a3erUCOmubSZkaOuGamb3tX790iwOIROww== dependencies: "@types/unist" "^2.0.0" @@ -10851,9 +8776,11 @@ unist-util-position@^3.0.0: integrity sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA== unist-util-position@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-4.0.1.tgz#f8484b2da19a897a0180556d160c28633070dbb9" - integrity sha512-mgy/zI9fQ2HlbOtTdr2w9lhVaiFUHWQnZrFF2EUoVOqtAUdzqMtNiD99qA5a1IcjWVR8O6aVYE9u7Z2z1v0SQA== + version "4.0.4" + resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-4.0.4.tgz#93f6d8c7d6b373d9b825844645877c127455f037" + integrity sha512-kUBE91efOWfIVBo8xzh/uZQ7p9ffYRtUbMRZBNFYwf0RK8koUMx6dGUfwylLOKmaT2cs4wSW96QoYUSXAyEtpg== + dependencies: + "@types/unist" "^2.0.0" unist-util-remove-position@^2.0.0: version "2.0.1" @@ -10863,9 +8790,9 @@ unist-util-remove-position@^2.0.0: unist-util-visit "^2.0.0" unist-util-remove-position@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-4.0.1.tgz#d5b46a7304ac114c8d91990ece085ca7c2c135c8" - integrity sha512-0yDkppiIhDlPrfHELgB+NLQD5mfjup3a8UYclHruTJWmY74je8g+CIFr79x5f6AkmzSwlvKLbs63hC0meOMowQ== + version "4.0.2" + resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-4.0.2.tgz#a89be6ea72e23b1a402350832b02a91f6a9afe51" + integrity sha512-TkBb0HABNmxzAcfLf4qsIbFbaPDvMO6wa3b3j4VcEzFVaw1LBKwnW4/sRJ/atSLSzoIg41JWEdnE7N6DIhGDGQ== dependencies: "@types/unist" "^2.0.0" unist-util-visit "^4.0.0" @@ -10878,9 +8805,9 @@ unist-util-remove@^2.0.0: unist-util-is "^4.0.0" unist-util-remove@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/unist-util-remove/-/unist-util-remove-3.1.0.tgz#8042577e151dac989b7517976bfe4bac58f76ccd" - integrity sha512-rO/sIghl13eN8irs5OBN2a4RC10MsJdiePCfwrvnzGtgIbHcDXr2REr0qi9F2r/CIb1r9FyyFmcMRIGs+EyUFw== + version "3.1.1" + resolved "https://registry.yarnpkg.com/unist-util-remove/-/unist-util-remove-3.1.1.tgz#8bfa181aff916bd32a4ed30b3ed76d0c21c077df" + integrity sha512-kfCqZK5YVY5yEa89tvpl7KnBBHu2c6CzMkqHUrlOqaRgGOMp0sMvwWOVrbAtj03KhovQB7i96Gda72v/EFE0vw== dependencies: "@types/unist" "^2.0.0" unist-util-is "^5.0.0" @@ -10894,9 +8821,9 @@ unist-util-stringify-position@^2.0.0: "@types/unist" "^2.0.2" unist-util-stringify-position@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-3.0.0.tgz#d517d2883d74d0daa0b565adc3d10a02b4a8cde9" - integrity sha512-SdfAl8fsDclywZpfMDTVDxA2V7LjtRDTOFd44wUJamgl6OlVngsqWjxvermMYf60elWHbxhuRCZml7AnuXCaSA== + version "3.0.3" + resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz#03ad3348210c2d930772d64b489580c13a7db39d" + integrity sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg== dependencies: "@types/unist" "^2.0.0" @@ -10908,18 +8835,10 @@ unist-util-visit-parents@^3.0.0: "@types/unist" "^2.0.0" unist-util-is "^4.0.0" -unist-util-visit-parents@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-4.1.1.tgz#e83559a4ad7e6048a46b1bdb22614f2f3f4724f2" - integrity sha512-1xAFJXAKpnnJl8G7K5KgU7FY55y3GcLIXqkzUj5QF/QVP7biUm0K0O2oqVkYsdjzJKifYeWn9+o6piAK2hGSHw== - dependencies: - "@types/unist" "^2.0.0" - unist-util-is "^5.0.0" - -unist-util-visit-parents@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-5.0.0.tgz#5ae2440f8710a0c18a2b4ba0c4471d18e1090494" - integrity sha512-CVaLOYPM/EaFTYMytbaju3Tw4QI3DHnHFnL358FkEu0hZOzSm/hqBdVwOQDR60jF5ZzhB1tlZlRH0ll/yekZIQ== +unist-util-visit-parents@^5.0.0, unist-util-visit-parents@^5.1.1: + version "5.1.3" + resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-5.1.3.tgz#b4520811b0ca34285633785045df7a8d6776cfeb" + integrity sha512-x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg== dependencies: "@types/unist" "^2.0.0" unist-util-is "^5.0.0" @@ -10933,23 +8852,14 @@ unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.1, unist- unist-util-is "^4.0.0" unist-util-visit-parents "^3.0.0" -unist-util-visit@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-3.1.0.tgz#9420d285e1aee938c7d9acbafc8e160186dbaf7b" - integrity sha512-Szoh+R/Ll68QWAyQyZZpQzZQm2UPbxibDvaY8Xc9SUtYgPsDzx5AWSk++UUt2hJuow8mvwR+rG+LQLw+KsuAKA== - dependencies: - "@types/unist" "^2.0.0" - unist-util-is "^5.0.0" - unist-util-visit-parents "^4.0.0" - unist-util-visit@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-4.1.0.tgz#f41e407a9e94da31594e6b1c9811c51ab0b3d8f5" - integrity sha512-n7lyhFKJfVZ9MnKtqbsqkQEk5P1KShj0+//V7mAcoI6bpbUjh3C/OG8HVD+pBihfh6Ovl01m8dkcv9HNqYajmQ== + version "4.1.2" + resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-4.1.2.tgz#125a42d1eb876283715a3cb5cceaa531828c72e2" + integrity sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg== dependencies: "@types/unist" "^2.0.0" unist-util-is "^5.0.0" - unist-util-visit-parents "^5.0.0" + unist-util-visit-parents "^5.1.1" universalify@^2.0.0: version "2.0.0" @@ -10959,7 +8869,15 @@ universalify@^2.0.0: unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== + +update-browserslist-db@^1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" + integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== + dependencies: + escalade "^3.1.1" + picocolors "^1.0.0" update-notifier@^5.1.0: version "5.1.0" @@ -11000,50 +8918,47 @@ url-loader@^4.1.1: url-parse-lax@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" - integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= + integrity sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ== dependencies: prepend-http "^2.0.0" -use-composed-ref@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.1.0.tgz#9220e4e94a97b7b02d7d27eaeab0b37034438bbc" - integrity sha512-my1lNHGWsSDAhhVAT4MKs6IjBUtG6ZG11uUqexPH9PptiIZDQOzaF4f5tEbJ2+7qvNbtXNBbU3SfmN+fXlWDhg== - dependencies: - ts-essentials "^2.0.3" +use-composed-ref@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.3.0.tgz#3d8104db34b7b264030a9d916c5e94fbe280dbda" + integrity sha512-GLMG0Jc/jiKov/3Ulid1wbv3r54K9HlMW29IWcDFPEqFkSO2nS0MuefWgMJpeHQ9YJeXDL3ZUF+P3jdXlZX/cQ== -use-isomorphic-layout-effect@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.1.tgz#7bb6589170cd2987a152042f9084f9effb75c225" - integrity sha512-L7Evj8FGcwo/wpbv/qvSfrkHFtOpCzvM5yl2KVyDJoylVuSvzphiiasmjgQPttIGBAy2WKiBNR98q8w7PiNgKQ== +use-isomorphic-layout-effect@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz#497cefb13d863d687b08477d9e5a164ad8c1a6fb" + integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA== -use-latest@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/use-latest/-/use-latest-1.2.0.tgz#a44f6572b8288e0972ec411bdd0840ada366f232" - integrity sha512-d2TEuG6nSLKQLAfW3By8mKr8HurOlTkul0sOpxbClIv4SQ4iOd7BYr7VIzdbktUCnv7dua/60xzd8igMU6jmyw== +use-latest@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/use-latest/-/use-latest-1.2.1.tgz#d13dfb4b08c28e3e33991546a2cee53e14038cf2" + integrity sha512-xA+AVm/Wlg3e2P/JiItTziwS7FK92LWrDB0p+hgXloIMuVCeJJ8v6f0eeHyPZaJrM+usM1FkFfbNCrJGs8A/zw== dependencies: - use-isomorphic-layout-effect "^1.0.0" + use-isomorphic-layout-effect "^1.1.1" util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== util@^0.12.0: - version "0.12.4" - resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253" - integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw== + version "0.12.5" + resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc" + integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA== dependencies: inherits "^2.0.3" is-arguments "^1.0.4" is-generator-function "^1.0.7" is-typed-array "^1.1.3" - safe-buffer "^5.1.2" which-typed-array "^1.1.2" utila@~0.4: version "0.4.0" resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" - integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw= + integrity sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA== utility-types@^3.10.0: version "3.10.0" @@ -11053,17 +8968,22 @@ utility-types@^3.10.0: utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== uuid@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== +uuid@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" + integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg== + uvu@^0.5.0: - version "0.5.3" - resolved "https://registry.yarnpkg.com/uvu/-/uvu-0.5.3.tgz#3d83c5bc1230f153451877bfc7f4aea2392219ae" - integrity sha512-brFwqA3FXzilmtnIyJ+CxdkInkY/i4ErvP7uV0DnUVxQcQ55reuHphorpF+tZoVHK2MniZ/VJzI7zJQoc9T9Yw== + version "0.5.6" + resolved "https://registry.yarnpkg.com/uvu/-/uvu-0.5.6.tgz#2754ca20bcb0bb59b64e9985e84d2e81058502df" + integrity sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA== dependencies: dequal "^2.0.0" diff "^5.0.0" @@ -11071,12 +8991,12 @@ uvu@^0.5.0: sade "^1.7.3" validate-peer-dependencies@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/validate-peer-dependencies/-/validate-peer-dependencies-2.1.0.tgz#1ad8218b1b168aeb500165f9de2a3f53269ece56" - integrity sha512-x+M+mp16g4N+jDQJO6a+AKnMHAViov9mRzYfgMYR6Bq+UTwewf8aTQsP+e1QH0oZrADqP7fuI/bEbl3CzRFhOQ== + version "2.2.0" + resolved "https://registry.yarnpkg.com/validate-peer-dependencies/-/validate-peer-dependencies-2.2.0.tgz#47b8ff008f66a66fc5d8699123844522c1d874f4" + integrity sha512-8X1OWlERjiUY6P6tdeU9E0EwO8RA3bahoOVG7ulOZT5MqgNDUO/BQoVjYiHPcNe+v8glsboZRIw9iToMAA2zAA== dependencies: - resolve-package-path "^4.0.0" - semver "^7.3.2" + resolve-package-path "^4.0.3" + semver "^7.3.8" value-equal@^1.0.1: version "1.0.1" @@ -11086,13 +9006,21 @@ value-equal@^1.0.1: vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== vfile-location@^3.0.0, vfile-location@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.2.0.tgz#d8e41fbcbd406063669ebf6c33d56ae8721d0f3c" integrity sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA== +vfile-location@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-4.1.0.tgz#69df82fb9ef0a38d0d02b90dd84620e120050dd0" + integrity sha512-YF23YMyASIIJXpktBa4vIGLJ5Gs88UB/XePgqPmTa7cDA+JeO3yclbpheQYCHjVHBn/yePzrXuygIL+xbvRYHw== + dependencies: + "@types/unist" "^2.0.0" + vfile "^5.0.0" + vfile-message@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" @@ -11102,9 +9030,9 @@ vfile-message@^2.0.0: unist-util-stringify-position "^2.0.0" vfile-message@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.1.0.tgz#5437035aa43185ff4b9210d32fada6c640e59143" - integrity sha512-4QJbBk+DkPEhBXq3f260xSaWtjE4gPKOfulzfMFF8ZNwaPZieWsg3iVlcmF04+eebzpcpeXOOFMfrYzJHVYg+g== + version "3.1.4" + resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.1.4.tgz#15a50816ae7d7c2d1fa87090a7f9f96612b59dea" + integrity sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw== dependencies: "@types/unist" "^2.0.0" unist-util-stringify-position "^3.0.0" @@ -11120,9 +9048,9 @@ vfile@^4.0.0: vfile-message "^2.0.0" vfile@^5.0.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/vfile/-/vfile-5.3.0.tgz#4990c78cb3157005590ee8c930b71cd7fa6a006e" - integrity sha512-Tj44nY/48OQvarrE4FAjUfrv7GZOYzPbl5OD65HxVKwLJKMPU7zmfV8cCgCnzKWnSfYG2f3pxu+ALqs7j22xQQ== + version "5.3.7" + resolved "https://registry.yarnpkg.com/vfile/-/vfile-5.3.7.tgz#de0677e6683e3380fafc46544cfe603118826ab7" + integrity sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g== dependencies: "@types/unist" "^2.0.0" is-buffer "^2.0.0" @@ -11172,16 +9100,22 @@ web-namespaces@^1.0.0: resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec" integrity sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw== +web-worker@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/web-worker/-/web-worker-1.2.0.tgz#5d85a04a7fbc1e7db58f66595d7a3ac7c9c180da" + integrity sha512-PgF341avzqyx60neE9DD+XS26MMNMoUQRz9NOZwW32nPQrF6p77f1htcnjBSEV8BGMKZ16choqUG4hyI0Hx7mA== + webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== webpack-bundle-analyzer@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5" - integrity sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ== + version "4.8.0" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.8.0.tgz#951b8aaf491f665d2ae325d8b84da229157b1d04" + integrity sha512-ZzoSBePshOKhr+hd8u6oCkZVwpVaXgpw23ScGLFpR6SjYI7+7iIWYarjN6OEYOfRt8o7ZyZZQk0DuMizJ+LEIg== dependencies: + "@discoveryjs/json-ext" "0.5.7" acorn "^8.0.4" acorn-walk "^8.0.0" chalk "^4.1.0" @@ -11204,9 +9138,9 @@ webpack-dev-middleware@^5.3.1: schema-utils "^4.0.0" webpack-dev-server@^4.9.3: - version "4.10.1" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.10.1.tgz#124ac9ac261e75303d74d95ab6712b4aec3e12ed" - integrity sha512-FIzMq3jbBarz3ld9l7rbM7m6Rj1lOsgq/DyLGMX/fPEB1UBUPtf5iL/4eNfhx8YYJTRlzfv107UfWSWcBK5Odw== + version "4.13.1" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.13.1.tgz#6417a9b5d2f528e7644b68d6ed335e392dccffe8" + integrity sha512-5tWg00bnWbYgkN+pd5yISQKDejRBYGEw15RaEEslH+zdbNDxxaZvEAO2WulaSaFKb5n3YG8JXsGaDsut1D0xdA== dependencies: "@types/bonjour" "^3.5.9" "@types/connect-history-api-fallback" "^1.3.5" @@ -11227,16 +9161,17 @@ webpack-dev-server@^4.9.3: html-entities "^2.3.2" http-proxy-middleware "^2.0.3" ipaddr.js "^2.0.1" + launch-editor "^2.6.0" open "^8.0.9" p-retry "^4.5.0" rimraf "^3.0.2" schema-utils "^4.0.0" - selfsigned "^2.0.1" + selfsigned "^2.1.1" serve-index "^1.9.1" sockjs "^0.3.24" spdy "^4.0.2" webpack-dev-middleware "^5.3.1" - ws "^8.4.2" + ws "^8.13.0" webpack-merge@^5.8.0: version "5.8.0" @@ -11252,9 +9187,9 @@ webpack-sources@^3.2.2, webpack-sources@^3.2.3: integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== webpack@^5.73.0: - version "5.74.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980" - integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA== + version "5.76.3" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.3.tgz#dffdc72c8950e5b032fddad9c4452e7787d2f489" + integrity sha512-18Qv7uGPU8b2vqGeEEObnfICyw2g39CHlDEK4I7NK13LOur1d0HGmGNKGT58Eluwddpn3oEejwvBPoP4M7/KSA== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^0.0.51" @@ -11308,33 +9243,22 @@ websocket-extensions@>=0.1.1: whatwg-url@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== dependencies: tr46 "~0.0.3" webidl-conversions "^3.0.0" -which-boxed-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" - integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== - dependencies: - is-bigint "^1.0.1" - is-boolean-object "^1.1.0" - is-number-object "^1.0.4" - is-string "^1.0.5" - is-symbol "^1.0.3" - which-typed-array@^1.1.2: - version "1.1.6" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.6.tgz#f3713d801da0720a7f26f50c596980a9f5c8b383" - integrity sha512-DdY984dGD5sQ7Tf+x1CkXzdg85b9uEel6nr4UkFg1LoE9OXv3uRuZhe5CoWdawhGACeFpEZXH8fFLQnDhbpm/Q== + version "1.1.9" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6" + integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA== dependencies: - available-typed-arrays "^1.0.4" + available-typed-arrays "^1.0.5" call-bind "^1.0.2" - es-abstract "^1.18.5" - foreach "^2.0.5" + for-each "^0.3.3" + gopd "^1.0.1" has-tostringtag "^1.0.0" - is-typed-array "^1.1.6" + is-typed-array "^1.1.10" which@^1.3.1: version "1.3.1" @@ -11379,9 +9303,9 @@ wrap-ansi@^7.0.0: strip-ansi "^6.0.0" wrap-ansi@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.0.1.tgz#2101e861777fec527d0ea90c57c6b03aac56a5b3" - integrity sha512-QFF+ufAqhoYHvoHdajT/Po7KoXVBPXS2bgjIam5isfWJPfIOnQZ50JtUiVvCv/sjgacf3yRrt2ZKUZ/V4itN4g== + version "8.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" + integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ== dependencies: ansi-styles "^6.1.0" string-width "^5.0.1" @@ -11390,7 +9314,7 @@ wrap-ansi@^8.0.1: wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== write-file-atomic@^3.0.0: version "3.0.3" @@ -11403,14 +9327,14 @@ write-file-atomic@^3.0.0: typedarray-to-buffer "^3.1.5" ws@^7.3.1: - version "7.5.7" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67" - integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== + version "7.5.9" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" + integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== -ws@^8.4.2: - version "8.7.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.7.0.tgz#eaf9d874b433aa00c0e0d8752532444875db3957" - integrity sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg== +ws@^8.13.0: + version "8.13.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" + integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== xdg-basedir@^4.0.0: version "4.0.0" @@ -11429,6 +9353,11 @@ xtend@^4.0.0, xtend@^4.0.1: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== +yallist@^3.0.2: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" + integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== + yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" @@ -11450,6 +9379,6 @@ zwitch@^1.0.0: integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw== zwitch@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.2.tgz#91f8d0e901ffa3d66599756dde7f57b17c95dce1" - integrity sha512-JZxotl7SxAJH0j7dN4pxsTV6ZLXoLdGME+PsjkL/DaBrVryK9kTGq06GfKrwcSOqypP+fdXGoCHE36b99fWVoA== + version "2.0.4" + resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.4.tgz#c827d4b0acb76fc3e685a4c6ec2902d51070e9d7" + integrity sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A== From 256ea10af96300d912c0d29df5c27ead8efdd91a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 24 Mar 2023 16:28:50 -0700 Subject: [PATCH 5853/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/e70ac1c9496fd36cff8ed99492b49b3efacb6281 https://github.com/facebook/litho/commit/3723e82b5b541f2669480c93d491a58b2b8446ba https://github.com/facebook/proxygen/commit/5da4f531d602ad342237b88317c3dd0208418a42 https://github.com/facebook/watchman/commit/3bf12050c2c23340d0c31c96235547d9d344b8bd https://github.com/facebookincubator/katran/commit/4954e3b99c129d2919a4706bdabad7641efa1d01 https://github.com/facebookincubator/mvfst/commit/44cc8f26c1e5b5a404dd0eb0565bc4d0ba154c43 https://github.com/facebookincubator/velox/commit/2b4d44b5498006d14eae69538a8e4582d4ed1a1e Reviewed By: bigfootjon fbshipit-source-id: 83a201fcecd9dfa0b06a5216d2575e10b04ef965 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 64d842c3344f..2fe70c8a79de 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bbae00269845b7cc7cebe8ff454e625aa30f63ba +Subproject commit e70ac1c9496fd36cff8ed99492b49b3efacb6281 From 52ed0175ce4c531bbb05ce03da684cd271653aac Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 24 Mar 2023 19:08:15 -0700 Subject: [PATCH 5854/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/6442718611f3c62c224ffd4e7058ee06370aebbd https://github.com/facebookincubator/fizz/commit/109be99e41b78628cd1c83fe491d8db024bf5e73 Reviewed By: bigfootjon fbshipit-source-id: 9c75f0e170a10e2b6cf1913b407f117f1f4091e5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2fe70c8a79de..456e72272864 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e70ac1c9496fd36cff8ed99492b49b3efacb6281 +Subproject commit 6442718611f3c62c224ffd4e7058ee06370aebbd diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7a061d59f969..b8ac78505d2d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0571e96ee0cfee36748406d3018b23492f55903b +Subproject commit f5d6dc8549413ea88025c35652974367f518f8ca From 7a4f4727fa39e79dd16de4e6ec376ec0b8342d5d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 25 Mar 2023 02:34:46 -0700 Subject: [PATCH 5855/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/994f0348bbd8c82e38bb67a78baaa45a0cb199f7 Reviewed By: bigfootjon fbshipit-source-id: 01abf3db93696b710e939cb158f0ff44720e108a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 456e72272864..bd02fff2f4a4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6442718611f3c62c224ffd4e7058ee06370aebbd +Subproject commit 994f0348bbd8c82e38bb67a78baaa45a0cb199f7 From 2b45b24f18b342cdc6d70c84980d31987fdbcc64 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 25 Mar 2023 18:03:33 -0700 Subject: [PATCH 5856/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5763f9609bd531166e425ff33903cbbd4c775deb Reviewed By: bigfootjon fbshipit-source-id: 56d3adc9df6b8e900d00622b5a7c08fe75d6c6a5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bd02fff2f4a4..5cdcdc01d277 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 994f0348bbd8c82e38bb67a78baaa45a0cb199f7 +Subproject commit 5763f9609bd531166e425ff33903cbbd4c775deb diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b8ac78505d2d..163a1e62b5ad 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f5d6dc8549413ea88025c35652974367f518f8ca +Subproject commit 3f3673fd4696c8e4772b711facc39f65f98cd1ed From 55b0403a3095cf7b16121915d6557e2a1384f6b0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 26 Mar 2023 21:47:47 -0700 Subject: [PATCH 5857/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/48771f2cb12529fdfb1f8765f4376b5a589bf4cc Reviewed By: bigfootjon fbshipit-source-id: 9c68f2e95e7b8007941238d42a6714682c5e4d68 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5cdcdc01d277..1fbb301cd909 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5763f9609bd531166e425ff33903cbbd4c775deb +Subproject commit 48771f2cb12529fdfb1f8765f4376b5a589bf4cc From 9b50e86cfea56fd753c86cefa37604f0e3527f09 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 27 Mar 2023 09:20:01 -0700 Subject: [PATCH 5858/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/13395377edeed6ff55c0d378ea879ae0a6dde437 Reviewed By: bigfootjon fbshipit-source-id: 4a654daca8a9b00ce4010b65d374fa9f5eb8f23f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1fbb301cd909..8692215bd9d4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 48771f2cb12529fdfb1f8765f4376b5a589bf4cc +Subproject commit 13395377edeed6ff55c0d378ea879ae0a6dde437 From db7f6a2f0a3ec4460f280ed4eb48908601cfa7f6 Mon Sep 17 00:00:00 2001 From: "Zeyi (Rice) Fan" Date: Mon, 27 Mar 2023 09:33:16 -0700 Subject: [PATCH 5859/7387] fix logo link in readme Summary: I broke the logo link when updated the website. This fixes it. Reviewed By: genevievehelsel Differential Revision: D44390781 fbshipit-source-id: b267403f87a89a5c3f04a823f0c9913058e663c1 --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index 78a3ccc17104..4845cbcd3fc9 100644 --- a/README.markdown +++ b/README.markdown @@ -1,5 +1,5 @@
- watchman-logo + watchman-logo

Watchman

A file watching service.

From 51f581516313fffe86dccd17b5681b8ae47c6fc0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 27 Mar 2023 11:20:54 -0700 Subject: [PATCH 5860/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/9eafb5b479d039908d77b57c7bbc65719de6445f https://github.com/facebookincubator/velox/commit/9d0e079308874b1bbb38b8fd6ebe84a8e939a342 Reviewed By: jailby fbshipit-source-id: cccae608f28b2772d1c8d9d9c5df16c55972fd7d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8692215bd9d4..f87fac9d131f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 13395377edeed6ff55c0d378ea879ae0a6dde437 +Subproject commit 9eafb5b479d039908d77b57c7bbc65719de6445f From 890aeba172e24cba7907f77f518d1a9ad18d51c1 Mon Sep 17 00:00:00 2001 From: Muir Manders Date: Mon, 27 Mar 2023 11:54:35 -0700 Subject: [PATCH 5861/7387] status: show watchman crawl progress bar in rust Summary: While we are waiting for watchman to crawl the repo, call "debug-root-status" and pipe the file count into a progress bar. The similar Python logic renders the "crawling" progress bar until the crawl is done and then proceeds with the query. In Rust I made it render the progress bar concurrently with the query. This should show the progress bar even if the repo has never been watched before (i.e. when there is no crawl until the query happens). Reviewed By: quark-zju Differential Revision: D44033615 fbshipit-source-id: 3c97fa7a63cd090b5ace82d7385f887e564eb9cf --- watchman/rust/watchman_client/src/lib.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/watchman/rust/watchman_client/src/lib.rs b/watchman/rust/watchman_client/src/lib.rs index e00e2a57bd41..a68228d9a507 100644 --- a/watchman/rust/watchman_client/src/lib.rs +++ b/watchman/rust/watchman_client/src/lib.rs @@ -351,6 +351,11 @@ impl CanonicalPath { fn strip_unc_escape(path: PathBuf) -> PathBuf { path } + + /// Consume self yielding the canonicalized PathBuf. + pub fn into_path_buf(self) -> PathBuf { + self.0 + } } /// Data that describes a watched filesystem location. From 272270ab273a38d1156848ea9707103c7c940e32 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 27 Mar 2023 12:20:57 -0700 Subject: [PATCH 5862/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/9bd2c41430600d63fda73851d728e018763e58fe https://github.com/facebook/watchman/commit/51f581516313fffe86dccd17b5681b8ae47c6fc0 https://github.com/facebookincubator/mvfst/commit/23eaf463c737b876aef7741a353b176a08717401 Reviewed By: jailby fbshipit-source-id: d2b3fd75019dc3c34e5a918538c8201d331a9ff6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f87fac9d131f..f86d73652bf0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9eafb5b479d039908d77b57c7bbc65719de6445f +Subproject commit 9bd2c41430600d63fda73851d728e018763e58fe From 429fdbdc6345d7389ddd24b669c167e7efb8fac1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 27 Mar 2023 23:21:19 -0700 Subject: [PATCH 5863/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/150394350316b1201e66b8c2dfdd9383afdc81da https://github.com/facebook/fb303/commit/fb0fd51541670370d2b34db555ab227efbebfb6a https://github.com/facebook/folly/commit/9d72edd62970ae6b933b32ac5e5d084450b08e70 https://github.com/facebook/proxygen/commit/e279d0b3b56a3c19dae0d50032c58a98b52450e7 https://github.com/facebookexperimental/rust-shed/commit/30f4573e9698e9db50deb7ed7552ac1431b9741e https://github.com/facebookincubator/fizz/commit/0d309d345c93f9e9c5bb5d9513f65e1f417b5c72 https://github.com/facebookincubator/mvfst/commit/d7207398b1c792cc1fc964c0b3b9ba5fc18b7f5e Reviewed By: jailby fbshipit-source-id: ffacf0e7c84e19882c74439e7ff3d6fc48c8ec36 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f86d73652bf0..81f768fa75c7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9bd2c41430600d63fda73851d728e018763e58fe +Subproject commit 53fffa9bf98364e50dd04593be72cd9c29b37955 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ea39bb87f820..6774017fda7a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 77e08c29d9f3b60b55dd74c1ceede35a8297e586 +Subproject commit 9d72edd62970ae6b933b32ac5e5d084450b08e70 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 163a1e62b5ad..747f9157e201 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3f3673fd4696c8e4772b711facc39f65f98cd1ed +Subproject commit 2ee1978ac4282fb679eec8b39fcef15071caa3c3 From 43ed48ac18131c275d87e10d8e5fb1c03e5f20bb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 28 Mar 2023 07:28:38 -0700 Subject: [PATCH 5864/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/3f0f544ba4b6743836e4d30a0af848b1218f0bcb https://github.com/facebook/litho/commit/f520cbcb0b4f7d8dec5bee6afaed85342be0baf0 Reviewed By: jailby fbshipit-source-id: fc28e29359c881837194fec94ccd8af940e80ae3 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6774017fda7a..3aa693cf3978 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9d72edd62970ae6b933b32ac5e5d084450b08e70 +Subproject commit 3f0f544ba4b6743836e4d30a0af848b1218f0bcb From 1967ee0b4e8d3a3f7e5e3c911e56835e668992c1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 28 Mar 2023 08:18:40 -0700 Subject: [PATCH 5865/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7ab0a877d94a75b92c9dabbcf6ac1002a9f012b9 https://github.com/facebook/proxygen/commit/22104db7374844d28af446e1429994ca4ad63862 https://github.com/facebook/watchman/commit/43ed48ac18131c275d87e10d8e5fb1c03e5f20bb https://github.com/facebookincubator/katran/commit/926b507cdf5e07083bc0b2d03c9e9cefa2661729 https://github.com/facebookincubator/velox/commit/3159ba91de55af0dabdb724130a5461049fbb6f6 Reviewed By: jailby fbshipit-source-id: 25e30991c7cb2da16ff3966627ff5a7fc182a553 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 81f768fa75c7..d42824c5bac9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 53fffa9bf98364e50dd04593be72cd9c29b37955 +Subproject commit 7ab0a877d94a75b92c9dabbcf6ac1002a9f012b9 From 5130e15a8004b67687ddf695d69ddd114ed915c0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 28 Mar 2023 11:59:09 -0700 Subject: [PATCH 5866/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/737cfa05e81e552597ca6e295949b2236aa30c44 https://github.com/facebookincubator/mvfst/commit/24e04e1e6412f6d9b39b4aff5961bfe1ada6f06d https://github.com/facebookincubator/velox/commit/55daa3e5de0ebadd52686ba898686e065c8bbaa8 https://github.com/fairinternal/egohowto/commit/f8b18701f1c9f1d18dfc7dbcfbd3a9f2ee0c815d Reviewed By: jailby fbshipit-source-id: e801db60548241573e35446c8676039a893752a9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d42824c5bac9..2b6fc8269083 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7ab0a877d94a75b92c9dabbcf6ac1002a9f012b9 +Subproject commit 737cfa05e81e552597ca6e295949b2236aa30c44 From 4f7171edf433eecb75835b20938355b9e8ccc9ba Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 28 Mar 2023 17:10:00 -0700 Subject: [PATCH 5867/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/0019303f7a2657491574ffe4970ee4184b84c89f https://github.com/facebook/proxygen/commit/0885cd826035e1f943c4eab259ca0bb66b9a0a94 https://github.com/facebookincubator/mvfst/commit/e56d4bd7f655637494826d4ace26d96f9d84f39c https://github.com/facebookincubator/velox/commit/6ac95adf0ffba81d94fabb0b46e283016f567c76 https://github.com/pytorch/fbgemm/commit/dde6d13814a8323fd690af3d42842c53f3acd862 Reviewed By: jailby fbshipit-source-id: 562a94d2601f69332c58442c4c5b9136093dd105 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2b6fc8269083..580f8cbf134b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 737cfa05e81e552597ca6e295949b2236aa30c44 +Subproject commit 0019303f7a2657491574ffe4970ee4184b84c89f From bd7d98919124b65f48b124a2e377e40a2a320792 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 28 Mar 2023 19:19:24 -0700 Subject: [PATCH 5868/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/1fca7fb4825d2b9230f9b07ead6c73742b7895ad Reviewed By: jailby fbshipit-source-id: d975b2ef9477acba20571c3df81be44f057e7b29 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 580f8cbf134b..db60f9864d25 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0019303f7a2657491574ffe4970ee4184b84c89f +Subproject commit 1fca7fb4825d2b9230f9b07ead6c73742b7895ad From 0eacb07676134c54f4a7e556c78dbc045dd22ffa Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 28 Mar 2023 23:06:39 -0700 Subject: [PATCH 5869/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/2f648971bfc17df7ebc610e1592c9044fca126dc https://github.com/pytorch/fbgemm/commit/a49926789619fbb864ecf49f4e3a9e81315149c3 Reviewed By: jailby fbshipit-source-id: fb6e55551d4a21f1e39b4251f8e85227b591c975 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index db60f9864d25..e0f33d76b1cc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1fca7fb4825d2b9230f9b07ead6c73742b7895ad +Subproject commit 2f648971bfc17df7ebc610e1592c9044fca126dc diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 747f9157e201..61a2000da908 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2ee1978ac4282fb679eec8b39fcef15071caa3c3 +Subproject commit 5164a47234d6823c1875e2257f064a8a0e9fa05b From 2c485e825275d14a3b3f16315f22eb3215acff7a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 29 Mar 2023 01:15:13 -0700 Subject: [PATCH 5870/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/c8e72460d8d9f493ced297fe4ff18595356fd095 https://github.com/facebook/proxygen/commit/559032efef058989b7c5c2e94b21c769b773752d https://github.com/facebookincubator/mvfst/commit/85af36295abfb32de619d3aadb3da0482e4a376c Reviewed By: jailby fbshipit-source-id: e14adc5317a925cf49d196c5658d5da3ef2a1e46 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e0f33d76b1cc..6014ea95d937 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2f648971bfc17df7ebc610e1592c9044fca126dc +Subproject commit c8e72460d8d9f493ced297fe4ff18595356fd095 From 361760fc1213e1bdd791c196ac2837c9b3543542 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 29 Mar 2023 09:56:00 -0700 Subject: [PATCH 5871/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5231fdbced65b102aa909048210501765b7c34ec https://github.com/facebook/proxygen/commit/526d17676449c510644d065a17664385832ed535 Reviewed By: jailby fbshipit-source-id: b20f791d9944b4492231688dcdc805cbae435379 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6014ea95d937..2d3034db1a00 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c8e72460d8d9f493ced297fe4ff18595356fd095 +Subproject commit 5231fdbced65b102aa909048210501765b7c34ec diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 61a2000da908..8f1edfc6f325 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5164a47234d6823c1875e2257f064a8a0e9fa05b +Subproject commit 8284ac3453ed5ba9c78b856cfac7a374acf32a0e From 2e44032f86d3af54d6aef65fe680a8c7c2636e3d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 29 Mar 2023 11:57:29 -0700 Subject: [PATCH 5872/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/ef080b38796981410965193920960f439a3bce2a https://github.com/facebook/proxygen/commit/a2d125b0707b3c039d6190ede9a138189e98ba6c Reviewed By: jailby fbshipit-source-id: 1b820a1e3c85011c2b6f535caca237a74ec69568 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2d3034db1a00..96090d68fb2d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5231fdbced65b102aa909048210501765b7c34ec +Subproject commit ef080b38796981410965193920960f439a3bce2a From d7f568c4879dd8263ecc85ec3c63126bc18e1c5f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 29 Mar 2023 12:51:22 -0700 Subject: [PATCH 5873/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/9103a54cf047f7065dda1427b1cec79e366ae912 https://github.com/facebook/fbthrift/commit/e1668559d04935b24725528f34142c71f6d05222 https://github.com/facebook/watchman/commit/2e44032f86d3af54d6aef65fe680a8c7c2636e3d Reviewed By: jailby fbshipit-source-id: 1ba2a3866fda5e3d60e6818f61e19f5b2a8e7d0e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 96090d68fb2d..35a4d142f746 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ef080b38796981410965193920960f439a3bce2a +Subproject commit e1668559d04935b24725528f34142c71f6d05222 From 2fc3dbac1818de069918621774ea49e13d4eee90 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 29 Mar 2023 14:55:53 -0700 Subject: [PATCH 5874/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/6b2d7a9eba2871cc7f28ccf3e84bdd8b673a62b4 Reviewed By: jailby fbshipit-source-id: 3ccc40b3a1956cde45388e7e0ffad5d6196c517b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 35a4d142f746..868e02f96b05 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e1668559d04935b24725528f34142c71f6d05222 +Subproject commit 6b2d7a9eba2871cc7f28ccf3e84bdd8b673a62b4 From ac96cfa30c6c4d737959e52e3a1fcff5b8355b7e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 29 Mar 2023 18:00:38 -0700 Subject: [PATCH 5875/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/62883cb4ac2451e0b1bf440140dee0e6fc2f0f98 https://github.com/facebook/proxygen/commit/2a5121d155058d665da6eb09f712d585bcd9664e https://github.com/facebookexperimental/edencommon/commit/2a916bbe111f2fe679190276c3cbb58b1ad2b8b1 https://github.com/facebookincubator/fizz/commit/d17e5d6d5f0ea59707ec5445b0c6b38e3dc68e6f https://github.com/facebookincubator/katran/commit/bf66ac947bf600eb268c23ebc83f07cdd15b0cea https://github.com/facebookincubator/velox/commit/ae011a9c37f8c2566a3164b89a2accf2ebc4153a Reviewed By: jailby fbshipit-source-id: 2dd0841fb5e9bb1761149adf48452129ae2e2391 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 868e02f96b05..a7461ab9f2f0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6b2d7a9eba2871cc7f28ccf3e84bdd8b673a62b4 +Subproject commit 62883cb4ac2451e0b1bf440140dee0e6fc2f0f98 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 3aa693cf3978..afb4bc996aaf 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 3f0f544ba4b6743836e4d30a0af848b1218f0bcb +Subproject commit 9b2984feea5833dc21ff7dd643a8510a193ba652 From 4acafc8c7ea7c2c9284ad48f5fc644719f91401f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 29 Mar 2023 19:03:50 -0700 Subject: [PATCH 5876/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/2b35a132ad838dbdd0034e32e14d2de59ea18f68 https://github.com/facebookincubator/mvfst/commit/da5dbe43a3b000cb1441ef87d04ca7443206da8d Reviewed By: jailby fbshipit-source-id: b58d35a1a400a345284ae9d7974f7cb502ccd2d5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a7461ab9f2f0..538be8010bcc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 62883cb4ac2451e0b1bf440140dee0e6fc2f0f98 +Subproject commit 2b35a132ad838dbdd0034e32e14d2de59ea18f68 From 7101ae187af8503b02506c84a7d02e6f4556b39b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 30 Mar 2023 09:00:21 -0700 Subject: [PATCH 5877/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/fec054e3d00f3f2a5ac686c355a0a837e2bdc296 https://github.com/facebookincubator/velox/commit/dca89230cd8dd3e9d54a7785da984763afe1c5fc Reviewed By: yns88 fbshipit-source-id: 53ede0c008a100e1a6dca67870961454c6c4081a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 538be8010bcc..a1f17f34b1d2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2b35a132ad838dbdd0034e32e14d2de59ea18f68 +Subproject commit fec054e3d00f3f2a5ac686c355a0a837e2bdc296 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8f1edfc6f325..d02b25ee51ce 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8284ac3453ed5ba9c78b856cfac7a374acf32a0e +Subproject commit 6f9adcbae804cbafd671c2fe602d5bb1e7447b0b From afefa9918d68de65d23eda3ed0c051e7ae9bca01 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 30 Mar 2023 12:14:04 -0700 Subject: [PATCH 5878/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/63435b9f41a72ba03b41dcbd68187315df256851 https://github.com/facebook/fbthrift/commit/8a6fda180c9a5572865d4486eb54a23a9616240a https://github.com/facebookincubator/mvfst/commit/9a6f47a1d739cb9646cd299a96453eb2e4ecfeab https://github.com/facebookincubator/velox/commit/b09f6ec6d48b11be53da96d216f73715ac5c26ab Reviewed By: yns88 fbshipit-source-id: cae5a6c9cdece4cee8940e495211e0ff560c7453 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a1f17f34b1d2..2063bd9e68c1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit fec054e3d00f3f2a5ac686c355a0a837e2bdc296 +Subproject commit 8a6fda180c9a5572865d4486eb54a23a9616240a From 3c04213118f9aceb91a9e54e6ab96bbd371e384c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 30 Mar 2023 14:19:49 -0700 Subject: [PATCH 5879/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/6a3a9801d4c1d4c9c793d6cddf8c2ed1a7612a27 Reviewed By: yns88 fbshipit-source-id: 27f295c5b8113c61f27e15caaa8806aaf0430703 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2063bd9e68c1..2c5c0a837764 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8a6fda180c9a5572865d4486eb54a23a9616240a +Subproject commit 6a3a9801d4c1d4c9c793d6cddf8c2ed1a7612a27 From d48edc62d9a0a44e4132aeedbecbbb7ab58ee7e6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 30 Mar 2023 15:17:19 -0700 Subject: [PATCH 5880/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/33a57fc1dd0e5b4fcad29fd98844af1ba47a0e3e Reviewed By: yns88 fbshipit-source-id: a8cc153a7b8c1491ae264b42e4d1aaf6d637aefe --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2c5c0a837764..7caa30f5062f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6a3a9801d4c1d4c9c793d6cddf8c2ed1a7612a27 +Subproject commit 33a57fc1dd0e5b4fcad29fd98844af1ba47a0e3e From 0e8de2079e3b81f3fe4159f87b7b8351c3590e2f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 30 Mar 2023 16:45:55 -0700 Subject: [PATCH 5881/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/700a4415bd8e6f95afead69f998cf619046c2b06 https://github.com/facebook/mcrouter/commit/74a59d6bea873e986cda3069e575ef258faa104a https://github.com/facebook/proxygen/commit/e9514c86b22d988cb57440f94f215c6f39502761 https://github.com/facebook/watchman/commit/d48edc62d9a0a44e4132aeedbecbbb7ab58ee7e6 https://github.com/facebookincubator/velox/commit/15cc3435cde7bd2a215678a0ebf8848e5daf0b32 Reviewed By: yns88 fbshipit-source-id: 36a3a1bb0da1d44c5a40a5b9ac1dd2a0a8cf3ad5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7caa30f5062f..822c6af84172 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 33a57fc1dd0e5b4fcad29fd98844af1ba47a0e3e +Subproject commit 700a4415bd8e6f95afead69f998cf619046c2b06 From 740683c133f55d61172e237ca2258b0dc3819c07 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 30 Mar 2023 17:41:45 -0700 Subject: [PATCH 5882/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/4f917bbd45037d418992b54b72fc7cb17f5d331e https://github.com/facebook/fbthrift/commit/20f688092b7894fa11900ed83229946921e45493 Reviewed By: yns88 fbshipit-source-id: 5dadffab21249c5127017a925842cddeb4a508be --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 822c6af84172..a6f490348b05 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 700a4415bd8e6f95afead69f998cf619046c2b06 +Subproject commit 20f688092b7894fa11900ed83229946921e45493 From 08c2bbde9f9bef633ebee055ab1e97ddfa69359c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 30 Mar 2023 18:37:15 -0700 Subject: [PATCH 5883/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/cf802142eb2c36234726c2d7d288e50115ebfd36 https://github.com/facebook/watchman/commit/740683c133f55d61172e237ca2258b0dc3819c07 Reviewed By: yns88 fbshipit-source-id: bd62af2e6fafc2355ee789ca3e1316f7b7b24c8a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a6f490348b05..69a440e414e8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 20f688092b7894fa11900ed83229946921e45493 +Subproject commit cf802142eb2c36234726c2d7d288e50115ebfd36 From 7aa562b9a6a00a6a4d4571de70577bf144f4ddbf Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 31 Mar 2023 13:00:39 -0700 Subject: [PATCH 5884/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/3f8e0be77b327f6e9bf6f51378f6b7d03195348a https://github.com/facebookincubator/velox/commit/6208b4ee3972fddb83eed68b350b6a96c21467e7 Reviewed By: yns88 fbshipit-source-id: 5c4570920e3ee7d6cd89994bdb90802f3c04e7ab --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 69a440e414e8..5b53201ff182 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cf802142eb2c36234726c2d7d288e50115ebfd36 +Subproject commit 3f8e0be77b327f6e9bf6f51378f6b7d03195348a From 240f315031a0a88b3d1fa4c236ee9a9c0e28f9dd Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 31 Mar 2023 13:59:57 -0700 Subject: [PATCH 5885/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/28cfb1dc5077ee6b862b38734fd6729e234502e6 https://github.com/facebook/fbthrift/commit/bb45e17a679c53f5076b13a1985d012edf9c1f82 https://github.com/facebook/watchman/commit/7aa562b9a6a00a6a4d4571de70577bf144f4ddbf https://github.com/facebookexperimental/rust-shed/commit/47f504b7575226d036797821988dce9050b25d06 https://github.com/facebookincubator/velox/commit/58a8e261a6c06746d54dea333ff8b99d88b1cc5c Reviewed By: yns88 fbshipit-source-id: e56b09ecacd3bb3a4a8e7a16148faf44d5b0a437 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5b53201ff182..91e3b96e2fe7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3f8e0be77b327f6e9bf6f51378f6b7d03195348a +Subproject commit bb45e17a679c53f5076b13a1985d012edf9c1f82 From b4893818429c373cfe934edf43222b94cd428fe4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 31 Mar 2023 15:49:56 -0700 Subject: [PATCH 5886/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/37294eccc03e6a1a17bf48d1a287a85a408a8c10 https://github.com/facebookexperimental/rust-shed/commit/9731593f059e77b4cfa1a67f95aebb0f9cb785a7 https://github.com/facebookincubator/velox/commit/59910bf5a4066da930a647ab8b2f06305151ad63 Reviewed By: yns88 fbshipit-source-id: b2168aa1e7ae12e24a1cb581cbb0e5b5ee9b5819 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 91e3b96e2fe7..d79b41bb70c0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bb45e17a679c53f5076b13a1985d012edf9c1f82 +Subproject commit 37294eccc03e6a1a17bf48d1a287a85a408a8c10 From 6a0f2d6f3aea360f66d00d5b0ace0508c9e953d2 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 31 Mar 2023 16:53:56 -0700 Subject: [PATCH 5887/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/dd5a1fd592b97b025d76a4ea9463c07c772dc234 https://github.com/facebook/fbthrift/commit/8753965af395decbdd32a52bd8b322910b6c08f7 https://github.com/facebook/folly/commit/9c370dd40fe9c2e7739380f7ed1df5f0f6eb4b48 https://github.com/facebook/watchman/commit/b4893818429c373cfe934edf43222b94cd428fe4 https://github.com/facebookexperimental/rust-shed/commit/190dd7e0b24f181411584921a141434fa778df70 Reviewed By: yns88 fbshipit-source-id: 055b5492640e0c0972ee1402676a6d2ce0237bb2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d79b41bb70c0..caf499806752 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 37294eccc03e6a1a17bf48d1a287a85a408a8c10 +Subproject commit 8753965af395decbdd32a52bd8b322910b6c08f7 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index afb4bc996aaf..a95ff125ddb4 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9b2984feea5833dc21ff7dd643a8510a193ba652 +Subproject commit 9c370dd40fe9c2e7739380f7ed1df5f0f6eb4b48 From 47ad309b172e90540168ab0bd254f4f4966e99ee Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 31 Mar 2023 17:46:57 -0700 Subject: [PATCH 5888/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/ed363f3c012f8703ed6765a01c348e39dc78b002 https://github.com/facebook/proxygen/commit/6d4685bccc17a4aeebb39876a6c0cbfa916a17d0 https://github.com/facebook/wangle/commit/8ee592d5750b46c4a7cf4468be3afbaed16c2e3e https://github.com/facebookexperimental/edencommon/commit/e48bdebcc7ecc3e3ad90da686715d2f2141d4c6d https://github.com/facebookincubator/fizz/commit/96586696b2ea6d93582d0b1cdb5d69182b242742 https://github.com/facebookincubator/katran/commit/2988ae3090589a3c727fcc9db44666f95812f57c https://github.com/facebookincubator/mvfst/commit/315e1547e96ecf37b41b0ae5ed1163e4236fe81f https://github.com/facebookincubator/velox/commit/8884ae618af2d0e017cb7433506297251be2d30b Reviewed By: yns88 fbshipit-source-id: 9f97030b81157c2d5921062c3917dc97eb599ba9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index caf499806752..258ad8eef5ca 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8753965af395decbdd32a52bd8b322910b6c08f7 +Subproject commit ed363f3c012f8703ed6765a01c348e39dc78b002 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d02b25ee51ce..06bebd07f9e2 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6f9adcbae804cbafd671c2fe602d5bb1e7447b0b +Subproject commit 8ee592d5750b46c4a7cf4468be3afbaed16c2e3e From 8a536c389e9453a496f88e8036360b7a86ff4a5f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 1 Apr 2023 18:12:30 -0700 Subject: [PATCH 5889/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/wangle/commit/cb7b7d721acb5d26c7adb709fea713b8a5b8a735 https://github.com/facebookexperimental/edencommon/commit/a7d9a233bf9eb75a80f70cce41a7278d255a7298 https://github.com/facebookincubator/fizz/commit/fc2ac83bd90bdbc7183aee6d007286031e95ac01 https://github.com/facebookincubator/katran/commit/34e2f3c0065238cb723d0cd2ca401681407a5412 https://github.com/pytorch/fbgemm/commit/5ad0bf1d918c5bbe27248eb18c4b4147eef07cb3 Reviewed By: yns88 fbshipit-source-id: 2fd71b279482581e6e1a080ec0a9870123e39c07 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 258ad8eef5ca..15555688b496 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ed363f3c012f8703ed6765a01c348e39dc78b002 +Subproject commit d0d294343f0ac0e40a505f0819be83e60cf25604 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a95ff125ddb4..12356e6d7600 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9c370dd40fe9c2e7739380f7ed1df5f0f6eb4b48 +Subproject commit 40765225648a6937622d4c309da429e14542f321 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 06bebd07f9e2..78d65f2435e4 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8ee592d5750b46c4a7cf4468be3afbaed16c2e3e +Subproject commit cb7b7d721acb5d26c7adb709fea713b8a5b8a735 From 46f701ddb7eab9f8e63b29ddcd5dfd367fdaf699 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 2 Apr 2023 00:32:34 -0700 Subject: [PATCH 5890/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/wangle/commit/1382804596169372c095973b8c0c7d8a38096ac5 https://github.com/facebookexperimental/edencommon/commit/b692430a6709cc9765be33eb9c5753b8314a95c2 https://github.com/facebookincubator/fizz/commit/459b560771a0d67ae33e2a97dc670ec64a074f45 https://github.com/facebookincubator/katran/commit/82b93e348d218a85604d355769b3a1e22891ecf2 https://github.com/facebookincubator/velox/commit/7a2798d4bb0539522faca761d85644995583dd8e Reviewed By: yns88 fbshipit-source-id: bb78dc77a3b00b6a8a313b81d2081045fdcd6d5f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 15555688b496..8e7a9903fe58 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d0d294343f0ac0e40a505f0819be83e60cf25604 +Subproject commit eb2041cfd35e478d41c1c3fe3c20ab4763d8414b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 12356e6d7600..cf6c539536ac 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 40765225648a6937622d4c309da429e14542f321 +Subproject commit b8b3ed56ecd1aff05abe7c2e5085da40e9ffad5f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 78d65f2435e4..99a9093a2612 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit cb7b7d721acb5d26c7adb709fea713b8a5b8a735 +Subproject commit 1382804596169372c095973b8c0c7d8a38096ac5 From b8c7a3dda03007e824a9c13718f7da884b3522ac Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 2 Apr 2023 23:23:07 -0700 Subject: [PATCH 5891/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/ea52832e1283042b58262897c97527b8c2f4698f https://github.com/facebook/proxygen/commit/a080dfe9b4970b0fa432898de4b27796063e7408 https://github.com/facebook/wangle/commit/a153b33438e47b9fb1a8967d923ff72af24582f9 https://github.com/facebookincubator/katran/commit/c24fd07b1435e692461117966ce01d8465c21d49 Reviewed By: yns88 fbshipit-source-id: 9e77bc08070edf5c78c85e856c57defc3b19f454 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8e7a9903fe58..f1911cbeac9c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit eb2041cfd35e478d41c1c3fe3c20ab4763d8414b +Subproject commit ea52832e1283042b58262897c97527b8c2f4698f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 99a9093a2612..44e3fad5c385 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1382804596169372c095973b8c0c7d8a38096ac5 +Subproject commit a153b33438e47b9fb1a8967d923ff72af24582f9 From 89e87f381672d6aa81e88e1b49960c6f4319a735 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 3 Apr 2023 02:12:35 -0700 Subject: [PATCH 5892/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/cd36a5332be67e0465b02cfc3ceb196f07a05696 https://github.com/facebook/watchman/commit/b8c7a3dda03007e824a9c13718f7da884b3522ac Reviewed By: yns88 fbshipit-source-id: a1ce2257a8630a9098f239ca49e294cf3dc6bce0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f1911cbeac9c..f0dffeb2b95e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ea52832e1283042b58262897c97527b8c2f4698f +Subproject commit cd36a5332be67e0465b02cfc3ceb196f07a05696 From c875359b1becc9980219377e7b416441af73269b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 3 Apr 2023 08:45:15 -0700 Subject: [PATCH 5893/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/59053eb8167b5dc4d6d4f9dc7dd273b73ed0daf8 Reviewed By: yns88 fbshipit-source-id: aea2de1893720da1b9b811c1fe00f3ad432fbfc5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f0dffeb2b95e..49a8bd244f7b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cd36a5332be67e0465b02cfc3ceb196f07a05696 +Subproject commit 59053eb8167b5dc4d6d4f9dc7dd273b73ed0daf8 From 9a4c7d2cf0312829517a78d876c27dbba0464777 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 3 Apr 2023 09:40:17 -0700 Subject: [PATCH 5894/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/f24408d62102008ddbab19e3dc49d517283a5c57 https://github.com/facebook/fb303/commit/f94200e0c20aa468df18bc4b87111fa1e31a72cb https://github.com/facebook/fbthrift/commit/37243b45012920e65255ee1de381ce6f1daca049 https://github.com/facebook/watchman/commit/c875359b1becc9980219377e7b416441af73269b https://github.com/facebookexperimental/rust-shed/commit/2308da6af899c9a165eca4a374222ef5a1342956 https://github.com/facebookresearch/vrs/commit/b14c3eeacc9314fb2d3dd11d6dbec0b113b50dfb Reviewed By: yns88 fbshipit-source-id: 9fc017f649e948fecee547f0afe1569a43dc03f1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 49a8bd244f7b..af2eb420adef 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 59053eb8167b5dc4d6d4f9dc7dd273b73ed0daf8 +Subproject commit 37243b45012920e65255ee1de381ce6f1daca049 From 593c8cfa1ac6930e6e4c990b04c2928aba63af8b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 3 Apr 2023 10:43:56 -0700 Subject: [PATCH 5895/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/e3d5fe9f25845f1d872971d0fb88aaa4efcb4343 https://github.com/facebook/fbthrift/commit/62c333519d7ee3a47f2d89daf5ae3b164b10560a https://github.com/facebookexperimental/rust-shed/commit/cf98c92130aed51c4d33045ee537474b84a0bacf https://github.com/facebookincubator/velox/commit/0e5889c0d2f048b6dee4e1b09590be1535cc43f7 Reviewed By: yns88 fbshipit-source-id: a4281211b976f5c65929bbc3bd0305225ecabd38 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index af2eb420adef..87885919dac7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 37243b45012920e65255ee1de381ce6f1daca049 +Subproject commit 62c333519d7ee3a47f2d89daf5ae3b164b10560a From a6a8e51082e95f61ceb676db88a8be7b8e62f709 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 3 Apr 2023 11:41:38 -0700 Subject: [PATCH 5896/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/db523157cbe7c88e6089db99d126ec2dd75b5873 https://github.com/facebook/fbthrift/commit/5e4fa809f23586bd2773c1aa7aa230a8959ec1ac https://github.com/facebook/rocksdb/commit/b4d78189b348144723264025ad549800a340e2ae https://github.com/facebook/watchman/commit/593c8cfa1ac6930e6e4c990b04c2928aba63af8b https://github.com/fairinternal/egohowto/commit/247c5a80174f425e3d3fb88d66551cf44aa12b37 Reviewed By: yns88 fbshipit-source-id: 827323ea1d7431542a7422dff176771b3af323fb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 87885919dac7..db3cbb633133 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 62c333519d7ee3a47f2d89daf5ae3b164b10560a +Subproject commit 5e4fa809f23586bd2773c1aa7aa230a8959ec1ac From 7688f2ba60e2e01a1fa09fd57afd9a8c3c618ad8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 3 Apr 2023 13:40:23 -0700 Subject: [PATCH 5897/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/55eb543f0e9c5cc407c604ab38b46806de4e2772 Reviewed By: yns88 fbshipit-source-id: 277e15fa8a6151ba4cb9c28eac3fbdab9a62b5e8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index db3cbb633133..0a7bfeb74aa5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5e4fa809f23586bd2773c1aa7aa230a8959ec1ac +Subproject commit 55eb543f0e9c5cc407c604ab38b46806de4e2772 From e588dc910287dfefc265a9e239550b7acbdc2498 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Mon, 3 Apr 2023 14:43:56 -0700 Subject: [PATCH 5898/7387] fix blake3 build on MSVC (#4447) Summary: X-link: https://github.com/facebookincubator/velox/pull/4447 CMake requires you use ASM_MASM on MSVC. Otherwise it attempts to pass the .asm files to cl.exe, which does not understand what to do with them. Also, the architecture is spelled AMD64 instead of x86_64 on Windows. Reviewed By: xavierd Differential Revision: D44484372 fbshipit-source-id: 539265ac737e388c646c04452932f788c55ce7ae --- build/fbcode_builder/patches/blake3_CMakeLists_txt.patch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/fbcode_builder/patches/blake3_CMakeLists_txt.patch b/build/fbcode_builder/patches/blake3_CMakeLists_txt.patch index 95d235f5de85..9b1c828fafe6 100644 --- a/build/fbcode_builder/patches/blake3_CMakeLists_txt.patch +++ b/build/fbcode_builder/patches/blake3_CMakeLists_txt.patch @@ -13,7 +13,7 @@ new file mode 100644 index 0000000..171554b --- /dev/null +++ b/CMakeLists.txt -@@ -0,0 +1,78 @@ +@@ -0,0 +1,81 @@ +cmake_minimum_required(VERSION 3.12) +cmake_policy(VERSION ${CMAKE_VERSION}) + @@ -40,13 +40,16 @@ index 0000000..171554b + blake3_dispatch.c + blake3_portable.c) + -+if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64) ++if((CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64) OR (CMAKE_SYSTEM_PROCESSOR STREQUAL AMD64)) + enable_language(ASM) + if(MSVC) ++ enable_language(ASM_MASM) + set(SUFFIX "windows_msvc.asm") + elseif(WIN32) ++ enable_language(ASM) + set(SUFFIX "windows_gnu.S") + else() ++ enable_language(ASM) + set(SUFFIX "unix.S") + endif() + target_sources(blake3 PRIVATE From c66278202e00a1aa87e28bcd8da59edd41532b42 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 3 Apr 2023 14:45:36 -0700 Subject: [PATCH 5899/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/4a11cb1b55e2b8871b7f52d34f7e8ac6d390a7d2 https://github.com/facebook/fbthrift/commit/b16fc97da0cf141af5f8b0177a12628ee7dde9b5 https://github.com/facebook/litho/commit/15d3cd3e2df39630c752a205eed32d73081db282 https://github.com/facebook/watchman/commit/7688f2ba60e2e01a1fa09fd57afd9a8c3c618ad8 https://github.com/facebookexperimental/rust-shed/commit/993c6a00a86aa3f6cdc47db740bb0ef352bf91ba https://github.com/facebookincubator/velox/commit/5d3d39e2c76fc459af9c63cc21601060af07f7b1 https://github.com/fairinternal/egohowto/commit/3dabfc45a2c28d3283d143bab05e32410109a88f Reviewed By: yns88 fbshipit-source-id: 0328e22d1773491b18a0160e7a90f8706fb17f77 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0a7bfeb74aa5..03608fcf3f6a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 55eb543f0e9c5cc407c604ab38b46806de4e2772 +Subproject commit b16fc97da0cf141af5f8b0177a12628ee7dde9b5 From 1feb29c8d7f0574752e26400568481d9dda8e706 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 3 Apr 2023 17:48:01 -0700 Subject: [PATCH 5900/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/44152a8419450f9194b1e2b52d2c86f44dbed0d7 https://github.com/facebook/fbthrift/commit/b846823f997483574ed5826e7a84f5c69f829ab2 https://github.com/facebook/folly/commit/62eeb799779cbc24b622ec8ce3501c7969d60bae https://github.com/facebook/litho/commit/4d4b0a892011e42b1bf2cfa0a1795eaa979e1516 https://github.com/pytorch/fbgemm/commit/0064f56a1f017c42ee0ba82be760896f61934235 Reviewed By: yns88 fbshipit-source-id: 40becad54c1c8a1959e421e3da08580ad5512036 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 03608fcf3f6a..d290b2d33d83 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b16fc97da0cf141af5f8b0177a12628ee7dde9b5 +Subproject commit b846823f997483574ed5826e7a84f5c69f829ab2 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index cf6c539536ac..3596843b7632 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b8b3ed56ecd1aff05abe7c2e5085da40e9ffad5f +Subproject commit 62eeb799779cbc24b622ec8ce3501c7969d60bae diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 44e3fad5c385..93bc59a2fa0b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a153b33438e47b9fb1a8967d923ff72af24582f9 +Subproject commit 7912f745b53c5a319bc4c1e5710a698d958be566 From 73a97900c648480eb0954d473b144da25decf89c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 4 Apr 2023 04:15:35 -0700 Subject: [PATCH 5901/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/31bbdac6bb133c3d6f2aec1d932d445722ba995b https://github.com/pytorch/fbgemm/commit/595adad0e9aba22a9e6af7f54eedb4ff4b381c4e Reviewed By: yns88 fbshipit-source-id: 43bf2bc7b0f17dc8347de763251e2715d1cec05e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d290b2d33d83..f6d506f1c35d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b846823f997483574ed5826e7a84f5c69f829ab2 +Subproject commit 31bbdac6bb133c3d6f2aec1d932d445722ba995b From 61917cd6c955fb5258b111b527ffe23e689c7b36 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 4 Apr 2023 07:11:30 -0700 Subject: [PATCH 5902/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/931db02070d6dd69eef4ecc741928513bb9250df Reviewed By: yns88 fbshipit-source-id: 2e759f61e377d37f18c5500fa7dbf8f684be2186 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f6d506f1c35d..f55750d6765e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 31bbdac6bb133c3d6f2aec1d932d445722ba995b +Subproject commit 931db02070d6dd69eef4ecc741928513bb9250df From c84b168d2365e3b2ef19faa1eb46ffb67f1f3898 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 4 Apr 2023 11:14:59 -0700 Subject: [PATCH 5903/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c8796233e5911c81f8939c5a51330e14048b8bed https://github.com/facebook/fbthrift/commit/3568e8fcd805738161ce22515985cf2574cc1e78 https://github.com/facebook/ocamlrep/commit/5f93ebf7f8a422b3a34160f75091022dee0b6c37 https://github.com/facebookexperimental/rust-shed/commit/342af3aa48013b76b99e682bdd3b0f545d858977 https://github.com/facebookincubator/mvfst/commit/97eefa8ad2bc07abb611118ebceaccd413f1c37d https://github.com/facebookincubator/velox/commit/1e66a40ca38c8701af8fe12fedf09cf2999d7351 https://github.com/facebookresearch/vrs/commit/86d714e44617cc80050088ba7a053a96ac457f28 https://github.com/fairinternal/egohowto/commit/89a9d283491d013adf820ae63404b16a11bcbbbe Reviewed By: yns88 fbshipit-source-id: 44fb3551231d74a38a64c3d9387b2f11304e50a4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f55750d6765e..b946d2645395 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 931db02070d6dd69eef4ecc741928513bb9250df +Subproject commit 3568e8fcd805738161ce22515985cf2574cc1e78 From 5f395733aaf95cc321e0af1a1887038204fad462 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 4 Apr 2023 13:32:03 -0700 Subject: [PATCH 5904/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/c72ca0779ecec5bc4430c799bfe9aeb24e1cb0cc https://github.com/facebookincubator/velox/commit/4d5dcd84ea365cedafdb39d2ce27f49acdb6f0de https://github.com/pytorch/kineto/commit/693be6169898eca0ed4105a6651151d53c28db8d Reviewed By: yns88 fbshipit-source-id: 15845a8ee24ce652572d7b2c78f446f69df850d1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b946d2645395..4a4b619d0d1d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3568e8fcd805738161ce22515985cf2574cc1e78 +Subproject commit 0da8979165cef31cdb2549a8470eb05d87f0fdc1 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 3596843b7632..16ecd583b5da 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 62eeb799779cbc24b622ec8ce3501c7969d60bae +Subproject commit c72ca0779ecec5bc4430c799bfe9aeb24e1cb0cc From c8d130500a20cb18426c5fc63a236b79e62d7e17 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 4 Apr 2023 14:35:48 -0700 Subject: [PATCH 5905/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/b9f2eee2653ba111f0084581c4bbf6e2890e933e https://github.com/facebook/litho/commit/4affc6f791dc27707b325caac8e39e82f65c88da https://github.com/facebook/proxygen/commit/df9dcbe2dcc227938de13ab0f112c83f76592496 https://github.com/facebook/wangle/commit/eec52a89472c17e1c50e2e012e9473004c70374d https://github.com/facebookexperimental/edencommon/commit/5f32b9744278c5d894a226c63773c1a868a425e8 https://github.com/facebookincubator/fizz/commit/067c1931149fcd14ba6252ec412a2d5e935ffce0 https://github.com/facebookincubator/katran/commit/d1ac4c41a82509946700a46d491fda46ab48e313 https://github.com/facebookincubator/mvfst/commit/7a8cddeb76d2b5e65299885e0f127ae508541090 https://github.com/facebookincubator/velox/commit/3ba066d805b62b47c0802ce75a740d90b528aa9a https://github.com/pytorch/fbgemm/commit/3eaae909735840284beaa60450db2cf4ba962bd9 Reviewed By: yns88 fbshipit-source-id: 9193c2693badcf22c8a5d3ab455a9984f1d06bfb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4a4b619d0d1d..6def024e86f8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0da8979165cef31cdb2549a8470eb05d87f0fdc1 +Subproject commit b9f2eee2653ba111f0084581c4bbf6e2890e933e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 93bc59a2fa0b..474cb2d64273 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7912f745b53c5a319bc4c1e5710a698d958be566 +Subproject commit eec52a89472c17e1c50e2e012e9473004c70374d From 10c1a6a2a81a48b01adec5b54183fb191f59ee53 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 4 Apr 2023 15:35:34 -0700 Subject: [PATCH 5906/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c14f003c8c675752cb7581004a79c1bf809a13a2 https://github.com/facebook/fbthrift/commit/f28d2f1ceb9e25198a39c43cc4a25b6a60927ac3 https://github.com/facebook/watchman/commit/c8d130500a20cb18426c5fc63a236b79e62d7e17 https://github.com/facebookexperimental/rust-shed/commit/390821167065985e4aa740e656772d0da2f1c7a6 https://github.com/facebookincubator/velox/commit/99cd1302b470f0ede2068a04cf55ff19ea16dae8 https://github.com/facebookresearch/recipes/commit/b383caddca40905fb2f6307bb108416df6541760 Reviewed By: yns88 fbshipit-source-id: e0142435fc1d99f41f68ffc98d488dedaee30774 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6def024e86f8..232263565b77 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b9f2eee2653ba111f0084581c4bbf6e2890e933e +Subproject commit f28d2f1ceb9e25198a39c43cc4a25b6a60927ac3 From 8e8de6ec5306407a13439c55522107e5607c0df3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 4 Apr 2023 19:34:37 -0700 Subject: [PATCH 5907/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/aa8c07fe1d10ea3d7e09422be44ae0e6df25dc8b https://github.com/facebook/fb303/commit/7b0f1327f34e28091e7b452c883af7a35e1e6982 https://github.com/facebook/fbthrift/commit/951546a34e77aa29ae53914ccdb0914d3ba406be https://github.com/facebook/proxygen/commit/d2c8a746463b79656127abca577d19aa171b9aed https://github.com/facebookresearch/vrs/commit/be31a8d43ee7b37da892213b1b36f252e4c73cef Reviewed By: yns88 fbshipit-source-id: 93db5108f0f4c8914182794ed1e9f5fee626a683 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 232263565b77..7c8e0e0849d0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f28d2f1ceb9e25198a39c43cc4a25b6a60927ac3 +Subproject commit 951546a34e77aa29ae53914ccdb0914d3ba406be From 189240e685d6792bfddf01b0b0366d4061ca2b29 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 5 Apr 2023 11:45:46 -0700 Subject: [PATCH 5908/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/0aa79ccca1d1f3d20c3cd8a0a9ce44d08a8f1f63 https://github.com/facebookincubator/velox/commit/0ceaf98faf00717ee66ca75ca273b03f4a6a1034 https://github.com/pytorch/kineto/commit/90ffd1ddd242d01db27c75263d51fb89726e50c8 Reviewed By: yns88 fbshipit-source-id: 2f3f4f7a1904350756e1859a4169e153af714f18 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7c8e0e0849d0..cfddc13d5daf 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 951546a34e77aa29ae53914ccdb0914d3ba406be +Subproject commit 0aa79ccca1d1f3d20c3cd8a0a9ce44d08a8f1f63 From 56b55f8b2999cde8d59be75e4f2dced6cc587c86 Mon Sep 17 00:00:00 2001 From: Xavier Deguillard Date: Wed, 5 Apr 2023 12:24:50 -0700 Subject: [PATCH 5909/7387] service: remove "required" from eden.thrift Summary: This is deprecated and Thrift is warning about it, remove it. Reviewed By: fanzeyi Differential Revision: D44695237 fbshipit-source-id: 6f91f50574d2898d98cfb9c732c2d15e5789087a --- eden/fs/service/eden.thrift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index d1442f1b649a..e82a922452d8 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -123,7 +123,7 @@ enum EdenErrorType { } exception EdenError { - 1: required string message; + 1: string message; 2: optional i32 errorCode; 3: EdenErrorType errorType; } (message = 'message') From 7659a3d166693a3ef78295acc43dd1c44e064c34 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 5 Apr 2023 14:59:20 -0700 Subject: [PATCH 5910/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/19a1a4cc186359a3f76b47b31830938ea1daf301 https://github.com/facebook/wangle/commit/5539b5414b63f3eb1e69e7d39246443b1eaed345 https://github.com/facebookincubator/katran/commit/1dade5b103df71ab1b76db7ee9b73f400de7300e https://github.com/facebookincubator/mvfst/commit/abc7b682f5958d102764f8546fbb12bc23bbe5d5 https://github.com/facebookincubator/velox/commit/5f6ea3360d788653a6e80946a1c757d4c264c0c1 Reviewed By: yns88 fbshipit-source-id: 7a81b0f9740fa8ac37bc6374d6a7e846a795d85c --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 16ecd583b5da..1a9d4aac8e4d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c72ca0779ecec5bc4430c799bfe9aeb24e1cb0cc +Subproject commit 19a1a4cc186359a3f76b47b31830938ea1daf301 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 474cb2d64273..ee4e63a6ce48 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit eec52a89472c17e1c50e2e012e9473004c70374d +Subproject commit 5539b5414b63f3eb1e69e7d39246443b1eaed345 From 6a7d6e6bac9736377411f830c337b8827ce0e7fa Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 5 Apr 2023 15:49:21 -0700 Subject: [PATCH 5911/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/81cbdc16d3e4c81e10c581e6e076fa04a9200daa https://github.com/facebook/litho/commit/4bb4b4cab47bdeb9a7efd880b2cbea009ef524a4 https://github.com/facebook/proxygen/commit/2328a537c6064f7b01115fef1b8cba1177c54613 https://github.com/facebook/rocksdb/commit/7f5b9f40cb9a888447b7097cc5b834417d9fad66 https://github.com/facebook/watchman/commit/7659a3d166693a3ef78295acc43dd1c44e064c34 https://github.com/facebookexperimental/edencommon/commit/2f46ac2d86f11131417f63f4eb39f33a95db0944 https://github.com/facebookincubator/fizz/commit/a84dd45df90390f9fb690d9f50517f3bdc9e6324 https://github.com/facebookincubator/mvfst/commit/6bd49484f9044c24a9e1bab24099be5266c4006f https://github.com/facebookincubator/velox/commit/9fdb6dd23952b8a0f971586bab2b48dd0e1711f2 Reviewed By: yns88 fbshipit-source-id: e78a120bfd96da3bc5eb9c7c9c25f7fc1b21330a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cfddc13d5daf..63be6305458b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0aa79ccca1d1f3d20c3cd8a0a9ce44d08a8f1f63 +Subproject commit 81cbdc16d3e4c81e10c581e6e076fa04a9200daa From 953afc563aec2af018c5aeb33e2c9a202c41e2d6 Mon Sep 17 00:00:00 2001 From: Ekin Dursun Date: Wed, 5 Apr 2023 16:12:45 -0700 Subject: [PATCH 5912/7387] Remove always true check (#1128) Summary: `idx` is unsigned so it's always non-negative. This change removes a warning. Pull Request resolved: https://github.com/facebook/watchman/pull/1128 Reviewed By: chadaustin Differential Revision: D44725948 Pulled By: mshroyer fbshipit-source-id: 6f96a4bde7101c4cc7d3451ebd231b65a205ad43 --- watchman/thirdparty/libart/src/art-inl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/thirdparty/libart/src/art-inl.h b/watchman/thirdparty/libart/src/art-inl.h index 8d9689ec8533..f02b3da8616e 100644 --- a/watchman/thirdparty/libart/src/art-inl.h +++ b/watchman/thirdparty/libart/src/art-inl.h @@ -58,7 +58,7 @@ inline unsigned char art_tree::keyAt( #if !ART_SANITIZE_ADDRESS // If we were built with -fsanitize=address, let ASAN catch this, // otherwise, make sure we blow up if the input depth is out of bounds. - assert(idx >= 0 && idx <= key_len); + assert(idx <= key_len); #endif return key[idx]; } From 126b0cd383df08e806cc1b168e1b86a156ef5a1a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 5 Apr 2023 17:39:45 -0700 Subject: [PATCH 5913/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/91defeebcc355aab4b9f7cb7ed762c42a10c40ae https://github.com/facebook/rocksdb/commit/0623c5b903d1e2ffc6c7ed1e6419163985827ef2 https://github.com/facebook/watchman/commit/953afc563aec2af018c5aeb33e2c9a202c41e2d6 https://github.com/facebookincubator/velox/commit/9eaaa683c1e8e2082899a8720327f8e4d6ea7570 Reviewed By: yns88 fbshipit-source-id: 6084a07c7771b934527f850fc47675ab6113f0f1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 63be6305458b..4463ddd29b02 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 81cbdc16d3e4c81e10c581e6e076fa04a9200daa +Subproject commit 91defeebcc355aab4b9f7cb7ed762c42a10c40ae From 1eaeb38b9eac17f6f3004c8f2652df7478624056 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 6 Apr 2023 08:42:14 -0700 Subject: [PATCH 5914/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7a2710b9ec41e3f33f8e7e43d5c7d504aceeb1eb https://github.com/facebook/litho/commit/3b685c25e7e12e85c7a31e089985200c9322de3c Reviewed By: yns88 fbshipit-source-id: 1dc8270c71f93df49a11ce857d2c7d12ccfc7fee --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4463ddd29b02..057db5b9c071 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 91defeebcc355aab4b9f7cb7ed762c42a10c40ae +Subproject commit 7a2710b9ec41e3f33f8e7e43d5c7d504aceeb1eb diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 1a9d4aac8e4d..270888cc34f8 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 19a1a4cc186359a3f76b47b31830938ea1daf301 +Subproject commit 64a632c5bdfaa816cd24f416f6b45258aff53bc1 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ee4e63a6ce48..94f19231bf78 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5539b5414b63f3eb1e69e7d39246443b1eaed345 +Subproject commit 14cd3ade09ab0fa604e5a1484e095575647e7f70 From 0062dbd82c8b9e5b3c0bcd50a2a2798e0b425753 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 6 Apr 2023 10:41:05 -0700 Subject: [PATCH 5915/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/338f9f61a70c7e9351e983ae94dbe01080a7f627 https://github.com/facebookincubator/mvfst/commit/22468024cdd6a237286a0a0d18f81a763effadb2 Reviewed By: jailby fbshipit-source-id: 1f15f67c8de824ef20201bf21c00e7be2bbd3cad --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 270888cc34f8..43b4f020bff6 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 64a632c5bdfaa816cd24f416f6b45258aff53bc1 +Subproject commit 338f9f61a70c7e9351e983ae94dbe01080a7f627 From 28457d301a6546d637654357426bda8273802e5a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 6 Apr 2023 12:10:35 -0700 Subject: [PATCH 5916/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/ff5676e82348f7870a6d74eaede9e32e7b72bebe https://github.com/facebook/fbthrift/commit/ebfecdf78de625be0b1efd0e64dc3166d4b50684 https://github.com/facebook/litho/commit/e1e7e9db4bc30723fa7c2808a67194ff351bcdfa https://github.com/facebook/ocamlrep/commit/4a90b982f629ba427f28e31e9c5039e6d7c8f95f https://github.com/facebook/proxygen/commit/49787d79217618dd5dda71ddaac816dab066c38f https://github.com/facebook/rocksdb/commit/b3c43a5b999b1631f259c3f5b9a19c3606d9f5cf https://github.com/facebook/wangle/commit/6c65baf53c915e985b0929057dfe1c331ec13124 https://github.com/facebook/watchman/commit/0062dbd82c8b9e5b3c0bcd50a2a2798e0b425753 https://github.com/facebookincubator/fizz/commit/aa4744ad1d96a589e154d59301acf55e31364fa4 https://github.com/facebookincubator/katran/commit/a432e35a00d110c18b53caabbf0e381384d36568 https://github.com/facebookincubator/mvfst/commit/75c9683e141742278ca37b8025cfd3a6f1877a91 Reviewed By: jailby fbshipit-source-id: 4931f9499806446ef633f71c4a3d81da5e53cdb5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 057db5b9c071..0e5f629695e7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7a2710b9ec41e3f33f8e7e43d5c7d504aceeb1eb +Subproject commit ebfecdf78de625be0b1efd0e64dc3166d4b50684 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 94f19231bf78..38d27a60bb76 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 14cd3ade09ab0fa604e5a1484e095575647e7f70 +Subproject commit 6c65baf53c915e985b0929057dfe1c331ec13124 From f552a1a21fa26e0c1b8428ea7556e45814950608 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 6 Apr 2023 13:17:50 -0700 Subject: [PATCH 5917/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/3033c0eb21e7a26aea88ec0e83e59f097e854480 https://github.com/facebook/folly/commit/ad4ad70a94a526d11413015347a2f965eb25f993 https://github.com/facebook/litho/commit/656c11e672bd9b20d5638c6bb86f802c914f0110 https://github.com/facebook/wangle/commit/96205567bb182a07de50e0df3fbb543281af0af3 Reviewed By: jailby fbshipit-source-id: 47fd207ebd028232f4c0212042b57a3be1f543fb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0e5f629695e7..074c8ba203f8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ebfecdf78de625be0b1efd0e64dc3166d4b50684 +Subproject commit 3033c0eb21e7a26aea88ec0e83e59f097e854480 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 43b4f020bff6..59913b3ac948 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 338f9f61a70c7e9351e983ae94dbe01080a7f627 +Subproject commit ad4ad70a94a526d11413015347a2f965eb25f993 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 38d27a60bb76..7a19205198b4 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6c65baf53c915e985b0929057dfe1c331ec13124 +Subproject commit 96205567bb182a07de50e0df3fbb543281af0af3 From 387c0d2b33be7153d50723398de6d2b5d8863d5c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 6 Apr 2023 14:16:47 -0700 Subject: [PATCH 5918/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/cf80bd71afac5eb745e6764960b9c5c96a41df63 https://github.com/facebook/litho/commit/c4db0eb6469cbef7dff3da29e402dcc22a47c056 https://github.com/facebook/proxygen/commit/6df3bc66a9e6b56ab9e77dc8a8123aaef6def925 https://github.com/facebook/watchman/commit/f552a1a21fa26e0c1b8428ea7556e45814950608 Reviewed By: jailby fbshipit-source-id: ab543c60fbf1a0119e4a3875c92410c08c25cf35 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 074c8ba203f8..4f85d15769fc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3033c0eb21e7a26aea88ec0e83e59f097e854480 +Subproject commit cf80bd71afac5eb745e6764960b9c5c96a41df63 From 06ecd91736df35e8eb15580f7c9ee6a1e564df90 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 6 Apr 2023 16:11:44 -0700 Subject: [PATCH 5919/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/4a128bfe47e1549ceae0c21878cc83e6dfc9573e https://github.com/facebook/ocamlrep/commit/e5f0312c75d94469e55229bfbcc66ab661adce7a https://github.com/facebookexperimental/edencommon/commit/069c83f282d8131a69e670755c62d3e31263354b https://github.com/facebookincubator/fizz/commit/1b59f117904f81cbd153105a4d726feccb54e969 https://github.com/facebookincubator/velox/commit/585d3e19185cd17c0f38f64b64fc058927dd2f2f Reviewed By: jailby fbshipit-source-id: 9a27111b1a35895d0b0f629d0ac5e46df70f9111 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4f85d15769fc..10d044f58020 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cf80bd71afac5eb745e6764960b9c5c96a41df63 +Subproject commit 4a128bfe47e1549ceae0c21878cc83e6dfc9573e From ac93677553a73584b56d08231e656328058ccd21 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 6 Apr 2023 17:08:39 -0700 Subject: [PATCH 5920/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5d96696f809206725e93124c9c5896c5fe6fcd4b https://github.com/facebook/rocksdb/commit/0578d9f9515b1e39e0b6483ca658a16bcdd8bc9e https://github.com/facebook/watchman/commit/06ecd91736df35e8eb15580f7c9ee6a1e564df90 https://github.com/facebookexperimental/rust-shed/commit/293214ecb299ebdf1c0a478833b4ddd66d80a986 https://github.com/facebookincubator/katran/commit/34a4b9d24ef63ffb330edc1965005be751a33a31 https://github.com/facebookincubator/mvfst/commit/75bdfb6f4846b5d73813e80a1b35d1d0ca9e07d2 Reviewed By: jailby fbshipit-source-id: 47f2a76377717f0bccbc6905fd01e53a088db7ef --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 10d044f58020..7abf7c749e15 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4a128bfe47e1549ceae0c21878cc83e6dfc9573e +Subproject commit 5d96696f809206725e93124c9c5896c5fe6fcd4b From de2ba993b644760ac503c17f7841470a44d0cbbf Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 6 Apr 2023 19:23:10 -0700 Subject: [PATCH 5921/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/08e911b0e09600db78cdd57224d4ee56ae64a83e https://github.com/facebook/fbthrift/commit/466112fdedb7b20e47d86083aef4d0657a538b2f https://github.com/facebook/proxygen/commit/318a54a96d2030e26eb951cccc4423d27bbb7656 https://github.com/facebookresearch/vrs/commit/28d976ab4f8a6787fc77c8a08ff3b43709bc4b23 Reviewed By: jailby fbshipit-source-id: 87bb35ab2e4298dfc812330a1aef97d6ee775b25 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7abf7c749e15..7e965bf3491c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5d96696f809206725e93124c9c5896c5fe6fcd4b +Subproject commit 466112fdedb7b20e47d86083aef4d0657a538b2f From 15ba5e6186da78661a0ef8839e13228d3c32d183 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 7 Apr 2023 13:29:42 -0700 Subject: [PATCH 5922/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/b05729db7ad9934503fccde45562c04d5146813d https://github.com/facebook/ocamlrep/commit/5f974fd12c2b0a6e5b30b18f02852d22595c6ba5 https://github.com/facebook/wangle/commit/d2d31d00dc25f6fdd6bc32e35767dd44b59c9ee5 https://github.com/facebookincubator/mvfst/commit/b6c657fd23cbcc5d8c5be6671a0a4be75732bcd7 Reviewed By: jailby fbshipit-source-id: 259a7f91c9871ccd289e8d3b9f0dd5245790e17a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7e965bf3491c..a9e3059c2ad8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 466112fdedb7b20e47d86083aef4d0657a538b2f +Subproject commit b05729db7ad9934503fccde45562c04d5146813d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7a19205198b4..825cab757a44 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 96205567bb182a07de50e0df3fbb543281af0af3 +Subproject commit d2d31d00dc25f6fdd6bc32e35767dd44b59c9ee5 From 69d42578b9ee58f0c6c842d1b824aadbeab6c40a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 7 Apr 2023 14:26:20 -0700 Subject: [PATCH 5923/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/092e3550254df855455514779f340a9078483b6c https://github.com/facebook/rocksdb/commit/f9db0c6e9c801a1f3357780fd32ece7b6de21f53 https://github.com/facebookincubator/fizz/commit/38a079a7af1605808015839d0503363b8a344042 Reviewed By: jailby fbshipit-source-id: b51a0f8967f259980fa3b010cc2fd146c31dc560 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a9e3059c2ad8..3039a20baae4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b05729db7ad9934503fccde45562c04d5146813d +Subproject commit 092e3550254df855455514779f340a9078483b6c From 7d5e65bec80e4e20ae4dca1ff784c3560eb57ed9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 7 Apr 2023 16:31:10 -0700 Subject: [PATCH 5924/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/e87919c689971fcc31b06d554779ed780f043d4f https://github.com/facebook/fbthrift/commit/465548c64731bbd234cf939d081cf34ca45cda53 https://github.com/facebook/litho/commit/3ff84799469927231eec5c131ce1c91489cc2d55 https://github.com/facebook/proxygen/commit/d5a21cc5c0eb4fb28045f139a767f83945b39cf4 https://github.com/facebook/rocksdb/commit/64cead919fb3ef4a8d31c74b97c267dd02379f38 https://github.com/facebookexperimental/edencommon/commit/8f2083300d4cec5ea38c89f195b66bc3d030ad8e https://github.com/facebookexperimental/rust-shed/commit/3b281411cdcaf5e8907108dd54659ba603ff0440 https://github.com/facebookincubator/fizz/commit/8980263a98cb7f6d5fa51021a9ae4c8516581ab4 https://github.com/facebookincubator/velox/commit/565c90eede842437305ca5a59d97a77811716909 https://github.com/facebookresearch/vrs/commit/a49fe3acdb7bb88b868d515c07d1378ad86bd3c1 Reviewed By: jailby fbshipit-source-id: 508afee3849a7aa85ad223b682598a59180809f6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3039a20baae4..63d0329f0dbc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 092e3550254df855455514779f340a9078483b6c +Subproject commit 465548c64731bbd234cf939d081cf34ca45cda53 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 59913b3ac948..95d99c182658 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ad4ad70a94a526d11413015347a2f965eb25f993 +Subproject commit 8c52d79a616f7a89095d3121a7f02394c16c0848 From c76382308f0c25a0aaefe4fbc1b6b1becb1dbd8c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 7 Apr 2023 17:34:48 -0700 Subject: [PATCH 5925/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/ocamlrep/commit/b9b9ab2921c1d310f1bd017b0d10e2aa403b547e https://github.com/facebook/wangle/commit/f38f112315316c90af62e6ec92c0865ca43d5d0c https://github.com/facebookincubator/katran/commit/330a03cb34f07088f56726442c820c70a89daa21 https://github.com/pytorch/fbgemm/commit/253f1f19555ae9c95eca69b19c5ef1fdebf648f5 Reviewed By: jailby fbshipit-source-id: da744fda47c58d4e4f52058537867df0055db895 --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 825cab757a44..336b131276dd 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d2d31d00dc25f6fdd6bc32e35767dd44b59c9ee5 +Subproject commit f38f112315316c90af62e6ec92c0865ca43d5d0c From 931270de1db4b4e197cc6bc2ab0540b1a03145a7 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 7 Apr 2023 19:35:02 -0700 Subject: [PATCH 5926/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8b1ad1586c2db1b1da51af120b28fee094b14e7f https://github.com/facebook/ocamlrep/commit/5e952c00fec06d1bab446edfeab469b12983bfdc https://github.com/facebook/rocksdb/commit/c8552d8c636c4fb5f8094df7b9065ae6e99fbb10 Reviewed By: jailby fbshipit-source-id: 14f6661f648950a26cf45c38bc9e9f2cfe08dc74 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 63d0329f0dbc..0eb42980661a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 465548c64731bbd234cf939d081cf34ca45cda53 +Subproject commit 8b1ad1586c2db1b1da51af120b28fee094b14e7f From df3f0719c10f1cdc15a7b114d82d00446f7a1a03 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 8 Apr 2023 07:48:53 -0700 Subject: [PATCH 5927/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/bf69abf5f88679cdd0d1b5791f350af325505047 https://github.com/facebookincubator/superconsole/commit/bc8209b8172b758a5f5df99d4a43e7527c6b6cf0 Reviewed By: jailby fbshipit-source-id: 70c463ce6d4e8a8a64903455cd8dbbc3948e234b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0eb42980661a..6f122d933999 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8b1ad1586c2db1b1da51af120b28fee094b14e7f +Subproject commit bf69abf5f88679cdd0d1b5791f350af325505047 From 51fd076710ca90ab1b915d52962157f064a77a74 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 8 Apr 2023 18:05:52 -0700 Subject: [PATCH 5928/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/cbd6599e616d79e904194474b4eeb754e94f6122 Reviewed By: jailby fbshipit-source-id: 74890b6036950b6e53cb873c5a25098b57147de8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6f122d933999..ddc233355f20 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bf69abf5f88679cdd0d1b5791f350af325505047 +Subproject commit cbd6599e616d79e904194474b4eeb754e94f6122 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 336b131276dd..77bcb307bbab 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f38f112315316c90af62e6ec92c0865ca43d5d0c +Subproject commit a65a6150c02c9c6f9addafeb51daf7d6ed569b98 From d0e14ba196e02245ebbfd57017acd29051ed1120 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 10 Apr 2023 13:28:57 -0700 Subject: [PATCH 5929/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/8c5c5fb148ea0e89495e68118f6296c4728dac9c https://github.com/facebook/fbthrift/commit/ee4166800f2ccd5dc6e7341977490a4726bdd65d https://github.com/facebook/rocksdb/commit/d5a9c0c937b65b7bec58fed4432fd97e16bc716a Reviewed By: jurajh-fb fbshipit-source-id: d888ea547ae252024925235b21f17513cb287d0f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ddc233355f20..312baac4f022 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cbd6599e616d79e904194474b4eeb754e94f6122 +Subproject commit ee4166800f2ccd5dc6e7341977490a4726bdd65d From b205f69e4afc8e38e57b9c3d46caef8aa3d392bd Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 10 Apr 2023 14:37:16 -0700 Subject: [PATCH 5930/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/8b70dc730cf97fae000d785a2b589babc0c96d84 https://github.com/facebook/fb303/commit/77f4152ea11ade4579b5f5e7a061860a256a5f55 https://github.com/facebook/fbthrift/commit/d9a3765661e0e94f2baa76b38e3eac56c089c1eb https://github.com/facebook/watchman/commit/d0e14ba196e02245ebbfd57017acd29051ed1120 https://github.com/facebookexperimental/rust-shed/commit/8d48ad91618b471540d09ab31d26a488d4c19ebe Reviewed By: jurajh-fb fbshipit-source-id: 3960deabfc6b4d55414b41abcc1431e350fabce9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 312baac4f022..dc330dd0c06b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ee4166800f2ccd5dc6e7341977490a4726bdd65d +Subproject commit d9a3765661e0e94f2baa76b38e3eac56c089c1eb From ceeb02dbafdecb9ea0df442a99113b0e966c7167 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 10 Apr 2023 17:45:59 -0700 Subject: [PATCH 5931/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/e378cfd7d2a9792d59cfd92667450171d600c84b https://github.com/facebook/fbthrift/commit/f7a5525f74916bd603f91d9af2cbde6e50eabc44 Reviewed By: jurajh-fb fbshipit-source-id: 99eb44c0d4ec7ff34b32b63b9aefe4d1b98d140b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index dc330dd0c06b..aeaab26ad0aa 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d9a3765661e0e94f2baa76b38e3eac56c089c1eb +Subproject commit f7a5525f74916bd603f91d9af2cbde6e50eabc44 From 6797649c5ca64892525b916521be48ab28caf617 Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Mon, 10 Apr 2023 18:28:23 -0700 Subject: [PATCH 5932/7387] return value instead of error for non source control types Summary: Eden's readdir and getfileAttribute endpoint returns an error when an entry in a directory has a type that is not: regular file, directory, or symlink. This causes issues for Buck2 because it propagates this error to the user. For Buck2 a directory having a file that isn't a regular file, directory, or symlink isn't an error case, it's just a file Buck2 wants to skip over. Buck2 would like to be able to differentiate real errors getting the filetype (like say a network error) and having a weird file in some directory. From chatting with Thomas, Buck2 is unlikely to ever care what type the file is (if its not a file, dir or symlink). So it's sufficient just let buck2 know it's some "other" type of file. I think it makes sense to just add a non source control type here. I also considered adding dtype as an attribute, but I don't think we need it, but we could add that too. In some cases it can be dangerous to add values to thrift enumeration (SourceControlType enum we change below) (reference post: https://fb.workplace.com/groups/thriftusers/permalink/785884732120941/). But in our case, rust + Buck2 handles new enum types gracefully (and with exactly the behavior we want): https://our.intern.facebook.com/intern/diffusion/FBS/browse/master/fbcode/buck2/app/buck2_common/src/io/eden.rs?lines=157 so adding a value to the enum is safe (for buck2). hack is our other client. they are going to handle it less gracefully: https://www.internalfb.com/code/fbsource/[65673fd318750984372aeb5b44036a259a0d85d2]/fbcode/hphp/hack/src/facebook/hh_distc/package/package.rs?lines=441 but from what I can tell hack would also error if they tried to list a directory with a socket in it with out this change. Will confirm with them that this change is ok with them. Reviewed By: chadaustin Differential Revision: D44794698 fbshipit-source-id: 4e3ab7964fa2c0932b0363fb9ad62f24af74480c --- eden/fs/service/eden.thrift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index e82a922452d8..ed9f4474abc6 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1182,6 +1182,8 @@ enum SourceControlType { REGULAR_FILE = 1, EXECUTABLE_FILE = 2, SYMLINK = 3, + UNKNOWN = 4, // File types that can not be versioned in source control. +// Currently includes things like FIFOs and sockets. } /** From ca5ceb633df4b5080f58b9052501c824bda3df17 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 10 Apr 2023 19:47:47 -0700 Subject: [PATCH 5933/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/534b0f18530035130550c7e31508b2e03d076cdd https://github.com/facebook/ocamlrep/commit/7de47f4efa493908f823299f48c765354b998bcf https://github.com/facebook/watchman/commit/6797649c5ca64892525b916521be48ab28caf617 https://github.com/facebookincubator/velox/commit/833443260e5e449036e852b1be8758946fbeacbc Reviewed By: jurajh-fb fbshipit-source-id: f4df6d3b4f5cffe7423f8320510cefa2ff274b11 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index aeaab26ad0aa..e9b7f09e5438 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f7a5525f74916bd603f91d9af2cbde6e50eabc44 +Subproject commit 534b0f18530035130550c7e31508b2e03d076cdd From 90c115c56f9e9553b514c089b7e3e905379fa9cf Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 11 Apr 2023 00:16:15 -0700 Subject: [PATCH 5934/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/41934c63a88d7b0df98dcdbf07c4f3fabf3cf9cf https://github.com/pytorch/multipy/commit/1a88dde37444c0dc99c58b35c7f0f9ba1f82e684 Reviewed By: jurajh-fb fbshipit-source-id: d32ede0fd9f81f32313e00f4e62ff951ace8c4f8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e9b7f09e5438..64a923358f1f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 534b0f18530035130550c7e31508b2e03d076cdd +Subproject commit 41934c63a88d7b0df98dcdbf07c4f3fabf3cf9cf From b87e3b5dd5455dc79f4b8a53a5dd330d63c5b491 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 11 Apr 2023 09:40:47 -0700 Subject: [PATCH 5935/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/e615b505da6745cc9a7e522f50930f63cf8ea78a https://github.com/facebook/folly/commit/ce350ec79a1d8abcb00767f0c4b682068d4a9c2a https://github.com/facebook/litho/commit/11117a0b78757457454c8db01c90c769eccb4ff1 https://github.com/facebook/ocamlrep/commit/a63a4da6e0505358f6e846512456f891e65d25d6 https://github.com/facebook/proxygen/commit/fedbd51d58c09ad4ea05725a6a5824a12e903468 https://github.com/facebook/wangle/commit/35967475952b70b2c60dfde249546da6f373f153 https://github.com/facebookincubator/katran/commit/bed3521a3b337ecaa795c38070d9114f648148ad https://github.com/facebookincubator/mvfst/commit/279b28ace371ca536bc16e2f6ab7e8250603005b https://github.com/facebookincubator/velox/commit/f4b15554ff34f66b9939ef3f791a6e66c0a9325d Reviewed By: jurajh-fb fbshipit-source-id: dcd2ac91e2ba3b4c0a686fbc8bb181c492bd36fe --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 95d99c182658..88d4e43f0547 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 8c52d79a616f7a89095d3121a7f02394c16c0848 +Subproject commit ce350ec79a1d8abcb00767f0c4b682068d4a9c2a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 77bcb307bbab..899d3fc8e9a3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a65a6150c02c9c6f9addafeb51daf7d6ed569b98 +Subproject commit 35967475952b70b2c60dfde249546da6f373f153 From ca7593e6df2d116b3e211a7cd7a6e4e39ecdab76 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 11 Apr 2023 16:21:22 -0700 Subject: [PATCH 5936/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/63b4e165b740408fa583bb0444b2989a4b6144c8 https://github.com/facebookexperimental/rust-shed/commit/3da5f7ea5c175a5ace927d555bbd738ca3ea398b https://github.com/facebookincubator/katran/commit/0816170dc47acac196adaa5cb3686cadf3295aca https://github.com/pytorch/fbgemm/commit/3b8e7a579cdf80b213fc336175d4ce9182fb79f1 Reviewed By: jurajh-fb fbshipit-source-id: b1be5a18d8ee6b5d020eb6333f885bcbcabb0f08 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 64a923358f1f..2270a9177281 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 41934c63a88d7b0df98dcdbf07c4f3fabf3cf9cf +Subproject commit 1552810792ae129edff08f931796752caf4a2251 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 88d4e43f0547..bb21b280ae34 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ce350ec79a1d8abcb00767f0c4b682068d4a9c2a +Subproject commit 63b4e165b740408fa583bb0444b2989a4b6144c8 From 939a99ed7ce639feaa28e6233c316b09c808802b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 11 Apr 2023 17:08:12 -0700 Subject: [PATCH 5937/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/74aebe2db113ea19759c801001182363c5ec6f1a https://github.com/facebook/litho/commit/74a0aab3dabac5311c1f70571c42bb27faa6f757 https://github.com/facebookincubator/velox/commit/810e9335feca7cebd549c7bb7a53aec043c8508b Reviewed By: jurajh-fb fbshipit-source-id: 94488cd8733197ef804003619dd847502567b6fb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2270a9177281..30f851731a69 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1552810792ae129edff08f931796752caf4a2251 +Subproject commit 74aebe2db113ea19759c801001182363c5ec6f1a From f7ad96fbbcbaae26db85b5c56bee9ad9faaa186f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 11 Apr 2023 22:19:55 -0700 Subject: [PATCH 5938/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/1347a456c440e8fb366c59db47232c4aacf76bd3 Reviewed By: jurajh-fb fbshipit-source-id: 567568632e4112243d81293b623f43c7f144778d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 30f851731a69..2401c2827199 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 74aebe2db113ea19759c801001182363c5ec6f1a +Subproject commit 1347a456c440e8fb366c59db47232c4aacf76bd3 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index bb21b280ae34..8bd1bc36d3ed 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 63b4e165b740408fa583bb0444b2989a4b6144c8 +Subproject commit bcddc0df8653f202fcbd462a2ef368b7a65c598a From 090c69c4bf16d4a76ab319ef7709bb3d99e92d4d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 12 Apr 2023 01:20:10 -0700 Subject: [PATCH 5939/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/f2de94f84282332490c6ef1f5f1ca0b41b1cbc78 https://github.com/facebookincubator/velox/commit/eba2356b2df50e9cc658f68f5ddf367ab2722abc Reviewed By: jurajh-fb fbshipit-source-id: be418a1b70ed2e9416e718c7af1fd9cced3762c4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2401c2827199..996098d70be1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1347a456c440e8fb366c59db47232c4aacf76bd3 +Subproject commit f2de94f84282332490c6ef1f5f1ca0b41b1cbc78 From 3a68c334823b9913d76a048ae186dda5d27ea4e2 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 12 Apr 2023 08:41:38 -0700 Subject: [PATCH 5940/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/d9b004dd911940d45917fc438c31884dc75bff2f https://github.com/facebook/litho/commit/49fd6e5f4466d9d290eefae5a6b29de2f6d0d6e8 https://github.com/facebook/ocamlrep/commit/8be145fc532f3e01d92191973c707e1891276f28 https://github.com/facebookincubator/superconsole/commit/da4b8a98f05857f86b208c0534ab981c596c84ef Reviewed By: jurajh-fb fbshipit-source-id: 637399610235d848773a54698eaa989c9afe8e30 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 996098d70be1..2fb65b1e104a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f2de94f84282332490c6ef1f5f1ca0b41b1cbc78 +Subproject commit f72160da1f3c8aed7b4c4b533e57bb9b6feebe59 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8bd1bc36d3ed..ccbe1ad19e6d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit bcddc0df8653f202fcbd462a2ef368b7a65c598a +Subproject commit d9b004dd911940d45917fc438c31884dc75bff2f From 183223cd0acd9d367faaaaf5226a7533834d01da Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 12 Apr 2023 09:48:01 -0700 Subject: [PATCH 5941/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/238672c7857b128e28329e3b49a3018efe5333c7 https://github.com/facebook/fbthrift/commit/5edc01cb5bd91b269e1ed1d2f76642d1d5aaa336 https://github.com/facebook/wangle/commit/46e84205f096a5ec32573f191d8e654afff4a3a8 https://github.com/facebookincubator/mvfst/commit/6d7d6cbd079d61b1415a6b7f69d2a7df0443478e https://github.com/facebookincubator/superconsole/commit/4cdf36dace2d04dfc5a219249675869f987bfca7 Reviewed By: jurajh-fb fbshipit-source-id: 6a738617923d2bac1bf51eb9229fa7c731fbf0aa --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2fb65b1e104a..1b90eb7ba8e9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f72160da1f3c8aed7b4c4b533e57bb9b6feebe59 +Subproject commit 5edc01cb5bd91b269e1ed1d2f76642d1d5aaa336 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 899d3fc8e9a3..7f3d1dbc152c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 35967475952b70b2c60dfde249546da6f373f153 +Subproject commit 46e84205f096a5ec32573f191d8e654afff4a3a8 From bc30ced9454102244896e011477eb136d8aadaa7 Mon Sep 17 00:00:00 2001 From: Mark Shroyer Date: Wed, 12 Apr 2023 10:51:18 -0700 Subject: [PATCH 5942/7387] Teach getdeps to find VS 2022 Professional's dumpbin.exe (#4581) Summary: X-link: https://github.com/facebookincubator/velox/pull/4581 Allows one to do getdeps builds on machines using Visual Studio 2022 Professional. Reviewed By: chadaustin Differential Revision: D44804055 fbshipit-source-id: 7a1042a3c1f4b6b44707afdb7e33294ad1851462 --- build/fbcode_builder/getdeps/dyndeps.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/fbcode_builder/getdeps/dyndeps.py b/build/fbcode_builder/getdeps/dyndeps.py index 1219a0bb3687..64ab7b09ac96 100644 --- a/build/fbcode_builder/getdeps/dyndeps.py +++ b/build/fbcode_builder/getdeps/dyndeps.py @@ -190,6 +190,9 @@ def find_dumpbin(self) -> str: "VC/bin/dumpbin.exe" ), ("c:/Program Files (x86)/Microsoft Visual Studio */VC/bin/dumpbin.exe"), + ( + "C:/Program Files/Microsoft Visual Studio/*/Professional/VC/Tools/MSVC/*/bin/HostX64/x64/dumpbin.exe" + ), ] for pattern in globs: for exe in glob.glob(pattern): From 1ad9a0475ddf3ac82131b0a12dc654eb060dcfa6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 12 Apr 2023 12:27:52 -0700 Subject: [PATCH 5943/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/448670c2004ed3fcc2a65cd422b5e2baa4e2bb6f https://github.com/facebook/fbthrift/commit/869979dd1afd9e53f4760f2d9699eb34e79004d7 https://github.com/facebook/folly/commit/e4699eb4697b55cf9dd9cf785cdc789611d7df77 https://github.com/facebook/litho/commit/cec0d05d93e67fd92aa3e0e8457e5e8ec787c5d3 https://github.com/facebook/ocamlrep/commit/7fb5267f68cb5f80e109d7fa9bdb0116319c09b6 https://github.com/facebook/proxygen/commit/3c731d28dd081d2a0c9a15344ee0ad65221c5cae https://github.com/facebook/wangle/commit/27c93f8f14210bd6835c121bdf7aff552fd61d40 https://github.com/facebook/watchman/commit/bc30ced9454102244896e011477eb136d8aadaa7 https://github.com/facebookexperimental/edencommon/commit/c93e24da1597eaf003f44d858e4be714c1a47609 https://github.com/facebookexperimental/rust-shed/commit/e9011a20e61617fa7a09e614debfd7fd18a8eea6 https://github.com/facebookincubator/fizz/commit/ce2d951ad2dd5c489565cb3a1185bdcf9d6ff8fe https://github.com/facebookincubator/katran/commit/d63de3a950f1a748f207ecddb4b8c3408c6e2bb1 https://github.com/facebookincubator/mvfst/commit/38919995f9d545a305d083d074354793d055245f https://github.com/facebookincubator/velox/commit/028cf5ca54e7501168fce6a53543d283ddf1b928 Reviewed By: jurajh-fb fbshipit-source-id: d8ae0a6179653f81557419dc8662cb765973f4df --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1b90eb7ba8e9..826ce45b040a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5edc01cb5bd91b269e1ed1d2f76642d1d5aaa336 +Subproject commit 869979dd1afd9e53f4760f2d9699eb34e79004d7 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ccbe1ad19e6d..a6fa63ed7219 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d9b004dd911940d45917fc438c31884dc75bff2f +Subproject commit e4699eb4697b55cf9dd9cf785cdc789611d7df77 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7f3d1dbc152c..93278431d8a9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 46e84205f096a5ec32573f191d8e654afff4a3a8 +Subproject commit 27c93f8f14210bd6835c121bdf7aff552fd61d40 From 7423154fa03d70b59776154dc4c6cf3907338d96 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 12 Apr 2023 13:28:30 -0700 Subject: [PATCH 5944/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/846d5c954c7247ecf11b523d1574c5b1ff933b4b https://github.com/facebook/fbthrift/commit/3530c47451125e2ac3256a149a23d622d65c61ec https://github.com/facebook/ocamlrep/commit/cafebc5f12779a1444d1c0121ca9f15a7a48fa26 https://github.com/facebook/proxygen/commit/b01ac58726b61ee1c21d021775cdc43a841b3e2f https://github.com/facebook/wangle/commit/702ba2d90489f39ded0197c5b29f9c5173f20689 https://github.com/facebook/watchman/commit/1ad9a0475ddf3ac82131b0a12dc654eb060dcfa6 https://github.com/facebookexperimental/edencommon/commit/b8f7fa3ba187b87073af5a57e85fcef3302f7841 https://github.com/facebookexperimental/rust-shed/commit/79c18eebdcc7b12da2617738a861888ef6df9ab3 https://github.com/facebookincubator/fizz/commit/1859e3861158c76faf78e77a52357da8d7330cb8 https://github.com/facebookincubator/katran/commit/5b00c167192249a878f409abfe37f38f2cba3e85 https://github.com/facebookincubator/mvfst/commit/b4a7802d7e05a1f400ec0715296b35a44034d2b1 https://github.com/facebookincubator/velox/commit/a368dc4bf187427007afb5626bd890a2b06fbb77 Reviewed By: jurajh-fb fbshipit-source-id: 6853584c15d870d1f342e0cade97bad1901a19eb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 826ce45b040a..bb77ab46e1f8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 869979dd1afd9e53f4760f2d9699eb34e79004d7 +Subproject commit 3530c47451125e2ac3256a149a23d622d65c61ec diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 93278431d8a9..ec484bf58508 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 27c93f8f14210bd6835c121bdf7aff552fd61d40 +Subproject commit 702ba2d90489f39ded0197c5b29f9c5173f20689 From b1c1d8e175371c4cb19085d6198d6471d90aefc2 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 12 Apr 2023 16:03:22 -0700 Subject: [PATCH 5945/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/fce789fcce0e15694e7761daf914392a3e9c2f61 https://github.com/facebook/litho/commit/cd075e49effbd8b728fdbcc87f361eac9d3c0635 https://github.com/facebookincubator/superconsole/commit/e1875fdcb996be05d64b495c387889c026644e7d Reviewed By: jurajh-fb fbshipit-source-id: 7a4de07d22c1a8769205d5c53c5af3f3f96c3ef7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bb77ab46e1f8..e054fee83725 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3530c47451125e2ac3256a149a23d622d65c61ec +Subproject commit fce789fcce0e15694e7761daf914392a3e9c2f61 From 305dc30431231359cdedd0b6b838918b59b6582e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 12 Apr 2023 20:15:02 -0700 Subject: [PATCH 5946/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8ef6ff316a3f828d8b7205d9f6ee6cdc49fa412b https://github.com/facebook/proxygen/commit/6926d8c62439f9fa2fceb3f3eb765094b9c7230a https://github.com/facebookincubator/fizz/commit/f6f0500f1b7347c04b96a14b2d804fc1b1026272 https://github.com/facebookincubator/katran/commit/602ea5a43eff3956fde51aecd5c024a60602326e https://github.com/facebookincubator/mvfst/commit/9b5a379a2f605fc009f20309ead720467411c267 https://github.com/facebookincubator/velox/commit/9bb32d9561b3d57e404bdf04ea2fed5cfa786eff Reviewed By: jurajh-fb fbshipit-source-id: 297ecd3adb6a5f2e51a7778dc614f22c246050ef --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e054fee83725..195ba275cadb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit fce789fcce0e15694e7761daf914392a3e9c2f61 +Subproject commit 8ef6ff316a3f828d8b7205d9f6ee6cdc49fa412b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a6fa63ed7219..c1307bab1e5c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e4699eb4697b55cf9dd9cf785cdc789611d7df77 +Subproject commit 5db53469a0d2c6053deee588d9b414c17a8cd9ae From 27e931e3d261d68e385994d98c274c9e169e7668 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 12 Apr 2023 23:01:24 -0700 Subject: [PATCH 5947/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/61dc4000f11c542d014194fc42fe6407ad70aed5 Reviewed By: jurajh-fb fbshipit-source-id: a96f66d5b81331f4815feb12a463786b2b2be812 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 195ba275cadb..ba4d6a418afd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8ef6ff316a3f828d8b7205d9f6ee6cdc49fa412b +Subproject commit 61dc4000f11c542d014194fc42fe6407ad70aed5 From 6a2142b8d6a4b20c3538fdc396798d20b534d7dc Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 13 Apr 2023 05:04:57 -0700 Subject: [PATCH 5948/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/a1310d12929096228ffac6929fd6c974ccd9d447 Reviewed By: jurajh-fb fbshipit-source-id: 2538a6bc479da6f40c029806bc4b46011c5db8be --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ba4d6a418afd..ad24cf3ca05b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 61dc4000f11c542d014194fc42fe6407ad70aed5 +Subproject commit 4c2dcbeefd7d26fa0d5a93abcc1558e9cff48303 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index c1307bab1e5c..af4780fe4b0f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 5db53469a0d2c6053deee588d9b414c17a8cd9ae +Subproject commit a1310d12929096228ffac6929fd6c974ccd9d447 From 85fa93d39141bb8244386507ad6afc5083de14a6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 13 Apr 2023 05:52:45 -0700 Subject: [PATCH 5949/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/cf8970540eedc4958c3a58025d23fc5a09fb3314 https://github.com/facebook/fbthrift/commit/8e7b3e38a70aa4a3cee1a62eabacec32ddb2085b https://github.com/facebook/ocamlrep/commit/bc37d9d353dfa727059467191f0e6f6fa479235a https://github.com/facebook/proxygen/commit/4bf4b1e7c417c3c64f0ed3f35be2f4c323cfba72 https://github.com/facebookexperimental/rust-shed/commit/e393a0a15d24df1aecd5c2d52e40cc7e1a2c1440 https://github.com/facebookincubator/velox/commit/3c4e85f8813d5bf5d537c139fcc8911c501ea198 Reviewed By: jurajh-fb fbshipit-source-id: c89e7da14d45edbaead6a785407cdd30a2bb61aa --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ad24cf3ca05b..79ecef1f6903 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4c2dcbeefd7d26fa0d5a93abcc1558e9cff48303 +Subproject commit 8e7b3e38a70aa4a3cee1a62eabacec32ddb2085b From 07e2767dc59b1f4bcb1594be7daa2f4ab9d99ab1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 13 Apr 2023 12:28:54 -0700 Subject: [PATCH 5950/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/fbf277ce6186fe6b438865af6bea0360e8ef3b92 https://github.com/facebook/fbthrift/commit/6b06c89f1c677975d1cb7169495cb0b77797e38e https://github.com/facebook/ocamlrep/commit/e9320e2b279b0e55551cc500b1c696f4c9c31b20 https://github.com/facebook/proxygen/commit/a0f95bafed418ac681b0047f313dd718039ca11f https://github.com/facebook/wangle/commit/f2d2a323ee44e4e411049a6cc64999032af2da34 https://github.com/facebookincubator/katran/commit/548bb139eef9fd96674b3a5f7d15bd0a8cbeb656 https://github.com/facebookincubator/mvfst/commit/8bd7f39c3f077c4575e49695184bd0cbb2e9abea Reviewed By: jurajh-fb fbshipit-source-id: 59fa9326230da7906f233d9b5d888e280fb3d251 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 79ecef1f6903..571e5946bfb7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8e7b3e38a70aa4a3cee1a62eabacec32ddb2085b +Subproject commit 6b06c89f1c677975d1cb7169495cb0b77797e38e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ec484bf58508..75a63d999afb 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 702ba2d90489f39ded0197c5b29f9c5173f20689 +Subproject commit f2d2a323ee44e4e411049a6cc64999032af2da34 From edd08588d6ddece3970097c4f8def7f070a7afd4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 13 Apr 2023 14:18:03 -0700 Subject: [PATCH 5951/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/e145d1f5cd42cd5b2e4b2f82157747a15c5e768e https://github.com/facebook/folly/commit/9b7a2dd2c5e755fbaf1a2b60189d77c288636efd https://github.com/facebook/proxygen/commit/b129c27df86c9f081d337a6fe79ca1a206ee50cb https://github.com/facebookexperimental/edencommon/commit/21992237ebdbfb3d0488ea356592e5353175ecab https://github.com/facebookincubator/velox/commit/4fb7b67852593cae11feba04b58f55896c5f8fea https://github.com/fairinternal/egohowto/commit/ff85368920f54a363aa3c047e23b7d5190912b71 Reviewed By: jurajh-fb fbshipit-source-id: 9ff5b4e40de7ff06034938eaaad09853820daaf8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 571e5946bfb7..72f9365700af 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6b06c89f1c677975d1cb7169495cb0b77797e38e +Subproject commit e145d1f5cd42cd5b2e4b2f82157747a15c5e768e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index af4780fe4b0f..a4034ea1bddf 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a1310d12929096228ffac6929fd6c974ccd9d447 +Subproject commit 9b7a2dd2c5e755fbaf1a2b60189d77c288636efd From 65e2f96d35a62a8f812d1c28971b53d361c561db Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 13 Apr 2023 15:59:18 -0700 Subject: [PATCH 5952/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/9aa321697441e7a3b283a465609d083387139870 Reviewed By: jurajh-fb fbshipit-source-id: 35e13d7d44c69f5c088e4b83129438296ab2b5e6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 72f9365700af..9fbaa6480804 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e145d1f5cd42cd5b2e4b2f82157747a15c5e768e +Subproject commit 9aa321697441e7a3b283a465609d083387139870 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 75a63d999afb..030c2f3141c2 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f2d2a323ee44e4e411049a6cc64999032af2da34 +Subproject commit 0e0618e9ee9f076a7b963b5aa639f28650c41d8a From e64311cfa1fe0a8916b5aef4acc50f89bd2982cb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 13 Apr 2023 17:42:03 -0700 Subject: [PATCH 5953/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/347e4e980f9b5404637e7a6f693bdd462f4b696d https://github.com/facebookincubator/superconsole/commit/e2093cb7f93bf9c7d2ba75c275a656b8fb54016d Reviewed By: jurajh-fb fbshipit-source-id: c00b0867dddc89176ea8ec09e8dece032562ed83 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a4034ea1bddf..7082ead62116 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9b7a2dd2c5e755fbaf1a2b60189d77c288636efd +Subproject commit 347e4e980f9b5404637e7a6f693bdd462f4b696d From e2a7032a8eec74297b6d4f5479420719d2b5991b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 13 Apr 2023 23:43:30 -0700 Subject: [PATCH 5954/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/22f0f0233e1c3557de1907f200e82115d373db84 https://github.com/facebookincubator/velox/commit/9a7c5d8008f81cf77144371fd08898e7887d7edb Reviewed By: jurajh-fb fbshipit-source-id: 7a297ba83f1c153693d66e6b2f5ab4fa372b1963 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9fbaa6480804..0506f79c8cfa 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9aa321697441e7a3b283a465609d083387139870 +Subproject commit 11ba367ba9d9a150656e432cf4c2ca7fc3acace5 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7082ead62116..908d0a8427a6 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 347e4e980f9b5404637e7a6f693bdd462f4b696d +Subproject commit 22f0f0233e1c3557de1907f200e82115d373db84 From fe190d77fb1d180bbc2088ac11e23a3279ff20d7 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 14 Apr 2023 11:10:51 -0700 Subject: [PATCH 5955/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/da374b3d071d6c8b91a35924e9f68425899448fd https://github.com/facebook/fbthrift/commit/124f5a6b0ac0629062ed8fdd0d77d976af1e8a66 https://github.com/facebook/ocamlrep/commit/7857c15c2b9d4f4261033e58baf7e55fb8634baa https://github.com/facebookexperimental/rust-shed/commit/921439865149532198121025d8cf5f18dec055ac https://github.com/facebookincubator/velox/commit/3035946753e69b7bb4e270d04a696e8f792c4a6b Reviewed By: jurajh-fb fbshipit-source-id: aefb00d65f62f8c139a6b985397ba5efc6d8d605 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0506f79c8cfa..2ad2cf388605 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 11ba367ba9d9a150656e432cf4c2ca7fc3acace5 +Subproject commit 124f5a6b0ac0629062ed8fdd0d77d976af1e8a66 From 45fa6e13a6eb25e3a0f6a56bf1fd16eed203d68d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 14 Apr 2023 13:02:22 -0700 Subject: [PATCH 5956/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/9d1510a586f4a69f62641abc0770c5e8e21c37e3 https://github.com/facebook/ocamlrep/commit/35a6b34f06058c22c021fc4b133805d9ff40a054 https://github.com/facebook/rocksdb/commit/ba16e8eee7b1a7ad933ff67e33082c46b01d68d7 Reviewed By: jurajh-fb fbshipit-source-id: e81e77712f4a887e25a00311d6e680fe156a76fc --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2ad2cf388605..40cf69e630d7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 124f5a6b0ac0629062ed8fdd0d77d976af1e8a66 +Subproject commit 9d1510a586f4a69f62641abc0770c5e8e21c37e3 From 9ec779653a660fab8773589a566edbb45c7880d8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 14 Apr 2023 15:08:48 -0700 Subject: [PATCH 5957/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/16266b6b64c00bfa8ade9165a0de78ce3ecb4e79 https://github.com/facebook/litho/commit/f6f5dc7c8448a0bedda0bfdfc95d3afa572470c7 https://github.com/facebook/wangle/commit/207aa1d64c869f43550b4fca5df0203d86c4f7e4 https://github.com/facebookincubator/katran/commit/3bf2453fbd6a18779a729ca44413560eecd9cb8f https://github.com/facebookincubator/mvfst/commit/63d62e220672faa7af87aedea44d741c047a1e21 https://github.com/pytorch/fbgemm/commit/e07dda2d50562f534abc682b0dc79a8cd5ce819d Reviewed By: jurajh-fb fbshipit-source-id: f217e0e3a9e348577a00290fce7e001a7338d662 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 40cf69e630d7..fefb6132b642 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9d1510a586f4a69f62641abc0770c5e8e21c37e3 +Subproject commit 16266b6b64c00bfa8ade9165a0de78ce3ecb4e79 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 030c2f3141c2..5c45204c9a26 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0e0618e9ee9f076a7b963b5aa639f28650c41d8a +Subproject commit 207aa1d64c869f43550b4fca5df0203d86c4f7e4 From efc891b9f64a7b560b9e06f62fb8767343501729 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 15 Apr 2023 01:38:04 -0700 Subject: [PATCH 5958/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/1e7f13644729f1f71434fa06395267db723ad4e0 Reviewed By: jurajh-fb fbshipit-source-id: a67f67df549e9697f577b6c202ab08e051dbc19a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index fefb6132b642..a6de76caf978 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 16266b6b64c00bfa8ade9165a0de78ce3ecb4e79 +Subproject commit 1e7f13644729f1f71434fa06395267db723ad4e0 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5c45204c9a26..7aebdba73dba 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 207aa1d64c869f43550b4fca5df0203d86c4f7e4 +Subproject commit 7b46089f7a7baf9f46a807ddf68b5c746c85c1b6 From 62361168ce0db114da911180cbf8b2ee62b45cce Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 16 Apr 2023 21:37:59 -0700 Subject: [PATCH 5959/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/775d2a2b5902991ea9c117dee6b91833c2ac03f8 Reviewed By: jurajh-fb fbshipit-source-id: b13ea99c3a182f08754911f8c7aa1966d3782ffc --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a6de76caf978..51879050d8f2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1e7f13644729f1f71434fa06395267db723ad4e0 +Subproject commit 775d2a2b5902991ea9c117dee6b91833c2ac03f8 From 5ceade71c75283d6b889ae143acd11d80a3647aa Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 17 Apr 2023 15:05:09 -0700 Subject: [PATCH 5960/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/34e7754c53d2510b8c3c935a48f26cafa8790c04 https://github.com/facebook/ocamlrep/commit/19872abf9ff4d9c62440db87a9146a35b2b498eb https://github.com/facebook/rocksdb/commit/9b698cda512ed0aed702ffeed941d621bd142f9e https://github.com/facebookincubator/velox/commit/2c729a98c4940b46cf1d621352b686cf5eb0ebd0 Reviewed By: bigfootjon fbshipit-source-id: bf5ccc85a7fb1ae31b8e3ee4359a58dc4bd00a59 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 51879050d8f2..b124d6b6c223 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 775d2a2b5902991ea9c117dee6b91833c2ac03f8 +Subproject commit 34e7754c53d2510b8c3c935a48f26cafa8790c04 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 908d0a8427a6..ed8f654bfce9 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 22f0f0233e1c3557de1907f200e82115d373db84 +Subproject commit d0b4382337404155f74912fa553e2f3bba774446 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7aebdba73dba..c5596763581a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7b46089f7a7baf9f46a807ddf68b5c746c85c1b6 +Subproject commit 56bdb15440e9472863f792edb0a8ba2e058cc7ee From 2b4d419b8ca5689d5f72349f0c40a09a1e166297 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Mon, 17 Apr 2023 16:39:48 -0700 Subject: [PATCH 5961/7387] refactor EdenServer mount and shutdown Summary: Small refactorings that don't have a particular theme. I'm working towards removing FUSE- and PrjFS-isms from EdenMount and friends. Reviewed By: kmancini Differential Revision: D44728015 fbshipit-source-id: 328abae1043a48f440836b98f1a1ee20a1b091d1 --- eden/fs/service/eden.thrift | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index ed9f4474abc6..bda022825cfd 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -190,7 +190,7 @@ enum MountState { */ INITIALIZED = 2, /** - * Starting to mount fuse. + * Starting to mount the filesystem. */ STARTING = 3, /** @@ -198,7 +198,10 @@ enum MountState { */ RUNNING = 4, /** - * Encountered an error while starting fuse mount. + * Encountered an error while starting the user-space filesystem mount. + * FUSE is a misnomer: this error state also applies to NFS and Windows' + * Projected File System. + * TODO: rename to INITIALIZATION_ERROR. */ FUSE_ERROR = 5, /** @@ -223,7 +226,7 @@ enum MountState { * An error occurred during mount initialization. * * This state is used for errors that occur during the INITIALIZING phase, - * before we have attempted to start the FUSE mount. + * before we have attempted to start the user-space filesystem mount. */ INIT_ERROR = 9, } (cpp2.enum_type = 'uint32_t') From 1d362c2905dfe38b516223c6f37cda85c5ca1cad Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 17 Apr 2023 18:36:16 -0700 Subject: [PATCH 5962/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/cf971e8d04c6dd0c76b1680c335f20f0deb86448 https://github.com/facebook/fbthrift/commit/a5b03657ebb443018410260b094abe3e0a1b9aa6 https://github.com/facebook/proxygen/commit/2f83c8b424894fc47b57361bf1f9c1d08af5c48b Reviewed By: bigfootjon fbshipit-source-id: 807e14bacabd25f47b12aaeb1e312bbdd410a2f3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b124d6b6c223..298b881b9e46 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 34e7754c53d2510b8c3c935a48f26cafa8790c04 +Subproject commit a5b03657ebb443018410260b094abe3e0a1b9aa6 From 656c8676adfa8e8eb2bd00ccbf713eb284d3ca86 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 18 Apr 2023 02:59:57 -0700 Subject: [PATCH 5963/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/e1d64df3f79efd1c4dd31878b9a6477c278ff2a0 Reviewed By: bigfootjon fbshipit-source-id: 12be804d2b1f4e300b5de2961c4f66a93b1b8118 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 298b881b9e46..e00939ed2d9e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a5b03657ebb443018410260b094abe3e0a1b9aa6 +Subproject commit e1d64df3f79efd1c4dd31878b9a6477c278ff2a0 From 6df14227232d48c46c5d74f10758f9c5211dc968 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 18 Apr 2023 08:48:13 -0700 Subject: [PATCH 5964/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/589cb24fdacea806084696b782a3be25d85c5779 https://github.com/facebook/ocamlrep/commit/650106dd32d1122b039527b4adc26e11758222cc Reviewed By: bigfootjon fbshipit-source-id: 975cf9b3560f2c1fd76830fc77b1bc01bf481d8e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e00939ed2d9e..1651624669a7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e1d64df3f79efd1c4dd31878b9a6477c278ff2a0 +Subproject commit 589cb24fdacea806084696b782a3be25d85c5779 From 168f39708ca6c8cb9eee2b8e1cf996a66bbe7d3b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 18 Apr 2023 13:04:39 -0700 Subject: [PATCH 5965/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/1066353c2c480566100df62802f35c7925830535 https://github.com/facebook/fbthrift/commit/8b385483e9c9864c37d10ea86d0a001f908fd3d4 https://github.com/facebook/ocamlrep/commit/0b71e3966ced3d017334b87b123ddfb58d4a0f78 https://github.com/facebook/proxygen/commit/90f52d7e8afcd6502a6327dca354c76a8f19e599 https://github.com/facebook/rocksdb/commit/bd80433c73691031ba7baa65c16c63a83aef201a https://github.com/facebook/wangle/commit/7a04ee349078aab083255a5f36e52611bbc8fcdb https://github.com/facebookincubator/katran/commit/eacf8bb71f8e459b71c209336e68dbac47a4ef6d https://github.com/facebookincubator/mvfst/commit/164ae050ef4b0d509ebce7e06bb3f1c621575bc8 Reviewed By: bigfootjon fbshipit-source-id: 7846859294d7ae1576a1de7c9c588a69abe0cbd6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1651624669a7..91da02ae5e9d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 589cb24fdacea806084696b782a3be25d85c5779 +Subproject commit 8b385483e9c9864c37d10ea86d0a001f908fd3d4 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c5596763581a..416391c555b3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 56bdb15440e9472863f792edb0a8ba2e058cc7ee +Subproject commit 7a04ee349078aab083255a5f36e52611bbc8fcdb From e3e7a8114f9e1e1c516b0f5a99d72d46105fdb26 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 18 Apr 2023 18:31:44 -0700 Subject: [PATCH 5966/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/2a35e4ba2a213295e9cd52dae21ca3885646697d https://github.com/fairinternal/egohowto/commit/90381ef9cd05a986f7f12850a65a9163af2450d2 Reviewed By: bigfootjon fbshipit-source-id: ea5a582b68e36159280244755ef044b9b3899762 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 91da02ae5e9d..c02ff4a6f589 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8b385483e9c9864c37d10ea86d0a001f908fd3d4 +Subproject commit 2a35e4ba2a213295e9cd52dae21ca3885646697d From 4cad1b96eff7dfd198576ce171b7790ce165a8b7 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 19 Apr 2023 10:46:12 -0700 Subject: [PATCH 5967/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/d3fc49c0be65133c21e2e9db238331af0daf11b5 Reviewed By: bigfootjon fbshipit-source-id: b6732cd0d7589abc8dc03b85a29d8a3105d013d6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c02ff4a6f589..89be8167cbcc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2a35e4ba2a213295e9cd52dae21ca3885646697d +Subproject commit d3fc49c0be65133c21e2e9db238331af0daf11b5 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ed8f654bfce9..a1f05b055547 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d0b4382337404155f74912fa553e2f3bba774446 +Subproject commit 3a3a6d4fb673443f04536f2d385b9545ba135d7e From 13d039ab4f379c79e431bd6515ce659dae5402a0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 19 Apr 2023 11:37:36 -0700 Subject: [PATCH 5968/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/68420f95c30c43143891d5e0956f8f6d0533914f https://github.com/facebook/fbthrift/commit/f22096dffdffd370b69ed4d0f277e388dfd0d26f https://github.com/facebookincubator/velox/commit/0a8760ffd6fcb9633ae7a911b935018be42e6e2b https://github.com/pytorch/fbgemm/commit/e53cdde6ba820c585a8f94c09fa32dff154d4276 Reviewed By: bigfootjon fbshipit-source-id: 310d83f928ae17ce54ce40e111030fc732f6525e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 89be8167cbcc..730ac2c83dd7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d3fc49c0be65133c21e2e9db238331af0daf11b5 +Subproject commit f22096dffdffd370b69ed4d0f277e388dfd0d26f From 11b711019d4ba7012de5abdc63c428a012c8f8a1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 19 Apr 2023 12:04:19 -0700 Subject: [PATCH 5969/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/7e1bb493a01576f69bb0ee308422c213fdd4a7e5 https://github.com/facebook/fbthrift/commit/00de0bf999a4dd61e0deb47636eaa3041942b425 https://github.com/facebookincubator/velox/commit/3e6e7ecef3a1129164738515b19793b0b494c319 https://github.com/pytorch/fbgemm/commit/88dc18c8dfd2453211b90c82e885b78d4969c70a Reviewed By: bigfootjon fbshipit-source-id: 143347618604d184974e995d3f29c682f4d3571f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 730ac2c83dd7..72d9b5ebb7bc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f22096dffdffd370b69ed4d0f277e388dfd0d26f +Subproject commit 00de0bf999a4dd61e0deb47636eaa3041942b425 From 1d0ff2c975210eb01cbeff5dbd257234775d9aaf Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 19 Apr 2023 13:00:33 -0700 Subject: [PATCH 5970/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/248de798764ff1306701dcabb86bbc5c647ac719 https://github.com/facebook/fb303/commit/f8f4e4e4fbe9583512f5408cca0b1de588875335 https://github.com/facebook/fbthrift/commit/f22096dffdffd370b69ed4d0f277e388dfd0d26f https://github.com/facebook/litho/commit/cff65f819e32152f600673082502da2685ff859d https://github.com/facebook/ocamlrep/commit/2eb960e8cf03c5ada7f9acb05f176aa2a7bc9f84 https://github.com/facebook/wangle/commit/39bcd139c1842df36a92aa69cdd62ebc73b96ce0 https://github.com/facebook/watchman/commit/13d039ab4f379c79e431bd6515ce659dae5402a0 https://github.com/facebookincubator/katran/commit/be1025f20cc0862a0d53428c0789b8cd3e4fe8d4 https://github.com/facebookincubator/velox/commit/cc6ec8c438ed14f974cba204f8ea1359598e57b2 https://github.com/pytorch/fbgemm/commit/e53cdde6ba820c585a8f94c09fa32dff154d4276 https://github.com/pytorch/kineto/commit/487adbaca8ca5bc440f15757e7437f8cc714d27e Reviewed By: bigfootjon fbshipit-source-id: 142fa7429fc8660dbf00d9c1d9dcb2609def75df --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 72d9b5ebb7bc..730ac2c83dd7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 00de0bf999a4dd61e0deb47636eaa3041942b425 +Subproject commit f22096dffdffd370b69ed4d0f277e388dfd0d26f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 416391c555b3..b444c6948fc8 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7a04ee349078aab083255a5f36e52611bbc8fcdb +Subproject commit 39bcd139c1842df36a92aa69cdd62ebc73b96ce0 From 9f8b7c4e382cdb712b38de06bc5285fe7ca88aff Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 19 Apr 2023 13:58:51 -0700 Subject: [PATCH 5971/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/a21955fdf3e12bdf58bdde13514fe25cef05cb19 https://github.com/facebook/ocamlrep/commit/3974a7cdade3d0bd8ff3d06afb132e7414474526 https://github.com/facebook/proxygen/commit/281228df65709f3daa7b3845f1607d485c1e96f8 https://github.com/facebook/watchman/commit/1d0ff2c975210eb01cbeff5dbd257234775d9aaf https://github.com/facebookincubator/velox/commit/9a07acb5bcac718a5cdb40ae914f4a40bf0c459c Reviewed By: bigfootjon fbshipit-source-id: f3f638b073d9809b68cd7ca1b4842b1daf5db884 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 730ac2c83dd7..47cea713a613 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f22096dffdffd370b69ed4d0f277e388dfd0d26f +Subproject commit a21955fdf3e12bdf58bdde13514fe25cef05cb19 From ee27a995e9627d1483bea2d05c238f87060fe3cc Mon Sep 17 00:00:00 2001 From: Michael Cuevas Date: Wed, 19 Apr 2023 17:48:40 -0700 Subject: [PATCH 5972/7387] use folly signal handlers Summary: On Linux, let's try using folly signal handlers so that we can get a better stacktrace when something SIGTERMs us. Reviewed By: chadaustin Differential Revision: D44890441 fbshipit-source-id: 072ff7ce5ab746b333da1f17d962c9678da87039 --- watchman/WatchmanConfig.h | 6 ++++++ watchman/listener.cpp | 6 +++++- watchman/main.cpp | 20 +++++++++++++------- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/watchman/WatchmanConfig.h b/watchman/WatchmanConfig.h index 2113e167c7aa..ae22e8462ae9 100644 --- a/watchman/WatchmanConfig.h +++ b/watchman/WatchmanConfig.h @@ -7,6 +7,8 @@ #pragma once +#include + #include "watchman/thirdparty/jansson/jansson.h" class w_string; @@ -30,6 +32,10 @@ std::string cfg_pretty_print_root_files(const json_ref& root_files); namespace watchman { +// Folly signal handling will be limited to Linux for now. We eventually want +// to move all platforms to folly signal handling. +constexpr bool kUseFollySignalHandler = folly::kIsLinux; + class Configuration { public: Configuration(); diff --git a/watchman/listener.cpp b/watchman/listener.cpp index e80393a1a316..70746fe7ce6c 100644 --- a/watchman/listener.cpp +++ b/watchman/listener.cpp @@ -450,7 +450,11 @@ bool w_start_listener() { sigaddset(&sigset, SIGCHLD); sigprocmask(SIG_BLOCK, &sigset, NULL); #endif - setup_signal_handlers(); + // TODO: We are trying out folly signal handling on Linux. Eventually we + // should remove this if and use folly signal handling on all platforms. + if (!kUseFollySignalHandler) { + setup_signal_handlers(); + } std::optional tcp_loop; std::optional unix_loop; diff --git a/watchman/main.cpp b/watchman/main.cpp index 01a83f8855a5..25e12cc20f3f 100644 --- a/watchman/main.cpp +++ b/watchman/main.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -987,14 +988,19 @@ static SpawnResult try_spawn_watchman( } static int inner_main(int argc, char** argv) { - // Since we don't fully integrate with folly, but may pull - // in dependencies that do, we need to perform a little bit - // of bootstrapping. We don't want to run the full folly - // init today because it will interfere with our own signal - // handling. In the future we will integrate this properly. - folly::SingletonVault::singleton()->registrationComplete(); + // TODO: We used to avoid folly::init so it didn't interfere with our own + // signal handling. We want to swap to folly signal handling, so we'll do a + // full init on Linux to test it. We should remove this if in the future. + if (kUseFollySignalHandler) { + folly::init(&argc, &argv, folly::InitOptions().useGFlags(false)); + } else { + folly::SingletonVault::singleton()->registrationComplete(); + } + SCOPE_EXIT { - folly::SingletonVault::singleton()->destroyInstancesFinal(); + if (!kUseFollySignalHandler) { + folly::SingletonVault::singleton()->destroyInstancesFinal(); + } }; auto daemon_argv = parse_cmdline(&argc, &argv); From 7416ab73d610312570ce38eed283731fc6e9b6bf Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 19 Apr 2023 18:57:33 -0700 Subject: [PATCH 5973/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/6c849a5195b214bb942bf154f6490166dfdd9a08 https://github.com/facebook/watchman/commit/ee27a995e9627d1483bea2d05c238f87060fe3cc https://github.com/facebookincubator/velox/commit/2f52e848d41ea7bee31967848554e9b5375b334e Reviewed By: bigfootjon fbshipit-source-id: cc05cd4032b68ac27c0dcdc9c305937f5fe7a3f6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 47cea713a613..69634e535c02 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a21955fdf3e12bdf58bdde13514fe25cef05cb19 +Subproject commit 6c849a5195b214bb942bf154f6490166dfdd9a08 From d55b999bf9265359d05ead11d45eacead576dc22 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 20 Apr 2023 14:52:19 -0700 Subject: [PATCH 5974/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/c38dee1a78f99f313fa950268dca3eb0405bee41 https://github.com/facebook/litho/commit/91bd4c940a388b1df6319d94935437405dc852fb https://github.com/facebook/ocamlrep/commit/dfd6384843b99d2170b775b9fa0e74e38b733961 https://github.com/facebook/rocksdb/commit/0a774a102f0be845007e3927dcda228716a771d2 https://github.com/facebookincubator/velox/commit/3fb6e7512c1416d1a5890c78de01e93c79ed4372 Reviewed By: bigfootjon fbshipit-source-id: c254b9eb8da7474f6c8c24dbacb851f6cd476946 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 69634e535c02..b7af04387148 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6c849a5195b214bb942bf154f6490166dfdd9a08 +Subproject commit c38dee1a78f99f313fa950268dca3eb0405bee41 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a1f05b055547..00c315b5fbcb 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 3a3a6d4fb673443f04536f2d385b9545ba135d7e +Subproject commit 08b97b9a4e2efb5e87a43a32c28cebb8db8824e4 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b444c6948fc8..bdc2569fcb85 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 39bcd139c1842df36a92aa69cdd62ebc73b96ce0 +Subproject commit 64d6a4bfd41c795300d29555dde5c297d9515588 From 000d905c3580169db6f22f1f635ad2f6523b94cb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 21 Apr 2023 02:22:56 -0700 Subject: [PATCH 5975/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5cdd0cf0079f6ba59a34d54f2030ffc41e51c776 https://github.com/facebook/proxygen/commit/86f94ae41225f34f6adc7f0096600ab3462f2b16 https://github.com/facebookincubator/mvfst/commit/8a497d321556094051182f3a157f04c5c006c03b Reviewed By: bigfootjon fbshipit-source-id: 0071f6efe6c7ba8e7d0f3def3ff7d0d782c63364 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b7af04387148..e062d6a02e98 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c38dee1a78f99f313fa950268dca3eb0405bee41 +Subproject commit 5cdd0cf0079f6ba59a34d54f2030ffc41e51c776 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index bdc2569fcb85..01f01d578a46 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 64d6a4bfd41c795300d29555dde5c297d9515588 +Subproject commit d33c416f03ba40033fb7a1026703150a7548b727 From 202d24b374f4c48b89eac0f5dacf9806d9a8b075 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 21 Apr 2023 10:53:18 -0700 Subject: [PATCH 5976/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/ae499882a1bfe8a6e2348e749a68010833ea1771 https://github.com/facebook/litho/commit/3606904f48b8b718b38027b018cdf41914ad00e6 https://github.com/facebook/ocamlrep/commit/d73f9769cd2f69039c3f425c8fc230dd18270005 https://github.com/facebookincubator/velox/commit/e264875c3ff9e25013175a7af7c1b2c5e9fcd068 Reviewed By: bigfootjon fbshipit-source-id: 4c4a0755cbef465ecf7b7fcf6ca7d10f22b4936d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e062d6a02e98..cd51c916f10d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5cdd0cf0079f6ba59a34d54f2030ffc41e51c776 +Subproject commit ae499882a1bfe8a6e2348e749a68010833ea1771 From 80a8471a633b05fc2b253ce9b7390016ee06d7d3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 21 Apr 2023 16:51:26 -0700 Subject: [PATCH 5977/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/77e9aec876d09e4b0e33fe1be9c765d84d530dc1 https://github.com/facebook/litho/commit/e58db95c791ed6e678287a9a991456d2b472fd3f https://github.com/facebook/mcrouter/commit/0934f6c285ab12d81c5a2f4afdb9ad051bbbbc24 Reviewed By: bigfootjon fbshipit-source-id: 1491c96b7c4047c92d7c0ac2c1cd53eadcd5f06f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cd51c916f10d..213fee1737c3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ae499882a1bfe8a6e2348e749a68010833ea1771 +Subproject commit 77e9aec876d09e4b0e33fe1be9c765d84d530dc1 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 00c315b5fbcb..a5e7a9fb89bd 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 08b97b9a4e2efb5e87a43a32c28cebb8db8824e4 +Subproject commit fc8514ed53b8d91c5304c2b7dcf8b5ce49598cb9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 01f01d578a46..c02b60b24063 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d33c416f03ba40033fb7a1026703150a7548b727 +Subproject commit 7a3b6e57df674d286c4ee8252bb0f30a040b15d2 From e2c0278e9c703594510f75abd71b13e804271728 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 21 Apr 2023 18:52:04 -0700 Subject: [PATCH 5978/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/d498b9335227f30f9a8f52be513ab2fc5bb30bf9 https://github.com/facebook/fbthrift/commit/4a5a7ef70ad2ba6d232c2d93ae2282e6f993bef7 https://github.com/facebook/folly/commit/e3b9b1e936e1d27908a18ee27c62274db87ca5ab Reviewed By: bigfootjon fbshipit-source-id: 0c119d1f0712b3a09172863bb681dbf027bf87f1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 213fee1737c3..c363b25710b8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 77e9aec876d09e4b0e33fe1be9c765d84d530dc1 +Subproject commit 4a5a7ef70ad2ba6d232c2d93ae2282e6f993bef7 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a5e7a9fb89bd..89d74e8d72c5 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit fc8514ed53b8d91c5304c2b7dcf8b5ce49598cb9 +Subproject commit e3b9b1e936e1d27908a18ee27c62274db87ca5ab From 8bf2b04eb77653d418c745ddcc2c37fdbccab4c3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 21 Apr 2023 19:45:34 -0700 Subject: [PATCH 5979/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/da5d6edd5898ed699288eb0297f19fb9dfa3fb79 https://github.com/facebook/fbthrift/commit/f2a6e5991762244ea94d9887d03f07609cf65a8a https://github.com/facebook/proxygen/commit/e251c3e7302ad41e9969a6e7078d2d6615efae21 https://github.com/facebook/watchman/commit/e2c0278e9c703594510f75abd71b13e804271728 https://github.com/facebookincubator/velox/commit/372c9af8a416cac6890c2afcdb155a95f9fdc557 Reviewed By: bigfootjon fbshipit-source-id: afb9f2d42b3e3efe9ddc833e6a6f95c1adcb87bb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c363b25710b8..1cecbafdf257 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4a5a7ef70ad2ba6d232c2d93ae2282e6f993bef7 +Subproject commit f2a6e5991762244ea94d9887d03f07609cf65a8a From f60a0336cbb854c1f59e40b513df486e6bfbf583 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 22 Apr 2023 13:13:37 -0700 Subject: [PATCH 5980/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/a28ec399b8785c8ac77eede5f056fa69f39d9304 https://github.com/facebook/wangle/commit/8365d3bfa9a818e19323ec857e379b1e76a2ce75 https://github.com/facebookexperimental/edencommon/commit/f291be1643cb21a97b28d60f591cc436950ab455 https://github.com/facebookincubator/fizz/commit/d7bcaa8d7272ba152d80e2ce5e0dd1f3a030995c https://github.com/facebookincubator/katran/commit/115618a61480d5d4107c015cc47ec248ddb8f556 Reviewed By: bigfootjon fbshipit-source-id: 2fad1854609bee4bda5787f5a464ace328ccdd5d --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c02b60b24063..5c8a9d50aaeb 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7a3b6e57df674d286c4ee8252bb0f30a040b15d2 +Subproject commit 8365d3bfa9a818e19323ec857e379b1e76a2ce75 From 1e94d4eecfd74bae66c7e7e53774c7756b45e471 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 22 Apr 2023 20:28:56 -0700 Subject: [PATCH 5981/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/922680310c6d83896a76d2d2ec3bc7b4c785972a https://github.com/facebook/fbthrift/commit/c9b4fa97963ebf5ad666794652af32110e9e0b21 https://github.com/facebook/wangle/commit/379c9092f06420d010509b8f33bcdcdf75e00d0c https://github.com/facebookincubator/katran/commit/2800d03ab97ecb987dc495ecc613bb64f6df5d9c https://github.com/facebookincubator/mvfst/commit/bd5491552fb81c3e279b99f787ed323b636d133c Reviewed By: bigfootjon fbshipit-source-id: 5e5122e5c09e0aabd8470facc21ffd947efcd7e9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1cecbafdf257..d6ce40b0aea2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f2a6e5991762244ea94d9887d03f07609cf65a8a +Subproject commit c9b4fa97963ebf5ad666794652af32110e9e0b21 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5c8a9d50aaeb..26690abf31ee 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8365d3bfa9a818e19323ec857e379b1e76a2ce75 +Subproject commit 379c9092f06420d010509b8f33bcdcdf75e00d0c From 62e7935328341d4bdc174728cbb2d478f6bbe48e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 23 Apr 2023 14:33:20 -0700 Subject: [PATCH 5982/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/6202c14f5cfcd043bbd944e1653e5ae523f65562 https://github.com/facebook/fb303/commit/b53e2a83ae0bafcdf5b2b711bbf4c7081eee2a07 https://github.com/facebook/fbthrift/commit/ee5afbb82d2b0fbd5082dd3bdbee7315456db49f https://github.com/facebook/proxygen/commit/c677c88c2566d3aec0f08769fd5d7fde8d9deab7 https://github.com/facebook/watchman/commit/1e94d4eecfd74bae66c7e7e53774c7756b45e471 Reviewed By: bigfootjon fbshipit-source-id: f220e10fc215d626d7b2b173bab2b39859ee291e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d6ce40b0aea2..442dbbb49453 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c9b4fa97963ebf5ad666794652af32110e9e0b21 +Subproject commit ee5afbb82d2b0fbd5082dd3bdbee7315456db49f From bb97d7e4a2ef3d81ef7fac100654c0d74eba80fb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 24 Apr 2023 12:29:49 -0700 Subject: [PATCH 5983/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/ebd2568cd64a624064ab57675ecafd5bcc90a1e4 https://github.com/facebook/ocamlrep/commit/777abec6ee276f099e7fee4abed80cb2f27b87dd https://github.com/facebookincubator/velox/commit/e62ff1dfca9d8c4ed7dc27accdda9c8aae98d43c https://github.com/pytorch/fbgemm/commit/c03208718622ba3176239cc31c3b984fd9037b5b Reviewed By: jailby fbshipit-source-id: 0d3774adb285c3af2b74281b485058a848c7058b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 442dbbb49453..330be74c5800 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ee5afbb82d2b0fbd5082dd3bdbee7315456db49f +Subproject commit ebd2568cd64a624064ab57675ecafd5bcc90a1e4 From 8c59861a662a9bd285ced98ffcfefa3adaa36e07 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 24 Apr 2023 13:40:58 -0700 Subject: [PATCH 5984/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/a36563d5beaf04ebf3fa84c73d10662ebbc038d0 https://github.com/facebook/folly/commit/bbea491604736f0c492a5cfc68d1db067107dd25 Reviewed By: jailby fbshipit-source-id: 1db8579e91ae51394c92b86bdee2541909abd584 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 330be74c5800..3255f28c5c4c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ebd2568cd64a624064ab57675ecafd5bcc90a1e4 +Subproject commit a36563d5beaf04ebf3fa84c73d10662ebbc038d0 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 89d74e8d72c5..77b5fab02a3f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e3b9b1e936e1d27908a18ee27c62274db87ca5ab +Subproject commit bbea491604736f0c492a5cfc68d1db067107dd25 From 73179f56d273840563558b81bf766b5f794541ed Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 24 Apr 2023 15:27:22 -0700 Subject: [PATCH 5985/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/57fce894a4fc35d38abb41511b40933a88e9673e https://github.com/facebook/fb303/commit/1f99bc0308bdf8258c46c983c60f44bbd97703bc https://github.com/facebook/fbthrift/commit/f52b3e72d94537c82789d77897d64c7f4bc75d7c https://github.com/facebook/ocamlrep/commit/5d49a8daa818cb115fc94ffbc24d318ea6afbf27 https://github.com/facebookexperimental/rust-shed/commit/34c4c188e0e08b84b612328bc8b9a133bfaf765c https://github.com/facebookincubator/mvfst/commit/ded3f445eaa7ca69b74bdb0cf8d6523a5c8c7182 Reviewed By: jailby fbshipit-source-id: 894bcd53dbbfe48d9802ef41f7e9b6e377ce28e3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3255f28c5c4c..62f536461288 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a36563d5beaf04ebf3fa84c73d10662ebbc038d0 +Subproject commit f52b3e72d94537c82789d77897d64c7f4bc75d7c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 26690abf31ee..eeb7403083a7 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 379c9092f06420d010509b8f33bcdcdf75e00d0c +Subproject commit b070b3eb594866358ba8a8c368ceeac802c3e9e1 From c76b3d29053478563780fa231a244da806ae2233 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 24 Apr 2023 16:46:23 -0700 Subject: [PATCH 5986/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/718a10b8359b20a0f70b74815e19990a3e0bbac1 https://github.com/facebook/ocamlrep/commit/a2ed2941e3512aaf3fd7386a2603baa39196bc33 https://github.com/facebookincubator/velox/commit/cc6a58bd22e6b67f67a51f6763ca12a4d30ad305 Reviewed By: jailby fbshipit-source-id: 45b728f84cafbd7777b574d957ccf28e08c61eac --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 62f536461288..6d1a034a1dc8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f52b3e72d94537c82789d77897d64c7f4bc75d7c +Subproject commit 718a10b8359b20a0f70b74815e19990a3e0bbac1 From 94166c4dc78886a58cd463cb97b563aa6dd5c89e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 24 Apr 2023 20:22:24 -0700 Subject: [PATCH 5987/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/384b40a22c85780d835530a9fb6e5e72591975ac https://github.com/facebook/fbthrift/commit/bdf016b76cf5ce7e04e2183007bd6b4d94497b07 https://github.com/facebook/litho/commit/4453c239a03c248ed2f5e78a5bf5d3768ce0dec3 https://github.com/facebookincubator/fizz/commit/5a140af5b4e5a02876fea05ae73e71806f4b8a70 https://github.com/facebookincubator/velox/commit/0ada6a05fabe88f31748a918dc4390007bb33005 https://github.com/fairinternal/egohowto/commit/80e922e5a39973791e321bcd742eaabc17bda50d Reviewed By: jailby fbshipit-source-id: 74734036f4aa43ec3de9f0fcf23331c67a0e9b13 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6d1a034a1dc8..5255e325da88 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 718a10b8359b20a0f70b74815e19990a3e0bbac1 +Subproject commit bdf016b76cf5ce7e04e2183007bd6b4d94497b07 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 77b5fab02a3f..1e12d169252e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit bbea491604736f0c492a5cfc68d1db067107dd25 +Subproject commit 28e4a1f42b6ebf1205e4bc066f392bcae86cda9b From b01da12b17b6a075ccf93291cf38a718946e88ab Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 24 Apr 2023 23:05:45 -0700 Subject: [PATCH 5988/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/27b47bf80c1e3760efb381bcbf02064d9a3a40e6 Reviewed By: jailby fbshipit-source-id: 26bf4cc9bfd07179ce16c03f0db0be60abd00ea8 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 1e12d169252e..b4f0c7026552 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 28e4a1f42b6ebf1205e4bc066f392bcae86cda9b +Subproject commit 27b47bf80c1e3760efb381bcbf02064d9a3a40e6 From f4def7c4663edca769bc12ac870a7f1a3514ccda Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 25 Apr 2023 10:38:17 -0700 Subject: [PATCH 5989/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/bb9ff7c359be923e0d6dd3bade02c5abefe70448 Reviewed By: jailby fbshipit-source-id: b22d1c4e385792a118720e5bb7d63721f0442833 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5255e325da88..f07bd648b1a2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bdf016b76cf5ce7e04e2183007bd6b4d94497b07 +Subproject commit bb9ff7c359be923e0d6dd3bade02c5abefe70448 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b4f0c7026552..c14f6d14d498 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 27b47bf80c1e3760efb381bcbf02064d9a3a40e6 +Subproject commit 7dc90ec9db55c6e83c8eb930fa6ef31399215a14 From 9391132cc2e68762e5c1904a6215537e0be2e3fa Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 25 Apr 2023 11:30:32 -0700 Subject: [PATCH 5990/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/e93b25daf9265765007cd3df43ceb9b45ad40ca6 https://github.com/facebook/rocksdb/commit/40d69b59ad87730b13259209a59eb8aaa8d1b71a https://github.com/facebookincubator/mvfst/commit/9ceb7790fc821dfbf9f768096c6786e3c01f1eee Reviewed By: jailby fbshipit-source-id: a1c2d43736c91ba92ccacbde192b9f2fb03b28fd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f07bd648b1a2..944a3de22ead 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bb9ff7c359be923e0d6dd3bade02c5abefe70448 +Subproject commit e93b25daf9265765007cd3df43ceb9b45ad40ca6 From 91110654e4146745ce9b358f50db5bc25a98bff1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 25 Apr 2023 12:35:07 -0700 Subject: [PATCH 5991/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/ccd05995f9cba4199cb3dd95d62092e2bd023963 https://github.com/facebook/fbthrift/commit/be8456ce32413a108a1bf3edbe0e2274afb56357 https://github.com/facebook/proxygen/commit/28eb8df798f0ce3033673e037f9767d50cdaeff8 https://github.com/facebook/watchman/commit/9391132cc2e68762e5c1904a6215537e0be2e3fa Reviewed By: jailby fbshipit-source-id: 05b9031ee48092808222baf2f0ec43b835d7e05f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 944a3de22ead..faa8912bb594 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e93b25daf9265765007cd3df43ceb9b45ad40ca6 +Subproject commit be8456ce32413a108a1bf3edbe0e2274afb56357 From 511626bcdc163cf1838fb0ebdca813dbcde788ec Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 25 Apr 2023 15:10:45 -0700 Subject: [PATCH 5992/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/8c407a8d3ccb4ca7d5aae06034e51c8adfd020c0 https://github.com/facebook/fb303/commit/f81f2fcfe34567c645b1d3208fc18b0fe91e1ce2 https://github.com/facebook/fbthrift/commit/d2de1f4a6f3689b41dc09732ef578c71a6470dda https://github.com/facebook/ocamlrep/commit/f4e5e52ff75fe1b1b3fc5cbcc8792b8ffde28969 https://github.com/facebook/rocksdb/commit/62fc15f009eba86e65f2f7448829429eae9ad071 https://github.com/facebook/wangle/commit/2520fa1256db7bc3ab62a6d4a92d676c995ed888 https://github.com/facebookexperimental/edencommon/commit/5d3934b48f184fea73dadadd94c1655e164239d7 https://github.com/facebookexperimental/rust-shed/commit/284feb34dd1718e3df1ef4af80eabbf7302ae395 https://github.com/facebookincubator/velox/commit/e670ee7053e5d1c1be186c08655d9e1d1ddff73b https://github.com/pytorch/fbgemm/commit/3bf2cf93b97a2dee856ee81d1b6bd60427f1e83e Reviewed By: jailby fbshipit-source-id: d136ebff8b355831133a10d209d419ddd23f5e3c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index faa8912bb594..d5d9da3de566 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit be8456ce32413a108a1bf3edbe0e2274afb56357 +Subproject commit d2de1f4a6f3689b41dc09732ef578c71a6470dda diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index eeb7403083a7..d280c9534d58 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b070b3eb594866358ba8a8c368ceeac802c3e9e1 +Subproject commit 2520fa1256db7bc3ab62a6d4a92d676c995ed888 From adedfdd27f2403c04c9d7297fd65a3b343d63473 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 25 Apr 2023 17:22:57 -0700 Subject: [PATCH 5993/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/99f42d1f49147581fcd9ad01e882d123fcdba5de https://github.com/facebook/fbthrift/commit/9e316371a6eb3644d5c1ffcdb41a774e154704ab https://github.com/facebook/ocamlrep/commit/ec95f46807d35de03d4186d373ca479af8b23c6d https://github.com/facebookexperimental/rust-shed/commit/6450f759b9ffaf9dbc85b838b41d301bde1102ca https://github.com/facebookincubator/katran/commit/bfbc9bd3604b2f772f9fc8ba79d04d058e10182e https://github.com/facebookincubator/mvfst/commit/ffc7f97e4baee3b68fb6d24a1a4c8686635cd8dc https://github.com/facebookincubator/velox/commit/af1c49da4f34fe907921082a99ef248e1edf8fb5 https://github.com/fairinternal/egohowto/commit/365ca32f097da23d6630a3bc1e50c23b0def5902 Reviewed By: jailby fbshipit-source-id: 11d4e482bad82036d985d4ba458541083b78617d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d5d9da3de566..a63f532eaf9a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d2de1f4a6f3689b41dc09732ef578c71a6470dda +Subproject commit 9e316371a6eb3644d5c1ffcdb41a774e154704ab From 8d956a9daf50d536b67222fc20c6ed8fe4db8ed7 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 26 Apr 2023 02:30:11 -0700 Subject: [PATCH 5994/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/litho/commit/ddb9caed36bc75ecfc63046fa1e83c8f8637ce77 https://github.com/facebook/wangle/commit/ef407b220bc077e9d77cf488b81b36453dfb2678 Reviewed By: jailby fbshipit-source-id: 05ef511a68e4866dc0df53ce7a7831dbf5ddd673 --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d280c9534d58..f40d8d1b52db 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2520fa1256db7bc3ab62a6d4a92d676c995ed888 +Subproject commit ef407b220bc077e9d77cf488b81b36453dfb2678 From 045291204293e87e3a05298135cb65e4f99b0ae3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 26 Apr 2023 11:57:30 -0700 Subject: [PATCH 5995/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/bdb837b9023d1305701928a9f5d1d44c319cafa5 https://github.com/facebook/ocamlrep/commit/c51f452f9b0326d4396be6c40e65868a7040c693 Reviewed By: jailby fbshipit-source-id: 99eb754f284831b7be7ab169ad3fe7d9609f9a4e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a63f532eaf9a..a23c70a25375 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9e316371a6eb3644d5c1ffcdb41a774e154704ab +Subproject commit bdb837b9023d1305701928a9f5d1d44c319cafa5 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index c14f6d14d498..dda20187df17 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7dc90ec9db55c6e83c8eb930fa6ef31399215a14 +Subproject commit b91f6b95e66fe8a3882e78a3f5e53238dca1917d From 61894f973e03bc043c95b74f0ff9054f4622d7e2 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 26 Apr 2023 13:50:44 -0700 Subject: [PATCH 5996/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/d583d931b79e34b0581df92ec923d2cd465b07c1 https://github.com/facebook/fbthrift/commit/b857bcff92283ae965538181b3f825da3a469712 https://github.com/facebook/proxygen/commit/59619d896476a0a6c47d5ea3628a7c1ec21924f9 https://github.com/facebookincubator/mvfst/commit/65f550c86ba40e72965c922ddf989efba35a7b67 https://github.com/facebookincubator/velox/commit/07c45132c093624b575f6578ef0f4e15f868c418 Reviewed By: jailby fbshipit-source-id: 173f8327f29b70296432fcdd2b554de55acd1eec --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a23c70a25375..0c9f74743891 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bdb837b9023d1305701928a9f5d1d44c319cafa5 +Subproject commit b857bcff92283ae965538181b3f825da3a469712 From 8d3a2a449967d07a6a6415011343ae1835623e70 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 26 Apr 2023 16:22:22 -0700 Subject: [PATCH 5997/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/9decbca7260b01247d1b525a1f3cfd3872fc293e https://github.com/facebook/litho/commit/9bc420630ff6b74922902fe05c102356f24fa7c2 https://github.com/facebook/ocamlrep/commit/507212bf650e3dc97dce273e874b018d3c32a16d https://github.com/facebook/proxygen/commit/ef7358f08d1eb9e36714816d77f1a2afbed60a2b https://github.com/facebook/watchman/commit/61894f973e03bc043c95b74f0ff9054f4622d7e2 https://github.com/facebookresearch/multimodal/commit/c6f6e44ec6e0addfdf01695db860a6febeb2d88b Reviewed By: jailby fbshipit-source-id: 041f62dd664ef832db998e45cc80b92ce1306edd --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index dda20187df17..ec7bfeb15735 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b91f6b95e66fe8a3882e78a3f5e53238dca1917d +Subproject commit 9decbca7260b01247d1b525a1f3cfd3872fc293e From 2cd57b8ba196b7ba00286db95d47c7271e8d5dff Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 26 Apr 2023 17:03:51 -0700 Subject: [PATCH 5998/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c11dd56d86457acbd6497fc1a4169807f1daad6d https://github.com/facebook/fbthrift/commit/fefb80f2b0ce7783152bca6f9eeb8ea36619bd4c https://github.com/facebook/litho/commit/93419ec89663a0752312dbd930f29fe1fc9ee858 https://github.com/facebook/ocamlrep/commit/605aeab3147ceddb9bdbbe6463d82c02f7ac2d7e https://github.com/facebook/wangle/commit/0b78771cc9532abe4bff4345200ff8dffcd69293 https://github.com/facebookexperimental/rust-shed/commit/6f39a21cf8dfa0956b46d870f2b6d1ad391e7c45 https://github.com/facebookincubator/katran/commit/c9c86c0ab0298a2f6d74bc212c806f182a1278a2 https://github.com/facebookincubator/mvfst/commit/c97f84a5fd3583def98f46c430361251d0b7214f https://github.com/facebookincubator/velox/commit/aa5d148b647ff5ad1e3cb8cc071022761d14a578 Reviewed By: jailby fbshipit-source-id: 0cc83a837df052079347915da6ae7ff150961f07 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0c9f74743891..5c1254bf41c5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b857bcff92283ae965538181b3f825da3a469712 +Subproject commit fefb80f2b0ce7783152bca6f9eeb8ea36619bd4c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f40d8d1b52db..516df4cf7a26 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ef407b220bc077e9d77cf488b81b36453dfb2678 +Subproject commit 0b78771cc9532abe4bff4345200ff8dffcd69293 From ce0da37121d40855df80e0c3a2a6f583ad5bf561 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 27 Apr 2023 13:50:46 -0700 Subject: [PATCH 5999/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/ffa826a4c478d5beabe8be09063f83fc54550a73 Reviewed By: jailby fbshipit-source-id: 9a96e0313e379d6f9ed27aeab4c6f679e78a2160 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5c1254bf41c5..2c462c6c73d5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit fefb80f2b0ce7783152bca6f9eeb8ea36619bd4c +Subproject commit ffa826a4c478d5beabe8be09063f83fc54550a73 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ec7bfeb15735..f33777ad9f51 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9decbca7260b01247d1b525a1f3cfd3872fc293e +Subproject commit aa7200f7e2a23f640bbe44a36fee18072c15c138 From 47be2229eaec6aa6e09c825b577ad9ac3d995f5b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 27 Apr 2023 14:30:01 -0700 Subject: [PATCH 6000/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/c9222bed40bb35758c73c6cfb56b3ab12edbc95f https://github.com/facebook/litho/commit/ff787ea0736f6a3a378b8e0cee89eb5a9560eda6 https://github.com/facebookexperimental/rust-shed/commit/cde3e3ad93801c6f81ac3987c7a621ff7e0875dc https://github.com/facebookincubator/velox/commit/e520d40166ba79b3ae91f6439900b920a7b9fe57 https://github.com/pytorch/fbgemm/commit/0d4c9f330c0942f4b6451c0f5a6d3257bcd60cd8 Reviewed By: jailby fbshipit-source-id: e81b0c43570d5368a734dfb3fc902412b7f0f529 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2c462c6c73d5..a5e86dfca30a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ffa826a4c478d5beabe8be09063f83fc54550a73 +Subproject commit c9222bed40bb35758c73c6cfb56b3ab12edbc95f From bbb269913102f5c685ac6503c7b54b44ecffd678 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 27 Apr 2023 21:30:58 -0700 Subject: [PATCH 6001/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/09b2d47e80e36d981b5e1316ff67aa33ff919cf8 Reviewed By: jailby fbshipit-source-id: 0c1e98a32038d479e8bdfe341ef80758d5821f13 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a5e86dfca30a..9361c9c0ce3e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c9222bed40bb35758c73c6cfb56b3ab12edbc95f +Subproject commit 0b63ef0c3db580dfd283ed7ec0e0c01a68cc5b4f diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f33777ad9f51..276213ad9328 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit aa7200f7e2a23f640bbe44a36fee18072c15c138 +Subproject commit 09b2d47e80e36d981b5e1316ff67aa33ff919cf8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 516df4cf7a26..b63007c84f8f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0b78771cc9532abe4bff4345200ff8dffcd69293 +Subproject commit 02aca162461ccbf8c686afc0ab93679b0109b41e From b0a4464c0d5f5fcfc69db2bbe56878f8d4e39033 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 27 Apr 2023 22:18:26 -0700 Subject: [PATCH 6002/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/1686ff3f41eb81d216cccb8ef3d5807c1f9f6b66 https://github.com/facebook/proxygen/commit/6f3080a7e458dbc77e52879ce4ef8e32c0319d8c https://github.com/facebookincubator/mvfst/commit/2f5a900da8c1497de3d890f520729db7d0ecc4a9 https://github.com/facebookincubator/velox/commit/0dc331bd6e351711b0df0f6350324fe060585758 Reviewed By: jailby fbshipit-source-id: a42300d39daae0f5e55601f78d588a5ceececfd6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9361c9c0ce3e..aa32023fc35a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0b63ef0c3db580dfd283ed7ec0e0c01a68cc5b4f +Subproject commit 1686ff3f41eb81d216cccb8ef3d5807c1f9f6b66 From 2a7283476c57307231b2ebf11e40813042e54855 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 28 Apr 2023 04:59:01 -0700 Subject: [PATCH 6003/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/d8cc74c20e0b86b050f14e4d9b49ce9c0e5de853 Reviewed By: jailby fbshipit-source-id: 490e3594a37342f61ad02372efe2c42896ace391 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index aa32023fc35a..e50a845aaa20 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1686ff3f41eb81d216cccb8ef3d5807c1f9f6b66 +Subproject commit d8cc74c20e0b86b050f14e4d9b49ce9c0e5de853 From 020f115a8d0559fcf0dfc8d706db084f6636db93 Mon Sep 17 00:00:00 2001 From: Xavier Deguillard Date: Fri, 28 Apr 2023 10:05:28 -0700 Subject: [PATCH 6004/7387] InMemoryView: do not warm sha1 cache for large files Summary: Computing sha1 for very large files can be extremely expensive, and in the case where that file keeps beeing written to, Watchman can end-up burning CPU cycles and all of the cores of the system for the cache to be invalid by the time the data is needed. This introduces a new config that allows the cache warmer to skip over large files (>10MB) to avoid falling into this pathological case. The downside is that if the sha1 is needed it'll be computed on the fly and then stored in the cache. Reviewed By: fanzeyi Differential Revision: D45377529 fbshipit-source-id: 69c9b0cde1bb72978af22baf92414375d54a47da --- watchman/InMemoryView.cpp | 7 ++++++- watchman/InMemoryView.h | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/watchman/InMemoryView.cpp b/watchman/InMemoryView.cpp index 7613b9fe857f..add7c11f4bc5 100644 --- a/watchman/InMemoryView.cpp +++ b/watchman/InMemoryView.cpp @@ -473,6 +473,9 @@ InMemoryView::InMemoryView( config_.getBool("content_hash_warming", false)), maxFilesToWarmInContentCache_( size_t(config_.getInt("content_hash_max_warm_per_settle", 1024))), + maxFileSizeToWarmInContentCache_(int64_t(config_.getInt( + "content_hash_max_file_size_to_warm", + 10 * 1024 * 1024))), syncContentCacheWarming_( config_.getBool("content_hash_warm_wait_before_settle", false)) { json_int_t in_memory_view_ring_log_size = @@ -1197,7 +1200,9 @@ void InMemoryView::warmContentCache() { break; } - if (f->exists && f->stat.isFile()) { + if (f->exists && f->stat.isFile() && + (maxFileSizeToWarmInContentCache_ <= 0 || + f->stat.size <= maxFileSizeToWarmInContentCache_)) { // Note: we could also add an expression to further constrain // the things we warm up here. Let's see if we need it before // going ahead and adding. diff --git a/watchman/InMemoryView.h b/watchman/InMemoryView.h index 3d84f2571d25..56cfc2bd7a59 100644 --- a/watchman/InMemoryView.h +++ b/watchman/InMemoryView.h @@ -414,6 +414,9 @@ class InMemoryView final : public QueryableView { bool enableContentCacheWarming_{false}; // How many of the most recent files to warm up when settling? size_t maxFilesToWarmInContentCache_{1024}; + // Do not warm up files whose size is greater than this. A size of 0 is + // equivalent to unlimited. + int64_t maxFileSizeToWarmInContentCache_{10 * 1024 * 1024}; // If true, we will wait for the items to be hashed before // dispatching the settle to watchman clients bool syncContentCacheWarming_{false}; From bbb45eb2adfd140c96b6fb106c5fa9afa392bf58 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 28 Apr 2023 10:55:42 -0700 Subject: [PATCH 6005/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/1b752ade62653c3866a5d3d54c8d02ea261660d6 https://github.com/facebook/ocamlrep/commit/a299640004548986e205dcce823d5aff648176fb https://github.com/facebook/watchman/commit/020f115a8d0559fcf0dfc8d706db084f6636db93 Reviewed By: jailby fbshipit-source-id: 9a4e0ce73f4466f80f188ddc7253e468793ecd04 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e50a845aaa20..5a70d6915ae7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d8cc74c20e0b86b050f14e4d9b49ce9c0e5de853 +Subproject commit 1b752ade62653c3866a5d3d54c8d02ea261660d6 From d2395007120028088cd1d5bb98503c49eccceeb5 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 28 Apr 2023 14:01:52 -0700 Subject: [PATCH 6006/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/ae67d6c387df374aae9da8a209fc5c9eb92f7a13 https://github.com/facebook/ocamlrep/commit/2e68e8de346a5d5baca6bf77d42b1e61520f02c5 https://github.com/facebookresearch/multimodal/commit/7a5573a7c041bd5f6803d1eae638f3aef7428254 Reviewed By: jailby fbshipit-source-id: acf8410a3141ac50bc0e2306f21925620261ded6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5a70d6915ae7..a6ee0f16b44e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1b752ade62653c3866a5d3d54c8d02ea261660d6 +Subproject commit ae67d6c387df374aae9da8a209fc5c9eb92f7a13 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b63007c84f8f..d22d0ed30b35 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 02aca162461ccbf8c686afc0ab93679b0109b41e +Subproject commit 215292f17ca7fbaaabc1c74881934036b48057ba From c5a3b469fa068e6d9e142a18190100ee4fbe089c Mon Sep 17 00:00:00 2001 From: Sasha Krassovsky Date: Fri, 28 Apr 2023 15:22:07 -0700 Subject: [PATCH 6007/7387] Add Dictionary Encoded vectors to PyVelox (#3859) Summary: This PR adds support for dictionary vectors in PyVelox. Currently base vectors are supported only for primitive (physical) types , and this also thus extends to Dictionary vectors. Dictionary vectors are required for additional fuzzer support, and expression eval in pyvelox. X-link: https://github.com/facebookincubator/velox/pull/3859 Reviewed By: pedroerp Differential Revision: D45409925 Pulled By: kgpai fbshipit-source-id: 6b05a0d543332fea48d912f93f267896d005f4e2 --- build/fbcode_builder/getdeps/dyndeps.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/build/fbcode_builder/getdeps/dyndeps.py b/build/fbcode_builder/getdeps/dyndeps.py index 64ab7b09ac96..e33db7940c57 100644 --- a/build/fbcode_builder/getdeps/dyndeps.py +++ b/build/fbcode_builder/getdeps/dyndeps.py @@ -15,9 +15,6 @@ from struct import unpack from typing import List, Optional -from .envfuncs import path_search - - OBJECT_SUBDIRS = ("bin", "lib", "lib64") From 27f6e6dc73380b0968b9ae60628a7b4569765719 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 28 Apr 2023 15:50:34 -0700 Subject: [PATCH 6008/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/a1b9bc43d51f1d77c9c4d2eae6b410a62d538461 https://github.com/facebook/fbthrift/commit/62464edc223876d6174c597c9ab6c0baed099717 https://github.com/facebookexperimental/rust-shed/commit/ac3b1a5b49f546ae4efc3df4b4ed91bea9df6033 https://github.com/facebookincubator/fizz/commit/b019d4c82065fbffdc56c8c8295b7e59acee5cac https://github.com/facebookincubator/katran/commit/863f8e678b78e6016438248ef0bef8e5ec3b006e https://github.com/facebookincubator/mvfst/commit/19c62f29f96dff878befe139d9e5d4341b8cc1c7 https://github.com/facebookincubator/velox/commit/d56bac1187cdee9a880547c71da34573c89726e9 Reviewed By: jailby fbshipit-source-id: 7737f98d6912098ab96e7c20572618d5f8896ee6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a6ee0f16b44e..7cd062412d96 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ae67d6c387df374aae9da8a209fc5c9eb92f7a13 +Subproject commit 62464edc223876d6174c597c9ab6c0baed099717 From 109ec714155f784101ffb308f8c71a7a575054dd Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 29 Apr 2023 07:35:50 -0700 Subject: [PATCH 6009/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7080c8ffb01be45a521fbcf3b53f0e538519e094 Reviewed By: jailby fbshipit-source-id: 9888c5d4a3e3ba3cd9a094e3214483f6d5461832 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7cd062412d96..bbc5726a2983 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 62464edc223876d6174c597c9ab6c0baed099717 +Subproject commit 7080c8ffb01be45a521fbcf3b53f0e538519e094 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 276213ad9328..f665ebb8f074 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 09b2d47e80e36d981b5e1316ff67aa33ff919cf8 +Subproject commit 756673a1947d997f88c0c03f25226e6576567872 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d22d0ed30b35..562883389df0 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 215292f17ca7fbaaabc1c74881934036b48057ba +Subproject commit ceabc41b4066122c1feb6da498a710bf68cc6de0 From ed975e35b3f3e2d93d870ff1a708e6150ce06651 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 29 Apr 2023 17:30:35 -0700 Subject: [PATCH 6010/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/bd7d0fce86b93d4def59f97ef5a2f1333b7a24b2 https://github.com/facebookexperimental/rust-shed/commit/54e9278cc472817b6c3c6d8a74b18c9c29fbed4f Reviewed By: jailby fbshipit-source-id: 34b9e3cfdcf21319ec56bef8fe0aeab81e22a5c4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bbc5726a2983..3527ac8fea91 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7080c8ffb01be45a521fbcf3b53f0e538519e094 +Subproject commit bd7d0fce86b93d4def59f97ef5a2f1333b7a24b2 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 562883389df0..81a4bb41b20b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ceabc41b4066122c1feb6da498a710bf68cc6de0 +Subproject commit 6a9848c1d1a93271c64c9b8d433075cc89ec14f4 From bfe098858e78367191e6eb1d2ba863295ebbf168 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 30 Apr 2023 12:52:47 -0700 Subject: [PATCH 6011/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/dbde9f181e1f19fe2879c9d08e571306c2eb484e Reviewed By: jailby fbshipit-source-id: c7f8b4d5bbf7d675f9f195184dfedfcccc340f24 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3527ac8fea91..cdadbe90c3d7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bd7d0fce86b93d4def59f97ef5a2f1333b7a24b2 +Subproject commit dbde9f181e1f19fe2879c9d08e571306c2eb484e From c32796f61c33bd824e726edb6fb825ad9d36fc3f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 1 May 2023 09:03:04 -0700 Subject: [PATCH 6012/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/9d51ebfe3657b12c706574354af9b34fe5a997dc Reviewed By: jailby fbshipit-source-id: 00ae4b1a2b31a9665eba3619502ab44e48b4e545 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f665ebb8f074..40873fdfd7ca 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 756673a1947d997f88c0c03f25226e6576567872 +Subproject commit 9d51ebfe3657b12c706574354af9b34fe5a997dc From c66cf34a4d872aee3100cb393cb0db8b1e1fdf7c Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Mon, 1 May 2023 09:30:16 -0700 Subject: [PATCH 6013/7387] Use sudo when installing dependencies on Linux (#4796) Summary: X-link: https://github.com/facebookincubator/velox/pull/4796 `brew` no longer supports running as root: ``` Error: Running Homebrew as root is extremely dangerous and no longer supported. As Homebrew does not drop privileges on installation you would be giving all build scripts full access to your system. Command '['brew', 'install', 'autoconf', 'automake', 'boost', 'cmake', 'double-conversion', 'icu4c', 'libevent', 'libsodium', 'libtool', 'lz4', 'ninja', 'openssl@1.1', 'xz', 'zlib', 'zstd']' returned non-zero exit status 1. !! Failed ``` And as a result the recommended install instructions no longer work: ``` sudo ./build/fbcode_builder/getdeps.py install-system-deps ... ``` and cannot be made to work portably across platforms because Linux requires `sudo` be there while macOS requires `sudo` not be there. To fix this move `sudo` to Linux system dependency installation only. Also update `apt-get` to `apt` while at it. Resolves https://github.com/facebook/fbthrift/issues/545. Reviewed By: somasun Differential Revision: D45371004 fbshipit-source-id: 75334db22226efc961e7d4d6c6eca911086b97ba --- build/fbcode_builder/getdeps.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index eb08ab096905..31a9c2f56443 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -409,11 +409,11 @@ def run_project_cmd(self, args, loader, manifest): if manager == "rpm": packages = sorted(set(all_packages["rpm"])) if packages: - cmd_args = ["dnf", "install", "-y"] + packages + cmd_args = ["sudo", "dnf", "install", "-y"] + packages elif manager == "deb": packages = sorted(set(all_packages["deb"])) if packages: - cmd_args = ["apt-get", "install", "-y"] + packages + cmd_args = ["sudo", "apt", "install", "-y"] + packages elif manager == "homebrew": packages = sorted(set(all_packages["homebrew"])) if packages: From 4408eef6760c3b5f9ec30083fd1d269108b957e2 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 1 May 2023 09:49:34 -0700 Subject: [PATCH 6014/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/96d7765a5a3770745dce390ee5cf7ddb36fddf02 https://github.com/facebook/folly/commit/fdef7b68cb8a99aa62eb0e5b6a572868b0b3ce24 https://github.com/facebook/ocamlrep/commit/d60abd8dee1a034014bc421a0e8d20dee3224d34 https://github.com/facebook/proxygen/commit/4466785c225523def95f85e8c4cdcfd23f84285c https://github.com/facebook/wangle/commit/31d3898c2143264c844c0375a9587d1d2ef8e3a3 https://github.com/facebookexperimental/edencommon/commit/911520c246f02703c81db9b71fda3880f8436df5 https://github.com/facebookincubator/fizz/commit/a8284eb55ad85af466dd0eedba4644a088064a4f https://github.com/facebookincubator/katran/commit/29ddd8adafea6b526e9e88ab4765c696317c44e5 https://github.com/facebookincubator/mvfst/commit/cb2703f197202922076691c114c14a540538b509 https://github.com/facebookincubator/velox/commit/15892a4d39d2d33280eddd42c339deeea9a31455 Reviewed By: jurajh-fb fbshipit-source-id: b20f308c00a7c312158d274ce5b80ba7dc598e1f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cdadbe90c3d7..45fa3799eb93 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit dbde9f181e1f19fe2879c9d08e571306c2eb484e +Subproject commit 96d7765a5a3770745dce390ee5cf7ddb36fddf02 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 40873fdfd7ca..f8dd126d65fc 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9d51ebfe3657b12c706574354af9b34fe5a997dc +Subproject commit fdef7b68cb8a99aa62eb0e5b6a572868b0b3ce24 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 81a4bb41b20b..fa3c26b9752f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6a9848c1d1a93271c64c9b8d433075cc89ec14f4 +Subproject commit 31d3898c2143264c844c0375a9587d1d2ef8e3a3 From e13b7adcbd8e72d870d444a9cdc5f68149c4c6e0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 1 May 2023 10:38:21 -0700 Subject: [PATCH 6015/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/0ab52ef597e0d8c1141baa1f3729f0f683151189 https://github.com/facebook/fbthrift/commit/e395fa774e1ef9a534eeabe98e266e19795a944b https://github.com/facebook/folly/commit/61ae0830616a015361c2648775aa1ad3addc2641 https://github.com/facebook/proxygen/commit/91c524a658b205d5ea2494cb56e630db2a18961e https://github.com/facebook/wangle/commit/1d17dafd7fbedff0d4f0ee9c53d49287b51a927f https://github.com/facebook/watchman/commit/4408eef6760c3b5f9ec30083fd1d269108b957e2 https://github.com/facebookexperimental/edencommon/commit/07d53bdb744ebd34177f79a92193b255e5c5ed37 https://github.com/facebookexperimental/rust-shed/commit/17cc6314f76d6691f25dc8ec4043f25880479d0a https://github.com/facebookincubator/fizz/commit/122477702d0b7e6ac9ad6643f21588d992d9da85 https://github.com/facebookincubator/katran/commit/eb9129e36b4703abec26bb80ef5a726417ead10b https://github.com/facebookincubator/mvfst/commit/2533487883b94c239440079b84cdbe14d2caf413 https://github.com/facebookincubator/velox/commit/cbdb2005fd770d71b74505ad8c47d5cb20799322 Reviewed By: jurajh-fb fbshipit-source-id: c56bdd36a013923397331cbbd6e125df6d7f87ce --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 45fa3799eb93..3786c776b839 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 96d7765a5a3770745dce390ee5cf7ddb36fddf02 +Subproject commit e395fa774e1ef9a534eeabe98e266e19795a944b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f8dd126d65fc..48e0499e1879 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit fdef7b68cb8a99aa62eb0e5b6a572868b0b3ce24 +Subproject commit 61ae0830616a015361c2648775aa1ad3addc2641 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index fa3c26b9752f..e719bf359937 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 31d3898c2143264c844c0375a9587d1d2ef8e3a3 +Subproject commit 1d17dafd7fbedff0d4f0ee9c53d49287b51a927f From 953811c03c99ef6852fe9ce7ad507295a60641a9 Mon Sep 17 00:00:00 2001 From: Xavier Deguillard Date: Mon, 1 May 2023 12:56:43 -0700 Subject: [PATCH 6016/7387] pybser: remove allocation denial of service Summary: By crafting a special bser packet, a client can cause Watchman to over-allocate memory causing Watchman to crash. This diff does 2 things: - Deny template when the keys are empty, this brings it up-to-par with the non-Python decoder. This avoid a case where an empty key combined with a large number of item can cause Watchman to not move in the input buffer but keep allocating memory - Do not pre-allocate the returned list to avoid a small buffer forcing EdenFS to allocate a gigantic list unecessarily. Reviewed By: chadaustin Differential Revision: D45381585 fbshipit-source-id: 026bf1588f207ab99460ff1010e462123ffbe30b --- watchman/python/pywatchman/bser.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/watchman/python/pywatchman/bser.c b/watchman/python/pywatchman/bser.c index 9c33a90383ed..241bba5a44d6 100644 --- a/watchman/python/pywatchman/bser.c +++ b/watchman/python/pywatchman/bser.c @@ -425,6 +425,10 @@ bunser_template(const char** ptr, const char* end, const unser_ctx_t* ctx) { } numkeys = PySequence_Length(keys); + if (numkeys == 0) { + PyErr_Format(PyExc_ValueError, "Expected non-empty ARRAY in TEMPLATE"); + return NULL; + } // Load number of array elements if (!bunser_int(ptr, end, &nitems)) { @@ -438,7 +442,7 @@ bunser_template(const char** ptr, const char* end, const unser_ctx_t* ctx) { return NULL; } - arrval = PyList_New((Py_ssize_t)nitems); + arrval = PyList_New(0); if (!arrval) { Py_DECREF(keys); return NULL; @@ -497,8 +501,11 @@ bunser_template(const char** ptr, const char* end, const unser_ctx_t* ctx) { } } - PyList_SET_ITEM(arrval, i, dict); - // DECREF(obj) not required as SET_ITEM steals the ref + int error = PyList_Append(arrval, dict); + Py_DECREF(dict); + if (error != 0) { + goto fail; + } } Py_DECREF(keys); From e499f24eaec713eba0c9fdb9a94558bd90cc356a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 1 May 2023 13:30:56 -0700 Subject: [PATCH 6017/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/261ecdb0f7a8884ed9c9046144a0b14fd4c82f59 https://github.com/facebook/watchman/commit/953811c03c99ef6852fe9ce7ad507295a60641a9 Reviewed By: jurajh-fb fbshipit-source-id: 690fdea9fa8e0a6c647d515e1b0c9c5ff2cde228 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3786c776b839..255aa7487f05 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e395fa774e1ef9a534eeabe98e266e19795a944b +Subproject commit 261ecdb0f7a8884ed9c9046144a0b14fd4c82f59 From 2eb4113d3cb82d58bbaaad3aba961e79bcab2e7a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 1 May 2023 17:15:57 -0700 Subject: [PATCH 6018/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/2ff2d79ca4715c275b1782fbd0b4ac96ece95570 https://github.com/facebook/proxygen/commit/464f374c00e97ee0d2e7d97c6a0438522ef261fd https://github.com/facebookincubator/velox/commit/4fe5d4aa67a13ad561e2a8b80f820307ec52722c Reviewed By: jurajh-fb fbshipit-source-id: 5136732d84f9dbb300f29930ad89a1974a42436d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 255aa7487f05..6b1d808127bb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 261ecdb0f7a8884ed9c9046144a0b14fd4c82f59 +Subproject commit 2ff2d79ca4715c275b1782fbd0b4ac96ece95570 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 48e0499e1879..d3f837e87a8a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 61ae0830616a015361c2648775aa1ad3addc2641 +Subproject commit 0bf4377be63c318061abef10946f93c75d5caf6f From 7d44fb1d79f2711b78f4626f677622cd0644b8cf Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 2 May 2023 01:40:14 -0700 Subject: [PATCH 6019/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/b0e471a1d55a9431dd857eed94a89dcdd7e93148 Reviewed By: jurajh-fb fbshipit-source-id: b031ad0ab02f72b0469a8d13348f864cc75e4cea --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6b1d808127bb..e151df7f553a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2ff2d79ca4715c275b1782fbd0b4ac96ece95570 +Subproject commit b0e471a1d55a9431dd857eed94a89dcdd7e93148 From 5dec75bfde483ad870bc1ed96db07f5fae83bbab Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 2 May 2023 03:45:06 -0700 Subject: [PATCH 6020/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/9ca30102579a0881120d791acc693638390f7133 https://github.com/facebook/proxygen/commit/5fe0044d50938cd762c10179f716d76135fcd360 https://github.com/facebook/wangle/commit/cf42e22c93bc9664b825ef57c5f56e1dc917d186 https://github.com/facebookincubator/velox/commit/6cd872ec26a7a1e13d8b5796b4745e5be738af76 Reviewed By: jurajh-fb fbshipit-source-id: b9aa310e21338c1bce81b3afb9db34b1c0ebc4ec --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e151df7f553a..c06442fb23ac 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b0e471a1d55a9431dd857eed94a89dcdd7e93148 +Subproject commit 9ca30102579a0881120d791acc693638390f7133 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d3f837e87a8a..b94dd5219af6 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0bf4377be63c318061abef10946f93c75d5caf6f +Subproject commit 0e00eaf5d8437dbb2778b69cb80a6232ffa8e097 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e719bf359937..082df87f1ebb 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1d17dafd7fbedff0d4f0ee9c53d49287b51a927f +Subproject commit cf42e22c93bc9664b825ef57c5f56e1dc917d186 From f97a66ef50aa20dd7d30b826b36cb3ba78168777 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 2 May 2023 10:09:24 -0700 Subject: [PATCH 6021/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/091787d88f9645e1486aab5bce653e03cba95d24 https://github.com/facebook/ocamlrep/commit/dd01d8b72e2aca460c8463cf15cb9ac198e231a4 https://github.com/facebookincubator/velox/commit/bd75e33e910dcaffb7b0a892906525bbbf9e410b https://github.com/pytorch/fbgemm/commit/680be477b3e995fd2e9b8443d3af12b2b027a075 Reviewed By: jurajh-fb fbshipit-source-id: 92b27a195c8e532154fef9f105a2de1e84c1ea98 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b94dd5219af6..d065936a4818 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0e00eaf5d8437dbb2778b69cb80a6232ffa8e097 +Subproject commit 091787d88f9645e1486aab5bce653e03cba95d24 From c58a2e2ba7b534418d867cb6565b7d689ceaea77 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 2 May 2023 11:01:11 -0700 Subject: [PATCH 6022/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/e0cbd1a48c7119ce4f4f6822b467aa6bd865c1b3 https://github.com/facebook/fbthrift/commit/0812280f48b53f0046ec81eadb5ee0a49a73f49c https://github.com/facebook/ocamlrep/commit/591007d51ef0aa31160a9d629b42aa0f87599cbc https://github.com/facebook/watchman/commit/f97a66ef50aa20dd7d30b826b36cb3ba78168777 https://github.com/facebookexperimental/edencommon/commit/0e774f31b37645d7d187d4723bfd142f84daa6ba https://github.com/facebookincubator/fizz/commit/177601d2022f4278b61b9e1941a1fc862e6cea57 https://github.com/facebookincubator/katran/commit/a550051921c9da7aa0883b2d89bdbb28e6553111 https://github.com/facebookincubator/mvfst/commit/9e39e43ef5bfc81dec6ee9b55cada5b7aa96df60 https://github.com/facebookincubator/velox/commit/787c52e06deb0e25a983276c5819ed53392f972f Reviewed By: jurajh-fb fbshipit-source-id: 68c35d42079d2dfd09d3fe44e8c1445b2b65dd47 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c06442fb23ac..943a71fbbf76 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9ca30102579a0881120d791acc693638390f7133 +Subproject commit 0812280f48b53f0046ec81eadb5ee0a49a73f49c From cfb426526eaa7be37bd89e3dce2ee9530287e947 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 2 May 2023 12:57:57 -0700 Subject: [PATCH 6023/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/50980416506ed35b8deae38d3ac2c72c93ef4d48 https://github.com/facebook/ocamlrep/commit/d7de18573661e60663a5b426d8cc072e9f9ab961 https://github.com/facebook/proxygen/commit/585db5ce2d73e8e4b87624aead7dca442dc7afbf https://github.com/facebookincubator/velox/commit/0ddf88ec0bea1ff3c15dfa01815a57c5503b76c9 Reviewed By: jurajh-fb fbshipit-source-id: 4c41b7d6840f0d0b38f819b4864fc4a138f310cf --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 943a71fbbf76..6f79229614d5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0812280f48b53f0046ec81eadb5ee0a49a73f49c +Subproject commit 50980416506ed35b8deae38d3ac2c72c93ef4d48 From 1404352fb3e17c1b70731ad5b429f1111b697ee8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 2 May 2023 14:42:02 -0700 Subject: [PATCH 6024/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/b5d003c97da9502dd2fad32ca601cde61405a339 https://github.com/facebook/fbthrift/commit/dce5b09d7e486dfb895ee1b15bf273ee26dfe90a https://github.com/facebook/ocamlrep/commit/52f3cbdc37b42c41358e248897cc182c7a26fd4c https://github.com/facebook/proxygen/commit/6ea86a6ee11da0e79570b18ea755938c3b314efd https://github.com/facebookincubator/katran/commit/4fa29f9fe49ed4580903575c78d75aa1520bdc81 https://github.com/facebookincubator/velox/commit/31a601b545c6462ef2a7c445a30291b20096866d https://github.com/fairinternal/egohowto/commit/64b5d97b2ca1f32f7eb594f890ca71d72c8acb59 https://github.com/pytorch/fbgemm/commit/b90928e010cc99059cebfba633c2bd2daaba85bb Reviewed By: jurajh-fb fbshipit-source-id: d30c88b59d2c9abac16072aee345c43801d968f9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6f79229614d5..8c9f4922b26f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 50980416506ed35b8deae38d3ac2c72c93ef4d48 +Subproject commit dce5b09d7e486dfb895ee1b15bf273ee26dfe90a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d065936a4818..14295cb5eb05 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 091787d88f9645e1486aab5bce653e03cba95d24 +Subproject commit 2016c499ce8bf713c41f5b059184837f14a5db6e From 01e913da83cf87ff5216e736f968cb2cd0b0b3b7 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 2 May 2023 16:18:54 -0700 Subject: [PATCH 6025/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/8582eeaf3eab7a6765328bb1846a9521d47577b2 Reviewed By: jurajh-fb fbshipit-source-id: 9b00fff9799a98144ca1ee1005e7fc23bdc25ad7 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 14295cb5eb05..d9cbbd007cdf 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 2016c499ce8bf713c41f5b059184837f14a5db6e +Subproject commit 8582eeaf3eab7a6765328bb1846a9521d47577b2 From cf9783860b254bc968c88524d068c7190e82075d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 2 May 2023 18:38:16 -0700 Subject: [PATCH 6026/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/2afa84519e6f65d7fa1e89b00506f62e4668d502 https://github.com/facebook/folly/commit/9d90e2902985fcbcae21350c59200491656b7aca https://github.com/facebook/litho/commit/ac6702398a19feeb621be493b224550423becdda https://github.com/facebook/proxygen/commit/ec098aeb49e469c3ee4ca571220827b9ddcd82c7 https://github.com/facebookincubator/velox/commit/6c59c0d087cbb942a6d2937e5cd00f1fc3a82c15 Reviewed By: jurajh-fb fbshipit-source-id: 4fe1884af44baa17920fcde88bf729d1d96bd2f1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8c9f4922b26f..4bab8d1c81b6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit dce5b09d7e486dfb895ee1b15bf273ee26dfe90a +Subproject commit 2afa84519e6f65d7fa1e89b00506f62e4668d502 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d9cbbd007cdf..d373dc0b164d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 8582eeaf3eab7a6765328bb1846a9521d47577b2 +Subproject commit 9d90e2902985fcbcae21350c59200491656b7aca From a56a72ef90939d3d728054642ea44b56e3e740dc Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 2 May 2023 22:59:56 -0700 Subject: [PATCH 6027/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/9fffd355c07b8579f2c32a8afb0f3c7cd58913b2 Reviewed By: jurajh-fb fbshipit-source-id: 7a8eb9f5386c173e03ce119fa3a5f7e262b079ed --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4bab8d1c81b6..6d433f303792 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2afa84519e6f65d7fa1e89b00506f62e4668d502 +Subproject commit 9fffd355c07b8579f2c32a8afb0f3c7cd58913b2 From 00505839c00baddf0a46186efe46c18215641089 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 3 May 2023 10:01:32 -0700 Subject: [PATCH 6028/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/e692f2637cdf319e472b69f17d80c702250c7378 https://github.com/facebook/rocksdb/commit/a475e9f746ade38fd6f4167af0719b8304731de2 https://github.com/facebook/wangle/commit/f347a407d237a5f65f97cd31814c0395677cf11c https://github.com/facebookexperimental/edencommon/commit/627abc385072fbcb5d2f71ca51932569777c91fe https://github.com/facebookincubator/fizz/commit/7ecbe395ffa72f1af7f20c0b5727426d9c002e50 https://github.com/facebookincubator/katran/commit/acfa00db51c34b930c51dc9205070fdc28fdcc8e https://github.com/facebookincubator/mvfst/commit/0b132b19e6699175ade089da608aa0592e5abd19 https://github.com/facebookincubator/velox/commit/c4d49b5e74a0a58523a7191f58d4121749c12cbb https://github.com/facebookresearch/multimodal/commit/f51c16b7d857fec93c1d95bcb1d78cd2ac2f1ddd Reviewed By: jurajh-fb fbshipit-source-id: 1466229686d1087349c5e450e60a6df1eafb3512 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6d433f303792..c929894ebfc8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9fffd355c07b8579f2c32a8afb0f3c7cd58913b2 +Subproject commit 26f9a109db88705f8c755d23a7ffb3f60528e280 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d373dc0b164d..82a0ce569e98 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9d90e2902985fcbcae21350c59200491656b7aca +Subproject commit e692f2637cdf319e472b69f17d80c702250c7378 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 082df87f1ebb..972e2aa4a4f1 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit cf42e22c93bc9664b825ef57c5f56e1dc917d186 +Subproject commit f347a407d237a5f65f97cd31814c0395677cf11c From 7596266992e3a7fa79f455863b1e902f21dad996 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 3 May 2023 12:04:03 -0700 Subject: [PATCH 6029/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/e21db1b285a181aa1a98bbe3fc0de18aa7ac8e55 https://github.com/facebook/litho/commit/89c6fcd2879f27b5bb6f93a65a3998e120c7a467 https://github.com/facebook/rocksdb/commit/a11f1e12ca95ae6795f0a0674c3a3dbf82c157e9 https://github.com/facebookincubator/velox/commit/a2a18f1b3f8875dc77ef64f6a09e3054e5973b86 Reviewed By: jurajh-fb fbshipit-source-id: 9516f3f2649c745ea11c44b1437bf6135f6be9d3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c929894ebfc8..6f0e53336e4e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 26f9a109db88705f8c755d23a7ffb3f60528e280 +Subproject commit e21db1b285a181aa1a98bbe3fc0de18aa7ac8e55 From ce9de1c05ddb7c4899d7428e96f9f919e086033c Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Wed, 3 May 2023 12:25:16 -0700 Subject: [PATCH 6030/7387] Fix using the Thrift annotation library Summary: Pass the include directory to the Thrift compiler to fix using the annotation library. Fixes the following error when building openr: ``` $ opensource/fbcode_builder/getdeps.py build openr ... [ERROR:/data/users/viz/scratch/dataZusersZvizZfbsource/fbcode_builder_getdeps/shipit/openr/openr/if/Dual.thrift:17] Could not find include file thrift/annotation/cpp.thrift ``` Reviewed By: avalonalex Differential Revision: D45530515 fbshipit-source-id: ad5586ebe0711d4574dcb4a5e8d61ea8bb544653 --- build/fbcode_builder/CMake/FBThriftCppLibrary.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/build/fbcode_builder/CMake/FBThriftCppLibrary.cmake b/build/fbcode_builder/CMake/FBThriftCppLibrary.cmake index ba7c551a1cdd..745053caceaa 100644 --- a/build/fbcode_builder/CMake/FBThriftCppLibrary.cmake +++ b/build/fbcode_builder/CMake/FBThriftCppLibrary.cmake @@ -115,6 +115,7 @@ function(add_fbthrift_cpp_library LIB_NAME THRIFT_FILE) --legacy-strict --gen "mstch_cpp2:${GEN_ARG_STR}" "${thrift_include_options}" + -I "${FBTHRIFT_INCLUDE_DIR}" -o "${output_dir}" "${CMAKE_CURRENT_SOURCE_DIR}/${THRIFT_FILE}" WORKING_DIRECTORY From 9019364a4352b96d81cfec2e343e8d9a47c6daf8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 3 May 2023 13:00:14 -0700 Subject: [PATCH 6031/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/f367c17729cd3694f505f82c28b4af87c9244fbd https://github.com/facebook/litho/commit/0ea8627d44b0f058a6e82eb66d20e93d10b92a5a https://github.com/facebook/ocamlrep/commit/d56b735568db32addd55bbab8f5546380d002b57 https://github.com/facebook/watchman/commit/7596266992e3a7fa79f455863b1e902f21dad996 https://github.com/facebookincubator/mvfst/commit/f424ac918c12c216898a87db7a240e6a8162664e https://github.com/facebookincubator/velox/commit/3be771f3fcfc3be353d3428e61a563ab0b8630c7 Reviewed By: jurajh-fb fbshipit-source-id: 788bded00684fb367b8087cb8a4098b4fcdfb51f --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 82a0ce569e98..380619499d5a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e692f2637cdf319e472b69f17d80c702250c7378 +Subproject commit f367c17729cd3694f505f82c28b4af87c9244fbd From ba463d1be0854327eb33a72b24392ca4c245b414 Mon Sep 17 00:00:00 2001 From: Scott Ramsby Date: Thu, 4 May 2023 17:42:27 -0700 Subject: [PATCH 6032/7387] Make fmt formatter methods const Summary: Staging an update to the latest fmt version triggered lots of build errors due to non-`const` methods on custom formatters. This fixes the `format()` methods to be `const` as they don't mutate any state anyway, as well as `parse()` methods that don't need to mutate internal state. This mitigates many future build errors. Updates were identified and executed by using regular expression search/replacements such as: `(constexpr auto parse\(ParseContext& [^)]*\)) \{` -> `$1 const {` `(constexpr auto parse\(ParseContext& [^)]*\)) ->` -> `$1 const ->` `(auto format\(.*, FormatContext& [^)]*\)) \{` -> `$1 const {` `(auto format\(.*, FormatContext& [^)]*\)) ->` -> `$1 const ->` Any changes to third-party code was then reverted. Some small changes detected from subsequent build errors were then applied. Reviewed By: vitaut Differential Revision: D45420948 fbshipit-source-id: 211bf7f3b59616eda3cd228caf4e93ff81d4fc2b --- watchman/watchman_string.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/watchman/watchman_string.h b/watchman/watchman_string.h index ec0bb279ec64..d3f2a025db57 100644 --- a/watchman/watchman_string.h +++ b/watchman/watchman_string.h @@ -547,7 +547,7 @@ namespace fmt { template <> struct formatter { template - constexpr auto parse(ParseContext& ctx) { + constexpr auto parse(ParseContext& ctx) const { return ctx.begin(); } @@ -560,7 +560,7 @@ struct formatter { template <> struct formatter { template - constexpr auto parse(ParseContext& ctx) { + constexpr auto parse(ParseContext& ctx) const { return ctx.begin(); } From a268d72502d28535c36010b05e608deeb8bf726e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 4 May 2023 18:52:06 -0700 Subject: [PATCH 6033/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/b8a488b9f200b9c112d43342476604f9905271f1 https://github.com/facebook/fb303/commit/6759b9cf44181ca6e6b8a07ba03a90b93a4df42a https://github.com/facebook/fbthrift/commit/fcbae29cf6b2deaa6686fe427fd84c0589bf0b4a https://github.com/facebook/folly/commit/1e6579890fe71387c14135080fc093045ab79897 https://github.com/facebook/litho/commit/89d82588816d394e0dd49a981c722d908c6803ac https://github.com/facebook/mcrouter/commit/0a402a5d76d003d5cfb214512c81b683d655e7ff https://github.com/facebook/ocamlrep/commit/8ced5c4c4455b890a18d7b9f1cb6e25ed4d23f96 https://github.com/facebook/proxygen/commit/d608c1a26dd457c4b4f5d2318d098e0e0fab133b https://github.com/facebook/rocksdb/commit/a5909f88641a1222865839e62c91e43e6ee36c03 https://github.com/facebook/squangle/commit/1f7e420d86ef13b7d32b6ce62dfb527f504e37f3 https://github.com/facebook/wangle/commit/2b20ed59f6fa5bb035d7a5278fa6b072e140fe42 https://github.com/facebook/watchman/commit/ba463d1be0854327eb33a72b24392ca4c245b414 https://github.com/facebookexperimental/edencommon/commit/c145322e9bba95cbcccfa74a8aa1cc61bfc5a6a3 https://github.com/facebookexperimental/rust-shed/commit/2be0bb3255f5d322353c4a6dc789ade775781d95 https://github.com/facebookincubator/fizz/commit/f1823d5363d33f3120a8d66749d2389d3582b266 https://github.com/facebookincubator/katran/commit/0f97fd62c420aacca7797afbc58e812f728f7741 https://github.com/facebookincubator/mvfst/commit/08da61d755444240bb720d63311c82e248b9f2c8 https://github.com/facebookincubator/velox/commit/0b589bc09ea5f869ea25ba6a0ad60870c896b271 https://github.com/facebookresearch/multimodal/commit/b5981a40023ca6ca6453e7b66abf8238ef98d7f9 https://github.com/pytorch/fbgemm/commit/9f913e0bd3e8b44d424ec1f59c3b34d2ee3c6899 https://github.com/pytorch/multipy/commit/475fa535f87716f18201879454c827c8b02a590f Reviewed By: jurajh-fb fbshipit-source-id: c50494edff61d1c42811fc40f2676c2cd6714b78 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6f0e53336e4e..b53bbea6a06f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e21db1b285a181aa1a98bbe3fc0de18aa7ac8e55 +Subproject commit fcbae29cf6b2deaa6686fe427fd84c0589bf0b4a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 380619499d5a..ab87d558f2a8 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f367c17729cd3694f505f82c28b4af87c9244fbd +Subproject commit 1e6579890fe71387c14135080fc093045ab79897 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 972e2aa4a4f1..931cd262d1f1 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f347a407d237a5f65f97cd31814c0395677cf11c +Subproject commit 2b20ed59f6fa5bb035d7a5278fa6b072e140fe42 From 110c935e596691671ef243f66b8aeceb17bfa7f7 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 4 May 2023 19:39:14 -0700 Subject: [PATCH 6034/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/8e9b7f11a6c784bfa46091e709528851564f244a https://github.com/facebook/fb303/commit/3d42fef735b4aa0adcefbe63fa884389b5140559 https://github.com/facebook/fbthrift/commit/25fa837971263eca200a0584cd9d698579bb3d3f https://github.com/facebook/proxygen/commit/6ce0b7b0963187c558fcd232c1a2c25fc3c33e0b https://github.com/facebook/wangle/commit/0df0321c531cc56ce5f6fa1cde262ac6253de6b5 https://github.com/facebook/watchman/commit/a268d72502d28535c36010b05e608deeb8bf726e https://github.com/facebookexperimental/edencommon/commit/92781d0ada6626a4059db697120006149f57d2c6 https://github.com/facebookexperimental/rust-shed/commit/d23fae4dcf10055c8cfcfede330b0ee92c95df99 https://github.com/facebookincubator/fizz/commit/413fc487887cd94bdf04e135795d73a74c1d5f1b https://github.com/facebookincubator/katran/commit/c1a1e3af50e731103bd07bb6505678e18bb496d8 https://github.com/facebookincubator/mvfst/commit/6f0685879ae4d957d4da4f279301c1eb74fd0fb7 https://github.com/facebookincubator/velox/commit/509f98438cf6c22c1a808faccf1d15d4226c9ea8 Reviewed By: jurajh-fb fbshipit-source-id: 5ff182f2f92517bfda4f522a82a43ef0d942b549 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b53bbea6a06f..7b68f1406dec 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit fcbae29cf6b2deaa6686fe427fd84c0589bf0b4a +Subproject commit 25fa837971263eca200a0584cd9d698579bb3d3f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 931cd262d1f1..90340b09c991 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2b20ed59f6fa5bb035d7a5278fa6b072e140fe42 +Subproject commit 0df0321c531cc56ce5f6fa1cde262ac6253de6b5 From 2903a897428c90dea2f3014bf972e4eb42edac7c Mon Sep 17 00:00:00 2001 From: Scott Ramsby Date: Thu, 4 May 2023 20:02:01 -0700 Subject: [PATCH 6035/7387] Use iterators when calling format_to() on memory buffers Summary: Newer versions of fmt require that you pass an iterator rather than a direct memory buffer as an output to the `format_to()` family of functions. This does that to unblock an upgrade to a newer fmt version. Reviewed By: Orvid Differential Revision: D45555430 fbshipit-source-id: 81712f8fae1d2ba07d4dc40e48ee056aa2a136df --- watchman/watchman_string.h | 1 + 1 file changed, 1 insertion(+) diff --git a/watchman/watchman_string.h b/watchman/watchman_string.h index d3f2a025db57..414dbe5dd6dc 100644 --- a/watchman/watchman_string.h +++ b/watchman/watchman_string.h @@ -17,6 +17,7 @@ #include #include +#include #include #include #include From 5d302688a5bba866a0a6939ea1a36b12880f347a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 4 May 2023 22:10:59 -0700 Subject: [PATCH 6036/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/ca5eb75d7602de4cc827fd1e511d18c5f72ea6d9 Reviewed By: jurajh-fb fbshipit-source-id: ea35f93ea45a326c717ec32b01a5653072667eea --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7b68f1406dec..d8da135af560 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 25fa837971263eca200a0584cd9d698579bb3d3f +Subproject commit ca5eb75d7602de4cc827fd1e511d18c5f72ea6d9 From 9bc56f4a5d3d69c1cf646d8b593eefac32b4549b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 5 May 2023 07:02:55 -0700 Subject: [PATCH 6037/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/b6b4f43aed4950399562784efd9deb598a28e2df Reviewed By: jurajh-fb fbshipit-source-id: 497624694c17b985929d0d1d58f64955791af9ae --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d8da135af560..8183d66aa903 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ca5eb75d7602de4cc827fd1e511d18c5f72ea6d9 +Subproject commit b6b4f43aed4950399562784efd9deb598a28e2df From eaec76ef994561512c428d468e9b9fb6f0f08d8b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 5 May 2023 10:52:08 -0700 Subject: [PATCH 6038/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8b70e8a0dbf14b9ef2bedbb6fad364559337dfcc https://github.com/facebook/mcrouter/commit/467c509ec0b181da9706bc95d68874685dbf9bf5 Reviewed By: jurajh-fb fbshipit-source-id: c3de198be5c1fc45e68d6f05cf2b013e63768421 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8183d66aa903..bf81ca9d11f8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b6b4f43aed4950399562784efd9deb598a28e2df +Subproject commit 8b70e8a0dbf14b9ef2bedbb6fad364559337dfcc From d59d732b2d510bdeaa184fb07f5745ced0b023fc Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 5 May 2023 12:07:39 -0700 Subject: [PATCH 6039/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/a94eb5d0dcfc76b39c460cdc5ef64cb84226b457 https://github.com/facebook/watchman/commit/eaec76ef994561512c428d468e9b9fb6f0f08d8b Reviewed By: jurajh-fb fbshipit-source-id: 007dcc57ca44d8f61e086cf461b2417bd5aae238 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bf81ca9d11f8..39d36b59aad5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8b70e8a0dbf14b9ef2bedbb6fad364559337dfcc +Subproject commit a94eb5d0dcfc76b39c460cdc5ef64cb84226b457 From 32453c0125b6398700c4bfed5e0d9a39a44d855d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 5 May 2023 13:26:38 -0700 Subject: [PATCH 6040/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/fd51f52f7ded2a7128f8b46948e7590230fda70e https://github.com/facebookincubator/mvfst/commit/cfcc5cc5cb2eb5c9a8ddd688983d5a86b0cbbe89 Reviewed By: jurajh-fb fbshipit-source-id: 457468781b88f40727810e570d48dcfdc1ba6901 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 39d36b59aad5..d57edbe5b60a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a94eb5d0dcfc76b39c460cdc5ef64cb84226b457 +Subproject commit fd51f52f7ded2a7128f8b46948e7590230fda70e From 23fc525f5a6413ffa6fbddff44dbdc1f24e07396 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 5 May 2023 21:12:10 -0700 Subject: [PATCH 6041/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/38d28cb7c8b466d82df5f026ca309a03f2b1f457 Reviewed By: jurajh-fb fbshipit-source-id: 3a1159c0077a6768a2eb847055d44e4db0c8ae20 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d57edbe5b60a..6d1e29a8f10a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit fd51f52f7ded2a7128f8b46948e7590230fda70e +Subproject commit 38d28cb7c8b466d82df5f026ca309a03f2b1f457 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 90340b09c991..a3fe3c27a3c7 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0df0321c531cc56ce5f6fa1cde262ac6253de6b5 +Subproject commit 91947d769543912d6ca66b56c8822753d97ceded From 38600c98ad30bf6d8c0b36144bb9ad5aa6b4326f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 8 May 2023 10:58:03 -0700 Subject: [PATCH 6042/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/16f7689c381c1f0128ffee5374a50b61a588271f Reviewed By: bigfootjon fbshipit-source-id: 2d7f5845e603efb306065c97f96f1813b6ccd9c3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6d1e29a8f10a..e5f9400e5380 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 38d28cb7c8b466d82df5f026ca309a03f2b1f457 +Subproject commit 16f7689c381c1f0128ffee5374a50b61a588271f From 177bc31839476dd1a8798b943883f8cec483d6ae Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 8 May 2023 16:34:44 -0700 Subject: [PATCH 6043/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7551adaf882e459f79307fb564f10adfcc91adab https://github.com/facebook/proxygen/commit/0d85f40618747662473b6d4ecc507a245ec0078a https://github.com/facebookincubator/fizz/commit/4a37a67b042b8d215f9c8493fabd99225978b18d https://github.com/facebookincubator/velox/commit/c485f1e815c844596e7da6ea4ddd07fd1f8db48b Reviewed By: bigfootjon fbshipit-source-id: 5842d0468f79e08acb51b5faabf102e79fe83467 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e5f9400e5380..0b0b6e7b6edd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 16f7689c381c1f0128ffee5374a50b61a588271f +Subproject commit 7551adaf882e459f79307fb564f10adfcc91adab diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ab87d558f2a8..ba0af92e8ee1 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1e6579890fe71387c14135080fc093045ab79897 +Subproject commit 5c114cc5df47e5bcd428333c3dcd46bbd25eb08d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a3fe3c27a3c7..9c43704274f6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 91947d769543912d6ca66b56c8822753d97ceded +Subproject commit eb30aaa341b9a9bb0485296258d889932988c80a From a2cadf25069b325dd03ab622c779fb8ced9f7e00 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 8 May 2023 17:19:44 -0700 Subject: [PATCH 6044/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/f617c40419e77f7f1bc080a1f919034cd5d04e0d https://github.com/facebook/folly/commit/da553547d43672c99c05c4671e2d56388a2b0894 https://github.com/facebook/litho/commit/ebe75b5062e1dd6b70272f236570ee5d58e002c5 https://github.com/facebook/ocamlrep/commit/a1ef0d7468f8841bb2c98873b9934207774b6339 Reviewed By: bigfootjon fbshipit-source-id: 4c38875b0d7368bd32d629c6de6daaa2a47afd6b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0b0b6e7b6edd..d9bb52e70ece 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7551adaf882e459f79307fb564f10adfcc91adab +Subproject commit f617c40419e77f7f1bc080a1f919034cd5d04e0d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ba0af92e8ee1..a03927039539 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 5c114cc5df47e5bcd428333c3dcd46bbd25eb08d +Subproject commit da553547d43672c99c05c4671e2d56388a2b0894 From 0745bb160115585bd0f2e27a3ad411df466e7912 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 9 May 2023 03:33:50 -0700 Subject: [PATCH 6045/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/d974c1f17e2526afc58c1cfd5cdbade3bbe44f89 Reviewed By: bigfootjon fbshipit-source-id: 8bfae0e2fb154e3e6311f940041d6636db3a9c21 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d9bb52e70ece..f27551bbe744 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f617c40419e77f7f1bc080a1f919034cd5d04e0d +Subproject commit 403ad225dc63c95e18c50fd6068009c4cbafd0b0 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a03927039539..100a9be1c4dc 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit da553547d43672c99c05c4671e2d56388a2b0894 +Subproject commit d974c1f17e2526afc58c1cfd5cdbade3bbe44f89 From 5f2e45bb67028181b10356906cdfd44e752ddc4b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 9 May 2023 09:57:42 -0700 Subject: [PATCH 6046/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/8e72e8ff093fcbca5ed14e3803d4a13b43788c35 https://github.com/facebook/wangle/commit/8cc247fd1d2fb31134bac5517237d2042b428467 Reviewed By: bigfootjon fbshipit-source-id: fb8c7739715e99316ee3fcafc3ddef0072a34c8d --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 100a9be1c4dc..acc07dc8138c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d974c1f17e2526afc58c1cfd5cdbade3bbe44f89 +Subproject commit 8e72e8ff093fcbca5ed14e3803d4a13b43788c35 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9c43704274f6..8be35f73f9b7 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit eb30aaa341b9a9bb0485296258d889932988c80a +Subproject commit 8cc247fd1d2fb31134bac5517237d2042b428467 From 7d5bb20c216b541fe28378cad92bce3e02eea5be Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 9 May 2023 14:49:12 -0700 Subject: [PATCH 6047/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/c167ec105aff2838b88241350ef1ccccac73dd44 https://github.com/facebook/folly/commit/482c33561c546b719bc2ce5419568076a5052435 https://github.com/facebookresearch/vrs/commit/77e0cbe2ba220285fbab5945e78fa99d2b8a1b1d Reviewed By: bigfootjon fbshipit-source-id: 6005fef6d7a80355f7f53d1a3fbea70c80774848 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f27551bbe744..babeea2275d7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 403ad225dc63c95e18c50fd6068009c4cbafd0b0 +Subproject commit c167ec105aff2838b88241350ef1ccccac73dd44 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index acc07dc8138c..b19785feb65b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 8e72e8ff093fcbca5ed14e3803d4a13b43788c35 +Subproject commit 482c33561c546b719bc2ce5419568076a5052435 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8be35f73f9b7..730c5aabb954 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8cc247fd1d2fb31134bac5517237d2042b428467 +Subproject commit 2320e61e0ceb91d4d9fd7b84a7445284c9262b5d From f9b10126edd2faa60e7c7734609a82f7fee7e4c6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 9 May 2023 15:33:29 -0700 Subject: [PATCH 6048/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/261eda770e3e335bff48807bd3b82511061377c6 https://github.com/facebook/folly/commit/da3babcd57495a1e9db06afcefceff0bb13acf4a https://github.com/facebook/proxygen/commit/07697337495538d5fb682d30ba6e693779b1ede1 https://github.com/facebookincubator/mvfst/commit/d957b44e81c88d06bf3c2570b4a21aa660f7e2b5 https://github.com/facebookincubator/velox/commit/2e2fa34d4188d7aa951324758a4f36a3b41af1fb Reviewed By: bigfootjon fbshipit-source-id: ec88d839438ce9c39003721b08f8af2f7714377a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index babeea2275d7..0a680bb4b64f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c167ec105aff2838b88241350ef1ccccac73dd44 +Subproject commit 261eda770e3e335bff48807bd3b82511061377c6 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b19785feb65b..6d1361cf5c45 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 482c33561c546b719bc2ce5419568076a5052435 +Subproject commit da3babcd57495a1e9db06afcefceff0bb13acf4a From fb65c8084d83595d4d3111ea439f75fd3c797f23 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 10 May 2023 03:50:46 -0700 Subject: [PATCH 6049/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/418fe1f76e9041df67b689e0585ac5cc90d81315 https://github.com/facebook/litho/commit/73a587b61b120692ff0d0f056ab50fdcec359dce https://github.com/facebook/proxygen/commit/932ee8758904233c735d53e390164405e3a6b354 Reviewed By: bigfootjon fbshipit-source-id: e23e7a914acf3ef554ff3a144357cb99fa4b599d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0a680bb4b64f..8704221268ce 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 261eda770e3e335bff48807bd3b82511061377c6 +Subproject commit 418fe1f76e9041df67b689e0585ac5cc90d81315 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6d1361cf5c45..f7a7eaa7708d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit da3babcd57495a1e9db06afcefceff0bb13acf4a +Subproject commit fa75688ec1bc83f9c6f36bd89a3b2a7c88b767f8 From 7ee7b1a353c67659ae0c229ff513630571b15b82 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 10 May 2023 08:19:19 -0700 Subject: [PATCH 6050/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/00d03be3736d92a2bcbf28cbad96617b7b6533f3 https://github.com/facebookincubator/katran/commit/43d2a407819e1fbd25087bf079ac52abd6036378 Reviewed By: bigfootjon fbshipit-source-id: e417f9ed8e250bb5666dba179f9b0f6536510fb3 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f7a7eaa7708d..4627bfe0482d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit fa75688ec1bc83f9c6f36bd89a3b2a7c88b767f8 +Subproject commit 00d03be3736d92a2bcbf28cbad96617b7b6533f3 From f254049b55d8aefd6b76ca3309889b14c3eb3362 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 10 May 2023 09:15:10 -0700 Subject: [PATCH 6051/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/9c86b7b8de8982cb1980c8d432a8f3c693702e01 https://github.com/facebook/wangle/commit/f0259f0c5345bae30537936ce74afe05a4b7b0f2 https://github.com/facebook/watchman/commit/7ee7b1a353c67659ae0c229ff513630571b15b82 https://github.com/facebookexperimental/edencommon/commit/4650e668eb05c2458f9bf267c17d60401b481bcd https://github.com/facebookincubator/fizz/commit/da0e7980ff20d1502cc8a4e8104a4f6ad98397c4 https://github.com/facebookincubator/katran/commit/f621e7e9b7ee310895117cb9566ca8227c308d8b https://github.com/facebookincubator/mvfst/commit/ea815e5a0aaa3abb8323f7c3751cb0540185f5f9 https://github.com/facebookincubator/velox/commit/c8ef00f047bcd002d32dddda230fc88d2dc425d9 Reviewed By: bigfootjon fbshipit-source-id: 18247269b87c97aa53adc0620bcc70a320c95300 --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 730c5aabb954..a685f7a8a169 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2320e61e0ceb91d4d9fd7b84a7445284c9262b5d +Subproject commit f0259f0c5345bae30537936ce74afe05a4b7b0f2 From 039fabc5157086995d7e19b60fe3de2038312247 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 10 May 2023 11:27:20 -0700 Subject: [PATCH 6052/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/194292a840eaad76f91781e450b1eb037db96e81 https://github.com/facebook/rocksdb/commit/7531cbda9177e8d218a287718c4fc2355c6e1597 https://github.com/facebookincubator/mvfst/commit/fd703066ff6a18b4a00faafb6081a28f10e88c63 Reviewed By: bigfootjon fbshipit-source-id: 2dbbb7e0ed89bc41c720a5885cc926341bdcda0e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8704221268ce..82f1a4f24fff 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 418fe1f76e9041df67b689e0585ac5cc90d81315 +Subproject commit 194292a840eaad76f91781e450b1eb037db96e81 From f8862da9d2da5641967ec6da7e82c3eb326f6d01 Mon Sep 17 00:00:00 2001 From: generatedunixname226714639793621 Date: Wed, 10 May 2023 16:16:04 -0700 Subject: [PATCH 6053/7387] fbcode/eden/ Reviewed By: genevievehelsel Differential Revision: D45563720 fbshipit-source-id: 4633e2842f21729b7f690a49f522fe81af213625 --- eden/fs/takeover/takeover.thrift | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eden/fs/takeover/takeover.thrift b/eden/fs/takeover/takeover.thrift index 8ee5472b4da1..08ac19bd8757 100644 --- a/eden/fs/takeover/takeover.thrift +++ b/eden/fs/takeover/takeover.thrift @@ -7,7 +7,10 @@ namespace cpp2 facebook.eden -typedef i64 (cpp2.type = "uint64_t") ui64 +include "thrift/annotation/cpp.thrift" + +@cpp.Type{name = "uint64_t"} +typedef i64 ui64 // A list of takeover data serialization versions that the client supports struct TakeoverVersionQuery { From 4a0ffae2b27b3e1710cd6cea9e8ed2623e89136e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 10 May 2023 17:27:01 -0700 Subject: [PATCH 6054/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7f93840f31bfa41adb1c7d27a68eec31e6d8007a https://github.com/facebook/folly/commit/6088d1fc0c81cd300f6f697bc3ce8d7d4579b933 https://github.com/facebook/litho/commit/9a0e17381ceaabf6de1eecbcc617e44263007834 https://github.com/facebook/mcrouter/commit/c1015c5e4a3336ed896cfab86bc55148f141424b https://github.com/facebook/ocamlrep/commit/a863acd85542f24f7d78ec13a76218806787e398 https://github.com/facebook/watchman/commit/f8862da9d2da5641967ec6da7e82c3eb326f6d01 https://github.com/facebookexperimental/edencommon/commit/283db50159e60fb361f3b2f8697a0a0b4f77f504 https://github.com/facebookincubator/velox/commit/6877f37f207611caabddfba6dc4bad0755946e7e https://github.com/facebookresearch/vrs/commit/7d34d54434f8924371e315645da5a492456b4af9 Reviewed By: bigfootjon fbshipit-source-id: 20632ec2522fb2e75e5b510db481b4349f8e3940 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 82f1a4f24fff..5124b1a03544 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 194292a840eaad76f91781e450b1eb037db96e81 +Subproject commit 7f93840f31bfa41adb1c7d27a68eec31e6d8007a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4627bfe0482d..d6c7f9057d67 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 00d03be3736d92a2bcbf28cbad96617b7b6533f3 +Subproject commit 6088d1fc0c81cd300f6f697bc3ce8d7d4579b933 From 4e6be16f915419ea9b79326504cda05f5b52ce6e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 10 May 2023 18:03:45 -0700 Subject: [PATCH 6055/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/14dcda98d5134e48be739b4f4cccce7570044daf https://github.com/facebook/proxygen/commit/6db891658110b5f429f08d11010973806bd12812 https://github.com/facebook/watchman/commit/4a0ffae2b27b3e1710cd6cea9e8ed2623e89136e https://github.com/facebookexperimental/edencommon/commit/c85c49cd673a74b54ca5b52bfa44b049ed175032 https://github.com/facebookincubator/mvfst/commit/56eb6528f43ed282319cd386a6bcc6fde3d9dc83 https://github.com/facebookincubator/velox/commit/134d8b989ffd49347793c7a540f0af2d9ac65a81 Reviewed By: bigfootjon fbshipit-source-id: 285305aeda09400d3fddd09f929bf94efb4571c4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5124b1a03544..24b0d6848cd5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7f93840f31bfa41adb1c7d27a68eec31e6d8007a +Subproject commit 14dcda98d5134e48be739b4f4cccce7570044daf From 7b0eda8a3355743b5c663bf5b277b6ef9acf78a2 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 10 May 2023 21:30:55 -0700 Subject: [PATCH 6056/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/b8c1b99074782a6d1a7a1dbd75640797a1769a61 https://github.com/facebookincubator/velox/commit/e649f434e3412c3be1b3a8bb7b5a21bb250c84b9 Reviewed By: bigfootjon fbshipit-source-id: 99cf0bab18d331b11a126a57af32544ed356d24b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 24b0d6848cd5..e1b2e5b71695 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 14dcda98d5134e48be739b4f4cccce7570044daf +Subproject commit b8c1b99074782a6d1a7a1dbd75640797a1769a61 From a92e96e601cb860d564f0bb0a52cbb3850eb8f8e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 11 May 2023 05:20:15 -0700 Subject: [PATCH 6057/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/be8a1399d51d07cba41677bf2f25848f5acd79ce https://github.com/facebook/proxygen/commit/0516c46dfbe24d7bdfb163acce663cb68c59ed26 https://github.com/facebookincubator/mvfst/commit/fc2b645154fd90806de107574b76526f80f69b6d https://github.com/facebookincubator/velox/commit/71f9b4e1d5dbb1787de0f879322c133b687134c9 Reviewed By: bigfootjon fbshipit-source-id: a155da3bf33c2423198812bebe40471707bc3c1e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e1b2e5b71695..50dc87ae2224 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b8c1b99074782a6d1a7a1dbd75640797a1769a61 +Subproject commit be8a1399d51d07cba41677bf2f25848f5acd79ce diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d6c7f9057d67..0497df595e5f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 6088d1fc0c81cd300f6f697bc3ce8d7d4579b933 +Subproject commit acc54b40c86ecf78d0921b5d38b1fce990f2ce90 From c37ff1b4ca9aa16bcc277c63c9a48608bb6dbffe Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 11 May 2023 09:45:39 -0700 Subject: [PATCH 6058/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/wangle/commit/090c7f6fa72941ad8c83bace65083c8e9551ec08 https://github.com/facebookincubator/fizz/commit/f2d0368a8af5f4da6e3041b55282862bbe242e9d Reviewed By: bigfootjon fbshipit-source-id: 3b7d64750c927a9852adb2bc6a243f951c5fe8a1 --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a685f7a8a169..02347dcbfde3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f0259f0c5345bae30537936ce74afe05a4b7b0f2 +Subproject commit 090c7f6fa72941ad8c83bace65083c8e9551ec08 From 9c83d40125b0925f81c3daf3acb08c32078a230b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 11 May 2023 11:00:19 -0700 Subject: [PATCH 6059/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/c8fcedf00585dadeecf7c995534b435aa7e092cc https://github.com/facebook/fb303/commit/9f4eb26f4cfced4cfbcbd1cf889ea11f3fb220a6 https://github.com/facebook/fbthrift/commit/2231e605c6cfcdf02ff14cc04083e5305c9c7f34 https://github.com/facebook/folly/commit/6e2063b916b045edc324a0ebac5d820f6a4b3a67 https://github.com/facebook/litho/commit/9d82873d6ec4000cc10cf2b2dc1c1241d43285de https://github.com/facebook/proxygen/commit/eb65e316e9d7989a8eecb2bddc34dd82c4775fcb https://github.com/facebook/watchman/commit/c37ff1b4ca9aa16bcc277c63c9a48608bb6dbffe https://github.com/facebookincubator/katran/commit/0b01ee1f3f28f01651e61bbb5298642c656791ba https://github.com/facebookincubator/velox/commit/7d5f716fd0926fbde37a7082fb3ff07fd533d3b5 https://github.com/pytorch/kineto/commit/ba73493399869edf3f8e6e71a6f6dcdb1c84c426 Reviewed By: bigfootjon fbshipit-source-id: 6713a7a0933b29703f25a810456486ce6bb82c6b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 50dc87ae2224..cc5bf97b5537 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit be8a1399d51d07cba41677bf2f25848f5acd79ce +Subproject commit 2231e605c6cfcdf02ff14cc04083e5305c9c7f34 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0497df595e5f..80a51b463f23 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit acc54b40c86ecf78d0921b5d38b1fce990f2ce90 +Subproject commit 6e2063b916b045edc324a0ebac5d820f6a4b3a67 From fae3276820bdd1a10b4bcee014664c61920b599d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 11 May 2023 12:53:22 -0700 Subject: [PATCH 6060/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/29a1f9ff0ed753966bff89ed31e5cbf7e3b464d6 https://github.com/facebook/fbthrift/commit/bcab3086a893d116ba10864137f16ce774fec50f https://github.com/facebook/folly/commit/dd689ed8de48b6e9d0a9af452d81e5a5a0fed271 https://github.com/facebook/litho/commit/bdab6d8746c53bcb3385c9c63ea202b4edffe454 https://github.com/facebook/ocamlrep/commit/5ddb30d0f50a36335d56b5372d69ad2c555ba574 https://github.com/facebookexperimental/edencommon/commit/54db30762c6ffa8d95561cc7ce7c0c1ab4e72770 https://github.com/facebookexperimental/rust-shed/commit/a457646bbca1a0b4caafb6f6f8c4c1efcfc47c17 https://github.com/facebookincubator/velox/commit/d39c3225dfb5005667838994a5e61fa27f5aaa74 https://github.com/facebookresearch/vrs/commit/54bc80de0d3fad738306427307d0ae4388f7d4be https://github.com/pytorch/kineto/commit/dbc742bb7128815340e82163a3c3ab302a7d9775 Reviewed By: bigfootjon fbshipit-source-id: c0024ee3086a55e8a7f9235f1625180901127eb9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cc5bf97b5537..7c7f00ae9100 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2231e605c6cfcdf02ff14cc04083e5305c9c7f34 +Subproject commit bcab3086a893d116ba10864137f16ce774fec50f diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 80a51b463f23..eebc718bd741 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 6e2063b916b045edc324a0ebac5d820f6a4b3a67 +Subproject commit dd689ed8de48b6e9d0a9af452d81e5a5a0fed271 From c95e8c8659b6ae416cd098f2407be12c47875765 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 11 May 2023 14:01:27 -0700 Subject: [PATCH 6061/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/d5dce323934052c31dd90e5c4f1964fb2174035a https://github.com/facebook/fbthrift/commit/1e9b97ebf565e0e180878402c2feac03120e5fce https://github.com/facebook/ocamlrep/commit/9e725043aac1bcd70e3eddb3a1aabd9cc02d2226 https://github.com/facebook/proxygen/commit/ab5d4555badbbee82a5c7658bb51c64b8f30e4df https://github.com/facebook/watchman/commit/fae3276820bdd1a10b4bcee014664c61920b599d https://github.com/facebookexperimental/rust-shed/commit/8081a355e6e27ac885b3d20d69abcca18e67c327 https://github.com/facebookincubator/velox/commit/34e11acb7aa275a2634f082661123a535c7890b5 https://github.com/pytorch/fbgemm/commit/dfc3cc16ea9e54cadaacf20daf91437fe36193e6 Reviewed By: bigfootjon fbshipit-source-id: 206f5afdeb767b40a81c89bda13f0e620b244e47 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7c7f00ae9100..20bcfa35ce64 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bcab3086a893d116ba10864137f16ce774fec50f +Subproject commit 1e9b97ebf565e0e180878402c2feac03120e5fce From c64526fea08f33866e0b58b9e6999a9a47780166 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 11 May 2023 15:45:04 -0700 Subject: [PATCH 6062/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/7c49356aeb2031be46f3a43190637cd5a112197f https://github.com/facebook/ocamlrep/commit/18183aa7b23f6c68b8ebc0372da5d9276a2335de https://github.com/pytorch/fbgemm/commit/394ada3bcf266be6f2e796a66d4e80f96bfdcca8 Reviewed By: bigfootjon fbshipit-source-id: b2b84218d2796999c68773af934ecfbcb7b10025 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index eebc718bd741..e0f7b3c028b7 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit dd689ed8de48b6e9d0a9af452d81e5a5a0fed271 +Subproject commit 7c49356aeb2031be46f3a43190637cd5a112197f From 835f54315644af39c3a39490a0c4a7d9b926c8a5 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 11 May 2023 18:25:13 -0700 Subject: [PATCH 6063/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/59297ec098249df3e5715447a6341699782fa195 https://github.com/facebook/rocksdb/commit/47235dda9e729fd41027d6050aae12667d57ea6f Reviewed By: bigfootjon fbshipit-source-id: 1115411bd69ae8c8cb5474df5552bb8897277418 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 20bcfa35ce64..e54fb2f928dc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1e9b97ebf565e0e180878402c2feac03120e5fce +Subproject commit 59297ec098249df3e5715447a6341699782fa195 From 6efa25719d2e97500361e61077138e1817da808f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 11 May 2023 21:58:38 -0700 Subject: [PATCH 6064/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/0c8a39cd1be4ff4047f8a05f8712fdfe444c87de Reviewed By: bigfootjon fbshipit-source-id: 2d84e6c85c6feaf205bcf6dbfe9451603fbd5fbb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e54fb2f928dc..7c2d79874bbd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 59297ec098249df3e5715447a6341699782fa195 +Subproject commit 0c8a39cd1be4ff4047f8a05f8712fdfe444c87de From 38f6b83be5692f0c632f92e8a0aac76a57310303 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 12 May 2023 10:30:51 -0700 Subject: [PATCH 6065/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/35603d4d7da9669b60a1109e140c4732ad3ce9b7 https://github.com/facebook/fbthrift/commit/e986418c62385456a39656f289276157721598d3 https://github.com/facebook/ocamlrep/commit/673acd95fe39acb112c30f512867bd2ab3c01fe2 Reviewed By: bigfootjon fbshipit-source-id: 7c8749ed9ba37f8216cbea10c7757a3d6261fa7d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7c2d79874bbd..0cc06ed61f84 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0c8a39cd1be4ff4047f8a05f8712fdfe444c87de +Subproject commit e986418c62385456a39656f289276157721598d3 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 02347dcbfde3..903b1d7f13da 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 090c7f6fa72941ad8c83bace65083c8e9551ec08 +Subproject commit d7bb2d649b65487901c961cff8493276a9fc59c4 From 61f7e32a27497d5741fc33de49bb18e51bd9eba7 Mon Sep 17 00:00:00 2001 From: Xavier Deguillard Date: Fri, 12 May 2023 11:38:26 -0700 Subject: [PATCH 6066/7387] eden: on fresh instance, only return fresh instance Summary: There is a subtle bug here where when Watchman reaches the configured threshold all the processed files/directories are returned alongside the fresh instance. In particular, this creates some confusion for Watchman users. Reviewed By: chadaustin Differential Revision: D45800569 fbshipit-source-id: 93b79e790873fe902d546767e966ad77c518f191 --- watchman/integration/eden/test_eden_since.py | 11 +++++++++-- watchman/watcher/eden.cpp | 17 +++++++++++------ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/watchman/integration/eden/test_eden_since.py b/watchman/integration/eden/test_eden_since.py index 644d069148c9..3730f3272eeb 100644 --- a/watchman/integration/eden/test_eden_since.py +++ b/watchman/integration/eden/test_eden_since.py @@ -292,7 +292,13 @@ def test_eden_since_across_update(self) -> None: ) def test_eden_since_over_threshold(self) -> None: - root = self.makeEdenMount(lambda repo: populate(repo, 1)) + # Make sure to have a large amount of files to dwarf Mercurial + # modifying a ton of files in the .hg directory. + root = self.makeEdenMount( + lambda repo: populate( + repo, 50, extra_files=[f"bigdir/{i}" for i in range(100)] + ) + ) repo = self.repoForPath(root) res = self.watchmanCommand("watch", root) @@ -315,7 +321,7 @@ def do_query(clock): }, ) - shutil.rmtree(os.path.join(root, "bdir")) + shutil.rmtree(os.path.join(root, "bigdir")) repo.hg("addremove") repo.commit("removal commit.") @@ -334,6 +340,7 @@ def do_query(clock): # configuration. This is expected to return a fresh instance. res = do_query(clock) self.assertTrue(res["is_fresh_instance"]) + self.assertFileListsEqual([], res["files"]) clock = res["clock"] # Make sure that we detect newly edited files afterwards. diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index ac552931238c..d635542a499a 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -1227,6 +1227,7 @@ class EdenView final : public QueryableView { // 1 = added std::unordered_map byFile; std::unordered_map dtypes; + bool freshInstance = false; std::move(stream).subscribeInline( [&](folly::Try&& changeTry) mutable { @@ -1235,7 +1236,7 @@ class EdenView final : public QueryableView { "Error: ", folly::exceptionStr(changeTry.exception()), "\n"); - result = makeFreshInstance(ctx); + freshInstance = true; return false; } @@ -1285,17 +1286,21 @@ class EdenView final : public QueryableView { if (thresholdForFreshInstance_ != 0 && byFile.size() > thresholdForFreshInstance_ && ctx->query->empty_on_fresh_instance) { - result = makeFreshInstance(ctx); + freshInstance = true; return false; } return true; }); - for (auto& [name, count] : byFile) { - result.fileInfo.emplace_back(name, getDTypeFromEden(dtypes[name])); - if (count > 0) { - result.createdFileNames.emplace(name); + if (freshInstance) { + result = makeFreshInstance(ctx); + } else { + for (auto& [name, count] : byFile) { + result.fileInfo.emplace_back(name, getDTypeFromEden(dtypes[name])); + if (count > 0) { + result.createdFileNames.emplace(name); + } } } From 19d418a7fae2c262370f4aea152570ce6351e87a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 12 May 2023 12:13:28 -0700 Subject: [PATCH 6067/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/4fa460f8b62c2a6925862db9bfd260cbc7422c55 https://github.com/facebook/watchman/commit/61f7e32a27497d5741fc33de49bb18e51bd9eba7 https://github.com/facebookexperimental/edencommon/commit/1ece1206325e7a32cc9a8333b84b6fcf58281379 https://github.com/facebookincubator/velox/commit/9ccc84e031bc20787e7c6bdfd413cce89ea9f67c https://github.com/fairinternal/egohowto/commit/e9b04b8fe7e9ce3fa07a052bcf091a951349dfd7 Reviewed By: bigfootjon fbshipit-source-id: 54534d18bad4174e0184d99def73713e3d9e08ea --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0cc06ed61f84..9d942b60784b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e986418c62385456a39656f289276157721598d3 +Subproject commit 4fa460f8b62c2a6925862db9bfd260cbc7422c55 From 9441d3678dd9aad807f214b4ca292af3b399a931 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 12 May 2023 16:30:18 -0700 Subject: [PATCH 6068/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/a01170af59372451dbe0f0125553eeca3b30ba53 https://github.com/facebook/folly/commit/cea162bf00fbe6a801f909056987626d615b6ca9 https://github.com/facebook/litho/commit/73bdabf32b397500eef6ff73c3703a3f67c7b697 https://github.com/facebook/ocamlrep/commit/cd1cb6fcd5406737013d72122e02bd05e919727e https://github.com/facebook/proxygen/commit/7819670405c5faf23ff86757692304f7863e8e1e https://github.com/facebook/wangle/commit/60bc2b7e35ca5016cc6d3d031aa039d01d57fd11 https://github.com/facebookexperimental/edencommon/commit/2a0a94f3c44c95f21c985eaa9baddad7bd280ee4 https://github.com/facebookincubator/fizz/commit/33dd20b958e089b0155b1654fe21ad4c73095a3d https://github.com/facebookincubator/katran/commit/403412f4d4e7f67ac780a45062f312ae148cce7e https://github.com/facebookincubator/mvfst/commit/61dafe025b8f26f1f0423e034258891b9a8273e5 https://github.com/facebookincubator/velox/commit/bec8558ca05e5aa12399f7bb009fc2c5f79b384b Reviewed By: bigfootjon fbshipit-source-id: da1dadf5a4e6be99b64335ab9fc781ed03ca56a9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9d942b60784b..6d838fdc1d3f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4fa460f8b62c2a6925862db9bfd260cbc7422c55 +Subproject commit a01170af59372451dbe0f0125553eeca3b30ba53 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e0f7b3c028b7..3da4772ab92f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7c49356aeb2031be46f3a43190637cd5a112197f +Subproject commit cea162bf00fbe6a801f909056987626d615b6ca9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 903b1d7f13da..1f0f074e0ddc 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d7bb2d649b65487901c961cff8493276a9fc59c4 +Subproject commit 60bc2b7e35ca5016cc6d3d031aa039d01d57fd11 From 55312c530158da681488e8942469abd75bb92028 Mon Sep 17 00:00:00 2001 From: Xavier Deguillard Date: Fri, 12 May 2023 16:57:14 -0700 Subject: [PATCH 6069/7387] io: do not recurse into directories on different FS Summary: In the case where a Watchman watch is created on a parent directory of an EdenFS mount, Watchman will happily crawl the EdenFS repo as if it was on the same filesystem as the root directory. However, this ends up creating a lot of issues, starting with forcing EdenFS to fetch the entirety of the repository and slowing it down as a result. Since this is almost never the desired behavior, Watchman can simply stop recursing on directories that are not on the same mount, solving the issue above. Reviewed By: chadaustin Differential Revision: D45468181 fbshipit-source-id: 8117ba1e3980beeeadff32e50ff39f5c0b81a152 --- watchman/InMemoryView.h | 2 +- watchman/fs/FileSystem.cpp | 20 ++++++++++ watchman/fs/FileSystem.h | 10 +++++ watchman/fs/ParallelWalk.cpp | 20 +++++++--- watchman/fs/ParallelWalk.h | 1 + watchman/fs/ParallelWalkMain.cpp | 6 ++- .../integration/eden/test_eden_journal.py | 4 +- .../integration/eden/test_eden_unmount.py | 1 - .../eden/test_eden_watch_parent.py | 40 +++++++++++++++++++ .../integration/lib/WatchmanEdenTestCase.py | 6 +-- watchman/root/Root.h | 3 ++ watchman/root/init.cpp | 8 +++- watchman/root/iothread.cpp | 18 ++++++++- 13 files changed, 120 insertions(+), 19 deletions(-) create mode 100644 watchman/integration/eden/test_eden_watch_parent.py diff --git a/watchman/InMemoryView.h b/watchman/InMemoryView.h index 56cfc2bd7a59..3ba2ad31cd24 100644 --- a/watchman/InMemoryView.h +++ b/watchman/InMemoryView.h @@ -311,7 +311,7 @@ class InMemoryView final : public QueryableView { * `coll` if a directory needs to be rescanned. */ void statPath( - const RootConfig& root, + const Root& root, const CookieSync& cookies, ViewDatabase& view, PendingChanges& coll, diff --git a/watchman/fs/FileSystem.cpp b/watchman/fs/FileSystem.cpp index 5f625ea017eb..95c3195ff96c 100644 --- a/watchman/fs/FileSystem.cpp +++ b/watchman/fs/FileSystem.cpp @@ -375,6 +375,26 @@ w_string readSymbolicLink(const char* path) { #endif } +bool isOnSameMount( + const FileInformation& root, + const FileInformation& file, + const char* file_path) { +#ifdef _WIN32 + (void)root; + if ((file.fileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) == + FILE_ATTRIBUTE_REPARSE_POINT) { + auto fd = openFileHandle(file_path, OpenFileHandleOptions::queryFileInfo()); + auto reparseTag = fd.getReparseTag(); + return reparseTag != IO_REPARSE_TAG_PROJFS; + } else { + return true; + } +#else + (void)file_path; + return root.dev == file.dev; +#endif +} + } // namespace watchman #ifdef _WIN32 diff --git a/watchman/fs/FileSystem.h b/watchman/fs/FileSystem.h index b240e12e1d4f..1ffc060dd455 100644 --- a/watchman/fs/FileSystem.h +++ b/watchman/fs/FileSystem.h @@ -73,6 +73,16 @@ FileInformation getFileInformation( const char* path, CaseSensitivity caseSensitive = CaseSensitivity::Unknown); +/** + * Test to see if both the files are on the same mount point. + * + * In particular, EdenFS mount below the root will return false. + */ +bool isOnSameMount( + const FileInformation& root, + const FileInformation& file, + const char* file_path); + /** equivalent to realpath() */ w_string realPath(const char* path); diff --git a/watchman/fs/ParallelWalk.cpp b/watchman/fs/ParallelWalk.cpp index 446b054e25ed..94884f972703 100644 --- a/watchman/fs/ParallelWalk.cpp +++ b/watchman/fs/ParallelWalk.cpp @@ -20,6 +20,7 @@ struct ParallelWalkerContext { // Input. std::shared_ptr fileSystem; folly::Executor* executor; + std::optional rootStat; // Task tracking. Other task states live in the Executor. std::atomic readDirTaskCount{0}; @@ -31,8 +32,11 @@ struct ParallelWalkerContext { ParallelWalkerContext( std::shared_ptr fileSystem, - folly::Executor* executor) - : fileSystem{std::move(fileSystem)}, executor{executor} {} + folly::Executor* executor, + std::optional rootStat) + : fileSystem{std::move(fileSystem)}, + executor{executor}, + rootStat{rootStat} {} // Helper for (resultQueue or errorQueue).dequeue. // If no tasks are running, return nullopt. @@ -214,8 +218,11 @@ void readDirTask( for (const auto& entry : entries) { if (entry.stat.isDir()) { AbsolutePath subdirPath = pathJoin(dirFullPath, entry.name); - size_t sizeHint = entry.stat.size / kApproximateSizePerEntry; - subdirsToRead.push_back(std::make_pair(subdirPath, sizeHint)); + if (!context->rootStat || + isOnSameMount(*context->rootStat, entry.stat, subdirPath.c_str())) { + size_t sizeHint = entry.stat.size / kApproximateSizePerEntry; + subdirsToRead.push_back(std::make_pair(subdirPath, sizeHint)); + } } } @@ -243,10 +250,11 @@ void readDirTask( ParallelWalker::ParallelWalker( std::shared_ptr fileSystem, AbsolutePath rootPath, + std::optional rootStat, size_t threadCountHint) { auto executor = getExecutor(threadCountHint); - context_ = - std::make_shared(std::move(fileSystem), executor); + context_ = std::make_shared( + std::move(fileSystem), executor, rootStat); auto task = [context = context_, path = std::move(rootPath), counter = ReadDirTaskCounter(context_)]() mutable { diff --git a/watchman/fs/ParallelWalk.h b/watchman/fs/ParallelWalk.h index 1da91c848354..f06f28bc30b1 100644 --- a/watchman/fs/ParallelWalk.h +++ b/watchman/fs/ParallelWalk.h @@ -68,6 +68,7 @@ class ParallelWalker final { explicit ParallelWalker( std::shared_ptr fileSystem, AbsolutePath rootPath, + std::optional rootStat, size_t threadCountHint = 0); /** diff --git a/watchman/fs/ParallelWalkMain.cpp b/watchman/fs/ParallelWalkMain.cpp index 77a0c33b82a1..9f19e1d916bf 100644 --- a/watchman/fs/ParallelWalkMain.cpp +++ b/watchman/fs/ParallelWalkMain.cpp @@ -18,7 +18,11 @@ void walk(watchman::AbsolutePath path, size_t threadCountHint) { auto start_time = std::chrono::steady_clock::now(); std::shared_ptr fileSystem( std::shared_ptr{}, &watchman::realFileSystem); - auto walker = watchman::ParallelWalker(fileSystem, path, threadCountHint); + auto walker = watchman::ParallelWalker( + fileSystem, + path, + fileSystem->getFileInformation(path.c_str()), + threadCountHint); size_t directory_count = 0; size_t path_count = 0; off_t size = 0; diff --git a/watchman/integration/eden/test_eden_journal.py b/watchman/integration/eden/test_eden_journal.py index e19af733a5ef..6f7fa693bb70 100644 --- a/watchman/integration/eden/test_eden_journal.py +++ b/watchman/integration/eden/test_eden_journal.py @@ -220,9 +220,7 @@ def populate(repo): clock = self.watchmanCommand("clock", root) - eden = self.eden - assert eden is not None - with eden.get_thrift_client_legacy() as thrift_client: + with self.eden.get_thrift_client_legacy() as thrift_client: thrift_client.setJournalMemoryLimit(root, 0) self.assertEqual(0, thrift_client.getJournalMemoryLimit(root)) diff --git a/watchman/integration/eden/test_eden_unmount.py b/watchman/integration/eden/test_eden_unmount.py index d01c1b898783..51a7b32c2e5a 100644 --- a/watchman/integration/eden/test_eden_unmount.py +++ b/watchman/integration/eden/test_eden_unmount.py @@ -22,7 +22,6 @@ def populate(repo): clock = self.watchmanCommand("clock", root) self.touchRelative(root, "newfile") - # pyre-fixme[16]: Optional type has no attribute `unmount`. self.eden.unmount(root) with self.assertRaises(pywatchman.CommandError) as ctx: diff --git a/watchman/integration/eden/test_eden_watch_parent.py b/watchman/integration/eden/test_eden_watch_parent.py new file mode 100644 index 000000000000..fe009b3c75d9 --- /dev/null +++ b/watchman/integration/eden/test_eden_watch_parent.py @@ -0,0 +1,40 @@ +# Copyright (c) Meta Platforms, Inc. and affiliates. +# +# This source code is licensed under the MIT license found in the +# LICENSE file in the root directory of this source tree. + + +import os + +from facebook.eden.constants import STATS_MOUNTS_STATS +from facebook.eden.ttypes import GetStatInfoParams +from watchman.integration.lib import WatchmanEdenTestCase + + +class TestEdenWatchParent(WatchmanEdenTestCase.WatchmanEdenTestCase): + def test_eden_watch_parent(self) -> None: + def populate(repo): + repo.write_file("adir/file", "foo!\n") + repo.commit("initial commit.") + + def get_loaded_count() -> int: + with self.eden.get_thrift_client_legacy() as client: + stats = client.getStatInfo( + GetStatInfoParams(statsMask=STATS_MOUNTS_STATS) + ) + mountPointInfo = stats.mountPointInfo + if mountPointInfo is None: + raise Exception("stats.mountPointInfo is not set") + self.assertEqual(len(mountPointInfo), 1) + for mountPath in mountPointInfo: + info = mountPointInfo[mountPath] + return info.loadedFileCount + info.loadedTreeCount + return 0 + + root = self.makeEdenMount(populate) + + before_loaded = get_loaded_count() + self.watchmanCommand("watch", os.path.dirname(root)) + after_loaded = get_loaded_count() + + self.assertEqual(before_loaded, after_loaded) diff --git a/watchman/integration/lib/WatchmanEdenTestCase.py b/watchman/integration/lib/WatchmanEdenTestCase.py index 4130cc8ed6aa..84c1673d5249 100644 --- a/watchman/integration/lib/WatchmanEdenTestCase.py +++ b/watchman/integration/lib/WatchmanEdenTestCase.py @@ -54,9 +54,9 @@ class WatchmanEdenTestCase(WatchmanTestCase.WatchmanTestCase): ".eden/this-dir", ] - eden: Optional[edenclient.EdenFS] + eden: edenclient.EdenFS - def setUp(self): + def setUp(self) -> None: super(WatchmanEdenTestCase, self).setUp() # The test EdenFS instance. @@ -93,9 +93,7 @@ def _restoreHome(self) -> None: os.environ["HOME"] = self.save_home def cleanUpEden(self) -> None: - assert self.eden is not None self.eden.cleanup() - self.eden = None def cleanUpWatchman(self): roots = self.watchmanCommand("watch-list")["roots"] diff --git a/watchman/root/Root.h b/watchman/root/Root.h index ab2a35ac162c..0eab40651a5d 100644 --- a/watchman/root/Root.h +++ b/watchman/root/Root.h @@ -98,6 +98,7 @@ class RootConfig { const w_string fs_type; const CaseSensitivity case_sensitive; const IgnoreSet ignore; + const FileInformation stat; }; /** @@ -238,6 +239,8 @@ class Root : public RootConfig, public std::enable_shared_from_this { const std::chrono::seconds gc_age{DEFAULT_GC_AGE}; const std::chrono::seconds idle_reap_age{0}; + const bool allow_crawling_other_mounts; + // Stream of broadcast unilateral items emitted by this root std::shared_ptr unilateralResponses; diff --git a/watchman/root/init.cpp b/watchman/root/init.cpp index 33ebfe31a1cc..c271f9a4afc1 100644 --- a/watchman/root/init.cpp +++ b/watchman/root/init.cpp @@ -243,7 +243,12 @@ Root::Root( Configuration config_, std::shared_ptr view, SaveGlobalStateHook saveGlobalStateHook) - : RootConfig{root_path, fs_type, getCaseSensitivityForPath(root_path.c_str()), computeIgnoreSet(root_path, config_)}, + : RootConfig{ + root_path, + fs_type, + getCaseSensitivityForPath(root_path.c_str()), + computeIgnoreSet(root_path, config_), + fileSystem.getFileInformation(root_path.c_str())}, cookies( fileSystem, computeCookieDir(root_path, config_, case_sensitive, ignore)), @@ -256,6 +261,7 @@ Root::Root( gc_age(int(config.getInt("gc_age_seconds", DEFAULT_GC_AGE))), idle_reap_age( int(config.getInt("idle_reap_age_seconds", kDefaultReapAge))), + allow_crawling_other_mounts{config_.getBool("allow_crawling_other_mounts", false)}, unilateralResponses(std::make_shared()), view_{std::move(view)}, saveGlobalStateHook_{std::move(saveGlobalStateHook)} { diff --git a/watchman/root/iothread.cpp b/watchman/root/iothread.cpp index 2593be555686..9520b9542bba 100644 --- a/watchman/root/iothread.cpp +++ b/watchman/root/iothread.cpp @@ -676,7 +676,12 @@ void InMemoryView::crawlerParallel( std::shared_ptr fs = std::make_shared(fileSystem_, root, watcher_); size_t threadCountHint = config_.getInt("parallel_crawl_thread_count", 0); - ParallelWalker walker{std::move(fs), path, threadCountHint}; + ParallelWalker walker{ + std::move(fs), + path, + root->allow_crawling_other_mounts ? std::nullopt + : std::optional{root->stat}, + threadCountHint}; // Step 1: Process readDir results. while (true) { @@ -810,7 +815,7 @@ bool did_file_change( } // namespace void InMemoryView::statPath( - const RootConfig& root, + const Root& root, const CookieSync& cookies, ViewDatabase& view, PendingChanges& coll, @@ -1002,6 +1007,15 @@ void InMemoryView::statPath( dir_ent->last_check_existed = true; } + if (!(root.allow_crawling_other_mounts || + isOnSameMount(root.stat, st, path.c_str()))) { + logf( + DBG, + "Ignoring {} as it doesn't reside on the same mount point as the root directory\n", + pending.path); + return; + } + // Don't recurse if our parent is an ignore dir or via crawlerParallel // (already recursive) if (!viaPwalk && From af63456d82ca6b7607f6d015370b4545d00d3094 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 12 May 2023 17:23:01 -0700 Subject: [PATCH 6070/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/0973eca65f275d709a5ad60c4f2c56202b28393e https://github.com/facebook/ocamlrep/commit/3f897ba7cb3a5ff2a8400c74f26677d2791f70c7 https://github.com/facebookincubator/velox/commit/6085b4974b0256ff9b8afa06996e204e581db2c2 Reviewed By: bigfootjon fbshipit-source-id: ecdd1847ddd870f692efb15c1dfbb667a6c93680 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6d838fdc1d3f..8a922c62153f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a01170af59372451dbe0f0125553eeca3b30ba53 +Subproject commit 0973eca65f275d709a5ad60c4f2c56202b28393e From b09516c5851e1b3f158379b5855df193c56ded46 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 13 May 2023 17:04:51 -0700 Subject: [PATCH 6071/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/ocamlrep/commit/1e411375134150d485bda78392abc80c53dd6bf7 https://github.com/facebook/wangle/commit/e34f56e1905768bc137dd1306a270bfca66be85e https://github.com/facebookincubator/fizz/commit/3e296705f01891e9d6ab9b0ce63b70076709c37f https://github.com/facebookincubator/katran/commit/9a5b37353dec86899f647b705f1a6c46b4ad19a4 https://github.com/facebookincubator/mvfst/commit/56aa0b4caacd1af8d8e70147111511994a82f828 Reviewed By: bigfootjon fbshipit-source-id: f3b9c9c4420f72f1c45210f8288d92b408b541c8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8a922c62153f..92981de2a680 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0973eca65f275d709a5ad60c4f2c56202b28393e +Subproject commit 8b69821cba3156928a776841c690cf63a95f02b3 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 3da4772ab92f..18175982d619 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit cea162bf00fbe6a801f909056987626d615b6ca9 +Subproject commit ed6832328093ccbc9db673ed0b4bf35fe00e3392 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1f0f074e0ddc..b0ab40a54795 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 60bc2b7e35ca5016cc6d3d031aa039d01d57fd11 +Subproject commit e34f56e1905768bc137dd1306a270bfca66be85e From 10e1ab80530eeddd1c3b3db8aad166abae2727b0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 14 May 2023 01:12:20 -0700 Subject: [PATCH 6072/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/wangle/commit/5541897572b584c0397dc549659aa743f3aec6ec Reviewed By: bigfootjon fbshipit-source-id: 48ef0610778b637cd7e557a8e4c0da94a6e76923 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 92981de2a680..12ab65904520 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8b69821cba3156928a776841c690cf63a95f02b3 +Subproject commit b7a8e944952842f87287610824a6ae6dde66c80d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b0ab40a54795..dcbba0e0ed84 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e34f56e1905768bc137dd1306a270bfca66be85e +Subproject commit 5541897572b584c0397dc549659aa743f3aec6ec From ef11edc968851a39eb374d4177b08af1035fc31d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 14 May 2023 18:02:16 -0700 Subject: [PATCH 6073/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5447de259bc43e9647eccc84e8daa75019dd6a5d https://github.com/facebook/proxygen/commit/392f6205819767ee61d0de884649c044ca16f571 https://github.com/facebook/watchman/commit/10e1ab80530eeddd1c3b3db8aad166abae2727b0 Reviewed By: bigfootjon fbshipit-source-id: 340be9364c269e89243726fb31b450f2a863d93a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 12ab65904520..039cca5bd3d4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b7a8e944952842f87287610824a6ae6dde66c80d +Subproject commit 5447de259bc43e9647eccc84e8daa75019dd6a5d From c9000677eb5a030c66ef5473c9646234ced446e7 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 15 May 2023 12:13:54 -0700 Subject: [PATCH 6074/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/f769b87cea2eba7eb03689176fda2eca34595b5e https://github.com/facebook/litho/commit/98ffb76b80100c2b263c665bdd5c815133e5ebd4 https://github.com/facebook/proxygen/commit/de62dd53bb7587aed1b2d5df5bdbcdbc58c9923d Reviewed By: jailby fbshipit-source-id: 4a2f8d5ec28e8431025161ce54f0c3d1c353a36e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 039cca5bd3d4..9f6ea7c6bcc0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5447de259bc43e9647eccc84e8daa75019dd6a5d +Subproject commit f769b87cea2eba7eb03689176fda2eca34595b5e From 2127f47c5663b067207cab88c06ea4039b38ae6a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 15 May 2023 14:01:03 -0700 Subject: [PATCH 6075/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/bc0d482c72d34bcf50e8684651f2bb8f647d7d39 https://github.com/facebook/litho/commit/6dd0748667ab0ad6e2bcedd950f86ddb2071e840 https://github.com/facebook/ocamlrep/commit/6398c78ade2e3c2fff30052ce7e428f22351c55f https://github.com/facebook/proxygen/commit/0f5985b2fe1fce870b05d9d5015ef85c36b02f46 https://github.com/facebook/rocksdb/commit/fb636f24981e997a52bb106a30c3a9a07cbbc614 https://github.com/facebookincubator/velox/commit/c908e3033ebb25bb39b6951a8c96c8ab007888d8 Reviewed By: jailby fbshipit-source-id: 78379f097482ff8bc1a6a27d94534b97256de583 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9f6ea7c6bcc0..f5206332e6a0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f769b87cea2eba7eb03689176fda2eca34595b5e +Subproject commit bc0d482c72d34bcf50e8684651f2bb8f647d7d39 From 5db5c9859e4b1e35972b3b77a0d70a53c219e009 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 15 May 2023 15:02:34 -0700 Subject: [PATCH 6076/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/436e0a07ad5e555836d04dc028bfb7c46e93f008 https://github.com/facebook/litho/commit/de19bdd5285d261b1cb3af78f3e3995762a67fa5 https://github.com/facebook/ocamlrep/commit/1a9b97d1f20091a6f7111e59cd73bfb292c360cc https://github.com/facebook/watchman/commit/2127f47c5663b067207cab88c06ea4039b38ae6a https://github.com/facebookincubator/velox/commit/b603d530e2fa669a784645de9ecc008898827f9b https://github.com/pytorch/fbgemm/commit/891001019f9717e7bf68a3ab2540b5c2caa8c2a6 Reviewed By: jailby fbshipit-source-id: 6e6b04e21e8d4135219fe6a55d5b4a6549e17c75 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 18175982d619..dd77c23b84e5 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ed6832328093ccbc9db673ed0b4bf35fe00e3392 +Subproject commit 436e0a07ad5e555836d04dc028bfb7c46e93f008 From 9d5419d5f4cdf52edf48154d9586092c299b757c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 15 May 2023 15:52:58 -0700 Subject: [PATCH 6077/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5c645d95a1cf1f0cd5fc85d40c97a940099c8780 https://github.com/facebook/proxygen/commit/0e31aca5d66b127f6b90d4d6d0366edc8040dc29 https://github.com/facebook/wangle/commit/5469db13db525ba106520fe204566ac4e4392143 https://github.com/facebookexperimental/edencommon/commit/be5219cad51ab4fcbf9cb4401aacc1197cf38bdd https://github.com/facebookincubator/fizz/commit/31d75c6bbbc6e3e30ca9174043600d6baffa7295 https://github.com/facebookincubator/katran/commit/2cd238570383a72367e390d9c9c62c5c40e611b0 https://github.com/facebookincubator/mvfst/commit/29860606949e3dbc0c80fa4c73623916a19c39ed https://github.com/facebookincubator/velox/commit/dd1d6596e0fb6e6090fb9f6ab87c5d9782886054 Reviewed By: jailby fbshipit-source-id: eb08a77fd4031b26e45761772b727568d6dfabba --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f5206332e6a0..e3cbee2a0c10 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bc0d482c72d34bcf50e8684651f2bb8f647d7d39 +Subproject commit 5c645d95a1cf1f0cd5fc85d40c97a940099c8780 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index dcbba0e0ed84..04c5e5d73734 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5541897572b584c0397dc549659aa743f3aec6ec +Subproject commit 5469db13db525ba106520fe204566ac4e4392143 From 447addef9621892d5d867e542acd9215dcda9400 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 16 May 2023 15:07:20 -0700 Subject: [PATCH 6078/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/c14636fb68bb9cd57883b895e872d01bae655951 https://github.com/facebook/litho/commit/ea4ba38c193f5a418282e31fee0fe549761e0d8c https://github.com/facebook/proxygen/commit/aaa1fb718da706133480fa5fbcb90e3370350d93 https://github.com/facebookincubator/katran/commit/5def659c1e80b9c3c1990fdbec8c4b78d696ecc8 https://github.com/facebookincubator/mvfst/commit/a55b14d0f05339df0097e683192c42fe68f434a6 https://github.com/facebookincubator/velox/commit/cc50b171c1051ab0e1d38a942d460aec94cd8bc1 Reviewed By: jailby fbshipit-source-id: 73e682df047c5271341b3271c3ba0b0a24fd68ae --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e3cbee2a0c10..b25e5c95617b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5c645d95a1cf1f0cd5fc85d40c97a940099c8780 +Subproject commit c14636fb68bb9cd57883b895e872d01bae655951 From 2ccece57db7cc93f41e1848091f8f3ef578a478e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 16 May 2023 16:00:28 -0700 Subject: [PATCH 6079/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/e55d3ca1488d03ec3e478044da77c1a86bebea84 https://github.com/facebook/litho/commit/6014569811c0bedc565cb8e681bc8f86ea74b4fd https://github.com/facebook/wangle/commit/c2d4a0bc379755dccdea2489f53d9661324873f3 Reviewed By: jailby fbshipit-source-id: 3fa05381686f44cb55fec8de331b0fdb4cd9c23f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b25e5c95617b..f4c479415fcf 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c14636fb68bb9cd57883b895e872d01bae655951 +Subproject commit e55d3ca1488d03ec3e478044da77c1a86bebea84 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 04c5e5d73734..ba07fa73914b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5469db13db525ba106520fe204566ac4e4392143 +Subproject commit c2d4a0bc379755dccdea2489f53d9661324873f3 From eaa7bac6732a7c206ca42b94c0fa5305ba4d1715 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 16 May 2023 17:06:08 -0700 Subject: [PATCH 6080/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/83b0673545004f5cf7cb75f52be2b7f4d4d31cb4 https://github.com/facebook/folly/commit/58ec77602c9717e267d4b7c5ada1698365fb2207 https://github.com/facebook/proxygen/commit/d902d1677e31c4b8b1896083c89a765193cafb32 https://github.com/facebook/watchman/commit/2ccece57db7cc93f41e1848091f8f3ef578a478e https://github.com/facebookincubator/velox/commit/99ee69f6d8decf3b8ba3021bfea22e3661721e4e https://github.com/pytorch/kineto/commit/60b08b0827c38f47e45ee29b3dc04b0720e53535 Reviewed By: jailby fbshipit-source-id: 726e27198dd4b031cd670b89768f2c5d3acbeeec --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f4c479415fcf..9f40ad01af00 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e55d3ca1488d03ec3e478044da77c1a86bebea84 +Subproject commit 83b0673545004f5cf7cb75f52be2b7f4d4d31cb4 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index dd77c23b84e5..a884cb938da6 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 436e0a07ad5e555836d04dc028bfb7c46e93f008 +Subproject commit 58ec77602c9717e267d4b7c5ada1698365fb2207 From 39e60ace31c97fcb90d9cf6aedc04718c0df9e70 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 16 May 2023 17:56:49 -0700 Subject: [PATCH 6081/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/b51da0b17e8fc011684c8cc17d38af354f6fb9fc https://github.com/facebook/ocamlrep/commit/eaf3323121055e75cdbeaf4667bc4799ed877a93 https://github.com/facebook/wangle/commit/52c4ed05005215cd5fba604def2c670d849d3af8 https://github.com/facebookexperimental/edencommon/commit/2f7964af3fbc1e979331b4d5f513429e64064005 https://github.com/facebookincubator/fizz/commit/4783fd0a96dc9bb6f387d23bf9acff9a042ab504 https://github.com/facebookincubator/katran/commit/9d2464961560f4359140d05a6135f266d2218338 https://github.com/facebookincubator/mvfst/commit/81abe1ff704df05d1ef724ba5b0b902835504f97 https://github.com/facebookincubator/velox/commit/719304c73165bdb32dca33e21cca24b0fe81fcaa Reviewed By: jailby fbshipit-source-id: f9437b197274a8650c4931ab3e1b1c9f7b68f30f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9f40ad01af00..e7f34c6d5c3c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 83b0673545004f5cf7cb75f52be2b7f4d4d31cb4 +Subproject commit b51da0b17e8fc011684c8cc17d38af354f6fb9fc diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ba07fa73914b..83071fb1b828 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c2d4a0bc379755dccdea2489f53d9661324873f3 +Subproject commit 52c4ed05005215cd5fba604def2c670d849d3af8 From 97e1992e71d14446d4dc72b6c7565a5ad6f75780 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 16 May 2023 19:29:14 -0700 Subject: [PATCH 6082/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/1ae71d3660e9d1da0f9f2aacbe6edf67c5a65ea9 https://github.com/facebookincubator/velox/commit/5f7143b75ee7e1e2056978a0a14645c3c4bcb15f Reviewed By: jailby fbshipit-source-id: 86d4bfd47c3c1b981ccf5751ffa82ea1e7c8886c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e7f34c6d5c3c..34fbc3e3ea4a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b51da0b17e8fc011684c8cc17d38af354f6fb9fc +Subproject commit 1ae71d3660e9d1da0f9f2aacbe6edf67c5a65ea9 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a884cb938da6..7f858ff46915 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 58ec77602c9717e267d4b7c5ada1698365fb2207 +Subproject commit 25b5b4581b3091387da3cb03f497b902f7ed38cc From 660165542cd4b4ae50b2302b3c13a215eec73dd8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 16 May 2023 21:39:13 -0700 Subject: [PATCH 6083/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/ae721c53ae45bc3e2282f8ad2ab7033159b07f07 https://github.com/facebookexperimental/edencommon/commit/5a4b134f0c098df7cf95804dfdad766ea2e1495a https://github.com/facebookincubator/fizz/commit/abefa9de238ad2f02d4d0e8123f51f5aa32cd441 Reviewed By: jailby fbshipit-source-id: 86522a19cdf307c63116ce6f835fb572aada58c1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 34fbc3e3ea4a..4c7864a228d7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1ae71d3660e9d1da0f9f2aacbe6edf67c5a65ea9 +Subproject commit ae721c53ae45bc3e2282f8ad2ab7033159b07f07 From 8fe504374c8f6db63b997729776684ff84cd3ad3 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 16 May 2023 23:41:45 -0700 Subject: [PATCH 6084/7387] fix Windows CMake build Summary: I'm starting to think that including these windows.h defines in the build systems is a bad idea. Reviewed By: mshroyer Differential Revision: D45935279 fbshipit-source-id: 6424bba46e3c63a2fa3d121765ec71718292e5c6 --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 850ebdc4d6be..8252ba5f1b9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,10 @@ set(CMAKE_MODULE_PATH set(CMAKE_CXX_STANDARD 17) +if (WIN32) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWIN32_LEAN_AND_MEAN -DNOMINMAX -DSTRICT") +endif() + # Tell CMake to also look in the directories where getdeps.py installs # our third-party dependencies. list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/external/install") From a15b5e5f425b0f5b13f5430f7a22747f3b63e57e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 17 May 2023 03:54:36 -0700 Subject: [PATCH 6085/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/52e883bcf9986151cb2d4cb56d3cde94cf00e0dd Reviewed By: jailby fbshipit-source-id: fe101edb79a33a4cc3b9f0513951d0b15e79e053 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7f858ff46915..d7818e69ded0 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 25b5b4581b3091387da3cb03f497b902f7ed38cc +Subproject commit 52e883bcf9986151cb2d4cb56d3cde94cf00e0dd From 69e46c72fa6f3ccdd773aa69b9e03e52483bdb1f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 17 May 2023 04:59:40 -0700 Subject: [PATCH 6086/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/9c61d4767f681564e7fef9ffad3bc41838d91545 https://github.com/facebook/ocamlrep/commit/9546535e7f4f3348b4003462564199e4b09f42b7 https://github.com/facebook/proxygen/commit/eeac5eae50d9568544aeb414c035f18ed4742210 https://github.com/facebook/watchman/commit/a15b5e5f425b0f5b13f5430f7a22747f3b63e57e https://github.com/facebookexperimental/edencommon/commit/cf1a7a57ad7818f1a2d084ddbb3f19e6d918ce82 https://github.com/facebookincubator/fizz/commit/64f168ce370575bffd4d9d0195c487a5c2bf47b9 https://github.com/facebookincubator/velox/commit/4e7c6ff8fa208362f0ec0261513b2d4b2d232316 Reviewed By: jailby fbshipit-source-id: b5a8e84b8311d886a306f154fdd0f0eccf28702a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4c7864a228d7..7950540b41d9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ae721c53ae45bc3e2282f8ad2ab7033159b07f07 +Subproject commit 9c61d4767f681564e7fef9ffad3bc41838d91545 From 8571272b7bd820d09b5f70a27bd6a9e58236b2fd Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 17 May 2023 09:51:06 -0700 Subject: [PATCH 6087/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/48ab4c745d52fc64e4550ad20549ef3ca96a05d0 https://github.com/facebookincubator/velox/commit/7e74c9bea6bf6274176c5dd54fdaf595a6c05abd Reviewed By: jailby fbshipit-source-id: 269b42e1ef0045d226203e1466a3b06896acfaed --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d7818e69ded0..81cb1e3f090c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 52e883bcf9986151cb2d4cb56d3cde94cf00e0dd +Subproject commit 48ab4c745d52fc64e4550ad20549ef3ca96a05d0 From 881a715c3cf1bfa3e7efda1265e1b35d4bf0b93d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 17 May 2023 15:24:41 -0700 Subject: [PATCH 6088/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5898151b24ae44453ef4fd185c460ca4895c742a https://github.com/facebookincubator/mvfst/commit/c95b297cb104393e9cda9129f628490500ea24fc Reviewed By: jailby fbshipit-source-id: 273dd02f717cc229ae3500272009738d0f6c803f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7950540b41d9..bf08f6e3c552 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9c61d4767f681564e7fef9ffad3bc41838d91545 +Subproject commit 5898151b24ae44453ef4fd185c460ca4895c742a From 17d147eb327419a2f2b08b155152b1442f43ea13 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 17 May 2023 18:01:24 -0700 Subject: [PATCH 6089/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7db5e37ab50a500f2da55fb8a8912dee33bc7f1e https://github.com/facebook/proxygen/commit/9eaa2c90b331573695c5ab3d983dd5cbe70a4ebd https://github.com/facebook/wangle/commit/2e1486d51863308df9cf08aa32da4aca5410b3a1 https://github.com/facebookincubator/fizz/commit/91afa7ea2aff0b51a3cb2363c7a25d43071aa696 https://github.com/facebookincubator/katran/commit/96edd8aaefae5d9a208b520eb3ca5f4335855fa4 https://github.com/facebookincubator/velox/commit/6058c0fb20b652e14cc9e68bbc84e88b02970017 https://github.com/pytorch/fbgemm/commit/0a3380ffa4934eae1c865542707dd0acf38771b2 Reviewed By: jailby fbshipit-source-id: b405f79a8db2ed0ce75642b78b5c0bf376977e97 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bf08f6e3c552..7714950b419a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5898151b24ae44453ef4fd185c460ca4895c742a +Subproject commit 7db5e37ab50a500f2da55fb8a8912dee33bc7f1e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 83071fb1b828..0ca0943e2dec 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 52c4ed05005215cd5fba604def2c670d849d3af8 +Subproject commit 2e1486d51863308df9cf08aa32da4aca5410b3a1 From 29e2e783fcb62b45db7c20cbcb85f0bfd5016fc5 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 17 May 2023 18:55:41 -0700 Subject: [PATCH 6090/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/fde410c98133b8bbaaa83e85af1d838af97f2362 https://github.com/facebook/fb303/commit/1301df957552aae99eb3e2d8e2c300e82a45c3a8 https://github.com/facebook/fbthrift/commit/15f1980c0e09ea87d0dbaf60d7c6ef27144e4010 https://github.com/facebook/proxygen/commit/8588f5d545214ec9d188ba595aea8d87a8dd2759 https://github.com/facebook/rocksdb/commit/586d78b31e8026b31d229f3f0f548d25f7d68a87 https://github.com/facebook/watchman/commit/17d147eb327419a2f2b08b155152b1442f43ea13 https://github.com/facebookexperimental/rust-shed/commit/071a24ff4047e5275d4b307f453e4c98dc16eaaa https://github.com/facebookincubator/mvfst/commit/aeee9b372827cea28697755ea1f68bfc5288548a https://github.com/facebookincubator/velox/commit/f3ba043aaf0baa9240f95094aa7c08bee2985b6b Reviewed By: jailby fbshipit-source-id: 80b2ca5df1c1484782f526b97d80e071335cd803 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7714950b419a..0f90fc2724ca 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7db5e37ab50a500f2da55fb8a8912dee33bc7f1e +Subproject commit 15f1980c0e09ea87d0dbaf60d7c6ef27144e4010 From 76a3dcdf2edc1d8f0f847109fef16f6247fced67 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 17 May 2023 21:00:24 -0700 Subject: [PATCH 6091/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/f3d04ea32fb4f2ece79cf109a991173b4a640a23 https://github.com/facebook/ocamlrep/commit/dc1b8d53f3c38f29e395cf7794bf8d8ba667d710 https://github.com/facebook/rocksdb/commit/e110d713e0f0880e5621e6875c60e9c9c0239480 Reviewed By: jailby fbshipit-source-id: 39ad4d68667a17ec2638950419dd02da8626d1b2 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 81cb1e3f090c..e9268c512ef8 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 48ab4c745d52fc64e4550ad20549ef3ca96a05d0 +Subproject commit f3d04ea32fb4f2ece79cf109a991173b4a640a23 From 5614f6fe80513376dc1558ba04e84e690a7af2e8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 18 May 2023 07:55:58 -0700 Subject: [PATCH 6092/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/132d3a5e9b1169071f7af4d3fcde17a1739d6ea4 Reviewed By: jailby fbshipit-source-id: 0a73c6fe861a3979386b8adca707cb78656def37 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0f90fc2724ca..9eca85f0df9c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 15f1980c0e09ea87d0dbaf60d7c6ef27144e4010 +Subproject commit 9816231e64b58a462119cae97e4c0a36cd9ebc72 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e9268c512ef8..fce92de053b0 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f3d04ea32fb4f2ece79cf109a991173b4a640a23 +Subproject commit 132d3a5e9b1169071f7af4d3fcde17a1739d6ea4 From edd5ed37dfb79ee51c97c6448fc93f83636e7fbb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 18 May 2023 10:19:38 -0700 Subject: [PATCH 6093/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/c50025aca070101438bf2b925ca53af8811cd7e6 https://github.com/facebook/litho/commit/7a81328c11b3430b7f6ce7d2a630532e44d326c3 https://github.com/facebook/rocksdb/commit/50046869a466efd19456562dad643951900acbb2 https://github.com/facebookincubator/velox/commit/7c2b015799ff52562a04ba0771f224da6a6a4857 Reviewed By: jailby fbshipit-source-id: 9787866448c4184803de6d821d737ab182172cb9 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index fce92de053b0..f8956d5bd55f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 132d3a5e9b1169071f7af4d3fcde17a1739d6ea4 +Subproject commit c50025aca070101438bf2b925ca53af8811cd7e6 From ca3041b54639fd001daf38cd6f38aee245315570 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 18 May 2023 11:41:27 -0700 Subject: [PATCH 6094/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/70332e93adbab75cef57a6bab0c4c75ef08f98e8 https://github.com/facebook/litho/commit/ad0d5f39ea39a6dc6449e08ad2e08433a9312314 https://github.com/facebook/ocamlrep/commit/3b2fe63f2e90d9db7e69f7c2880ef6e1661bae6e https://github.com/facebook/proxygen/commit/56f1aba73c010c8723fc8f49d25e555e192c8af8 https://github.com/facebook/rocksdb/commit/7263f51d50ad5ad1cb3835ac3ef221567264dafe https://github.com/facebook/watchman/commit/edd5ed37dfb79ee51c97c6448fc93f83636e7fbb https://github.com/facebookincubator/velox/commit/e54df62003808e50e45b14c057a27ee28c34d40a https://github.com/pytorch/kineto/commit/938f19a171a88bdb0e0f1895376d072181b60c06 Reviewed By: jailby fbshipit-source-id: 42fc3e1bd32d13264b540994182ae4ea1e389992 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9eca85f0df9c..011715384bcb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9816231e64b58a462119cae97e4c0a36cd9ebc72 +Subproject commit 70332e93adbab75cef57a6bab0c4c75ef08f98e8 From 7f780e038e567106404d18f1b1e89b138edd198c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 18 May 2023 12:38:41 -0700 Subject: [PATCH 6095/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/2b75a4dfda53a230428013dd15ad96b7ef65524c https://github.com/facebook/ocamlrep/commit/ce1c35c4408a1c53c0b9e54363160d2f6f913ddd https://github.com/facebookincubator/velox/commit/8303f64994373216b8e3c758a9832d44b7982a20 Reviewed By: jailby fbshipit-source-id: ae41e18fb3b66afebf22d0ffd5f7daa211ac10db --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f8956d5bd55f..6e0c16bf0725 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c50025aca070101438bf2b925ca53af8811cd7e6 +Subproject commit 2b75a4dfda53a230428013dd15ad96b7ef65524c From d0ddd51b68a9b9d53e62c1ac952983a9b86cef73 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 18 May 2023 14:41:04 -0700 Subject: [PATCH 6096/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/e91c7e1ef2ad75407191927c50d84e17c5546e2a https://github.com/facebook/rocksdb/commit/8d8eb0e77e13a3902d23fbda742dc47aa7bc418f https://github.com/facebook/wangle/commit/ae726ecfc6530f09809cc6bcd8436ffde22ea76d https://github.com/facebookincubator/mvfst/commit/b89882a77272b55bf4a025122daf6bd18271bd65 https://github.com/facebookincubator/velox/commit/9fec2680d96dbd55817b9b7c485626e0146cc18a Reviewed By: jailby fbshipit-source-id: c98b3fda59858c56ecb3e28ee531ddb68905b6d6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 011715384bcb..d6da27bab133 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 70332e93adbab75cef57a6bab0c4c75ef08f98e8 +Subproject commit e91c7e1ef2ad75407191927c50d84e17c5546e2a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0ca0943e2dec..d57d1a06de33 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2e1486d51863308df9cf08aa32da4aca5410b3a1 +Subproject commit ae726ecfc6530f09809cc6bcd8436ffde22ea76d From 2209b1c89dd939fdb5a2ccf469c73a95f3e02848 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 18 May 2023 15:42:49 -0700 Subject: [PATCH 6097/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/056d08dd45ad7360fb5958436979e8ae26f2cac1 https://github.com/facebook/proxygen/commit/15c2bf352fe42d4076d984d77fad91d98c263f35 https://github.com/pytorch/kineto/commit/6bf8eeb9955a2e975e494ae8dffd2259680e771b Reviewed By: jailby fbshipit-source-id: 1302c047e9d41bc90dc6898c1c0730e7f753c8fe --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d6da27bab133..ce7a8a3f8038 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e91c7e1ef2ad75407191927c50d84e17c5546e2a +Subproject commit 056d08dd45ad7360fb5958436979e8ae26f2cac1 From 8a790113b3207c70c41870fafd3ac5867fff52cf Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 18 May 2023 19:54:01 -0700 Subject: [PATCH 6098/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/291e8303613a2e938db9a3ebf80deebf6257ee23 https://github.com/facebook/fb303/commit/9464d4dadb9b4342182173437d286439b4cdd50c https://github.com/facebook/fbthrift/commit/686ce92db58a19bb0db089bbcec7fbc383898dbb https://github.com/facebookexperimental/rust-shed/commit/8584457c509d059f252359ce37c2e74836d21d99 https://github.com/facebookincubator/fizz/commit/d696c6ed2ffec7ed15b77744266902a2ba8b8be2 https://github.com/facebookincubator/katran/commit/202efa8761e623155c9384b3f138e38978253a7f https://github.com/facebookincubator/mvfst/commit/84ae622255e6298369365bc967be10fcebc75859 https://github.com/facebookincubator/velox/commit/456b42799cbb6429f0c63cb3db4e24f286cb4485 Reviewed By: jailby fbshipit-source-id: 34e407a20e2b78cdc1446cfca9628413b9feebe9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ce7a8a3f8038..1584bd454786 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 056d08dd45ad7360fb5958436979e8ae26f2cac1 +Subproject commit 686ce92db58a19bb0db089bbcec7fbc383898dbb diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6e0c16bf0725..401029db4e0a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 2b75a4dfda53a230428013dd15ad96b7ef65524c +Subproject commit 0ce77fd895e28895b64154220c2aa162c70ee228 From 68bdbdf3d9ab7162251f681a080a1a5c4b93b2f8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 19 May 2023 07:39:14 -0700 Subject: [PATCH 6099/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/5dd4aa4ac997b5fd056babc17c71bbc90620b93f https://github.com/facebook/fbthrift/commit/1f07eedd60a2a9ba6b1ca75502535d0a33e6c422 https://github.com/facebook/folly/commit/3b61ea12796899ad5ca4e4f7bf97b24d1937882b https://github.com/facebook/mcrouter/commit/d1f99229d241c05bde5afb71dafd6945880eff57 https://github.com/facebook/ocamlrep/commit/ce787c929b83ff5a1428a71833ba9e3d7d78434b Reviewed By: jailby fbshipit-source-id: dd64246f242d62c097810580cf51b7e4d56afe3b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1584bd454786..a49921a7d41e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 686ce92db58a19bb0db089bbcec7fbc383898dbb +Subproject commit 1f07eedd60a2a9ba6b1ca75502535d0a33e6c422 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 401029db4e0a..6c55aa0309dd 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0ce77fd895e28895b64154220c2aa162c70ee228 +Subproject commit 3b61ea12796899ad5ca4e4f7bf97b24d1937882b From 828a6af9d2836417717d309e1f0cd21b9d27e303 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 19 May 2023 08:44:38 -0700 Subject: [PATCH 6100/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/bcc43e98530e1af32567896537f0ead155f48908 https://github.com/facebook/fbthrift/commit/b051560909400c38927d3428afdeda516a1f7a98 https://github.com/facebook/ocamlrep/commit/e7ae198c609a26b7a0d507aecd0fe4ad178ae98c https://github.com/facebook/proxygen/commit/b33fec4053be28e2dfcf498eea6680f7d47aba2d https://github.com/facebook/watchman/commit/68bdbdf3d9ab7162251f681a080a1a5c4b93b2f8 https://github.com/facebookincubator/fizz/commit/71e036e72c6a43cc714c495ef518bef2de998d65 https://github.com/facebookincubator/velox/commit/5ce708297d64134f4e8d57a6f982a8b4ffff8f19 Reviewed By: jailby fbshipit-source-id: 843ab079d4ed029432f6fb5b64adf68ef0dce052 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a49921a7d41e..c71240df1928 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1f07eedd60a2a9ba6b1ca75502535d0a33e6c422 +Subproject commit b051560909400c38927d3428afdeda516a1f7a98 From 1aa9aeaedad9f983c64ba19fee935ccd8222fd67 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 19 May 2023 10:58:31 -0700 Subject: [PATCH 6101/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/86691d608ed7055fbf8616835f4a43bc81ade169 https://github.com/facebookincubator/mvfst/commit/0ef17254e8897e9d53ae44780b517e90f6383b87 Reviewed By: jailby fbshipit-source-id: 0e231664e8ad5ea9429bcf32b5ae325e7dd870c1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c71240df1928..cf559108e8c9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b051560909400c38927d3428afdeda516a1f7a98 +Subproject commit 86691d608ed7055fbf8616835f4a43bc81ade169 From 65844a07f7df1afcc618f0b6f1eda0741091e0c8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 20 May 2023 10:59:25 -0700 Subject: [PATCH 6102/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5f8415018bf7f1a5396b8492c5dd11a447aac303 https://github.com/facebook/proxygen/commit/e5e389d1a92cfd8edf886e1994dcdc4a325d6600 Reviewed By: jailby fbshipit-source-id: 2b8c30f8ecc39c4c7a0098d8f66cf3c214cb6e8f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cf559108e8c9..bf5e80d62333 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 86691d608ed7055fbf8616835f4a43bc81ade169 +Subproject commit 5f8415018bf7f1a5396b8492c5dd11a447aac303 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d57d1a06de33..80a90f66e13e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ae726ecfc6530f09809cc6bcd8436ffde22ea76d +Subproject commit e35600387b59532bf5c90d6619e32923b4c53201 From cabdf0a45cfe5a56cca42678106e2137610a1b5f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 22 May 2023 10:36:19 -0700 Subject: [PATCH 6103/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/ef9efa37feaa86fabddb6de7a0e5c9f9e21ca37c https://github.com/facebookincubator/conversionsapi-tag-for-googletagmanager/commit/667fb680452cdc87842711feb52467114410ea70 Reviewed By: jurajh-fb fbshipit-source-id: 4d21433663e8df304d7c8687ab6e1668a6718332 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6c55aa0309dd..9a2cd308367c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 3b61ea12796899ad5ca4e4f7bf97b24d1937882b +Subproject commit ef9efa37feaa86fabddb6de7a0e5c9f9e21ca37c From f78d33b634b389ef346c35779c3330942b28ae3d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 22 May 2023 14:29:36 -0700 Subject: [PATCH 6104/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/ed21c8c6c37b7efc88466cd327f483f8686c947e https://github.com/facebook/ocamlrep/commit/47367a2493c952e446426f9425055b84c16af471 https://github.com/facebookincubator/mvfst/commit/372075b6901a3040ffd80501beda53ff31f73530 Reviewed By: jurajh-fb fbshipit-source-id: b2202c3f4a2ba8ffca3db30068f9afa371b47e39 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bf5e80d62333..47bad5a649ab 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5f8415018bf7f1a5396b8492c5dd11a447aac303 +Subproject commit 383097519da398fbba0c13cd2178c6c38ac7834a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9a2cd308367c..bf9d5d62383e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ef9efa37feaa86fabddb6de7a0e5c9f9e21ca37c +Subproject commit ed21c8c6c37b7efc88466cd327f483f8686c947e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 80a90f66e13e..fbb718e3a6b3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e35600387b59532bf5c90d6619e32923b4c53201 +Subproject commit 3671bc13b654b45c85617a16a29ba62695ba477f From 0731ee67f41add4027dca034962138a89e29bf6e Mon Sep 17 00:00:00 2001 From: Muir Manders Date: Mon, 22 May 2023 15:11:23 -0700 Subject: [PATCH 6105/7387] fix windows file sizes > 2**31-1 Summary: We were storing stat.st_size (file byte size) as off_t, but on Windows off_t is a 32 bit signed integer. Any value greater than 2**31-1 was not working. Instead, store file size as uint64_t so big file support is not platform or architecture dependent. Note that in most other places file size is represented as a size_t, so big files still won't work if size_t is only 4 bytes. Reviewed By: chadaustin Differential Revision: D46041426 fbshipit-source-id: 99a3a4274cf1dc08bf6a65e07362fde149407c00 --- watchman/InMemoryView.cpp | 3 +- watchman/fs/FileInformation.cpp | 2 +- watchman/fs/FileInformation.h | 2 +- watchman/integration/test_big_file.py | 46 +++++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 watchman/integration/test_big_file.py diff --git a/watchman/InMemoryView.cpp b/watchman/InMemoryView.cpp index add7c11f4bc5..ecd3ecf63ee4 100644 --- a/watchman/InMemoryView.cpp +++ b/watchman/InMemoryView.cpp @@ -1202,7 +1202,8 @@ void InMemoryView::warmContentCache() { if (f->exists && f->stat.isFile() && (maxFileSizeToWarmInContentCache_ <= 0 || - f->stat.size <= maxFileSizeToWarmInContentCache_)) { + f->stat.size <= + static_cast(maxFileSizeToWarmInContentCache_))) { // Note: we could also add an expression to further constrain // the things we warm up here. Let's see if we need it before // going ahead and adding. diff --git a/watchman/fs/FileInformation.cpp b/watchman/fs/FileInformation.cpp index 6cb7d89a7f1d..c25826dd1065 100644 --- a/watchman/fs/FileInformation.cpp +++ b/watchman/fs/FileInformation.cpp @@ -15,7 +15,7 @@ namespace watchman { #ifndef _WIN32 FileInformation::FileInformation(const struct stat& st) : mode(st.st_mode), - size(off_t(st.st_size)), + size(static_cast(st.st_size)), uid(st.st_uid), gid(st.st_gid), ino(st.st_ino), diff --git a/watchman/fs/FileInformation.h b/watchman/fs/FileInformation.h index 9d55f6db1777..86f49fdc9eb4 100644 --- a/watchman/fs/FileInformation.h +++ b/watchman/fs/FileInformation.h @@ -89,7 +89,7 @@ struct FileInformation { // so it is preferable to use isSymlink() rather than // S_ISLNK() on the mode value. mode_t mode{0}; - off_t size{0}; + uint64_t size{0}; // On Windows systems, these fields are approximated // from cheaply available information in a way that is diff --git a/watchman/integration/test_big_file.py b/watchman/integration/test_big_file.py new file mode 100644 index 000000000000..86deeb86d81b --- /dev/null +++ b/watchman/integration/test_big_file.py @@ -0,0 +1,46 @@ +# vim:ts=4:sw=4:et: +# Copyright (c) Meta Platforms, Inc. and affiliates. +# +# This source code is licensed under the MIT license found in the +# LICENSE file in the root directory of this source tree. + + +import os +import os.path + +from watchman.integration.lib import WatchmanTestCase + + +@WatchmanTestCase.expand_matrix +class TestBigFile(WatchmanTestCase.WatchmanTestCase): + def test_big_file(self) -> None: + root = self.mkdtemp() + + def check(file_size): + with open(os.path.join(root, "big"), "w") as f: + f.truncate(file_size) + + self.watchmanCommand("watch", root) + + result = self.watchmanCommand( + "query", + root, + { + "fields": [ + "name", + "size", + ], + }, + ) + + self.assertEqual(len(result["files"]), 1) + + file = result["files"][0] + self.assertEqual(file["name"], "big") + self.assertEqual(file["size"], file_size) + + # This size overflows int32 + check(2**31) + + # This size overflows uint32 + check(2**32) From fcd74cf2e59f37e27080119c869a78d543b77706 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 22 May 2023 15:16:25 -0700 Subject: [PATCH 6106/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/4f7c1f74858c30d2af460b6f2333a59070683d99 https://github.com/facebook/rocksdb/commit/11ebddb1d4b58a22af3e4f6e6611de77114046ce https://github.com/facebookincubator/mvfst/commit/7113e085444f83ff4f830d59c6ff1e08e4560564 https://github.com/facebookincubator/velox/commit/fe81121bba6c2b123d20eda74eafee47c12f3ff0 Reviewed By: jurajh-fb fbshipit-source-id: 699307b7d3daff66d5f038560da81b2b1ee9f4bf --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 47bad5a649ab..450000062937 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 383097519da398fbba0c13cd2178c6c38ac7834a +Subproject commit 4f7c1f74858c30d2af460b6f2333a59070683d99 From fae99134122d36c8630f92bcbebe6e97b869b1b3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 23 May 2023 00:00:20 -0700 Subject: [PATCH 6107/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/eee65a94807b222042700a2b40b2d4ab30675765 Reviewed By: jurajh-fb fbshipit-source-id: bb8b6c4b97dd50d7f629afe1f741e18d806baa83 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 450000062937..e3c671e8783b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4f7c1f74858c30d2af460b6f2333a59070683d99 +Subproject commit 18728083a0be7eb98328ded54fccfad3c8ce1cc3 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index bf9d5d62383e..b9acd8c14061 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ed21c8c6c37b7efc88466cd327f483f8686c947e +Subproject commit eee65a94807b222042700a2b40b2d4ab30675765 From 12a0decd313d88e153f68f58772043e5a8473fd0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 23 May 2023 07:38:55 -0700 Subject: [PATCH 6108/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/18e27976e3ca1ba9dc02ba92669f330c4f600de8 https://github.com/facebook/litho/commit/0c76535b2f555308c17741a8e823731901b0042b Reviewed By: jurajh-fb fbshipit-source-id: c4b86305ef34f78f53dfddb41f785a1d728cd5a8 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b9acd8c14061..4e80c557a0d0 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit eee65a94807b222042700a2b40b2d4ab30675765 +Subproject commit 18e27976e3ca1ba9dc02ba92669f330c4f600de8 From 5a78b1a3ea03093e46951736c2a9909dfcb39559 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 23 May 2023 08:35:54 -0700 Subject: [PATCH 6109/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/5ed29aacd750ec0eb3914f255feab6705fe9d90e https://github.com/facebook/fbthrift/commit/b7a269109956b690a35400236e2d6be230cef3b2 https://github.com/facebook/litho/commit/902949a86aa4326d937d4d0150620ad82d1d65ad https://github.com/facebook/wangle/commit/9783c17027d4737da47e8820fb24dcf08ea7c4d5 https://github.com/facebook/watchman/commit/12a0decd313d88e153f68f58772043e5a8473fd0 https://github.com/facebookexperimental/edencommon/commit/11081099f460a31fb14e553b2ca18431b544e712 https://github.com/facebookincubator/fizz/commit/aa14cfaa0a487f1776f01de27d5b5c6b11e797ac https://github.com/facebookincubator/katran/commit/f6274cf93d3a8fcdd26470e3a070f8f34479e3b3 https://github.com/facebookincubator/mvfst/commit/e9b8b354cededebb39cd68a801466d09e9d8fed4 Reviewed By: jurajh-fb fbshipit-source-id: ee1a10119b64b8600081eea279454b01f9c31e0d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e3c671e8783b..5686d5aab4e3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 18728083a0be7eb98328ded54fccfad3c8ce1cc3 +Subproject commit b7a269109956b690a35400236e2d6be230cef3b2 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index fbb718e3a6b3..8219fd17c85e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3671bc13b654b45c85617a16a29ba62695ba477f +Subproject commit 9783c17027d4737da47e8820fb24dcf08ea7c4d5 From 5a1c58828bacef2a8f0303f21223e62de720852f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 23 May 2023 10:27:36 -0700 Subject: [PATCH 6110/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8eb05e020dd219f80adee567085d34dabb1ffc69 https://github.com/facebook/rocksdb/commit/bf9e864235df9be959a859b3af68f2056f17c211 https://github.com/facebookincubator/mvfst/commit/a088596b7deb07c089a7eea48a0cad36c32a2cf1 Reviewed By: jurajh-fb fbshipit-source-id: b970e19ea57cbf218bc097b8ffcd6e8c77498efc --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5686d5aab4e3..b0ce3ba64a17 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b7a269109956b690a35400236e2d6be230cef3b2 +Subproject commit 8eb05e020dd219f80adee567085d34dabb1ffc69 From ee110efb83d16649b586be603717b45cd24abf09 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 23 May 2023 11:59:51 -0700 Subject: [PATCH 6111/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/c177c93acabda0d1281f31c0e92f22b3b08be191 https://github.com/facebook/fbthrift/commit/68e4e25248eee387a2aa869cac55a18e1041649b https://github.com/facebookincubator/katran/commit/bf6ec35a3f767fa1fa41e243e96975ad3009cf71 Reviewed By: jurajh-fb fbshipit-source-id: a17cd385060b6e4b5947ab8523baa91c134937e4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b0ce3ba64a17..27db94d15bca 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8eb05e020dd219f80adee567085d34dabb1ffc69 +Subproject commit 68e4e25248eee387a2aa869cac55a18e1041649b From 2076907ac87c1251df7a431c6b958c2af94ca49a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 23 May 2023 16:04:29 -0700 Subject: [PATCH 6112/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/fdb9545c5102e93b58f21f2a792bd640bd7be39d Reviewed By: jurajh-fb fbshipit-source-id: 997b0206e7accde62bb2fbe36782b0d1000d509f --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4e80c557a0d0..21ec93edd1f1 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 18e27976e3ca1ba9dc02ba92669f330c4f600de8 +Subproject commit fdb9545c5102e93b58f21f2a792bd640bd7be39d From d73a7aed50dfc53d3b48eeb8e17913ec7aca8c1e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 23 May 2023 18:30:43 -0700 Subject: [PATCH 6113/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/98ae2021bfe759fcf67e20ffcbb56c95db685019 Reviewed By: jurajh-fb fbshipit-source-id: 1adb4f5edd88e925371daf15cdc56b6126e17414 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 27db94d15bca..3f90ec926fe0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 68e4e25248eee387a2aa869cac55a18e1041649b +Subproject commit 98ae2021bfe759fcf67e20ffcbb56c95db685019 From d777378d9c93b56e806ffdc97c832230a663c84e Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 23 May 2023 19:12:06 -0700 Subject: [PATCH 6114/7387] add OBJECT_ID attribute to getAttributesFromFilesV2 Summary: For tools that want to take advantage of the same fast-path logic when directories don't change across updates, expose a semistable ID they can use to cache derived data or get a rough understand when a directory has changed its contents. Reviewed By: kmancini, xavierd Differential Revision: D45974142 fbshipit-source-id: 7b2b482876b07e73514a936e198de2dc31ed1597 --- eden/fs/service/eden.thrift | 39 +++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index bda022825cfd..bb0e5ec3426a 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -294,12 +294,36 @@ union FileInformationOrError { */ enum FileAttributes { NONE = 0, + /** + * Returns the SHA-1 hash of a file. Returns an error for symlinks and directories, + * and non-regular files. + */ SHA1_HASH = 1, + /** + * Returns the size of a file. Returns an error for symlinks and directories. + */ FILE_SIZE = 2, + /** + * Returns the type of a file or directory if it has a corresponding "source + * control type" that can be represented in a source control type. + */ SOURCE_CONTROL_TYPE = 4, + /** + * Returns an opaque identifier that can be used to know when a file or directory + * (recursively) has changed. + * + * If the file or directory (recursively) has been locally written to, no object ID + * will be returned. In that case, the caller should physically compare or search + * the directory structure. + * + * Do not attempt to parse this identifier. It is subject to change at any moment. + */ + OBJECT_ID = 8, /* NEXT_ATTR = 2^x */ } (cpp2.enum_type = 'uint64_t') +typedef unsigned64 RequestedAttributes + /** * Subset of attributes for a single file returned by getAttributesFromFiles() */ @@ -339,6 +363,16 @@ union SourceControlTypeOrError { 2: EdenError error; } +union ObjectIdOrError { + // If the path has been locally written to, it will have no object ID. Therefore, + // it's possible for `objectId` to be unset even if there is no error. + // + // Notably, if path refers to a directory, no object ID will be returned if any + // child file or directory has been written to. + 1: ThriftObjectId objectId; + 2: EdenError error; +} + /** * Subset of attributes for a single file returned by getAttributesFromFiles() * @@ -350,6 +384,7 @@ struct FileAttributeDataV2 { 1: optional Sha1OrError sha1; 2: optional SizeOrError size; 3: optional SourceControlTypeOrError sourceControlType; + 4: optional ObjectIdOrError objectId; } /** @@ -409,7 +444,7 @@ struct SyncBehavior { struct GetAttributesFromFilesParams { 1: PathString mountPoint; 2: list paths; - 3: unsigned64 requestedAttributes; + 3: RequestedAttributes requestedAttributes; 4: SyncBehavior sync; } @@ -428,7 +463,7 @@ struct GetAttributesFromFilesResultV2 { struct ReaddirParams { 1: PathString mountPoint; 2: list directoryPaths; - 3: unsigned64 requestedAttributes; + 3: RequestedAttributes requestedAttributes; 4: SyncBehavior sync; } From 683afa86282c30d07fb2fbc764a52d238b3d19f9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 23 May 2023 19:30:11 -0700 Subject: [PATCH 6115/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/9ca3de5be2fc8463f0664462a8fa71dff3c09094 https://github.com/facebook/proxygen/commit/36c5110b33a2388d861ff9445ca153f0f26fb61d Reviewed By: jurajh-fb fbshipit-source-id: 2a9ffb69dcd460ae97d9b622a53dd72444b9f3f8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3f90ec926fe0..c4c6db998d87 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 98ae2021bfe759fcf67e20ffcbb56c95db685019 +Subproject commit 9ca3de5be2fc8463f0664462a8fa71dff3c09094 From 07e2738be71ea2d22bd2a2b246eca88133b0959c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 24 May 2023 10:06:38 -0700 Subject: [PATCH 6116/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/4f47c282b68037c8019def8691c18691611f3958 https://github.com/facebook/folly/commit/dc08e5a31f8b53fd8e55c236a19d082b217b6ec0 https://github.com/facebook/litho/commit/c3aefd9e8bb929d2bb40eef60d3a6a0c4af15164 https://github.com/facebook/mcrouter/commit/a47aaa73c620fd24b9466395cadd7e3de57ba587 Reviewed By: jurajh-fb fbshipit-source-id: b4b40e49b32fb818fdae530818d69bda6dc2c85b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c4c6db998d87..15ec45b46624 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9ca3de5be2fc8463f0664462a8fa71dff3c09094 +Subproject commit 4f47c282b68037c8019def8691c18691611f3958 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 21ec93edd1f1..f07c816879d4 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit fdb9545c5102e93b58f21f2a792bd640bd7be39d +Subproject commit dc08e5a31f8b53fd8e55c236a19d082b217b6ec0 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8219fd17c85e..98c2c1e3f6a4 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9783c17027d4737da47e8820fb24dcf08ea7c4d5 +Subproject commit cf51b0951b64f758e3db93c2c7e952d6049f1d9f From 08dd4354035587e8151980e9e5bae9265c0b13eb Mon Sep 17 00:00:00 2001 From: Xavier Deguillard Date: Wed, 24 May 2023 10:12:03 -0700 Subject: [PATCH 6117/7387] integration: allow tests to run on Windows Summary: There appear to be no integration test coverage on Windows, let's fix that. Reviewed By: chadaustin Differential Revision: D46132604 fbshipit-source-id: 42b77679ba253b585614049c28d253e89ccf4709 --- watchman/integration/cppclient.cpp | 4 ++-- watchman/integration/lib/WatchmanInstance.py | 7 +++++-- watchman/integration/test_cppclient.py | 1 + watchman/integration/test_wm_wait.py | 2 ++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/watchman/integration/cppclient.cpp b/watchman/integration/cppclient.cpp index 0da9fc42cce4..62451863cd6e 100644 --- a/watchman/integration/cppclient.cpp +++ b/watchman/integration/cppclient.cpp @@ -97,8 +97,8 @@ int main(int argc, char** argv) { } dynamic relative_query = dynamic::object("fields", dynamic::array("name"))( "expression", - dynamic::array("name", empty_file_relative_path.native())); - auto subdir_ptr = c.watch(subdir.path().native()).get(); + dynamic::array("name", empty_file_relative_path.string())); + auto subdir_ptr = c.watch(subdir.path().string()).get(); auto result = c.query(relative_query, subdir_ptr).get(); if (result.raw_["files"].empty()) { LOG(ERROR) << "FAIL: No files found in " << folly::toJson(result.raw_); diff --git a/watchman/integration/lib/WatchmanInstance.py b/watchman/integration/lib/WatchmanInstance.py index 5964583964b0..b5c29c50e05b 100644 --- a/watchman/integration/lib/WatchmanInstance.py +++ b/watchman/integration/lib/WatchmanInstance.py @@ -258,11 +258,14 @@ def _waitForSuspend(self, suspended, timeout: float) -> bool: time.sleep(0.03) return False + def _susresBinary(self) -> str: + return os.environ.get("WATCHMAN_SUSRES", "susres.exe") + def suspend(self) -> None: if self.proc.poll() or self.pid <= 1: raise Exception("watchman process isn't running") if os.name == "nt": - subprocess.check_call(["susres.exe", "suspend", str(self.pid)]) + subprocess.check_call([self._susresBinary(), "suspend", str(self.pid)]) else: os.kill(self.pid, signal.SIGSTOP) @@ -273,7 +276,7 @@ def resume(self) -> None: if self.proc.poll() or self.pid <= 1: raise Exception("watchman process isn't running") if os.name == "nt": - subprocess.check_call(["susres.exe", "resume", str(self.pid)]) + subprocess.check_call([self._susresBinary(), "resume", str(self.pid)]) else: os.kill(self.pid, signal.SIGCONT) diff --git a/watchman/integration/test_cppclient.py b/watchman/integration/test_cppclient.py index 214163647700..545a2839f7a2 100644 --- a/watchman/integration/test_cppclient.py +++ b/watchman/integration/test_cppclient.py @@ -21,6 +21,7 @@ ) +@unittest.skipIf(os.name == "nt", "cppclient doesn't run on Windows") class TestCppClient(unittest.TestCase): def setUp(self) -> None: self.tmpDirCtx = tempfile.TemporaryDirectory() # noqa P201 diff --git a/watchman/integration/test_wm_wait.py b/watchman/integration/test_wm_wait.py index b35c21fbc94a..026c5fe5282f 100644 --- a/watchman/integration/test_wm_wait.py +++ b/watchman/integration/test_wm_wait.py @@ -7,11 +7,13 @@ import os import subprocess import sys +import unittest from watchman.integration.lib import WatchmanTestCase @WatchmanTestCase.expand_matrix +@unittest.skipIf(os.name == "nt", "Doesn't run on Windows") class TestWatchmanWait(WatchmanTestCase.WatchmanTestCase): def requiresPersistentSession(self) -> bool: return True From 54328db6d223944313412779ded36d7ce9f863be Mon Sep 17 00:00:00 2001 From: Xavier Deguillard Date: Wed, 24 May 2023 10:12:03 -0700 Subject: [PATCH 6118/7387] win32: handle overflow events Summary: According to Microsoft's documentation, the kernel may overflow its own buffers if user space doesn't read file notification fast enough. In that case, the documentation is not clear, but a combinaison of 2 things can be done: - An ERROR_NOTIFY_ENUM_DIR will be returned - The written bytes value will be set to 0 From reading the code, it appears that ERROR_NOTIFY_ENUM_DIR is correctly used[0], but the code never test for the written bytes value. Thus in the case where Windows only notify Watchman of an overflow via the written bytes, Watchman will not detect the overflow and miss events! To better understand the error, I've simply added a sleep(20) right before calling ReadDirectoryChangesW to force the buffer to overflow and copied a large amount of files in a watched directory. Watching the directory with `watchman-wait . -m 0` showed that no files were detected as written and that GetOverlappedResult was setting the written bytes to 0. Reviewed By: mshroyer Differential Revision: D46122162 fbshipit-source-id: d6a0b65e51283ca7bb8ab160b84d3d034daebbaf --- watchman/integration/test_force_recrawl.py | 32 +++++++ watchman/watcher/win32.cpp | 100 ++++++++++++--------- 2 files changed, 89 insertions(+), 43 deletions(-) create mode 100644 watchman/integration/test_force_recrawl.py diff --git a/watchman/integration/test_force_recrawl.py b/watchman/integration/test_force_recrawl.py new file mode 100644 index 000000000000..e7f9a70891b7 --- /dev/null +++ b/watchman/integration/test_force_recrawl.py @@ -0,0 +1,32 @@ +# Copyright (c) Meta Platforms, Inc. and affiliates. +# +# This source code is licensed under the MIT license found in the +# LICENSE file in the root directory of this source tree. + + +import os + +from watchman.integration.lib import WatchmanTestCase + + +@WatchmanTestCase.expand_matrix +class TestForceRecrawl(WatchmanTestCase.WatchmanTestCase): + def test_force_recrawl(self) -> None: + root = self.mkdtemp() + self.watchmanCommand("watch", root) + + os.mkdir(os.path.join(root, "foo")) + filelist = ["foo"] + + self.assertFileList(root, filelist) + + self.suspendWatchman() + + filelist = ["foo"] + for i in range(20000): + self.touchRelative(root, "foo", str(i)) + filelist.append(f"foo/{i}") + + self.resumeWatchman() + + self.assertFileList(root, filelist) diff --git a/watchman/watcher/win32.cpp b/watchman/watcher/win32.cpp index a59eec691c54..dbdd0e07d090 100644 --- a/watchman/watcher/win32.cpp +++ b/watchman/watcher/win32.cpp @@ -236,58 +236,72 @@ void WinWatcher::readChangesThread(const std::shared_ptr& root) { } if (err == ERROR_NOTIFY_ENUM_DIR) { - root->scheduleRecrawl("ERROR_NOTIFY_ENUM_DIR"); + logf( + ERR, + "GetOverlappedResult failed with ERROR_NOTIFY_ENUM_DIR, recrawling.\n"); + items.emplace_back( + w_string{root->root_path}, + PendingFlags{W_PENDING_IS_DESYNCED | W_PENDING_RECURSIVE}); } else { logf(ERR, "Cancelling watch for {}\n", root->root_path); root->cancel(); break; } } else { - PFILE_NOTIFY_INFORMATION notify = (PFILE_NOTIFY_INFORMATION)buf.data(); - - while (true) { - // FileNameLength is in BYTES, but FileName is WCHAR - DWORD n_chars = notify->FileNameLength / sizeof(notify->FileName[0]); - w_string name(notify->FileName, n_chars); - - auto full = w_string::pathCat({root->root_path, name}); - - if (!root->ignore.isIgnored(full.data(), full.size())) { - // If we have a delete or rename-away it may be part of - // a recursive tree remove or rename. In that situation - // the notifications that we'll receive from the OS will - // be from the leaves and bubble up to the root of the - // delete/rename. We want to flag those paths for recursive - // analysis so that we can prune children from the trie - // that is built when we pass this to the pending list - // later. We don't do that here in this thread because - // we're trying to minimize latency in this context. - items.emplace_back( - w_string{full}, - (notify->Action == FILE_ACTION_REMOVED || - notify->Action == FILE_ACTION_RENAMED_OLD_NAME) - ? W_PENDING_RECURSIVE - : 0); - - if (!name.empty() && - (notify->Action == FILE_ACTION_ADDED || - notify->Action == FILE_ACTION_REMOVED || - notify->Action == FILE_ACTION_RENAMED_OLD_NAME || - notify->Action == FILE_ACTION_RENAMED_NEW_NAME)) { - // ReadDirectoryChangesW provides change events when the child - // entry list changes, but may not provide a notification for the - // parent when its mtime changes. It should be rescanned, so - // synthesize an event for the IO thread here. - items.emplace_back(full.dirName(), PendingFlags{}); + if (bytes == 0) { + logf(ERR, "ReadDirectoryChangesW overflowed, recrawling.\n"); + items.emplace_back( + w_string{root->root_path}, + PendingFlags{W_PENDING_IS_DESYNCED | W_PENDING_RECURSIVE}); + } else { + PFILE_NOTIFY_INFORMATION notify = + (PFILE_NOTIFY_INFORMATION)buf.data(); + + while (true) { + // FileNameLength is in BYTES, but FileName is WCHAR + DWORD n_chars = + notify->FileNameLength / sizeof(notify->FileName[0]); + w_string name(notify->FileName, n_chars); + + auto full = w_string::pathCat({root->root_path, name}); + + if (!root->ignore.isIgnored(full.data(), full.size())) { + // If we have a delete or rename-away it may be part of + // a recursive tree remove or rename. In that situation + // the notifications that we'll receive from the OS will + // be from the leaves and bubble up to the root of the + // delete/rename. We want to flag those paths for recursive + // analysis so that we can prune children from the trie + // that is built when we pass this to the pending list + // later. We don't do that here in this thread because + // we're trying to minimize latency in this context. + items.emplace_back( + w_string{full}, + (notify->Action == FILE_ACTION_REMOVED || + notify->Action == FILE_ACTION_RENAMED_OLD_NAME) + ? W_PENDING_RECURSIVE + : 0); + + if (!name.empty() && + (notify->Action == FILE_ACTION_ADDED || + notify->Action == FILE_ACTION_REMOVED || + notify->Action == FILE_ACTION_RENAMED_OLD_NAME || + notify->Action == FILE_ACTION_RENAMED_NEW_NAME)) { + // ReadDirectoryChangesW provides change events when the child + // entry list changes, but may not provide a notification for + // the parent when its mtime changes. It should be rescanned, so + // synthesize an event for the IO thread here. + items.emplace_back(full.dirName(), PendingFlags{}); + } } - } - // Advance to next item - if (notify->NextEntryOffset == 0) { - break; + // Advance to next item + if (notify->NextEntryOffset == 0) { + break; + } + notify = + (PFILE_NOTIFY_INFORMATION)(notify->NextEntryOffset + (char*)notify); } - notify = - (PFILE_NOTIFY_INFORMATION)(notify->NextEntryOffset + (char*)notify); } ResetEvent(olapEvent); From 8b1259b6a348a0bd17ac0ff3615d17a5e6140484 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 24 May 2023 11:00:13 -0700 Subject: [PATCH 6119/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/4f4b97b7a5dfc21bb55279008add885a536d2fc4 https://github.com/facebook/litho/commit/86491c51051bfa3cb2afd9ea7ad5fe9027457133 https://github.com/facebook/watchman/commit/54328db6d223944313412779ded36d7ce9f863be https://github.com/facebookincubator/katran/commit/5fe0890c1f9a1dff3d634860c257c0be80d9e0aa Reviewed By: jurajh-fb fbshipit-source-id: bb9f8b6416d7e6a93f201284a381ab5b4d94245e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 15ec45b46624..3ee002408766 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4f47c282b68037c8019def8691c18691611f3958 +Subproject commit 4f4b97b7a5dfc21bb55279008add885a536d2fc4 From 36303a29dd9498d2a61c796f9684658903c59a77 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 24 May 2023 15:03:57 -0700 Subject: [PATCH 6120/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/78a2b4b15e60a6c04da36fa26620c754a100b96c https://github.com/facebook/folly/commit/b6af14dd1ecdc8aa69d54f9308cf2b4130af10b8 https://github.com/facebookincubator/mvfst/commit/c00fe235c8c82eafce65b66a54b9af650c471536 https://github.com/facebookincubator/velox/commit/e1f89b69beef7fd923b8cbb1ae02bc83245ed06b Reviewed By: jurajh-fb fbshipit-source-id: 8c6a3e24a93cf0abe11121e2df39dfa710d727a9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3ee002408766..1a74ad3090b6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4f4b97b7a5dfc21bb55279008add885a536d2fc4 +Subproject commit 78a2b4b15e60a6c04da36fa26620c754a100b96c diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f07c816879d4..2178c019fe8b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit dc08e5a31f8b53fd8e55c236a19d082b217b6ec0 +Subproject commit b6af14dd1ecdc8aa69d54f9308cf2b4130af10b8 From 84a52bbc89204572100f15c985e7d4024a8a9aba Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Wed, 24 May 2023 16:41:02 -0700 Subject: [PATCH 6121/7387] remove debugGetScmBlob Summary: I created debugGetBlob a while ago and there are no more callers of debugGetScmBlob from code search, so let's delete this. Reviewed By: chadaustin Differential Revision: D45972619 fbshipit-source-id: 97276ec2182fbe7d9022a06e9a0df34ae4e80235 --- eden/fs/service/eden.thrift | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index bb0e5ec3426a..4cc339504e95 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1933,21 +1933,6 @@ service EdenService extends fb303_core.BaseService { 3: bool localStoreOnly, ) throws (1: EdenError ex); - /** - * DEPRECATED -- use debugGetBlob instead. - * TODO: Remove January 2023. - * - * Get the contents of a source control Blob. - * - * This can be used to confirm if eden's LocalStore contains information - * for the blob, and that the information is correct. - */ - binary debugGetScmBlob( - 1: PathString mountPoint, - 2: ThriftObjectId id, - 3: bool localStoreOnly, - ) throws (1: EdenError ex); - /** * Get the contents of a source control Blob. * From 2c51b00c7afe48a6d0f3485485b124a41a6b47c9 Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Wed, 24 May 2023 16:41:02 -0700 Subject: [PATCH 6122/7387] remove debugGetScmBlobMetadata Summary: I migrated the last caller of debugGetScmBlobMetadata to debugGetBlobMetadata in the last diff. Let's delete the old method. I am not really concerned about waiting for that lower diff to rollout and all because this is a debugging command that we only sparingly ask users to run (As far as I know like maybe 3 times). Reviewed By: chadaustin Differential Revision: D45972617 fbshipit-source-id: 6d4689a225fee972f8e3a802115852043f0bade8 --- eden/fs/service/eden.thrift | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 4cc339504e95..5661dbba5c57 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1944,23 +1944,6 @@ service EdenService extends fb303_core.BaseService { 1: DebugGetScmBlobRequest request, ) throws (1: EdenError ex); - /** - * DEPRECATED -- use debugGetBlobMetadata instead. - * TODO: Remove Febuary 2023. - * - * Get the metadata about a source control Blob. - * - * This retrieves the metadata about a source control Blob. This returns - * the size and contents SHA1 of the blob, which eden stores separately from - * the blob itself. This can also be a useful alternative to - * debugGetScmBlob() when getting data about extremely large blobs. - */ - ScmBlobMetadata debugGetScmBlobMetadata( - 1: PathString mountPoint, - 2: ThriftObjectId id, - 3: bool localStoreOnly, - ) throws (1: EdenError ex); - /** * Get the metadata about a source control Blob. * From e9a601cb200e10ab66acf8900aa5d801ef04e1e4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 24 May 2023 17:15:56 -0700 Subject: [PATCH 6123/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/03b65a16d39cf8dda517ef979580eded76024ed0 https://github.com/facebook/watchman/commit/2c51b00c7afe48a6d0f3485485b124a41a6b47c9 Reviewed By: jurajh-fb fbshipit-source-id: d39886567109b27aff25328142adf61fdbe4c336 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1a74ad3090b6..095960eaaaf7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 78a2b4b15e60a6c04da36fa26620c754a100b96c +Subproject commit 03b65a16d39cf8dda517ef979580eded76024ed0 From 87e5d2b3905e08fef250a71d9c94a5a4f8ba849d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 25 May 2023 10:10:02 -0700 Subject: [PATCH 6124/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/883007bd8994563793cf676e578954f4baf52954 https://github.com/facebookincubator/katran/commit/0a94f8d187b2aac43a63edc0535123152fdab723 Reviewed By: jurajh-fb fbshipit-source-id: 079837fc4fac309ac0dc905e7d1e066fac05ea1b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 095960eaaaf7..f199b65c2d41 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 03b65a16d39cf8dda517ef979580eded76024ed0 +Subproject commit 883007bd8994563793cf676e578954f4baf52954 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 2178c019fe8b..1a47b696a286 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b6af14dd1ecdc8aa69d54f9308cf2b4130af10b8 +Subproject commit d16705f766d89440540d8435bcec0656acf9c045 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 98c2c1e3f6a4..5aeb9e928720 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit cf51b0951b64f758e3db93c2c7e952d6049f1d9f +Subproject commit de3661de8c859457763673386cfa0fdadb427bbb From 0e90171fc601b24cd5269bf963bd18edb034ce58 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 25 May 2023 11:31:15 -0700 Subject: [PATCH 6125/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/954c272abd58529b060323f6660f3c2fb52bf1eb https://github.com/facebook/ocamlrep/commit/2fe24aa73b96dc8a713e8add73a3095921c768c3 https://github.com/facebook/rocksdb/commit/dcc6fc99f99821ef7c31853675c389cdef6cb9f7 Reviewed By: jurajh-fb fbshipit-source-id: f620eb4f0a20a4211348d58a38a94995e2eec07d --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 1a47b696a286..b5f173cb851d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d16705f766d89440540d8435bcec0656acf9c045 +Subproject commit 954c272abd58529b060323f6660f3c2fb52bf1eb From ae9a53907544a3d018f5ddcaed101647332d15ea Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 25 May 2023 13:08:32 -0700 Subject: [PATCH 6126/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/2aa5ba681d49a7e4f0cacdf2f95432f15fc9a12f https://github.com/facebook/litho/commit/d71cdbeb28cadb99e944d9a239b1b83f98033a7a https://github.com/facebook/ocamlrep/commit/74b5232ee2ad230a8193eb1f5626357bdfe3be11 https://github.com/facebook/proxygen/commit/9e418d0dcc96f5c674c62126f2647345426c4f4e https://github.com/facebook/watchman/commit/0e90171fc601b24cd5269bf963bd18edb034ce58 https://github.com/facebookincubator/mvfst/commit/4754b3a363bf2088b2c46cf369ed3752a982e6b3 https://github.com/pytorch/fbgemm/commit/52074141ade619bf623e045a2525bac7f45992e9 Reviewed By: jurajh-fb fbshipit-source-id: 5b6632cf6b2ec59d258d132975ce7591f434f220 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b5f173cb851d..f81f644e3608 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 954c272abd58529b060323f6660f3c2fb52bf1eb +Subproject commit 2aa5ba681d49a7e4f0cacdf2f95432f15fc9a12f From c9ffd08c6a476f45eac209e5b177c9f00aa8abeb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 25 May 2023 14:29:25 -0700 Subject: [PATCH 6127/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/24be93d2c17d0f2d244469085debe39371a6d70c https://github.com/facebook/ocamlrep/commit/448d0c1e421f6d0b48bcd82de584cf90c6b56ce6 https://github.com/facebookincubator/mvfst/commit/96187d911401c0b1dccb2f7545f317e8ed58fcf5 https://github.com/facebookincubator/velox/commit/797ab53d38cb13a3ae92dfa70adf7430fc1ff3c3 Reviewed By: jurajh-fb fbshipit-source-id: 26ae43225bbf7f827a2cbaa60c33fa804e8a817b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f199b65c2d41..84a9a7ca9227 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 883007bd8994563793cf676e578954f4baf52954 +Subproject commit 24be93d2c17d0f2d244469085debe39371a6d70c From e0eefef316076b4734300681da7fb15bccb92cde Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 26 May 2023 09:05:50 -0700 Subject: [PATCH 6128/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/619eeff73ed1d28a92bb4ffa1da1fc71d21b0656 Reviewed By: jurajh-fb fbshipit-source-id: ce19c6be6671de951cefa3c156ea15c4ab537969 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 84a9a7ca9227..cb74f5806032 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 24be93d2c17d0f2d244469085debe39371a6d70c +Subproject commit caad46dc8ace414174c3d28409510c6c4d969770 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f81f644e3608..f2e301cf7e8b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 2aa5ba681d49a7e4f0cacdf2f95432f15fc9a12f +Subproject commit 619eeff73ed1d28a92bb4ffa1da1fc71d21b0656 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5aeb9e928720..757954aea3db 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit de3661de8c859457763673386cfa0fdadb427bbb +Subproject commit cbfc1d77ec263237e8fcbce8392e6eae8a62034f From f736e654be78395f21d4b83228d970d2b9447fed Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 26 May 2023 11:34:11 -0700 Subject: [PATCH 6129/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/f681898c11d82999ce5877e59262fbade4b46c65 https://github.com/facebook/ocamlrep/commit/d33bc9c4b63992e95cb3484cf2166222afa93850 https://github.com/facebook/proxygen/commit/1bff704a7f7511ddf77bed0f348f46904dbe6fbe https://github.com/facebook/rocksdb/commit/23f4e9ad63ca4b1ab5d318cb261916ab1a3a231b https://github.com/facebookincubator/katran/commit/15b24eaac0495995401eb407a558ca6aeaa22e03 Reviewed By: jurajh-fb fbshipit-source-id: 2bc30ce3c3c0513809c2c72daba33683e203a505 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f2e301cf7e8b..b1862561579c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 619eeff73ed1d28a92bb4ffa1da1fc71d21b0656 +Subproject commit f681898c11d82999ce5877e59262fbade4b46c65 From 21c0ef2df39496f0219e9876b949e4015926425d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 27 May 2023 11:46:24 -0700 Subject: [PATCH 6130/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/1ac9a233b29983679c457ce8e868a2d3aee6fb94 Reviewed By: jurajh-fb fbshipit-source-id: 985a12f854e0ed809620504762e64ee43745d06e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cb74f5806032..31575a623be1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit caad46dc8ace414174c3d28409510c6c4d969770 +Subproject commit 1ac9a233b29983679c457ce8e868a2d3aee6fb94 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 757954aea3db..53b22dbe1933 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit cbfc1d77ec263237e8fcbce8392e6eae8a62034f +Subproject commit 459fb5a5977a97ca57d7b6d75dbde85ab5659b94 From 1c0374ab6cf5e2d5a2fd65aba2571caa3553acae Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 27 May 2023 18:09:56 -0700 Subject: [PATCH 6131/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/wangle/commit/6a10c17c6a5a24632c31acb089d4fa059255b9c9 https://github.com/facebookexperimental/edencommon/commit/18f729e0cbc7924cfbdd39a41f1f26c72c81134b https://github.com/facebookincubator/fizz/commit/2775716d02c61880fb5797579e6fd5d892486fc2 https://github.com/facebookincubator/katran/commit/ea88c211a0bb5ba8501c3fbfc93f33c352230014 https://github.com/facebookincubator/mvfst/commit/b08e477a043a744ac4d3eb4ae993c3fada923efc https://github.com/facebookincubator/velox/commit/3f1f4a30a2e3b6f11bcbda79ac9d94ab79d068b7 Reviewed By: jurajh-fb fbshipit-source-id: e8a846f98a39d281e02ead7f3aeda90e2165310a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 31575a623be1..17ae3e37d500 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1ac9a233b29983679c457ce8e868a2d3aee6fb94 +Subproject commit 3215beb12977333577bad2c6455ddd3caede5d87 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b1862561579c..b7ce23998340 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f681898c11d82999ce5877e59262fbade4b46c65 +Subproject commit ec297b748575e8ab86333899295715e6e85f909d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 53b22dbe1933..a7ed1b26c21a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 459fb5a5977a97ca57d7b6d75dbde85ab5659b94 +Subproject commit 6a10c17c6a5a24632c31acb089d4fa059255b9c9 From 495b9a24298c2ebc9fa2ec7799074cfe496f8562 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 28 May 2023 18:25:00 -0700 Subject: [PATCH 6132/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/wangle/commit/6fc52b5e18ab0b16975de8fd6cb6676ab022bd99 https://github.com/facebookincubator/katran/commit/80dfedc6a5e3ef79f7f9cfbc189e187e70501913 https://github.com/facebookincubator/mvfst/commit/90c5de62c5d62801bb8607d3c06c9ac46255a539 Reviewed By: jurajh-fb fbshipit-source-id: 23fdb7e2060363dd26ba054bd8f723afb09ef656 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 17ae3e37d500..87fa128aa405 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3215beb12977333577bad2c6455ddd3caede5d87 +Subproject commit 86ae8b65bd4f58dc1fd569c70068085369cb9222 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a7ed1b26c21a..8f7165cf1a15 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6a10c17c6a5a24632c31acb089d4fa059255b9c9 +Subproject commit 6fc52b5e18ab0b16975de8fd6cb6676ab022bd99 From be5ef34edc1b89a16ff66ee239dcefbfedd3fc9f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 29 May 2023 12:15:46 -0700 Subject: [PATCH 6133/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/wangle/commit/9b9ca0dc6e99a0b0e8405d837bdaccf933c2d263 https://github.com/facebookexperimental/edencommon/commit/972348726c287d2b8bc84ea2c4e0aeb8784fc7b0 https://github.com/facebookincubator/fizz/commit/a08be6edc2c359ec3fa84f8cf036175fbd4d5030 https://github.com/facebookincubator/katran/commit/aa795a44a7d84397ed1a7b543dcb3f52a88fb311 https://github.com/facebookincubator/mvfst/commit/740635be0c74c75c1c1ab40fa4d34510fd176a08 https://github.com/facebookincubator/velox/commit/576c2f49be7326f96e4aed0bcedd07d9b2a1e207 Reviewed By: bigfootjon fbshipit-source-id: eaf85e98ee0342247d9074e34a1dfdb4a494ee0c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 87fa128aa405..ec50ba4f49a1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 86ae8b65bd4f58dc1fd569c70068085369cb9222 +Subproject commit 77b9cd2845711737bf51c8f815a7d92a1dd5347e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b7ce23998340..7c522f4ae62f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ec297b748575e8ab86333899295715e6e85f909d +Subproject commit 98b37d78f1c0ba1d8625c635b0b4f786b5a9843d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8f7165cf1a15..137840e33bc1 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6fc52b5e18ab0b16975de8fd6cb6676ab022bd99 +Subproject commit 9b9ca0dc6e99a0b0e8405d837bdaccf933c2d263 From c12021fae82f424efae9c0b1526a5122ab9d790a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 29 May 2023 19:10:04 -0700 Subject: [PATCH 6134/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/cddd98c85ae65afb742093d186d6eda7aa0d3f82 https://github.com/facebook/fbthrift/commit/4b961903f65b70ddf16f9e4355febfd51936e3a4 https://github.com/facebook/proxygen/commit/559efd56c2be03c98731e07958fd9c894c5984c5 https://github.com/facebook/watchman/commit/be5ef34edc1b89a16ff66ee239dcefbfedd3fc9f Reviewed By: bigfootjon fbshipit-source-id: 27aed56da50d168d262161e375ffb3e91ecc6c4c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ec50ba4f49a1..1adab89ce989 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 77b9cd2845711737bf51c8f815a7d92a1dd5347e +Subproject commit 4b961903f65b70ddf16f9e4355febfd51936e3a4 From aaa04ca739107f0ac56cf875899036ca4a4f4b55 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 30 May 2023 07:58:23 -0700 Subject: [PATCH 6135/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/53fe06193c73f51e0e2eb433dcb1dc024b54706e Reviewed By: bigfootjon fbshipit-source-id: 0911246e406c405256cc55f6d958a240009459e1 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7c522f4ae62f..7322f9e00c34 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 98b37d78f1c0ba1d8625c635b0b4f786b5a9843d +Subproject commit 53fe06193c73f51e0e2eb433dcb1dc024b54706e From 4a0601f261c19084795f3d162c8df9c8131a78db Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 30 May 2023 18:26:10 -0700 Subject: [PATCH 6136/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/734b65a507f79e31eb6f973551e40823c784cf93 https://github.com/facebook/ocamlrep/commit/04a31a05c861d6e847c7c0e52743c2e8ec00248e https://github.com/facebook/rocksdb/commit/8848ec92dd782d3448b874c8f57b17be7a7457bc https://github.com/facebookincubator/velox/commit/1b09b649b7b29b046a9e25884d5384ef0a040976 https://github.com/facebookresearch/vrs/commit/9ae998dfaa4a466620e0382ba3e11ad49601afb8 https://github.com/pytorch/fbgemm/commit/d20754526bb56719193ed874f8e722ed8c46667b Reviewed By: bigfootjon fbshipit-source-id: 05c6f919d4e59d365b2e9c2b40fb845639fe39ca --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1adab89ce989..6b675ca6adc0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4b961903f65b70ddf16f9e4355febfd51936e3a4 +Subproject commit 734b65a507f79e31eb6f973551e40823c784cf93 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7322f9e00c34..7eed90673265 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 53fe06193c73f51e0e2eb433dcb1dc024b54706e +Subproject commit 19f353fe9eeb7afd6ae3c2422490de2df86297c9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 137840e33bc1..635530cb017d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9b9ca0dc6e99a0b0e8405d837bdaccf933c2d263 +Subproject commit a7f900fc72cda7812a2426982d8a662a04b4bc41 From 80a452343036b8b0047a941a176b50e7a853895b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 31 May 2023 00:06:41 -0700 Subject: [PATCH 6137/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/2671e037efdb3ee756a212032865c5f0a39e5610 https://github.com/facebookincubator/velox/commit/c5b1cfdc287d792413fe87616ccef3c9eb011a29 https://github.com/pytorch/fbgemm/commit/17a4ea186591b2b529a40a85118929e35c3db659 Reviewed By: bigfootjon fbshipit-source-id: 1f6b9bc79f075c4757a0c813638c8bc7620b91c2 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7eed90673265..a5cbb88fc19e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 19f353fe9eeb7afd6ae3c2422490de2df86297c9 +Subproject commit 2671e037efdb3ee756a212032865c5f0a39e5610 From 3383798c40de31aec14b6ed36cf0151aedc114b9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 31 May 2023 01:29:54 -0700 Subject: [PATCH 6138/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/a5b1bcbdfee04152b81d555d80ce006020c643b8 https://github.com/facebook/watchman/commit/80a452343036b8b0047a941a176b50e7a853895b https://github.com/facebookincubator/velox/commit/ce005ea54d89000c7a2786cc3c55b04fe76a01fc Reviewed By: bigfootjon fbshipit-source-id: 935d591e243e9c3a72a5a4692cc8e9ee7f34ba18 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6b675ca6adc0..b3ab112ded1d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 734b65a507f79e31eb6f973551e40823c784cf93 +Subproject commit a5b1bcbdfee04152b81d555d80ce006020c643b8 From b0e7ebebb69760efff4c19912a8f0cbc442a7527 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 31 May 2023 06:09:14 -0700 Subject: [PATCH 6139/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/6e1ad85f64fc208b7d8c06f950cecb61781e9ae9 Reviewed By: bigfootjon fbshipit-source-id: 643b2a172d07a23426fffa696149cd5458a4e47b --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a5cbb88fc19e..4c2f2fee5233 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 2671e037efdb3ee756a212032865c5f0a39e5610 +Subproject commit 6e1ad85f64fc208b7d8c06f950cecb61781e9ae9 From 6bffbda660b7859d8d3b13efb34accfe8af3e2cf Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 31 May 2023 07:43:14 -0700 Subject: [PATCH 6140/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/proxygen/commit/0fa3a7ff54d750206f343cc7d70bd7818777f604 https://github.com/facebook/wangle/commit/515c48dadee0525d4ecac15c2f44293dae74c2c1 https://github.com/facebook/watchman/commit/b0e7ebebb69760efff4c19912a8f0cbc442a7527 https://github.com/facebookexperimental/edencommon/commit/4e13798e3bf4ec6420182add0b4845ca03981c91 https://github.com/facebookincubator/fizz/commit/3425446232e43b49d0f77ca0864dd574abf4c1d7 https://github.com/facebookincubator/katran/commit/abab863d586ca5a5e4af8e4541f68fa6834b6b2e https://github.com/facebookincubator/mvfst/commit/91f7ed75620a919a01018863fcf3ed39236054f6 Reviewed By: bigfootjon fbshipit-source-id: b9dd46ef4af891b5d3fa86c8f1306051cbb35f7d --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 635530cb017d..eff7ff896092 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a7f900fc72cda7812a2426982d8a662a04b4bc41 +Subproject commit 515c48dadee0525d4ecac15c2f44293dae74c2c1 From 9bdafa76325eb7cef5060f14d7906bed4d0d54dd Mon Sep 17 00:00:00 2001 From: Mark Shroyer Date: Wed, 31 May 2023 10:11:47 -0700 Subject: [PATCH 6141/7387] Fix unbounded allocation in PyBser Summary: Adds a check to bunser_object so that we bail out, without allocating, if the input's declared size is greater than the number of key-value pairs the rest of the buffer could possibly contain. This is similar to the existing check in bunser_array and prevents a tiny malformed input from forcing disproportionate memory allocation. Reviewed By: xavierd Differential Revision: D46244905 fbshipit-source-id: b9a0537ab3c638bffa942ada340da871eea65b59 --- watchman/python/pywatchman/bser.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/watchman/python/pywatchman/bser.c b/watchman/python/pywatchman/bser.c index 241bba5a44d6..0aa166a48c76 100644 --- a/watchman/python/pywatchman/bser.c +++ b/watchman/python/pywatchman/bser.c @@ -318,6 +318,14 @@ bunser_object(const char** ptr, const char* end, const unser_ctx_t* ctx) { return NULL; } + if (2 * nitems > end - buf) { + // Each key-value pair in the input will be at least two bytes long. This + // check ensures we only pre-allocate an amount of memory for the key and + // value tuples proportional to the length of the input. + PyErr_Format(PyExc_ValueError, "document too short for object's size"); + return NULL; + } + if (mutable) { res = PyDict_New(); } else { From 2995d52fbab19c510cb541695281c132be0bd609 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 31 May 2023 13:14:08 -0700 Subject: [PATCH 6142/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/d7c18535f4730e6c871313d267f002712b681504 https://github.com/facebook/folly/commit/3e204b24767065681e257e7351ec9eab7d211f93 https://github.com/facebook/litho/commit/2ecb1dd6d47d54b515f8b5b2f6f39ca5016a95db https://github.com/facebook/ocamlrep/commit/d276511161c84cca474279d4e347cbe6c1de0644 https://github.com/facebookincubator/velox/commit/149a8a24eeb8435c2102eb52637ab91f8b8a9b3a Reviewed By: bigfootjon fbshipit-source-id: 162809f94d2afcfe59730eeb0ebc7eae45ada643 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b3ab112ded1d..22ded023b7d3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a5b1bcbdfee04152b81d555d80ce006020c643b8 +Subproject commit d7c18535f4730e6c871313d267f002712b681504 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4c2f2fee5233..3bfc3ad5c4f6 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 6e1ad85f64fc208b7d8c06f950cecb61781e9ae9 +Subproject commit 3e204b24767065681e257e7351ec9eab7d211f93 From e285f75f46481338ad985a25c1c39d751fe91bba Mon Sep 17 00:00:00 2001 From: Xavier Deguillard Date: Wed, 31 May 2023 13:56:35 -0700 Subject: [PATCH 6143/7387] config: enable user config on Windows Summary: On Windows, the HOME environment variable is not set, instead the USERPROFILE one should be used. As a future step, we should follow XDG in addition to these instead of polluting the home directory. Reviewed By: kmancini Differential Revision: D46301520 fbshipit-source-id: 3374331c1366113716d1daa1355c6783274f17e1 --- watchman/WatchmanConfig.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/watchman/WatchmanConfig.cpp b/watchman/WatchmanConfig.cpp index 11438b6d179d..a4b5776f2f9a 100644 --- a/watchman/WatchmanConfig.cpp +++ b/watchman/WatchmanConfig.cpp @@ -89,7 +89,8 @@ std::optional> loadSystemConfig() { } std::optional loadUserConfig() { - const char* home = getenv("HOME"); + // TODO(xavierd): We should follow XDG and Windows AppData folder instead + const char* home = getenv(folly::kIsWindows ? "USERPROFILE" : "HOME"); if (!home) { return std::nullopt; } From 982b955181bba9d9242d1197d55f0350e1d7870c Mon Sep 17 00:00:00 2001 From: Xavier Deguillard Date: Wed, 31 May 2023 13:56:35 -0700 Subject: [PATCH 6144/7387] childprocess: enable platform independant null redirection Summary: On Windows, /dev/null doesn't exist, instead the NUL file is a magic one that serves the same purpose. Reviewed By: kmancini Differential Revision: D46301519 fbshipit-source-id: 78cb29e194ea2df738c690db52c71ead997e5681 --- watchman/ChildProcess.cpp | 18 +++++++++++++++--- watchman/ChildProcess.h | 8 ++++++++ watchman/PerfSample.cpp | 10 +++++----- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/watchman/ChildProcess.cpp b/watchman/ChildProcess.cpp index 935f805d5bed..abfb15993529 100644 --- a/watchman/ChildProcess.cpp +++ b/watchman/ChildProcess.cpp @@ -238,14 +238,26 @@ void ChildProcess::Options::pipeStderr() { pipe(STDERR_FILENO, false); } -void ChildProcess::Options::nullStdin() { +void ChildProcess::Options::nullFd(int fd, int flags) { #ifdef _WIN32 - open(STDIN_FILENO, "NUL", O_RDONLY, 0); + open(fd, "NUL", flags, 0); #else - open(STDIN_FILENO, "/dev/null", O_RDONLY, 0); + open(fd, "/dev/null", flags, 0666); #endif } +void ChildProcess::Options::nullStdin() { + nullFd(STDIN_FILENO, O_RDONLY); +} + +void ChildProcess::Options::nullStdout() { + nullFd(STDOUT_FILENO, O_WRONLY); +} + +void ChildProcess::Options::nullStderr() { + nullFd(STDERR_FILENO, O_WRONLY); +} + void ChildProcess::Options::chdir(w_string_piece path) { cwd_ = std::string(path.data(), path.size()); #ifdef _WIN32 diff --git a/watchman/ChildProcess.h b/watchman/ChildProcess.h index 1a49ea7cc49f..8ef89fe0439c 100644 --- a/watchman/ChildProcess.h +++ b/watchman/ChildProcess.h @@ -94,6 +94,12 @@ class ChildProcess { // Set up stdin with a null device void nullStdin(); + // Set up stdout with a null device + void nullStdout(); + + // Set up stderr with a null device + void nullStderr(); + // Arrange to open(2) a file for the child process and make // it available as targetFd void open(int targetFd, const char* path, int flags, int mode); @@ -102,6 +108,8 @@ class ChildProcess { void chdir(w_string_piece path); private: + void nullFd(int fd, int flags); + struct Inner { // There is no defined way to copy or move either of // these things, so we separate them out into a container diff --git a/watchman/PerfSample.cpp b/watchman/PerfSample.cpp index ba4988465a96..10b38ab6b5d5 100644 --- a/watchman/PerfSample.cpp +++ b/watchman/PerfSample.cpp @@ -239,9 +239,9 @@ void PerfLogThread::loop() noexcept { opts.environment().set( {{"WATCHMAN_STATE_DIR", stateDir}, {"WATCHMAN_SOCK", get_sock_name_legacy()}}); - opts.open(STDIN_FILENO, "/dev/null", O_RDONLY, 0666); - opts.open(STDOUT_FILENO, "/dev/null", O_WRONLY, 0666); - opts.open(STDERR_FILENO, "/dev/null", O_WRONLY, 0666); + opts.nullStdin(); + opts.nullStdout(); + opts.nullStderr(); try { ChildProcess proc(cmd, std::move(opts)); @@ -256,8 +256,8 @@ void PerfLogThread::loop() noexcept { {{"WATCHMAN_STATE_DIR", stateDir}, {"WATCHMAN_SOCK", get_sock_name_legacy()}}); opts.pipeStdin(); - opts.open(STDOUT_FILENO, "/dev/null", O_WRONLY, 0666); - opts.open(STDERR_FILENO, "/dev/null", O_WRONLY, 0666); + opts.nullStdout(); + opts.nullStderr(); try { ChildProcess proc({perf_cmd}, std::move(opts)); From 368c3e29122e5e30e9e6c87ca9fea2ee6bd8c234 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 31 May 2023 15:35:40 -0700 Subject: [PATCH 6145/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/a9bc6f8e4ed3c84152cd6cbdbf05b215f87ebb9f https://github.com/facebook/fbthrift/commit/ff8b099d7f1dcfcb6cc98c9f6b26aa11de334d18 https://github.com/facebook/litho/commit/7296359b2dd857a44e5beffef9d56b7f0fd3bdc7 https://github.com/facebook/ocamlrep/commit/5907a7e35ab990246b7df999456679a4ea9e8b65 https://github.com/facebook/rocksdb/commit/68a9cd21f2f6af4c6ab8724a19fbd4ea8ae89bdd https://github.com/facebook/watchman/commit/982b955181bba9d9242d1197d55f0350e1d7870c https://github.com/facebookincubator/mvfst/commit/222bf7c993189a21b325d8892548c9559f1d3139 https://github.com/facebookincubator/velox/commit/fd09df681a0b74cc49fc10edeba810b68ff3ebe5 Reviewed By: bigfootjon fbshipit-source-id: a45edd94a4822f27533f5286c4a55f73dd7030ce --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 22ded023b7d3..438da578a588 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d7c18535f4730e6c871313d267f002712b681504 +Subproject commit ff8b099d7f1dcfcb6cc98c9f6b26aa11de334d18 From f0f067b0ca7896f7017f8d35d39f59e65983e2ec Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 31 May 2023 18:40:54 -0700 Subject: [PATCH 6146/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/61ecf2954829ebfaab6407e956d52058c72bcb1c Reviewed By: bigfootjon fbshipit-source-id: 7d63c2a1ef8c4500819928463d89b81346e87db8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 438da578a588..bd228f09b09d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ff8b099d7f1dcfcb6cc98c9f6b26aa11de334d18 +Subproject commit 61ecf2954829ebfaab6407e956d52058c72bcb1c diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 3bfc3ad5c4f6..957b42fe655d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 3e204b24767065681e257e7351ec9eab7d211f93 +Subproject commit 150885e9f18b512b4f79a1a882ce2681126bd5e3 From 72cb34b32e9419ceb9d0dfe6adec7bc416776435 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 1 Jun 2023 07:55:47 -0700 Subject: [PATCH 6147/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/44fff7c3e49f040e18590926e0c831cf9eeddddd https://github.com/facebook/mcrouter/commit/82c13cdea73cb2358894704462615e619b4bd41a https://github.com/facebook/ocamlrep/commit/fcdc6fdf6fd587a4d82c962dc529b2aecfc5aeff https://github.com/facebook/wangle/commit/48c498debfb668100507c4a20aa52c090ad31287 https://github.com/facebookexperimental/edencommon/commit/933339454cde7e35982401a5446c405cdb15ae75 https://github.com/facebookincubator/fizz/commit/596a5276cb92b9c834c04ca1c1edda6afacd1339 https://github.com/facebookincubator/katran/commit/10a58cb3c2d5d7579fb1baf5be4e59b535df5f21 Reviewed By: bigfootjon fbshipit-source-id: 498c6dbad79f0ff320d74389003fc20c9ead4c81 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 957b42fe655d..501223092176 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 150885e9f18b512b4f79a1a882ce2681126bd5e3 +Subproject commit 44fff7c3e49f040e18590926e0c831cf9eeddddd diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index eff7ff896092..42864d7c9323 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 515c48dadee0525d4ecac15c2f44293dae74c2c1 +Subproject commit 48c498debfb668100507c4a20aa52c090ad31287 From 2cd5f57172ce799a6feee1d29ad3a8e6cde1717c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 1 Jun 2023 14:32:02 -0700 Subject: [PATCH 6148/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/4936f7dc85f4e78cc490cee158d9a85b0dfc02b9 https://github.com/facebook/proxygen/commit/b5918c9efae420c1bd7f92174054fcda9627c52c https://github.com/facebook/squangle/commit/5c0c8de571ca064e44e18e60623bc83ba38fd8c0 https://github.com/facebookincubator/mvfst/commit/c64a4e5b218a5b611c9d9cdaf0019fa06138707e https://github.com/facebookincubator/velox/commit/4f6024b16bc8a714171d7f19f1cdc34420dabb91 Reviewed By: bigfootjon fbshipit-source-id: a9ecd94cd552fd00b3d04f7597ea2584671a5c36 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bd228f09b09d..37b927ea7e33 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 61ecf2954829ebfaab6407e956d52058c72bcb1c +Subproject commit 4936f7dc85f4e78cc490cee158d9a85b0dfc02b9 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 501223092176..d80c1ed66cc1 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 44fff7c3e49f040e18590926e0c831cf9eeddddd +Subproject commit 91e820db6e966698031d757b92094a313eb79e16 From 9a7d6bfe816c0638fa6021f4d88403850139ea1a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 1 Jun 2023 17:37:06 -0700 Subject: [PATCH 6149/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/6d84367c0c4a8b6465a22ac6426bf800436682d0 Reviewed By: bigfootjon fbshipit-source-id: 29b8c4502d5fa197a290163ac6db6dba8d3d36c6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 37b927ea7e33..7634100cdd11 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4936f7dc85f4e78cc490cee158d9a85b0dfc02b9 +Subproject commit 6d84367c0c4a8b6465a22ac6426bf800436682d0 From e3cd97f7b95de19c1a703fb0d2539f2c7f52877a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 1 Jun 2023 18:28:21 -0700 Subject: [PATCH 6150/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/d639d0289b98709a3325a9f2fd7c67b65a7dff4f https://github.com/facebook/wangle/commit/dcfc0c5cad17daa52e288aa1f772a8a928af0100 https://github.com/facebook/watchman/commit/9a7d6bfe816c0638fa6021f4d88403850139ea1a https://github.com/facebookexperimental/edencommon/commit/af6a5c02fda5bdbb42784657211d4b84a14a7e23 https://github.com/facebookincubator/fizz/commit/9f0173d37592ef9a551bf5b5c92e352d43ed0000 https://github.com/facebookincubator/katran/commit/2bf40199366dde4b8c704d65a9e056c5ebd9764d Reviewed By: bigfootjon fbshipit-source-id: bcdd061aec66bcc120977131ba44fd94a55dfc36 --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 42864d7c9323..1f25ec9c4c16 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 48c498debfb668100507c4a20aa52c090ad31287 +Subproject commit dcfc0c5cad17daa52e288aa1f772a8a928af0100 From 7f35d6e6ddca718050481029aa621412d8d6d2f4 Mon Sep 17 00:00:00 2001 From: Xavier Deguillard Date: Thu, 1 Jun 2023 19:24:08 -0700 Subject: [PATCH 6151/7387] portability: handle "" correctly in PosixSpawn Summary: Windows handling of argument is weird, very weird in fact. The stackoverflow article paints a very detailled picture for the interested. One corner case is for empty strings. It looks like this would get translated to """""" which but once unexpanded, this would be passed to applications as """. Instead, """" should be passed, which is correctly unexpanded. Reviewed By: genevievehelsel Differential Revision: D46338699 fbshipit-source-id: 3b541354269c1a56737a55cc7598e847d0cc4919 --- watchman/portability/PosixSpawn.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/watchman/portability/PosixSpawn.cpp b/watchman/portability/PosixSpawn.cpp index fbd026c34c28..a12c1c3b0232 100644 --- a/watchman/portability/PosixSpawn.cpp +++ b/watchman/portability/PosixSpawn.cpp @@ -214,8 +214,14 @@ static char* build_command_line(char* const argv[]) { for (j = 0; arg[j]; j++) { switch (arg[j]) { case '"': - strcpy(cur, "\"\"\""); - cur += 3; + if (arg[j + 1] != '"') { + strcpy(cur, "\"\"\""); + cur += 3; + } else { + strcpy(cur, "\"\"\"\""); + cur += 4; + j++; + } break; default: *cur = arg[j]; From b108129864e1ccaf5862732191d42a8bd32396b1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 1 Jun 2023 20:00:16 -0700 Subject: [PATCH 6152/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/7e057ce99bd0e4a164592f119f85e39998dd31c2 https://github.com/facebook/fbthrift/commit/adaf4caa5332c086cdfe0d2ba64d82d482e4e05d https://github.com/facebook/ocamlrep/commit/49a43cb953456f529fce16f342f510129f54932d https://github.com/facebook/watchman/commit/7f35d6e6ddca718050481029aa621412d8d6d2f4 https://github.com/facebookincubator/mvfst/commit/49820ae00ef5ef53dfd4213ae666af7b482eb4c5 Reviewed By: bigfootjon fbshipit-source-id: 1541b29e8cee39f1fc5b59b949acffa9878b694a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7634100cdd11..a1b0985e62e7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6d84367c0c4a8b6465a22ac6426bf800436682d0 +Subproject commit adaf4caa5332c086cdfe0d2ba64d82d482e4e05d From fb77797eed29fc1b615e3c3f32b998211fbab7fd Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 2 Jun 2023 18:37:53 -0700 Subject: [PATCH 6153/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/ba079adeb9e9c0f7f76e7382195edc1fb4d0468f https://github.com/facebook/fbthrift/commit/05eb09b6bfbc495eaabf2b72fa2231b106974168 https://github.com/facebook/ocamlrep/commit/31bbf58fd2f43c24a3cb840b306c28d3250fd93e Reviewed By: bigfootjon fbshipit-source-id: 1af20ab27ac94c3755deec59db572f7159344b78 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a1b0985e62e7..2e1becefcac0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit adaf4caa5332c086cdfe0d2ba64d82d482e4e05d +Subproject commit 05eb09b6bfbc495eaabf2b72fa2231b106974168 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1f25ec9c4c16..929d1c8d3f9a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit dcfc0c5cad17daa52e288aa1f772a8a928af0100 +Subproject commit 10dbe364d042bee86faedd1b0be902d53c7e1a52 From 18d124bcf124aaf644056c37fc470f7c4d265cb3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 3 Jun 2023 14:56:38 -0700 Subject: [PATCH 6154/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/0938f58f0ccca17da07c935c935a3640dc59c79b https://github.com/facebook/wangle/commit/b00d373ac06916dd20e426d95535ba8a16c62b8e https://github.com/facebookincubator/katran/commit/0c360b1bb837312bedfeb79178c9baf072a8801a https://github.com/facebookincubator/mvfst/commit/1748cb7b0c44bf2de8667a91b973f25b36ef83b9 Reviewed By: bigfootjon fbshipit-source-id: d3d4ed03ecc8d16a5b9bdbbdd2aff92d6d0e40be --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2e1becefcac0..bf076b4c92c8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 05eb09b6bfbc495eaabf2b72fa2231b106974168 +Subproject commit 454753f1f81f5a1b5761a134e6fa7ac417fbeaa3 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d80c1ed66cc1..e06f5dbf9721 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 91e820db6e966698031d757b92094a313eb79e16 +Subproject commit a4fa80609a440919537db94c5ca53551823bceeb diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 929d1c8d3f9a..bc728186306b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 10dbe364d042bee86faedd1b0be902d53c7e1a52 +Subproject commit b00d373ac06916dd20e426d95535ba8a16c62b8e From 28fcb03778e2db889f819d8c12011a053ebb2f2e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 4 Jun 2023 05:57:02 -0700 Subject: [PATCH 6155/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/b5de6ab609a22b3fc7ad2cfd0ea08cae9624c4cb Reviewed By: bigfootjon fbshipit-source-id: fce49bd89280a5485733ea0127364a1fcc051795 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bf076b4c92c8..74dcc14d8941 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 454753f1f81f5a1b5761a134e6fa7ac417fbeaa3 +Subproject commit b5de6ab609a22b3fc7ad2cfd0ea08cae9624c4cb diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index bc728186306b..73e477c088c7 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b00d373ac06916dd20e426d95535ba8a16c62b8e +Subproject commit bc016ed808a2f2de4420305b914200a039bed5f7 From 2a5a53bd0748ec41e826d275001faed7e6867451 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 5 Jun 2023 08:39:46 -0700 Subject: [PATCH 6156/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/b2d99bd6992d8a311386776c29e41938cd6d2c25 https://github.com/facebookexperimental/rust-shed/commit/6b150aa224b1d903c861a846cc49def49d5e4c5a Reviewed By: bigfootjon fbshipit-source-id: f079fe3c87d4eba658366349a45d589763081a7b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 74dcc14d8941..d6db10748aca 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b5de6ab609a22b3fc7ad2cfd0ea08cae9624c4cb +Subproject commit b2d99bd6992d8a311386776c29e41938cd6d2c25 From 1edb45ee29489bd50535e4f20fb2c3e11aa1b43c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 5 Jun 2023 22:45:17 -0700 Subject: [PATCH 6157/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/954e688bebcb5ddc20111c2a9be5011c98165ec4 Reviewed By: jailby fbshipit-source-id: b4f7102e6cd00faf9985f246e0d92c092c29ce02 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d6db10748aca..d2f85f030a46 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b2d99bd6992d8a311386776c29e41938cd6d2c25 +Subproject commit e608509a7383152d08b23aa0bcf6f5aae7d75bd8 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e06f5dbf9721..776b8597b7a3 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a4fa80609a440919537db94c5ca53551823bceeb +Subproject commit 954e688bebcb5ddc20111c2a9be5011c98165ec4 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 73e477c088c7..bd928d76d947 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit bc016ed808a2f2de4420305b914200a039bed5f7 +Subproject commit d346c010431ddf2d0b893704015bcad7b6b405b3 From 5e94c79ab24fc09ca76a036e976d9cb4f60558aa Mon Sep 17 00:00:00 2001 From: Barys Skarabahaty Date: Mon, 5 Jun 2023 23:41:35 -0700 Subject: [PATCH 6158/7387] Integrate with virtualInode Summary: Integrating blake3 with virtual inode. Reviewed By: chadaustin Differential Revision: D46268717 fbshipit-source-id: c513a71e81691c43b0eada26aa5f1325a79db07b --- eden/fs/service/eden.thrift | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 5661dbba5c57..49ff0647ba2f 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -319,6 +319,12 @@ enum FileAttributes { * Do not attempt to parse this identifier. It is subject to change at any moment. */ OBJECT_ID = 8, + + /** + * Returns the BLAKE3 hash of a file. Returns an error for symlinks and directories, + * and non-regular files. + */ + BLAKE3_HASH = 16, /* NEXT_ATTR = 2^x */ } (cpp2.enum_type = 'uint64_t') From 1f6b80ce1279008fd7d8d737cc426bf8f82b4107 Mon Sep 17 00:00:00 2001 From: Barys Skarabahaty Date: Mon, 5 Jun 2023 23:41:35 -0700 Subject: [PATCH 6159/7387] Expose blake3 via file attributes Summary: Expose blake3 via file attributes and changing some integration tests accordingly. Added blake3_sum so that it could be used to verify blake3 hashes and updated the tests to work with blake3. Reviewed By: chadaustin Differential Revision: D46307686 fbshipit-source-id: 6f2a4e8e25757862ef17d56f92b90a95c7f5a474 --- eden/fs/service/eden.thrift | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 49ff0647ba2f..f274de00dbcc 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -359,6 +359,11 @@ union Sha1OrError { 2: EdenError error; } +union Blake3OrError { + 1: BinaryHash blake3; + 2: EdenError error; +} + union SizeOrError { 1: i64 size; 2: EdenError error; @@ -391,6 +396,7 @@ struct FileAttributeDataV2 { 2: optional SizeOrError size; 3: optional SourceControlTypeOrError sourceControlType; 4: optional ObjectIdOrError objectId; + 5: optional Blake3OrError blake3; } /** From d9703d9280c3621abe5143336b4ac5a70a738a60 Mon Sep 17 00:00:00 2001 From: Barys Skarabahaty Date: Mon, 5 Jun 2023 23:41:35 -0700 Subject: [PATCH 6160/7387] Add getBlake3 method to eden service Summary: Adding a method to retrieve blake3 hash for a list of files. Reviewed By: chadaustin Differential Revision: D46268718 fbshipit-source-id: 59cb3d25a1d059a7e9b6a4da784a820945ffbd32 --- eden/fs/service/eden.thrift | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index f274de00dbcc..01bf622987dd 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -249,6 +249,11 @@ union SHA1Result { 2: EdenError error; } +union Blake3Result { + 1: BinaryHash blake3; + 2: EdenError error; +} + /** * Effectively a `struct timespec` */ @@ -1639,6 +1644,24 @@ service EdenService extends fb303_core.BaseService { 3: SyncBehavior sync, ) throws (1: EdenError ex); + /** + * For each path, returns an EdenError instead of the BLAKE3 if any of the + * following occur: + * - path is the empty string. + * - path identifies a non-existent file. + * - path identifies something that is not an ordinary file (e.g., symlink + * or directory). + * + * Note: may return stale data if synchronizeWorkingCopy isn't called, and if + * the SyncBehavior specify a 0 timeout. see the documentation for both of + * these for more details. + */ + list getBlake3( + 1: PathString mountPoint, + 2: list paths, + 3: SyncBehavior sync, + ) throws (1: EdenError ex); + /** * On systems that support bind mounts, establish a bind mount within the * repo such that `mountPoint / repoPath` is redirected to `targetPath`. From 29c71dc50df4348c5f82a5f35698653e5901bd79 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 5 Jun 2023 23:51:44 -0700 Subject: [PATCH 6161/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/a7977df5cfc16d52fbf05fc13f0928aaf1cc2445 https://github.com/facebook/proxygen/commit/2af2dc26e836eff623289bafd83b8a826ebb698d https://github.com/facebookincubator/fizz/commit/a0e766e557f9c3f3a8383e32a878af35d14b4b62 https://github.com/facebookincubator/mvfst/commit/93e365ba52870e5949d200f1aa6bd53a4f36d8fe https://github.com/facebookincubator/velox/commit/5127680a7d0e61645bcdeecd496be3c4c2b5b53f Reviewed By: jailby fbshipit-source-id: 79b919b65f49d51719ea1a99342fa6aa8646e9b9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d2f85f030a46..4fd2f7aa59c6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e608509a7383152d08b23aa0bcf6f5aae7d75bd8 +Subproject commit a7977df5cfc16d52fbf05fc13f0928aaf1cc2445 From 97d0e25264563f2fa9a2df1ffe9c674548c549e3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 6 Jun 2023 08:24:14 -0700 Subject: [PATCH 6162/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/34368ea1657d9cc8e4500451cdbed4a1c0de2ba9 Reviewed By: jailby fbshipit-source-id: fa007c01673168102de4a1e9e85149a0beba1b31 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4fd2f7aa59c6..f5426294987a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a7977df5cfc16d52fbf05fc13f0928aaf1cc2445 +Subproject commit 34368ea1657d9cc8e4500451cdbed4a1c0de2ba9 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 776b8597b7a3..281591866e9a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 954e688bebcb5ddc20111c2a9be5011c98165ec4 +Subproject commit 1b7cd10340f565d7fa3fd4f78d6faf14605d77b2 From b8f18ecd872da80e33b6b6309c43bf50945ce6be Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Tue, 6 Jun 2023 11:06:29 -0700 Subject: [PATCH 6163/7387] watchman: add license for serde_bser and watchman_client crates Summary: So it gets included in the crates uploaded to cargo Reviewed By: michel-slm Differential Revision: D29851109 fbshipit-source-id: a9d9fef226e17f29b6ce6567cfcbbc81c2b8ff6b --- watchman/rust/serde_bser/LICENSE | 21 +++++++++++++++++++++ watchman/rust/watchman_client/LICENSE | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 watchman/rust/serde_bser/LICENSE create mode 100644 watchman/rust/watchman_client/LICENSE diff --git a/watchman/rust/serde_bser/LICENSE b/watchman/rust/serde_bser/LICENSE new file mode 100644 index 000000000000..1b277b98b674 --- /dev/null +++ b/watchman/rust/serde_bser/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) Meta Platforms, Inc. and its affiliates. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/watchman/rust/watchman_client/LICENSE b/watchman/rust/watchman_client/LICENSE new file mode 100644 index 000000000000..1b277b98b674 --- /dev/null +++ b/watchman/rust/watchman_client/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) Meta Platforms, Inc. and its affiliates. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From c404d22294f903551868333a4f7027123c8e24fd Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 6 Jun 2023 14:17:53 -0700 Subject: [PATCH 6164/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/e41c487ebb112cff718645e5ea514c184534793d https://github.com/facebook/rocksdb/commit/2e8cc98ab2c106836d972ae843b85bdd01f79bea https://github.com/facebook/wangle/commit/6b80b5764f327d3bf1cbe6e951a80b7e4e8091ba https://github.com/facebookexperimental/edencommon/commit/2cebee52e631030609d9b83bed492c654454d3f0 https://github.com/facebookincubator/velox/commit/f7b75403307e95b3c6a88fc8ffdbd2e272b8fbe5 Reviewed By: jailby fbshipit-source-id: de288cfde6a88758a57d5fdb380ee97b3421cbf1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f5426294987a..fe420b01247e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 34368ea1657d9cc8e4500451cdbed4a1c0de2ba9 +Subproject commit e41c487ebb112cff718645e5ea514c184534793d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index bd928d76d947..8fff087e5fb7 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d346c010431ddf2d0b893704015bcad7b6b405b3 +Subproject commit 6b80b5764f327d3bf1cbe6e951a80b7e4e8091ba From 2b36fc9c2073d140705a21296630d8b1eb4ead1d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 6 Jun 2023 19:36:59 -0700 Subject: [PATCH 6165/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/0086d6d32d1958bca211b88462d3f2bcc2915932 https://github.com/facebook/fbthrift/commit/e19ba27246c83acfc532ad2d8e8b418db0f37029 https://github.com/facebook/rocksdb/commit/3093d98c7815889e84ddacbf6f1d522d7bf4eb65 https://github.com/pytorch/fbgemm/commit/371a0f4ccf5988ae0f0366e65ec5640ed23fe372 Reviewed By: jailby fbshipit-source-id: d262f1c89b5da7402fb3105c407ee18480bf6264 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index fe420b01247e..2b6b3651135e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e41c487ebb112cff718645e5ea514c184534793d +Subproject commit e19ba27246c83acfc532ad2d8e8b418db0f37029 From 21294de09744c05635935a3481f760b0971f8811 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 6 Jun 2023 22:10:12 -0700 Subject: [PATCH 6166/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/1e41621477d01fdb7a8f3b9723c289a82342fcb7 https://github.com/facebook/ocamlrep/commit/6fe6769f1b8f42cfe0fbbdf1a0d401a3be576cc8 https://github.com/facebookresearch/vrs/commit/612b59274763f48f335e62851dd80559b5d6217c Reviewed By: jailby fbshipit-source-id: 99b85fb2a880732ee2ef7d0cf82f968626df7d17 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2b6b3651135e..ad250add8b1e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e19ba27246c83acfc532ad2d8e8b418db0f37029 +Subproject commit 1e41621477d01fdb7a8f3b9723c289a82342fcb7 From e02ec6bc6f4a4aa8e9be6425239d8b6a6b24990e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 7 Jun 2023 03:53:22 -0700 Subject: [PATCH 6167/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/wangle/commit/4675e2631e3f41dc76d109bbf1a3e218b7abcde3 https://github.com/pytorch/fbgemm/commit/e775ead40af080685c644dab8965690ec669c188 Reviewed By: jailby fbshipit-source-id: 5e6bbeb58d5875589bbf50e51f77685f359d4fc6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ad250add8b1e..90734f22f3df 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1e41621477d01fdb7a8f3b9723c289a82342fcb7 +Subproject commit 94b2cac2675666f0193f7683c7b376059c553510 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8fff087e5fb7..9a6d0f0ca56e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6b80b5764f327d3bf1cbe6e951a80b7e4e8091ba +Subproject commit 4675e2631e3f41dc76d109bbf1a3e218b7abcde3 From ebcb6f6a6418627c3b6561735d00c049b058a91a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 7 Jun 2023 06:39:09 -0700 Subject: [PATCH 6168/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/80f3aefac8793930ae34f54bfd7e2e2933bdbb0f https://github.com/facebookincubator/velox/commit/86137eb2cf00369165562a74184e96f2f7ad1a99 Reviewed By: jailby fbshipit-source-id: 0045abc705d87b4beb5185aa1e13c3b25d573bf7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 90734f22f3df..dec6dbda9e49 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 94b2cac2675666f0193f7683c7b376059c553510 +Subproject commit 80f3aefac8793930ae34f54bfd7e2e2933bdbb0f From c6372e5c9c9579719366de0700ac48854a25f919 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 8 Jun 2023 02:10:29 -0700 Subject: [PATCH 6169/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/48a6ed3a03be43837681ed17b1e8787275292828 https://github.com/facebookincubator/velox/commit/2b218abfb4185c7e129490f4503a8c1de535d5f3 Reviewed By: jailby fbshipit-source-id: 900697cc3aa2b8f1b36f57f05a0dfbd2e0d38d4a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index dec6dbda9e49..61dd07857fe2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 80f3aefac8793930ae34f54bfd7e2e2933bdbb0f +Subproject commit 48a6ed3a03be43837681ed17b1e8787275292828 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 281591866e9a..e7c0e6e31928 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1b7cd10340f565d7fa3fd4f78d6faf14605d77b2 +Subproject commit f2ed6109f07dc4ca5251f88ac57559e54a55c306 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9a6d0f0ca56e..08914890d57d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 4675e2631e3f41dc76d109bbf1a3e218b7abcde3 +Subproject commit 3b4a4def1ce69843fc31ab115a05ba54f868e972 From 435f9a599f042fb6a6ad37e5e5ff050d0ba00b35 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 8 Jun 2023 23:27:59 -0700 Subject: [PATCH 6170/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/8d8bbb5c3b72861fe9a791985859b28f7b96221f https://github.com/facebook/fbthrift/commit/96bda6f24c870abe6331efae94e703c5fc1d0fc9 https://github.com/facebook/proxygen/commit/a064355052b359a232f3f14577a2851fa26396f2 https://github.com/facebookexperimental/rust-shed/commit/73ba90c38d9fd57864afa3684afa15bd162c936e Reviewed By: jailby fbshipit-source-id: 85e8ed80b088061648f42bdf8437acbabfe503fe --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 61dd07857fe2..864a7e5aa893 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 48a6ed3a03be43837681ed17b1e8787275292828 +Subproject commit 96bda6f24c870abe6331efae94e703c5fc1d0fc9 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e7c0e6e31928..deb2bf4883c4 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f2ed6109f07dc4ca5251f88ac57559e54a55c306 +Subproject commit 4e34617690866005b42031376c093b4a3fd970c3 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 08914890d57d..432d39efac6a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3b4a4def1ce69843fc31ab115a05ba54f868e972 +Subproject commit 1a0b530d007b3674cd6071fc03495632a384f461 From eb73c7b3def4be9da1f129acaa4a6786ec17de08 Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Fri, 9 Jun 2023 11:52:50 -0700 Subject: [PATCH 6171/7387] Add missing inodes in windows doctor Summary: eden doctor can discover when an inode is missing for a file, but can't remediate the issue. restart usually remediates the issue, but it would be better to have doctor remediate since restart can be very slow. We could do something similar to our remediation for phantom inodes (performing a filesystem operation). However, messing with the filesystem leaves us open to races with concurrent modifications. The point of the filesystem io is to make eden see a notification about a certain path and match it's state to the filesystem. So we can directly do that instead. We can more directly do this by introducing a thrift call to make eden match it's internal state to the filesystem. We could replace the other remediation with this thrift call. I'll leave that for a follow up. Reviewed By: xavierd Differential Revision: D46243633 fbshipit-source-id: a1df5929428dc4f6c8fd71d826fe1e7371ebf283 --- eden/fs/service/eden.thrift | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 01bf622987dd..265f5cda6adb 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1549,6 +1549,19 @@ struct EnsureMaterializedParams { 5: SyncBehavior sync; } +struct MatchFilesystemPathResult { + 1: optional EdenError error; +} + +struct MatchFileSystemResponse { + 1: list results; +} + +struct MatchFileSystemRequest { + 1: MountId mountPoint; + 2: list paths; +} + service EdenService extends fb303_core.BaseService { list listMounts() throws (1: EdenError ex); void mount(1: MountArgument info) throws (1: EdenError ex); @@ -1910,6 +1923,15 @@ service EdenService extends fb303_core.BaseService { 3: ThriftRootId newHash, ) throws (1: EdenError ex); + /** + * When eden doctor or another tool noticies that EdenFS is out of sync with + * the filesystem this API can be used to poke EdenFS into noticing the file + * change. + */ + MatchFileSystemResponse matchFilesystem( + 1: MatchFileSystemRequest params, + ) throws (1: EdenError ex); + //////// Administrative APIs //////// /** From 59e81e9efc8a1ec182f411e3ff83c4485ffa677d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 9 Jun 2023 12:55:04 -0700 Subject: [PATCH 6172/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/d695349a6ebec4cd559f3acea9d8785509650db5 https://github.com/facebook/mcrouter/commit/6cdf1bf3d742f95d0bb02dfb55a4fbd85aa00549 https://github.com/facebook/ocamlrep/commit/e600fa8f80562e46a040ee22f45baa65d278172c https://github.com/facebook/wangle/commit/becd5a92fabf39d3d267de41c22bf4f7c5edc506 https://github.com/facebook/watchman/commit/eb73c7b3def4be9da1f129acaa4a6786ec17de08 https://github.com/facebookincubator/fizz/commit/0eb84ae06341b5ef0d27dd77f790362d16f37563 https://github.com/facebookincubator/velox/commit/aacc1ec05f41d371052d0f755d80f948c9b9a1cf Reviewed By: jailby fbshipit-source-id: 9175d967e2ffb4ddec5e301351c69c61340f762a --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index deb2bf4883c4..4bfa46f40b5d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 4e34617690866005b42031376c093b4a3fd970c3 +Subproject commit d695349a6ebec4cd559f3acea9d8785509650db5 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 432d39efac6a..a2ee71cedf89 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1a0b530d007b3674cd6071fc03495632a384f461 +Subproject commit becd5a92fabf39d3d267de41c22bf4f7c5edc506 From df96b8ab3dfe09d63ae0db0a65db20c63508c0e6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 9 Jun 2023 13:50:26 -0700 Subject: [PATCH 6173/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/proxygen/commit/da677d8f8579874cf7268394997926dbe2454364 https://github.com/facebook/wangle/commit/648c74e832bde5227d7eea6626ec09f32464faeb https://github.com/facebook/watchman/commit/59e81e9efc8a1ec182f411e3ff83c4485ffa677d https://github.com/facebookincubator/fizz/commit/095b2fd492883bbe5d62f5a70f2717f5377b1341 https://github.com/facebookincubator/mvfst/commit/5c0e757a4a5d180278876b3b3036de3712a97e03 https://github.com/facebookincubator/velox/commit/79c1d9478733cf9dc017a12b71b45834d04987e0 Reviewed By: jailby fbshipit-source-id: a70f6c6ded2e4bb402aacda367615bf344ef7a01 --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a2ee71cedf89..4fe1561ab6cc 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit becd5a92fabf39d3d267de41c22bf4f7c5edc506 +Subproject commit 648c74e832bde5227d7eea6626ec09f32464faeb From b466f49a46469db52f54af8902bce6a27f9c5f17 Mon Sep 17 00:00:00 2001 From: "Genevieve (Genna) Helsel" Date: Fri, 9 Jun 2023 15:00:32 -0700 Subject: [PATCH 6174/7387] fix libsodium download url Summary: 404 was fixed, though now the issue is the link was changed Reviewed By: xavierd Differential Revision: D46604217 fbshipit-source-id: d203410fe5705158f9af350a07aa92c38b8cc332 --- build/fbcode_builder/manifests/libsodium | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/manifests/libsodium b/build/fbcode_builder/manifests/libsodium index c37f4b5a619e..0c9941c3fee7 100644 --- a/build/fbcode_builder/manifests/libsodium +++ b/build/fbcode_builder/manifests/libsodium @@ -20,7 +20,7 @@ builder = autoconf subdir = libsodium-1.0.17 [download.os=windows] -url = https://download.libsodium.org/libsodium/releases/libsodium-1.0.17-msvc.zip +url = https://download.libsodium.org/libsodium/releases/old/libsodium-1.0.17-msvc.zip sha256 = f0f32ad8ebd76eee99bb039f843f583f2babca5288a8c26a7261db9694c11467 [build.os=windows] From a839cd1ef82346f127c42ebed12dbcd1608e3693 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 9 Jun 2023 15:36:59 -0700 Subject: [PATCH 6175/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/edf154c2e830bbe64c38ecdbdddc36a9f17b3d52 https://github.com/facebook/fbthrift/commit/6b5eb4f7986695b423f1551b69d1e610a6d96d68 https://github.com/facebook/folly/commit/cb94e9ac3ccc5710e9ae069e0102f206fa0fb23a https://github.com/facebook/proxygen/commit/4101731fbe16267c6d1a1dad6d62e67d07df1222 https://github.com/facebook/wangle/commit/9796d0254b90caa091d93a1c47e15fd7e4cfbfb4 https://github.com/facebook/watchman/commit/b466f49a46469db52f54af8902bce6a27f9c5f17 https://github.com/facebookexperimental/edencommon/commit/afae1c1758a60593d2ac6792c3efe61e942922fa https://github.com/facebookexperimental/rust-shed/commit/d5ef708d541ceac0d08e8fe2ad7e32afa83ee90b https://github.com/facebookincubator/fizz/commit/12e41e670d40672bca37f077b6a4c019e2d8c0bf https://github.com/facebookincubator/katran/commit/100bb0afd1200cb9eb6c9e6174059f1daf7cd619 https://github.com/facebookincubator/mvfst/commit/16adac03ca172268366a2c6c366c1d9aea0f3c5f https://github.com/facebookincubator/velox/commit/395034c7ef5796616d7b5063b92fe6e4886fc8ca Reviewed By: jailby fbshipit-source-id: b3cb7742dcab5f4804279bb31902c5a77b09a990 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 864a7e5aa893..6361f227eced 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 96bda6f24c870abe6331efae94e703c5fc1d0fc9 +Subproject commit 6b5eb4f7986695b423f1551b69d1e610a6d96d68 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4bfa46f40b5d..702dc7f2667d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d695349a6ebec4cd559f3acea9d8785509650db5 +Subproject commit cb94e9ac3ccc5710e9ae069e0102f206fa0fb23a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4fe1561ab6cc..7bd031f3e25c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 648c74e832bde5227d7eea6626ec09f32464faeb +Subproject commit 9796d0254b90caa091d93a1c47e15fd7e4cfbfb4 From 5eea02d5b68ab48a2b07a77eef6e4ccef662e6d0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 9 Jun 2023 16:29:51 -0700 Subject: [PATCH 6176/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/3a54a0d187232440116abcc15911ef7f47f10215 https://github.com/facebook/fb303/commit/55831be3200521294040b49f32022396ce60e064 https://github.com/facebook/fbthrift/commit/dded2df980ba093978a54cfcf8e7ec13f4716b85 https://github.com/facebook/proxygen/commit/ca6e612baf90f2491c4a7c83b2ece32b8ef72aff https://github.com/facebook/wangle/commit/d7d043bed714d8201bb5bc6e2843cc46df1e1261 https://github.com/facebook/watchman/commit/a839cd1ef82346f127c42ebed12dbcd1608e3693 https://github.com/facebookexperimental/edencommon/commit/1315f004846fed23e56356377d58bc2c7f871117 https://github.com/facebookexperimental/rust-shed/commit/018a0a7d152a75064a8957a3ab52a9e7da783e94 https://github.com/facebookincubator/fizz/commit/0d5820306d9c6f9a18c3fdfb8a911024ee811908 https://github.com/facebookincubator/katran/commit/7a8b769cc8815a1156162ab32523985812bdf619 https://github.com/facebookincubator/mvfst/commit/9c45203c8e4799d4d63617e92bf35c9823cc91bf https://github.com/facebookincubator/velox/commit/39860dd803a6ae70f37de8c408e98796f595085f Reviewed By: jailby fbshipit-source-id: 9a816b656ec02fb0d20943a2fe965d4ea24f4dac --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6361f227eced..edfaf35ec5af 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6b5eb4f7986695b423f1551b69d1e610a6d96d68 +Subproject commit dded2df980ba093978a54cfcf8e7ec13f4716b85 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7bd031f3e25c..c5f375ec0091 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9796d0254b90caa091d93a1c47e15fd7e4cfbfb4 +Subproject commit d7d043bed714d8201bb5bc6e2843cc46df1e1261 From 64c208d405906172c6ee6f1d487b9ec31824c1c6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 9 Jun 2023 19:02:33 -0700 Subject: [PATCH 6177/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/ed94b5d5c8735ad4d13c1a9640a118294bd184e3 https://github.com/facebook/ocamlrep/commit/6adcc1dbcaf6ffbbf5df719fbcc5d6db98558caa https://github.com/facebookincubator/velox/commit/4ddc957d3eaf957334caf67eb186cfdd9ffcfecb Reviewed By: jailby fbshipit-source-id: 3b82d02b8753141642087eedc06bc9e8edf9d4f8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index edfaf35ec5af..9519f0f53f3d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit dded2df980ba093978a54cfcf8e7ec13f4716b85 +Subproject commit ed94b5d5c8735ad4d13c1a9640a118294bd184e3 From d0bb4d98a6485d255c9f3cd1b6af908c1899666a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 10 Jun 2023 17:30:17 -0700 Subject: [PATCH 6178/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/17ee2be361d558dc998c60fae85ea4eb33a795d9 Reviewed By: jailby fbshipit-source-id: a17bd5ff3ddf6d9a831124671c58153a4b86f61e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9519f0f53f3d..22ba8de166de 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ed94b5d5c8735ad4d13c1a9640a118294bd184e3 +Subproject commit 17ee2be361d558dc998c60fae85ea4eb33a795d9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c5f375ec0091..7e47e26820f9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d7d043bed714d8201bb5bc6e2843cc46df1e1261 +Subproject commit 645f60973cf34a6e5c05aa749beec62433aa5d35 From 6ec7144794d5ed7e88fb004c5b5d9bc87ca0867c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 11 Jun 2023 00:25:12 -0700 Subject: [PATCH 6179/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/2e9248b8d7617a471133e109924c0f4bc96377c4 https://github.com/facebook/wangle/commit/5d8c6ce3651fcae4a2a4063341e2f407bc0c6690 https://github.com/facebookexperimental/edencommon/commit/9461420917de663e0f6924a876bedb8724df0a78 https://github.com/facebookincubator/fizz/commit/0709cb33f34bf38997180b7a60b338266f12bf53 https://github.com/facebookincubator/katran/commit/830ba3cc7983a3c9e461597926d6f32904b856ef https://github.com/facebookincubator/mvfst/commit/e1cc29fed87a4ee34963f0e94369bba89d0731f2 https://github.com/facebookincubator/velox/commit/c4aa43c06eb65c517f9191a4f94e06fe5c447cb5 Reviewed By: jailby fbshipit-source-id: a43d81c6f269fac20de6a99f80a99dfb228e95fe --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 22ba8de166de..34f48e7aadbf 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 17ee2be361d558dc998c60fae85ea4eb33a795d9 +Subproject commit 2e9248b8d7617a471133e109924c0f4bc96377c4 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 702dc7f2667d..fd866c0f2539 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit cb94e9ac3ccc5710e9ae069e0102f206fa0fb23a +Subproject commit cf09290469ec37203fe4cae0c6d79e4f4a6af127 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7e47e26820f9..1b6a98fe6a7b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 645f60973cf34a6e5c05aa749beec62433aa5d35 +Subproject commit 5d8c6ce3651fcae4a2a4063341e2f407bc0c6690 From 6df0acda1b03f39f4bb1d1e44913fc9246a2fab6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 12 Jun 2023 01:24:02 -0700 Subject: [PATCH 6180/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/db9db04b8c47963546a6624e2a2c6e2db1c6b5e1 https://github.com/facebook/wangle/commit/832aa525f2a4dd008a02b145bf54ddfd2679aa6c https://github.com/facebookincubator/katran/commit/dc850f95d6bbb5e95a9dc3a59654e8596201c1e1 https://github.com/facebookincubator/mvfst/commit/c00490f7304f7057fcbee086ff5c7b6d2ab7c77e Reviewed By: jailby fbshipit-source-id: 92fc34bf8f4d8633086254ad8f8b3dcbaf55867d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 34f48e7aadbf..4b179beb3633 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2e9248b8d7617a471133e109924c0f4bc96377c4 +Subproject commit db9db04b8c47963546a6624e2a2c6e2db1c6b5e1 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1b6a98fe6a7b..fab268ce49ba 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5d8c6ce3651fcae4a2a4063341e2f407bc0c6690 +Subproject commit 832aa525f2a4dd008a02b145bf54ddfd2679aa6c From 032e040ab925ea9836dfa8298d8ff7a8e6a7046d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 12 Jun 2023 03:02:16 -0700 Subject: [PATCH 6181/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/5282746689f3f6cd87c2f9a73802f3c5dfec14b7 https://github.com/facebook/fb303/commit/92d135dbc4bf5f337e755d5e5fb0ade711159f8e https://github.com/facebook/fbthrift/commit/bd0a056acb9894f4b62e0fae3165cb414a6646b9 https://github.com/facebook/proxygen/commit/030b32b50c97e080e138e21c6ba414e4aa8fc125 https://github.com/facebook/watchman/commit/6df0acda1b03f39f4bb1d1e44913fc9246a2fab6 https://github.com/facebookexperimental/rust-shed/commit/6e9d3e6bf76834bc9555418b5b5087d49072a992 Reviewed By: jailby fbshipit-source-id: 0b4f83ba0464e26f3beca79e41d20243676f30fa --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4b179beb3633..cbe0397a1382 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit db9db04b8c47963546a6624e2a2c6e2db1c6b5e1 +Subproject commit bd0a056acb9894f4b62e0fae3165cb414a6646b9 From 8d684798788ef2584b3bca29ee2d3537cee368fe Mon Sep 17 00:00:00 2001 From: Richard Barnes Date: Mon, 12 Jun 2023 08:45:34 -0700 Subject: [PATCH 6182/7387] Use C++17 [[fallthrough]] in 2 files inc terragraph/fw_test_api/wireless_fw_test_api/src/fb_tg_fw_bf_proc.c Reviewed By: urban-1 Differential Revision: D46602832 fbshipit-source-id: 3b4e286b4e7ff5c26ea8258defff766693fe0ffd --- watchman/thirdparty/wildmatch/wildmatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/thirdparty/wildmatch/wildmatch.c b/watchman/thirdparty/wildmatch/wildmatch.c index 3e24c384e1a2..5cd7b1d764ad 100644 --- a/watchman/thirdparty/wildmatch/wildmatch.c +++ b/watchman/thirdparty/wildmatch/wildmatch.c @@ -87,7 +87,7 @@ static int dowild(const uchar *p, const uchar *text, unsigned int flags) /* Literal match with following character. Note that the test * in "default" handles the p[1] == '\0' failure case. */ p_ch = *++p; - /* FALLTHROUGH */ + __attribute__((fallthrough)); default: if (p_ch == '/') { /* Consume any number of consecutive slashes. */ From d44df83dfcdecf5f791de9aa7888f0c5c18fde37 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 12 Jun 2023 10:55:45 -0700 Subject: [PATCH 6183/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8234be440e63f74a7af4f9ab067c468f0b9d9867 https://github.com/facebook/litho/commit/3f417a3fb1c65ecabf5c58714efd0907050c4618 https://github.com/facebook/ocamlrep/commit/607244a6b4a9234f816dec2f13a3061bc7686d88 https://github.com/facebook/watchman/commit/8d684798788ef2584b3bca29ee2d3537cee368fe https://github.com/facebookincubator/mvfst/commit/8a7fedfe1d6c7ab40a058444da1436a5fdd1c2f4 https://github.com/pytorch/fbgemm/commit/a1268a146fd1652fc75fa8bd3131da4c86d714f6 Reviewed By: jurajh-fb fbshipit-source-id: dbec2eee6a949527f1b8a01d288d6875ab66a9a5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cbe0397a1382..2dbee61e23d2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bd0a056acb9894f4b62e0fae3165cb414a6646b9 +Subproject commit 8234be440e63f74a7af4f9ab067c468f0b9d9867 From b1c21dd4e4bd6c6668c04734e9048988aa578e20 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 12 Jun 2023 16:34:57 -0700 Subject: [PATCH 6184/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/16954c6c5aafadd643595b56ae037cc78c7069b3 https://github.com/facebook/folly/commit/fbb2651e36b034da12303bf26527ea3951c5dacb https://github.com/facebook/ocamlrep/commit/f3e906ebd9fb3ff5987e572fc59418fec4c11c27 https://github.com/facebook/rocksdb/commit/a2a90f89980e06931e03a300cfdc28e925d37417 https://github.com/facebook/wangle/commit/ac8726b84c44b525e54974b44d982038c908a6af https://github.com/facebookincubator/katran/commit/75cf6e00e29d5b8c2137b806ff9ec0467e4897de https://github.com/facebookincubator/mvfst/commit/05c9085d1176a3159e6a24b83cbb823a077a321d https://github.com/facebookincubator/velox/commit/50b563efd3db7a4fb4571779c9cf72e3693e58ed Reviewed By: jurajh-fb fbshipit-source-id: 6e7f190c806eb327135eb6b3c3f5d757f51ba830 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2dbee61e23d2..9252c07fe412 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8234be440e63f74a7af4f9ab067c468f0b9d9867 +Subproject commit 16954c6c5aafadd643595b56ae037cc78c7069b3 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index fd866c0f2539..694cf737a26e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit cf09290469ec37203fe4cae0c6d79e4f4a6af127 +Subproject commit fbb2651e36b034da12303bf26527ea3951c5dacb diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index fab268ce49ba..5a66ffb73e00 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 832aa525f2a4dd008a02b145bf54ddfd2679aa6c +Subproject commit ac8726b84c44b525e54974b44d982038c908a6af From 302931a9fab213c59415eaf24c62c599f0c5cae9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 12 Jun 2023 18:12:06 -0700 Subject: [PATCH 6185/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/eccddeb6270973fc43c2c6d0d2b794cf48da0d5d https://github.com/facebook/litho/commit/c650cdb94ff56322a226a47578f64be9a704c626 https://github.com/facebook/proxygen/commit/b2b78db413b9cb6b9aab20399686f518dc30f93d https://github.com/facebookexperimental/edencommon/commit/dba3844cd48b5da6571b3381d251bf17687e6bd5 https://github.com/facebookincubator/fizz/commit/48b01bcaf4031aa616f46aa6366797641d7be930 https://github.com/facebookincubator/katran/commit/ab2f1ec5788057383cd72000f0580867e98e600f https://github.com/facebookincubator/mvfst/commit/6b79afa9788692e974629f1192dba364306f35c3 https://github.com/facebookincubator/velox/commit/14fa974c8669c9d2c50222d8bdad70b364a1b7ec Reviewed By: jurajh-fb fbshipit-source-id: b026b199c8801a23eda662752dca39cf5ffe263a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9252c07fe412..834ada18335e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 16954c6c5aafadd643595b56ae037cc78c7069b3 +Subproject commit eccddeb6270973fc43c2c6d0d2b794cf48da0d5d From 4f287398198aeb436bbea4beea1a11e3b91153b9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 12 Jun 2023 21:40:05 -0700 Subject: [PATCH 6186/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/b480b78a0d4ea9fa56898c78b32dab49acf306a5 Reviewed By: jurajh-fb fbshipit-source-id: 5f5bb460b3a56ec5e30a5428faa3dc0290e1980a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 834ada18335e..f5adfaac6747 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit eccddeb6270973fc43c2c6d0d2b794cf48da0d5d +Subproject commit b480b78a0d4ea9fa56898c78b32dab49acf306a5 From 1762285aad3ddc7acf4b9de903f812987f158a0a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 13 Jun 2023 08:45:59 -0700 Subject: [PATCH 6187/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/e8b6c1c2f20eee2b330942170948791c2323d7b5 https://github.com/facebook/ocamlrep/commit/be83d4149dbb3fd188ecbbe6f69ef6c843d0adec https://github.com/facebookresearch/multimodal/commit/0bf3e075c868eaf24bb39229b63ac0d10ebecee3 Reviewed By: jurajh-fb fbshipit-source-id: 6aacf83e40eda25a5d48e390ea03093c01e3f398 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 694cf737a26e..b5da8064dc37 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit fbb2651e36b034da12303bf26527ea3951c5dacb +Subproject commit e8b6c1c2f20eee2b330942170948791c2323d7b5 From 3e958cc25650cb4624a959714b4ac1bad4360247 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 13 Jun 2023 16:48:17 -0700 Subject: [PATCH 6188/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/e783f7bc5769d896cb3e3eb63e97c50285ecf86e https://github.com/facebook/rocksdb/commit/cac3240cbfdb0bd4ef1900bc2d664187b3e404bb https://github.com/facebookincubator/mvfst/commit/f22653ea1a0de7d559e76e05d89a4a115d517a23 https://github.com/facebookincubator/velox/commit/4a2422e5f1cdff8b861c4718652128d6c03c5b33 https://github.com/pytorch/fbgemm/commit/4c0e4d39975a73ce1497c6101b42b7d766aa6503 Reviewed By: jurajh-fb fbshipit-source-id: f3b9b28f0d7e66038b2b4ca2a66170b3a59fe9a5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f5adfaac6747..3014d2195da2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b480b78a0d4ea9fa56898c78b32dab49acf306a5 +Subproject commit e783f7bc5769d896cb3e3eb63e97c50285ecf86e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5a66ffb73e00..4c0f76557283 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ac8726b84c44b525e54974b44d982038c908a6af +Subproject commit 9b7c904eb94440e6d2445b1d4332df64836cca07 From c6153739b25cee23769d2fe6aa063a3a21cbc66c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 13 Jun 2023 19:11:38 -0700 Subject: [PATCH 6189/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/6daf45209f24960fe30a8ffbfb055a0a1d5f05bf https://github.com/facebookincubator/fizz/commit/d4e7d66ea5dea91fc86ba3a12a70244fec978503 https://github.com/facebookincubator/katran/commit/04a34daf2bb2999799e3c5f5a56e1b768cdf113d https://github.com/facebookincubator/mvfst/commit/0eb597be38910b540ec8fc52063996f7b26e3759 https://github.com/facebookincubator/velox/commit/4dae62f3a19cdf0a0374f8f61b8336afbe452456 Reviewed By: jurajh-fb fbshipit-source-id: 7a22ec0f4d37827a41e225c617b78c4556b66ceb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3014d2195da2..109b0d1898ab 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e783f7bc5769d896cb3e3eb63e97c50285ecf86e +Subproject commit 6daf45209f24960fe30a8ffbfb055a0a1d5f05bf From 5e3293e840ab06c61ac8fab86b485672295268ff Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 13 Jun 2023 20:11:47 -0700 Subject: [PATCH 6190/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/480b5c0aadc8b75a0f956d2e6548da60b79b112e https://github.com/facebook/watchman/commit/c6153739b25cee23769d2fe6aa063a3a21cbc66c Reviewed By: jurajh-fb fbshipit-source-id: 6382a5272a816210427a7e6e50f2ec3f4c99bd4d --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b5da8064dc37..402807f59c3f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e8b6c1c2f20eee2b330942170948791c2323d7b5 +Subproject commit 480b5c0aadc8b75a0f956d2e6548da60b79b112e From b6ec7cfb4750f5403071818065b0ad7f1f55a17c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 13 Jun 2023 22:00:26 -0700 Subject: [PATCH 6191/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/61095c2b9b383a73034169a2a88f21e38fde9872 https://github.com/facebook/ocamlrep/commit/bc9507860e6e54dbd2d276f29578304b4dd48f68 https://github.com/facebook/proxygen/commit/4c15289fa72d3adfba06e957b52d33e12c5f54ed https://github.com/facebookincubator/fizz/commit/df19c8785dc0703fc86cee4c32c35712c1752745 https://github.com/facebookincubator/velox/commit/f2a7751eb471996408cc352f724786e77e3a3c84 https://github.com/pytorch/fbgemm/commit/78aa737944c78ddf4bbfe58e7b2686b22a863305 Reviewed By: jurajh-fb fbshipit-source-id: c59f5280b72ee1ce87459b28392fdbd6686ca77c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 109b0d1898ab..15eae4b24d6b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6daf45209f24960fe30a8ffbfb055a0a1d5f05bf +Subproject commit 61095c2b9b383a73034169a2a88f21e38fde9872 From 4431053f4022a53fd98947c9fbcb780d83f53ff6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 14 Jun 2023 01:16:51 -0700 Subject: [PATCH 6192/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7c2e73111d32b141d2da706d64208d04b8119934 https://github.com/facebook/proxygen/commit/9d552a0bfdf16eb5d53c2769a93777b3666e4efc https://github.com/facebookincubator/velox/commit/f8fa2fa597d17143e654fe51e96a9cb60f1a851c Reviewed By: jurajh-fb fbshipit-source-id: 51129d906e50e0a05c48281f4da1fbf84b588e93 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 15eae4b24d6b..7eb66c7ebd4b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 61095c2b9b383a73034169a2a88f21e38fde9872 +Subproject commit 7c2e73111d32b141d2da706d64208d04b8119934 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4c0f76557283..084a0385d7b3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9b7c904eb94440e6d2445b1d4332df64836cca07 +Subproject commit 11d064a484da19e18e87c70017b9376169ebbfcb From feb1dcb01fc09c750f020b5330a1201721215bb5 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 14 Jun 2023 10:21:36 -0700 Subject: [PATCH 6193/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/bf83608398fbb92fb450e8abade9ba4e74d402b9 https://github.com/facebookexperimental/edencommon/commit/f715a32bf75fddcaa54127dabc1117586e07f9d3 https://github.com/facebookincubator/katran/commit/172dcce6ec6e08a3f4f667cff1c2f29b93331a96 Reviewed By: jurajh-fb fbshipit-source-id: 0d195199282ae294917974377bc441987bd43830 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7eb66c7ebd4b..bcfe12f4b0cb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7c2e73111d32b141d2da706d64208d04b8119934 +Subproject commit bf83608398fbb92fb450e8abade9ba4e74d402b9 From 83dcd4f3efd8cf3405181b7ac537980a1a7b1722 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 14 Jun 2023 12:04:41 -0700 Subject: [PATCH 6194/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7a34fd812c3094ae6dfc118609cf7246ca837079 https://github.com/facebook/folly/commit/39a91ef587d0e6cf90e992479545e947f0b3a5b4 https://github.com/facebook/litho/commit/f2b5c18a51d9c46cb161a57841ab9077352df84c https://github.com/facebook/rocksdb/commit/15e8a843d9c675b1eae24819228c32ca28d9f240 https://github.com/facebookincubator/katran/commit/b8cc63120985b380b6ad8e45410dd0b4ec806999 https://github.com/facebookincubator/mvfst/commit/7222c4bb00edddb5e680a1377da9adbf849980b1 https://github.com/facebookincubator/velox/commit/674a33da1249d20afba7f5d5763609cf27ef92b5 Reviewed By: jurajh-fb fbshipit-source-id: f06da79e41fd1a8040f5570498380024cee3a853 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bcfe12f4b0cb..4ba24568e706 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bf83608398fbb92fb450e8abade9ba4e74d402b9 +Subproject commit 7a34fd812c3094ae6dfc118609cf7246ca837079 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 402807f59c3f..942649d63f7f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 480b5c0aadc8b75a0f956d2e6548da60b79b112e +Subproject commit 39a91ef587d0e6cf90e992479545e947f0b3a5b4 From 44d3a2add7578debb2ba16fdfd18e83944c17131 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 14 Jun 2023 13:05:00 -0700 Subject: [PATCH 6195/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7d75c32ef82e8d4335ad0f40f835368634a2e2ae https://github.com/facebook/folly/commit/3f6daa796115feddd0b571283053ac917fa02fb1 https://github.com/facebook/litho/commit/76cc2a68fb6ac901805a5eb7524d1457b832f5a9 https://github.com/facebook/proxygen/commit/6b8cad4cbcbe384affa059ec1667e591f4f99106 Reviewed By: jurajh-fb fbshipit-source-id: f395d2da2776168783120a035e334da603439f5d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4ba24568e706..27d27bcb552a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7a34fd812c3094ae6dfc118609cf7246ca837079 +Subproject commit 7d75c32ef82e8d4335ad0f40f835368634a2e2ae diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 942649d63f7f..b5a6ebcd196c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 39a91ef587d0e6cf90e992479545e947f0b3a5b4 +Subproject commit 3f6daa796115feddd0b571283053ac917fa02fb1 From 089daf6d532d771fcac06f117f15f4118479de20 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 15 Jun 2023 13:17:57 -0700 Subject: [PATCH 6196/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/170e9f45a964d69684e3e8f2d3e17aa6834085dd https://github.com/facebook/ocamlrep/commit/0bd6f5816e0c3104307bd3ae58f7b68298634e0f https://github.com/facebook/proxygen/commit/d8ec820c37d24d5d4636b517b1a17fd0a7ff259d https://github.com/facebookincubator/katran/commit/c6e81813ce0ee3ad228bbf7737ed70a45ba2f57e https://github.com/facebookincubator/velox/commit/ed03ab529f5d83d6dc2687f05aac83765bf7b87c Reviewed By: jurajh-fb fbshipit-source-id: ec34c6a0b77053e960cf1e5ee143d9964794af56 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 27d27bcb552a..054767fab148 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7d75c32ef82e8d4335ad0f40f835368634a2e2ae +Subproject commit 414e2b1810a5c6617bbc1bd1607bb921b435314d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b5a6ebcd196c..bea5716372ce 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 3f6daa796115feddd0b571283053ac917fa02fb1 +Subproject commit 170e9f45a964d69684e3e8f2d3e17aa6834085dd diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 084a0385d7b3..ae39a42a0792 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 11d064a484da19e18e87c70017b9376169ebbfcb +Subproject commit 5ef6819413b4247ec5fba192d778552ec17e5e5f From e211112509fca5985771db04dad4afc6cdb9bd80 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 15 Jun 2023 14:59:00 -0700 Subject: [PATCH 6197/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/4c3d8dfc3594a8ea506d218404b5acadbdc3a91d https://github.com/facebook/rocksdb/commit/fa878a01074fe039135e37720f669391d1663525 https://github.com/facebook/watchman/commit/089daf6d532d771fcac06f117f15f4118479de20 https://github.com/facebookexperimental/edencommon/commit/ad1c657fdd0e6a49050f35e8f557aa4305895b16 https://github.com/facebookincubator/mvfst/commit/3062ab9986da4f075c7069508d1d4879bffb5446 https://github.com/facebookincubator/velox/commit/d60c7624defdac3e8fdc99f2cdfc9532a2d352ba https://github.com/pytorch/fbgemm/commit/75c5cee70e4f266122038bb1ec0a1ef593c52287 https://github.com/pytorch/kineto/commit/b71a1bc66aeee1f8375e5dad6338ab2e56c407c6 Reviewed By: jurajh-fb fbshipit-source-id: f216b2c35406fecc8cc5de3f9c15a02d9aed0f55 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index bea5716372ce..44ae59c71b45 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 170e9f45a964d69684e3e8f2d3e17aa6834085dd +Subproject commit 4c3d8dfc3594a8ea506d218404b5acadbdc3a91d From 39290c123d1606e520bbaa1f92737fea010ec278 Mon Sep 17 00:00:00 2001 From: Eddie Shen Date: Thu, 15 Jun 2023 18:42:33 -0700 Subject: [PATCH 6198/7387] Replace remaining atty usages with stdlib Summary: `std::io::IsTerminal` was stabilized in 1.70. It is intended to be a drop in replacement for `atty::is(Stdout)`. This codemod removes all remaining instances of atty `arc f` was ran twice, followed by two invocations of `arc lint -e extra --take RUSTFIXDEPS`. `arc autocargo` was also ran This script was a little naive though, and as a result, I had to manually move the newly added imports to the correct line. I ran lints again afterwards. Reviewed By: dbxfb Differential Revision: D46736264 fbshipit-source-id: a686b96b1fa0aa4389f65487ed426f226c86e8e9 --- watchman/cli/Cargo.toml | 1 - watchman/cli/src/rage/stream.rs | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index 085f6ecaa4e4..c2b45786e7f4 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -9,7 +9,6 @@ edition = "2021" [dependencies] ahash = "0.8" anyhow = "1.0.65" -atty = "0.2" duct = "0.13.6" jwalk = "0.6" serde = { version = "1.0.136", features = ["derive", "rc"] } diff --git a/watchman/cli/src/rage/stream.rs b/watchman/cli/src/rage/stream.rs index 3c80a93c03a0..bc0b3aaa9c85 100644 --- a/watchman/cli/src/rage/stream.rs +++ b/watchman/cli/src/rage/stream.rs @@ -6,6 +6,7 @@ */ use std::io; +use std::io::IsTerminal; use std::io::Stdout; use std::io::Write; @@ -58,7 +59,7 @@ impl Stream { } pub fn new(hostname: Option) -> Self { - if atty::isnt(atty::Stream::Stdout) { + if !std::io::stdout().is_terminal() { Self::new_stdout() } else if let Ok(reporter) = FbReporter::new(hostname) { Self::Child(reporter) @@ -72,7 +73,7 @@ impl Stream { if let Self::Child(_) = self { true } else { - atty::isnt(atty::Stream::Stdout) + !std::io::stdout().is_terminal() } } From a50ba8157b52d491a84e781a2dcb1eeb8da8ffc0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 15 Jun 2023 18:44:43 -0700 Subject: [PATCH 6199/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/c61cf9fc76dd1ca5f770b355fc1efd4b42f4748e https://github.com/facebook/fbthrift/commit/b05393f266944c165c44c0479f73c650ceead823 https://github.com/facebook/folly/commit/b9630b1c8d4e3a5d186bff5a96f68ddae4f966bb https://github.com/facebook/rocksdb/commit/253bc91953a0accb4f1a1643543b4676e59445d8 https://github.com/facebookexperimental/rust-shed/commit/338b05bf725b92dceec3575048f98f1bf96e2f5b https://github.com/facebookincubator/fizz/commit/1e460f6790385db48c05c610feb415e601d802f6 https://github.com/facebookincubator/mvfst/commit/dccfc706b5575276192dd88e9f1d9fe8db6a1c7d https://github.com/facebookincubator/velox/commit/4679d201fd6612db2a7f5e9ad86c430dde93cb4f Reviewed By: jurajh-fb fbshipit-source-id: eef188585c508324d06605326e190b70393d3da9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 054767fab148..a6e48cf2a137 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 414e2b1810a5c6617bbc1bd1607bb921b435314d +Subproject commit b05393f266944c165c44c0479f73c650ceead823 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 44ae59c71b45..85dcae21d315 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 4c3d8dfc3594a8ea506d218404b5acadbdc3a91d +Subproject commit b9630b1c8d4e3a5d186bff5a96f68ddae4f966bb From f4dd29c54855287aecf0a0bfd07becc540bb1c29 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 16 Jun 2023 01:55:45 -0700 Subject: [PATCH 6200/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/37e3b8f02da0c43287dd47cde4efdf5daff0a193 https://github.com/facebook/proxygen/commit/3bbe4aca62533127073342d7f14516274afef623 https://github.com/facebook/wangle/commit/788f650df5ed9ac9f2768758f593d2e8ea8a3456 https://github.com/facebookincubator/velox/commit/478a705ee4fe408feccc03902028c485993f08d7 Reviewed By: jurajh-fb fbshipit-source-id: 9969b9d93e65f0adae4da5a7d725ea031a2380ee --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a6e48cf2a137..65a0df5f4a32 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b05393f266944c165c44c0479f73c650ceead823 +Subproject commit 37e3b8f02da0c43287dd47cde4efdf5daff0a193 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 85dcae21d315..e8ea86ed605f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b9630b1c8d4e3a5d186bff5a96f68ddae4f966bb +Subproject commit 9079e21d327084cf0135ce99c4bd050aae76ccb8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ae39a42a0792..7dcd25f7d278 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5ef6819413b4247ec5fba192d778552ec17e5e5f +Subproject commit 788f650df5ed9ac9f2768758f593d2e8ea8a3456 From 9367edef9db794c566bda01ec2a32f015c5956fb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 20 Jun 2023 23:06:09 -0700 Subject: [PATCH 6201/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/7ae149b67858319438dbb32ac51eeb4269f80f30 https://github.com/facebook/fb303/commit/9a5d0ec397e6fe7c63c1c4e8ad5c63b67464f6e2 https://github.com/facebook/fbthrift/commit/c3c1126defb8b81e1f9ba0729130372f8d11767e https://github.com/facebook/folly/commit/331180d8bce400c406d4039a1e6cbe53954e226f https://github.com/facebook/litho/commit/db94bf110f5e8b2304924808ebf7252167df266a https://github.com/facebook/ocamlrep/commit/f8357ae26546f00a9e5dec5bb238a97180e16b7d https://github.com/facebook/proxygen/commit/7a90a1dc2ca4f47c6041a9f552e78b3562cf96f0 https://github.com/facebook/rocksdb/commit/2926e0718c479c5852f3bca7a4ff8c48b69afbbd https://github.com/facebook/wangle/commit/2cf803545e8c85feb695def42ba31e80743b50ec https://github.com/facebook/watchman/commit/f4dd29c54855287aecf0a0bfd07becc540bb1c29 https://github.com/facebookexperimental/edencommon/commit/0490e63a2b0403bd7db999b7dd106f1ab5d0eb59 https://github.com/facebookexperimental/rust-shed/commit/a26d4c8a83da72eb7fc58facdd305ded8b05d58b https://github.com/facebookincubator/fizz/commit/8f585bcef65691e13640123ef5a0772a8ed332f6 https://github.com/facebookincubator/katran/commit/7300aa31d118e041a31cae2f3c4cc3a4957ad6df https://github.com/facebookincubator/mvfst/commit/19e37767ea75ed8c414ebb4684aa8073ec5f997f https://github.com/facebookincubator/velox/commit/8d90bd88ba79b86e5b78f8b782998467a792a40e https://github.com/facebookresearch/vrs/commit/83f60c640b1ace5b6fd60fb37f780b1fa3c933dc https://github.com/fairinternal/egohowto/commit/c9278c44dc260c3952415a6e60c97dd8490207e9 https://github.com/pytorch/fbgemm/commit/8f1b8777745d412c10d254284a72d76357ac287a https://github.com/pytorch/kineto/commit/5bc32eb109bc47ab6e916b1f82a680e75f336568 https://github.com/pytorch/multipy/commit/bd1c76f294335695db8bfa66250781c1627f4eb7 Reviewed By: jailby fbshipit-source-id: fade021fc92f12b5a746a1cc8645e3d617a5d7ab --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 65a0df5f4a32..4e2e5176f7e2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 37e3b8f02da0c43287dd47cde4efdf5daff0a193 +Subproject commit c3c1126defb8b81e1f9ba0729130372f8d11767e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e8ea86ed605f..2f8d83bd6ba2 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9079e21d327084cf0135ce99c4bd050aae76ccb8 +Subproject commit 331180d8bce400c406d4039a1e6cbe53954e226f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7dcd25f7d278..c190d282ccb4 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 788f650df5ed9ac9f2768758f593d2e8ea8a3456 +Subproject commit 2cf803545e8c85feb695def42ba31e80743b50ec From 12b4e092f78919a4d84f06ffd226a0e8f66d6234 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 21 Jun 2023 11:42:21 -0700 Subject: [PATCH 6202/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/f758579ffb47f047d773e5349ef8319c97b96407 https://github.com/facebook/fbthrift/commit/aaa1b708e6cd420ba588c6af60d6f23d6e783136 https://github.com/facebook/litho/commit/0abd76d5df8083c7460042903c507cabc49e41c9 https://github.com/facebook/proxygen/commit/0ee52c8903df23ee7f7be56b839f2feed5a79b50 https://github.com/facebookincubator/mvfst/commit/b5f3ae1cc97ad3b147b81bac41e7971e5b1c4fcd https://github.com/facebookincubator/velox/commit/97e002d55c4ac4f7035621950656ad89461d27f5 Reviewed By: jailby fbshipit-source-id: 8d044a7c55e5f7e3aa0d63df03d74b94750fcd0d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4e2e5176f7e2..31aa9bb49b57 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c3c1126defb8b81e1f9ba0729130372f8d11767e +Subproject commit aaa1b708e6cd420ba588c6af60d6f23d6e783136 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 2f8d83bd6ba2..6837bb47c6a7 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 331180d8bce400c406d4039a1e6cbe53954e226f +Subproject commit 4a892bbcf525367b910d3fa6e05704db68c8eeea diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c190d282ccb4..b5b4d8c6c3bf 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2cf803545e8c85feb695def42ba31e80743b50ec +Subproject commit ed8aa918715c406d7c5181a1a48ef6a7253c3310 From c47b6afb63592d60f233daccc589c9b164b597be Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 21 Jun 2023 13:50:45 -0700 Subject: [PATCH 6203/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/16cb556c253f8b1b574111017a40d5bf56e3b7e0 https://github.com/facebook/fbthrift/commit/594363cd65f04156597f6f600124dcfbf6accf04 https://github.com/facebook/rocksdb/commit/98c6d7fd8026e6d0a7d1d48da1eba7cffb38774f https://github.com/facebookincubator/mvfst/commit/54c6345f24878e362818091e604404852c7bd170 https://github.com/facebookincubator/velox/commit/24c844032b136f1696b1dab2789e235f6c392fe7 https://github.com/facebookresearch/vrs/commit/2d642ec96a795e4b5fd14997ce0d252a40284b30 Reviewed By: jailby fbshipit-source-id: da66fd3832bbdf49d445d1201b48a1503d6f7d0f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 31aa9bb49b57..ac299c455e88 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit aaa1b708e6cd420ba588c6af60d6f23d6e783136 +Subproject commit 594363cd65f04156597f6f600124dcfbf6accf04 From 5163eb4f522334d94a5126f3b8961b1e1e8d5da4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 21 Jun 2023 18:34:40 -0700 Subject: [PATCH 6204/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/a88f1d172fecdacb6aa19413b70d4ad79404d1eb https://github.com/facebook/proxygen/commit/c6f92edfa31fe2ddb4d011d32f7a6218a2ff914b https://github.com/facebookincubator/velox/commit/21c0de214dc925c63e9a61622cd1aed46d05a211 Reviewed By: jailby fbshipit-source-id: 16d84061f980603436406a472e17de9d4a4f7851 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ac299c455e88..1cb661aaddeb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 594363cd65f04156597f6f600124dcfbf6accf04 +Subproject commit a88f1d172fecdacb6aa19413b70d4ad79404d1eb From c4f642c25779300437187ecd027c028098aac1c5 Mon Sep 17 00:00:00 2001 From: Nick Terrell Date: Wed, 21 Jun 2023 19:48:28 -0700 Subject: [PATCH 6205/7387] Add benchmark Summary: X-link: https://github.com/facebookincubator/velox/pull/5350 Adds the latest google benchmark version (v1.8.0) to the manifests. This is required by Zstrong, which I'm adding in a stacked diff. bypass-github-export-checks Reviewed By: quark-zju Differential Revision: D46747196 fbshipit-source-id: 624ca665cff0617d515a1647683870c7a5cb5c66 --- build/fbcode_builder/manifests/benchmark | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 build/fbcode_builder/manifests/benchmark diff --git a/build/fbcode_builder/manifests/benchmark b/build/fbcode_builder/manifests/benchmark new file mode 100644 index 000000000000..25d621184cea --- /dev/null +++ b/build/fbcode_builder/manifests/benchmark @@ -0,0 +1,13 @@ +[manifest] +name = benchmark + +[download] +url = https://github.com/google/benchmark/archive/refs/tags/v1.8.0.tar.gz +sha256 = ea2e94c24ddf6594d15c711c06ccd4486434d9cf3eca954e2af8a20c88f9f172 + +[build] +builder = cmake +subdir = benchmark-1.8.0/ + +[cmake.defines] +BENCHMARK_ENABLE_TESTING=OFF From f8490462a5c0204993dfe083550cdca99c10f782 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 21 Jun 2023 20:46:04 -0700 Subject: [PATCH 6206/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/b711e709dad8f4005ca03907995949184c31e5d5 https://github.com/facebook/fb303/commit/8895d3f0003a149c0a1235d0164f371a393b207c https://github.com/facebook/fbthrift/commit/ba533b19f4b247bb520c4964a090975cb138bc60 https://github.com/facebook/folly/commit/8cd513080a88a58f09093b4ce147fca5ba848554 https://github.com/facebook/proxygen/commit/4963d2d72bd2dc5773507acaa5317711a979bd79 https://github.com/facebook/wangle/commit/76b91938d8618f3abacfb1b89f8d6d5a346af677 https://github.com/facebook/watchman/commit/c4f642c25779300437187ecd027c028098aac1c5 https://github.com/facebookexperimental/edencommon/commit/95abad79b0a4df82d93f559f521f8cba086b041c https://github.com/facebookexperimental/rust-shed/commit/d4086e2a834dd58f889dad0ff85762920f48f251 https://github.com/facebookincubator/fizz/commit/05335fd0850e6d8be2adbbfe648c036ff6ccfeed https://github.com/facebookincubator/katran/commit/a9b85d004ca9a4037084dd9a9a0435df9467febb https://github.com/facebookincubator/mvfst/commit/0442e2a1dee6733c2d4bfd9e65b181fbc7348bd1 https://github.com/facebookincubator/velox/commit/98921bb6595fa89219bb6d81cae226b437670562 https://github.com/facebookresearch/vrs/commit/bea323cf200e02919d7d93d32b973e3996d5fe80 Reviewed By: jailby fbshipit-source-id: af107657c955f987274e592962e82aa8f8d35c9d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1cb661aaddeb..98001f2f0326 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a88f1d172fecdacb6aa19413b70d4ad79404d1eb +Subproject commit ba533b19f4b247bb520c4964a090975cb138bc60 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6837bb47c6a7..9ac471d5ad07 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 4a892bbcf525367b910d3fa6e05704db68c8eeea +Subproject commit 8cd513080a88a58f09093b4ce147fca5ba848554 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b5b4d8c6c3bf..e00a43d1752b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ed8aa918715c406d7c5181a1a48ef6a7253c3310 +Subproject commit 76b91938d8618f3abacfb1b89f8d6d5a346af677 From 3cc7452abae21d2319212940d0908c5fd24744bd Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 21 Jun 2023 21:51:34 -0700 Subject: [PATCH 6207/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/7c401174ee16641fa7cdfba40d40877c79848058 https://github.com/facebook/fb303/commit/4a63e8e38a879012d3f9d7c18c6557125bc89196 https://github.com/facebook/fbthrift/commit/654157881ec102b1626d20cf27c0c4df17d8ed12 https://github.com/facebook/ocamlrep/commit/14042e907d619099df3d834a10a45d2c03db7f9b https://github.com/facebook/proxygen/commit/adb8bde36e7883a4277b1b64f3559b788749aa01 https://github.com/facebook/wangle/commit/c2c00d4511f22af93c32a0d4ff7a7313cfe6cbf8 https://github.com/facebook/watchman/commit/f8490462a5c0204993dfe083550cdca99c10f782 https://github.com/facebookexperimental/edencommon/commit/f7b4ec0ccaabff2a1568729a88a28b0f4d2c385b https://github.com/facebookexperimental/rust-shed/commit/29eca1aca9956671bce0f44f5a39d898e41c39ba https://github.com/facebookincubator/fizz/commit/54d971f5bc83f9f3293eba5e91f4a2f64bc7a975 https://github.com/facebookincubator/katran/commit/bd6ba316473fd2a331928ab7ac9b17894ebaa93f https://github.com/facebookincubator/mvfst/commit/95982f2b00444c6cc8b382f5d7ff2c1d1d5351da https://github.com/facebookincubator/velox/commit/561063004d477c839877b4f20769c80bf9ff2622 Reviewed By: jailby fbshipit-source-id: fc460893401db3402786ca33c9d890b6ef13c780 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 98001f2f0326..950ec95b3cd5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ba533b19f4b247bb520c4964a090975cb138bc60 +Subproject commit 654157881ec102b1626d20cf27c0c4df17d8ed12 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e00a43d1752b..64a1160bfe2d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 76b91938d8618f3abacfb1b89f8d6d5a346af677 +Subproject commit c2c00d4511f22af93c32a0d4ff7a7313cfe6cbf8 From 84f5806f997d49779d76cf3de634513864b083b9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 22 Jun 2023 01:12:59 -0700 Subject: [PATCH 6208/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/abaf30ed1244184cae61b05c8e28e545fc17eecb https://github.com/facebook/rocksdb/commit/05a1d52e77f5b98791849aae83bad413f2e42601 https://github.com/facebookincubator/mvfst/commit/77ef320ec03905a9f62d6ee642443606de4191ac Reviewed By: jailby fbshipit-source-id: 460f886fb558444fd3cc6d6777e5bc9713d28070 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 950ec95b3cd5..6e0d477d8f5d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 654157881ec102b1626d20cf27c0c4df17d8ed12 +Subproject commit abaf30ed1244184cae61b05c8e28e545fc17eecb From e6c0aa0ba12925f9eb81e54251063370a8df0872 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 22 Jun 2023 12:54:59 -0700 Subject: [PATCH 6209/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/fe773b7e840eb039dfd31391df95bf5db4d0c7f3 https://github.com/facebook/proxygen/commit/0b32a87ad8889861872e922595722571f06859ed https://github.com/facebookincubator/fizz/commit/f2c51976e4678bf05d41617757f041bff2b14ec3 https://github.com/facebookincubator/velox/commit/866b50c2895ee9382f1d7fc3e43c04a0810db275 https://github.com/pytorch/fbgemm/commit/56fde403a64d5e26503fd03537c623377f779caa Reviewed By: jailby fbshipit-source-id: 98201bf66e639ce55f4e8ec8c2c3d22e2f3ddb0e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6e0d477d8f5d..55a5d787c508 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit abaf30ed1244184cae61b05c8e28e545fc17eecb +Subproject commit fe773b7e840eb039dfd31391df95bf5db4d0c7f3 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9ac471d5ad07..20c5b66bf6c9 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 8cd513080a88a58f09093b4ce147fca5ba848554 +Subproject commit 5c227af84c1379f6f196932ca6b2fcfc7863c8ca From 173a1f50d7028e93567114f0a40634d3c17b45d3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 22 Jun 2023 13:58:03 -0700 Subject: [PATCH 6210/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/813dbbb833a6b8e99c1f5d0d3836febefb870cb0 https://github.com/facebook/rocksdb/commit/fb5748decfbe7d42f9a4dfd4925b5bc61bb2ea45 https://github.com/facebookincubator/velox/commit/79387614e7399679b5eb2e748f94c88fcecf5c9c Reviewed By: jailby fbshipit-source-id: ae72203ba7f8f70e7428b88de446a9e7dc4ac3e2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 55a5d787c508..8d04547fddf2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit fe773b7e840eb039dfd31391df95bf5db4d0c7f3 +Subproject commit 813dbbb833a6b8e99c1f5d0d3836febefb870cb0 From de9a52b6ad6befa3e741de455bf2820ebc89a1d6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 22 Jun 2023 18:01:33 -0700 Subject: [PATCH 6211/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/0594cabc07000053cdad8df1c3cc8c5e23696460 https://github.com/facebook/wangle/commit/bfa240b4322db470c19e5bf19dab01d361728b5e https://github.com/facebookexperimental/rust-shed/commit/05e369ee9b711193a28b24afa54d28478c8c462a Reviewed By: jailby fbshipit-source-id: 089e6942f621f1285f4c9540859223cbaa0e9b3c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8d04547fddf2..5a91bd879506 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 813dbbb833a6b8e99c1f5d0d3836febefb870cb0 +Subproject commit 0594cabc07000053cdad8df1c3cc8c5e23696460 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 64a1160bfe2d..2eab395bcfe9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c2c00d4511f22af93c32a0d4ff7a7313cfe6cbf8 +Subproject commit bfa240b4322db470c19e5bf19dab01d361728b5e From ef2284b68b6acf4e7e0640a49c9878459b68c328 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Thu, 22 Jun 2023 18:12:16 -0700 Subject: [PATCH 6212/7387] Back out "Use C++17 [[fallthrough]] in watchman" Summary: MSVC does not support __attribute__((fallthrough)). Original commit changeset: 3b4e286b4e7f Original Phabricator Diff: D46602832 Reviewed By: MichaelCuevas Differential Revision: D46953691 fbshipit-source-id: eb0a3a503e5ea4a20974b87c188c8021fee95292 --- watchman/thirdparty/wildmatch/wildmatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/thirdparty/wildmatch/wildmatch.c b/watchman/thirdparty/wildmatch/wildmatch.c index 5cd7b1d764ad..3e24c384e1a2 100644 --- a/watchman/thirdparty/wildmatch/wildmatch.c +++ b/watchman/thirdparty/wildmatch/wildmatch.c @@ -87,7 +87,7 @@ static int dowild(const uchar *p, const uchar *text, unsigned int flags) /* Literal match with following character. Note that the test * in "default" handles the p[1] == '\0' failure case. */ p_ch = *++p; - __attribute__((fallthrough)); + /* FALLTHROUGH */ default: if (p_ch == '/') { /* Consume any number of consecutive slashes. */ From 7e342394a0dba876ebda3dfa0588b53c860253ff Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Thu, 22 Jun 2023 18:12:16 -0700 Subject: [PATCH 6213/7387] fix CMake build on Windows Reviewed By: genevievehelsel Differential Revision: D46957330 fbshipit-source-id: 9a8de5de8c6124ca6400b8c89d0dd74617f10f65 --- watchman/thirdparty/deelevate_binding/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/watchman/thirdparty/deelevate_binding/CMakeLists.txt b/watchman/thirdparty/deelevate_binding/CMakeLists.txt index c19d13723f41..939cd7e4e1e2 100644 --- a/watchman/thirdparty/deelevate_binding/CMakeLists.txt +++ b/watchman/thirdparty/deelevate_binding/CMakeLists.txt @@ -18,8 +18,9 @@ target_link_libraries( libdeelevate INTERFACE rust_deelevate - Userenv.lib - Bcrypt.lib + userenv.lib + bcrypt.lib + ntdll.lib ) install( From 47004972dce0617b76de231d8febc000741e1821 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 22 Jun 2023 19:07:59 -0700 Subject: [PATCH 6214/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/334bc616557da6ed703cd0b30fc02ecc2dafb24a https://github.com/facebook/watchman/commit/7e342394a0dba876ebda3dfa0588b53c860253ff https://github.com/facebookresearch/vrs/commit/2309e79b1c50391426c2bf50bbdc157dfd6b35b2 Reviewed By: jailby fbshipit-source-id: ac5e9097cb3fae31d0f04a14ce636faca7d64270 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5a91bd879506..d53ab6664c23 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0594cabc07000053cdad8df1c3cc8c5e23696460 +Subproject commit 334bc616557da6ed703cd0b30fc02ecc2dafb24a From a60ba30e496f9097cde77df8069880e9fe800339 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 23 Jun 2023 12:23:48 -0700 Subject: [PATCH 6215/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/291c5a12fafaa4c2132535dd61d9176b64ef3c8d https://github.com/facebook/litho/commit/44ad48e70a5b86b4bc6ecf55a12e328b5a248e9d https://github.com/facebook/ocamlrep/commit/841daa0607e03c50c8ea5345642c121d93bd60de https://github.com/facebookincubator/fizz/commit/bca56f87acb1ff9d6685c90f8954924370d2f7cb https://github.com/facebookincubator/velox/commit/e972e6f7fe49c31868cf2fe5de0c4a58dc30f150 Reviewed By: jailby fbshipit-source-id: 2056c99bfc4d65c3a200c3d2e41eb2d5a18f843f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d53ab6664c23..b12936fb445b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 334bc616557da6ed703cd0b30fc02ecc2dafb24a +Subproject commit 291c5a12fafaa4c2132535dd61d9176b64ef3c8d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 20c5b66bf6c9..68aab1a1ed0c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 5c227af84c1379f6f196932ca6b2fcfc7863c8ca +Subproject commit c82d4fb9d725d39bb3400e29165905faffe6bbd6 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2eab395bcfe9..82235b3fb776 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit bfa240b4322db470c19e5bf19dab01d361728b5e +Subproject commit afd7fbdb7cc68b1b4d4226909992b41ed1319751 From 4d05f2794f4b38b719134989de57ef19be467ffe Mon Sep 17 00:00:00 2001 From: Nick Terrell Date: Fri, 23 Jun 2023 14:27:40 -0700 Subject: [PATCH 6216/7387] Add cmake build system Summary: X-link: https://github.com/facebookincubator/zstrong/pull/492 * Adds a cmake build system that gets dependencies using getdeps. * Adds a helper script `build.py` to invoke getdeps & cmake (see README.md). * Configures VSCode's `cmake-tools` extension to work with our build system. * Adds getdeps autogenerated CI for linux & mac. * Add cmake-based CI for linux & max to `dev-ci.yml` that includes `-Werror` bypass-github-export-checks Reviewed By: Cyan4973 Differential Revision: D46699912 fbshipit-source-id: 06b8e7327b3c0f46b0428d8b5ce9a632cc550646 --- build/fbcode_builder/manifests/zstrong | 33 ++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 build/fbcode_builder/manifests/zstrong diff --git a/build/fbcode_builder/manifests/zstrong b/build/fbcode_builder/manifests/zstrong new file mode 100644 index 000000000000..5205c2c6708f --- /dev/null +++ b/build/fbcode_builder/manifests/zstrong @@ -0,0 +1,33 @@ +[manifest] +name = zstrong + +[git] +repo_url = https://github.com/facebookincubator/zstrong.git + +[build] +builder = cmake + +[dependencies] +zstd + +[dependencies.test=on] +benchmark +fmt +googletest + +[shipit.pathmap] +fbcode/data_compression/experimental/zstrong = . + +[shipit.strip] +^fbcode/data_compression/experimental/zstrong/zstrong/zs2_config\.h$ + +[cmake.defines] +BUILD_SHARED_LIBS=OFF + +[cmake.defines.test=on] +BUILD_TESTS=ON +BUILD_BENCHMARKS=ON + +[cmake.defines.test=off] +BUILD_TESTS=OFF +BUILD_BENCHMARKS=OFF From e64f1df3d46ec648f8c54a7f03368b51af654d07 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 23 Jun 2023 15:12:49 -0700 Subject: [PATCH 6217/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/901ce6f54a8b2df2d88786fab63a697a1106c4ad https://github.com/facebook/fbthrift/commit/6f504f5f3c28c35342ddf2f20e8a5eec39d0e1a0 https://github.com/facebook/folly/commit/e102fd7ff5550052271816aa6ecb44bd22a0aad8 https://github.com/facebook/ocamlrep/commit/94c09817269dc1b0b40eda24569c5477bd50770b https://github.com/facebook/proxygen/commit/ac3fdbaf040a336ae7f9a87f50015b8306c1d2c3 https://github.com/facebook/rocksdb/commit/ca50ccc71a1ce89008b4737e74f321b8df8a3b5b https://github.com/facebook/wangle/commit/e64ab4c7ac5769a62f5d3323be2053bc284feabf https://github.com/facebook/watchman/commit/4d05f2794f4b38b719134989de57ef19be467ffe https://github.com/facebookexperimental/edencommon/commit/44505b6d03e0ecb50babb18780751d31609f5c35 https://github.com/facebookexperimental/rust-shed/commit/f21eb92a02aed1dbc395f19930bf36cf759394e4 https://github.com/facebookincubator/fizz/commit/eb5af42694405278196d4bc5202c6a40af6aa0de https://github.com/facebookincubator/katran/commit/cc4fac0d0993cb807bc585e968177da52e3dc606 https://github.com/facebookincubator/mvfst/commit/7972b53958240cdbf3c8dbefed97a83f11510e01 https://github.com/facebookincubator/velox/commit/f7845fcf75aac50d0f1203dc5ed3071b0d5069d4 https://github.com/facebookresearch/multimodal/commit/ea3830bfa06a3c107c8a10f492750fe5c98b8bc9 Reviewed By: jailby fbshipit-source-id: e4b4b49f9a2739f87b67e1f88da8647a71f85394 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b12936fb445b..50a65f73fb7b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 291c5a12fafaa4c2132535dd61d9176b64ef3c8d +Subproject commit 6f504f5f3c28c35342ddf2f20e8a5eec39d0e1a0 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 68aab1a1ed0c..e1d13e5673a5 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c82d4fb9d725d39bb3400e29165905faffe6bbd6 +Subproject commit e102fd7ff5550052271816aa6ecb44bd22a0aad8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 82235b3fb776..532c4d7eba9e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit afd7fbdb7cc68b1b4d4226909992b41ed1319751 +Subproject commit e64ab4c7ac5769a62f5d3323be2053bc284feabf From 0fdfb8192dce096c6b839c68a1b839d04d3a174e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 24 Jun 2023 02:35:38 -0700 Subject: [PATCH 6218/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/9eb65689e47a2dba8aeb088aa58cf54d29ffc83c https://github.com/facebook/proxygen/commit/df48b2d71358b88447a962a756dae91a1557ef17 https://github.com/facebookincubator/velox/commit/49a911971efcaeb9e016abb484adb4f76e8e98cd Reviewed By: jailby fbshipit-source-id: 8c16c4b53a22084465a7ca42bdd99c93050497f9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 50a65f73fb7b..472869a6dd8f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6f504f5f3c28c35342ddf2f20e8a5eec39d0e1a0 +Subproject commit 9eb65689e47a2dba8aeb088aa58cf54d29ffc83c diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e1d13e5673a5..c7f811584d30 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e102fd7ff5550052271816aa6ecb44bd22a0aad8 +Subproject commit 5648b86b6ea029c3511ccb19600b23c2d512c282 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 532c4d7eba9e..f885ec267ee2 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e64ab4c7ac5769a62f5d3323be2053bc284feabf +Subproject commit c8418150031aa2c6571054b62b0a5425ef37d9fe From 832abd8154987b9b036e048392409cc3fa1eac68 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 24 Jun 2023 16:09:12 -0700 Subject: [PATCH 6219/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/94ef26a64051226cffb6f9d942156c309bdfc5dd https://github.com/facebook/wangle/commit/f21c106331066741cecbae362b865acfa4215645 https://github.com/facebook/watchman/commit/0fdfb8192dce096c6b839c68a1b839d04d3a174e https://github.com/facebookexperimental/edencommon/commit/eb11a7d5d16b68f04bd3989df6091d1a2da0b14f https://github.com/facebookexperimental/rust-shed/commit/433648906710b5e75b79eb6fc9f04e2160d9664a https://github.com/facebookincubator/fizz/commit/974075539721dc33aab9e4f5d578afa344f82854 https://github.com/facebookincubator/katran/commit/55cde2d2158990908d2fb851765e3fc65320cd4f https://github.com/facebookincubator/mvfst/commit/fff0708704f815d9e07f3ae57e15291d21e9ded0 Reviewed By: jailby fbshipit-source-id: 6a2f1d6d9c3269ba131724f38b7628b8b2c5e091 --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f885ec267ee2..9d70de70629b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c8418150031aa2c6571054b62b0a5425ef37d9fe +Subproject commit f21c106331066741cecbae362b865acfa4215645 From 9d81bfbaacdd1a21e96c94eed4010abe9e9416cc Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 24 Jun 2023 17:01:05 -0700 Subject: [PATCH 6220/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/9bd57cddeca48130d21324099e6ed5e9b2b37009 Reviewed By: jailby fbshipit-source-id: c97b95cafd79c553831ddad6d4c52682e9f4be9c --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index c7f811584d30..3f0ee6d9cf66 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 5648b86b6ea029c3511ccb19600b23c2d512c282 +Subproject commit 9bd57cddeca48130d21324099e6ed5e9b2b37009 From 8f5d6d2c4a1747c110a81c80033bf52eae070c42 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 25 Jun 2023 12:59:58 -0700 Subject: [PATCH 6221/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/40100c1940b213193fd3a173cf7fb71401fef86e https://github.com/facebookincubator/velox/commit/2116d37a1cc862a3a83f0307dc14a54d8eadd356 Reviewed By: jailby fbshipit-source-id: 733397ca2cd4f112b7e94262d026bb263e1a4f7e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 472869a6dd8f..1144fb933f2c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9eb65689e47a2dba8aeb088aa58cf54d29ffc83c +Subproject commit 40100c1940b213193fd3a173cf7fb71401fef86e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 3f0ee6d9cf66..12fd8b9f4c40 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9bd57cddeca48130d21324099e6ed5e9b2b37009 +Subproject commit 468d81a1874a926401e355b61cffe94d437dfd00 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9d70de70629b..252cc8ed56c3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f21c106331066741cecbae362b865acfa4215645 +Subproject commit e6e895f6f027f5e17070e0034717e49c3f7ec2ce From ff59894868bb60b88e7115afa771cff34e87aa65 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 26 Jun 2023 04:14:58 -0700 Subject: [PATCH 6222/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/7e6be2e7d1e7498806a7156823112614c9b24246 https://github.com/facebook/fbthrift/commit/18fe32e97f6ee1d3801221b701eb699a686a94c1 Reviewed By: jailby fbshipit-source-id: 7a18cb1a56cd7a9c59938dd1922da81af46198f4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1144fb933f2c..4a071db7a3ec 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 40100c1940b213193fd3a173cf7fb71401fef86e +Subproject commit 18fe32e97f6ee1d3801221b701eb699a686a94c1 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 252cc8ed56c3..8a9d3414fab0 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e6e895f6f027f5e17070e0034717e49c3f7ec2ce +Subproject commit 6e7d9fcda601f04e1a9262527af9592d784a43d3 From c0fbd72542febf780b9566e25fb4a34aa06cbf1f Mon Sep 17 00:00:00 2001 From: John Elliott Date: Mon, 26 Jun 2023 11:53:22 -0700 Subject: [PATCH 6223/7387] Added new chownV2 method to thrift service Summary: * On MacOS uid/gid are both defined as uint64_t, specifically `nobody` is 4294967294. * The thrift contract uses int32_t for uid/gid parameters * An overflow is likely occurring when passing values above INT_MAX to the service * This change creates a new `chownV2` that uses int64_t values, "deprecates" the previous method Reviewed By: MichaelCuevas Differential Revision: D46946415 fbshipit-source-id: fcff8ab6c46018561b78f23c6460441333284832 --- eden/fs/service/eden.thrift | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 265f5cda6adb..af64c1ea55e3 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1562,6 +1562,14 @@ struct MatchFileSystemRequest { 2: list paths; } +struct ChangeOwnershipRequest { + 1: PathString mountPoint; + 2: i64 uid; + 3: i64 gid; +} + +struct ChangeOwnershipResponse {} + service EdenService extends fb303_core.BaseService { list listMounts() throws (1: EdenError ex); void mount(1: MountArgument info) throws (1: EdenError ex); @@ -1878,9 +1886,20 @@ service EdenService extends fb303_core.BaseService { /** * Chowns all files in the requested mount to the requested uid and gid + * + * DEPRECATED: Prefer using ChangeOwnership in new code. Callers may still + * need to fall back to chown() if talking to an older edenfs daemon + * that does not support ChangeOwnership() yet. */ void chown(1: PathString mountPoint, 2: i32 uid, 3: i32 gid); + /** + * Changes ownership all files in the requested mount to the requested uid and gid + */ + ChangeOwnershipResponse changeOwnership( + 1: ChangeOwnershipRequest request, + ) throws (1: EdenError ex); + /** * Return the list of files that are different from the specified source * control commit. From 91030ca47ad463dfc0105dd2a60cc5ef6a2b1e0a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 26 Jun 2023 12:18:51 -0700 Subject: [PATCH 6224/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/d2d9f73e9afc01ecbf999bfe11fe5f6ec6cfc107 https://github.com/facebook/fbthrift/commit/495bda5d8ea216e470ddfe1721d46dd8f1916c76 https://github.com/facebook/folly/commit/d59f9846848d6cb18fe714fd2d284ba23e1e3747 https://github.com/facebook/litho/commit/6235932bda22add49d03d9545a224e14b571c822 https://github.com/facebook/ocamlrep/commit/5046175ec9cfa218fd459522ef394bd123913380 https://github.com/facebook/rocksdb/commit/ff1cc8a63e64684bcdfab099e3728da51d7fb2e3 https://github.com/facebook/wangle/commit/dace0225d153f5ac00ba789c347913ea5a6b34c4 https://github.com/facebookincubator/katran/commit/b17ab0d66a44afa474101fd7f2f2ec96ae932295 https://github.com/facebookincubator/velox/commit/36a1507025ed40ec1344e97c22416ec7b071139e Reviewed By: bigfootjon fbshipit-source-id: ad5255f4fc1d1105ef2e13d6b8fce7c34ffd72ef --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4a071db7a3ec..0c8969b57c02 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 18fe32e97f6ee1d3801221b701eb699a686a94c1 +Subproject commit 495bda5d8ea216e470ddfe1721d46dd8f1916c76 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 12fd8b9f4c40..2517bc481748 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 468d81a1874a926401e355b61cffe94d437dfd00 +Subproject commit d59f9846848d6cb18fe714fd2d284ba23e1e3747 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8a9d3414fab0..27b7958dfcc3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6e7d9fcda601f04e1a9262527af9592d784a43d3 +Subproject commit dace0225d153f5ac00ba789c347913ea5a6b34c4 From f182f46362e0efec37cc2285a9b819d8439b092f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 26 Jun 2023 13:18:02 -0700 Subject: [PATCH 6225/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/5e5212e3f39344de6f51cf8ab84f0ac5a11be492 https://github.com/facebook/fbthrift/commit/21c62f6c01f3bb01074dad2ad47dd851e66417f4 https://github.com/facebook/ocamlrep/commit/c43612d258507cada10a2bad9847078775a8100c https://github.com/facebook/proxygen/commit/dafd401ba722d81c8d1acd6b2841309dc6295d88 https://github.com/facebook/wangle/commit/b22830ba97ccce630a81c522ccb4d26bb613f535 https://github.com/facebook/watchman/commit/91030ca47ad463dfc0105dd2a60cc5ef6a2b1e0a https://github.com/facebookexperimental/edencommon/commit/7f8466695de90361f083404def072739348f7079 https://github.com/facebookincubator/fizz/commit/d87b00dddedc0c56e0f113249049f129486d0851 https://github.com/facebookincubator/katran/commit/044dbaa07a8d103185d5bcd7cd9b4954d4c01880 https://github.com/facebookincubator/velox/commit/3acc81d048f2bb6cf75ca2f5635bd043ba26390f Reviewed By: bigfootjon fbshipit-source-id: e6d29c0197365d11bcb484fc64d9346fcba0dde8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0c8969b57c02..9df00f05f1d1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 495bda5d8ea216e470ddfe1721d46dd8f1916c76 +Subproject commit 21c62f6c01f3bb01074dad2ad47dd851e66417f4 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 27b7958dfcc3..f232ae42c8f3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit dace0225d153f5ac00ba789c347913ea5a6b34c4 +Subproject commit b22830ba97ccce630a81c522ccb4d26bb613f535 From 55476991ac5cce93b615623ef9e4616df239f0e5 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 26 Jun 2023 14:44:46 -0700 Subject: [PATCH 6226/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/a80e449f34aafd5cc7250bb77fde779e70fef000 https://github.com/facebook/folly/commit/e74fe5c99dd9d96b80b17f8396ce2568f2becb45 https://github.com/facebook/rocksdb/commit/94c247bff88e95355411d4649823641c833c2a0a https://github.com/facebookresearch/multimodal/commit/94979e22410081f8f266c2baf45495b799be53d5 Reviewed By: bigfootjon fbshipit-source-id: ed01d5ed12880ef462ce3489abfe99f870c60fcd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9df00f05f1d1..d2259129d365 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 21c62f6c01f3bb01074dad2ad47dd851e66417f4 +Subproject commit a80e449f34aafd5cc7250bb77fde779e70fef000 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 2517bc481748..6dc1a2df104f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d59f9846848d6cb18fe714fd2d284ba23e1e3747 +Subproject commit e74fe5c99dd9d96b80b17f8396ce2568f2becb45 From 9bf7ac45581f408eead7c5b67ae5167962470eac Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 27 Jun 2023 03:45:52 -0700 Subject: [PATCH 6227/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/efcfffb8bfe65c2d29d30bef1d5bc7b7a5d60af3 https://github.com/facebook/litho/commit/8ada185968776742aef6b3bc500a2c368b418c48 Reviewed By: bigfootjon fbshipit-source-id: 79f5e463afe43bb42977048084c65bc7cc79ac1f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d2259129d365..46f79e370175 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a80e449f34aafd5cc7250bb77fde779e70fef000 +Subproject commit efcfffb8bfe65c2d29d30bef1d5bc7b7a5d60af3 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6dc1a2df104f..9e1b5fc9f73f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e74fe5c99dd9d96b80b17f8396ce2568f2becb45 +Subproject commit 5095e77238fd31687711a6d0a6f397e6b6242a63 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f232ae42c8f3..348caf9455aa 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b22830ba97ccce630a81c522ccb4d26bb613f535 +Subproject commit 15360a89d941228d576ede9110bb4f510c908650 From 7be452e09a90041f75880ddfd47764ac6795ff06 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 27 Jun 2023 07:55:54 -0700 Subject: [PATCH 6228/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/f82d679314fe6e826d818ffd878ab3e3144bcc77 https://github.com/facebook/litho/commit/3f80da6619cc6dea25deb5b66d8d71c85dc65757 https://github.com/facebook/ocamlrep/commit/63644ef6e4beb03ffdaef77cc3d97a78ddfeb090 https://github.com/facebookincubator/velox/commit/22ecefc98c7a4767769b83f019777020bd8e7a2e Reviewed By: bigfootjon fbshipit-source-id: 15bce5d250ba2d96cd67a0a177b14229e4d90c91 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9e1b5fc9f73f..065069f4be6d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 5095e77238fd31687711a6d0a6f397e6b6242a63 +Subproject commit f82d679314fe6e826d818ffd878ab3e3144bcc77 From 5fc798d434104704acdbd90a02f9f91ed3a862b3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 27 Jun 2023 12:47:24 -0700 Subject: [PATCH 6229/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/041b49664b47c95447097dfc477ff11fb0fdaa5b https://github.com/facebook/ocamlrep/commit/ea05ee66c016daf39db7dd14f684987b985c6563 https://github.com/facebook/proxygen/commit/2bbb3b55a71df0a19695697f350a4994dc6decd6 https://github.com/facebook/rocksdb/commit/f7aa70a72f6f09f2f94594123d84de65e610d81a Reviewed By: bigfootjon fbshipit-source-id: f7453b9f862bf7689973955ee540a6c84f7a03c7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 46f79e370175..e8361958e1d8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit efcfffb8bfe65c2d29d30bef1d5bc7b7a5d60af3 +Subproject commit 041b49664b47c95447097dfc477ff11fb0fdaa5b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 348caf9455aa..dd61c2ca0731 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 15360a89d941228d576ede9110bb4f510c908650 +Subproject commit 597869618f2e4a7fd0ffd3a23361c085fea738ea From 25a941961690c6d6b9ff465af0005904ba203ae5 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 27 Jun 2023 17:56:04 -0700 Subject: [PATCH 6230/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/3fddab231ba53d1b877840023744a4e5afa97178 https://github.com/facebook/fbthrift/commit/5792b0aadc9c03b9c9687f78a3f318ce479e698b https://github.com/facebookincubator/mvfst/commit/e3d67efb5a06d9bf059e9cd586833c89f3ab1c3b https://github.com/facebookincubator/velox/commit/d0884ed7bd917c838bb50771d111911eb3cfa4da Reviewed By: bigfootjon fbshipit-source-id: 709f660c0063c4ba6670e69521642328160c9308 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e8361958e1d8..0caa0d59abf6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 041b49664b47c95447097dfc477ff11fb0fdaa5b +Subproject commit 5792b0aadc9c03b9c9687f78a3f318ce479e698b From 18358cd90cd977a68ac80e454238f9c7d0ae994c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 28 Jun 2023 06:04:32 -0700 Subject: [PATCH 6231/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/0ff1d7478155b55926ff2dd8ae4b3e2d500e40bc Reviewed By: bigfootjon fbshipit-source-id: 0c580c076047c0687feccb2a11c641df7db2ead7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0caa0d59abf6..4b946419d537 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5792b0aadc9c03b9c9687f78a3f318ce479e698b +Subproject commit 0ff1d7478155b55926ff2dd8ae4b3e2d500e40bc diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 065069f4be6d..1d51f55d409d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f82d679314fe6e826d818ffd878ab3e3144bcc77 +Subproject commit d2ca58d3f580548a5a7e7a9ab4acf92ee2da58bc From b6f0fc5b373901aa25409a5257f9dfb86a02b34e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 28 Jun 2023 10:26:18 -0700 Subject: [PATCH 6232/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/e40198f00c232ccca40b11c3d68c578007fbe81e https://github.com/facebook/folly/commit/066724c012853a7f29f3bb8853543f3a5b5c48e9 https://github.com/facebook/litho/commit/04c8de56785471dbec0f74e70fa6c2e85369ea88 https://github.com/facebook/ocamlrep/commit/2a05b670448606ea3dd792ca8cbed98d49c5d6e3 https://github.com/facebook/wangle/commit/3a48d0c4d65fd0ed90f7dcbe8c6756fc01ba496d https://github.com/facebookexperimental/edencommon/commit/626a9592b09603e9295c75e1c6ab4c3a8e935393 https://github.com/facebookincubator/mvfst/commit/44a8935137af4d29a608baf8db87761165d5f713 Reviewed By: bigfootjon fbshipit-source-id: 5eda2e11f8dc22252847bc8f29c49aae8c3a5692 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 1d51f55d409d..7b418a587244 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d2ca58d3f580548a5a7e7a9ab4acf92ee2da58bc +Subproject commit 066724c012853a7f29f3bb8853543f3a5b5c48e9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index dd61c2ca0731..1fe6a379a9db 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 597869618f2e4a7fd0ffd3a23361c085fea738ea +Subproject commit 3a48d0c4d65fd0ed90f7dcbe8c6756fc01ba496d From 872b30e2eb47c7b16665bd5470508256463dd562 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 28 Jun 2023 11:48:12 -0700 Subject: [PATCH 6233/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/bfd3bcc5a854db468e00984830e63e4d3da6ada6 https://github.com/facebook/fbthrift/commit/c028f1e1ace4ee6dd813ef231d81f4db6f2d9d8f https://github.com/facebook/ocamlrep/commit/07aa55dd5141fc87a16b190a593c9f747a1b6f57 https://github.com/facebook/proxygen/commit/f7dcf3dcec23988f2963a4f181b06b77649eeced https://github.com/facebook/squangle/commit/5a4fce65d05c0495a638641dc187da92bca7f88d https://github.com/facebook/watchman/commit/b6f0fc5b373901aa25409a5257f9dfb86a02b34e https://github.com/facebookincubator/mvfst/commit/e53037bb6ab72b75c7a1c735198c41ae804199eb https://github.com/facebookincubator/velox/commit/0c74f80c18eea6f53ae1c910bad38be15c258bfd Reviewed By: bigfootjon fbshipit-source-id: d37578ed6f600c16e8f3259201649ce346f9ea0e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4b946419d537..7848c7feddbc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0ff1d7478155b55926ff2dd8ae4b3e2d500e40bc +Subproject commit c028f1e1ace4ee6dd813ef231d81f4db6f2d9d8f From 6a1d1e8e8be7b29e80357bf8519d17c587990f13 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 28 Jun 2023 14:25:34 -0700 Subject: [PATCH 6234/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/0657a73edf8b451341d3a8916806a1c66c352b1a https://github.com/facebook/litho/commit/3ca8973afd2fac82a0ba56280b1a7ded22bed7d3 https://github.com/facebook/ocamlrep/commit/41b09a7aab37965c8d26bd410c315ad1efa813cd https://github.com/facebookexperimental/rust-shed/commit/1651c6ed63a531687b0247aec64216332d2876d6 Reviewed By: bigfootjon fbshipit-source-id: 658b2aca961df2dd074c91eae2e5b1c0a8ef54e7 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7b418a587244..0c70c9c5073d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 066724c012853a7f29f3bb8853543f3a5b5c48e9 +Subproject commit 0657a73edf8b451341d3a8916806a1c66c352b1a From 2b50409d07546bb754a07eb83488746f9a6afe80 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 29 Jun 2023 01:05:23 -0700 Subject: [PATCH 6235/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/d7090ee21c995d1ca9d7bed9f6f16ae2e95d5d6d https://github.com/facebookincubator/velox/commit/853e67bf2ac5de7bb3a170afe7174aae895e2b0d Reviewed By: bigfootjon fbshipit-source-id: e6f9255d602f1b0a4925dd4942ca6e76dff89f7c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7848c7feddbc..b4168d14282d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c028f1e1ace4ee6dd813ef231d81f4db6f2d9d8f +Subproject commit d7090ee21c995d1ca9d7bed9f6f16ae2e95d5d6d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0c70c9c5073d..028ee6528e7f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0657a73edf8b451341d3a8916806a1c66c352b1a +Subproject commit a282761bb031b8705160c24afac72929fcb6abc0 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1fe6a379a9db..9bcca0bd9289 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3a48d0c4d65fd0ed90f7dcbe8c6756fc01ba496d +Subproject commit 57d6ced004249504fdbc1cb1bfd36de42f04464b From 21385664a47d474e2155b2849f6ea704398024b9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 29 Jun 2023 05:05:19 -0700 Subject: [PATCH 6236/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/3128e7d493531587b05cef3160a256da4a00a66d https://github.com/facebook/fbthrift/commit/4db8a648634be07d4423187c0264addb052e98a8 https://github.com/facebookexperimental/edencommon/commit/86c3c9395a851d9ffa30c4b16182decdb34c6c9a https://github.com/facebookexperimental/rust-shed/commit/0a107876c17f85f927be5c4514a35a366a46b3dd https://github.com/facebookincubator/katran/commit/63ba135186139d21dba9648cf777f8d6afec38d3 https://github.com/facebookincubator/velox/commit/c83e226ad64959d5f5481d56db09599c76ea47c1 https://github.com/facebookresearch/recipes/commit/752b76650409ec1fa6fb998ddb492d6df883c709 Reviewed By: bigfootjon fbshipit-source-id: 6a0884b9fc5f997863f168e089beb71449ed821e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b4168d14282d..185feee17290 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d7090ee21c995d1ca9d7bed9f6f16ae2e95d5d6d +Subproject commit 4db8a648634be07d4423187c0264addb052e98a8 From 1fb779bf2d605fd8fe670139c0323eef902ca75d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 30 Jun 2023 04:40:07 -0700 Subject: [PATCH 6237/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/1f7db18533e844caf26a61155b272ff4152b367f https://github.com/facebook/ocamlrep/commit/992e28ad0b9a61e2ffdf9d9e654332b4a9efef06 Reviewed By: bigfootjon fbshipit-source-id: 1c5f2347cbc777a6b32372391874fc2dbe9c4f11 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 185feee17290..6b34d8659692 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4db8a648634be07d4423187c0264addb052e98a8 +Subproject commit f9aa82ff458a2e455a08fa2874509c883834da30 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 028ee6528e7f..c36f635e9e1b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a282761bb031b8705160c24afac72929fcb6abc0 +Subproject commit 1f7db18533e844caf26a61155b272ff4152b367f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9bcca0bd9289..2bbbb1d9056f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 57d6ced004249504fdbc1cb1bfd36de42f04464b +Subproject commit 911bc84de5e6976638f743febda48bde99034eb5 From 44162f028cee789f221d7735c303d227e49c1a16 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 30 Jun 2023 22:13:32 -0700 Subject: [PATCH 6238/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7fa7b66425ac53a71eca1c19cd41f8a7754c04c5 Reviewed By: bigfootjon fbshipit-source-id: 137028b51952f38d06defa79ee04daad4e7202cb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6b34d8659692..4a22b4f45cde 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f9aa82ff458a2e455a08fa2874509c883834da30 +Subproject commit 7fa7b66425ac53a71eca1c19cd41f8a7754c04c5 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index c36f635e9e1b..a1930bb31b77 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1f7db18533e844caf26a61155b272ff4152b367f +Subproject commit 135560575acb16d52b26f1f55deccc50e9845d36 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2bbbb1d9056f..93a4514908f0 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 911bc84de5e6976638f743febda48bde99034eb5 +Subproject commit 88de68a458422042c2376aea62cdf6dad8738bca From 4caa3a9466888d484b8f2aeebd780cecaf559d66 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 1 Jul 2023 15:16:47 -0700 Subject: [PATCH 6239/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/c7404db1c7473ab9c2b9689928d6402d917b1c57 Reviewed By: bigfootjon fbshipit-source-id: ed4cb6c5f4a09ceba8ef92e687093df100714047 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4a22b4f45cde..71c6bf806146 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7fa7b66425ac53a71eca1c19cd41f8a7754c04c5 +Subproject commit c7404db1c7473ab9c2b9689928d6402d917b1c57 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 93a4514908f0..bdc40d4f8998 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 88de68a458422042c2376aea62cdf6dad8738bca +Subproject commit e4b456359682bb3141b3f8d7a16f3cfdf5fb22f8 From a09feb4a71812767515bbffc2c992aec5ad81ed6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 2 Jul 2023 16:32:43 -0700 Subject: [PATCH 6240/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/daa03f9e72bc867a4a4f40994ff470f50cd7e4c4 Reviewed By: bigfootjon fbshipit-source-id: cd4572cc3eac7b53779568dbb8520abfa521db71 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 71c6bf806146..c2bf89b2ae03 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c7404db1c7473ab9c2b9689928d6402d917b1c57 +Subproject commit daa03f9e72bc867a4a4f40994ff470f50cd7e4c4 From e577308db24689e10a573fff9a5ad07229c2fe4f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 3 Jul 2023 14:51:36 -0700 Subject: [PATCH 6241/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/6f19d4a9fd0a8238cb87a787de56b765f9cc51ea https://github.com/facebook/proxygen/commit/5ccc8e2c091716bdc8548bd5783b4f5aeb7d4e2e https://github.com/facebook/wangle/commit/f79141a4c4cd6aff027ce3e789f1e0a548e3ef62 https://github.com/facebookincubator/katran/commit/1fa3699b524885a5493ac6c58878099ae73ecf4f https://github.com/facebookincubator/mvfst/commit/215ac7acf32cadf835ae15b753104b96a7cef23d https://github.com/pytorch/fbgemm/commit/cff9c630431612df1a549fdde84c1aa9ed86418a Reviewed By: jurajh-fb fbshipit-source-id: 711aaedbd127cc64e51dde8843b849b7607947c2 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a1930bb31b77..be910e5a7948 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 135560575acb16d52b26f1f55deccc50e9845d36 +Subproject commit 6f19d4a9fd0a8238cb87a787de56b765f9cc51ea diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index bdc40d4f8998..2a3852375638 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e4b456359682bb3141b3f8d7a16f3cfdf5fb22f8 +Subproject commit f79141a4c4cd6aff027ce3e789f1e0a548e3ef62 From 49521002568d44e4f0af90433e21ec4665a53dcb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 4 Jul 2023 05:40:11 -0700 Subject: [PATCH 6242/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/d20b75f94502ac87f7e3e413321e26fe162eba85 Reviewed By: jurajh-fb fbshipit-source-id: 858d0f1301b67f4009bad881561852eb9d56ea17 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c2bf89b2ae03..b104ba6f0c4d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit daa03f9e72bc867a4a4f40994ff470f50cd7e4c4 +Subproject commit d20b75f94502ac87f7e3e413321e26fe162eba85 From 0cc0772cfbe5280cdbbc9314184930dd233bddbc Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 4 Jul 2023 09:09:59 -0700 Subject: [PATCH 6243/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/57fa0938f5b57ba1f628e93cecee45fcdc279718 https://github.com/facebookincubator/velox/commit/bf955247e5cdbb431013c850d06773b04f632c18 Reviewed By: jurajh-fb fbshipit-source-id: 8c0f8629b721407b559b6ebdc929c5906b1ae2ef --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index be910e5a7948..d2d1ab5fb6e1 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 6f19d4a9fd0a8238cb87a787de56b765f9cc51ea +Subproject commit 57fa0938f5b57ba1f628e93cecee45fcdc279718 From 0c691c2965fe0aaacfe85b06a5f658c55b9500b0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 4 Jul 2023 12:15:02 -0700 Subject: [PATCH 6244/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/d51809e85bf89ae1f78bf90d775beddda6bc6196 Reviewed By: jurajh-fb fbshipit-source-id: a61dd38f7bdb92ecf1ffdad5fc65b06189e94b42 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b104ba6f0c4d..4b0636360329 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d20b75f94502ac87f7e3e413321e26fe162eba85 +Subproject commit d51809e85bf89ae1f78bf90d775beddda6bc6196 From 21afc01294ed0110f3752016902be94eb4544e8b Mon Sep 17 00:00:00 2001 From: kayagokalp Date: Tue, 4 Jul 2023 16:07:50 -0700 Subject: [PATCH 6245/7387] fix-ci: move from unmaintained `actions-rs` to a maintained alternative Summary: Unfortunately `actions-rs` is [unmaintained](https://github.com/actions-rs/toolchain/issues/216) and I am trying to advocate a move from actions-rs to its maintained alternative such as https://github.com/dtolnay/rust-toolchain across the community. X-link: https://github.com/facebook/hhvm/pull/9369 Reviewed By: dtolnay Differential Revision: D46326694 Pulled By: dtolnay fbshipit-source-id: 2f08553539fba083e5ec90662328d69b78e19b44 --- build/fbcode_builder/getdeps.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 31a9c2f56443..565ef99135e7 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -1043,11 +1043,7 @@ def write_job_for_platform(self, platform, args): # noqa: C901 if m != manifest: if m.name == "rust": out.write(" - name: Install Rust Stable\n") - out.write(" uses: actions-rs/toolchain@v1\n") - out.write(" with:\n") - out.write(" toolchain: stable\n") - out.write(" default: true\n") - out.write(" profile: minimal\n") + out.write(" uses: dtolnay/rust-toolchain@stable\n") else: ctx = loader.ctx_gen.get_context(m.name) if m.get_repo_url(ctx) != main_repo_url: From d2b6062e5f415a3f3029f2941f710e2241d7953e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 4 Jul 2023 16:16:15 -0700 Subject: [PATCH 6246/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/5c58c6d2145eed9c3bf68496eb4e8feefffcc987 https://github.com/facebook/fb303/commit/d6d4ec5efd47e7929543dcc0ddb8dddf3df4b225 https://github.com/facebook/wangle/commit/8de01cdd020bcd671ccb9d180d0d9f4683088a62 https://github.com/facebookexperimental/edencommon/commit/4c31739ec4b26900648905358168cbc04266102a https://github.com/facebookincubator/fizz/commit/75a523492c67227d5828ce0467dd8cdd578420e0 https://github.com/facebookincubator/mvfst/commit/ed8ef6bf3ebeece0ee8bb5439335ebfb4030fca6 Reviewed By: jurajh-fb fbshipit-source-id: 67f7b9a09368576385c15a2b80c72ba41fe3eb6e --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2a3852375638..add6cd3f29ff 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f79141a4c4cd6aff027ce3e789f1e0a548e3ef62 +Subproject commit 8de01cdd020bcd671ccb9d180d0d9f4683088a62 From a4f20414c4f74ca269c55c68efa4fe91fdb6ca90 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 4 Jul 2023 17:59:32 -0700 Subject: [PATCH 6247/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/f775589e600c54b19f2477099eb000d682adedc3 https://github.com/facebook/fbthrift/commit/7b977ab2143a807fbc62d1fd1546f058bb635d70 https://github.com/facebook/folly/commit/5f0fdff88ed3aa41bc005c151dc6f515d1a9a064 https://github.com/facebook/proxygen/commit/5c8be5c1aa31935163ad8b6a48cd2ddeae3f0b16 https://github.com/facebook/wangle/commit/eef42993796d4e4766ab4264d1dfa4a3f3e280f2 https://github.com/facebook/watchman/commit/d2b6062e5f415a3f3029f2941f710e2241d7953e https://github.com/facebookexperimental/edencommon/commit/2da4b7eede074c7d63eae31ddba329833c087ce8 https://github.com/facebookexperimental/rust-shed/commit/9b69745893b80fa62732ad28c3d1d4d943b1d1bb https://github.com/facebookincubator/fizz/commit/5d0607b35812438bb8dcf2a6bbd95149e285bf17 https://github.com/facebookincubator/katran/commit/49c936d10f3dc796e1a5b8d6b5bfb56ed7a04113 https://github.com/facebookincubator/mvfst/commit/cb16e78bef160c4e553ec4562405a8151960616d https://github.com/facebookincubator/velox/commit/6857656f175dc3baa9f66e8e658c20e3fd7db9e2 Reviewed By: jurajh-fb fbshipit-source-id: c49af8bafed6c0b44b71617d8c1ddb04c0213d6d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4b0636360329..0b2392676f5b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d51809e85bf89ae1f78bf90d775beddda6bc6196 +Subproject commit 7b977ab2143a807fbc62d1fd1546f058bb635d70 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d2d1ab5fb6e1..4ea0ab2b0193 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 57fa0938f5b57ba1f628e93cecee45fcdc279718 +Subproject commit 5f0fdff88ed3aa41bc005c151dc6f515d1a9a064 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index add6cd3f29ff..770c8ab95475 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8de01cdd020bcd671ccb9d180d0d9f4683088a62 +Subproject commit eef42993796d4e4766ab4264d1dfa4a3f3e280f2 From f5e3de6c2eaea50ed7d420cf33c001b378fd4555 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 5 Jul 2023 04:40:56 -0700 Subject: [PATCH 6248/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/7a9f3720d7780de5718c48c49645b3d4e3f9ad16 Reviewed By: jurajh-fb fbshipit-source-id: a5c7b43044e26b78f497054e0cd9a3a29da629aa --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4ea0ab2b0193..e0605ba8b7f1 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 5f0fdff88ed3aa41bc005c151dc6f515d1a9a064 +Subproject commit 7a9f3720d7780de5718c48c49645b3d4e3f9ad16 From d53cf96631c89cce4a3a5cc16a06ed90900297f6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 5 Jul 2023 05:48:57 -0700 Subject: [PATCH 6249/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/971f1c77f8b223fb7fe87484cd5681407290c75c https://github.com/facebook/fbthrift/commit/60e777f3703c80c2fc853102a579d960f8184c45 https://github.com/facebook/folly/commit/7a9f3720d7780de5718c48c49645b3d4e3f9ad16 https://github.com/facebook/wangle/commit/43e99df50c0f7fa3f919f0122bbbb6b4bbd3d0ad https://github.com/facebook/watchman/commit/f5e3de6c2eaea50ed7d420cf33c001b378fd4555 https://github.com/facebookincubator/katran/commit/558fa03a401f2b1eba01cf16f5f40527244273b1 https://github.com/facebookincubator/mvfst/commit/cd006a5ef67f4fcee11971ce89c92ec663df8762 https://github.com/facebookincubator/sks/commit/7c657cae0a8505941485d1a38019d64923103d1b Reviewed By: jurajh-fb fbshipit-source-id: 0484b2ed12de04e322b0933cd9efb231086fc703 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0b2392676f5b..fa08c5d7976f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7b977ab2143a807fbc62d1fd1546f058bb635d70 +Subproject commit 60e777f3703c80c2fc853102a579d960f8184c45 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 770c8ab95475..a64e25739843 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit eef42993796d4e4766ab4264d1dfa4a3f3e280f2 +Subproject commit 43e99df50c0f7fa3f919f0122bbbb6b4bbd3d0ad From a90c50a491287686010f2e61f4b43406455b57c8 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Wed, 5 Jul 2023 08:38:06 -0700 Subject: [PATCH 6250/7387] Eliminate dependency on unmaintained node12-based action Reviewed By: diliop Differential Revision: D47220090 fbshipit-source-id: 0b69dcce8115db028d194746fb1fc4fa2d283ad4 --- .github/workflows/getdeps_linux.yml | 6 +----- .github/workflows/getdeps_mac.yml | 6 +----- .github/workflows/getdeps_windows.yml | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/getdeps_linux.yml b/.github/workflows/getdeps_linux.yml index d3d427936a33..193bb385280a 100644 --- a/.github/workflows/getdeps_linux.yml +++ b/.github/workflows/getdeps_linux.yml @@ -18,11 +18,7 @@ jobs: - name: Fetch boost run: python3 build/fbcode_builder/getdeps.py fetch --no-tests boost - name: Install Rust Stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - default: true - profile: minimal + uses: dtolnay/rust-toolchain@stable - name: Fetch ninja run: python3 build/fbcode_builder/getdeps.py fetch --no-tests ninja - name: Fetch cmake diff --git a/.github/workflows/getdeps_mac.yml b/.github/workflows/getdeps_mac.yml index e7ec5c919112..eabf58c51fdd 100644 --- a/.github/workflows/getdeps_mac.yml +++ b/.github/workflows/getdeps_mac.yml @@ -18,11 +18,7 @@ jobs: - name: Fetch boost run: python3 build/fbcode_builder/getdeps.py fetch --no-tests boost - name: Install Rust Stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - default: true - profile: minimal + uses: dtolnay/rust-toolchain@stable - name: Fetch ninja run: python3 build/fbcode_builder/getdeps.py fetch --no-tests ninja - name: Fetch cmake diff --git a/.github/workflows/getdeps_windows.yml b/.github/workflows/getdeps_windows.yml index 78bf8ad75fa1..911dd3e75dc9 100644 --- a/.github/workflows/getdeps_windows.yml +++ b/.github/workflows/getdeps_windows.yml @@ -25,11 +25,7 @@ jobs: - name: Fetch boost run: python build/fbcode_builder/getdeps.py fetch --no-tests boost - name: Install Rust Stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - default: true - profile: minimal + uses: dtolnay/rust-toolchain@stable - name: Fetch ninja run: python build/fbcode_builder/getdeps.py fetch --no-tests ninja - name: Fetch cmake From 63847c7593d0b09e1de33f1594328b99298ca6fd Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 5 Jul 2023 12:15:16 -0700 Subject: [PATCH 6251/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/1bddaf4cb9f56db14af3872b12647e5ab34f5dec https://github.com/fairinternal/egohowto/commit/53ab6635fea205266b886b4d26dc301d4a2ce646 Reviewed By: jurajh-fb fbshipit-source-id: c293af4435bcc0e6ec253ab2340a59780d5a844e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index fa08c5d7976f..be9f727c8535 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 60e777f3703c80c2fc853102a579d960f8184c45 +Subproject commit 1bddaf4cb9f56db14af3872b12647e5ab34f5dec From 0f2519b8095284cf818c6650a1b6177871eff099 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 5 Jul 2023 16:53:07 -0700 Subject: [PATCH 6252/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/4739c2538221c2f6084539c940d82ea90cd481c4 https://github.com/facebook/ocamlrep/commit/4adbc5aa83f3e31531c9a93f1d46305812e13db8 https://github.com/facebookincubator/fizz/commit/54be83d570f4b0053814440e53d62a04670fa14e https://github.com/facebookincubator/velox/commit/6efbaee1a402a4a1783b38dfbef4a360d472f4ac Reviewed By: jurajh-fb fbshipit-source-id: 733409eb6d8d9174b01ad5fe64fb02b96e0c3359 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index be9f727c8535..14971394c581 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1bddaf4cb9f56db14af3872b12647e5ab34f5dec +Subproject commit 4739c2538221c2f6084539c940d82ea90cd481c4 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e0605ba8b7f1..d67626d2762c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7a9f3720d7780de5718c48c49645b3d4e3f9ad16 +Subproject commit 817725d82a30c5921e09db34c5a69eaba8ceba6a From c4f8deb448f55c22bd28970b2adb41dd994f01cd Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 5 Jul 2023 19:14:29 -0700 Subject: [PATCH 6253/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/123488ee5686e3d0969af06c39aa223b8e3b5cea https://github.com/facebookexperimental/edencommon/commit/d74fcda0d77a90716fb7e25c349dbc8f6b0ff34c https://github.com/facebookincubator/velox/commit/a18901fd9ea8971fd24bcf31c69054dab59e2d9a Reviewed By: jurajh-fb fbshipit-source-id: 5e7e834610da834e250fc96ff6bdf9295ba5de16 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 14971394c581..7e2440c12585 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4739c2538221c2f6084539c940d82ea90cd481c4 +Subproject commit 123488ee5686e3d0969af06c39aa223b8e3b5cea From 0c8ee22c170afcfc6d43aca42fc6dd3ea13d4124 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 6 Jul 2023 18:17:15 -0700 Subject: [PATCH 6254/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8724d628ed88c32d07383f9148cc7255e45e1240 https://github.com/facebook/wangle/commit/bbafb72662bd20d5a02f40b27819418408ff0ceb https://github.com/facebookexperimental/edencommon/commit/3d03c8e97f452bc8de03fff864eaf8a2266a7679 https://github.com/facebookexperimental/rust-shed/commit/8a16f99bd063c8b81c5361b57883e3a8ff821cf1 https://github.com/facebookincubator/fizz/commit/6ca8914248007930a6f414232dbae7b3c7338f88 https://github.com/facebookincubator/velox/commit/0123a9dd44bc4e7b79d81fb72a4837825cd8dd3c https://github.com/facebookresearch/recipes/commit/bb37380c1e72991c420fb3dab6dbd0c17d3c909a https://github.com/pytorch/fbgemm/commit/2b108173659eb3a261153de870d4410493f40186 Reviewed By: jurajh-fb fbshipit-source-id: 88a0de7ee55f6e89ba69a1eac106923c71caa60f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7e2440c12585..497653870ba7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 123488ee5686e3d0969af06c39aa223b8e3b5cea +Subproject commit 8724d628ed88c32d07383f9148cc7255e45e1240 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d67626d2762c..6d714d438848 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 817725d82a30c5921e09db34c5a69eaba8ceba6a +Subproject commit ec474be38862571fbc6f7ccc061684c1aae4126e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a64e25739843..a9556a6bb2fa 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 43e99df50c0f7fa3f919f0122bbbb6b4bbd3d0ad +Subproject commit bbafb72662bd20d5a02f40b27819418408ff0ceb From fab68e5b7524bb6a0c990659242134b97d61de77 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 6 Jul 2023 23:06:28 -0700 Subject: [PATCH 6255/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/0129385ac98dc5bd9ef07dadde5cf6db31bdb563 https://github.com/facebook/fbthrift/commit/ef9eb26333052e2cb56a67e69fe4a65263a849b1 https://github.com/facebookincubator/velox/commit/b41bd6c7a45480d93a37137fb3a594da77f232eb Reviewed By: jurajh-fb fbshipit-source-id: c109f9a48202fdafe02a220987e6e3acf22b7619 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 497653870ba7..9a4e96b4895b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8724d628ed88c32d07383f9148cc7255e45e1240 +Subproject commit ef9eb26333052e2cb56a67e69fe4a65263a849b1 From fe40d7e8b682922e51f81caa9441ce4eed13b491 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 7 Jul 2023 07:57:19 -0700 Subject: [PATCH 6256/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8b7324593e6745cb94b411f85f211d33faa0fdac https://github.com/facebook/litho/commit/5bfafe4951b8a8c6b4ef1e4ae2f6b6b6e2947321 Reviewed By: jurajh-fb fbshipit-source-id: f2464d0eb51016077a2864ec3cdacac0a43c9551 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9a4e96b4895b..377c6ebb33d1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ef9eb26333052e2cb56a67e69fe4a65263a849b1 +Subproject commit 8b7324593e6745cb94b411f85f211d33faa0fdac From 43223a395fa5aaef501fbcab56025a8759638d85 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 7 Jul 2023 19:24:09 -0700 Subject: [PATCH 6257/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ba707777f3bc29b4a7a590eab2e0799d58bddb53 https://github.com/facebook/fbthrift/commit/b0734a36a05d358cc3ec1936adfdbbace0e01610 https://github.com/facebookincubator/velox/commit/d3585cecc1490e3c96386ff6f597ab972b55e8d7 Reviewed By: jurajh-fb fbshipit-source-id: 368d595e97bc296653e951dbdbf3420bae2c5768 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 377c6ebb33d1..e6289afaf9f5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8b7324593e6745cb94b411f85f211d33faa0fdac +Subproject commit b0734a36a05d358cc3ec1936adfdbbace0e01610 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a9556a6bb2fa..76bfde505fc9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit bbafb72662bd20d5a02f40b27819418408ff0ceb +Subproject commit 73c06829b4b0c332dc95c0cae090ab0ddc4ad6c7 From 0e18f21bcc4dd76b8c626a8a45019371cb10ed31 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sat, 8 Jul 2023 14:34:39 -0700 Subject: [PATCH 6258/7387] Update serde and serde_json Reviewed By: zertosh Differential Revision: D47316922 fbshipit-source-id: bc9c0b407d27fee3d590e456d4ddba34e0228f34 --- watchman/cli/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index c2b45786e7f4..fd1e29be833a 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -11,8 +11,8 @@ ahash = "0.8" anyhow = "1.0.65" duct = "0.13.6" jwalk = "0.6" -serde = { version = "1.0.136", features = ["derive", "rc"] } -serde_json = { version = "1.0.79", features = ["float_roundtrip", "unbounded_depth"] } +serde = { version = "1.0.167", features = ["derive", "rc"] } +serde_json = { version = "1.0.100", features = ["float_roundtrip", "unbounded_depth"] } structopt = "0.3.23" sysinfo = "0.26.8" tabular = "0.2.0" From 23835f14c5f0ffd58e25a64933947edc55a5ebed Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sat, 8 Jul 2023 14:36:37 -0700 Subject: [PATCH 6259/7387] Updates of dtolnay crate-o-matic universe Reviewed By: zertosh Differential Revision: D47316925 fbshipit-source-id: d6d374466693cff397a0358bb38c790575998a21 --- watchman/cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index fd1e29be833a..217fc78cb55d 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] ahash = "0.8" -anyhow = "1.0.65" +anyhow = "1.0.71" duct = "0.13.6" jwalk = "0.6" serde = { version = "1.0.167", features = ["derive", "rc"] } From fcb148b4ae49ef165cf3af499b96edbe78f86aeb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 8 Jul 2023 16:37:04 -0700 Subject: [PATCH 6260/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/a1657f7e6126471363361def92562e4138832c99 https://github.com/facebook/fbthrift/commit/82fdcacff6002ce973f721ca48ed954a951ea076 https://github.com/facebook/folly/commit/404aaa787b488286c7d40cd145a6a7acbeaeccf2 https://github.com/facebook/ocamlrep/commit/53326d231128687a0a00772c57f99251b43225c5 https://github.com/facebook/watchman/commit/23835f14c5f0ffd58e25a64933947edc55a5ebed https://github.com/facebookexperimental/rust-shed/commit/45b66317e585c8e13e0cefbc880123e96d954b2c Reviewed By: jurajh-fb fbshipit-source-id: 47060d457b731e32ef014b4f11059a01fef595f6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e6289afaf9f5..81bdf9dd6c10 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b0734a36a05d358cc3ec1936adfdbbace0e01610 +Subproject commit 82fdcacff6002ce973f721ca48ed954a951ea076 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6d714d438848..860708a75ff5 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ec474be38862571fbc6f7ccc061684c1aae4126e +Subproject commit 404aaa787b488286c7d40cd145a6a7acbeaeccf2 From 1476ea161211ebf3a6ffca432af723c70124379b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 9 Jul 2023 02:34:23 -0700 Subject: [PATCH 6261/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/1bb8d2b5d1059178ac67eb27739b9f9ea2081041 Reviewed By: jurajh-fb fbshipit-source-id: 6387573e5edc227af03c97386b7a6d8377230e00 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 81bdf9dd6c10..f089141acde4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 82fdcacff6002ce973f721ca48ed954a951ea076 +Subproject commit cbb77e3038b644fffd6f0186e183a18899336555 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 860708a75ff5..38e5eb93f3f5 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 404aaa787b488286c7d40cd145a6a7acbeaeccf2 +Subproject commit 1bb8d2b5d1059178ac67eb27739b9f9ea2081041 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 76bfde505fc9..bc93bff5ea57 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 73c06829b4b0c332dc95c0cae090ab0ddc4ad6c7 +Subproject commit 544855e36c7b2a3b6998f8276ab5a55a37025fa9 From 348be95a1be8f271855da30b4fa61364bce95e47 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 9 Jul 2023 18:10:58 -0700 Subject: [PATCH 6262/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/139e7c083bfbc7e3a2308a9cc65b9a2918e15358 https://github.com/facebook/fbthrift/commit/38c9f3987db579a7e39c99332ada5ba1ba3ab4af https://github.com/facebook/wangle/commit/59aea45327a4d1a7b6dc736f2317ffd5c63e81a4 https://github.com/facebook/watchman/commit/1476ea161211ebf3a6ffca432af723c70124379b https://github.com/facebookexperimental/edencommon/commit/d0d965378a2a31d320e28ab70d99ba6ff832533a https://github.com/facebookincubator/fizz/commit/b6fe196fd85bfe927645c06a308afb63b00e15e3 https://github.com/facebookincubator/katran/commit/c879ea2d33ae4f0a66ca9f20354e2eeeca94257b https://github.com/facebookincubator/mvfst/commit/dca32052af2f9befbde63779275bc9db77cb54d7 Reviewed By: jurajh-fb fbshipit-source-id: 67af858fc63b82160ff8ea54958d5d154ca41faf --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f089141acde4..0273e0c35d39 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cbb77e3038b644fffd6f0186e183a18899336555 +Subproject commit 38c9f3987db579a7e39c99332ada5ba1ba3ab4af diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index bc93bff5ea57..a84b161c3259 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 544855e36c7b2a3b6998f8276ab5a55a37025fa9 +Subproject commit 59aea45327a4d1a7b6dc736f2317ffd5c63e81a4 From c8a8c1bacc4ff79c4a56af379b5bc7022a94998c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 10 Jul 2023 05:53:57 -0700 Subject: [PATCH 6263/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/ea5950d570f1e825a5524f1a409f00a323352a0d https://github.com/facebook/litho/commit/a3bc744e5fd45cc3165ca4b975032575043795d5 https://github.com/facebook/ocamlrep/commit/1d5363bef2a3edd49ef767d16c899af90f6b9207 https://github.com/facebookincubator/sks/commit/d4f546b92498d6dd1c6307d1fab79d110d698bde Reviewed By: jurajh-fb fbshipit-source-id: adf4ed4a0c0300ea9540dec42e15c25fc24b4b31 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0273e0c35d39..d3f6b4eb6727 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 38c9f3987db579a7e39c99332ada5ba1ba3ab4af +Subproject commit ea5950d570f1e825a5524f1a409f00a323352a0d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a84b161c3259..57958c5b2e6f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 59aea45327a4d1a7b6dc736f2317ffd5c63e81a4 +Subproject commit d494a3d90d51b7aec08f41afffd9fbd65d131c15 From d04792646845f6bf21d5a2b644bb1a3db25f3a88 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 10 Jul 2023 14:25:15 -0700 Subject: [PATCH 6264/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/1adea387ef308bdf8cf5b7f40198905d4dff7647 https://github.com/facebook/ocamlrep/commit/8f195d71ddd29f8d8f8c6a3cf18be031181c3956 https://github.com/facebookincubator/velox/commit/b1c4ed52b42baf92352ae22b37c6a0fa390cf259 Reviewed By: bigfootjon fbshipit-source-id: 2ae7b17290803e7a9b028415a936451a2b3cb8d7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d3f6b4eb6727..0f11e185659f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ea5950d570f1e825a5524f1a409f00a323352a0d +Subproject commit 1adea387ef308bdf8cf5b7f40198905d4dff7647 From 882b9f86e464abba301cde44d7cdaaf039084b45 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 10 Jul 2023 17:44:05 -0700 Subject: [PATCH 6265/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/652bc25b5ded301d57848c8b0da2386deeec40bf https://github.com/facebook/fbthrift/commit/cd9f218b5d8dd71c34134121a574187da78ae675 https://github.com/facebook/ocamlrep/commit/b4ea7f311af6e7d1e9cdfff09125d45933bfff44 https://github.com/facebookincubator/velox/commit/410a8966ce74e5782b12c00a2ffcbfb1474ad0a4 Reviewed By: bigfootjon fbshipit-source-id: 6170aa9f1dd5fe68b8ee7685853fb923e96bbe07 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0f11e185659f..0f1bc3f7f812 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1adea387ef308bdf8cf5b7f40198905d4dff7647 +Subproject commit cd9f218b5d8dd71c34134121a574187da78ae675 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 38e5eb93f3f5..23b87a03abaf 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1bb8d2b5d1059178ac67eb27739b9f9ea2081041 +Subproject commit 2bb1fe8fcce041ce4081678c0eb253261f676bd0 From fbfa5e82a473abfb52f33943e1d5a22160b6e75c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 10 Jul 2023 19:05:16 -0700 Subject: [PATCH 6266/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/d9068286ba49dc3962d24fbda1a11a5afd3e0a74 https://github.com/facebook/folly/commit/1e8793be916c0ee0e9094fdb78bf795cbbcd0c8c https://github.com/facebook/wangle/commit/e21816a36657c033825f5273a28cefb46209043c https://github.com/facebookexperimental/rust-shed/commit/5b1adf52f58ce487fd278b8aef7e4717ce91610e https://github.com/facebookincubator/katran/commit/874a9edafe6b792501701f915b85fc73c887cf34 https://github.com/facebookincubator/mvfst/commit/3a3ee3571cbf4762ad8e9acedc632de07dd4ddb0 Reviewed By: bigfootjon fbshipit-source-id: 497830765cc361435360f4b0d0128f6be3a94ff0 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 23b87a03abaf..82389ea4718b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 2bb1fe8fcce041ce4081678c0eb253261f676bd0 +Subproject commit 1e8793be916c0ee0e9094fdb78bf795cbbcd0c8c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 57958c5b2e6f..1a8da05c04eb 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d494a3d90d51b7aec08f41afffd9fbd65d131c15 +Subproject commit e21816a36657c033825f5273a28cefb46209043c From 3a3ce70a0d3e6dd9bb96d161ac7cd913f87e7e55 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 10 Jul 2023 20:19:21 -0700 Subject: [PATCH 6267/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/cda19249469988f587a78efbc344e2ba94c5ede1 https://github.com/facebook/fbthrift/commit/33e9880d52603aba0f649d7974c7d3da6c72f936 https://github.com/facebook/mcrouter/commit/cddc005ccd3ab9035f00a5ce8da238450b92121c https://github.com/facebook/watchman/commit/fbfa5e82a473abfb52f33943e1d5a22160b6e75c https://github.com/pytorch/fbgemm/commit/372c62e9d5ba3c3d07250cc5b2cee63cdb1d719c Reviewed By: bigfootjon fbshipit-source-id: 60208b952a40e6b388dfadcea522175dba2f1e21 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0f1bc3f7f812..f1551249fe5c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cd9f218b5d8dd71c34134121a574187da78ae675 +Subproject commit 33e9880d52603aba0f649d7974c7d3da6c72f936 From 6558116d39ff163bb733a891353a1a33958f65bf Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 11 Jul 2023 08:28:43 -0700 Subject: [PATCH 6268/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/a72f1c4d2a4be2f9d989bc83610d44dea7fff1e1 https://github.com/facebook/litho/commit/8bdd8d452970195bb8817f6333be51f06efb281c https://github.com/facebook/ocamlrep/commit/7205cd64124ca4a722780dbf33bd16b0f546be94 https://github.com/facebookincubator/katran/commit/7cca2aae1607ab6770d80b08ec640b7f9dc5106f https://github.com/facebookincubator/velox/commit/57e1600eeab3a7849e9a368a2c464ceb074e6259 Reviewed By: bigfootjon fbshipit-source-id: 77d43904fc69b9a9ba35d9433eac607995bbf7df --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f1551249fe5c..4029bc6578b5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 33e9880d52603aba0f649d7974c7d3da6c72f936 +Subproject commit a72f1c4d2a4be2f9d989bc83610d44dea7fff1e1 From f5e7c76e45ca4c263829aa98efb06173940deedf Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 11 Jul 2023 18:22:39 -0700 Subject: [PATCH 6269/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/0d361f7492aab85ee5350bd93c94168cc501ae1d https://github.com/facebook/litho/commit/9999481e794d9a3fe6326b6e8ded8b4c1eb274f5 https://github.com/facebookincubator/velox/commit/9134514672aa3c4d6eb3dcab00378e48592959ec https://github.com/pytorch/fbgemm/commit/eea19e82c4e4af8a5846871a2888eb6d58870f81 Reviewed By: bigfootjon fbshipit-source-id: 3cbfd4256e4784c8a106596aa931327c774f2a1f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4029bc6578b5..fe6f8ab0c97b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a72f1c4d2a4be2f9d989bc83610d44dea7fff1e1 +Subproject commit ee51a9217de5730fb5dc22218c2eee67582ebc51 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 82389ea4718b..7e1c0a90345e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1e8793be916c0ee0e9094fdb78bf795cbbcd0c8c +Subproject commit 0d361f7492aab85ee5350bd93c94168cc501ae1d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1a8da05c04eb..06ff121fd9da 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e21816a36657c033825f5273a28cefb46209043c +Subproject commit 81a74a29326aacbe5621ddbd2cd4983672d640ef From 55c71f9f034477bd68709825284f837dd3711e71 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 11 Jul 2023 19:26:50 -0700 Subject: [PATCH 6270/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/a183a5debdddad9867120bc99e5e0c869299a201 https://github.com/facebook/ocamlrep/commit/d634a946ad9d963a9ecf21e79b56899ea78440d2 https://github.com/facebookincubator/fizz/commit/cdfe0b802625afa4a471fba355309c4b1fd9c4eb https://github.com/facebookincubator/mvfst/commit/2587d1576f2d32c4a2290e68f106009c5ba9a896 https://github.com/facebookincubator/velox/commit/d1a6f6baf33ac81ee156c495d9a51eab84bfdf8e Reviewed By: bigfootjon fbshipit-source-id: e39457f8c1d127d10c2054c1b46038b733251c08 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index fe6f8ab0c97b..1a20c56019e5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ee51a9217de5730fb5dc22218c2eee67582ebc51 +Subproject commit a183a5debdddad9867120bc99e5e0c869299a201 From c31b41bdfc8e53dc0b32a379a99a3bc4bb716258 Mon Sep 17 00:00:00 2001 From: Astrid Yu Date: Wed, 12 Jul 2023 15:32:56 -0700 Subject: [PATCH 6271/7387] third-party/rust: bump tokio v1.25.0 -> v1.29.1 Summary: Needed for reqwest QUIC support (requirement of ^1.28) Reviewed By: zertosh Differential Revision: D47304356 fbshipit-source-id: d39999373ae51f79123927a073f3073e21a10078 --- watchman/cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index 217fc78cb55d..6dc7878c71fb 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -16,7 +16,7 @@ serde_json = { version = "1.0.100", features = ["float_roundtrip", "unbounded_de structopt = "0.3.23" sysinfo = "0.26.8" tabular = "0.2.0" -tokio = { version = "1.25.0", features = ["full", "test-util", "tracing"] } +tokio = { version = "1.29.1", features = ["full", "test-util", "tracing"] } watchman_client = { version = "0.8.0", path = "../rust/watchman_client" } [target.'cfg(target_os = "linux")'.dependencies] From 1e99aa314f5c84ed414944d86c513d748f4ac3be Mon Sep 17 00:00:00 2001 From: "Zeyi (Rice) Fan" Date: Wed, 12 Jul 2023 17:47:03 -0700 Subject: [PATCH 6272/7387] Migrate "watchman" from LLVM-12 to LLVM-15 Reviewed By: chadaustin Differential Revision: D46923316 fbshipit-source-id: 4fe5236958f10c70837c5ac94e3f1414afac73ce --- watchman/PACKAGE | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 watchman/PACKAGE diff --git a/watchman/PACKAGE b/watchman/PACKAGE new file mode 100644 index 000000000000..5afaa2b74164 --- /dev/null +++ b/watchman/PACKAGE @@ -0,0 +1,3 @@ +load("@fbcode_macros//build_defs:package_local_utils.bzl", "package_local_utils") + +package_local_utils.set_clang_version(15, True) From 7833055db3435e8bc8fb93ed4baa0e1eaf69909f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 14 Jul 2023 13:28:06 -0700 Subject: [PATCH 6273/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/b74dec6ed5b39d28ecd62697ec68491148d903c2 https://github.com/facebook/fb303/commit/6a99f470b83915c72511ca762febc9fc94f43138 https://github.com/facebook/folly/commit/81b0048c199e08d2de7ab75c949635026c52811b https://github.com/facebook/litho/commit/a1851e76e962f84be1d1124a57fa354de070cc70 https://github.com/facebook/ocamlrep/commit/9fe360aeec7ed34dd07b567d7d370809a00b3979 https://github.com/facebook/proxygen/commit/bc44e34bc5861a4db1e7b22133e28c05d330e1ab https://github.com/facebook/rocksdb/commit/bc0db33483d5e79b281ba3137ebf286b2d1efd8d https://github.com/facebook/squangle/commit/bce749bcf2e4555df02224137c86524ca9283249 https://github.com/facebook/wangle/commit/87390dfd14480c3484be062033f5237d7515a359 https://github.com/facebook/watchman/commit/1e99aa314f5c84ed414944d86c513d748f4ac3be https://github.com/facebookexperimental/edencommon/commit/abddc1bbcc398d931bb7d3a90b7f476982d2afd5 https://github.com/facebookexperimental/rust-shed/commit/ae932f6edd6621318a059d0fc2ef6bb3aee5d911 https://github.com/facebookincubator/fizz/commit/afd2d9db4938a19646c98487c9671a142a7889d8 https://github.com/facebookincubator/katran/commit/4a9cfd6ea5bbec21201ffa8aca73fdfd1c9cd1cb https://github.com/facebookincubator/mvfst/commit/08aba67f8b94660e8bc594c2350311b5dbc6e211 https://github.com/facebookincubator/velox/commit/2a002a4989a2b1fd156edcbbcdedade12c9783e4 https://github.com/facebookresearch/recipes/commit/7b8257c8a42b478420f9732f868f844b1c1e3436 https://github.com/facebookresearch/vrs/commit/193ebf5271fd139c4d52eacf8a88a4ee2564c141 https://github.com/fairinternal/egohowto/commit/78dd7b2e3320aa411863bf22f03d49f88f1dd9fa https://github.com/pytorch/fbgemm/commit/4a3931ace03b7a6e98c3c9f267fc48a09fb2997d https://github.com/pytorch/kineto/commit/c9362f65fb30d9854de19920edd2082e8e2c5477 Reviewed By: bigfootjon fbshipit-source-id: e187cc7350fd7d5d7d58e5898e2011b8062ae146 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7e1c0a90345e..b6f6a845c7f7 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0d361f7492aab85ee5350bd93c94168cc501ae1d +Subproject commit 81b0048c199e08d2de7ab75c949635026c52811b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 06ff121fd9da..19f39528818b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 81a74a29326aacbe5621ddbd2cd4983672d640ef +Subproject commit 87390dfd14480c3484be062033f5237d7515a359 From 6cae0b551d56e5f309723fa61a0add41bc01293c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 14 Jul 2023 15:18:18 -0700 Subject: [PATCH 6274/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/c2c0b3ba40fa512e5a7c4d479f68c833be39bf8c https://github.com/facebook/fb303/commit/92db9fea829267db92b18a00632bbb6aa5dfa0d8 https://github.com/facebook/fbthrift/commit/93ba5b87f8a5c59abf37fff3954a60b8b12ac065 https://github.com/facebook/folly/commit/1ef274fc4d2789aa0b250f8e406b59f1fe19485a https://github.com/facebook/proxygen/commit/d8254920df8e3ea07a99eaaef4d237464661a8a3 https://github.com/facebook/wangle/commit/ee9d42b27acea4d489d1ab301bd1f6b7c1d10007 https://github.com/facebook/watchman/commit/7833055db3435e8bc8fb93ed4baa0e1eaf69909f https://github.com/facebookexperimental/edencommon/commit/756ee8e9f5ed5c1293e973e30ea8ee800cf2cdad https://github.com/facebookincubator/fizz/commit/432d921980936e139b04142d0e8834b9bce756de https://github.com/facebookincubator/katran/commit/ec14beb38344439663b1d947d9b5168b8f06e34c https://github.com/facebookincubator/mvfst/commit/82e6f4c59cc1abcd640bf320d1465f09ee8c5304 https://github.com/facebookincubator/superconsole/commit/5c3a101c057e245cc3e17dbf796a3875fc9330de https://github.com/facebookincubator/velox/commit/838c74ba1d0dbedcf459c1f14805e2c132154fed Reviewed By: bigfootjon fbshipit-source-id: 609ecc317f138cd93fb55e19fa8b0423cd46dfa3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1a20c56019e5..02a61232abba 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a183a5debdddad9867120bc99e5e0c869299a201 +Subproject commit 93ba5b87f8a5c59abf37fff3954a60b8b12ac065 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b6f6a845c7f7..5764ffb41d7a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 81b0048c199e08d2de7ab75c949635026c52811b +Subproject commit 1ef274fc4d2789aa0b250f8e406b59f1fe19485a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 19f39528818b..7f3d1ca8d920 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 87390dfd14480c3484be062033f5237d7515a359 +Subproject commit ee9d42b27acea4d489d1ab301bd1f6b7c1d10007 From f12c100b30679bc1f5c69d9b89ffdbb3663551cc Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 14 Jul 2023 18:26:36 -0700 Subject: [PATCH 6275/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/859ffef38f12051242ede2cd7836a1ded30092f3 Reviewed By: bigfootjon fbshipit-source-id: 0e3f45916da875accedc4572dbef394af38d49dd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 02a61232abba..6067821b6d10 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 93ba5b87f8a5c59abf37fff3954a60b8b12ac065 +Subproject commit 859ffef38f12051242ede2cd7836a1ded30092f3 From 5d73cf06e8b94a4a9fef46acc4da7494302de78b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 15 Jul 2023 15:13:38 -0700 Subject: [PATCH 6276/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/0608d84e8fbb07c24ba2ea7f3f48ad1eb26d7390 https://github.com/facebook/proxygen/commit/ee31ac5b3a43fecad16f12421a70afbf7e0856b1 https://github.com/facebook/wangle/commit/78a833bf525e799b2e5ccd239e271ff78bd82abc https://github.com/facebookincubator/fizz/commit/f2c46d77a8044f2bccddba70c577a756c2807254 Reviewed By: bigfootjon fbshipit-source-id: 898b37f8d3202da98256a443aa10f1a1297a357e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6067821b6d10..c11f14e76757 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 859ffef38f12051242ede2cd7836a1ded30092f3 +Subproject commit 409cb68409ed31282b55a2a27c274c9905a41c9e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 5764ffb41d7a..4b5529713171 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1ef274fc4d2789aa0b250f8e406b59f1fe19485a +Subproject commit 223824e541306293eff9c32ffc643ed3f3118def diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7f3d1ca8d920..0ad354f08105 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ee9d42b27acea4d489d1ab301bd1f6b7c1d10007 +Subproject commit 78a833bf525e799b2e5ccd239e271ff78bd82abc From 9838ab984f1623f5172721bd67575b585236ac78 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 16 Jul 2023 15:11:43 -0700 Subject: [PATCH 6277/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/960f16fe81d4b40b334e80b19d4f0b7e83dd7522 Reviewed By: bigfootjon fbshipit-source-id: 525231ab382c5841adec51988dd5c797d3dbf35d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c11f14e76757..0ac5dff297d7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 409cb68409ed31282b55a2a27c274c9905a41c9e +Subproject commit 960f16fe81d4b40b334e80b19d4f0b7e83dd7522 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0ad354f08105..14109088e215 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 78a833bf525e799b2e5ccd239e271ff78bd82abc +Subproject commit 3f4d63d977ee159c11b6b7550deeb000f3d28578 From ae0c3de619c37188a754df7a408f58e372960208 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 16 Jul 2023 18:06:05 -0700 Subject: [PATCH 6278/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/4758264b286163b21d76d714ae942b22bbfc529d https://github.com/facebook/proxygen/commit/d5aeea8770a1777051ee7f84496d7e07b4fd6226 Reviewed By: bigfootjon fbshipit-source-id: 6b0d12dddecace07b0f31c38efc8e464da5cdecd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0ac5dff297d7..5bf47f7ee510 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 960f16fe81d4b40b334e80b19d4f0b7e83dd7522 +Subproject commit 4758264b286163b21d76d714ae942b22bbfc529d From 7f386f8db3e3ad08395bda71be79a6e7c2d5f1c6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 17 Jul 2023 12:03:55 -0700 Subject: [PATCH 6279/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7d488441d983871424f2203eb7172f7ea8e96627 https://github.com/facebook/folly/commit/b1cac0abfd4cd27e6656a03dcffed6d68d520e7d https://github.com/facebook/ocamlrep/commit/acf93cc8edbda0126e9a545d72ae2992c6321d12 https://github.com/facebookincubator/velox/commit/66f448a307c19ce3fac793c7279182448bc2b62a https://github.com/facebookresearch/vrs/commit/9b944c80216dedd4edd88b3fbbc64f9b4fa3d3ee https://github.com/pytorch/multipy/commit/d0032e0d9d757a7d31ee5b4eacb47d9f4d383143 Reviewed By: jailby fbshipit-source-id: 66d076ae17eafa9834cc9b5d4be9f0c042e9ca9c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5bf47f7ee510..c26660901973 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4758264b286163b21d76d714ae942b22bbfc529d +Subproject commit 7d488441d983871424f2203eb7172f7ea8e96627 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4b5529713171..7a9e49af4fb2 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 223824e541306293eff9c32ffc643ed3f3118def +Subproject commit b1cac0abfd4cd27e6656a03dcffed6d68d520e7d From 7b7c08779bdddc930bbdebf43b8362be524bfbf1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 17 Jul 2023 13:25:56 -0700 Subject: [PATCH 6280/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/0b9bc02474fcec0d8af3f2bff955e130d30156d9 https://github.com/facebook/proxygen/commit/157a97255ae6c4447b487f3c4c5b4764708015c1 https://github.com/facebook/wangle/commit/0abb456a5cb91917f08ee3a83c9dea888fb68f8e https://github.com/facebook/watchman/commit/7f386f8db3e3ad08395bda71be79a6e7c2d5f1c6 https://github.com/facebookexperimental/edencommon/commit/facde51cbd3104d08149adfb1448694eaed529f4 https://github.com/facebookincubator/fizz/commit/a140ccd1c9cd1e0a99c6ee66729071d41ce0aea5 https://github.com/facebookincubator/katran/commit/e8cc4de228ccd62b59799f06aaa3cc984f3e2d2f https://github.com/facebookincubator/mvfst/commit/4a21ea0d1bdaa70830dbdceaca8709c24dfcb7ee https://github.com/facebookincubator/velox/commit/4606f780b589d554a4f9d5025cbd6d422863bba6 Reviewed By: jailby fbshipit-source-id: bd6c422aee49168b5fba9081cdadb9e8d94661c0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c26660901973..824c4442e98e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7d488441d983871424f2203eb7172f7ea8e96627 +Subproject commit 0b9bc02474fcec0d8af3f2bff955e130d30156d9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 14109088e215..9eaa861eb01e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3f4d63d977ee159c11b6b7550deeb000f3d28578 +Subproject commit 0abb456a5cb91917f08ee3a83c9dea888fb68f8e From ecc06111a4d3934b869933e427a653532c20bc2e Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Mon, 17 Jul 2023 15:18:23 -0700 Subject: [PATCH 6281/7387] use the compiler-defined _WIN32 define Summary: WIN32 is defined by windows.h. _WIN32 is defined by the compiler. The latter is more reliable under refactoring. Reviewed By: xavierd Differential Revision: D47528610 fbshipit-source-id: 56318741cdf9d8e234c0b8d55aeb7f96e7d5efaa --- watchman/cmds/info.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/cmds/info.cpp b/watchman/cmds/info.cpp index 294cf572fd2f..4fa8ada811ba 100644 --- a/watchman/cmds/info.cpp +++ b/watchman/cmds/info.cpp @@ -140,7 +140,7 @@ static UntypedResponse cmd_get_sockname(Client*, const json_ref&) { "unix_domain", w_string_to_json(w_string::build(get_unix_sock_name()))); } -#ifdef WIN32 +#ifdef _WIN32 if (!disable_named_pipe) { resp.set( "named_pipe", From 31da3a444128ae38ba8667657bbd90af6f84ae8f Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Mon, 17 Jul 2023 16:49:19 -0700 Subject: [PATCH 6282/7387] don't build boost wave Summary: X-link: https://github.com/facebookincubator/velox/pull/5686 We're seeing what looks like incompatibilities between Xcode 14.3.1 and Boost Wave: ``` /Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/c++/v1/__algorithm/copy.h:62:75: error: 'iterator_type' is a private member of 'boost::spirit::multi_pass >, boost::wave::cpplexer::lex_input_interface > *>, boost::spirit::iterator_policies::default_policy >' && __is_cpp17_contiguous_iterator::value ^ ``` We don't use Boost Wave anywhere, so don't build it. Reviewed By: lnicco, xavierd Differential Revision: D47489625 fbshipit-source-id: c1e7cd804575d0eda465371aed4727d94dfb2504 --- build/fbcode_builder/manifests/boost | 1 - 1 file changed, 1 deletion(-) diff --git a/build/fbcode_builder/manifests/boost b/build/fbcode_builder/manifests/boost index 82ae6e54214b..8e95a27286b8 100644 --- a/build/fbcode_builder/manifests/boost +++ b/build/fbcode_builder/manifests/boost @@ -92,7 +92,6 @@ job_weight_mib = 512 --with-thread --with-timer --with-type_erasure ---with-wave [bootstrap.args.os=darwin] # Not really gcc, but CI puts a broken clang in the PATH, and saying gcc From 9e59e3bda7aa50bee704ec89803bd0472b2f2da8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 17 Jul 2023 16:50:07 -0700 Subject: [PATCH 6283/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/5c4656bf5f9cffabf190f3319447b0023113dd11 https://github.com/facebook/fbthrift/commit/e6f5064146835489cfe3758236f1937f00c67517 https://github.com/facebook/ocamlrep/commit/72fb0e4fbd3d86a010c984bc9210de311c3c3432 https://github.com/facebook/watchman/commit/ecc06111a4d3934b869933e427a653532c20bc2e https://github.com/facebookincubator/velox/commit/4029e7fedc8ece90a26ee7f97e610b1d6650d89a https://github.com/pytorch/fbgemm/commit/2de3f82c6871d94391219759600c36db7a587c4f Reviewed By: jailby fbshipit-source-id: 785dcb54862f2725c9b4ced2040571e868aba0c2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 824c4442e98e..2e8092e87ca4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0b9bc02474fcec0d8af3f2bff955e130d30156d9 +Subproject commit e6f5064146835489cfe3758236f1937f00c67517 From 961270432988d875d8428bf47f29694957a46004 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Mon, 17 Jul 2023 17:56:15 -0700 Subject: [PATCH 6284/7387] fix getdeps build Summary: X-link: https://github.com/facebookincubator/velox/pull/5687 When I introduced ProcessId, I forgot to fix the open source build. This diff also works around a bug in fmt 8. Reviewed By: kmancini Differential Revision: D47485282 fbshipit-source-id: bc7b1cd604f255443d9cee3a7bae714d0ff6c28e --- build/fbcode_builder/manifests/edencommon | 1 + 1 file changed, 1 insertion(+) diff --git a/build/fbcode_builder/manifests/edencommon b/build/fbcode_builder/manifests/edencommon index 6b02178cb83d..772c9407ed9f 100644 --- a/build/fbcode_builder/manifests/edencommon +++ b/build/fbcode_builder/manifests/edencommon @@ -11,6 +11,7 @@ repo_url = https://github.com/facebookexperimental/edencommon.git builder = cmake [dependencies] +fmt folly gflags glog From 0367826f6101c176b4c0c7b91072a5a479e45646 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 17 Jul 2023 18:21:04 -0700 Subject: [PATCH 6285/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/8018e73b2de6f3172c306be254e9aea51bbb6c52 https://github.com/facebook/fb303/commit/9e57fd10981451c351a035e3806a9ba13cff989f https://github.com/facebook/fbthrift/commit/ca84d2accedfe79d23d6a2f5851192b13198eed1 https://github.com/facebook/folly/commit/f0b2f8153cc30ac9cb5fc2fec38684a8df2f0e91 https://github.com/facebook/proxygen/commit/d26006e1b6cf04433aa604dd3057862d1922538b https://github.com/facebook/wangle/commit/2dedbbe4630c5b5c2fa5c90a3a95b98c499505c3 https://github.com/facebook/watchman/commit/9e59e3bda7aa50bee704ec89803bd0472b2f2da8 https://github.com/facebookexperimental/edencommon/commit/c992b17d5614bb3da6840666e87af4e162906fec https://github.com/facebookexperimental/rust-shed/commit/1ce11368f210cf4a2271fdda8bc7e00dcc5b260c https://github.com/facebookincubator/fizz/commit/69147b0ca134499e35b08151d09f61437e61ba3b https://github.com/facebookincubator/katran/commit/b1e0e74a1f907d4c15fdca0b823133006ef8c7f7 https://github.com/facebookincubator/mvfst/commit/cc3985f7ba4a61f4e9c5f5b271694c72b052adf1 https://github.com/facebookincubator/velox/commit/f232f2efb8699211e3e7dacf76724d9abb75aacd https://github.com/fairinternal/egohowto/commit/7230674a0eac731bc3c7e9946e788066a2eb5468 Reviewed By: jailby fbshipit-source-id: 70dcd30573b3421ee5d2d3d1b549b1b611d24e4c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2e8092e87ca4..fbcd907c6adc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e6f5064146835489cfe3758236f1937f00c67517 +Subproject commit ca84d2accedfe79d23d6a2f5851192b13198eed1 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7a9e49af4fb2..ed5fb5ae8e51 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b1cac0abfd4cd27e6656a03dcffed6d68d520e7d +Subproject commit f0b2f8153cc30ac9cb5fc2fec38684a8df2f0e91 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9eaa861eb01e..5594111c4ac5 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0abb456a5cb91917f08ee3a83c9dea888fb68f8e +Subproject commit 2dedbbe4630c5b5c2fa5c90a3a95b98c499505c3 From 34ba11a101db985a6c03f0a3a6cba8475017fff1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 18 Jul 2023 10:08:43 -0700 Subject: [PATCH 6286/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/614c89a98815636828053f77e2386f5006c8fe8f Reviewed By: jailby fbshipit-source-id: 225c5b3ee6bfde7413419e13733d1b3b954343c5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index fbcd907c6adc..10629eef4ada 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ca84d2accedfe79d23d6a2f5851192b13198eed1 +Subproject commit b07a9c5290454df400766e86fd4afb4fceb10805 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ed5fb5ae8e51..8d681ff66ed0 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f0b2f8153cc30ac9cb5fc2fec38684a8df2f0e91 +Subproject commit 614c89a98815636828053f77e2386f5006c8fe8f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5594111c4ac5..8c2f2632aeeb 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2dedbbe4630c5b5c2fa5c90a3a95b98c499505c3 +Subproject commit 6e4c86530528c90148e454df0be442c0cbd3713b From 47809b3f7dc7c6dbf9fed89c97f21e4c7a4bff66 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 18 Jul 2023 12:56:31 -0700 Subject: [PATCH 6287/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/a7b198bbe51165e62fdb4eb641c247f98b31e023 https://github.com/facebook/fbthrift/commit/c4d6d00a557451f85f06ad6e649f750804080844 https://github.com/facebook/ocamlrep/commit/23743d49fb8ca86ca0768dbf485e0ce2d196405a https://github.com/facebook/rocksdb/commit/662a1c99f6457106d2ea1cd21a8a9d1370cb0722 https://github.com/facebookincubator/fizz/commit/235358c8b2e613b85d47b2088c21f7bd344910ec https://github.com/facebookincubator/velox/commit/2be9093737e25c3787e3f40f78c0652e37e50c1f https://github.com/pytorch/kineto/commit/efa1c2bcc09d1c0d09c5b8864ecba974136131ea Reviewed By: jailby fbshipit-source-id: ca9e1010e6a90e4a9742a862ff98aba25110ab46 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 10629eef4ada..584f7be6a09c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b07a9c5290454df400766e86fd4afb4fceb10805 +Subproject commit c4d6d00a557451f85f06ad6e649f750804080844 From ea68ff45e9c5fbfa4b6f5b939a34e3d6c4a5eb64 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 18 Jul 2023 18:47:47 -0700 Subject: [PATCH 6288/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/53b1aeaea6a918e6f855735e633fc1c13d92d065 https://github.com/facebook/fbthrift/commit/9784cbbd3993b6f18288ceb533142ca6417becb8 https://github.com/facebook/proxygen/commit/8b1d9fbb096f89336444a775cea419297a16ea2d https://github.com/facebook/rocksdb/commit/ff0d618c7f55a610018d07ea8e090e8b285dea6c https://github.com/facebookincubator/mvfst/commit/8ce29ecf416943edf5bf40d11121ee91c048215c https://github.com/facebookincubator/velox/commit/a97a7343e75bb352d0d2e71292c7d27c670b4024 https://github.com/pytorch/fbgemm/commit/263e97837ca371ffa321943aa72cd5188b9401ea Reviewed By: jailby fbshipit-source-id: c11209c5be2cbf653f7e6c1344ad775813e03a94 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 584f7be6a09c..7acaf94a39a4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c4d6d00a557451f85f06ad6e649f750804080844 +Subproject commit 9784cbbd3993b6f18288ceb533142ca6417becb8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8c2f2632aeeb..5863179bfaed 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6e4c86530528c90148e454df0be442c0cbd3713b +Subproject commit f3233949b217733a46f205d0be0f85c1a0f9eb08 From 6547ff6bd0ab0dafa992794a78b87a26a3dc01fa Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 18 Jul 2023 20:20:39 -0700 Subject: [PATCH 6289/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/32df2de28c79236e30b527047ff12ad1e105b006 https://github.com/facebook/fbthrift/commit/97d4a3445e500fce62296b24e0d25514bc8c8761 https://github.com/facebook/rocksdb/commit/05c3b8ecac246fd62fb47b4b925af5d587b5ad6d https://github.com/facebookexperimental/edencommon/commit/c47a91d657480a39f9134b4a2931c88846468b5b https://github.com/facebookincubator/velox/commit/6a2d6f3fb56c1e99b6a6fac1ebfc7407c64eb6d7 Reviewed By: jailby fbshipit-source-id: dcf51301f69511ec99f34ecb6e71736a8f339786 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7acaf94a39a4..5307e8e67bd0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9784cbbd3993b6f18288ceb533142ca6417becb8 +Subproject commit 97d4a3445e500fce62296b24e0d25514bc8c8761 From 5ed27714f21a2d2f1a2f654f34576bcb19655e12 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 19 Jul 2023 11:38:51 -0700 Subject: [PATCH 6290/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/742a4bbbd5046e66c029fad83c200525309e3ef3 https://github.com/facebook/folly/commit/5b5b3d3e16ef385d83742828b78b0b3f5ef093da https://github.com/facebook/ocamlrep/commit/1d6b2c34f2b11662989aa09fb6cd2d80adb90d2b https://github.com/facebook/proxygen/commit/f8de4303f0f51e4b73e951f5886ca202d145f830 https://github.com/facebook/squangle/commit/8fa4bb0f609ea917e973f36f83659fb7cc346497 https://github.com/facebookexperimental/rust-shed/commit/26e7cf7164cba2d86f26ed57efd7b5b110dc24df https://github.com/facebookincubator/sks/commit/00d6e6b2eae6e7b140edf3a96a3e9871b6ce22d7 https://github.com/facebookincubator/velox/commit/2740de373b6f94b00f7ad3942cdf84a7763cb945 https://github.com/pytorch/kineto/commit/b76bdf9fa69e42fa4bb23f3c82aab92620bd594f Reviewed By: jailby fbshipit-source-id: 01f4100a3a3ec31878aa551b8067d0afd50d2e73 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5307e8e67bd0..e1834f610a04 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 97d4a3445e500fce62296b24e0d25514bc8c8761 +Subproject commit 742a4bbbd5046e66c029fad83c200525309e3ef3 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8d681ff66ed0..f530fcb8482a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 614c89a98815636828053f77e2386f5006c8fe8f +Subproject commit 5b5b3d3e16ef385d83742828b78b0b3f5ef093da From c7eb46e743bf368866b8490b97a0356e4ed76d5a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 19 Jul 2023 15:15:16 -0700 Subject: [PATCH 6291/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/b03ba38edd41f2716b85b2d35ee2bfe1699f0ed3 https://github.com/facebook/fb303/commit/78e1dc69bd27a00dbecc36c5ed4a91349eadef70 https://github.com/facebook/fbthrift/commit/e59b947e93c875ec05570a548cedbcfa2ac85542 https://github.com/facebook/folly/commit/c7a36234b8b451c9ba53d7a7b79dcb00f2e4343b https://github.com/facebook/ocamlrep/commit/1ff0c9f60da55c2b51f8ae04a03846bf0b199019 https://github.com/facebook/rocksdb/commit/86634885ebb59bd7a7950db9a540d80a3ac4ad7e https://github.com/facebook/wangle/commit/ca38a9b585b8bff512939f724478c0cb54171afb https://github.com/facebookexperimental/edencommon/commit/34111004eebad284c3c56149746e620fdc9f4c41 https://github.com/facebookexperimental/rust-shed/commit/e23917bfcd7dd6e2a88b4848a451df28b51f9631 https://github.com/facebookincubator/fizz/commit/b6db804bd6a4b817965a1a2326e9f9af2592d376 https://github.com/facebookincubator/katran/commit/8915047c6b50f0a0a2ff6c9f92e353d7e13550c5 https://github.com/facebookincubator/mvfst/commit/2cc5d6c59998ecc3bbfc480e2105f28d05a80730 https://github.com/facebookincubator/velox/commit/5392abb364c065920ae0ba8e0ba84f32b43d63c7 https://github.com/facebookresearch/vrs/commit/823d8cf1ef391d79bf93548d2e70faa26ba640ed https://github.com/pytorch/kineto/commit/aa8b623f297064129388bb30feaa76d15fd343e5 Reviewed By: jailby fbshipit-source-id: b1ab41aff294bc24777b752ee6c968ad74ae710e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e1834f610a04..9c9b7a3b2c8a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 742a4bbbd5046e66c029fad83c200525309e3ef3 +Subproject commit e59b947e93c875ec05570a548cedbcfa2ac85542 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f530fcb8482a..136ab7cd09d2 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 5b5b3d3e16ef385d83742828b78b0b3f5ef093da +Subproject commit c7a36234b8b451c9ba53d7a7b79dcb00f2e4343b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5863179bfaed..c5b1817765f9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f3233949b217733a46f205d0be0f85c1a0f9eb08 +Subproject commit ca38a9b585b8bff512939f724478c0cb54171afb From 38b0fd0d6959fdb1de6616a676c3f2269e5fb6b0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 19 Jul 2023 19:10:34 -0700 Subject: [PATCH 6292/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/4593ded3cf6ad9bf38c99f5092bafdfeb0ff52d1 https://github.com/facebook/fbthrift/commit/0e69ed57e4831061e887b878db0ccfa6a6937f02 https://github.com/facebook/wangle/commit/447825272ec33dd50b899e727c40bbd7d185e03d https://github.com/facebookexperimental/edencommon/commit/8558f3a7f5373a729734b83bed5440c7000535a6 https://github.com/facebookexperimental/rust-shed/commit/8295d6e09c4c25de849390f4506dbd9eabcfdfe3 https://github.com/facebookincubator/katran/commit/acc70f564d00e7616e5fd3c5c61e786c43ecc099 https://github.com/facebookincubator/mvfst/commit/c561f0394be43e35207a741552179f4e0a75f9d1 https://github.com/facebookincubator/velox/commit/40b1dafe1f4d5b53104824156e3f8f03bf2bdcef Reviewed By: jailby fbshipit-source-id: 03445c5418923bfec251b8426d3aef9192f84bf8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9c9b7a3b2c8a..e932f3f10290 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e59b947e93c875ec05570a548cedbcfa2ac85542 +Subproject commit 0e69ed57e4831061e887b878db0ccfa6a6937f02 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 136ab7cd09d2..f606e80e1775 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c7a36234b8b451c9ba53d7a7b79dcb00f2e4343b +Subproject commit 03fbccdc93e90a135d074f87e1433b4dcff988f0 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c5b1817765f9..ac2827ebefe8 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ca38a9b585b8bff512939f724478c0cb54171afb +Subproject commit 447825272ec33dd50b899e727c40bbd7d185e03d From 71f7558b0a0ab0e280ffe4661c88d694837bb4da Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 20 Jul 2023 00:46:34 -0700 Subject: [PATCH 6293/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/1940888a3aa5683e1d21d595c9563541996fbeb1 https://github.com/facebook/folly/commit/890a9a1c13f9c9290b122f87e6d79ebfd967d69c https://github.com/pytorch/fbgemm/commit/4096e8dd0819864b6d939c40001ba710cc9f5402 Reviewed By: jailby fbshipit-source-id: 21a3954b9d64d3a1eb8484f7c98837292eb5ae0e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e932f3f10290..104c112b312c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0e69ed57e4831061e887b878db0ccfa6a6937f02 +Subproject commit 1940888a3aa5683e1d21d595c9563541996fbeb1 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f606e80e1775..ca23e68b5bb1 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 03fbccdc93e90a135d074f87e1433b4dcff988f0 +Subproject commit 890a9a1c13f9c9290b122f87e6d79ebfd967d69c From 3465cd311de40b71cffd0f611cd27b53eb5d0b07 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 20 Jul 2023 02:52:12 -0700 Subject: [PATCH 6294/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/2a2aed4424b7e4bd1a337c933abc32e5a08d7b8f https://github.com/facebook/proxygen/commit/160b03d42f3bb3e67740feb8349538580150404b https://github.com/facebook/watchman/commit/71f7558b0a0ab0e280ffe4661c88d694837bb4da Reviewed By: jailby fbshipit-source-id: edcef6ad64fd55855f7b30cd96cea1ae599764dc --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 104c112b312c..02775ffb23e5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1940888a3aa5683e1d21d595c9563541996fbeb1 +Subproject commit 2a2aed4424b7e4bd1a337c933abc32e5a08d7b8f From be7769d85d267d3fd834806501016b20f5ff3e0a Mon Sep 17 00:00:00 2001 From: Zhaolong Zhu Date: Thu, 20 Jul 2023 06:55:54 -0700 Subject: [PATCH 6295/7387] getdeps: delete getdeps build for sapling Summary: X-link: https://github.com/facebookincubator/velox/pull/5731 We are now planning to remove the Sapling getdeps build since Sapling doesn't use it for open source anyway. The EdenFS getdeps build will adapt one way or another. Reviewed By: xavierd Differential Revision: D47606806 fbshipit-source-id: 203634db78b668b4e306294244af605b4aa5e9ec --- build/fbcode_builder/manifests/eden | 4 -- build/fbcode_builder/manifests/sapling | 65 -------------------------- 2 files changed, 69 deletions(-) delete mode 100644 build/fbcode_builder/manifests/sapling diff --git a/build/fbcode_builder/manifests/eden b/build/fbcode_builder/manifests/eden index b3d26d4741cd..161bccb1f1ed 100644 --- a/build/fbcode_builder/manifests/eden +++ b/build/fbcode_builder/manifests/eden @@ -52,10 +52,6 @@ libcurl # Added so that OSS doesn't see system "python" which is python 2 on darwin and some linux python -[dependencies.all(fb=off)] -# Outside Meta hg is not installed, or if it is, its not the one we want to test with -sapling - [shipit.pathmap.fb=on] # for internal builds that use getdeps fbcode/fb303 = fb303 diff --git a/build/fbcode_builder/manifests/sapling b/build/fbcode_builder/manifests/sapling deleted file mode 100644 index 3282ba719578..000000000000 --- a/build/fbcode_builder/manifests/sapling +++ /dev/null @@ -1,65 +0,0 @@ -[manifest] -name = sapling -fbsource_path = fbcode/eden -shipit_project = eden -shipit_fbcode_builder = true - -[git] -repo_url = https://github.com/facebook/sapling.git - -[build.not(os=windows)] -builder = make -subdir = eden/scm - -[build.os=windows] -# For now the biggest blocker is missing "make" on windows, but there are bound -# to be more -builder = nop - -[make.build_args] -getdepsbuild - -[make.install_args] -install-getdeps - -[shipit.pathmap] -fbcode/configerator/structs/scm/hg = configerator/structs/scm/hg -fbcode/configerator/structs/scm/hg/public_autocargo = configerator/structs/scm/hg -fbcode/eden/oss = . -fbcode/eden = eden -fbcode/eden/fs/public_autocargo = eden/fs -fbcode/eden/mononoke/public_autocargo = eden/mononoke -fbcode/eden/scm/public_autocargo = eden/scm -fbcode/tools/lfs = tools/lfs - -[shipit.strip] -^fbcode/configerator/structs/scm/hg(?!/public_autocargo).*/Cargo\.toml$ -^fbcode/eden/addons/.*$ -^fbcode/eden/fs/eden-config\.h$ -^fbcode/eden/fs/py/eden/config\.py$ -^fbcode/eden/hg-server/.*$ -^fbcode/eden/fs(?!/public_autocargo).*/Cargo\.toml$ -^fbcode/eden/mononoke(?!/public_autocargo).*/Cargo\.toml$ -^fbcode/eden/scm(?!/public_autocargo|/edenscmnative/bindings).*/Cargo\.toml$ -^fbcode/eden/scm/build/.*$ -^fbcode/eden/website/.*$ -^fbcode/eden/.*/\.cargo/.*$ -^.*/facebook/.*$ -^.*/fb/.*$ -/Cargo\.lock$ -\.pyc$ - -[dependencies] -fb303 -fbthrift -rust-shed - -[dependencies.not(os=windows)] -python - -# We use the system openssl on linux -[dependencies.not(os=linux)] -openssl - -[dependencies.fbsource=on] -rust From 6e6e910fb10340520408e7574b4a230d5b32cb50 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 20 Jul 2023 07:46:12 -0700 Subject: [PATCH 6296/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/2326239f8aad4c697de9a22eadb9fd48a85f9c0d https://github.com/facebook/fbthrift/commit/f60c483490e49d8ab0dde453fe4787f88c4492be https://github.com/facebook/folly/commit/93a853702de1c2dd23a884aecb90887c52d94d70 https://github.com/facebook/proxygen/commit/05ceedaf11be7c7a32e3a6bbd629c10d765863a2 https://github.com/facebook/wangle/commit/cf4fa1ebd9b703563d515d72ba8bc98b68a05f10 https://github.com/facebook/watchman/commit/be7769d85d267d3fd834806501016b20f5ff3e0a https://github.com/facebookexperimental/edencommon/commit/9797b0075bb125b944e01a543908e098d81a49d4 https://github.com/facebookexperimental/rust-shed/commit/f02528b087e0d60ae2b36fab3094b6d4feafbed4 https://github.com/facebookincubator/fizz/commit/5c27c3cec1b56d4024d8b8ad5bb298e3e94bed7a https://github.com/facebookincubator/katran/commit/01e821725597f40e99fffcefcaab636c457e47cd https://github.com/facebookincubator/mvfst/commit/5ce1e0b431ceb2aae4504cd7c1058720170402a5 https://github.com/facebookincubator/velox/commit/ee272b8e20bf1f9fb0ff2dd2b2f47675854458bf Reviewed By: jailby fbshipit-source-id: 8c03f5408ed7bb84878a55cf437fcdcd839926aa --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 02775ffb23e5..bd984349b04b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2a2aed4424b7e4bd1a337c933abc32e5a08d7b8f +Subproject commit f60c483490e49d8ab0dde453fe4787f88c4492be diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ca23e68b5bb1..b376a2d88d83 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 890a9a1c13f9c9290b122f87e6d79ebfd967d69c +Subproject commit 93a853702de1c2dd23a884aecb90887c52d94d70 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ac2827ebefe8..d3bcc33749f1 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 447825272ec33dd50b899e727c40bbd7d185e03d +Subproject commit cf4fa1ebd9b703563d515d72ba8bc98b68a05f10 From b326ddabd8540f1c01f1a24678a4381c1f75c38f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 20 Jul 2023 13:09:55 -0700 Subject: [PATCH 6297/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/4739ef7f6255cf0abac93d91517ca875fa84d201 https://github.com/facebook/folly/commit/363ec220a82b6bbbf87b3c75b826e7003dea62b8 https://github.com/facebook/ocamlrep/commit/888e28a2e5792d03b9c064dc0d7cdf0259cb9011 https://github.com/facebook/proxygen/commit/956be0203b85574b1ed4b76d86bc42fa1d16a754 https://github.com/facebook/rocksdb/commit/6628ff12d66439373243c34c8bae77cb54cecb31 https://github.com/facebook/wangle/commit/2a2b6873b59e3d01fa559a33f3075ae2369b60e3 https://github.com/facebookincubator/velox/commit/e697fa8beca567fa1cf08bf8f7c8de061f82377e Reviewed By: jailby fbshipit-source-id: c7d2188b41a4c2f6d9ef72b2e3689c501ac6caca --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bd984349b04b..611c2c0f8dbc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f60c483490e49d8ab0dde453fe4787f88c4492be +Subproject commit 8fba4e2cf25b154e0a855596b9c0d6796002e65b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b376a2d88d83..085334403787 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 93a853702de1c2dd23a884aecb90887c52d94d70 +Subproject commit 363ec220a82b6bbbf87b3c75b826e7003dea62b8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d3bcc33749f1..26e840830e2e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit cf4fa1ebd9b703563d515d72ba8bc98b68a05f10 +Subproject commit 2a2b6873b59e3d01fa559a33f3075ae2369b60e3 From 20468ddb49dd4ed38dfbaad27be7104762a51016 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 20 Jul 2023 16:24:05 -0700 Subject: [PATCH 6298/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/0f339977bfdb4ae793a09e6088513f3cea42f748 https://github.com/facebook/folly/commit/03fe479965371adf52614335db6cc7a872f9812c https://github.com/facebook/ocamlrep/commit/8c8c585a84928225f7dd7c835004e9fdf086e092 https://github.com/facebookincubator/velox/commit/a1ad6739625ed3b6867037ecc4d5bc5db46093be Reviewed By: jailby fbshipit-source-id: 3ba990d4e464ad1896160e222733d8af407e66e0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 611c2c0f8dbc..8589e190ba94 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8fba4e2cf25b154e0a855596b9c0d6796002e65b +Subproject commit 0f339977bfdb4ae793a09e6088513f3cea42f748 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 085334403787..851a85391520 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 363ec220a82b6bbbf87b3c75b826e7003dea62b8 +Subproject commit 03fe479965371adf52614335db6cc7a872f9812c From 25f84a4509c84c663db09acccf2396f22d472afc Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 21 Jul 2023 07:23:58 -0700 Subject: [PATCH 6299/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/4d6602967fc47b118a93932dd5db13f08eb06f56 https://github.com/facebook/folly/commit/836dfce9b7a16e1df52a2c4cd50ec4a5938401c5 https://github.com/facebook/litho/commit/35feb05522097642e615327552c40ecc512fdff7 Reviewed By: jailby fbshipit-source-id: 246d8a880976dac8215c8867c0ff4dc558919682 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8589e190ba94..7933ff074f66 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0f339977bfdb4ae793a09e6088513f3cea42f748 +Subproject commit 4d6602967fc47b118a93932dd5db13f08eb06f56 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 851a85391520..82555febc065 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 03fe479965371adf52614335db6cc7a872f9812c +Subproject commit 836dfce9b7a16e1df52a2c4cd50ec4a5938401c5 From 7c4132c808d0d9d15984cfcc208ac5c32d218650 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 21 Jul 2023 09:35:13 -0700 Subject: [PATCH 6300/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/bb891f038b53ecde809888b48b69b31ad83f3e60 https://github.com/facebook/fbthrift/commit/31b40505fd429bbd031b21c24767c701c9f3d83c https://github.com/facebook/ocamlrep/commit/bb5ab6594c4fa080dcd154e12fa0989e126b6d5c https://github.com/facebookexperimental/edencommon/commit/19196c940e08b37e8f2c7e927d2e1fe7d7ebc73e https://github.com/facebookexperimental/rust-shed/commit/21ae285dc8d3a9dfa085145fd27f23d7a3930d5f https://github.com/facebookincubator/conversionsapi-tag-for-googletagmanager/commit/a70e1193ff3feaacd2a934e5b80b9e275daadc1b https://github.com/facebookincubator/fizz/commit/6a99c337833d4f7cec91a6986982d9d3c4bab4d0 https://github.com/facebookincubator/katran/commit/5a5b3880c899ba1fcb5f3723c73ade1b71a11673 https://github.com/facebookincubator/mvfst/commit/83bb2ea6177b49f73a71924f75eaea1c206e658f https://github.com/facebookincubator/velox/commit/8f9e0399748ba674169f8163c51dcfb122b1f183 Reviewed By: jailby fbshipit-source-id: 631b633d83cc609714832a04bda9e6e01995950e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7933ff074f66..43f48570d96c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4d6602967fc47b118a93932dd5db13f08eb06f56 +Subproject commit 31b40505fd429bbd031b21c24767c701c9f3d83c From 17e66af8981d573ca55493ac4a161e8e307fe799 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 21 Jul 2023 12:29:45 -0700 Subject: [PATCH 6301/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/3c1b36ae424a9fbbb92cb2c64978dddb2dc7d427 https://github.com/facebook/ocamlrep/commit/f0c3af842511c38be2d636b605190fbbefb9c2c7 https://github.com/facebookincubator/mvfst/commit/fd5bd417e888435cbf9025e5a51342b5a03c4f57 https://github.com/facebookincubator/velox/commit/06cac6fcc74d1361248cb74402bd2e3e0d065209 Reviewed By: jailby fbshipit-source-id: 4bc9346d475ef96d326dd89f3de582a3ce281dfd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 43f48570d96c..83f6438449a0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 31b40505fd429bbd031b21c24767c701c9f3d83c +Subproject commit 3c1b36ae424a9fbbb92cb2c64978dddb2dc7d427 From 2eb676ba34f585b43be2230f569637388d7d8781 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 21 Jul 2023 13:30:02 -0700 Subject: [PATCH 6302/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/a49276cc17eb4ed406775f23830597e3da20abfa https://github.com/facebook/folly/commit/9f29a5aab33c7c9629bbf53ec1de3f52eaa68481 https://github.com/facebook/wangle/commit/84579454ce9a84d36aa2fe3a27b34e953e5efb26 Reviewed By: jailby fbshipit-source-id: b4ab61f71f53a817804d89b4123bc6ea3448f143 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 82555febc065..73215deaad0f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 836dfce9b7a16e1df52a2c4cd50ec4a5938401c5 +Subproject commit 9f29a5aab33c7c9629bbf53ec1de3f52eaa68481 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 26e840830e2e..38bc9012feab 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2a2b6873b59e3d01fa559a33f3075ae2369b60e3 +Subproject commit 84579454ce9a84d36aa2fe3a27b34e953e5efb26 From 6a6fe7b2bf175bbfcb32e05cdb2c8802e7af45a0 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Fri, 21 Jul 2023 13:39:03 -0700 Subject: [PATCH 6303/7387] update to fmt 9.1.0 Summary: X-link: https://github.com/facebookincubator/velox/pull/5691 Bring fmt in sync with our internal vendored copy. Reviewed By: jbeshay, xavierd Differential Revision: D47490114 fbshipit-source-id: 5c185b3a3daeb1211e947272fd2ad422285cf3f1 --- build/fbcode_builder/manifests/fmt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/manifests/fmt b/build/fbcode_builder/manifests/fmt index 55de5b6a5073..eb79496e3d99 100644 --- a/build/fbcode_builder/manifests/fmt +++ b/build/fbcode_builder/manifests/fmt @@ -2,12 +2,12 @@ name = fmt [download] -url = https://github.com/fmtlib/fmt/archive/refs/tags/8.0.1.tar.gz -sha256 = b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01 +url = https://github.com/fmtlib/fmt/archive/refs/tags/9.1.0.tar.gz +sha256 = 5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2 [build] builder = cmake -subdir = fmt-8.0.1 +subdir = fmt-9.1.0 [cmake.defines] FMT_TEST = OFF From d41e8fbcb23f1c7d4f27260448b0f2435a5d038d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 21 Jul 2023 14:31:12 -0700 Subject: [PATCH 6304/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/d1bf4766c47be6f8fe2009cdbead5665f2ab29c3 https://github.com/facebook/fbthrift/commit/6408380caee1986ac8eb32b88edd2d87df2197ba https://github.com/facebook/folly/commit/dfeb9e3b20b41ba776d2789e035c1b36c96faa75 https://github.com/facebook/litho/commit/5d5780fbb242e8d1432b1f23f828102abed77599 https://github.com/facebook/proxygen/commit/62684deba2f1d9d5120c9e0a1a86edb92c9dff03 https://github.com/facebook/wangle/commit/db9bf80c7be75eeeff23b524ea5caa64e800e688 https://github.com/facebook/watchman/commit/6a6fe7b2bf175bbfcb32e05cdb2c8802e7af45a0 https://github.com/facebookexperimental/edencommon/commit/553ed15564c017122e43c3c83abf6260efa3fe53 https://github.com/facebookexperimental/rust-shed/commit/11b061e307e8b78f025e2ba9d6ea1b5523d12de2 https://github.com/facebookincubator/fizz/commit/8f3c515ded775faf7d24aa71b75a2f8353fe7503 https://github.com/facebookincubator/katran/commit/0586f64961713a6884c81b016f48e4ce696c21cf https://github.com/facebookincubator/mvfst/commit/90870b428657931eb484e0620949f575d5f5b8bc https://github.com/facebookincubator/velox/commit/48aa0b74220524242824289a2fd5c9421ea09a03 Reviewed By: jailby fbshipit-source-id: cb805622391d5376541694181cb85483baf1dcb0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 83f6438449a0..3e3296dae034 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3c1b36ae424a9fbbb92cb2c64978dddb2dc7d427 +Subproject commit 6408380caee1986ac8eb32b88edd2d87df2197ba diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 73215deaad0f..fc9daf778045 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9f29a5aab33c7c9629bbf53ec1de3f52eaa68481 +Subproject commit dfeb9e3b20b41ba776d2789e035c1b36c96faa75 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 38bc9012feab..16ced9f35fc2 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 84579454ce9a84d36aa2fe3a27b34e953e5efb26 +Subproject commit db9bf80c7be75eeeff23b524ea5caa64e800e688 From e5a0c0f6201acdde61098a4912e23ce54f6c9197 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 21 Jul 2023 15:33:02 -0700 Subject: [PATCH 6305/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/15b1a2fdcf3440da01847ff359f9fbca8ee11c7a https://github.com/facebook/fbthrift/commit/9b62b214e32d47f6aa9d3225bba6acb088dbd1e9 https://github.com/facebook/proxygen/commit/370bf4628de982e4b8a1dd3ab9e8c748759e2db7 https://github.com/facebook/wangle/commit/4cf6400dc04291ec53f7a5479907160fea1b2581 https://github.com/facebook/watchman/commit/d41e8fbcb23f1c7d4f27260448b0f2435a5d038d https://github.com/facebookexperimental/edencommon/commit/cfa4cf0bd96d8a9475eb0315d0f5dc2e6755db70 https://github.com/facebookexperimental/rust-shed/commit/71f12024c202b9627dcb586330b0b5f9f21f80f9 https://github.com/facebookincubator/fizz/commit/0ccd4b07499c1ad59c673a30c4e57cd0d07b55b2 https://github.com/facebookincubator/katran/commit/44d213e24add783ad30d92971aba58d24756eb61 https://github.com/facebookincubator/mvfst/commit/96267075948b1557bbf8419c1c592081c4d445d0 https://github.com/facebookincubator/velox/commit/bac36e737134b4b13dc2470de5c0fccd1ccdde8e https://github.com/pytorch/fbgemm/commit/0a72c7af3f2e397038749ab2133ffb6a82385153 Reviewed By: jailby fbshipit-source-id: 9852572117882c07867ea2d041328241ff724def --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3e3296dae034..465a865eb6f4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6408380caee1986ac8eb32b88edd2d87df2197ba +Subproject commit 9b62b214e32d47f6aa9d3225bba6acb088dbd1e9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 16ced9f35fc2..7c7ecd42b237 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit db9bf80c7be75eeeff23b524ea5caa64e800e688 +Subproject commit 4cf6400dc04291ec53f7a5479907160fea1b2581 From 1abf4ef65477a91b27fb53727240e42fc2506d56 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 21 Jul 2023 17:13:46 -0700 Subject: [PATCH 6306/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/92e9607a8f6843aa02bc12a0d1b2cae1a6b697eb https://github.com/facebookincubator/velox/commit/d74d56c6afd088efaa37076479e9507b5b2ad675 Reviewed By: jailby fbshipit-source-id: 5a734782f41e97d09b1e8153f47dcb67324d4940 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index fc9daf778045..da71343a9934 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit dfeb9e3b20b41ba776d2789e035c1b36c96faa75 +Subproject commit 92e9607a8f6843aa02bc12a0d1b2cae1a6b697eb From e24c3250de0e9de9fc8fa4892337ae07918bd154 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 21 Jul 2023 20:48:00 -0700 Subject: [PATCH 6307/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/b0910f94e7593049b3dec69ba41a1ae0eaff6246 Reviewed By: jailby fbshipit-source-id: 609268bea557ef6046c4ca22ee0a0354b59f84a1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 465a865eb6f4..bda60af83542 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9b62b214e32d47f6aa9d3225bba6acb088dbd1e9 +Subproject commit b0910f94e7593049b3dec69ba41a1ae0eaff6246 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index da71343a9934..7e2db3fbb99f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 92e9607a8f6843aa02bc12a0d1b2cae1a6b697eb +Subproject commit 9c150e1138f6affe44c22b75b296161565a7e11e From 5c9d40a87e037f28325fbc93ad000a095e632b19 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Fri, 21 Jul 2023 23:31:24 -0700 Subject: [PATCH 6308/7387] Updated lz4 manifest to exlude ls4-static on CentOS Stream 9 Summary: Ran into issue install dependenices via: `sudo opensource/fbcode_builder/getdeps.py install-system-deps --recursive eden` ``` ... Error: Unable to find a match: lz4-static ... ``` Reviewed By: chadaustin Differential Revision: D47688409 fbshipit-source-id: 281b930e7d94d616b88d291257112e729c5f3b29 --- build/fbcode_builder/manifests/lz4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/fbcode_builder/manifests/lz4 b/build/fbcode_builder/manifests/lz4 index 2ce1ca9fd1ec..084d6a4aecd8 100644 --- a/build/fbcode_builder/manifests/lz4 +++ b/build/fbcode_builder/manifests/lz4 @@ -6,8 +6,8 @@ lz4 [rpms] lz4-devel -# centos (not centos_stream that is Meta internal) 8 is missing this -[rpms.not(all(distro=centos,distro_vers=8))] +# centos 8 and centos_stream 9 are missing this rpm +[rpms.not(any(all(distro=centos,distro_vers=8),all(distro=centos_stream,distro_vers=9)))] lz4-static [debs] From b2f3270b658599190640ff2635dca4f6c8e8b286 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 22 Jul 2023 01:06:03 -0700 Subject: [PATCH 6309/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/e44edbd7a506957227c58e4b96e0ba2988032b90 https://github.com/facebook/fbthrift/commit/43efc1d16c890625e0f6eb702e5b37564dd82cec https://github.com/facebook/folly/commit/017e42662179411f83eb24c7100b3af7f8a61518 https://github.com/facebook/ocamlrep/commit/586d121b8523455126c80e58ae2582533a2e1809 https://github.com/facebook/proxygen/commit/0f46fa081988855c14bdf087ea4bb02488dfd871 https://github.com/facebook/wangle/commit/3fc424664d1367c9e7a5c945d00e0c9dedd4fa3b https://github.com/facebook/watchman/commit/5c9d40a87e037f28325fbc93ad000a095e632b19 https://github.com/facebookexperimental/edencommon/commit/ad8eef25dc8ad11711e5e77c857a38af9b6aa42e https://github.com/facebookexperimental/rust-shed/commit/4fbb0cda7ecca1356f939a82ae3cfdf1dadaca90 https://github.com/facebookincubator/fizz/commit/53830eeda970163c08e19f9597fb7def3a5d7fb2 https://github.com/facebookincubator/katran/commit/54c8a6398a887a2247e9c8e368bc085875242d7f https://github.com/facebookincubator/mvfst/commit/14a44593a14c7c6307f56fba2c5ad6f633628efa https://github.com/facebookincubator/velox/commit/363833c063052f8be820794b583f3cda786e359a Reviewed By: jailby fbshipit-source-id: c536ff34ad5fb13dc13f0c1052dd12a140a697b8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bda60af83542..92ec07f390f3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b0910f94e7593049b3dec69ba41a1ae0eaff6246 +Subproject commit 43efc1d16c890625e0f6eb702e5b37564dd82cec diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7e2db3fbb99f..269d66cb7455 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9c150e1138f6affe44c22b75b296161565a7e11e +Subproject commit 017e42662179411f83eb24c7100b3af7f8a61518 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7c7ecd42b237..bff86f7f32f5 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 4cf6400dc04291ec53f7a5479907160fea1b2581 +Subproject commit 3fc424664d1367c9e7a5c945d00e0c9dedd4fa3b From 2a0928a44f9e16e3c158ce2276389e21ee76683c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 22 Jul 2023 02:14:36 -0700 Subject: [PATCH 6310/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/2abc92f79e3765dba20de0fa867da90f94b85da7 https://github.com/facebook/fbthrift/commit/ab4f7890dd83e2e513a213c9616b1bf0f3724bc0 https://github.com/facebook/proxygen/commit/a7a0be8c703ad5995887c81b9bb8c3af821658cf https://github.com/facebook/wangle/commit/fcee590cc1130dd1c4b4378ca9815679b6ab712c https://github.com/facebook/watchman/commit/b2f3270b658599190640ff2635dca4f6c8e8b286 https://github.com/facebookexperimental/edencommon/commit/518f2264f4d9feda635980d1b11242fda3767fd0 https://github.com/facebookexperimental/rust-shed/commit/0288ac1569178f31248d570dc83043ed1dc376a8 https://github.com/facebookincubator/fizz/commit/555161037025db59658ae5d0277c4c3e1e49817e https://github.com/facebookincubator/katran/commit/aeef34d53693c10048783f7d5c3b09920f02db03 https://github.com/facebookincubator/mvfst/commit/65f10c816a5b4ac0f874f642427786032d71b62a https://github.com/facebookincubator/velox/commit/a650c1726c5bbd9957ca8326bfbcec8fa8c38aaf Reviewed By: jailby fbshipit-source-id: 41836ef41cd17b3f66b9f02bafd010c5a7b9ed34 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 92ec07f390f3..5d56362e6a5a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 43efc1d16c890625e0f6eb702e5b37564dd82cec +Subproject commit ab4f7890dd83e2e513a213c9616b1bf0f3724bc0 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index bff86f7f32f5..6a4f6dd125e6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3fc424664d1367c9e7a5c945d00e0c9dedd4fa3b +Subproject commit fcee590cc1130dd1c4b4378ca9815679b6ab712c From 9e5f0c151f15e4438fc7676d8ea6fd67c473739d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 23 Jul 2023 02:11:45 -0700 Subject: [PATCH 6311/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ff41a5daa7a147442832d1be18cdf6fd22b747dc https://github.com/facebook/fbthrift/commit/fb3c6ce37aab5aecbb39c827e0ae84256c64a44b https://github.com/facebook/proxygen/commit/738a576dd4d459954f584960f68a74ee6f2e88d3 https://github.com/facebook/wangle/commit/68b1ec08f23196e0ad1dd2dfbb2308c095caf440 https://github.com/facebook/watchman/commit/2a0928a44f9e16e3c158ce2276389e21ee76683c https://github.com/facebookexperimental/rust-shed/commit/fcad8bf6a1a7ed36c17bbd3acaaaa2d0d2449596 https://github.com/facebookincubator/katran/commit/5c43a6ec9e5271bb7e5ee4548b17bbf11c7b641e https://github.com/facebookincubator/mvfst/commit/5cbdeff46a7767c6736e78da1384e42911b7028e Reviewed By: jailby fbshipit-source-id: 71a35f4193d61319a26a9ae87b19d6d3e359d492 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5d56362e6a5a..60e07b7c47b8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ab4f7890dd83e2e513a213c9616b1bf0f3724bc0 +Subproject commit fb3c6ce37aab5aecbb39c827e0ae84256c64a44b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6a4f6dd125e6..65dbdf943791 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit fcee590cc1130dd1c4b4378ca9815679b6ab712c +Subproject commit 68b1ec08f23196e0ad1dd2dfbb2308c095caf440 From c5aa9a1bc77cd23772179fa19e95bcf2190a6c4f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 23 Jul 2023 16:14:12 -0700 Subject: [PATCH 6312/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/68fde05a97028c0108b67f0a1f59ef5fd39ef284 https://github.com/facebook/ocamlrep/commit/1d9cd2a85125365a4d96ad365b6cbc414ebea3bf Reviewed By: jailby fbshipit-source-id: 87cdee76294dbe2f0c549e4483d9c50a2f142f46 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 60e07b7c47b8..2bec6ab8711e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit fb3c6ce37aab5aecbb39c827e0ae84256c64a44b +Subproject commit 68fde05a97028c0108b67f0a1f59ef5fd39ef284 From a37d779c41e339d405632d8bfe617e40ed110de1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 24 Jul 2023 15:01:19 -0700 Subject: [PATCH 6313/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/d0d37e3df26bf46aab119ed84a678f374b206fd2 https://github.com/pytorch/kineto/commit/9af4ea4bb196c8bae882c510dc3680b4d0925be0 Reviewed By: jurajh-fb fbshipit-source-id: 3c2d3f012e143235b45aab8b76f9ce57847dcd14 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2bec6ab8711e..608dd6d68120 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 68fde05a97028c0108b67f0a1f59ef5fd39ef284 +Subproject commit d0d37e3df26bf46aab119ed84a678f374b206fd2 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 269d66cb7455..3d655e1f9949 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 017e42662179411f83eb24c7100b3af7f8a61518 +Subproject commit ba07191dd7c1cb44cfb8975f7b1b914764810f0b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 65dbdf943791..3c3c3b0316e5 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 68b1ec08f23196e0ad1dd2dfbb2308c095caf440 +Subproject commit b87ce35e9b7d44f937d83cabd679bf39d83874f6 From 522972fb79ddb558cb0f7608383dff23bcb7531f Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Mon, 24 Jul 2023 15:59:32 -0700 Subject: [PATCH 6314/7387] break dependency from SharedMutex on SysResource.h Summary: This is the payoff diff for a series of dependency-breaking changes in Folly. After this change, including SharedMutex.h does not include , shaving 4-7 seconds off compilation times on my laptop. Reviewed By: Orvid Differential Revision: D47417705 fbshipit-source-id: 4a536d185e09faed7cbd11e76e95cfa16abaf40b --- watchman/Logging.h | 1 + watchman/scm/Git.cpp | 1 + watchman/scm/Mercurial.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/watchman/Logging.h b/watchman/Logging.h index c159728f671b..5076c8a44d8c 100644 --- a/watchman/Logging.h +++ b/watchman/Logging.h @@ -9,6 +9,7 @@ #include #include +#include // For timeval. Replace this. #include "watchman/PubSub.h" #include "watchman/watchman_preprocessor.h" diff --git a/watchman/scm/Git.cpp b/watchman/scm/Git.cpp index a743bb5a4023..23e2c2766cc6 100644 --- a/watchman/scm/Git.cpp +++ b/watchman/scm/Git.cpp @@ -8,6 +8,7 @@ #include "watchman/scm/Git.h" #include #include +#include #include "watchman/ChildProcess.h" #include "watchman/CommandRegistry.h" #include "watchman/Logging.h" diff --git a/watchman/scm/Mercurial.cpp b/watchman/scm/Mercurial.cpp index e0a01377c35a..3545daa6fa0f 100644 --- a/watchman/scm/Mercurial.cpp +++ b/watchman/scm/Mercurial.cpp @@ -8,6 +8,7 @@ #include "Mercurial.h" #include #include +#include #include #include #include From cc97fe5058e268b1cb57ada918444134dbf622b7 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 24 Jul 2023 16:56:39 -0700 Subject: [PATCH 6315/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5b5a2014b6220aa7d8f3d8aec36ff3ef58692a07 https://github.com/facebook/folly/commit/65f2052bd580d52ddcc8d442d7b84edf29bdef7d https://github.com/facebook/watchman/commit/522972fb79ddb558cb0f7608383dff23bcb7531f https://github.com/facebookincubator/velox/commit/d0790d4dfc37d1f9e59f7d83d25ce6e860624a7b Reviewed By: jurajh-fb fbshipit-source-id: e1fa78985fda375657d0613a4011724ff04b6120 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 608dd6d68120..91cc092e5900 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d0d37e3df26bf46aab119ed84a678f374b206fd2 +Subproject commit 5b5a2014b6220aa7d8f3d8aec36ff3ef58692a07 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 3d655e1f9949..d284460d8dc3 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ba07191dd7c1cb44cfb8975f7b1b914764810f0b +Subproject commit 65f2052bd580d52ddcc8d442d7b84edf29bdef7d From 1f0efed53aae822c9c3971afef0d1faff83081bf Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 25 Jul 2023 19:05:55 -0700 Subject: [PATCH 6316/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/81a25dbb98a104cb938990ef81cb06ea1abc32fe https://github.com/facebook/fb303/commit/998d739fccbfb11cffce3c81706641ac7c38db95 https://github.com/facebook/fbthrift/commit/6b1facf3e01ed0425aef5318d9e52c6914dc5259 https://github.com/facebook/folly/commit/c409a5a381bfb88fe4aafb5270aaf24c8267cf99 https://github.com/facebook/litho/commit/b47a7bc2ddab07f0d5f18e5d8aba07e002db8cd2 https://github.com/facebook/ocamlrep/commit/f18f2a38d6556e91b06edbad7afd86c4863be321 https://github.com/facebook/proxygen/commit/4246f00ff1dd4d489ce6e0764847eec21099296b https://github.com/facebook/wangle/commit/12806fae0158cc259b3e788f4a1caea7df2f690f https://github.com/facebook/watchman/commit/cc97fe5058e268b1cb57ada918444134dbf622b7 https://github.com/facebookexperimental/edencommon/commit/37691d2108bb31b0b13089fb212040d46c739210 https://github.com/facebookexperimental/rust-shed/commit/a1cdb019d5789fee19db04bdc3b7ecabd355b7ae https://github.com/facebookincubator/fizz/commit/c7f8c4509eb90289213daffd9c3e4e132f1431a2 https://github.com/facebookincubator/katran/commit/930620f065f27e7fe39d5b772484bc5147be8e6b https://github.com/facebookincubator/mvfst/commit/0d335aa7ef28666d1f8e7e9db8f5d9d79e757842 https://github.com/facebookincubator/velox/commit/37186fc7904cb59cba6e267e0ec75c1add806062 https://github.com/pytorch/fbgemm/commit/a2b55203e6787214775c641364f3f8dcc45d5bf4 https://github.com/pytorch/kineto/commit/a94f97b666057e91db118249830cf861b1b7bd0b Reviewed By: jurajh-fb fbshipit-source-id: 7be4535c8bc9915d908978e63e8e6b6b7883a57c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 91cc092e5900..6677e3099eff 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5b5a2014b6220aa7d8f3d8aec36ff3ef58692a07 +Subproject commit 6b1facf3e01ed0425aef5318d9e52c6914dc5259 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d284460d8dc3..e7ba14483d9c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 65f2052bd580d52ddcc8d442d7b84edf29bdef7d +Subproject commit c409a5a381bfb88fe4aafb5270aaf24c8267cf99 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3c3c3b0316e5..bc694b35d252 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b87ce35e9b7d44f937d83cabd679bf39d83874f6 +Subproject commit 12806fae0158cc259b3e788f4a1caea7df2f690f From 48947144c91ab240897c6fff9af9fd064a8103b3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 25 Jul 2023 20:22:11 -0700 Subject: [PATCH 6317/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/498206d597fc703c6d29ff7cfb3b44e8c7871cd0 https://github.com/facebook/fb303/commit/283266cb8329b2222a686997a07e3be308e0be40 https://github.com/facebook/fbthrift/commit/8c31d85723dacfe82fd9d3ddf8211bedcac2a87b https://github.com/facebook/ocamlrep/commit/7b9dc358594400bc1782c0bb7b4f68150e03feb2 https://github.com/facebook/proxygen/commit/68272c754cf7f3024d7636e74fdfd1d91ba258e5 https://github.com/facebook/wangle/commit/11e80ee005219a935e70e56983662c68c1189a61 https://github.com/facebook/watchman/commit/1f0efed53aae822c9c3971afef0d1faff83081bf https://github.com/facebookexperimental/edencommon/commit/d6784bc63e88d3260cdb2a1333734cab65aa8c4d https://github.com/facebookexperimental/rust-shed/commit/55f51971f93310ea720d890f3f2ed833ce3bc9ad https://github.com/facebookincubator/fizz/commit/adbe10d031d2c091ccce61a01d6a28bbc191f7e6 https://github.com/facebookincubator/katran/commit/7912330208dac52a5f928f22ed14aec26cd15935 https://github.com/facebookincubator/mvfst/commit/6eef254f2caa7dc714eaddf7374355549c6346f4 https://github.com/facebookincubator/velox/commit/517e3e3a0c8308c96ca068444dfeee37204f7773 Reviewed By: jurajh-fb fbshipit-source-id: 2bd96c359bd1458829820224dd72a4bd28f2fa06 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6677e3099eff..874ff10e8fcf 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6b1facf3e01ed0425aef5318d9e52c6914dc5259 +Subproject commit 8c31d85723dacfe82fd9d3ddf8211bedcac2a87b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index bc694b35d252..ded1831f8089 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 12806fae0158cc259b3e788f4a1caea7df2f690f +Subproject commit 11e80ee005219a935e70e56983662c68c1189a61 From ef15962f5d46d86aa0f94b591d87115069eaf592 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 26 Jul 2023 09:46:46 -0700 Subject: [PATCH 6318/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/d0254f0af28be32985a43159c3dd8156892f140c Reviewed By: jurajh-fb fbshipit-source-id: df460f8952406f8bcdda309550a4199d48109dc3 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e7ba14483d9c..8090f8779ccc 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c409a5a381bfb88fe4aafb5270aaf24c8267cf99 +Subproject commit d0254f0af28be32985a43159c3dd8156892f140c From d46d9908e26c9cb4e9f66ce256369f18c691dbfc Mon Sep 17 00:00:00 2001 From: Facebook Community Bot Date: Fri, 4 Aug 2023 10:38:54 -0700 Subject: [PATCH 6319/7387] Re-sync with internal repository (#1154) Co-authored-by: Facebook Community Bot <6422482+facebook-github-bot@users.noreply.github.com> --- build/fbcode_builder/CMake/FBPythonBinary.cmake | 4 ++-- build/fbcode_builder/CMake/FBThriftCppLibrary.cmake | 2 ++ build/fbcode_builder/CMake/fb_py_test_main.py | 2 +- build/fbcode_builder/getdeps.py | 2 +- build/fbcode_builder/getdeps/builder.py | 2 +- build/fbcode_builder/getdeps/cargo.py | 4 ++-- build/fbcode_builder/getdeps/envfuncs.py | 2 +- build/fbcode_builder/manifests/fbthrift | 1 + watchman/PACKAGE | 3 --- 9 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 watchman/PACKAGE diff --git a/build/fbcode_builder/CMake/FBPythonBinary.cmake b/build/fbcode_builder/CMake/FBPythonBinary.cmake index 99c33fb8c953..f91ebaf32645 100644 --- a/build/fbcode_builder/CMake/FBPythonBinary.cmake +++ b/build/fbcode_builder/CMake/FBPythonBinary.cmake @@ -32,7 +32,7 @@ if(NOT TARGET Python3::Interpreter) # We find with QUIET here, since otherwise this generates some noisy warnings # on versions of CMake before 3.12 if (WIN32) - # On Windows we need both the Intepreter as well as the Development + # On Windows we need both the Interpreter as well as the Development # libraries. find_package(Python3 COMPONENTS Interpreter Development QUIET) else() @@ -487,7 +487,7 @@ function(add_fb_python_library LIB_NAME) # won't complain if one of the dependencies doesn't exist (since it is # intended to allow passing in file names for plain library files rather # than just targets). - # - It ensures that sources for our depencencies are built before any + # - It ensures that sources for our dependencies are built before any # executable that depends on us. Note that we depend on "${dep}.py_lib" # rather than "${dep}.py_sources_built" for this purpose because the # ".py_sources_built" target won't be available for imported targets. diff --git a/build/fbcode_builder/CMake/FBThriftCppLibrary.cmake b/build/fbcode_builder/CMake/FBThriftCppLibrary.cmake index 745053caceaa..7688d80960df 100644 --- a/build/fbcode_builder/CMake/FBThriftCppLibrary.cmake +++ b/build/fbcode_builder/CMake/FBThriftCppLibrary.cmake @@ -151,6 +151,8 @@ function(add_fbthrift_cpp_library LIB_NAME THRIFT_FILE) ${ARG_DEPENDS} FBThrift::thriftcpp2 Folly::folly + mvfst::mvfst_server_async_tran + mvfst::mvfst_server ) # Add ${generated_headers} to the PUBLIC_HEADER property for ${LIB_NAME} diff --git a/build/fbcode_builder/CMake/fb_py_test_main.py b/build/fbcode_builder/CMake/fb_py_test_main.py index e9ae5dd028a6..41626181b1ec 100644 --- a/build/fbcode_builder/CMake/fb_py_test_main.py +++ b/build/fbcode_builder/CMake/fb_py_test_main.py @@ -262,7 +262,7 @@ def stopTest(self, test): super(BuckTestResult, self).stopTest(test) - # If a failure occured during module/class setup, then this "test" may + # If a failure occurred during module/class setup, then this "test" may # actually be a `_ErrorHolder`, which doesn't contain explicit info # about the upcoming test. Since we really only care about the test # name field (i.e. `_testMethodName`), we use that to detect an actual diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 565ef99135e7..9358c425e4aa 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -626,7 +626,7 @@ def run_project_cmd(self, args, loader, manifest): ) builder.build(install_dirs, reconfigure=reconfigure) - # If we are building the project (not depdendency) and a specific + # If we are building the project (not dependency) and a specific # cmake_target (not 'install') has been requested, then we don't # set the built_marker. This allows subsequent runs of getdeps.py # for the project to run with different cmake_targets to trigger diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 4f0c809092f2..aa1b0f99601c 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -346,7 +346,7 @@ def _build(self, install_dirs, reconfigure) -> None: class Iproute2Builder(BuilderBase): # ./configure --prefix does not work for iproute2. - # Thus, explicitly copy sources from src_dir to build_dir, bulid, + # Thus, explicitly copy sources from src_dir to build_dir, build, # and then install to inst_dir using DESTDIR # lastly, also copy include from build_dir to inst_dir def __init__(self, build_opts, ctx, manifest, src_dir, build_dir, inst_dir) -> None: diff --git a/build/fbcode_builder/getdeps/cargo.py b/build/fbcode_builder/getdeps/cargo.py index 64a4e577b33e..09e00a39cf98 100644 --- a/build/fbcode_builder/getdeps/cargo.py +++ b/build/fbcode_builder/getdeps/cargo.py @@ -194,7 +194,7 @@ def _patchup_workspace(self, dep_to_git) -> None: my-rename-of-crate = { package = "crate", git = "..." } they can count themselves lucky because the code will raise an - Exception. There migh be more cases where the code will silently pass + Exception. There might be more cases where the code will silently pass producing bad results. """ workspace_dir = self.workspace_dir() @@ -362,7 +362,7 @@ def _resolve_dep_to_crates(self, build_source_dir, dep_to_git): dep_to_crates = {} - # First populate explicit crate paths from depedencies + # First populate explicit crate paths from dependencies for name, git_conf in dep_to_git.items(): crates = git_conf["crate_source_map"].keys() if crates: diff --git a/build/fbcode_builder/getdeps/envfuncs.py b/build/fbcode_builder/getdeps/envfuncs.py index 6072a69ec4db..60de6b23143e 100644 --- a/build/fbcode_builder/getdeps/envfuncs.py +++ b/build/fbcode_builder/getdeps/envfuncs.py @@ -32,7 +32,7 @@ def _key(self, key): # project uses `unicode_literals`. `subprocess` will raise an error # if the environment that it is passed has a mixture of byte and # unicode strings. - # It is simplest to force everthing to be `str` for the sake of + # It is simplest to force everything to be `str` for the sake of # consistency. key = str(key) if sys.platform.startswith("win"): diff --git a/build/fbcode_builder/manifests/fbthrift b/build/fbcode_builder/manifests/fbthrift index b4ca88315ccb..6b761f127fc6 100644 --- a/build/fbcode_builder/manifests/fbthrift +++ b/build/fbcode_builder/manifests/fbthrift @@ -26,6 +26,7 @@ libsodium python-six wangle zstd +mvfst # Thrift also depends on openssl but since the latter requires a platform- # specific configuration we rely on the folly manifest to provide this # dependency to avoid duplication. diff --git a/watchman/PACKAGE b/watchman/PACKAGE deleted file mode 100644 index 5afaa2b74164..000000000000 --- a/watchman/PACKAGE +++ /dev/null @@ -1,3 +0,0 @@ -load("@fbcode_macros//build_defs:package_local_utils.bzl", "package_local_utils") - -package_local_utils.set_clang_version(15, True) From fa8f7d40ba2348dc648b06f2cea6cb97a77162a0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 26 Jul 2023 12:34:49 -0700 Subject: [PATCH 6320/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/c51cb5780198089ea5997e825f7bf72d249ec8ef https://github.com/facebook/rocksdb/commit/5c2a063c499911eddd276e5b0b484deb9cc4e875 https://github.com/facebookresearch/vrs/commit/525a8bb552e41bfba98d08aefdd835a3455c8cd4 Reviewed By: jurajh-fb fbshipit-source-id: 4dc48b172e55e82eb04b4177a20f8cfd78ce0380 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 874ff10e8fcf..f9510d57b772 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8c31d85723dacfe82fd9d3ddf8211bedcac2a87b +Subproject commit c51cb5780198089ea5997e825f7bf72d249ec8ef From f4287827bbc576d9070eaa6d66fd22d052ff93a7 Mon Sep 17 00:00:00 2001 From: Konstantin Tsoy Date: Wed, 26 Jul 2023 12:49:13 -0700 Subject: [PATCH 6321/7387] Back out "Fix typos discovered by codespell" Summary: Original commit changeset: 337824bc37bc Original Phabricator Diff: D47722462 Reviewed By: jbeshay, terrelln, lnicco Differential Revision: D47801753 fbshipit-source-id: 795ffcccbc2223608e2a707ec2e5bcc7dd974eb3 --- build/fbcode_builder/CMake/FBPythonBinary.cmake | 4 ++-- build/fbcode_builder/CMake/fb_py_test_main.py | 2 +- build/fbcode_builder/getdeps.py | 2 +- build/fbcode_builder/getdeps/builder.py | 2 +- build/fbcode_builder/getdeps/cargo.py | 4 ++-- build/fbcode_builder/getdeps/envfuncs.py | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/fbcode_builder/CMake/FBPythonBinary.cmake b/build/fbcode_builder/CMake/FBPythonBinary.cmake index f91ebaf32645..99c33fb8c953 100644 --- a/build/fbcode_builder/CMake/FBPythonBinary.cmake +++ b/build/fbcode_builder/CMake/FBPythonBinary.cmake @@ -32,7 +32,7 @@ if(NOT TARGET Python3::Interpreter) # We find with QUIET here, since otherwise this generates some noisy warnings # on versions of CMake before 3.12 if (WIN32) - # On Windows we need both the Interpreter as well as the Development + # On Windows we need both the Intepreter as well as the Development # libraries. find_package(Python3 COMPONENTS Interpreter Development QUIET) else() @@ -487,7 +487,7 @@ function(add_fb_python_library LIB_NAME) # won't complain if one of the dependencies doesn't exist (since it is # intended to allow passing in file names for plain library files rather # than just targets). - # - It ensures that sources for our dependencies are built before any + # - It ensures that sources for our depencencies are built before any # executable that depends on us. Note that we depend on "${dep}.py_lib" # rather than "${dep}.py_sources_built" for this purpose because the # ".py_sources_built" target won't be available for imported targets. diff --git a/build/fbcode_builder/CMake/fb_py_test_main.py b/build/fbcode_builder/CMake/fb_py_test_main.py index 41626181b1ec..e9ae5dd028a6 100644 --- a/build/fbcode_builder/CMake/fb_py_test_main.py +++ b/build/fbcode_builder/CMake/fb_py_test_main.py @@ -262,7 +262,7 @@ def stopTest(self, test): super(BuckTestResult, self).stopTest(test) - # If a failure occurred during module/class setup, then this "test" may + # If a failure occured during module/class setup, then this "test" may # actually be a `_ErrorHolder`, which doesn't contain explicit info # about the upcoming test. Since we really only care about the test # name field (i.e. `_testMethodName`), we use that to detect an actual diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 9358c425e4aa..565ef99135e7 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -626,7 +626,7 @@ def run_project_cmd(self, args, loader, manifest): ) builder.build(install_dirs, reconfigure=reconfigure) - # If we are building the project (not dependency) and a specific + # If we are building the project (not depdendency) and a specific # cmake_target (not 'install') has been requested, then we don't # set the built_marker. This allows subsequent runs of getdeps.py # for the project to run with different cmake_targets to trigger diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index aa1b0f99601c..4f0c809092f2 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -346,7 +346,7 @@ def _build(self, install_dirs, reconfigure) -> None: class Iproute2Builder(BuilderBase): # ./configure --prefix does not work for iproute2. - # Thus, explicitly copy sources from src_dir to build_dir, build, + # Thus, explicitly copy sources from src_dir to build_dir, bulid, # and then install to inst_dir using DESTDIR # lastly, also copy include from build_dir to inst_dir def __init__(self, build_opts, ctx, manifest, src_dir, build_dir, inst_dir) -> None: diff --git a/build/fbcode_builder/getdeps/cargo.py b/build/fbcode_builder/getdeps/cargo.py index 09e00a39cf98..64a4e577b33e 100644 --- a/build/fbcode_builder/getdeps/cargo.py +++ b/build/fbcode_builder/getdeps/cargo.py @@ -194,7 +194,7 @@ def _patchup_workspace(self, dep_to_git) -> None: my-rename-of-crate = { package = "crate", git = "..." } they can count themselves lucky because the code will raise an - Exception. There might be more cases where the code will silently pass + Exception. There migh be more cases where the code will silently pass producing bad results. """ workspace_dir = self.workspace_dir() @@ -362,7 +362,7 @@ def _resolve_dep_to_crates(self, build_source_dir, dep_to_git): dep_to_crates = {} - # First populate explicit crate paths from dependencies + # First populate explicit crate paths from depedencies for name, git_conf in dep_to_git.items(): crates = git_conf["crate_source_map"].keys() if crates: diff --git a/build/fbcode_builder/getdeps/envfuncs.py b/build/fbcode_builder/getdeps/envfuncs.py index 60de6b23143e..6072a69ec4db 100644 --- a/build/fbcode_builder/getdeps/envfuncs.py +++ b/build/fbcode_builder/getdeps/envfuncs.py @@ -32,7 +32,7 @@ def _key(self, key): # project uses `unicode_literals`. `subprocess` will raise an error # if the environment that it is passed has a mixture of byte and # unicode strings. - # It is simplest to force everything to be `str` for the sake of + # It is simplest to force everthing to be `str` for the sake of # consistency. key = str(key) if sys.platform.startswith("win"): From d7ea7e15086955e0807ed0981548775d9109df2b Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 26 Jul 2023 17:10:41 -0700 Subject: [PATCH 6322/7387] Fix typos discovered by codespell Summary: `codespell --ignore-words-list=arithmetics,atleast,crate,crated,deriver,ect,hel,onl,startin,whats --skip="*.lock"` * https://pypi.org/project/codespell X-link: https://github.com/facebookincubator/mvfst/pull/307 Reviewed By: hanidamlaj, lnicco Differential Revision: D47809078 Pulled By: kvtsoy fbshipit-source-id: 566557f2389746db541ff265a5dec8d6404b3701 --- build/fbcode_builder/CMake/FBPythonBinary.cmake | 4 ++-- build/fbcode_builder/CMake/fb_py_test_main.py | 2 +- build/fbcode_builder/getdeps.py | 2 +- build/fbcode_builder/getdeps/builder.py | 2 +- build/fbcode_builder/getdeps/cargo.py | 4 ++-- build/fbcode_builder/getdeps/envfuncs.py | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/fbcode_builder/CMake/FBPythonBinary.cmake b/build/fbcode_builder/CMake/FBPythonBinary.cmake index 99c33fb8c953..f91ebaf32645 100644 --- a/build/fbcode_builder/CMake/FBPythonBinary.cmake +++ b/build/fbcode_builder/CMake/FBPythonBinary.cmake @@ -32,7 +32,7 @@ if(NOT TARGET Python3::Interpreter) # We find with QUIET here, since otherwise this generates some noisy warnings # on versions of CMake before 3.12 if (WIN32) - # On Windows we need both the Intepreter as well as the Development + # On Windows we need both the Interpreter as well as the Development # libraries. find_package(Python3 COMPONENTS Interpreter Development QUIET) else() @@ -487,7 +487,7 @@ function(add_fb_python_library LIB_NAME) # won't complain if one of the dependencies doesn't exist (since it is # intended to allow passing in file names for plain library files rather # than just targets). - # - It ensures that sources for our depencencies are built before any + # - It ensures that sources for our dependencies are built before any # executable that depends on us. Note that we depend on "${dep}.py_lib" # rather than "${dep}.py_sources_built" for this purpose because the # ".py_sources_built" target won't be available for imported targets. diff --git a/build/fbcode_builder/CMake/fb_py_test_main.py b/build/fbcode_builder/CMake/fb_py_test_main.py index e9ae5dd028a6..41626181b1ec 100644 --- a/build/fbcode_builder/CMake/fb_py_test_main.py +++ b/build/fbcode_builder/CMake/fb_py_test_main.py @@ -262,7 +262,7 @@ def stopTest(self, test): super(BuckTestResult, self).stopTest(test) - # If a failure occured during module/class setup, then this "test" may + # If a failure occurred during module/class setup, then this "test" may # actually be a `_ErrorHolder`, which doesn't contain explicit info # about the upcoming test. Since we really only care about the test # name field (i.e. `_testMethodName`), we use that to detect an actual diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 565ef99135e7..9358c425e4aa 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -626,7 +626,7 @@ def run_project_cmd(self, args, loader, manifest): ) builder.build(install_dirs, reconfigure=reconfigure) - # If we are building the project (not depdendency) and a specific + # If we are building the project (not dependency) and a specific # cmake_target (not 'install') has been requested, then we don't # set the built_marker. This allows subsequent runs of getdeps.py # for the project to run with different cmake_targets to trigger diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 4f0c809092f2..aa1b0f99601c 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -346,7 +346,7 @@ def _build(self, install_dirs, reconfigure) -> None: class Iproute2Builder(BuilderBase): # ./configure --prefix does not work for iproute2. - # Thus, explicitly copy sources from src_dir to build_dir, bulid, + # Thus, explicitly copy sources from src_dir to build_dir, build, # and then install to inst_dir using DESTDIR # lastly, also copy include from build_dir to inst_dir def __init__(self, build_opts, ctx, manifest, src_dir, build_dir, inst_dir) -> None: diff --git a/build/fbcode_builder/getdeps/cargo.py b/build/fbcode_builder/getdeps/cargo.py index 64a4e577b33e..09e00a39cf98 100644 --- a/build/fbcode_builder/getdeps/cargo.py +++ b/build/fbcode_builder/getdeps/cargo.py @@ -194,7 +194,7 @@ def _patchup_workspace(self, dep_to_git) -> None: my-rename-of-crate = { package = "crate", git = "..." } they can count themselves lucky because the code will raise an - Exception. There migh be more cases where the code will silently pass + Exception. There might be more cases where the code will silently pass producing bad results. """ workspace_dir = self.workspace_dir() @@ -362,7 +362,7 @@ def _resolve_dep_to_crates(self, build_source_dir, dep_to_git): dep_to_crates = {} - # First populate explicit crate paths from depedencies + # First populate explicit crate paths from dependencies for name, git_conf in dep_to_git.items(): crates = git_conf["crate_source_map"].keys() if crates: diff --git a/build/fbcode_builder/getdeps/envfuncs.py b/build/fbcode_builder/getdeps/envfuncs.py index 6072a69ec4db..60de6b23143e 100644 --- a/build/fbcode_builder/getdeps/envfuncs.py +++ b/build/fbcode_builder/getdeps/envfuncs.py @@ -32,7 +32,7 @@ def _key(self, key): # project uses `unicode_literals`. `subprocess` will raise an error # if the environment that it is passed has a mixture of byte and # unicode strings. - # It is simplest to force everthing to be `str` for the sake of + # It is simplest to force everything to be `str` for the sake of # consistency. key = str(key) if sys.platform.startswith("win"): From 442af30a21d265d57adc2ad8ee59d4b32e9f1736 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Wed, 26 Jul 2023 21:23:58 -0700 Subject: [PATCH 6323/7387] Update serde from 1.0.167 to 1.0.176 Reviewed By: quark-zju Differential Revision: D47811862 fbshipit-source-id: 03cefc52f3d024a2d0fb5580bed079ff2b4651e0 --- watchman/cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index 6dc7878c71fb..d2c7dc97a1fb 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -11,7 +11,7 @@ ahash = "0.8" anyhow = "1.0.71" duct = "0.13.6" jwalk = "0.6" -serde = { version = "1.0.167", features = ["derive", "rc"] } +serde = { version = "1.0.176", features = ["derive", "rc"] } serde_json = { version = "1.0.100", features = ["float_roundtrip", "unbounded_depth"] } structopt = "0.3.23" sysinfo = "0.26.8" From 23a0cb5b1e60356b8855839c6d7d47dae8026bf4 Mon Sep 17 00:00:00 2001 From: Srikrishna Gopu Date: Fri, 28 Jul 2023 10:40:59 -0700 Subject: [PATCH 6324/7387] move sai fake to sai 1.12.0 Summary: X-link: https://github.com/facebook/fboss/pull/147 As titled, move sai fake sai to 1.12.0. BCM and TAJO P4 WB SDK already moved to 1.12.0 and its good to move fake also to the same version. This diff addresses: - Moving SAI version for fake from sai version 1.7 to 1.12 - Update sandcastle job to build the fake sai 1.12 - saiobject.h includes experimental header files as part of SAI 1.12 and hence the include path has to contain both sai/include and sai/experimental. Currently, vendors leverage the experimental header files differently (by placing include and experimental in the same include dir) than SAI spec but eventually we will have vendors also converge to the same model. Changing it now will break BCM builds. - Ignore including Saiversion.h in OSS since 1.12 contains saiversion.h already and defines SAI_VERSION and SAI_API_VERSION macros. NOTE that this should not alter BCM OSS builds. Reviewed By: shri-khare Differential Revision: D47779384 fbshipit-source-id: ba10a35dd95306c908c5cd3f76a1485461b011d7 --- build/fbcode_builder/manifests/libsai | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/manifests/libsai b/build/fbcode_builder/manifests/libsai index 4f422d8e15f6..d127f903e5a8 100644 --- a/build/fbcode_builder/manifests/libsai +++ b/build/fbcode_builder/manifests/libsai @@ -2,12 +2,13 @@ name = libsai [download] -url = https://github.com/opencomputeproject/SAI/archive/v1.7.1.tar.gz -sha256 = e18eb1a2a6e5dd286d97e13569d8b78cc1f8229030beed0db4775b9a50ab6a83 +url = https://github.com/opencomputeproject/SAI/archive/v1.12.0.tar.gz +sha256 = 1e7f43599baf1dcca122bbbb2baaeb9b20e5632d2ca6aaa61a568d1d58afaa97 [build] builder = nop -subdir = SAI-1.7.1 +subdir = SAI-1.12.0 [install.files] inc = include +experimental = experimental From 6a99899e1d8d1a652760089642ac0eab5b17a3d9 Mon Sep 17 00:00:00 2001 From: Srikrishna Gopu Date: Fri, 28 Jul 2023 10:40:59 -0700 Subject: [PATCH 6325/7387] kill openNSA builder Summary: X-link: https://github.com/facebook/fb303/pull/38 As titled, kill open NSA buidler from sandcastle getdeps Reviewed By: shri-khare Differential Revision: D47541677 fbshipit-source-id: 4621150a8accd04a9c8bef77b3d0cdaf9b5c3d0a --- build/fbcode_builder/getdeps/builder.py | 20 -------------------- build/fbcode_builder/getdeps/manifest.py | 4 ---- 2 files changed, 24 deletions(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index aa1b0f99601c..e1fae8e0f033 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -1125,26 +1125,6 @@ def build(self, install_dirs, reconfigure: bool) -> None: shutil.copytree(self.src_dir, self.inst_dir) -class OpenNSABuilder(NopBuilder): - # OpenNSA libraries are stored with git LFS. As a result, fetcher fetches - # LFS pointers and not the contents. Use git-lfs to pull the real contents - # before copying to install dir using NoopBuilder. - # In future, if more builders require git-lfs, we would consider installing - # git-lfs as part of the sandcastle infra as against repeating similar - # logic for each builder that requires git-lfs. - def __init__(self, build_opts, ctx, manifest, src_dir, inst_dir) -> None: - super(OpenNSABuilder, self).__init__( - build_opts, ctx, manifest, src_dir, inst_dir - ) - - def build(self, install_dirs, reconfigure: bool) -> None: - env = self._compute_env(install_dirs) - self._run_cmd(["git", "lfs", "install", "--local"], cwd=self.src_dir, env=env) - self._run_cmd(["git", "lfs", "pull"], cwd=self.src_dir, env=env) - - super(OpenNSABuilder, self).build(install_dirs, reconfigure) - - class SqliteBuilder(BuilderBase): def __init__(self, build_opts, ctx, manifest, src_dir, build_dir, inst_dir) -> None: super(SqliteBuilder, self).__init__( diff --git a/build/fbcode_builder/getdeps/manifest.py b/build/fbcode_builder/getdeps/manifest.py index 4c0e191b59f2..7ef984b33a70 100644 --- a/build/fbcode_builder/getdeps/manifest.py +++ b/build/fbcode_builder/getdeps/manifest.py @@ -17,7 +17,6 @@ MakeBuilder, NinjaBootstrap, NopBuilder, - OpenNSABuilder, OpenSSLBuilder, SqliteBuilder, ) @@ -581,9 +580,6 @@ def create_builder( # noqa:C901 build_options, ctx, src_dir, build_dir, inst_dir, loader ) - if builder == "OpenNSA": - return OpenNSABuilder(build_options, ctx, self, src_dir, inst_dir) - raise KeyError("project %s has no known builder" % (self.name)) def create_prepare_builders( From d6045d9bdecb4e3fb0c2257ab1483dd178496284 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 4 Aug 2023 14:53:31 -0700 Subject: [PATCH 6326/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/d086981d798def9870e559efc39f70fdd803e46b https://github.com/facebook/fb303/commit/a5624f35533f6b30ce2def5001cc85c2bb6c7d5e https://github.com/facebook/fbthrift/commit/f8e3e0077a4e7b3c26374852c7b5a189f7776316 https://github.com/facebook/folly/commit/015c667b1af971fb9d7ab6e0ab690d2a71d02de6 https://github.com/facebook/litho/commit/1522bafd2d3ea32bd0589f35f53fb6e6a24acb07 https://github.com/facebook/mcrouter/commit/d6850afb3f32dd42e2b1936f0347158cdcee75e9 https://github.com/facebook/mvfst/commit/95910bdf200ab113ffa10a3612fce49a1c0e2a13 https://github.com/facebook/ocamlrep/commit/1e602d346b5273111c0c86b41e6464bb703ea9d7 https://github.com/facebook/proxygen/commit/6eb64ccf65ba378bb34c63e215072d4edbfeb490 https://github.com/facebook/rocksdb/commit/09882a52d6d42d22e35475360eb5ae4356d3f3f6 https://github.com/facebook/squangle/commit/e2828bd3d0d82fa31264ff6794c549888ef7f4d3 https://github.com/facebook/wangle/commit/cf946ba1912ca83b1ac868c94166e4bf787cd512 https://github.com/facebook/watchman/commit/6a99899e1d8d1a652760089642ac0eab5b17a3d9 https://github.com/facebookexperimental/edencommon/commit/ff6df2853b40c5504cba299209c516128def1c8e https://github.com/facebookexperimental/rust-shed/commit/0d9f87662e8d50257f35f432f4fe8f185445741f https://github.com/facebookincubator/conversionsapi-tag-for-googletagmanager/commit/57d6c58acc79ee6af6c9d9de0baf867752870c50 https://github.com/facebookincubator/fizz/commit/56bdf15178b9a9c84ebdc8c42cf00bd07251afbe https://github.com/facebookincubator/katran/commit/8a51fb6fe0dc10f80f34eb5855a679c43ab62f16 https://github.com/facebookincubator/velox/commit/a30531e955ce3b47d7c427a8417969990e43ad3a https://github.com/facebookresearch/flsim/commit/89b5c16b1febd5efaa5818a13d06339f9e3bbcd9 https://github.com/facebookresearch/multimodal/commit/81e281cd3fe34802dd983841be907b4675dc559c https://github.com/facebookresearch/recipes/commit/247ad5cf38c9073e2b751455a36540581c4dcb49 https://github.com/facebookresearch/vrs/commit/e8ef307247d4c4ee7f736672b7419f6fd5340396 https://github.com/pytorch/fbgemm/commit/eb64159d9206c2a57c43185b53fa02c71c8ca4f6 https://github.com/pytorch/kineto/commit/8d4234cc1f32f3874c2b30928bd2086e3cb5778a Reviewed By: bigfootjon fbshipit-source-id: e6d53ebddb6f4e9d25ba3e00db052673ca453fa4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f9510d57b772..e3243972c734 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c51cb5780198089ea5997e825f7bf72d249ec8ef +Subproject commit f8e3e0077a4e7b3c26374852c7b5a189f7776316 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8090f8779ccc..b39a8390be9d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d0254f0af28be32985a43159c3dd8156892f140c +Subproject commit 015c667b1af971fb9d7ab6e0ab690d2a71d02de6 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ded1831f8089..3db4b9826fa3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 11e80ee005219a935e70e56983662c68c1189a61 +Subproject commit cf946ba1912ca83b1ac868c94166e4bf787cd512 From 627b4c5181857dc654d050a874e3ea403e163a6e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 5 Aug 2023 01:00:22 -0700 Subject: [PATCH 6327/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5aa3271b6aa9fb0d9521bf7729e2a5cfd4a01cb1 Reviewed By: bigfootjon fbshipit-source-id: 856c8966a36341d6602b9674fde68bb5a67ac5b5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e3243972c734..3655daade380 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f8e3e0077a4e7b3c26374852c7b5a189f7776316 +Subproject commit 5aa3271b6aa9fb0d9521bf7729e2a5cfd4a01cb1 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b39a8390be9d..1acba64b077a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 015c667b1af971fb9d7ab6e0ab690d2a71d02de6 +Subproject commit e9e2c3f5ae87aa02b3740c935296efddecefd18f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3db4b9826fa3..4cc066ce37d6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit cf946ba1912ca83b1ac868c94166e4bf787cd512 +Subproject commit 57838eac77b5ae34ac3b52f37665c91d883f4878 From f864947b3d02e44b9f473f9e7525d1750846b212 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 5 Aug 2023 17:12:56 -0700 Subject: [PATCH 6328/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/556a8ac12f97177b0a0eab30f2b1902780dd5390 https://github.com/facebook/mvfst/commit/5a1568ef6136f2546f4f2c235c7a6a81164d5689 https://github.com/facebook/proxygen/commit/c57784f439cb19c166adae44b8e28e8c06399274 https://github.com/facebook/wangle/commit/0d91202f64be9696aa66265d37715267e2a35a7d https://github.com/facebookincubator/katran/commit/e7b639a15c099864e28796611e0b039eb43ee595 Reviewed By: bigfootjon fbshipit-source-id: 0d08f89051a7a69cb1598d98d91389b12acc06a7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3655daade380..5578eabd61a1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5aa3271b6aa9fb0d9521bf7729e2a5cfd4a01cb1 +Subproject commit 556a8ac12f97177b0a0eab30f2b1902780dd5390 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4cc066ce37d6..b3bc6840fdb6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 57838eac77b5ae34ac3b52f37665c91d883f4878 +Subproject commit 0d91202f64be9696aa66265d37715267e2a35a7d From 3a534b44c70e1ad4411722be3402d4c235214928 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 6 Aug 2023 08:37:15 -0700 Subject: [PATCH 6329/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/d03f7c740cacf9184e8741f7e559dde7e2cd3ba4 Reviewed By: bigfootjon fbshipit-source-id: dd1353a3f16d519d02b22e0a9712625c3ec5c271 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5578eabd61a1..8bf22b8a796c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 556a8ac12f97177b0a0eab30f2b1902780dd5390 +Subproject commit d03f7c740cacf9184e8741f7e559dde7e2cd3ba4 From d52543bb74404e86687cd7fcb1f684acc1e81618 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 7 Aug 2023 07:44:51 -0700 Subject: [PATCH 6330/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7df7542f5712b3c2f31d033b9c108dddfb2ebfd2 https://github.com/facebook/litho/commit/cec5503207a72f6250ce904c1dfc171b3c90e473 https://github.com/facebook/mvfst/commit/3f2001b6515b30060789401a841ec58a2ded3024 https://github.com/facebook/proxygen/commit/2a89bb23b3c460f541b49f8167c99a76932127b9 https://github.com/facebook/wangle/commit/484766320b7a7ceae5558d616ab34f6dffd45f6f https://github.com/facebookexperimental/edencommon/commit/e210c1e9489d30b72106733cf290f4a2bf544407 https://github.com/facebookincubator/fizz/commit/be7c88a56910276cd6215882e95fea67bbcbc319 https://github.com/facebookincubator/katran/commit/f035824853ede4177ec93ab63708960fb1e5fe67 https://github.com/facebookincubator/velox/commit/fa0e930a1d904bdab76f822358d72d7dfc160642 Reviewed By: bigfootjon fbshipit-source-id: 4fba3608151d6c95f47174bfb4114dcf487abc6a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8bf22b8a796c..ec6b53e77bc3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d03f7c740cacf9184e8741f7e559dde7e2cd3ba4 +Subproject commit 7df7542f5712b3c2f31d033b9c108dddfb2ebfd2 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 1acba64b077a..6d374df759c7 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e9e2c3f5ae87aa02b3740c935296efddecefd18f +Subproject commit 0c113c0e45438776974dd1b43a5e320fe8812aed diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b3bc6840fdb6..18b0bfcd2132 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0d91202f64be9696aa66265d37715267e2a35a7d +Subproject commit 484766320b7a7ceae5558d616ab34f6dffd45f6f From 4de324cd532cf2809e4c51ae6d3e0eca9bebf7d3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 7 Aug 2023 15:25:21 -0700 Subject: [PATCH 6331/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/3e248cac6448f4d1b72ed5e24f9b3c7173cecc3e https://github.com/facebook/ocamlrep/commit/ed3d3041bac756a31c34f44b655f56cba71b1c42 Reviewed By: jailby fbshipit-source-id: fc84b3c5c410a05371e4369a229c6b7bf96fe0b9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ec6b53e77bc3..73681d3a73a1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7df7542f5712b3c2f31d033b9c108dddfb2ebfd2 +Subproject commit 3e248cac6448f4d1b72ed5e24f9b3c7173cecc3e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6d374df759c7..48d3a7994b9e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0c113c0e45438776974dd1b43a5e320fe8812aed +Subproject commit 81d5aeb4e720a6423aaae46bebac780ebb4a1b43 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 18b0bfcd2132..8200cc9807d0 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 484766320b7a7ceae5558d616ab34f6dffd45f6f +Subproject commit 28c6fba9162797474cea28edf39dcef02cabe5b3 From f85b90f911d092ad8992ca4595e42b3889ca1490 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 8 Aug 2023 04:54:56 -0700 Subject: [PATCH 6332/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/bdf14106b2dffd90211f65c4881a3b5ea8dc2254 https://github.com/facebook/litho/commit/8da7459181e036281ca3b7e47414796a2817266a https://github.com/facebook/ocamlrep/commit/bef3a31872b7b7e8bd1a445e5a41ac6687cf8e41 https://github.com/facebook/rocksdb/commit/99daea3481575a269f94c78da2bafc0c77e2608c https://github.com/facebookincubator/fizz/commit/987eca081be1564a65daf559452e8a4586f9d6fd https://github.com/facebookincubator/superconsole/commit/3558c0a9ae45cac817b2868350053767a25b2f27 https://github.com/facebookincubator/velox/commit/4b653edf45cf4dafec8ef7d79e1a39063a0e6dce https://github.com/pytorch/fbgemm/commit/fd0ec6d1aa1e4cc4a6314da6547cdf8807646dcf https://github.com/pytorch/kineto/commit/f6c845edc2ca265791381d82e84364afd0ae53bf Reviewed By: jailby fbshipit-source-id: 13190e6f521f96ace7b21ddd424c966024e6bf98 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 73681d3a73a1..0a8aec0334c0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3e248cac6448f4d1b72ed5e24f9b3c7173cecc3e +Subproject commit bdf14106b2dffd90211f65c4881a3b5ea8dc2254 From 855cb7d399ebf259b63d3933df9ae708e8b3f0a1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 8 Aug 2023 13:24:00 -0700 Subject: [PATCH 6333/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/a5597dbc85edc092a04c22c3458b25b45a3ca349 https://github.com/facebook/litho/commit/e3929e11094eec99054ab565a0ee86506790f435 https://github.com/facebook/ocamlrep/commit/051366488567e916ef8cc04ae19736a1cbe1469d https://github.com/facebook/rocksdb/commit/9c2ebcc2c365bb89af566b3076f813d7bf11146b Reviewed By: jailby fbshipit-source-id: f729f1ed70ff81220e821a5af2a8ab40acaf6c73 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0a8aec0334c0..b2e1a5fed7d8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bdf14106b2dffd90211f65c4881a3b5ea8dc2254 +Subproject commit a5597dbc85edc092a04c22c3458b25b45a3ca349 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8200cc9807d0..a0936f2fb93d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 28c6fba9162797474cea28edf39dcef02cabe5b3 +Subproject commit 46aa0c683d8b348789d2122343b76a398003b610 From ccc63a1f804efeede8a019c75a39f5930b75723d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 8 Aug 2023 14:17:56 -0700 Subject: [PATCH 6334/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/1ed408de0363e44fb466599a55b3aa60e59016e6 https://github.com/facebook/folly/commit/c52d4490bf1e0cf117a71342b427984f9ffc316e https://github.com/facebook/litho/commit/0422d4e122ba6087db15ab7b9887711dfcfd5dc0 https://github.com/facebook/mvfst/commit/0c73763e5e9e916209f5b1e49aaf220b3d0c2196 https://github.com/pytorch/fbgemm/commit/79c159b5b8f110f87feab52194b1c78b41bb587e Reviewed By: jailby fbshipit-source-id: 3efaf4be086af07f156042330555019897f386bc --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b2e1a5fed7d8..f85d963c8dcc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a5597dbc85edc092a04c22c3458b25b45a3ca349 +Subproject commit 1ed408de0363e44fb466599a55b3aa60e59016e6 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 48d3a7994b9e..815934fe00c5 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 81d5aeb4e720a6423aaae46bebac780ebb4a1b43 +Subproject commit c52d4490bf1e0cf117a71342b427984f9ffc316e From 77084a2a3685dd1f61ddd11c4b0938d3a9a2e3c5 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 8 Aug 2023 21:48:45 -0700 Subject: [PATCH 6335/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/c343aed195ca7208765a55460f41b3ad9176c913 https://github.com/facebookincubator/velox/commit/be43f800c31ee5ad16d857b11749d37c72be9532 Reviewed By: jailby fbshipit-source-id: 752eb913049b31a7ca9f58d4691a09167035d408 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f85d963c8dcc..5d1123e6c375 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1ed408de0363e44fb466599a55b3aa60e59016e6 +Subproject commit c343aed195ca7208765a55460f41b3ad9176c913 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 815934fe00c5..517f90a60a11 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c52d4490bf1e0cf117a71342b427984f9ffc316e +Subproject commit 50b3142b79a5eb8ab3be29b9089e1138b397c31e From 0c143d988d715733e549ec6e5d8ced43bec98de8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 9 Aug 2023 05:19:51 -0700 Subject: [PATCH 6336/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/f42e377c4de695f967d3c73554782fe02bf9f641 https://github.com/facebook/litho/commit/b257240583c790bb43302ae1e718aa4f96d58b34 https://github.com/facebook/ocamlrep/commit/710424ccea952e29f002773b7e9b5c78e87cfb58 https://github.com/facebookincubator/velox/commit/271dbdab7aa191de727050fb1dc044444b6255e9 Reviewed By: jailby fbshipit-source-id: 5e97c5af53188fd00d132ce45a78327059e8ee5c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5d1123e6c375..729698c05033 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c343aed195ca7208765a55460f41b3ad9176c913 +Subproject commit f42e377c4de695f967d3c73554782fe02bf9f641 From 5d98bc314b492006f92709e2fb7a59441a22cda9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 9 Aug 2023 06:30:10 -0700 Subject: [PATCH 6337/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/6dd4626f6f9ccb09906f41626fed0e8dc69500f9 https://github.com/facebook/fb303/commit/c47aadd5e5e893b1414bed2b545e22b224872d9a https://github.com/facebook/ocamlrep/commit/7cc378e288f90538a1bbaf0a52c1bbf5a844f543 https://github.com/facebook/wangle/commit/503693806f3b0dca14c36dc1e004918d121cf15f https://github.com/facebook/watchman/commit/0c143d988d715733e549ec6e5d8ced43bec98de8 https://github.com/facebookexperimental/rust-shed/commit/4af60d1103bba500284e28899db6e496a4c33717 Reviewed By: jailby fbshipit-source-id: d8c425e086bc2d361aa08c00345eac8db88a42e7 --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a0936f2fb93d..c15747e7e614 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 46aa0c683d8b348789d2122343b76a398003b610 +Subproject commit 503693806f3b0dca14c36dc1e004918d121cf15f From 6e3596b117f863916d0628de257a45a40665edf0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 9 Aug 2023 08:11:41 -0700 Subject: [PATCH 6338/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7ca97f87f97d0bf2a4952772fad95b3cf69ea2b1 https://github.com/facebook/ocamlrep/commit/d51c3c9edc64ee715bedde00082ef6413d052a23 Reviewed By: jailby fbshipit-source-id: ec782dbde3b9076a426d5a4f82423ae47e0174bd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 729698c05033..3c9f50c6c77c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f42e377c4de695f967d3c73554782fe02bf9f641 +Subproject commit 7ca97f87f97d0bf2a4952772fad95b3cf69ea2b1 From 9a6707e5d9ed699c3f1590e7a70b570e23720110 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 9 Aug 2023 11:57:24 -0700 Subject: [PATCH 6339/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/4095d19b70e5bab4c1ab49ee92dc05c184b9713a https://github.com/facebookincubator/velox/commit/84f8551c4fc0e10fdbaaf3a0049e83d2bf097457 Reviewed By: jailby fbshipit-source-id: 93a52e3148f4d09f4ba26b874cbe475ce97b2063 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3c9f50c6c77c..937034a7205f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7ca97f87f97d0bf2a4952772fad95b3cf69ea2b1 +Subproject commit 4095d19b70e5bab4c1ab49ee92dc05c184b9713a From dcecd8d788bc81b63f2a4c2bf0490f501c3cc1ed Mon Sep 17 00:00:00 2001 From: Nick Terrell Date: Wed, 9 Aug 2023 12:31:34 -0700 Subject: [PATCH 6340/7387] Update zstd to the latest release Summary: X-link: https://github.com/facebookincubator/velox/pull/6047 X-link: https://github.com/facebook/folly/pull/2053 X-link: https://github.com/facebookincubator/zstrong/pull/546 1.4.5 is many years old, update the the latest release when we build zstd. Reviewed By: chadaustin, Cyan4973 Differential Revision: D48172737 fbshipit-source-id: 773641160c8eb0f5fa01237245b97be199fd97f4 --- build/fbcode_builder/manifests/zstd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/manifests/zstd b/build/fbcode_builder/manifests/zstd index ebfe8c6069cd..18484f4b1ed1 100644 --- a/build/fbcode_builder/manifests/zstd +++ b/build/fbcode_builder/manifests/zstd @@ -13,12 +13,12 @@ libzstd-devel libzstd [download] -url = https://github.com/facebook/zstd/releases/download/v1.4.5/zstd-1.4.5.tar.gz -sha256 = 98e91c7c6bf162bf90e4e70fdbc41a8188b9fa8de5ad840c401198014406ce9e +url = https://github.com/facebook/zstd/releases/download/v1.5.5/zstd-1.5.5.tar.gz +sha256 = 9c4396cc829cfae319a6e2615202e82aad41372073482fce286fac78646d3ee4 [build] builder = cmake -subdir = zstd-1.4.5/build/cmake +subdir = zstd-1.5.5/build/cmake # The zstd cmake build explicitly sets the install name # for the shared library in such a way that cmake discards From 8ae287fb0db7853eb19c4e28893b47607c377420 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 9 Aug 2023 13:56:59 -0700 Subject: [PATCH 6341/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/f85d701ad5598d5d01691fd0ee0666e2db67c33f https://github.com/facebook/fbthrift/commit/c5105c1bd0e043eda41f1a784d2c142ac07c88a5 https://github.com/facebook/folly/commit/11d11e2dd1b8fbfd2749d0f7a6bda1fb13df4e34 https://github.com/facebook/mvfst/commit/8c485bb00bb659892e9334822b032b279dd46b8d https://github.com/facebook/ocamlrep/commit/69a753b8b6d2f8d8071aa8850070b81f432c258f https://github.com/facebook/proxygen/commit/a1ada43685d92285c55a265ba60a8c9f698b0bc8 https://github.com/facebook/wangle/commit/4e6510009038756cc98cc519fac270545002789f https://github.com/facebook/watchman/commit/dcecd8d788bc81b63f2a4c2bf0490f501c3cc1ed https://github.com/facebookexperimental/edencommon/commit/2cff027e1f125f1c422f66fa7912dd4bf108ae5b https://github.com/facebookexperimental/rust-shed/commit/d7ba2854b04fe4a3d1bc0a285fd19c6f6641f427 https://github.com/facebookincubator/fizz/commit/0fa15d623a280fd38d0aa6228bf5bc0ba737a7ab https://github.com/facebookincubator/katran/commit/69c381bb5636de8ed2622ac49963e95641674512 https://github.com/facebookincubator/velox/commit/d17fafd374a6ba82c4d12de65f3f49774553822c Reviewed By: jailby fbshipit-source-id: 000fc88b622dd929765850349cdf03b31d31d614 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 937034a7205f..8a0c76ec27ca 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4095d19b70e5bab4c1ab49ee92dc05c184b9713a +Subproject commit c5105c1bd0e043eda41f1a784d2c142ac07c88a5 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 517f90a60a11..be562ee2b95d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 50b3142b79a5eb8ab3be29b9089e1138b397c31e +Subproject commit 11d11e2dd1b8fbfd2749d0f7a6bda1fb13df4e34 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c15747e7e614..6105d6721536 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 503693806f3b0dca14c36dc1e004918d121cf15f +Subproject commit 4e6510009038756cc98cc519fac270545002789f From bfb1d0a54f51c52f40492cb970fb4c93c73e809f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 9 Aug 2023 16:14:38 -0700 Subject: [PATCH 6342/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/90ea2da5dee55e308e5d0b265bc0426d9a93bf43 https://github.com/facebook/litho/commit/6961e42617cdf52ee08a1cf12e22216e46c35002 https://github.com/facebook/ocamlrep/commit/eb73c44a9c6cbf2144ed2b8aac751ed23398c24d https://github.com/facebookincubator/fizz/commit/a5f718aecef5145845af61f792e6e17dbf0627bd https://github.com/facebookincubator/velox/commit/14ed4621afed95f7f40bb7ce298bbe5557c07740 Reviewed By: jailby fbshipit-source-id: 29e7bbb5b5bd462c2cfa245715dc8f6c862a17fe --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8a0c76ec27ca..e0384c3232b8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c5105c1bd0e043eda41f1a784d2c142ac07c88a5 +Subproject commit 90ea2da5dee55e308e5d0b265bc0426d9a93bf43 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6105d6721536..a1f3f773fc39 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 4e6510009038756cc98cc519fac270545002789f +Subproject commit c36e331c03937a1ad9a2804bda43a10efc8da5db From d22396a49bfb612b80bd44afe01e479b9d4c5e85 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 9 Aug 2023 18:19:48 -0700 Subject: [PATCH 6343/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/e4ad914419d95b3dcdee5d238cc3420b071501a5 https://github.com/pytorch/fbgemm/commit/5b95eb01843503de1e8872c84e4caa5c21f3be1c Reviewed By: jailby fbshipit-source-id: 87ee6414a38fa2d6aa3c73d6627595fd7f933239 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index be562ee2b95d..d180e0af20b1 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 11d11e2dd1b8fbfd2749d0f7a6bda1fb13df4e34 +Subproject commit e4ad914419d95b3dcdee5d238cc3420b071501a5 From 1888b762d64a8e486c33379f2a84debce7b69092 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 10 Aug 2023 08:06:59 -0700 Subject: [PATCH 6344/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/bb365a6ffe5d8da17be09c61d0d81073c5b8a033 https://github.com/facebook/ocamlrep/commit/439d1257a0fe648d050d2116e9b6d7d2b4874b1e https://github.com/pytorch/fbgemm/commit/7e31f3904f1b6e79416e4db517b9cc268d265eda Reviewed By: jailby fbshipit-source-id: 306f334f866bd87fedbe634fd694fdd680215421 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e0384c3232b8..ff7ed82439bd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 90ea2da5dee55e308e5d0b265bc0426d9a93bf43 +Subproject commit bb365a6ffe5d8da17be09c61d0d81073c5b8a033 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d180e0af20b1..d97457e74b39 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e4ad914419d95b3dcdee5d238cc3420b071501a5 +Subproject commit 848bcec11be433fc6c3b13b77b692af5b57760d6 From 70b5a370f957935db53a1c80ca170b918dbd8cbb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 10 Aug 2023 10:45:53 -0700 Subject: [PATCH 6345/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/bef0c44dc2ad4f307f6b9b2fb3fa0bacf4bc252a https://github.com/facebook/litho/commit/574e372b709138043785de6d90e066fe3029ac3d https://github.com/facebookincubator/velox/commit/563aec8efe3e02e511c31796834bc5918c057036 Reviewed By: jailby fbshipit-source-id: c19d0926c8ce5c495256f11fa1bda308a8070850 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ff7ed82439bd..366045bc77a9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bb365a6ffe5d8da17be09c61d0d81073c5b8a033 +Subproject commit bef0c44dc2ad4f307f6b9b2fb3fa0bacf4bc252a From 10b4dcb6d6dce6384a0a17ce0422e2bff9365619 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Thu, 10 Aug 2023 13:15:42 -0700 Subject: [PATCH 6346/7387] fix implicit float conversions Summary: Enable -Wfloat-conversion and make conversions explicit. Reviewed By: fanzeyi Differential Revision: D32301218 fbshipit-source-id: 31d0cad5032b6526c2b0845a2a8e649e8fce330b --- watchman/scm/Git.cpp | 4 +++- watchman/scm/Mercurial.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/watchman/scm/Git.cpp b/watchman/scm/Git.cpp index 23e2c2766cc6..9ad098187a47 100644 --- a/watchman/scm/Git.cpp +++ b/watchman/scm/Git.cpp @@ -177,7 +177,9 @@ std::chrono::time_point Git::getCommitDate( throw std::runtime_error(fmt::format( "failed to parse date value `{}` into a double", result.output)); } - return system_clock::from_time_t(timestamp); + // TODO: maybe do some bounds checking on the double we get from + // git. + return system_clock::from_time_t(static_cast(timestamp)); } std::vector Git::getCommitsPriorToAndIncluding( diff --git a/watchman/scm/Mercurial.cpp b/watchman/scm/Mercurial.cpp index 3545daa6fa0f..3dba66aa23fe 100644 --- a/watchman/scm/Mercurial.cpp +++ b/watchman/scm/Mercurial.cpp @@ -247,7 +247,9 @@ time_point Mercurial::convertCommitDate(const char* commitDate) { throw std::runtime_error(fmt::format( "failed to parse date value `{}` into a double", commitDate)); } - return system_clock::from_time_t(date); + // TODO: maybe do some bounds checking on the double we get from + // hg. + return system_clock::from_time_t(static_cast(date)); } std::vector Mercurial::getCommitsPriorToAndIncluding( From b75329653a1c7e69a2065a8fb9cdb4e118673806 Mon Sep 17 00:00:00 2001 From: Luca Niccolini Date: Thu, 10 Aug 2023 14:01:46 -0700 Subject: [PATCH 6347/7387] fix git repo URL for mvfst manifest Summary: the repo was moved Created from CodeHub with https://fburl.com/edit-in-codehub Reviewed By: mjoras, kvtsoy Differential Revision: D48090468 fbshipit-source-id: 2c94b5a68944530a4604fff8052da30d1754f8fb --- build/fbcode_builder/manifests/mvfst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/manifests/mvfst b/build/fbcode_builder/manifests/mvfst index 3fe11b331154..c2a797be2347 100644 --- a/build/fbcode_builder/manifests/mvfst +++ b/build/fbcode_builder/manifests/mvfst @@ -5,7 +5,7 @@ shipit_project = mvfst shipit_fbcode_builder = true [git] -repo_url = https://github.com/facebookincubator/mvfst.git +repo_url = https://github.com/facebook/mvfst.git [build] builder = cmake From e482e920002846c8b9f3ab48794962a96d44eff0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 10 Aug 2023 15:15:42 -0700 Subject: [PATCH 6348/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/e6f5518b6fb7d81b7872475611dcadb01384daab https://github.com/facebook/fbthrift/commit/517fda3e8d25a00a1b01ae57dfc69a8e052b9a8c https://github.com/facebook/folly/commit/cb4d2047256ba8cfedee388f33c897d12136b575 https://github.com/facebook/mvfst/commit/1ae78e52e28f1205fc5b243b027af8ac576259ab https://github.com/facebook/ocamlrep/commit/cf9070531a135e91e871ddb7bc225eedea9cd327 https://github.com/facebook/proxygen/commit/4716f8bb2639e7de06056e758969d28e0f9e1c34 https://github.com/facebook/rocksdb/commit/a85eccc6d6837f5ffb69427eb4074e13fa0dde10 https://github.com/facebook/wangle/commit/e46be86ee63e03fc1f3edde0ea11e915f6e13676 https://github.com/facebook/watchman/commit/b75329653a1c7e69a2065a8fb9cdb4e118673806 https://github.com/facebookexperimental/edencommon/commit/c00788a13d106c5f5541a287698899baa936f54c https://github.com/facebookexperimental/rust-shed/commit/7e502009a18fb308847cad25acc503f3d1725037 https://github.com/facebookincubator/fizz/commit/9ff46d4bc71c78718c7ddcecc7e48d196aadbec7 https://github.com/facebookincubator/katran/commit/250d1164524a630547f995de2a18d6400496986e https://github.com/facebookincubator/velox/commit/2c15ff999529ba966402a1795a8643fd51e04a90 Reviewed By: jailby fbshipit-source-id: 09db01034e73017dea85b5a67dc7dfede6e17dca --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 366045bc77a9..80d4ba6b72cd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bef0c44dc2ad4f307f6b9b2fb3fa0bacf4bc252a +Subproject commit 517fda3e8d25a00a1b01ae57dfc69a8e052b9a8c diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d97457e74b39..494d8f42c11e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 848bcec11be433fc6c3b13b77b692af5b57760d6 +Subproject commit cb4d2047256ba8cfedee388f33c897d12136b575 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a1f3f773fc39..f1135316fbdf 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c36e331c03937a1ad9a2804bda43a10efc8da5db +Subproject commit e46be86ee63e03fc1f3edde0ea11e915f6e13676 From c34bed1b18c603aec3201f24bd2e710e58926675 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 11 Aug 2023 10:49:15 -0700 Subject: [PATCH 6349/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/56690f14d74d4a21691adc53c398cca0b3eca99d https://github.com/facebook/ocamlrep/commit/3eb80ebebd966ae5ccaa7bec7c22e3d332dd5496 https://github.com/facebookincubator/katran/commit/bd1320042dc0f02a651fffbfecdfa3c4ac2d6542 https://github.com/facebookincubator/velox/commit/81a4de5f8406bbed8210ade2c456d9d0efdcc688 https://github.com/pytorch/fbgemm/commit/1b2746f642cc2c99fe9d1a0c34359c0de45341c2 Reviewed By: jailby fbshipit-source-id: 4c6229c78710e5d405f5f4e9cd23ada79d03fa18 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 80d4ba6b72cd..d7ee0865bc50 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 517fda3e8d25a00a1b01ae57dfc69a8e052b9a8c +Subproject commit 56690f14d74d4a21691adc53c398cca0b3eca99d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 494d8f42c11e..0c699f8ec449 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit cb4d2047256ba8cfedee388f33c897d12136b575 +Subproject commit 27584eae664b3ae880ecaa31a100bbf7b5db5887 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f1135316fbdf..6d055690e407 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e46be86ee63e03fc1f3edde0ea11e915f6e13676 +Subproject commit f8a96c71dae478facf603415320a02229a1b8ccc From b1a398a0333e5e7f97ea29646c421cfbcf89c474 Mon Sep 17 00:00:00 2001 From: Xendarboh <1435589+xendarboh@users.noreply.github.com> Date: Fri, 11 Aug 2023 11:49:05 -0700 Subject: [PATCH 6350/7387] fix ubuntu packages build failure (#1158) Summary: Fixes https://github.com/facebook/watchman/issues/1150 Pull Request resolved: https://github.com/facebook/watchman/pull/1158 Reviewed By: xavierd Differential Revision: D48273411 Pulled By: chadaustin fbshipit-source-id: 2ab0f45302714b31ff862d628fb8f9d7e92a7bae --- watchman/build/package/ubuntu-env/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/build/package/ubuntu-env/Dockerfile b/watchman/build/package/ubuntu-env/Dockerfile index 2cc329e6418a..230b0dcfc665 100644 --- a/watchman/build/package/ubuntu-env/Dockerfile +++ b/watchman/build/package/ubuntu-env/Dockerfile @@ -7,7 +7,7 @@ ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Etc/UTC RUN apt-get -y update -RUN apt-get -y install python3 gcc g++ libssl-dev curl +RUN apt-get -y install python3 gcc g++ libssl-dev curl sudo # Ubuntu 18.04 has an older version of Git, which causes actions/checkout@v3 # to check out the repository with REST, breaking version number generation. From 99bf10746ffff15a125e38a17c98a44a62b2fb5e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 11 Aug 2023 14:30:45 -0700 Subject: [PATCH 6351/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/a7a10cc4d25352f8e0650b61de0b3cbd103e615f https://github.com/facebook/litho/commit/6cf05eb844bbc5d1309aa05bc77418ba4d5004f7 https://github.com/facebook/mvfst/commit/ffed18a52f17e8c3bca356c29945ca9bf9b180d6 https://github.com/facebook/ocamlrep/commit/74ab21585029f89035986e01102608eb2d8d219a https://github.com/facebook/rocksdb/commit/38ecfabed2db16799322c40f7e5c596b539cf2bc https://github.com/facebook/watchman/commit/b1a398a0333e5e7f97ea29646c421cfbcf89c474 https://github.com/facebookincubator/velox/commit/792899957ad2687cda66e3f6d8ba11d09e5439be https://github.com/pytorch/fbgemm/commit/2bb3785aa9a7b0d345672eb12d4824a12f211a1f Reviewed By: jailby fbshipit-source-id: a9e28257cef42a68fb4369519de85765da54f248 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d7ee0865bc50..0746f825116c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 56690f14d74d4a21691adc53c398cca0b3eca99d +Subproject commit a7a10cc4d25352f8e0650b61de0b3cbd103e615f From 4757cec285b564f178b9c8ac0882b033cbe97795 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 11 Aug 2023 16:26:20 -0700 Subject: [PATCH 6352/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/43de204656b30703d8071cfef82490db0f0069df https://github.com/facebook/fbthrift/commit/c5c96450a4ac287593194a8499c2af031ebf6d0d https://github.com/facebook/ocamlrep/commit/df95a6dfeacb6a7040b275c8c2cfdceb08d15a19 https://github.com/facebook/wangle/commit/4e92b2d3fc1023a202146ce6042c0ae6b446a408 https://github.com/facebook/watchman/commit/99bf10746ffff15a125e38a17c98a44a62b2fb5e https://github.com/facebookexperimental/edencommon/commit/a2e9f032028c89ad4fa1f334b358bd61e5bb44be https://github.com/facebookexperimental/rust-shed/commit/5f0120b9e66c9c5d7587e4a7168ed9ef8f8b410b https://github.com/facebookincubator/fizz/commit/65a9f5b7d0ef470ec2d22b0f14d72795ce32f87b https://github.com/facebookincubator/velox/commit/c275968676fb8e03d2fe3e53b8e02cde4ea3c043 Reviewed By: jailby fbshipit-source-id: 537be6287fba41f2ebf82cdf540e426d31c656d2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0746f825116c..82819fadf88d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a7a10cc4d25352f8e0650b61de0b3cbd103e615f +Subproject commit c5c96450a4ac287593194a8499c2af031ebf6d0d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6d055690e407..73a8e516fee2 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f8a96c71dae478facf603415320a02229a1b8ccc +Subproject commit 4e92b2d3fc1023a202146ce6042c0ae6b446a408 From 676d50a89f95dcefad67e38a14144dfbfdcc322f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 11 Aug 2023 18:15:47 -0700 Subject: [PATCH 6353/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/f5d349cd82583db6513cbcc447cdf26d48de8b53 https://github.com/facebook/mvfst/commit/95d3240cecca2e75ea541b964f98e8f158c6fa9f https://github.com/facebook/proxygen/commit/713921adebc5638bedc6bf91afad14c90ad19817 https://github.com/facebook/rocksdb/commit/ef6f0255634827b5a7172e99efe2534b8d4ebd2e https://github.com/facebookincubator/katran/commit/ca97308b9d3fb25f0f28a1e5dd18732a75dcca24 Reviewed By: jailby fbshipit-source-id: 1978270d8dbdb101ec24e4325049eeb4e04bb749 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 82819fadf88d..eee9d9d9303b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c5c96450a4ac287593194a8499c2af031ebf6d0d +Subproject commit f5d349cd82583db6513cbcc447cdf26d48de8b53 From e920db3a95d884d861cfdae8da0e1f11804719d7 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 12 Aug 2023 10:33:54 -0700 Subject: [PATCH 6354/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/e06e04d1ef8f8887293a5bcbf9ca6b6b1d3c124c https://github.com/facebook/litho/commit/1a89e337513b648aefba4e2393d498f53ef609d4 Reviewed By: jailby fbshipit-source-id: abf287de6aad3203b7167bcf429cbd48502c8539 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index eee9d9d9303b..1b80ccbd3f0a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f5d349cd82583db6513cbcc447cdf26d48de8b53 +Subproject commit e06e04d1ef8f8887293a5bcbf9ca6b6b1d3c124c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 73a8e516fee2..e2855f62bb9f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 4e92b2d3fc1023a202146ce6042c0ae6b446a408 +Subproject commit bd353c2d7d9520b575fc89d75710a61e2fc7aebc From 8bc82ef0e2210af766170fcdd63e5f859bd4d193 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 13 Aug 2023 14:20:39 -0700 Subject: [PATCH 6355/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/733edc209c7f7247a7ead46084346caa46c18867 Reviewed By: jailby fbshipit-source-id: 64771e362b6f2d1ca4a45aaee7c5e6aa0db92ed3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1b80ccbd3f0a..1676d0bdf01f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e06e04d1ef8f8887293a5bcbf9ca6b6b1d3c124c +Subproject commit 733edc209c7f7247a7ead46084346caa46c18867 From e4a50bbd8bad8f11b53928915858d48a9d7188ce Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 14 Aug 2023 14:23:32 -0700 Subject: [PATCH 6356/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/b4eb30f1b3ca6504a143c1e2dd140e13c33eb11e https://github.com/facebookincubator/katran/commit/81b0ed87a65c672f2fe306839943859b64981bcf Reviewed By: jurajh-fb fbshipit-source-id: 88127e9b863cee0678db844b4becfa1dded49ae2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1676d0bdf01f..0859a790fc49 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 733edc209c7f7247a7ead46084346caa46c18867 +Subproject commit b4eb30f1b3ca6504a143c1e2dd140e13c33eb11e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0c699f8ec449..25880c900480 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 27584eae664b3ae880ecaa31a100bbf7b5db5887 +Subproject commit d7cf7dae7f2c9896ca5a5aed4ae84b5b7bec82c1 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e2855f62bb9f..4e7a51d89369 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit bd353c2d7d9520b575fc89d75710a61e2fc7aebc +Subproject commit d19f8f172afff40c1cd4de14a2a37da4b71a6fa3 From 7d7f718f815c65bdf98253bb056d0a7af5923395 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 14 Aug 2023 17:09:07 -0700 Subject: [PATCH 6357/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/6f5de64799ee266c072bde9f87b10de43cf2c57a https://github.com/facebook/litho/commit/9828b6489ce36a727a17a9d984f6b366938ad67e https://github.com/facebookincubator/velox/commit/f59979e248cf89987da99d3ec5f77bcb1129472c Reviewed By: jurajh-fb fbshipit-source-id: dabcbceedb170beafa0013ff4ce360557a067b27 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0859a790fc49..538f57b5c03f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b4eb30f1b3ca6504a143c1e2dd140e13c33eb11e +Subproject commit 6f5de64799ee266c072bde9f87b10de43cf2c57a From 3a39a678507871b7d872e984ab11ef857541e9aa Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 14 Aug 2023 19:12:24 -0700 Subject: [PATCH 6358/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/874591b31c3aa01f699d4fc98f260e12046aab62 https://github.com/facebook/folly/commit/d7381af5f36326027f4a9e844ae3efd7db034a65 Reviewed By: jurajh-fb fbshipit-source-id: dc86f463e7c8fc1b6888bcf51cb69c97922a4565 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 538f57b5c03f..f65144f50fe6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6f5de64799ee266c072bde9f87b10de43cf2c57a +Subproject commit 874591b31c3aa01f699d4fc98f260e12046aab62 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 25880c900480..45a93847ec51 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d7cf7dae7f2c9896ca5a5aed4ae84b5b7bec82c1 +Subproject commit d7381af5f36326027f4a9e844ae3efd7db034a65 From 1fbbba4e6b6797b7b601e12acb44e4c52fad35ee Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 14 Aug 2023 21:23:38 -0700 Subject: [PATCH 6359/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/81bea17d456f5edfa48f93dc0f0cfc758e842b84 https://github.com/pytorch/fbgemm/commit/8dc3160b467921042ede94d5f743b5f28ab0bde7 Reviewed By: jurajh-fb fbshipit-source-id: a672e74dad61ff87658a01dc5940607ee89bcc25 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f65144f50fe6..a6112f9ec60e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 874591b31c3aa01f699d4fc98f260e12046aab62 +Subproject commit 81bea17d456f5edfa48f93dc0f0cfc758e842b84 From c01ca76a78f2f2e90696e14420bc9d1c86baa253 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Tue, 15 Aug 2023 07:07:44 -0700 Subject: [PATCH 6360/7387] Modernize name of Cargo configuration files (.cargo/config -> .cargo/config.toml) Summary: `.cargo/config.toml` is the modern, editor-friendly name preferred since Rust 1.39. See https://doc.rust-lang.org/1.71.0/cargo/reference/config.html. Reviewed By: shayne-fletcher Differential Revision: D48341886 fbshipit-source-id: dc4390f2b6a974e113e1d4e01d3a3b287a05e785 --- build/fbcode_builder/getdeps/manifest.py | 2 +- build/fbcode_builder/manifests/fb303 | 2 +- build/fbcode_builder/manifests/fbthrift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/getdeps/manifest.py b/build/fbcode_builder/getdeps/manifest.py index 7ef984b33a70..15f69af7d4e8 100644 --- a/build/fbcode_builder/getdeps/manifest.py +++ b/build/fbcode_builder/getdeps/manifest.py @@ -74,7 +74,7 @@ "build_doc": OPTIONAL, "workspace_dir": OPTIONAL, "manifests_to_build": OPTIONAL, - # Where to write cargo config (defaults to build_dir/.cargo/config) + # Where to write cargo config (defaults to build_dir/.cargo/config.toml) "cargo_config_file": OPTIONAL, }, }, diff --git a/build/fbcode_builder/manifests/fb303 b/build/fbcode_builder/manifests/fb303 index 86ba61ffdcd0..ad398a8c281f 100644 --- a/build/fbcode_builder/manifests/fb303 +++ b/build/fbcode_builder/manifests/fb303 @@ -8,7 +8,7 @@ shipit_fbcode_builder = true repo_url = https://github.com/facebook/fb303.git [cargo] -cargo_config_file = source/fb303/thrift/.cargo/config +cargo_config_file = source/fb303/thrift/.cargo/config.toml [crate.pathmap] fb303_core = fb303/thrift diff --git a/build/fbcode_builder/manifests/fbthrift b/build/fbcode_builder/manifests/fbthrift index 6b761f127fc6..3d852d8d1c56 100644 --- a/build/fbcode_builder/manifests/fbthrift +++ b/build/fbcode_builder/manifests/fbthrift @@ -8,7 +8,7 @@ shipit_fbcode_builder = true repo_url = https://github.com/facebook/fbthrift.git [cargo] -cargo_config_file = source/thrift/lib/rust/.cargo/config +cargo_config_file = source/thrift/lib/rust/.cargo/config.toml [crate.pathmap] fbthrift = thrift/lib/rust From e59e51c5f141b5c24be2e96d9a59e67e1064a6c1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 15 Aug 2023 07:54:34 -0700 Subject: [PATCH 6361/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ecbda559a2147e27ab37d5bb70b2fda7bec2f46c https://github.com/facebook/fbthrift/commit/922bc0a08ebb7a4c577ad2253090cb4744efba49 https://github.com/facebook/folly/commit/a474be34c1af1611e4fa3d54f68e9cbd7c567668 https://github.com/facebook/mvfst/commit/f731234d1d2b3454bc3c7c2d89fafc641f9898f4 https://github.com/facebook/proxygen/commit/a18a258d96542bf7ebc92f5c1548f2c8d9e48c3b https://github.com/facebook/wangle/commit/002d8228af36db0c7520899bca9fc3fd005d57ad https://github.com/facebook/watchman/commit/c01ca76a78f2f2e90696e14420bc9d1c86baa253 https://github.com/facebookexperimental/edencommon/commit/e2ebb399e069925ffcff48db15cc572978edd374 https://github.com/facebookexperimental/rust-shed/commit/7f0082637344170f56e0da9f41d2d500264e26bb https://github.com/facebookincubator/fizz/commit/d4cdc34fe2d2f0aa71e09ecccea95f841922a970 https://github.com/facebookincubator/katran/commit/2ca05ddc4a1d1a310954b12db6a3b25d92670a3e https://github.com/facebookincubator/velox/commit/d293920a91e029ca5a51628187adc29d5f7a9fc1 Reviewed By: jurajh-fb fbshipit-source-id: 1f4efd844c4647b73025dd6f75e0bbf577d90474 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a6112f9ec60e..87ca9f30ad0a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 81bea17d456f5edfa48f93dc0f0cfc758e842b84 +Subproject commit 922bc0a08ebb7a4c577ad2253090cb4744efba49 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 45a93847ec51..72f58be2af05 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d7381af5f36326027f4a9e844ae3efd7db034a65 +Subproject commit a474be34c1af1611e4fa3d54f68e9cbd7c567668 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4e7a51d89369..d7a4b40a06db 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d19f8f172afff40c1cd4de14a2a37da4b71a6fa3 +Subproject commit 002d8228af36db0c7520899bca9fc3fd005d57ad From 94fadf4833fd6b9f4bc8f15c64e2fe61a178804f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 15 Aug 2023 08:40:18 -0700 Subject: [PATCH 6362/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/55bf6adf80d24bd0be9dd33a8abf65ef80ab6cf8 https://github.com/facebook/fbthrift/commit/ef22b13f6305afbe81b868239812977269a044df https://github.com/facebook/mvfst/commit/65e17822153a42b7348da56d4cc7be9022b8b037 https://github.com/facebook/ocamlrep/commit/3c65bbf7ced56fc915c36964f6c18561a8f7531f https://github.com/facebook/proxygen/commit/e961646101432e0079544e67441c2941743b6100 https://github.com/facebook/wangle/commit/2db4be83fbf00c166498cf3a39ad2ae7903d4f32 https://github.com/facebook/watchman/commit/e59e51c5f141b5c24be2e96d9a59e67e1064a6c1 https://github.com/facebookexperimental/edencommon/commit/571d1c53c783fe25c897a24de3a457a6cd9b906d https://github.com/facebookexperimental/rust-shed/commit/0ebf2ee0312b1086caf3c7a4085865611a1c99dc https://github.com/facebookincubator/fizz/commit/a764c2fd2b9e4b903a7ac53f14b8482db2640f9e https://github.com/facebookincubator/katran/commit/face6d00d7c1f6ea700611b67e34f48fe16d185b https://github.com/facebookincubator/velox/commit/cbae78030736cc9e22aef6d448ccb829635de455 Reviewed By: jurajh-fb fbshipit-source-id: 4830b45d23b75b8b742a40aedc2a35acefd408cb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 87ca9f30ad0a..5a3a9d49bbcc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 922bc0a08ebb7a4c577ad2253090cb4744efba49 +Subproject commit ef22b13f6305afbe81b868239812977269a044df diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d7a4b40a06db..61553d64a14e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 002d8228af36db0c7520899bca9fc3fd005d57ad +Subproject commit 2db4be83fbf00c166498cf3a39ad2ae7903d4f32 From 4da0e0516df7812ecda3e6f6edf5c436c29e00e0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 15 Aug 2023 13:27:20 -0700 Subject: [PATCH 6363/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/f6a8d8920d545320bbc0c34053d8cb492b49ea78 https://github.com/facebook/fbthrift/commit/384408df9dc350d1def648db59d5cd09dd9fbcff https://github.com/facebook/folly/commit/ad4a3547666a9725c223b4c5a078518cd9a4e6ed https://github.com/facebook/ocamlrep/commit/a6c60ffaed1d78e5e740df2bd0c2bd6f99050a9c https://github.com/facebookexperimental/rust-shed/commit/3df6df29c04bc7b9e71b265cb586b6a465ed9a27 https://github.com/facebookincubator/velox/commit/61186523db80fed5ffdda0d67fa117b0e141ce6d Reviewed By: jurajh-fb fbshipit-source-id: 108ab3088c313d5caebffdd2efa4553eb28e8919 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5a3a9d49bbcc..b3d21d0a4905 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ef22b13f6305afbe81b868239812977269a044df +Subproject commit 384408df9dc350d1def648db59d5cd09dd9fbcff diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 72f58be2af05..72cb661ba70b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a474be34c1af1611e4fa3d54f68e9cbd7c567668 +Subproject commit ad4a3547666a9725c223b4c5a078518cd9a4e6ed From b8b7efe1b1dc27f1925a96e04ed6095521f25f28 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 15 Aug 2023 17:20:43 -0700 Subject: [PATCH 6364/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/c9d924251118c0007ae28ae1455ec78da1681f8c https://github.com/facebook/fbthrift/commit/b37a7defc877084be9b5e7b19beb41dfc621c9ce https://github.com/facebook/mvfst/commit/b02918da183f72a0a093e32e61d3157583abe63f https://github.com/facebook/rocksdb/commit/b63018fb59b3736b7a2e597dc934da0693c16788 https://github.com/facebookincubator/velox/commit/8506e85a3d5809ffe42e56a209ef63160b1e15ce Reviewed By: jurajh-fb fbshipit-source-id: b34bd5d23ba4c9f663b0b6ba4ced47b3ab372ba3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b3d21d0a4905..d60943139bc6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 384408df9dc350d1def648db59d5cd09dd9fbcff +Subproject commit b37a7defc877084be9b5e7b19beb41dfc621c9ce diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 72cb661ba70b..06c4b6451917 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ad4a3547666a9725c223b4c5a078518cd9a4e6ed +Subproject commit 95105c51013f9558b2f84283958c842b884d5cd0 From ca7745598f9d829a0b8d48095615ede2fa0bc0cc Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 15 Aug 2023 20:13:34 -0700 Subject: [PATCH 6365/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/b90d54428cb4e78a23713cb25a51a3031dbd3711 Reviewed By: jurajh-fb fbshipit-source-id: 749053a4a6fc08099b8308121f594e0f3f06d537 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d60943139bc6..9b4497af7fe5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b37a7defc877084be9b5e7b19beb41dfc621c9ce +Subproject commit b90d54428cb4e78a23713cb25a51a3031dbd3711 From 19979d180dcad2556bd7df5e5a430c255905cf8c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 16 Aug 2023 11:00:40 -0700 Subject: [PATCH 6366/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/475e12b346c07aa8a9acaf7887c2ccec5566b60b https://github.com/facebook/fbthrift/commit/520f5c5cc49720b4f0929856d08a373e5f4c9c84 https://github.com/facebook/litho/commit/3fd2e9c079ddf4d75e9c20c6841b4d6b5282135e https://github.com/facebook/mvfst/commit/db728cd1a35f1549039e054a973ac93f97e8da5d https://github.com/facebook/rocksdb/commit/0b6ee88d51b4742c9a623df58587773ae2ca0de5 https://github.com/facebookincubator/velox/commit/c936593015ee8de15e8f88f3d427f242b9afa11c Reviewed By: jurajh-fb fbshipit-source-id: ceb9d1b9524ad73bbfa390b49e48ee532e8cce9e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9b4497af7fe5..90ba09f20036 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b90d54428cb4e78a23713cb25a51a3031dbd3711 +Subproject commit 520f5c5cc49720b4f0929856d08a373e5f4c9c84 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 61553d64a14e..27136c70d89e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2db4be83fbf00c166498cf3a39ad2ae7903d4f32 +Subproject commit 2d50bd9b0334728cbd778c39b01e9e1aa54cbc22 From c2594a98a096a68dd7db242bcee928f04169f730 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 11:30:22 -0700 Subject: [PATCH 6367/7387] Bump semver from 5.7.1 to 5.7.2 in /website (#1149) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
Release notes

Sourced from semver's releases.

v5.7.2

5.7.2 (2023-07-10)

Bug Fixes

Changelog

Sourced from semver's changelog.

5.7.2 (2023-07-10)

Bug Fixes

5.7

  • Add minVersion method

5.6

  • Move boolean loose param to an options object, with backwards-compatibility protection.
  • Add ability to opt out of special prerelease version handling with the includePrerelease option flag.

5.5

  • Add version coercion capabilities

5.4

  • Add intersection checking

5.3

  • Add minSatisfying method

5.2

  • Add prerelease(v) that returns prerelease components

5.1

  • Add Backus-Naur for ranges
  • Remove excessively cute inspection methods

5.0

  • Remove AMD/Browserified build artifacts
  • Fix ltr and gtr when using the * range
  • Fix for range * with a prerelease identifier
Commits
Maintainer changes

This version was pushed to npm by lukekarrys, a new releaser for semver since your current version.


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=semver&package-manager=npm_and_yarn&previous-version=5.7.1&new-version=5.7.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `dependabot rebase` will rebase this PR - `dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `dependabot merge` will merge this PR after your CI passes on it - `dependabot squash and merge` will squash and merge this PR after your CI passes on it - `dependabot cancel merge` will cancel a previously requested merge and block automerging - `dependabot reopen` will reopen this PR if it is closed - `dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/facebook/watchman/network/alerts).
Pull Request resolved: https://github.com/facebook/watchman/pull/1149 Reviewed By: genevievehelsel Differential Revision: D48321690 Pulled By: chadaustin fbshipit-source-id: 8d27408a9cbf4b20f8d6d4d53296055ab88460d9 --- website/yarn.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/website/yarn.lock b/website/yarn.lock index 73f41bf92f62..08a2771e7601 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -8062,19 +8062,19 @@ semver-diff@^3.1.1: semver "^6.3.0" semver@^5.4.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== semver@^7.3.2, semver@^7.3.4, semver@^7.3.7, semver@^7.3.8: - version "7.3.8" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" - integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: lru-cache "^6.0.0" From 55d20c86382db49a3e91c66d561c117c2e1bafe4 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Wed, 16 Aug 2023 12:34:08 -0700 Subject: [PATCH 6368/7387] modernize generate-release-yml Summary: Use anyhow. cargo-script to rust-script. Allow running the script from anywhere. Reviewed By: genevievehelsel Differential Revision: D48317089 fbshipit-source-id: feb2accb8a7de189ca584362933d52d585ae5612 --- .github/workflows/generate-release-yml.rs | 71 ++++++++++++----------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/.github/workflows/generate-release-yml.rs b/.github/workflows/generate-release-yml.rs index d6a12d489ae1..792df8fba028 100755 --- a/.github/workflows/generate-release-yml.rs +++ b/.github/workflows/generate-release-yml.rs @@ -1,19 +1,30 @@ -#!/usr/bin/env run-cargo-script +#!/usr/bin/env rust-script +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + //! //! ```cargo //! [dependencies] -//! atomicwrites = "0.3.1" +//! anyhow = "1.0.72" +//! atomicwrites = "0.4.1" //! yaml-rust = "0.4.5" //! ``` -extern crate atomicwrites; -extern crate yaml_rust; - -use atomicwrites::{AllowOverwrite, AtomicFile}; use std::io::Write; use std::path::Path; + +use anyhow::anyhow; +use anyhow::bail; +use atomicwrites::AllowOverwrite; +use atomicwrites::AtomicFile; use yaml_rust::yaml::Hash; -use yaml_rust::{Yaml, YamlEmitter, YamlLoader}; +use yaml_rust::Yaml; +use yaml_rust::YamlEmitter; +use yaml_rust::YamlLoader; type Pattern = Box String + 'static>; @@ -21,19 +32,13 @@ fn parse_pattern(pattern: &String) -> Option<(Pattern, Vec<&'static str>)> { // TODO: generalize this with an external table or something if pattern.contains("%UBUNTU_LTS_VERSION%") { Some(( - Box::new(move |p: &str, s: &str| { - p.replace("%UBUNTU_LTS_VERSION%", s) - }), - vec!("18", "20", "22"), + Box::new(move |p: &str, s: &str| p.replace("%UBUNTU_LTS_VERSION%", s)), + vec!["18", "20", "22"], )) } else if pattern.contains("%FEDORA_STABLE_VERSION%") { Some(( - Box::new(move |p: &str, s: &str| { - p.replace("%FEDORA_STABLE_VERSION%", s) - }), - // TODO: enable 35 by setting FIND_LIBRARY_USE_LIB64_PATHS - // for zstd - vec!("36"), + Box::new(move |p: &str, s: &str| p.replace("%FEDORA_STABLE_VERSION%", s)), + vec!["36"], )) } else { None @@ -91,47 +96,43 @@ fn expand_value(value: &Yaml) -> Yaml { } } -fn main() { - let input_path = Path::new("release.yml.in"); - let output_path = Path::new("release.yml"); +fn main() -> anyhow::Result<()> { + let Some(base_path) = std::env::var_os("RUST_SCRIPT_BASE_PATH") else { + bail!("RUST_SCRIPT_BASE_PATH must be set"); + }; + let base_path = Path::new(&base_path); + let input_path = base_path.join("release.yml.in"); + let output_path = base_path.join("release.yml"); - let contents = match std::fs::read_to_string(input_path) { + let contents = match std::fs::read_to_string(&input_path) { Ok(contents) => contents, Err(e) => { - eprintln!("Unable to read {}: {}", input_path.display(), e); - std::process::exit(1); + bail!("Unable to read {}: {}", input_path.display(), e); } }; let doc = match YamlLoader::load_from_str(&contents) { Ok(doc) => doc, Err(e) => { - eprintln!("Unable to parse {}: {}", input_path.display(), e); - std::process::exit(1); + bail!("Unable to parse {}: {}", input_path.display(), e); } }; let new_doc: Vec = doc.iter().map(expand_value).collect(); let mut out_str = String::new(); - out_str.extend("# @generated by generate-release-yml.rs\n".chars()); + out_str.extend("# \x40generated by generate-release-yml.rs\n".chars()); let mut emitter = YamlEmitter::new(&mut out_str); for doc in new_doc { match emitter.dump(&doc) { Ok(()) => (), Err(e) => { - eprintln!("Unable to generate {}: {}", output_path.display(), e); - std::process::exit(1); + bail!("Unable to generate {}: {}", output_path.display(), e); } } } let af = AtomicFile::new(&output_path, AllowOverwrite); - match af.write(|f| f.write_all(&out_str.as_bytes())) { - Ok(()) => (), - Err(e) => { - eprintln!("Unable to write {}: {}", output_path.display(), e); - std::process::exit(1); - } - } + af.write(|f| f.write_all(&out_str.as_bytes())) + .map_err(|e| anyhow!("Unable to write {}: {}", output_path.display(), e)) } From fab3c2c8538fe70f33029d8033472bef14e0d1d7 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Wed, 16 Aug 2023 12:34:08 -0700 Subject: [PATCH 6369/7387] remove automated builds for Ubuntu 18 Summary: Thrift no longer supports Ubuntu 18 and the build is failing. Reviewed By: genevievehelsel Differential Revision: D48317141 fbshipit-source-id: d6e5af6b23c7c7ae75aa6ba7a9a9110f4e006e08 --- .github/workflows/generate-release-yml.rs | 2 +- .github/workflows/release.yml | 52 ----------------------- 2 files changed, 1 insertion(+), 53 deletions(-) diff --git a/.github/workflows/generate-release-yml.rs b/.github/workflows/generate-release-yml.rs index 792df8fba028..31c10faea5e1 100755 --- a/.github/workflows/generate-release-yml.rs +++ b/.github/workflows/generate-release-yml.rs @@ -33,7 +33,7 @@ fn parse_pattern(pattern: &String) -> Option<(Pattern, Vec<&'static str>)> { if pattern.contains("%UBUNTU_LTS_VERSION%") { Some(( Box::new(move |p: &str, s: &str| p.replace("%UBUNTU_LTS_VERSION%", s)), - vec!["18", "20", "22"], + vec!["20", "22"], )) } else if pattern.contains("%FEDORA_STABLE_VERSION%") { Some(( diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 435f4f14f2ab..c74b5cd7d71b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,27 +25,6 @@ jobs: with: tag_name: "${{ github.ref }}" release_name: "${{ github.ref }}" - docker-ubuntu-18: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v3 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: "${{ github.repository_owner }}" - password: "${{ secrets.GITHUB_TOKEN }}" - - name: Build and push Docker image - uses: docker/build-push-action@v3 - with: - context: "." - build-args: UBUNTU_VERSION=18.04 - file: watchman/build/package/ubuntu-env/Dockerfile - push: true - tags: "${{ format('ghcr.io/{0}/watchman-build-env-ubuntu-18:latest', github.repository) }}" docker-ubuntu-20: runs-on: ubuntu-latest steps: @@ -109,37 +88,6 @@ jobs: file: watchman/build/package/fedora-env/Dockerfile push: true tags: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-36:latest', github.repository) }}" - clone-build-package-ubuntu-18: - needs: - - prepare - - docker-ubuntu-18 - runs-on: ubuntu-latest - container: - image: "${{ format('ghcr.io/{0}/watchman-build-env-ubuntu-18:latest', github.repository) }}" - steps: - - name: Fix HOME - run: echo HOME=/root >> $GITHUB_ENV - - name: Checkout code - uses: actions/checkout@v3 - - name: Install system dependencies - run: "./install-system-packages.sh" - - name: Fix dubious ownership - run: git config --global --add safe.directory /__w/watchman/watchman - - name: Build Watchman binaries - run: "./autogen.sh" - - name: Make .deb - env: - UBUNTU_VERSION: "18.04" - run: "./watchman/build/package/make-deb.sh" - - name: Upload .deb - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - uses: actions/upload-release-asset@v1 - with: - upload_url: "${{ needs.prepare.outputs.upload_url }}" - asset_path: /_debs/watchman.deb - asset_name: "watchman_ubuntu18.04_${{ needs.prepare.outputs.release }}.deb" - asset_content_type: application/x-deb clone-build-package-ubuntu-20: needs: - prepare From 35005614ed1b5296cd6f1a71110449194b5cd5d2 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Wed, 16 Aug 2023 12:34:08 -0700 Subject: [PATCH 6370/7387] add Fedora 37 and Fedora 38 releases Summary: Fedora 36 is EOL, so add the newer two. We can remove Fedora 36 later. Reviewed By: genevievehelsel Differential Revision: D48317194 fbshipit-source-id: 50eef9fd1cee49eca8cc47ca3d1902be65fc7105 --- .github/workflows/generate-release-yml.rs | 2 +- .github/workflows/release.yml | 106 ++++++++++++++++++++++ 2 files changed, 107 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generate-release-yml.rs b/.github/workflows/generate-release-yml.rs index 31c10faea5e1..7a5b0c7f6ef5 100755 --- a/.github/workflows/generate-release-yml.rs +++ b/.github/workflows/generate-release-yml.rs @@ -38,7 +38,7 @@ fn parse_pattern(pattern: &String) -> Option<(Pattern, Vec<&'static str>)> { } else if pattern.contains("%FEDORA_STABLE_VERSION%") { Some(( Box::new(move |p: &str, s: &str| p.replace("%FEDORA_STABLE_VERSION%", s)), - vec!["36"], + vec!["36", "37", "38"], )) } else { None diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c74b5cd7d71b..d4604f4c9743 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -88,6 +88,48 @@ jobs: file: watchman/build/package/fedora-env/Dockerfile push: true tags: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-36:latest', github.repository) }}" + docker-fedora-37: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Login to GitHub Container Registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: "${{ github.repository_owner }}" + password: "${{ secrets.GITHUB_TOKEN }}" + - name: Build and push Docker image + uses: docker/build-push-action@v3 + with: + context: "." + build-args: FEDORA_VERSION=37 + file: watchman/build/package/fedora-env/Dockerfile + push: true + tags: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-37:latest', github.repository) }}" + docker-fedora-38: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Login to GitHub Container Registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: "${{ github.repository_owner }}" + password: "${{ secrets.GITHUB_TOKEN }}" + - name: Build and push Docker image + uses: docker/build-push-action@v3 + with: + context: "." + build-args: FEDORA_VERSION=38 + file: watchman/build/package/fedora-env/Dockerfile + push: true + tags: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-38:latest', github.repository) }}" clone-build-package-ubuntu-20: needs: - prepare @@ -182,6 +224,70 @@ jobs: asset_path: "${{ steps.make_rpm.outputs.rpm_path }}" asset_name: "${{ steps.make_rpm.outputs.rpm_name }}" asset_content_type: application/x-rpm + clone-build-package-fedora-37: + needs: + - prepare + - docker-fedora-37 + runs-on: ubuntu-latest + container: + image: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-37:latest', github.repository) }}" + steps: + - name: Fix HOME + run: echo HOME=/root >> $GITHUB_ENV + - name: Checkout code + uses: actions/checkout@v3 + - name: Install system dependencies + run: "./install-system-packages.sh" + - name: Fix dubious ownership + run: git config --global --add safe.directory /__w/watchman/watchman + - name: Build Watchman binaries + run: "./autogen.sh" + - name: Make .rpm + id: make_rpm + env: + FEDORA_VERSION: "37" + run: "./watchman/build/package/make-rpm.sh" + - name: Upload .rpm + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + uses: actions/upload-release-asset@v1 + with: + upload_url: "${{ needs.prepare.outputs.upload_url }}" + asset_path: "${{ steps.make_rpm.outputs.rpm_path }}" + asset_name: "${{ steps.make_rpm.outputs.rpm_name }}" + asset_content_type: application/x-rpm + clone-build-package-fedora-38: + needs: + - prepare + - docker-fedora-38 + runs-on: ubuntu-latest + container: + image: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-38:latest', github.repository) }}" + steps: + - name: Fix HOME + run: echo HOME=/root >> $GITHUB_ENV + - name: Checkout code + uses: actions/checkout@v3 + - name: Install system dependencies + run: "./install-system-packages.sh" + - name: Fix dubious ownership + run: git config --global --add safe.directory /__w/watchman/watchman + - name: Build Watchman binaries + run: "./autogen.sh" + - name: Make .rpm + id: make_rpm + env: + FEDORA_VERSION: "38" + run: "./watchman/build/package/make-rpm.sh" + - name: Upload .rpm + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + uses: actions/upload-release-asset@v1 + with: + upload_url: "${{ needs.prepare.outputs.upload_url }}" + asset_path: "${{ steps.make_rpm.outputs.rpm_path }}" + asset_name: "${{ steps.make_rpm.outputs.rpm_name }}" + asset_content_type: application/x-rpm linux-build: continue-on-error: true needs: prepare From bcb39eb7bfeebaebd4fc1c91db2199bb58a62ab6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 16 Aug 2023 14:18:10 -0700 Subject: [PATCH 6371/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/1db92cdbd0a485e86ad34d17491b6796d544b8c3 https://github.com/facebook/folly/commit/50e90aed53877050faf7cd043374a61e0c62ba12 https://github.com/facebook/litho/commit/2a8006e10be2b5431fcfe63fdba9c7a083594670 https://github.com/facebook/mvfst/commit/d47d381da984ec001b22216d18e297c6b063e50a https://github.com/facebook/proxygen/commit/f65241ff0bbe51c8b1fca42633afebe776312538 https://github.com/facebook/watchman/commit/35005614ed1b5296cd6f1a71110449194b5cd5d2 Reviewed By: jurajh-fb fbshipit-source-id: 53ea3f25a1af01727dac7d2643fa1bb89143da2b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 90ba09f20036..df24a1f8d396 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 520f5c5cc49720b4f0929856d08a373e5f4c9c84 +Subproject commit 1db92cdbd0a485e86ad34d17491b6796d544b8c3 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 06c4b6451917..f92db003ffff 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 95105c51013f9558b2f84283958c842b884d5cd0 +Subproject commit 50e90aed53877050faf7cd043374a61e0c62ba12 From b80a206b6d242f38595a079a49b228d0ac003dda Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 16 Aug 2023 16:22:24 -0700 Subject: [PATCH 6372/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/03e656c17386fa23b46048ca2db2e4d0a9b9845f https://github.com/facebook/fbthrift/commit/8cf8a09e099db82ff9d1ede1d963f59704950699 https://github.com/facebook/proxygen/commit/73dcf2396daaa5a5d15cdb4fac7b9da1dedab905 Reviewed By: jurajh-fb fbshipit-source-id: d5d02fbb0f09715b4b2e8e3daaf3b459d14de72b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index df24a1f8d396..fd6b71eb8d81 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1db92cdbd0a485e86ad34d17491b6796d544b8c3 +Subproject commit 8cf8a09e099db82ff9d1ede1d963f59704950699 From 556b7c239789d077d62df151b5bdb02e767e659d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 16 Aug 2023 17:16:07 -0700 Subject: [PATCH 6373/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/e42a5a124a17945467d039310527b1336b32c956 https://github.com/facebook/wangle/commit/73cc31d482ff9323fb504d6ee4faa0e47c195850 https://github.com/facebookexperimental/edencommon/commit/b244ebf8625c9266fe86d8f180660c88f2a16c91 https://github.com/facebookincubator/katran/commit/7af613b8f4fe520f03d38e3c85968956cb9275e4 Reviewed By: jurajh-fb fbshipit-source-id: bbcd7f607feff0eec67e1a6cd7d116fc84031bde --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index fd6b71eb8d81..083f5f2f5441 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8cf8a09e099db82ff9d1ede1d963f59704950699 +Subproject commit e42a5a124a17945467d039310527b1336b32c956 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 27136c70d89e..387845a55a5d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2d50bd9b0334728cbd778c39b01e9e1aa54cbc22 +Subproject commit 73cc31d482ff9323fb504d6ee4faa0e47c195850 From bbbdc55d0619300b18a3d4a4d576659893c0ca19 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 16 Aug 2023 21:09:52 -0700 Subject: [PATCH 6374/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/844896dee402ef08b2facff86e0da79314805bc1 https://github.com/facebook/fbthrift/commit/8104d83fa4a9478e5e31b42f55b18d603ce27ba3 https://github.com/facebook/ocamlrep/commit/a6d2f6360d6fa331e8e6d89bd02a16c9732daa52 https://github.com/facebookexperimental/rust-shed/commit/185fe0915512d2a8cd246591c07caa7b29f3813e https://github.com/facebookresearch/multimodal/commit/951a4524b74c8d20be19ac0c3203a5d9bf451bd1 https://github.com/facebookresearch/vrs/commit/7270e2e8e9f06909c0347a1a672f09f3c391aa46 Reviewed By: jurajh-fb fbshipit-source-id: f78219c987ffa1b7b1d574b95518ae5367255438 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 083f5f2f5441..51ee574e504e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e42a5a124a17945467d039310527b1336b32c956 +Subproject commit 8104d83fa4a9478e5e31b42f55b18d603ce27ba3 From c9266baa3d1ee09c656bce1651d05a45bd0a9961 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 16 Aug 2023 23:48:56 -0700 Subject: [PATCH 6375/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7cf826d441be5eabdd081cda21eb3da15c0f2e62 Reviewed By: jurajh-fb fbshipit-source-id: 55cc8b0f2ee0244ed7934a37629009c732175f6a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 51ee574e504e..ba98f0d6f702 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8104d83fa4a9478e5e31b42f55b18d603ce27ba3 +Subproject commit 7cf826d441be5eabdd081cda21eb3da15c0f2e62 From 92da439e9d5b614bab8baf652bcc27abcc31f52f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 17 Aug 2023 05:33:37 -0700 Subject: [PATCH 6376/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/71a4bcbac1e8489714b6dd2b3d71ae2b1c39125a https://github.com/facebook/litho/commit/3916973758af3fb6ea483d035d00a7120b2ed9d6 https://github.com/facebook/proxygen/commit/d2d1f5bff604dddd50f20a2beb8536c8d74896a2 https://github.com/facebookincubator/fizz/commit/130d02ffc0c1b5fb762782e10f42cb322e1288ae https://github.com/facebookincubator/velox/commit/a4c2a1c3c103c32f0d9f04927e9dbd892faf351c https://github.com/facebookresearch/vrs/commit/f0968e82d6f95f9c4b6264c3217fa51a9f8cb786 Reviewed By: jurajh-fb fbshipit-source-id: 5f323a684eaa708014842443308a10840b0e960c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ba98f0d6f702..dde3fa1c511f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7cf826d441be5eabdd081cda21eb3da15c0f2e62 +Subproject commit 71a4bcbac1e8489714b6dd2b3d71ae2b1c39125a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f92db003ffff..0001867f6113 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 50e90aed53877050faf7cd043374a61e0c62ba12 +Subproject commit ab45d9b6a7a2a24b2a725447387f36772dd2cc4a From 532c088959ef977f55c74d182a47525fe87b29e4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 17 Aug 2023 10:58:53 -0700 Subject: [PATCH 6377/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/b6fc5df08c40a5a0629a6cb5fdd5e9ca509e3d27 https://github.com/facebook/folly/commit/b8f65b19372207c60889836787b7734f0124bfa9 https://github.com/facebook/mvfst/commit/752cc746417593296cf0f51bd82498cdcee8dba8 https://github.com/facebook/ocamlrep/commit/cfcbecf47faabd7d79de0ac544048c282bfa3934 https://github.com/facebookincubator/katran/commit/24247b2992b80624b769bdd45eb77bd721c24db2 https://github.com/facebookincubator/velox/commit/d2ebb4e3ba432882d93065eff94d9dad4101bb8b Reviewed By: jurajh-fb fbshipit-source-id: c34d37ffcd8df3c6e0af4e502f86b581f9b1be93 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index dde3fa1c511f..6168d413a10a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 71a4bcbac1e8489714b6dd2b3d71ae2b1c39125a +Subproject commit b6fc5df08c40a5a0629a6cb5fdd5e9ca509e3d27 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0001867f6113..5351fff75d55 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ab45d9b6a7a2a24b2a725447387f36772dd2cc4a +Subproject commit b8f65b19372207c60889836787b7734f0124bfa9 From 8f653f0e65277c95520343196fc1bcb82774353d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 18 Aug 2023 10:03:57 -0700 Subject: [PATCH 6378/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/a1a57a68ffd92e6828932f69e04c7117a76c0f46 https://github.com/facebook/mvfst/commit/78010fa3c64b1bc5d8640bd15553984253850e9b https://github.com/facebook/ocamlrep/commit/5044487d774bb5ad3794872f7c567ec859cff491 https://github.com/facebookincubator/velox/commit/eab7c0572c03766472273c74373bbdc5d8f7308e Reviewed By: jurajh-fb fbshipit-source-id: 7f1a107072fdc25088ae8941f0cd229b31c03f82 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6168d413a10a..36f57148701d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b6fc5df08c40a5a0629a6cb5fdd5e9ca509e3d27 +Subproject commit 483d754d24899fdcbfe5e3cf717871ba9b5cf1fa diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 5351fff75d55..18d1f2f0b02e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b8f65b19372207c60889836787b7734f0124bfa9 +Subproject commit a1a57a68ffd92e6828932f69e04c7117a76c0f46 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 387845a55a5d..6ac39896abbf 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 73cc31d482ff9323fb504d6ee4faa0e47c195850 +Subproject commit decd4fab936d0ef3f651224004a2a4de36ac6948 From abb74e3329dbd297855b679f2d11e69db1bcef46 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 18 Aug 2023 12:29:09 -0700 Subject: [PATCH 6379/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5f99b27f6ae009c0719de1844f6eb95a8795544a https://github.com/facebook/litho/commit/efc33f980e92e8259139352f710264e949bd01c0 https://github.com/facebook/mvfst/commit/1abfe5a2fa3c3a50a0d3efbee56d4d258e6c1ce4 https://github.com/facebook/proxygen/commit/db6d58c1e3a1f9adca5ca2c16a93dda3ddfef18b https://github.com/facebook/rocksdb/commit/0fa0c97d3e9ac5dfc2e7ae94834b0850cdef5df7 https://github.com/facebook/wangle/commit/2cca475e311be262d1ad827437c93f4445ab856e https://github.com/facebook/watchman/commit/8f653f0e65277c95520343196fc1bcb82774353d https://github.com/facebookexperimental/edencommon/commit/8968aba6d3323bcae46badf40ef711854aa97be3 https://github.com/facebookincubator/katran/commit/940c137ac8e0816a2af5b5640ae0723f455c2bd6 https://github.com/facebookincubator/velox/commit/1c6f79d98de23a1f9828077822f282b0705fbddc https://github.com/facebookresearch/vrs/commit/667fdb587f03c36432a60ee247c1b3c75bee311e Reviewed By: jurajh-fb fbshipit-source-id: eb811caf66cd5bf871bc8075d5ae2c1e31d9df49 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 36f57148701d..c56f6e5142fa 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 483d754d24899fdcbfe5e3cf717871ba9b5cf1fa +Subproject commit 5f99b27f6ae009c0719de1844f6eb95a8795544a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6ac39896abbf..d4e7d2d025d2 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit decd4fab936d0ef3f651224004a2a4de36ac6948 +Subproject commit 2cca475e311be262d1ad827437c93f4445ab856e From 6b6f0acd2a6dee754f63c47be11a0cfd7d69acd6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 18 Aug 2023 13:40:11 -0700 Subject: [PATCH 6380/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/e92804c897ed828e98ad6eb4c76fe6c222145aea https://github.com/facebook/fbthrift/commit/a1789ac5a240a38ba0b6e194e4c865981df61016 https://github.com/facebook/folly/commit/7d73f1c570c667f416eb46be444790ab8edd29d4 https://github.com/facebook/ocamlrep/commit/9e5984738f1eb1173a990bbc250c8cd712bc2e30 https://github.com/facebook/proxygen/commit/368e6c4d0644320d69e1d54c9da3b674dda6944e https://github.com/facebookincubator/velox/commit/79638ed8f2445248456c18508b628079215ebd34 Reviewed By: jurajh-fb fbshipit-source-id: 0f4dae2b30ff7cfdafba029a4d09110f02e15ae5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c56f6e5142fa..015c338a2c55 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5f99b27f6ae009c0719de1844f6eb95a8795544a +Subproject commit a1789ac5a240a38ba0b6e194e4c865981df61016 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 18d1f2f0b02e..e940970498f9 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a1a57a68ffd92e6828932f69e04c7117a76c0f46 +Subproject commit 7d73f1c570c667f416eb46be444790ab8edd29d4 From d56299867b7b5a53971079835e88234069aa08b8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 18 Aug 2023 17:48:00 -0700 Subject: [PATCH 6381/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/3b43d3bb72b68ab350ad93559dda2850bd0b9d25 https://github.com/facebook/proxygen/commit/c5d27f1383a48306f955ae3d9c52d6ab022ffd21 https://github.com/facebook/rocksdb/commit/f65a0379f0710be894fa72ebfcb4527d6d2ee3f0 https://github.com/facebookincubator/velox/commit/e1f4c8f79dd1e878ad01233f16add03e3e658d54 Reviewed By: jurajh-fb fbshipit-source-id: 75e02c8810db86f6acc2d420b24d78654ed160cc --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 015c338a2c55..6cebefb0e968 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a1789ac5a240a38ba0b6e194e4c865981df61016 +Subproject commit 3b43d3bb72b68ab350ad93559dda2850bd0b9d25 From ba55b677790200053321281cf5f546074a29faa0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 18 Aug 2023 19:34:05 -0700 Subject: [PATCH 6382/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/418e8ec9a4c2568d1f0d5db27ade81ae4acef66a https://github.com/facebook/rocksdb/commit/f53018c0c8a312be86eb0df956e03d4c81706030 https://github.com/facebookincubator/velox/commit/24276a10353cddb68fd7175097bf5695c6fa54f8 Reviewed By: jurajh-fb fbshipit-source-id: 01377bcec0231f203ab2a9d034f2ca50a4ee9e39 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e940970498f9..a8e32a249ecb 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7d73f1c570c667f416eb46be444790ab8edd29d4 +Subproject commit 418e8ec9a4c2568d1f0d5db27ade81ae4acef66a From 90aecd99a3efefbee8e37251752992d71e02cce4 Mon Sep 17 00:00:00 2001 From: Mack Ward Date: Fri, 18 Aug 2023 20:13:40 -0700 Subject: [PATCH 6383/7387] Upgrade zlib to 1.3 Summary: X-link: https://github.com/facebookincubator/velox/pull/6169 As of today, zlib 1.2.13 is no more: ``` $ with-proxy wget https://zlib.net/zlib-1.2.13.tar.gz --2023-08-18 18:01:43-- https://zlib.net/zlib-1.2.13.tar.gz Resolving fwdproxy (fwdproxy)... 2401:db00:12ff:ff13:face:b00c:0:1e10 Connecting to fwdproxy (fwdproxy)|2401:db00:12ff:ff13:face:b00c:0:1e10|:8080... connected. Proxy request sent, awaiting response... 404 Not Found 2023-08-18 18:01:43 ERROR 404: Not Found. ``` It's causing CI failures: https://www.internalfb.com/intern/sandcastle/job/36028798043461030 This diff updates to the latest version to fix the errors. As of today, zlib 1.13 is the new hotness: https://zlib.net/ {F1072264715} Reviewed By: ASchneidman Differential Revision: D48490699 fbshipit-source-id: 333cef334f9ae89938b3fe3d046804477ff4cfe2 --- build/fbcode_builder/manifests/zlib | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/manifests/zlib b/build/fbcode_builder/manifests/zlib index 89502194aec6..86647fc9275e 100644 --- a/build/fbcode_builder/manifests/zlib +++ b/build/fbcode_builder/manifests/zlib @@ -12,10 +12,10 @@ zlib-devel zlib-static [download] -url = https://zlib.net/zlib-1.2.13.tar.gz -sha256 = b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30 +url = https://zlib.net/zlib-1.3.tar.gz +sha256 = ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e [build] builder = cmake -subdir = zlib-1.2.13 +subdir = zlib-1.3 patchfile = zlib_dont_build_more_than_needed.patch From f9d4466852fc034055c8c9894ecb0365695ba4a4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 18 Aug 2023 21:34:03 -0700 Subject: [PATCH 6384/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/4609c17f897aa445001452883fa530e46f4d11e2 https://github.com/facebook/fbthrift/commit/f42fdbf1ff8f9a11f4d4af6deb43c29f94e2371f https://github.com/facebook/folly/commit/47931947ef40927e64b6375cd2b50061afd90e61 https://github.com/facebook/mvfst/commit/d489d08dbcda4c706f7b2706c7d4aff71bc04459 https://github.com/facebook/ocamlrep/commit/56faf7bce9e55fd1affe756def834a5393448894 https://github.com/facebook/proxygen/commit/fc08e2a7c0c7990a5609fd516a1988f2e77b2e82 https://github.com/facebook/wangle/commit/6cea008ac903f2676acf1b14c37dec360632a4fc https://github.com/facebook/watchman/commit/90aecd99a3efefbee8e37251752992d71e02cce4 https://github.com/facebookexperimental/edencommon/commit/a6049cbc4266ed123d29053741bf8f39db50b17e https://github.com/facebookexperimental/rust-shed/commit/c4aaa62c57512cb67a34a0c73237ec09d6965527 https://github.com/facebookincubator/fizz/commit/96ad2209ea013da8a2f5513a1918616f3ce984ca https://github.com/facebookincubator/katran/commit/05bed0b3a5cbc6024d1a8771f4a5bf34283fc93f https://github.com/facebookincubator/velox/commit/fe95052e9cbd514d712467d3f0bac3292bf4809f Reviewed By: jurajh-fb fbshipit-source-id: 2fc73e1c03ff6c5f4e681cd39123704705058c2c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6cebefb0e968..1a4d4a1e02f5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3b43d3bb72b68ab350ad93559dda2850bd0b9d25 +Subproject commit f42fdbf1ff8f9a11f4d4af6deb43c29f94e2371f diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a8e32a249ecb..b3b61eac51cf 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 418e8ec9a4c2568d1f0d5db27ade81ae4acef66a +Subproject commit 47931947ef40927e64b6375cd2b50061afd90e61 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d4e7d2d025d2..71a519f7150d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2cca475e311be262d1ad827437c93f4445ab856e +Subproject commit 6cea008ac903f2676acf1b14c37dec360632a4fc From a1d611165580f2fbfb2680a18752dd19e8f53213 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 19 Aug 2023 22:11:42 -0700 Subject: [PATCH 6385/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/de86b367837af5c4a6906515599d0dee42ad5336 Reviewed By: jurajh-fb fbshipit-source-id: 4b310bf543561fcbe09cbedfa70b8f4838774304 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1a4d4a1e02f5..1973566d7b67 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f42fdbf1ff8f9a11f4d4af6deb43c29f94e2371f +Subproject commit de86b367837af5c4a6906515599d0dee42ad5336 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b3b61eac51cf..66774aabb942 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 47931947ef40927e64b6375cd2b50061afd90e61 +Subproject commit 48227f514017c97d55f0b8b40786e91980e28b9c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 71a519f7150d..c5ac04bbdfb6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6cea008ac903f2676acf1b14c37dec360632a4fc +Subproject commit ec1d3637dc3b1814f0f7c0400b8d394fa7a07040 From 332a3ab22ca5a23c95995af1e333e36348f69e98 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 20 Aug 2023 12:47:55 -0700 Subject: [PATCH 6386/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fatal/commit/534770812681c614e5971b3a6998ca355300b82a https://github.com/facebook/fbthrift/commit/9d77337a6606498a3f388086fc464dbfd2c17e27 Reviewed By: jurajh-fb fbshipit-source-id: 3e8c1d60ce8176a4cfa0d5d9b6cb8b6025d71cee --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1973566d7b67..f293df442adb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit de86b367837af5c4a6906515599d0dee42ad5336 +Subproject commit 9d77337a6606498a3f388086fc464dbfd2c17e27 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 66774aabb942..513227556d34 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 48227f514017c97d55f0b8b40786e91980e28b9c +Subproject commit fe4a8b2736fadf3e50369034da7c1a856c5705b1 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c5ac04bbdfb6..0863754b8dde 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ec1d3637dc3b1814f0f7c0400b8d394fa7a07040 +Subproject commit 553b08e3111715d3e5285ac26a96fd7f44888d61 From c7c7571a0ce49da496fda2eafd00aa0be7e868fd Mon Sep 17 00:00:00 2001 From: Andres Suarez Date: Mon, 21 Aug 2023 06:07:02 -0700 Subject: [PATCH 6387/7387] Update serde from 1.0.176 to 1.0.185 Summary: This release most notably removes the precompiled serde_derive: https://github.com/serde-rs/serde/releases/tag/v1.0.184 Reviewed By: shayne-fletcher Differential Revision: D48516549 fbshipit-source-id: 077f650094f9424982de9283d04ede59306947b0 --- watchman/cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index d2c7dc97a1fb..2a082a408f58 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -11,7 +11,7 @@ ahash = "0.8" anyhow = "1.0.71" duct = "0.13.6" jwalk = "0.6" -serde = { version = "1.0.176", features = ["derive", "rc"] } +serde = { version = "1.0.185", features = ["derive", "rc"] } serde_json = { version = "1.0.100", features = ["float_roundtrip", "unbounded_depth"] } structopt = "0.3.23" sysinfo = "0.26.8" From d1d1236ff8738476ce944c5f3c22cdadb702a3c9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 21 Aug 2023 10:27:22 -0700 Subject: [PATCH 6388/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/b43243891af85df5d87d63466a3770a2a4f98779 https://github.com/facebook/fb303/commit/376a2caa135f1e29cba753da53358766640062f7 https://github.com/facebook/fbthrift/commit/f6ab4b59766f098cc4fb254a3d024fa47ece0ccc https://github.com/facebook/litho/commit/8d85ef669334c3ec898ca3dc1908fbf4bd0b7149 https://github.com/facebook/mvfst/commit/d8328171759f9f8ca53e993b9e840ba2dee28b60 https://github.com/facebook/ocamlrep/commit/abc14b8aafcc6746ec37bf7bf0de24bfc58d63a0 https://github.com/facebook/proxygen/commit/fcce055c1e52587875dfb775fd4ca30f97a89764 https://github.com/facebook/wangle/commit/b68ce1cdaeace95108e26f6a8b633cbd1ebe53eb https://github.com/facebook/watchman/commit/c7c7571a0ce49da496fda2eafd00aa0be7e868fd https://github.com/facebookexperimental/edencommon/commit/7d2d00042d6de63260b986d59fbd16b28f46daf5 https://github.com/facebookexperimental/rust-shed/commit/32c067cd871b3d374810a9223343119790165510 https://github.com/facebookincubator/fizz/commit/c723645c64bea3976edb2fb57d8f7b14b4166df5 https://github.com/facebookincubator/katran/commit/e1e48ff0d30f28a8f6eca028f122c2a5f80b6b67 https://github.com/facebookincubator/velox/commit/086e710ee189367f04b3d9e99ad28fcebd41d195 https://github.com/facebookresearch/vrs/commit/be5dc15007307b0285ab905e4d901014cab14c87 Reviewed By: bigfootjon fbshipit-source-id: 2dbf1f74c9e8a57bf89da477545eecd20f30e01d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f293df442adb..0b19e32a0543 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9d77337a6606498a3f388086fc464dbfd2c17e27 +Subproject commit f6ab4b59766f098cc4fb254a3d024fa47ece0ccc diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0863754b8dde..538457ac651c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 553b08e3111715d3e5285ac26a96fd7f44888d61 +Subproject commit b68ce1cdaeace95108e26f6a8b633cbd1ebe53eb From cd5aeebf8d6f1335a52561c37008e89e07600811 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 21 Aug 2023 14:50:39 -0700 Subject: [PATCH 6389/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/27e1a18b9045ee0177a56653c985836939d42561 https://github.com/facebook/fbthrift/commit/afe9dc81b2d88933e20d61fc1dc8f4b7d45b298f https://github.com/facebook/rocksdb/commit/4b5352070975dbffb64c6fe9ace3f3789b4ffa02 Reviewed By: bigfootjon fbshipit-source-id: c1cc3924a51ec5056a8441e31a349aacb2f95e32 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0b19e32a0543..e8b147222532 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f6ab4b59766f098cc4fb254a3d024fa47ece0ccc +Subproject commit afe9dc81b2d88933e20d61fc1dc8f4b7d45b298f diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 513227556d34..33db32bab76c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit fe4a8b2736fadf3e50369034da7c1a856c5705b1 +Subproject commit 092003907c491c892d67876f60eaab7ea96a77e9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 538457ac651c..9bb6c18f77e2 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b68ce1cdaeace95108e26f6a8b633cbd1ebe53eb +Subproject commit 39f0dbf02ce2bdfd6de5a824caf1145cc4df059a From fccc84b15b08b352328c03abb7c79b29362e0b1f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 21 Aug 2023 15:58:41 -0700 Subject: [PATCH 6390/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/94f09c6565925d6f525663a62898d78264890b42 https://github.com/facebook/folly/commit/6585c96508c123a79d5a5c65add7829c0b733fdd https://github.com/facebook/rocksdb/commit/2a9f3b6cc5aa072ce823fd35dcdb0e00c88c9279 https://github.com/facebookincubator/velox/commit/7523c9be58c31be02ebeb01cd19b44a31d716caf Reviewed By: bigfootjon fbshipit-source-id: 110200cbc76bcacf8a66f59bc59f2159ac50a3dd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e8b147222532..10248abe1982 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit afe9dc81b2d88933e20d61fc1dc8f4b7d45b298f +Subproject commit 94f09c6565925d6f525663a62898d78264890b42 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 33db32bab76c..6bf47e343828 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 092003907c491c892d67876f60eaab7ea96a77e9 +Subproject commit 6585c96508c123a79d5a5c65add7829c0b733fdd From caa55ad01c1e5790abeb5294add0ea4d23ad9fc6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 21 Aug 2023 23:58:40 -0700 Subject: [PATCH 6391/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/92eded6a26e857e35574bc30b6268ece5304fc7d https://github.com/facebookincubator/velox/commit/dbe2d2f7efeb64ac33eb21456d335910b735e364 Reviewed By: bigfootjon fbshipit-source-id: c9963b169179697c04961d14036f964ebf2221fd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 10248abe1982..b9d61a45e8ad 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 94f09c6565925d6f525663a62898d78264890b42 +Subproject commit 92eded6a26e857e35574bc30b6268ece5304fc7d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6bf47e343828..074149b260ef 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 6585c96508c123a79d5a5c65add7829c0b733fdd +Subproject commit c8deb52afd5caf9912c8150af420396713ac0eff From 465d7d8f77e77434a10f25477d0224485a51c961 Mon Sep 17 00:00:00 2001 From: Saul Gutierrez Date: Tue, 22 Aug 2023 15:44:27 -0700 Subject: [PATCH 6392/7387] symlinks: make watchman report symlinks Summary: This diff makes Watchman report the proper filemode for symlinks on Windows, which makes `hg status` and other related commands work for the old Python status. Note that some additional changes are still needed to make the new Rust status command work with watchman. This change also makes `test-symlinks.t` work with watchman on Windows Reviewed By: quark-zju Differential Revision: D47451133 fbshipit-source-id: c9f93ea7a2add7684983f92b9daec0846c766f5d --- watchman/fs/FileInformation.cpp | 8 +++----- watchman/fs/FileInformation.h | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/watchman/fs/FileInformation.cpp b/watchman/fs/FileInformation.cpp index c25826dd1065..852fa111600a 100644 --- a/watchman/fs/FileInformation.cpp +++ b/watchman/fs/FileInformation.cpp @@ -36,11 +36,9 @@ FileInformation::FileInformation(uint32_t dwFileAttributes) mode = 0666; } if (fileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) { - // It's a symlink, but to be msvc compatible, we report - // this as a file. Note that a reparse point can also - // have FILE_ATTRIBUTE_DIRECTORY set if the symlink was - // created with the intention of it appearing as a file. - mode |= _S_IFREG; + // Report it as a symlink. This is used by source control + // to detect symlinks. + mode |= S_IFLNK; } else if (fileAttributes & FILE_ATTRIBUTE_DIRECTORY) { mode |= _S_IFDIR | 0111 /* executable/searchable */; } else { diff --git a/watchman/fs/FileInformation.h b/watchman/fs/FileInformation.h index 86f49fdc9eb4..7f033956ec97 100644 --- a/watchman/fs/FileInformation.h +++ b/watchman/fs/FileInformation.h @@ -36,6 +36,7 @@ static_assert(S_IFMT == 0xF000, "The S_IFMT on Windows should be 0xF000"); #define DT_CHR ((_S_IFCHR) >> 12) #define DT_DIR ((_S_IFDIR) >> 12) #define DT_REG ((_S_IFREG) >> 12) +#define S_IFLNK 0xA000 #endif From bed00aca62bc016466efbc6f34c4dd1ef5fbe679 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 22 Aug 2023 23:07:59 -0700 Subject: [PATCH 6393/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/0a3df07594825ef724c75dc01a546d9953765916 https://github.com/facebook/fb303/commit/19c203c3dc34ecbadef0f5d9f3fb5f35ff4d9913 https://github.com/facebook/fbthrift/commit/a0ab87471e142532a0c8ea546b55de5ec918235b https://github.com/facebook/folly/commit/6b3dc22be2fd22057d0660e60be6dc7d7a63f1b4 https://github.com/facebook/mcrouter/commit/1300c80b52fd756a1bda656e4753b64473465fd6 https://github.com/facebook/mvfst/commit/56730dbae65c169f27568112b783fbd787db2477 https://github.com/facebook/ocamlrep/commit/def74835f5c35c3349a605d5cafdfb8fdb3065f2 https://github.com/facebook/proxygen/commit/dc28ca51ddce5e72b8d5543edcc4b0c7d780511d https://github.com/facebook/rocksdb/commit/2b6bcfe590fa6bded36d5ccdc416527a8faa759a https://github.com/facebook/wangle/commit/f300129f9a15bdbaac87ebaf4c4aa23fcd6fa791 https://github.com/facebook/watchman/commit/465d7d8f77e77434a10f25477d0224485a51c961 https://github.com/facebookexperimental/edencommon/commit/5531036bd44c3823bf18dfc1879aee0382de3fcb https://github.com/facebookexperimental/rust-shed/commit/be4844916ddfdb94594f37b65f83328bebbcdd99 https://github.com/facebookincubator/fizz/commit/8005e59c89d3ebe050c1ae1ffcfdd17545cad88f https://github.com/facebookincubator/katran/commit/f2aefa747c9c8f778a979513fe6ba79ac34189a1 https://github.com/facebookincubator/velox/commit/41123e6af29b6f70d8259c54e0e644fbd63ea7c4 https://github.com/facebookresearch/multimodal/commit/ca99d8d993fe427325ab8d8ff598d51e15e761d5 https://github.com/pytorch/fbgemm/commit/ddbfa97199bd7eb0f6c6691cd3239455cb8f394e Reviewed By: jailby fbshipit-source-id: 3c4c33e94d52758f48313a5b87ee5225c2025092 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b9d61a45e8ad..e2fc7a1cd66c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 92eded6a26e857e35574bc30b6268ece5304fc7d +Subproject commit a0ab87471e142532a0c8ea546b55de5ec918235b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 074149b260ef..be8c671a2f35 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c8deb52afd5caf9912c8150af420396713ac0eff +Subproject commit 6b3dc22be2fd22057d0660e60be6dc7d7a63f1b4 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9bb6c18f77e2..a9dc9928338b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 39f0dbf02ce2bdfd6de5a824caf1145cc4df059a +Subproject commit f300129f9a15bdbaac87ebaf4c4aa23fcd6fa791 From 23b13628ad5d683ce149d187fc84406cfd1244d2 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 23 Aug 2023 05:51:10 -0700 Subject: [PATCH 6394/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5fdf236ede3297b271af6d49e8d9703f55a0cd58 https://github.com/facebookincubator/conversionsapi-tag-for-googletagmanager/commit/9fff02672b614b4376e91179b98b5a081324c19c https://github.com/facebookincubator/velox/commit/ee80ae66f3b24f5bad06b6f89eb3ddc317fe74a8 Reviewed By: jailby fbshipit-source-id: 6e11bb9d922cea22151b957d05b63bbb2b4188d3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e2fc7a1cd66c..09a0e7f1b39f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a0ab87471e142532a0c8ea546b55de5ec918235b +Subproject commit 5fdf236ede3297b271af6d49e8d9703f55a0cd58 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a9dc9928338b..4af5c6007dfb 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f300129f9a15bdbaac87ebaf4c4aa23fcd6fa791 +Subproject commit 182eb75653442816592c7d218f0f673650eae4ce From ec7db31d6ad8e2d67019c6f025d542910d72ea07 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 23 Aug 2023 10:57:36 -0700 Subject: [PATCH 6395/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/c2e34195dea0d6635196711e71670a562fcfd11d https://github.com/facebook/ocamlrep/commit/f2f81c6814bab9264abc38a3be3cec4d4e7a5ed2 https://github.com/facebook/proxygen/commit/2a2ac80df901a6af3aa5b0bff5c14d2cdd02d602 https://github.com/facebookincubator/velox/commit/62df653e9a8ce539fca9dbe6540600bc4114f85c https://github.com/pytorch/kineto/commit/9d16f57f637871c96e284329034eee48d514a9a1 Reviewed By: jailby fbshipit-source-id: fd8a230d95b66537c995465f56aa6ed8e136c3c2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 09a0e7f1b39f..9b6b41341186 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5fdf236ede3297b271af6d49e8d9703f55a0cd58 +Subproject commit c2e34195dea0d6635196711e71670a562fcfd11d From 6373d34da6a0f274265f950a72811ba22f60c73e Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Wed, 23 Aug 2023 11:39:00 -0700 Subject: [PATCH 6396/7387] add Fedora 37 and 38 Vagrant images Summary: Fedora 36 is EOL, so I wanted to verify that Watchman built correctly on Fedora 37 and Fedora 38. (It does.) Reviewed By: genevievehelsel Differential Revision: D48566983 fbshipit-source-id: 6796629c23a56660d973a31e20b1ff5d0cb85ddc --- watchman/build/vagrant/Vagrantfile | 36 ++++++++++++++++-------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/watchman/build/vagrant/Vagrantfile b/watchman/build/vagrant/Vagrantfile index f64d6fe80ab0..aede0a529d98 100644 --- a/watchman/build/vagrant/Vagrantfile +++ b/watchman/build/vagrant/Vagrantfile @@ -165,23 +165,25 @@ Vagrant.configure("2") do |config| sync_fuse ubuntu end - config.vm.define "watchman-fedora-35", autostart: false do |fedora35| - fedora35.vm.box = "generic/fedora35" - fedora35.vm.hostname = "watchman-fedora-35" - - provision_fedora fedora35 - provider_linux fedora35 - sync_fuse fedora35 - end - - config.vm.define "watchman-fedora-36", autostart: false do |fedora36| - fedora36.vm.box = "generic/fedora36" - fedora36.vm.hostname = "watchman-fedora-36" - - provision_fedora fedora36 - provider_linux fedora36 - sync_fuse fedora36 - end + fedora_vms = [ + {name: "watchman-fedora-35", box: "generic/fedora35"}, + {name: "watchman-fedora-36", box: "generic/fedora36"}, + {name: "watchman-fedora-37", box: "generic/fedora37"}, + # boxen needs many more packages installed by default. Maybe + # generic/ will release a Fedora 38 box soon. + {name: "watchman-fedora-38", box: "boxen/fedora-38-x86_64"}, + ] + + fedora_vms.each { |fedora_vm| + config.vm.define fedora_vm[:name], autostart: false do |config| + config.vm.box = fedora_vm[:box] + config.vm.hostname = fedora_vm[:name] + + provision_fedora config + provider_linux config + sync_fuse config + end + } config.vm.define "watchman-freebsd" do |freebsd| freebsd.vm.box = "generic/freebsd12" From c815583a758be3bd34cb586ad8bc7c71a1eca3a1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 23 Aug 2023 11:56:24 -0700 Subject: [PATCH 6397/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/6d6cb2d3ed7fabe13e9251028730f8ed4d12718d https://github.com/facebook/ocamlrep/commit/aecbdddf0e494f7a04318da43c11fea44206afb2 https://github.com/facebook/watchman/commit/ec7db31d6ad8e2d67019c6f025d542910d72ea07 https://github.com/facebookincubator/velox/commit/4e18dcbc7018149db55ed907f8b85551db8cffaa Reviewed By: jailby fbshipit-source-id: ec721dbed1a2efb419bf5b8e24a77e71822d6c1c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9b6b41341186..951ae981de26 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c2e34195dea0d6635196711e71670a562fcfd11d +Subproject commit 6d6cb2d3ed7fabe13e9251028730f8ed4d12718d From 440a7d74c4b41f293acd910b26d549cb0aa2750b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 23 Aug 2023 13:06:50 -0700 Subject: [PATCH 6398/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8f79326b87eeeda32bca386911715f16bc78dd2d https://github.com/facebook/folly/commit/471c7a26e0cccf928fe2c4e7dcaf308d86fb7c0b https://github.com/facebook/rocksdb/commit/f833ca3878ecff6ce7ca66319bc30255aeefcdad https://github.com/facebook/watchman/commit/c815583a758be3bd34cb586ad8bc7c71a1eca3a1 https://github.com/facebookincubator/velox/commit/755bbf70c59deda59522dc54cc641b34e70fa2a8 https://github.com/pytorch/fbgemm/commit/179b78e996e28d40bee0a25275721b180d8a30a0 Reviewed By: jailby fbshipit-source-id: 5bfbb67e0eb995704108228cc8a0e5e6a03a7ca1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 951ae981de26..90b8f20d4a1f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6d6cb2d3ed7fabe13e9251028730f8ed4d12718d +Subproject commit 8f79326b87eeeda32bca386911715f16bc78dd2d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index be8c671a2f35..e026cdb6f0f3 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 6b3dc22be2fd22057d0660e60be6dc7d7a63f1b4 +Subproject commit 471c7a26e0cccf928fe2c4e7dcaf308d86fb7c0b From 88b1aaaaf8e470e8aacb165f102b8a2c662b1def Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 23 Aug 2023 15:39:24 -0700 Subject: [PATCH 6399/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fatal/commit/b81bb23e1b220147d27aa147272e0a69a3f6ec4a https://github.com/facebook/fbthrift/commit/2eef7139fc7fe8937e094486c376181047149aa0 https://github.com/facebook/ocamlrep/commit/a5abe5b6b798d7ee3d26fa4e229b101e6641a284 https://github.com/facebook/proxygen/commit/14d04f64b0b6a82917e07cc95d60f455a4fde6bd https://github.com/facebookincubator/katran/commit/5a0e4332aac5cb0bbac87f37cc61634250663c58 https://github.com/facebookincubator/velox/commit/4a88a15eeb76400bb5713e4d6adcd66ac1d4421c https://github.com/pytorch/fbgemm/commit/058ac2e19240d86ea7006313470df3b4e3891f9d Reviewed By: jailby fbshipit-source-id: 8242d4a64896b10d9de0392fea5807e9e21367ee --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 90b8f20d4a1f..b957e9b718ef 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8f79326b87eeeda32bca386911715f16bc78dd2d +Subproject commit 2eef7139fc7fe8937e094486c376181047149aa0 From 7b1c49b9bda882e5a15949552ff408e4ff1e1401 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 24 Aug 2023 14:51:31 -0700 Subject: [PATCH 6400/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/c883dc3bd65b6f1f9a76a333e35f4b19a5f8d77b https://github.com/facebook/litho/commit/51942029787420cc913896be975a4ad4078fed93 https://github.com/facebook/mvfst/commit/e60a8df41c0c5ed4c334e5c93a82de081b6f87d7 https://github.com/facebook/ocamlrep/commit/1fb7430265d102d27fe4115131a270f0320f1a8b https://github.com/facebook/wangle/commit/ded44fe5d5e7de29313311cf0be769dcd77c5e31 https://github.com/facebookexperimental/edencommon/commit/39908605eebca9b58e844c7c250d522451b26223 https://github.com/facebookincubator/katran/commit/a23a2679c39f27326fcb88c716ed6a82c46cee23 Reviewed By: jailby fbshipit-source-id: 382a1acdd94f4dcc630444e825e8ba4e66f7fae5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b957e9b718ef..8952152f7983 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2eef7139fc7fe8937e094486c376181047149aa0 +Subproject commit c883dc3bd65b6f1f9a76a333e35f4b19a5f8d77b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e026cdb6f0f3..56ed0bd7a046 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 471c7a26e0cccf928fe2c4e7dcaf308d86fb7c0b +Subproject commit 50f37df6709293fcb86c3227a5e3c4769a0c3a9e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4af5c6007dfb..26cf51c550e6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 182eb75653442816592c7d218f0f673650eae4ce +Subproject commit ded44fe5d5e7de29313311cf0be769dcd77c5e31 From 757d5252f3164b0aaaec479ee304bb8c01770099 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 24 Aug 2023 16:06:13 -0700 Subject: [PATCH 6401/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/649d0e1793068fb028fd1dae0a5b6e7185264b33 https://github.com/facebook/proxygen/commit/c879e9412ed1dc914dbdcc5a9d88f8e46a1c2620 https://github.com/facebook/rocksdb/commit/6353c6e2fbac3c982dd93e7be9208fed27107803 https://github.com/facebookincubator/velox/commit/a90bf3b28687d317481c0ab3a9cc72972e16afa9 Reviewed By: jailby fbshipit-source-id: 5b8daad1a2631a217596c1691cebf9f42386bab3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8952152f7983..3f640016ffde 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c883dc3bd65b6f1f9a76a333e35f4b19a5f8d77b +Subproject commit 649d0e1793068fb028fd1dae0a5b6e7185264b33 From 0b8e4d9e033d8eda9d2b0a9e33bbe58d28b94349 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 25 Aug 2023 12:06:14 -0700 Subject: [PATCH 6402/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/bfe734f327deaaad026c93c2d4ec97d3add50690 https://github.com/facebook/folly/commit/852f6bb1e0df6cd4e73e49b45e08d217c6af1788 https://github.com/facebook/litho/commit/cf69441cc1a38f05fb1c8e3645dbb51f057d894b https://github.com/pytorch/fbgemm/commit/6450f9f02db6d0407f6908c7d93dabc072b8964d Reviewed By: jailby fbshipit-source-id: 289a9c8d88973c2b78cee26c6d56a249397735ff --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3f640016ffde..816d6132b794 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 649d0e1793068fb028fd1dae0a5b6e7185264b33 +Subproject commit 2f8eadaac1f410296c237fb0d007801e7f5e6269 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 56ed0bd7a046..8dcdbd7e8843 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 50f37df6709293fcb86c3227a5e3c4769a0c3a9e +Subproject commit 852f6bb1e0df6cd4e73e49b45e08d217c6af1788 From daee325bd5e17f97539558dfadb983c7654f4bd3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 25 Aug 2023 14:09:27 -0700 Subject: [PATCH 6403/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/ff6dea79ffb17981642df250c55a0356df16447b https://github.com/facebook/fbthrift/commit/e2f9e47d8ccda784c615c332c8bebd59010dcfec https://github.com/facebook/litho/commit/369e06484f55c14ecb5dc76db4bdbb13e9499a09 https://github.com/facebook/ocamlrep/commit/14b8a006013a60440292876e63e4fe8eca07c7bb https://github.com/facebook/proxygen/commit/f1712fbb6924465c813174ab2f412584a9314e53 https://github.com/facebookexperimental/edencommon/commit/176bc68569b89bfe23f89939ec1f1dea3e220b0c https://github.com/facebookincubator/fizz/commit/0ec4bc9f9c72a4ba08dbaef24fabde24efd70119 https://github.com/facebookincubator/katran/commit/c169ad86caf9b12bdd71ba6ca0c30fd608cce290 https://github.com/facebookincubator/velox/commit/233f8cdca8d2db4f36a1c3e61fdf3b3ae9cb725b https://github.com/fairinternal/egohowto/commit/aab76c82baaa28286040e0db7610d9465c2c30da Reviewed By: jailby fbshipit-source-id: 348a9ce2eea7fca609541cda211c2e3bb54b0093 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 816d6132b794..47ec6b0e444e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2f8eadaac1f410296c237fb0d007801e7f5e6269 +Subproject commit e2f9e47d8ccda784c615c332c8bebd59010dcfec From 8d3d2f0cfaef2f33bea7bee23c1e0d2a78da7fd4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 25 Aug 2023 15:23:03 -0700 Subject: [PATCH 6404/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/4193f076d382d53a2eee11023561b28a58b782a6 https://github.com/facebook/rocksdb/commit/6cbb10466368217a91d3f293d62f48a47862f8e5 https://github.com/facebook/wangle/commit/08ce3f26545ff36b6913662eae9b11b186b4354f https://github.com/facebook/watchman/commit/daee325bd5e17f97539558dfadb983c7654f4bd3 https://github.com/facebookincubator/velox/commit/d6caa6fc3875eda9f3e6c785ee0464c37d4cbd24 https://github.com/pytorch/fbgemm/commit/d3f727ba1f5361f571f307767cef93eaf3432e9d Reviewed By: jailby fbshipit-source-id: 8978bf048285bf637d0423459a019fa726b2f165 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 47ec6b0e444e..26aab0abc727 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e2f9e47d8ccda784c615c332c8bebd59010dcfec +Subproject commit 4193f076d382d53a2eee11023561b28a58b782a6 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 26cf51c550e6..f0c26fa587f0 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ded44fe5d5e7de29313311cf0be769dcd77c5e31 +Subproject commit 08ce3f26545ff36b6913662eae9b11b186b4354f From 619040be7d7ec8f7e41dfca14c7778e5339d0708 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 25 Aug 2023 17:13:15 -0700 Subject: [PATCH 6405/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/f9261edc299ca82b0589e160623e985bc303e4d5 https://github.com/facebook/fbthrift/commit/a08f646088b47192ca91ff9aba2393f6a3defbfe https://github.com/facebook/ocamlrep/commit/9d0492c55c5dbb3bd39723bbc4585ced8ff445af https://github.com/facebook/rocksdb/commit/38e9e6903eccf9f13a8def6a28eb967a749dac41 https://github.com/facebookincubator/velox/commit/efa420f763a4327991531ad8ffbaff21538aead7 https://github.com/facebookresearch/pytorch-biggraph/commit/ab12fb79c6da4f5821421153c0e8a6e9ab6808b6 https://github.com/pytorch/kineto/commit/6da7e1799e387d3ed3b003f013c05f377227042c Reviewed By: jailby fbshipit-source-id: 850ddbfcc7be947da9fe30df5b2d2e628366598b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 26aab0abc727..0ccb03c0daa1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4193f076d382d53a2eee11023561b28a58b782a6 +Subproject commit a08f646088b47192ca91ff9aba2393f6a3defbfe From e851fafef240231178480da25ce9a65807db0aeb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 26 Aug 2023 12:21:51 -0700 Subject: [PATCH 6406/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5827963a4b15720b9d873689e8267fb66e0464d4 https://github.com/facebook/proxygen/commit/6f12618646395694102ab84de70196c30dbb4b7c https://github.com/facebook/wangle/commit/1a0a3b5d13b7b2b28d5937991d30506b560620e9 https://github.com/facebookincubator/velox/commit/a472d32d02b68f993b88b441883f2517f829bc9b Reviewed By: jailby fbshipit-source-id: a54b3be3cacb358b008eb0a4272ab7b44c8ee445 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0ccb03c0daa1..570766547f4d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a08f646088b47192ca91ff9aba2393f6a3defbfe +Subproject commit 5827963a4b15720b9d873689e8267fb66e0464d4 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8dcdbd7e8843..9f3a8401ec80 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 852f6bb1e0df6cd4e73e49b45e08d217c6af1788 +Subproject commit d463d82ea26ab6d62b4ef7c269c5e26081be3940 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f0c26fa587f0..6cc68551cf2d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 08ce3f26545ff36b6913662eae9b11b186b4354f +Subproject commit 1a0a3b5d13b7b2b28d5937991d30506b560620e9 From a7f52e786f69790ac45c0cfe892a3ca23999ecb3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 27 Aug 2023 00:27:35 -0700 Subject: [PATCH 6407/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/a835316ab165d327d00e818504f30a248de5d97a https://github.com/facebookincubator/velox/commit/cc419a6ce000be6d625ab4434966b2896178b1e6 Reviewed By: jailby fbshipit-source-id: 8ad628baa4fa88843b6d0219ce80af5556077757 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 570766547f4d..4c96399fc215 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5827963a4b15720b9d873689e8267fb66e0464d4 +Subproject commit a835316ab165d327d00e818504f30a248de5d97a From 7a308a4508f574b8e0bc65b629c2657f4e7d7df5 Mon Sep 17 00:00:00 2001 From: Richard Barnes Date: Sun, 27 Aug 2023 00:58:15 -0700 Subject: [PATCH 6408/7387] Del `(object)` from 50 inc wa/xml_voip_validator/constraints_operators.py Summary: Python3 makes the use of `(object)` in class inheritance unnecessary. Let's modernize our code by eliminating this. Reviewed By: palmje Differential Revision: D48718329 fbshipit-source-id: c6a24d879de97c1f37cce14e3cfecc6c44c8413b --- watchman/integration/lib/TempDir.py | 2 +- watchman/integration/lib/WatchmanEdenTestCase.py | 2 +- watchman/integration/lib/WatchmanInstance.py | 6 +++--- watchman/python/pywatchman/__init__.py | 8 ++++---- watchman/python/pywatchman/pybser.py | 6 +++--- watchman/python/pywatchman/windows.py | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/watchman/integration/lib/TempDir.py b/watchman/integration/lib/TempDir.py index aba87793a109..2e4a167fcfae 100644 --- a/watchman/integration/lib/TempDir.py +++ b/watchman/integration/lib/TempDir.py @@ -20,7 +20,7 @@ global_temp_dir = None -class TempDir(object): +class TempDir: """ This is a helper for locating a reasonable place for temporary files. When run in the watchman test suite, we compute this up-front and then diff --git a/watchman/integration/lib/WatchmanEdenTestCase.py b/watchman/integration/lib/WatchmanEdenTestCase.py index 84c1673d5249..2221a1c815a6 100644 --- a/watchman/integration/lib/WatchmanEdenTestCase.py +++ b/watchman/integration/lib/WatchmanEdenTestCase.py @@ -39,7 +39,7 @@ def is_buck_build(): def can_run_eden(): return False - class WatchmanEdenTestCase(object): + class WatchmanEdenTestCase: pass else: diff --git a/watchman/integration/lib/WatchmanInstance.py b/watchman/integration/lib/WatchmanInstance.py index b5c29c50e05b..7c4b98ae12f8 100644 --- a/watchman/integration/lib/WatchmanInstance.py +++ b/watchman/integration/lib/WatchmanInstance.py @@ -52,7 +52,7 @@ def mergeTestConfig(config): return {**test_config, **(config or {})} -class InitWithFilesMixin(object): +class InitWithFilesMixin: def _init_state(self) -> None: # pyre-fixme[16]: `InitWithFilesMixin` has no attribute `base_dir`. self.base_dir = tempfile.mkdtemp(prefix="inst") @@ -87,7 +87,7 @@ def get_state_args(self): ] -class InitWithDirMixin(object): +class InitWithDirMixin: """A mixin to allow setting up a state dir rather than a state file. This is only meant to test state dir creation and permissions -- most operations are unlikely to work. @@ -121,7 +121,7 @@ def get_state_args(self): return ["--test-state-dir={0}".format(self.base_dir)] -class _Instance(object): +class _Instance: # Tracks a running watchman instance. It is created with an # overridden global configuration file; you may pass that # in to the constructor diff --git a/watchman/python/pywatchman/__init__.py b/watchman/python/pywatchman/__init__.py index a768909367cc..a1a8763e26b1 100644 --- a/watchman/python/pywatchman/__init__.py +++ b/watchman/python/pywatchman/__init__.py @@ -173,7 +173,7 @@ def is_named_pipe_path(path: str) -> bool: return path.startswith("\\\\.\\pipe\\watchman") -class SockPath(object): +class SockPath: """Describes how to connect to watchman""" unix_domain = None @@ -206,7 +206,7 @@ def legacy_sockpath(self): return self.unix_domain -class Transport(object): +class Transport: """communication transport to the watchman server""" buf = None @@ -251,7 +251,7 @@ def readLine(self): self.buf.append(b) -class Codec(object): +class Codec: """communication encoding for the watchman server""" transport = None @@ -824,7 +824,7 @@ def send(self, *args): self.transport.write(cmd + b"\n") -class client(object): +class client: """Handles the communication with the watchman service""" sockpath = None diff --git a/watchman/python/pywatchman/pybser.py b/watchman/python/pywatchman/pybser.py index e88fe395b1b4..db3a95ecd82e 100644 --- a/watchman/python/pywatchman/pybser.py +++ b/watchman/python/pywatchman/pybser.py @@ -65,7 +65,7 @@ def _buf_pos(buf, pos) -> bytes: return ret -class _bser_buffer(object): +class _bser_buffer: def __init__(self, version): self.bser_version = version self.buf = ctypes.create_string_buffer(8192) @@ -264,7 +264,7 @@ def dumps(obj, version: int = 1, capabilities: int = 0): # This is a quack-alike with the bserObjectType in bser.c # It provides by getattr accessors and getitem for both index # and name. -class _BunserDict(object): +class _BunserDict: __slots__ = ("_keys", "_values") def __init__(self, keys, values): @@ -290,7 +290,7 @@ def __len__(self): return len(self._keys) -class Bunser(object): +class Bunser: def __init__(self, mutable=True, value_encoding=None, value_errors=None): self.mutable = mutable self.value_encoding = value_encoding diff --git a/watchman/python/pywatchman/windows.py b/watchman/python/pywatchman/windows.py index 4e6ba08c4fa7..a15fb36fa1fc 100644 --- a/watchman/python/pywatchman/windows.py +++ b/watchman/python/pywatchman/windows.py @@ -219,7 +219,7 @@ def __init__(self, code: int) -> None: ) -class WindowsSocketHandle(object): +class WindowsSocketHandle: AF_UNIX = 1 SOCK_STREAM = 1 From 37edc8cb0aa57356fcf41dadd2b6b3f9408fd9c2 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 27 Aug 2023 12:26:32 -0700 Subject: [PATCH 6409/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/proxygen/commit/20d0b0261b0e6580f3e46483d811674d04d48868 https://github.com/facebook/wangle/commit/41e5b6d3a6abbb33bff6503af5f2164c3bd209a6 https://github.com/facebookincubator/katran/commit/e157ba59d72ccf4e9e49b088470986a38033c54b Reviewed By: jailby fbshipit-source-id: 7ce2347fadac78313f759f5f2aaa2fc3b42ca0d1 --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6cc68551cf2d..9688e2c82ae9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1a0a3b5d13b7b2b28d5937991d30506b560620e9 +Subproject commit 41e5b6d3a6abbb33bff6503af5f2164c3bd209a6 From f47c3de1b208f7edd69ea772461791f3e9160f29 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 27 Aug 2023 14:12:28 -0700 Subject: [PATCH 6410/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/ea5b01173eb947a1b98d52b9c2e41052d2d2f696 https://github.com/facebook/fb303/commit/3ad010b01dd7849048ec423e3d29989e59287efa https://github.com/facebook/fbthrift/commit/5dd749a5c4a1443493c0a7edb4b45be88f0734d3 https://github.com/facebook/watchman/commit/37edc8cb0aa57356fcf41dadd2b6b3f9408fd9c2 https://github.com/facebookexperimental/rust-shed/commit/4705b7f1f17573a056144aa36b379b5ac4404c60 https://github.com/pytorch/fbgemm/commit/d582fe36da2dca5c17fe62fa21b3e8952a607c05 Reviewed By: jailby fbshipit-source-id: f5b1575e0357a1c546897a695a8344f9b3679fae --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4c96399fc215..af554ff9e11d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a835316ab165d327d00e818504f30a248de5d97a +Subproject commit 5dd749a5c4a1443493c0a7edb4b45be88f0734d3 From 7fdb5a5fd8b041f7186a462b30cf5babb603e18a Mon Sep 17 00:00:00 2001 From: Richard Barnes Date: Sun, 27 Aug 2023 22:33:14 -0700 Subject: [PATCH 6411/7387] Del `(object)` from 50 inc watchman/python/pywatchman_aio/__init__.py Summary: Python3 makes the use of `(object)` in class inheritance unnecessary. Let's modernize our code by eliminating this. Reviewed By: palmje Differential Revision: D48718296 fbshipit-source-id: 13bd3775244fbe2404501a7a57b55eb0253c6d4c --- watchman/python/pywatchman_aio/__init__.py | 6 +++--- watchman/python/tests/tests.py | 2 +- watchman/runtests.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/watchman/python/pywatchman_aio/__init__.py b/watchman/python/pywatchman_aio/__init__.py index 1b2cd1907c06..592a7e3b9685 100644 --- a/watchman/python/pywatchman_aio/__init__.py +++ b/watchman/python/pywatchman_aio/__init__.py @@ -67,7 +67,7 @@ async def _resolve_sockname(): return await loop.run_in_executor(None, _resolve_sockname_helper) -class AsyncTransport(object): +class AsyncTransport: """Communication transport to the Watchman Service.""" async def activate(self, **kwargs): @@ -116,7 +116,7 @@ def close(self): self.writer.close() -class AsyncCodec(object): +class AsyncCodec: """Communication encoding for the Watchman service.""" def __init__(self, transport): @@ -177,7 +177,7 @@ class ReceiveLoopError(Exception): pass -class AIOClient(object): +class AIOClient: """Create and manage an asyncio Watchman connection. Example usage: diff --git a/watchman/python/tests/tests.py b/watchman/python/tests/tests.py index aeb3dbdf8940..eed1c5ef9e87 100755 --- a/watchman/python/tests/tests.py +++ b/watchman/python/tests/tests.py @@ -151,7 +151,7 @@ def init_bser_mod(self): make_class(mod, suffix) -class FakeFile(object): +class FakeFile: def __init__(self, data): self._data = data self._ptr = 0 diff --git a/watchman/runtests.py b/watchman/runtests.py index d0f4b7470c4f..40b4fbdd7a0a 100755 --- a/watchman/runtests.py +++ b/watchman/runtests.py @@ -389,7 +389,7 @@ def loadTestsFromModule(self, module, *args, **kw): # Manage printing from concurrent threads # http://stackoverflow.com/a/3030755/149111 -class ThreadSafeFile(object): +class ThreadSafeFile: def __init__(self, f): self.f = f self.lock = threading.RLock() From 58f88f0d2f53dc084b56d72a1dbff7292c5ed334 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 28 Aug 2023 00:08:16 -0700 Subject: [PATCH 6412/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/af486d466e571d8b416cba6b64f89727427ab4fb https://github.com/facebook/ocamlrep/commit/33ce2629bfc8bdcd6e570edd925d0165e8cf0f0d https://github.com/facebook/watchman/commit/7fdb5a5fd8b041f7186a462b30cf5babb603e18a https://github.com/facebookresearch/flsim/commit/97ea92df3bfb64d7344c0d979821c5d6589103ac https://github.com/pytorch/fbgemm/commit/d535d5e84ea6b2b7754f7cf8a91ad88f9fe8e584 Reviewed By: jailby fbshipit-source-id: fa8717e29c9bad34a01b0a4ab8985658ac819119 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9f3a8401ec80..cf5cde893f74 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d463d82ea26ab6d62b4ef7c269c5e26081be3940 +Subproject commit af486d466e571d8b416cba6b64f89727427ab4fb From ab8081e0bafd3813e593a0464ebf7fe4baf0593f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 28 Aug 2023 01:22:42 -0700 Subject: [PATCH 6413/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/mvfst/commit/7eadadbd36fd072709d3e2b7c81a2a744a748c59 https://github.com/facebook/wangle/commit/0390d49e06dd5d342258943743c437aca124e98c https://github.com/facebook/watchman/commit/58f88f0d2f53dc084b56d72a1dbff7292c5ed334 https://github.com/facebookexperimental/edencommon/commit/ce0666694a973e2a534ba5763d910652c77d0c0d https://github.com/facebookexperimental/rust-shed/commit/547c4dc85b7d72bdc3d8290f8fd6b47712c73efb https://github.com/facebookincubator/fizz/commit/70e2bc039b0b9c2a059a810771d9562b23319b5c https://github.com/facebookincubator/katran/commit/b6ff599e2d05cdf462b18d1226216faf0db1a56a https://github.com/facebookincubator/velox/commit/77c1c461716a7f7432892408301f3ab9f984d3ca Reviewed By: jailby fbshipit-source-id: 6596b46a88962b707f850310e6c2f0b470c7e651 --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9688e2c82ae9..e04c16a6a77e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 41e5b6d3a6abbb33bff6503af5f2164c3bd209a6 +Subproject commit 0390d49e06dd5d342258943743c437aca124e98c From 87cb7520c334d1efed782a90b033930a82c1e0b7 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 28 Aug 2023 11:42:35 -0700 Subject: [PATCH 6414/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/9a39d1c9dbd39123c96d324d37c530f1ec5a346b https://github.com/facebook/mvfst/commit/3b1ce5b8540186d112c48aba91f631d7cf6c3d54 https://github.com/facebook/ocamlrep/commit/d63494539eab200b1f5bc5668906cd2ca3ab8c1f https://github.com/facebook/wangle/commit/d8ae7dfb4f58ec73fbd674876f6b6228c64d69f4 https://github.com/facebookincubator/velox/commit/895291403ee2bb73ce2ba59ccc8052eadb7daeb5 Reviewed By: jailby fbshipit-source-id: c5910d86b43ba5feed5448d735d5de2bc02e0b73 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index af554ff9e11d..45f892f0fdbf 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5dd749a5c4a1443493c0a7edb4b45be88f0734d3 +Subproject commit 9a39d1c9dbd39123c96d324d37c530f1ec5a346b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e04c16a6a77e..b5536a71c4fa 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0390d49e06dd5d342258943743c437aca124e98c +Subproject commit d8ae7dfb4f58ec73fbd674876f6b6228c64d69f4 From 2a99cb531463624f5fbef9b6a0b885b5ecd089ce Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 28 Aug 2023 19:21:56 -0700 Subject: [PATCH 6415/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/be3ca3d1a889d0dcb6f0bad3af0ee1d2e8b11e3c https://github.com/facebook/fbthrift/commit/23555b2872ed5c2ccb042edf0fdc5fda19fd3cbe https://github.com/facebookresearch/multimodal/commit/1b4f79f16c51ce3efd5ea90d23575a1cd99ce8fd https://github.com/pytorch/fbgemm/commit/94f9499fcd411a7428176e66ae62a49598f1103e Reviewed By: jailby fbshipit-source-id: 8fd306c97580a8d083f9e9f083aec55d7e611bcb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 45f892f0fdbf..120bf9fc652a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9a39d1c9dbd39123c96d324d37c530f1ec5a346b +Subproject commit 23555b2872ed5c2ccb042edf0fdc5fda19fd3cbe From 8b22ad99cca708cfce8843638b522c7cf38f5ac8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 28 Aug 2023 21:20:54 -0700 Subject: [PATCH 6416/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/106251fe5df2e21d7fdc586e6d090d889ee49f08 Reviewed By: jailby fbshipit-source-id: f43e7f0d05d333f9baa53c6dc3aa9eac7c875aa8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 120bf9fc652a..96ce1ab548dd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 23555b2872ed5c2ccb042edf0fdc5fda19fd3cbe +Subproject commit 106251fe5df2e21d7fdc586e6d090d889ee49f08 From db5392ed523aa7a9c4b7b313d78e472e11b7e8c3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 29 Aug 2023 04:27:48 -0700 Subject: [PATCH 6417/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/170665d432bf2d2e245c8a74a7d7bf8de735160d Reviewed By: jailby fbshipit-source-id: 432de9f3c9dea0d2a774435755a17502a63dc70f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 96ce1ab548dd..e49244800c75 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 106251fe5df2e21d7fdc586e6d090d889ee49f08 +Subproject commit 170665d432bf2d2e245c8a74a7d7bf8de735160d From a27dc2f395ee061b96183c74faa60a8f16184cc5 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 29 Aug 2023 08:10:44 -0700 Subject: [PATCH 6418/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/da4242e0a6fce6f8b2669580bc2ce11c03bc40d4 Reviewed By: jailby fbshipit-source-id: d4e1cd1c256a1fad7d04b9817280e641e4041675 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e49244800c75..54ba76725168 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 170665d432bf2d2e245c8a74a7d7bf8de735160d +Subproject commit da4242e0a6fce6f8b2669580bc2ce11c03bc40d4 From 8330b4f7048a0f3ba182d9f8e49d3eb56385f2b5 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 29 Aug 2023 15:58:37 -0700 Subject: [PATCH 6419/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/da9322f3479e00af2b2fff8d9400d8f4d72b4b43 https://github.com/facebookincubator/velox/commit/69894b7c42c4435b400397aaed6b09bef664b597 Reviewed By: jailby fbshipit-source-id: 2b8bdaf1973c78bfa0b045789878aed96cca7741 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 54ba76725168..a05554f7e987 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit da4242e0a6fce6f8b2669580bc2ce11c03bc40d4 +Subproject commit da9322f3479e00af2b2fff8d9400d8f4d72b4b43 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index cf5cde893f74..029d7ec2e5fd 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit af486d466e571d8b416cba6b64f89727427ab4fb +Subproject commit b20a885045570502e3752f3ee2b2bcc9f4c67c96 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b5536a71c4fa..33f7702e5781 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d8ae7dfb4f58ec73fbd674876f6b6228c64d69f4 +Subproject commit 59bb2aa5e0e10699d7c63163f527dedd80eafca9 From 4465def83a478e5d9085993ae3becb2b59a97818 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 29 Aug 2023 16:45:32 -0700 Subject: [PATCH 6420/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/4576904d0dc1de60d2eab9194752304ea5f18681 https://github.com/facebookincubator/velox/commit/65363175f73c5ed40cb8dac2c3f2e37fc02ac615 Reviewed By: jailby fbshipit-source-id: 2033e77c9776713b86d38e89ada353655d661e38 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a05554f7e987..289544a81ba1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit da9322f3479e00af2b2fff8d9400d8f4d72b4b43 +Subproject commit 4576904d0dc1de60d2eab9194752304ea5f18681 From 875232024eb1454318d0e2d4e788e2fcd56a9997 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 29 Aug 2023 18:29:06 -0700 Subject: [PATCH 6421/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5e32ef4d5ccf331e0014ce52175094d4f3f8bdcc Reviewed By: jailby fbshipit-source-id: b883b51009990b0af0455778e7bbb5fb95c9aca5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 289544a81ba1..ca8288db9584 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4576904d0dc1de60d2eab9194752304ea5f18681 +Subproject commit 5e32ef4d5ccf331e0014ce52175094d4f3f8bdcc From a28662133fc752cf2f4d6b1785e1df51344b23b4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 30 Aug 2023 02:26:03 -0700 Subject: [PATCH 6422/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/e85c703111c0a9776ffbcb098a04689d27177c91 https://github.com/facebook/ocamlrep/commit/74589519e431cf0aeb9ecc5922ad45d4c9bea32e Reviewed By: bigfootjon fbshipit-source-id: 19b06d81e2b8f46c45d97bd214c1d3f6f0852ade --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ca8288db9584..4a93667b1437 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5e32ef4d5ccf331e0014ce52175094d4f3f8bdcc +Subproject commit e85c703111c0a9776ffbcb098a04689d27177c91 From 9abe05595a07b4a9b199813f02f52e7d4909e360 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 30 Aug 2023 16:06:06 -0700 Subject: [PATCH 6423/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7602fb89fcb60252e5eaf29e6376f751da0e4197 https://github.com/facebook/ocamlrep/commit/6ac6453f12c4b78f248bd8c81c736024b905792f https://github.com/facebook/rocksdb/commit/05daa123323b1471bde4723dc441763d687fd825 Reviewed By: bigfootjon fbshipit-source-id: bcf81fe1103dea29f5075edd1a00e6994720daac --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4a93667b1437..8ef94d881e6f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e85c703111c0a9776ffbcb098a04689d27177c91 +Subproject commit 7602fb89fcb60252e5eaf29e6376f751da0e4197 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 029d7ec2e5fd..29fd23567fc1 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b20a885045570502e3752f3ee2b2bcc9f4c67c96 +Subproject commit e31ecea3fb8ec395d226d65f774edddb60e01b8e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 33f7702e5781..7086debc26bf 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 59bb2aa5e0e10699d7c63163f527dedd80eafca9 +Subproject commit e9385375cc0e1ccfae3b89588a81e71d18907a9f From 0f6c285a58df680c5586593b87c779907aa4a0ac Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 30 Aug 2023 18:07:08 -0700 Subject: [PATCH 6424/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8a6c85bd5265678a6b9de41122eb4887899881d2 https://github.com/facebook/litho/commit/e37e35ba91044b48524634477a649d627783cd07 https://github.com/facebook/mvfst/commit/6e93d868ebe7054b2f858a5848faef6503dc3fa6 https://github.com/facebook/ocamlrep/commit/d10a25020099ec2d07cf6f3ea66ad8b908518a5c https://github.com/facebookincubator/velox/commit/c52fbfe0f56ee54a84efb7e66e3c8ae854f9e5c0 Reviewed By: bigfootjon fbshipit-source-id: 7af91b1f915a1a73e609134c7647afda6adab72b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8ef94d881e6f..5a03ca2e8c15 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7602fb89fcb60252e5eaf29e6376f751da0e4197 +Subproject commit 8a6c85bd5265678a6b9de41122eb4887899881d2 From 4be365dc8675cf506cd8cd56f73efbdda4baa526 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 31 Aug 2023 16:19:55 -0700 Subject: [PATCH 6425/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/2df227d29d2c67a829279b0bf46e9a9f5778e15e https://github.com/facebook/mvfst/commit/bb2a55c392b2a1f93b820d110b72c54d71d6c379 https://github.com/facebook/ocamlrep/commit/c796feb258633a34358d8a13839b8e1be01e4b5d https://github.com/facebook/proxygen/commit/dc89f614e3358bbe1cbf621c8b24f517a6ec7464 https://github.com/facebookincubator/katran/commit/53409d35b28f9098ed7c6619e46bd7484a8567d8 Reviewed By: bigfootjon fbshipit-source-id: cedffbb4af3acabb15eb860d748d075fc98177c5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5a03ca2e8c15..ab623689286f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8a6c85bd5265678a6b9de41122eb4887899881d2 +Subproject commit 2df227d29d2c67a829279b0bf46e9a9f5778e15e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 29fd23567fc1..7c1daeb449bc 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e31ecea3fb8ec395d226d65f774edddb60e01b8e +Subproject commit 13897bc4d877622981369d5e43081e5237bcd7d1 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7086debc26bf..fbcd9b2f2fcb 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e9385375cc0e1ccfae3b89588a81e71d18907a9f +Subproject commit ed35f583b1f089f1ae72da8b39ff1c440032c7a8 From d8dc236d7f63c1157195a43f4f2a7a926ce2bb7d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 31 Aug 2023 18:27:25 -0700 Subject: [PATCH 6426/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/84d2bcbbc440a5d66ffc7924375b57d2c9639f3b https://github.com/facebookincubator/velox/commit/53c3a26210e5f573410e312317a0180f2ff33351 Reviewed By: bigfootjon fbshipit-source-id: ea223b8f4aea3b643a1c82e4eb6f78ceb8245da9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ab623689286f..e3eb2070b42f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2df227d29d2c67a829279b0bf46e9a9f5778e15e +Subproject commit 84d2bcbbc440a5d66ffc7924375b57d2c9639f3b From 7a1c974e672e78c793aac42a8bccf7ff0e0b3cdc Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 31 Aug 2023 21:41:33 -0700 Subject: [PATCH 6427/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8833e22cea224fb68bf4a064f348ec5cb5da3236 https://github.com/facebookincubator/velox/commit/e85f942b12d8012c2294e7b97f97f87309815ced Reviewed By: bigfootjon fbshipit-source-id: 4a05b051b75503c7ae370ebd5428ad11c7125d3a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e3eb2070b42f..287fa9f34a25 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 84d2bcbbc440a5d66ffc7924375b57d2c9639f3b +Subproject commit 8833e22cea224fb68bf4a064f348ec5cb5da3236 From 6046ffbdeee6d0a2fc31e6250edd3721531cc314 Mon Sep 17 00:00:00 2001 From: Manav Avlani Date: Thu, 31 Aug 2023 22:31:52 -0700 Subject: [PATCH 6428/7387] Copy over the build scripts from airstore Summary: This diff copies just over the build scripts from the airstore build setup and makes some minor changes to the naming / README in the existing build files. Now the build built wheels will be WS_Airstore rather than Airstore. Adding bypass as this doesnt have anything to with OSS github repos bypass-github-export-checks Reviewed By: DevidXu Differential Revision: D48868175 fbshipit-source-id: fbf5cf8e86bd2a310a4c9698158189f9b53adf5c --- build/fbcode_builder/manifests/ws_airstore | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 build/fbcode_builder/manifests/ws_airstore diff --git a/build/fbcode_builder/manifests/ws_airstore b/build/fbcode_builder/manifests/ws_airstore new file mode 100644 index 000000000000..1c97cd77ee58 --- /dev/null +++ b/build/fbcode_builder/manifests/ws_airstore @@ -0,0 +1,34 @@ +[manifest] +name = ws_airstore +fbsource_path = fbcode/warm_storage/experimental/ws_airstore/ +shipit_project = WS_AIRStore +shipit_fbcode_builder = true + +[build.os=linux] +builder = cmake + +[build.not(os=linux)] +# We only support Linux +builder = nop + +[dependencies] +boost +libcurl +fizz +fmt +folly +googletest +libsodium +libevent +double-conversion +proxygen +wangle +zstd +zlib +xz + +[shipit.pathmap] +fbcode/warm_storage/experimental/ws_airstore = . +fbcode/proxygen/lib/utils = proxygen/lib/utils + +[shipit.strip] From 46e4f94c6fc96bdc924b5988d36d8f4e1a229c22 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 1 Sep 2023 00:45:07 -0700 Subject: [PATCH 6429/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/feb5dfef44811decbfcbfdb868a778d8d1228dde https://github.com/facebook/fbthrift/commit/b73392aa8f5eda70985d1790e103de6ca312151c https://github.com/facebook/folly/commit/ea325e5dcb2956038a528174082388186caf3655 https://github.com/facebook/mvfst/commit/a8b9e203e4a6e3dc6a55c7ebe8acc2805adacde4 https://github.com/facebook/proxygen/commit/39d41bf564592d258e091602c8c7b6355535680f https://github.com/facebook/wangle/commit/89056c39757b57672ea34f1d09587b75364ba3cd https://github.com/facebook/watchman/commit/6046ffbdeee6d0a2fc31e6250edd3721531cc314 https://github.com/facebookexperimental/edencommon/commit/5b6100d52cf1b890aeb8c958ee6bd8d609f6e204 https://github.com/facebookexperimental/rust-shed/commit/34cb5ac636011b11e72481c85719b2d1bf1c217c https://github.com/facebookincubator/fizz/commit/80813b2ca48eeb3658a409d4a0adeb987f5f22a0 https://github.com/facebookincubator/katran/commit/e0bb836752651ea4b75dffb9136a369452aac72b https://github.com/facebookincubator/velox/commit/f327fe18978986691ac03f2235d33d8dba42c7c0 Reviewed By: bigfootjon fbshipit-source-id: 818765143538b1402fe450a1f075c1d7181f6075 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 287fa9f34a25..af44ebfc047b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8833e22cea224fb68bf4a064f348ec5cb5da3236 +Subproject commit b73392aa8f5eda70985d1790e103de6ca312151c diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7c1daeb449bc..6560fbecc8b3 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 13897bc4d877622981369d5e43081e5237bcd7d1 +Subproject commit ea325e5dcb2956038a528174082388186caf3655 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index fbcd9b2f2fcb..411f07a8c0d5 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ed35f583b1f089f1ae72da8b39ff1c440032c7a8 +Subproject commit 89056c39757b57672ea34f1d09587b75364ba3cd From b1bf6411b10374fc2fac550e91868741b909dec5 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 1 Sep 2023 09:54:23 -0700 Subject: [PATCH 6430/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/2fbc222a82123faa2c29d2fa7c9a20f74d21278e https://github.com/facebook/ocamlrep/commit/a4407dc3fe64440a625b0288a1dc056160d1c9a4 https://github.com/facebookincubator/fizz/commit/2e5ef12d8b6d29273d0d1249a9c179b35819a2c0 https://github.com/facebookincubator/velox/commit/0c909467071bdc0922e98e0e0ffd1fca64fda8a7 Reviewed By: bigfootjon fbshipit-source-id: 92d841ed155c6a716d88d7b1ef4fc10c9b54f1b7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index af44ebfc047b..b76ac21b841b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b73392aa8f5eda70985d1790e103de6ca312151c +Subproject commit 2fbc222a82123faa2c29d2fa7c9a20f74d21278e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6560fbecc8b3..fa8644968799 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ea325e5dcb2956038a528174082388186caf3655 +Subproject commit 0bca8cc31e40fa507f843e432e4579e819a47b59 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 411f07a8c0d5..0d2845c8d33f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 89056c39757b57672ea34f1d09587b75364ba3cd +Subproject commit 794407814486d709fc751e7d0ee5cd82d68b7b69 From b260cf048f88266cc39570b088d5225c3c234abf Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 1 Sep 2023 13:57:06 -0700 Subject: [PATCH 6431/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/29186e8fd94cfdf8f5e341501349d3dfdae2cbb5 https://github.com/facebook/fbthrift/commit/b1000890c1ce7935ffae42b87408c9f0d9b0ddd0 https://github.com/facebook/folly/commit/2ffc141e51ef34372ab5fb74446396f43c0181c1 https://github.com/facebook/mcrouter/commit/30ca00973d5d4c24230e2d1c0b0849aea9ade5b0 https://github.com/facebook/ocamlrep/commit/6efc64a5661ced341f92459c09c48f7dca62958f https://github.com/facebook/proxygen/commit/0b0c955e17d57d38815f78d11f5a2255d2b4d1b1 https://github.com/facebook/rocksdb/commit/9bd1a6fa29651e9b9d1e64b2711726981ae8e566 https://github.com/facebookexperimental/rust-shed/commit/f7ebab034bd944f392a6e59fc03616a72da79983 Reviewed By: bigfootjon fbshipit-source-id: 74b79e336c9e71c64241c98e85a73d5560e1bd2e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b76ac21b841b..178a3d22583a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2fbc222a82123faa2c29d2fa7c9a20f74d21278e +Subproject commit b1000890c1ce7935ffae42b87408c9f0d9b0ddd0 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index fa8644968799..da9b1fe39e43 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0bca8cc31e40fa507f843e432e4579e819a47b59 +Subproject commit 2ffc141e51ef34372ab5fb74446396f43c0181c1 From ad5b1f53c8fc0b5660de814037cf7d31d3c641d5 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 2 Sep 2023 10:16:53 -0700 Subject: [PATCH 6432/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/85e197b11b3a91ac546fca0276860baca06afbbb https://github.com/facebookincubator/fizz/commit/64a6492b6d4bde7c0e6930315bbd8baa3ec10c62 Reviewed By: bigfootjon fbshipit-source-id: cb325fba4567138f9d1300040a1d0831e2cc7532 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 178a3d22583a..ee114fb75e8d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b1000890c1ce7935ffae42b87408c9f0d9b0ddd0 +Subproject commit 85e197b11b3a91ac546fca0276860baca06afbbb diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index da9b1fe39e43..5b679936cca4 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 2ffc141e51ef34372ab5fb74446396f43c0181c1 +Subproject commit 1f591d7032edad3d6e30190c5fac55e28cde127f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0d2845c8d33f..c835e61d33df 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 794407814486d709fc751e7d0ee5cd82d68b7b69 +Subproject commit c092a4e300450abf03f239cea89fc25b3711f25c From 2670859e02eb26200a1ca0430e25b08256182166 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 2 Sep 2023 17:16:28 -0700 Subject: [PATCH 6433/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5a26ffc5a67d2d5fa1f6cb7cc4223bd6727c8563 https://github.com/facebookexperimental/rust-shed/commit/f14512b1832efb37de575a79b601b196fa3dd675 Reviewed By: bigfootjon fbshipit-source-id: 80cc075ef7e40b28de67a2cec5ca8894e2062852 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ee114fb75e8d..8f2e3c5159a1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 85e197b11b3a91ac546fca0276860baca06afbbb +Subproject commit 5a26ffc5a67d2d5fa1f6cb7cc4223bd6727c8563 From e3a2ee7951c1d0053c989cc244c472e1bd869575 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 2 Sep 2023 21:28:38 -0700 Subject: [PATCH 6434/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/mvfst/commit/70eb82f7216cd10ee4213a637f95e7f5f1f8113f https://github.com/facebook/wangle/commit/f76fa47c3d7d913b0d5ff310bca50ab88b4424fe Reviewed By: bigfootjon fbshipit-source-id: 67cf40bd01e9b9efdca99d3dbdea108ed0daf9fd --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c835e61d33df..4487e9aad168 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c092a4e300450abf03f239cea89fc25b3711f25c +Subproject commit f76fa47c3d7d913b0d5ff310bca50ab88b4424fe From cee239fc68521a0f0b49aa524631b75df3290077 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 3 Sep 2023 18:37:47 -0700 Subject: [PATCH 6435/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/1fa48cb5cb06ceac2f88b1b032cbfca4a7fbe4fd Reviewed By: bigfootjon fbshipit-source-id: 20ef94fb380255f0da8ca7f68c3d503df885fe89 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8f2e3c5159a1..024c8a6d87d4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5a26ffc5a67d2d5fa1f6cb7cc4223bd6727c8563 +Subproject commit 1fa48cb5cb06ceac2f88b1b032cbfca4a7fbe4fd diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 5b679936cca4..9b3647eda1d0 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1f591d7032edad3d6e30190c5fac55e28cde127f +Subproject commit f513832be29decb1bb7c5b97f17f6162c57b048c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4487e9aad168..2c51098b09b9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f76fa47c3d7d913b0d5ff310bca50ab88b4424fe +Subproject commit 27b163cf7012b7410d38c6542941e0082cd36446 From 53a9c5b9958f7ff7acce73e9689805828e3e08a4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 4 Sep 2023 19:11:14 -0700 Subject: [PATCH 6436/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/mvfst/commit/343f32d1465a60137bc1ffdbc2d2d59641fd6200 https://github.com/facebook/ocamlrep/commit/74bb4ca66648555b7e9fdae6d8858015b9b26c30 https://github.com/facebook/proxygen/commit/515f3281a8370ceedf57ad948dfb48a6a5dfa8ab https://github.com/facebook/wangle/commit/760d496453e485cd8ce3a2448ac0d45c9a3cc920 https://github.com/facebookincubator/katran/commit/322dc93d06a8284940c9b4abfe9c9b3be755eda8 Reviewed By: jurajh-fb fbshipit-source-id: 06b14abdae50314032688819d980d3279cd18d3c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 024c8a6d87d4..8e95fc799127 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1fa48cb5cb06ceac2f88b1b032cbfca4a7fbe4fd +Subproject commit bf592c06c6d54c9857a27a891e1c34f78f61a1c3 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2c51098b09b9..1d25d344813f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 27b163cf7012b7410d38c6542941e0082cd36446 +Subproject commit 760d496453e485cd8ce3a2448ac0d45c9a3cc920 From e18747083932fee4234f3f5ee67980882ba01d0a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 5 Sep 2023 03:19:43 -0700 Subject: [PATCH 6437/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/07c050986edb999cd3b028f8e0189ee385aa3566 https://github.com/facebook/litho/commit/688bf6b95342f474ced7b230df0619029a449fe8 Reviewed By: jurajh-fb fbshipit-source-id: 0392a0e0fe55fa60aafaf93cfb6715365932ee0e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8e95fc799127..461b5d0c0dbe 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bf592c06c6d54c9857a27a891e1c34f78f61a1c3 +Subproject commit 07c050986edb999cd3b028f8e0189ee385aa3566 From a20f90ff160452242fda97a9faa27ca0b4d9bf69 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 5 Sep 2023 09:39:33 -0700 Subject: [PATCH 6438/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5db1d2652e3e2804b1a4ef054fcc519f4a6ac111 Reviewed By: jurajh-fb fbshipit-source-id: e5888eb4acba26df228a21f0c830790c8cfe341f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 461b5d0c0dbe..1a37423220db 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 07c050986edb999cd3b028f8e0189ee385aa3566 +Subproject commit 5db1d2652e3e2804b1a4ef054fcc519f4a6ac111 From 4bd62a2cc27fdea47f0688f22efc96223d1d09d3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 5 Sep 2023 13:21:27 -0700 Subject: [PATCH 6439/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/d029f6894f06b0d21360ad053052d2d1c27daa7f https://github.com/facebook/fbthrift/commit/eadebcd5f1ca40a056fb2711b797bbdd571bc363 https://github.com/facebook/folly/commit/ae0a8b537b6ea6e0fdcbe9ff74d5dcaad7a6776d Reviewed By: jurajh-fb fbshipit-source-id: 73f1b6096017e768d3f6d357cc5bc18e3b59aa4c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1a37423220db..7ab4c9054549 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5db1d2652e3e2804b1a4ef054fcc519f4a6ac111 +Subproject commit eadebcd5f1ca40a056fb2711b797bbdd571bc363 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9b3647eda1d0..6f967289619d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f513832be29decb1bb7c5b97f17f6162c57b048c +Subproject commit ae0a8b537b6ea6e0fdcbe9ff74d5dcaad7a6776d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1d25d344813f..12daed954b12 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 760d496453e485cd8ce3a2448ac0d45c9a3cc920 +Subproject commit 1329a887b6fce52c55d7b67f0a25022c5726b14f From 504d8bb4c9f64477821707626813b472f59f7ee4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 5 Sep 2023 14:16:47 -0700 Subject: [PATCH 6440/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/8cd26aec76aa11b519d797b0d5d1cb6d953c67b4 https://github.com/facebook/fbthrift/commit/b7dd6396b4bd6d720a362a11ee3a0dfd702b0cc3 https://github.com/facebook/litho/commit/8c96f425e36c3f5d4ac0213c68c76c62431e3056 https://github.com/facebook/mvfst/commit/20301a6964be6cb4d1cba6626d6fce45019ed2f6 https://github.com/facebook/proxygen/commit/fae64ac684fcec35177a24b28cd4567d7dfe80c2 https://github.com/facebookexperimental/rust-shed/commit/b539722d53eae7d6fc01d9799db04bfc0dab7a91 https://github.com/facebookincubator/velox/commit/177cee48a2e8f9ecda48a6c4c070bff0e464eb92 https://github.com/facebookresearch/recipes/commit/8e5efb5bc958cda102ee91dbf5def59587eb4233 Reviewed By: jurajh-fb fbshipit-source-id: 4f8392caba13e3a9c6a350c8c70d2ff92cfc2388 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7ab4c9054549..945e0a24f62b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit eadebcd5f1ca40a056fb2711b797bbdd571bc363 +Subproject commit b7dd6396b4bd6d720a362a11ee3a0dfd702b0cc3 From eb39aa3491e259832c183db517d6767a0e3dee00 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 5 Sep 2023 15:15:51 -0700 Subject: [PATCH 6441/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/bead7c63bc68a9b3fb382498363c50101caac046 https://github.com/facebook/fb303/commit/bfcd97f4086687073c165df0fdcbb7196b6f8625 https://github.com/facebook/fbthrift/commit/cac223020918f2bc9c6587c61a01fa0b52532bd5 https://github.com/facebook/ocamlrep/commit/efecfcf69543b3345df1c0522bd231ab0742eedc https://github.com/facebook/watchman/commit/504d8bb4c9f64477821707626813b472f59f7ee4 https://github.com/facebookexperimental/rust-shed/commit/1932a4607dc86f4f1bce314faa09ed8376c977d0 https://github.com/facebookincubator/velox/commit/3792f2818895959c979dad0a5ad1eaa620e9f879 Reviewed By: jurajh-fb fbshipit-source-id: 60a4691c0f34013c512e91fff6936f1c12900025 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 945e0a24f62b..e6621d636ee3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b7dd6396b4bd6d720a362a11ee3a0dfd702b0cc3 +Subproject commit cac223020918f2bc9c6587c61a01fa0b52532bd5 From ac137ed0b94b54cfb21755d88a477b9839b6169d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 5 Sep 2023 16:02:37 -0700 Subject: [PATCH 6442/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/387e6a477d454e094523e07a97faced4db17510f https://github.com/facebook/fbthrift/commit/c85cdf4b6f54e78ded629b37aefb061b5fbd2d89 https://github.com/facebook/ocamlrep/commit/fb80bf9d3b16f319e0ca1cd43d4dea8228ef654a https://github.com/facebook/rocksdb/commit/6a98471ae57a52784cf63c6a8a1d58edb340ec74 https://github.com/fairinternal/egohowto/commit/728569c67aafd84cf890af4c60069f145c7dcb68 Reviewed By: jurajh-fb fbshipit-source-id: 5269cafd8a3312af828d992b1d97d7a5c709ba29 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e6621d636ee3..75384f7d6b3a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cac223020918f2bc9c6587c61a01fa0b52532bd5 +Subproject commit c85cdf4b6f54e78ded629b37aefb061b5fbd2d89 From ef1d73bf81a70ee4b0bae25faedab24805abccb5 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 5 Sep 2023 16:54:07 -0700 Subject: [PATCH 6443/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/9ad2666f72c92c303a717554f3deb42210b50362 https://github.com/facebook/watchman/commit/ac137ed0b94b54cfb21755d88a477b9839b6169d https://github.com/facebookincubator/velox/commit/3fea1c90eb326875d2075931d2a1ca5fc6dde994 Reviewed By: jurajh-fb fbshipit-source-id: f5794df4257d041175203048670e96d05d1f03f4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 75384f7d6b3a..e47de076016b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c85cdf4b6f54e78ded629b37aefb061b5fbd2d89 +Subproject commit 9ad2666f72c92c303a717554f3deb42210b50362 From 110614cf8424f1cccd25f6d63b8dbc077dff7985 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 5 Sep 2023 17:46:37 -0700 Subject: [PATCH 6444/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/219d57a6e8a3b6d51da84be470fa1c35aa3b46bb https://github.com/facebookincubator/velox/commit/909600bcc96c1ccad0490fa842fef36b3f1ec328 Reviewed By: jurajh-fb fbshipit-source-id: a12a2dc8e8d142ef46a4bb1cb583167bd71893c1 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6f967289619d..f3239aade245 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ae0a8b537b6ea6e0fdcbe9ff74d5dcaad7a6776d +Subproject commit 219d57a6e8a3b6d51da84be470fa1c35aa3b46bb From 5582defbaf349a3c3499cba3b61302d0a059c874 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 6 Sep 2023 08:45:52 -0700 Subject: [PATCH 6445/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/f62dca2944bb17b50f684a0fd74fedba619ceabc https://github.com/facebook/ocamlrep/commit/3b8a750bb833ee86e1106e3d028ff8bc3d1f2ba7 Reviewed By: jurajh-fb fbshipit-source-id: 848327d9719bab1975c77c3aa68f397ff9f6e039 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e47de076016b..8cf305293791 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9ad2666f72c92c303a717554f3deb42210b50362 +Subproject commit 75697c6f5a05f22d1d0b780bce9ac84d3128feab diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f3239aade245..d825ec4cd496 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 219d57a6e8a3b6d51da84be470fa1c35aa3b46bb +Subproject commit f62dca2944bb17b50f684a0fd74fedba619ceabc From 00c313c4f9cc670be463065c7dfa890e33188442 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 6 Sep 2023 10:48:30 -0700 Subject: [PATCH 6446/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/f06abe38cf79a4a3233b511f41c13f2d676f4bea https://github.com/facebook/litho/commit/ebe3c2ae818472dad6bfcdee0801b44e13b40bf2 https://github.com/facebook/ocamlrep/commit/b904abb693698e056ed96e2b4691ff7945abf591 https://github.com/facebookincubator/velox/commit/34e775f0fa1b3c242a033ac8af637cc3b3387a65 Reviewed By: jurajh-fb fbshipit-source-id: 5ef817e613e254e6a14d4cc35fda42ac0c338264 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8cf305293791..5e88360955c7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 75697c6f5a05f22d1d0b780bce9ac84d3128feab +Subproject commit f06abe38cf79a4a3233b511f41c13f2d676f4bea From d751f4070f4c739e1d0c605154f43884035c187b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 6 Sep 2023 16:43:06 -0700 Subject: [PATCH 6447/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/209d15a2695e3b82de6683a3079b83a63fb6871a https://github.com/facebook/fbthrift/commit/0680ba742099da7d6c28ad4fc24e034d858178ec https://github.com/facebook/ocamlrep/commit/ca67293528fff7fad2af43b75aa3ab68eebac01c https://github.com/facebook/proxygen/commit/7ef596b9144228515d72a7fbe8f1039690ad77bc https://github.com/facebook/rocksdb/commit/195f35c08be7e376891ef13e2c6ea2a2c823de3a Reviewed By: jurajh-fb fbshipit-source-id: 3bafb8b96f1ce773cb7872ae66d39ff6312837b3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5e88360955c7..948c774ab0cf 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f06abe38cf79a4a3233b511f41c13f2d676f4bea +Subproject commit 0680ba742099da7d6c28ad4fc24e034d858178ec diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d825ec4cd496..5a45e60599d0 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f62dca2944bb17b50f684a0fd74fedba619ceabc +Subproject commit 323364cb7c14ab1f7bb7b739c0e7945e1eeb8485 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 12daed954b12..dc2b797d4bf7 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1329a887b6fce52c55d7b67f0a25022c5726b14f +Subproject commit f8cc094dcd52d7d0799dfc624aa4f0bfc9821c99 From 02144e291c0ba1c20a8aa3846e43eaf9677f4e41 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Wed, 6 Sep 2023 22:12:38 -0700 Subject: [PATCH 6448/7387] Rename ProcessName* to ProcessInfo* Summary: In preparation for merging ProcessSimpleName and ProcessName functionality into ProcessNameCache renaming now The new cache will cache ProcessInfo object which will include both names, and the parent pid. Reviewed By: genevievehelsel Differential Revision: D48855222 fbshipit-source-id: 4cb10df7b6cc32efc0d655771d01d58e7ba57dd5 --- watchman/Client.cpp | 8 ++++---- watchman/Client.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/watchman/Client.cpp b/watchman/Client.cpp index 10ef943973f8..145fd635d32c 100644 --- a/watchman/Client.cpp +++ b/watchman/Client.cpp @@ -25,13 +25,13 @@ namespace { using namespace facebook::eden; -ProcessNameCache& getProcessNameCache() { - static auto* pnc = new ProcessNameCache; +ProcessInfoCache& getProcessInfoCache() { + static auto* pnc = new ProcessInfoCache; return *pnc; } -ProcessNameHandle lookupProcessName(pid_t pid) { - return getProcessNameCache().lookup(pid); +ProcessInfoHandle lookupProcessName(pid_t pid) { + return getProcessInfoCache().lookup(pid); } constexpr size_t kResponseLogLimit = 0; diff --git a/watchman/Client.h b/watchman/Client.h index da19a9670952..f5baa5360096 100644 --- a/watchman/Client.h +++ b/watchman/Client.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include #include @@ -236,7 +236,7 @@ class UserClient final : public Client { const std::chrono::system_clock::time_point since_; const pid_t peerPid_; - const facebook::eden::ProcessNameHandle peerName_; + const facebook::eden::ProcessInfoHandle peerName_; ClientStatus status_; }; From 5968c147d8b173db8d19f1ff690ab3a272f6b314 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Wed, 6 Sep 2023 22:12:38 -0700 Subject: [PATCH 6449/7387] Refactor ProcessNameCache to include ProcessSimpleName and ppid. Summary: When doing a hack-a-month task I punted on cleaning up some new code to retrieve a simple, human-readable process name - https://www.internalfb.com/diff/D47276991?dst_version_fbid=795860982081651&transaction_fbid=584703497175444. This change moves the fetching of a simple process name into the process name cache. My first cut at this kept ProcessName and ProcessSimpleName entirely separated in the cache, but the async processing fetched the two together. This felt pretty klunky, so this cut now bundles up ProcessName and ProcessSimpleName along with the pid and ppid (parent pid) into a new struct, ProcessInfo and changes to cache that instead. In some areas this is more ergonomic and otthers it slightly less ergonomic. The fact we obtain both names and parent pid is overkill in some cases, but what is needed for others. Given that these are used for logging and diagnostics this seemed OK to me. Note: ProcessSimpleName is only implemented (validly) for macOS today. Adding other platofms should not be difficult, but there is no use case at this time. Reviewed By: kmancini Differential Revision: D48923253 fbshipit-source-id: abcbc604e7a319bf1c249cf94948e4ff4b2504c9 --- watchman/Client.cpp | 12 ++++++------ watchman/Client.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/watchman/Client.cpp b/watchman/Client.cpp index 145fd635d32c..1cc3d3721577 100644 --- a/watchman/Client.cpp +++ b/watchman/Client.cpp @@ -26,11 +26,11 @@ namespace { using namespace facebook::eden; ProcessInfoCache& getProcessInfoCache() { - static auto* pnc = new ProcessInfoCache; - return *pnc; + static auto* pic = new ProcessInfoCache; + return *pic; } -ProcessInfoHandle lookupProcessName(pid_t pid) { +ProcessInfoHandle lookupProcessInfo(pid_t pid) { return getProcessInfoCache().lookup(pid); } @@ -223,7 +223,7 @@ UserClient::UserClient(PrivateBadge, std::unique_ptr stm) : Client{std::move(stm)}, since_{std::chrono::system_clock::now()}, peerPid_{this->stm->getPeerProcessID()}, - peerName_{lookupProcessName(peerPid_)} { + peerInfo_{lookupProcessInfo(peerPid_)} { clients.wlock()->insert(this); } @@ -263,8 +263,8 @@ ClientDebugStatus UserClient::getDebugStatus() const { if (peerPid_) { rv.peer.emplace(); rv.peer->pid = peerPid_; - // May briefly, once, block on the ProcessNameCache thread. - rv.peer->name = peerName_.get(); + // May briefly, once, block on the ProcessInfoCache thread. + rv.peer->name = peerInfo_.get().name; } rv.since = std::chrono::system_clock::to_time_t(since_); return rv; diff --git a/watchman/Client.h b/watchman/Client.h index f5baa5360096..ca817063e1fa 100644 --- a/watchman/Client.h +++ b/watchman/Client.h @@ -236,7 +236,7 @@ class UserClient final : public Client { const std::chrono::system_clock::time_point since_; const pid_t peerPid_; - const facebook::eden::ProcessInfoHandle peerName_; + const facebook::eden::ProcessInfoHandle peerInfo_; ClientStatus status_; }; From 18fbe7b66362895e7a84732347321af523042249 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 7 Sep 2023 01:08:33 -0700 Subject: [PATCH 6450/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/462efbe6d97361ff3a77a01bf87a52ec164ec0bd https://github.com/facebook/mcrouter/commit/5e8d7079991a8d2c1865ce071534bcecdee1d984 https://github.com/facebookincubator/velox/commit/fc8194dcce64227591e254934f871baa10929e04 Reviewed By: jurajh-fb fbshipit-source-id: c54569dd0b87c196538dbc29fc3e84c94f6dc3d9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 948c774ab0cf..26c6617b265b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0680ba742099da7d6c28ad4fc24e034d858178ec +Subproject commit 462efbe6d97361ff3a77a01bf87a52ec164ec0bd From c2aefbed3c344f6a3718f0d16eb2032f9049c875 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 7 Sep 2023 10:37:28 -0700 Subject: [PATCH 6451/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/1feabb1ca5b713b82b95b5e4adb179a0603c8841 https://github.com/facebook/folly/commit/1e35ea89d8dea8deeabda2088c223ac7e52f74e8 https://github.com/facebook/wangle/commit/a8cd55b44df5e964baf8bb3ab57b41f02ce5632b https://github.com/facebookincubator/fizz/commit/b9d197fbd7fe79a109bf914b2c55f8af3abd8814 https://github.com/facebookincubator/katran/commit/720f4aa49d4ea83cf9f2b5eb85a5270e6e26a118 https://github.com/facebookincubator/velox/commit/79daf3007c0a3533863e7f8680057fd5bcd850a6 https://github.com/pytorch/fbgemm/commit/d3fe19983e14bb5a9ce1bf0375f1425e1589d932 Reviewed By: jurajh-fb fbshipit-source-id: bd63530b9f4a354b1f817dae3142de4d5aae5b5f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 26c6617b265b..31b67a61ebbc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 462efbe6d97361ff3a77a01bf87a52ec164ec0bd +Subproject commit 1feabb1ca5b713b82b95b5e4adb179a0603c8841 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 5a45e60599d0..78de5228fed3 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 323364cb7c14ab1f7bb7b739c0e7945e1eeb8485 +Subproject commit 1e35ea89d8dea8deeabda2088c223ac7e52f74e8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index dc2b797d4bf7..df6f5d9a0aa8 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f8cc094dcd52d7d0799dfc624aa4f0bfc9821c99 +Subproject commit a8cd55b44df5e964baf8bb3ab57b41f02ce5632b From 999b943d4f1cbaccde13a9ecba73a88333707056 Mon Sep 17 00:00:00 2001 From: Luca Niccolini Date: Thu, 7 Sep 2023 12:11:33 -0700 Subject: [PATCH 6452/7387] Always build HTTP/3 components for proxygen opensource (#6473) Summary: Pull Request resolved: https://github.com/facebookincubator/velox/pull/6473 Reviewed By: kvtsoy Differential Revision: D49063181 fbshipit-source-id: fd4eb25db4a03688599dba1ede92096041a568c6 --- build/fbcode_builder/manifests/proxygen | 3 --- 1 file changed, 3 deletions(-) diff --git a/build/fbcode_builder/manifests/proxygen b/build/fbcode_builder/manifests/proxygen index 4b4da1a3c186..a7b48043f8fb 100644 --- a/build/fbcode_builder/manifests/proxygen +++ b/build/fbcode_builder/manifests/proxygen @@ -15,9 +15,6 @@ builder = cmake subdir = . job_weight_mib = 3072 -[cmake.defines] -BUILD_QUIC = ON - [cmake.defines.test=on] BUILD_TESTS = ON From 62d93ed7993a9f2d0137e49bc2d2f7b364dfa170 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 7 Sep 2023 13:04:16 -0700 Subject: [PATCH 6453/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/59053da2cf8690ab53e9397d637b9f115503a27a https://github.com/facebook/folly/commit/ad7076905369f1afe3ef24fca644a87951a91b05 https://github.com/facebook/litho/commit/afb2afa2ddc52429c7fc149241d32405c48cdedc https://github.com/facebook/mcrouter/commit/f77d4f00e4b8e9dd872be6fb208ae0440ecb6fde https://github.com/facebook/mvfst/commit/475358ca8728de3893e4a6da2da418888c830c2d https://github.com/facebook/ocamlrep/commit/6e9dee5d74b6bd931abb12d84137f74a9191cbda https://github.com/facebook/wangle/commit/256cafdb96bcc084e7430d1d4121a224aeb64080 https://github.com/facebook/watchman/commit/999b943d4f1cbaccde13a9ecba73a88333707056 https://github.com/facebookexperimental/edencommon/commit/5572a7e046d8636eb349e5aa9a9224f348c9c562 https://github.com/facebookexperimental/rust-shed/commit/431d21ae65ca406c31e04f6abe23cbd524f52fcc https://github.com/facebookincubator/fizz/commit/84e93301cb52b1fc172e4e85fbb3dd0dbae97ddd https://github.com/facebookincubator/katran/commit/1b958fbba4d16e098b115890df966be3969ea641 https://github.com/facebookincubator/velox/commit/dabfd2591beafadbe780ca25954904d9911a35e4 Reviewed By: jurajh-fb fbshipit-source-id: 2db3d792da3b5c746a3de008f8d3bd242b2c2503 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 31b67a61ebbc..ea6ac01dea55 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1feabb1ca5b713b82b95b5e4adb179a0603c8841 +Subproject commit 59053da2cf8690ab53e9397d637b9f115503a27a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 78de5228fed3..44d5f3eb91ee 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1e35ea89d8dea8deeabda2088c223ac7e52f74e8 +Subproject commit ad7076905369f1afe3ef24fca644a87951a91b05 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index df6f5d9a0aa8..602f9f61dab0 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a8cd55b44df5e964baf8bb3ab57b41f02ce5632b +Subproject commit 256cafdb96bcc084e7430d1d4121a224aeb64080 From 169c48c7ee5b74dc1d47660c2d31eb351a1ec77d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 7 Sep 2023 17:13:41 -0700 Subject: [PATCH 6454/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/d66e32562537a19f9cceb21fdf8560cd536411b7 https://github.com/facebook/fbthrift/commit/99046f6174b0bbdb56c59e7d4d5ce0f028e35558 https://github.com/facebook/mcrouter/commit/68eb7b7976a7bcdad2cb48f63ada66b8bddba6e4 https://github.com/facebook/ocamlrep/commit/1ed78156b59f6eea8d46a7bb97672466b5c1bb38 https://github.com/facebook/proxygen/commit/99b5dedb6b52d9b6f47a0c4593472737ae8572f1 https://github.com/facebook/rocksdb/commit/05183bedcc5cad87add8dfb4df122c6fc1d94410 https://github.com/facebookincubator/velox/commit/6583fcaf897029d9861a7817aea3f3235231be13 https://github.com/pytorch/fbgemm/commit/f664fd908dc0f0f29d69f358cfd5d71126761000 Reviewed By: jurajh-fb fbshipit-source-id: 0a528a16ab6b0d9fcf3180c868703f472362f5ba --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ea6ac01dea55..adb046051e1a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 59053da2cf8690ab53e9397d637b9f115503a27a +Subproject commit 99046f6174b0bbdb56c59e7d4d5ce0f028e35558 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 44d5f3eb91ee..5487799ae554 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ad7076905369f1afe3ef24fca644a87951a91b05 +Subproject commit a6aaef105459e10601a96168a4b5cae98b1b50fd diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 602f9f61dab0..f6065be0d158 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 256cafdb96bcc084e7430d1d4121a224aeb64080 +Subproject commit 0060dc58bc894fcfd0fc826171d93b935eb7aceb From 7af459775119fe467eee0cb4a26759c885bc38ce Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 7 Sep 2023 19:51:33 -0700 Subject: [PATCH 6455/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/368f742a9b563ee026ab69053a7c96807935cb9e https://github.com/facebookincubator/velox/commit/35911ef28796509ef47e6533784fc2fa7f5baf1a Reviewed By: jurajh-fb fbshipit-source-id: 185399d85488892f4d1e131693f1eb9c5bac5cc8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index adb046051e1a..3e2d5ef5d7a3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 99046f6174b0bbdb56c59e7d4d5ce0f028e35558 +Subproject commit 368f742a9b563ee026ab69053a7c96807935cb9e From e1889dd8e9630b8dba2d89a74fead09fe2a310fa Mon Sep 17 00:00:00 2001 From: Manav Avlani Date: Thu, 7 Sep 2023 23:19:56 -0700 Subject: [PATCH 6456/7387] Clear proxygen from getdeps build for ws_airstore Summary: Remove proxygen from getdeps build setup for ws_airstore bypass-github-export-checks Reviewed By: DevidXu Differential Revision: D49056210 fbshipit-source-id: 9c9ca10d3a78c4dbae85e9812451bbf9d3a20b32 --- build/fbcode_builder/manifests/ws_airstore | 2 -- 1 file changed, 2 deletions(-) diff --git a/build/fbcode_builder/manifests/ws_airstore b/build/fbcode_builder/manifests/ws_airstore index 1c97cd77ee58..3e5daa72a17d 100644 --- a/build/fbcode_builder/manifests/ws_airstore +++ b/build/fbcode_builder/manifests/ws_airstore @@ -21,7 +21,6 @@ googletest libsodium libevent double-conversion -proxygen wangle zstd zlib @@ -29,6 +28,5 @@ xz [shipit.pathmap] fbcode/warm_storage/experimental/ws_airstore = . -fbcode/proxygen/lib/utils = proxygen/lib/utils [shipit.strip] From ab778643c785c28555d7e980a28956a037921e6b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 8 Sep 2023 00:30:42 -0700 Subject: [PATCH 6457/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/f9a189514be19bcf9108b9a0623c65aba249d8bc https://github.com/facebook/fbthrift/commit/5bddeddbef3351d9029a637b7b86ad3eb6683d71 https://github.com/facebook/folly/commit/2c7bd5dd29e63480e5a9ccbe82f21bcb563c645b https://github.com/facebook/mvfst/commit/d6a2898d323600a57d63e8e18b9e363b9d78d310 https://github.com/facebook/ocamlrep/commit/ed5f2595d970352cd2ad2111fb05f912e6a4caab https://github.com/facebook/proxygen/commit/43439b8d22d4f85bef434398e5d4f4b1e816497b https://github.com/facebook/wangle/commit/3a0a2955d7f4e763853620f5b9fae44c0bdd2d1d https://github.com/facebook/watchman/commit/e1889dd8e9630b8dba2d89a74fead09fe2a310fa https://github.com/facebookexperimental/edencommon/commit/c97b27fa35eee954b8bd6981f11ea2e7f4b500ad https://github.com/facebookexperimental/rust-shed/commit/c813c5c670bcc744edaa59ffe8d7819c149d3075 https://github.com/facebookincubator/fizz/commit/9d8c41c05a95cf367122f4f0ebf1004bf5c432f3 https://github.com/facebookincubator/katran/commit/a847d1d272ff6350c8a003448c0da8f620d69fb6 https://github.com/facebookincubator/velox/commit/384b88432c4f2789a735422e491639998de28257 Reviewed By: jurajh-fb fbshipit-source-id: 95aed39bca176c0b8b35552bc5970fb20ca8061f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3e2d5ef5d7a3..5697143663a6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 368f742a9b563ee026ab69053a7c96807935cb9e +Subproject commit 5bddeddbef3351d9029a637b7b86ad3eb6683d71 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 5487799ae554..f3868c3c2556 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a6aaef105459e10601a96168a4b5cae98b1b50fd +Subproject commit 2c7bd5dd29e63480e5a9ccbe82f21bcb563c645b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f6065be0d158..57c9677a7ee4 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0060dc58bc894fcfd0fc826171d93b935eb7aceb +Subproject commit 3a0a2955d7f4e763853620f5b9fae44c0bdd2d1d From b3dc29339787b24b0162bcb9dcc9e3d7d808bddd Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 8 Sep 2023 01:20:12 -0700 Subject: [PATCH 6458/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/7e38a207e9e5ce79cbd0c6915f1b7cb7070a24d9 https://github.com/facebook/fbthrift/commit/11fb6f08d0a04441451b5d38bc0fed848b95de93 https://github.com/facebook/litho/commit/3afdfaa2a64b4eab7b52af49b187c7633661285d https://github.com/facebook/mvfst/commit/422c5dedbb0d670568ea69d5190220ca4c30bad6 https://github.com/facebook/ocamlrep/commit/18edea980859e33c49a62860680e187e97de3905 https://github.com/facebook/proxygen/commit/cd046bbdf3e2188460c5e7c91b85b9958aa755f5 https://github.com/facebook/wangle/commit/62e1c3015d7b861ca6fe0cf121be8cac8ac01045 https://github.com/facebook/watchman/commit/ab778643c785c28555d7e980a28956a037921e6b https://github.com/facebookexperimental/edencommon/commit/5f50447434269518944b7037b02204bd68c04b02 https://github.com/facebookexperimental/rust-shed/commit/30d51b48f53e2f027aa75fa73ae3cc2a17b7105d https://github.com/facebookincubator/fizz/commit/15c80da96a4e588b28e6ad3be21b36a7d12a0268 https://github.com/facebookincubator/katran/commit/31d2f619d1b0e82aca468f0579515597fad61c72 https://github.com/facebookincubator/velox/commit/880dfb07c103712c06ceb85aff419f19c2c9b2bc Reviewed By: jurajh-fb fbshipit-source-id: 11613ea27af49094eeab9cc28cf2e39caabcc179 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5697143663a6..7aad87d4890c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5bddeddbef3351d9029a637b7b86ad3eb6683d71 +Subproject commit 11fb6f08d0a04441451b5d38bc0fed848b95de93 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 57c9677a7ee4..e58615d04f82 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3a0a2955d7f4e763853620f5b9fae44c0bdd2d1d +Subproject commit 62e1c3015d7b861ca6fe0cf121be8cac8ac01045 From 1351b1ff5eaa2b3ea14dc0b74e51e4159c79acac Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 8 Sep 2023 08:09:17 -0700 Subject: [PATCH 6459/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/09916116bb8ed2d70f82ad0f4548a8cbbb7b08ab https://github.com/facebook/folly/commit/3886be41c53e81361a20e717259778afeafbacbb https://github.com/facebook/litho/commit/5ba34e6d1889be8f9ba7400eb31efc87f93f8bfd https://github.com/facebook/ocamlrep/commit/465791c72d1973bb1a9658f0efe1e442759dfb88 Reviewed By: jurajh-fb fbshipit-source-id: d1481076e712a119e9c45736b7e53296116810a5 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f3868c3c2556..bb17f930ffdc 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 2c7bd5dd29e63480e5a9ccbe82f21bcb563c645b +Subproject commit 3886be41c53e81361a20e717259778afeafbacbb From bd7e22a44c301afc25615617274eca98e42954b3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 8 Sep 2023 15:16:27 -0700 Subject: [PATCH 6460/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/f9883997c117dee280df44c8d1c90e51e2f3b4b5 https://github.com/facebook/ocamlrep/commit/a99e416d9a3cd3dedd22db0885ea0de997f325b3 https://github.com/facebookincubator/velox/commit/5e816ab023afa3fc8075971b2ab64764426e113b Reviewed By: jurajh-fb fbshipit-source-id: 975c346b939511b6c5c9fb8d6524f7055e84fbe1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7aad87d4890c..d5f34efd9988 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 11fb6f08d0a04441451b5d38bc0fed848b95de93 +Subproject commit f9883997c117dee280df44c8d1c90e51e2f3b4b5 From 56262ca80a81584a72a90c69d80a0e5547ec5e00 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 8 Sep 2023 17:26:49 -0700 Subject: [PATCH 6461/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/d531aa747c60ed1f275ddc583eed3d213e1b5238 https://github.com/facebook/fbthrift/commit/99dc4acf0593c590ef075f8348ea95fd98d081ea https://github.com/facebook/ocamlrep/commit/d268b63a752d5db2eaa3d850a396819034334ca9 https://github.com/facebook/proxygen/commit/afd786b3bb78f51a693c2b7653569ab7f8e0219a https://github.com/facebookincubator/katran/commit/d343d228e5bcf1c90005a17d39f7775233ba3a96 https://github.com/pytorch/fbgemm/commit/4decf7b316842a697908a2791decc6c5ca4bd1e2 Reviewed By: jurajh-fb fbshipit-source-id: 30bb8f613e97d42f27cff96fd5011c1a70d203db --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d5f34efd9988..d2293090ad5e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f9883997c117dee280df44c8d1c90e51e2f3b4b5 +Subproject commit 99dc4acf0593c590ef075f8348ea95fd98d081ea From 420961ac82e7b9b464ab21d95e377121993196ea Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 9 Sep 2023 09:15:42 -0700 Subject: [PATCH 6462/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/a989af10b7383a433e3f78040fed2e2d6fb20830 https://github.com/facebook/mvfst/commit/b39adb728ea62e5ac3f40a34ff463a7f26d8ea61 https://github.com/facebook/wangle/commit/fcb652f251ff48d08f7708d11db3ec0e78496a1e https://github.com/facebookexperimental/edencommon/commit/540cf8ef097faa340b5bb2eae9cb24add7086c7d https://github.com/facebookincubator/fizz/commit/9da7e4aa91e452578243266feabb9684ecf94f47 https://github.com/facebookincubator/velox/commit/3e5053954605a434ed9363d5bc34d906eac5ee4f Reviewed By: jurajh-fb fbshipit-source-id: bbc72320117ce35c6a86bc3bf99e4b67e76f3689 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d2293090ad5e..34d819f1e866 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 99dc4acf0593c590ef075f8348ea95fd98d081ea +Subproject commit 7ba695edeb397029ecc784762661c1e91a24f694 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index bb17f930ffdc..79d853b6d254 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 3886be41c53e81361a20e717259778afeafbacbb +Subproject commit 5d211e3c4cfee48d22f6de2b35a5f3ea8f421375 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e58615d04f82..7491d87409ec 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 62e1c3015d7b861ca6fe0cf121be8cac8ac01045 +Subproject commit fcb652f251ff48d08f7708d11db3ec0e78496a1e From a779dacbbc7891343e53bde950cf61421c4ef7ee Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 9 Sep 2023 21:11:52 -0700 Subject: [PATCH 6463/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/4441696e46ee3750af55ac5403f5d686f6204f72 https://github.com/facebookincubator/velox/commit/5557aa22aa04f75a790b7937d8c0040a52ab2f5f Reviewed By: jurajh-fb fbshipit-source-id: b6f9f8ac21911e85d2397b2450198e7f3c2889c4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 34d819f1e866..2d885f963444 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7ba695edeb397029ecc784762661c1e91a24f694 +Subproject commit 4441696e46ee3750af55ac5403f5d686f6204f72 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 79d853b6d254..8545578fcbbb 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 5d211e3c4cfee48d22f6de2b35a5f3ea8f421375 +Subproject commit cc12ac20311bfcb5d72ea955973532c58c0a9825 From a5cc25722db09bfbda67b8c98a9774569578b1f0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 10 Sep 2023 21:11:35 -0700 Subject: [PATCH 6464/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/mvfst/commit/24ed08bd8c4cf420edc02458e70ac977ed8d3523 https://github.com/facebook/proxygen/commit/07a57192813e1898e9937311cd3efc3d5e22774d https://github.com/facebook/wangle/commit/918c108e634c55a377aff29b5e9411a27f3f60dc https://github.com/facebookexperimental/edencommon/commit/75f46ce9a723a84e86821a03fa092778efb9cd57 https://github.com/facebookincubator/fizz/commit/a40ee5706c8dd889d2f9da6f14e6327a8a383a1c https://github.com/facebookincubator/katran/commit/4a70f4d952a2573181812df8d195e47f824799e6 https://github.com/facebookincubator/velox/commit/6fd816db78a9d7a53a76ad0ec76318cd3c05d919 Reviewed By: jurajh-fb fbshipit-source-id: 92fdf71f644a82f278fbd1143f1032a396b68f01 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2d885f963444..e6e3b8b099e7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4441696e46ee3750af55ac5403f5d686f6204f72 +Subproject commit 9f60376de40b48561ac50263089468b779195003 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8545578fcbbb..37b9b3e93082 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit cc12ac20311bfcb5d72ea955973532c58c0a9825 +Subproject commit 75652dbb403981e8eb988509c038067a7be72677 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7491d87409ec..d3ec1e352386 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit fcb652f251ff48d08f7708d11db3ec0e78496a1e +Subproject commit 918c108e634c55a377aff29b5e9411a27f3f60dc From bc9acc28aebb4d5820d5fc4ca5397128c5f509f2 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 11 Sep 2023 13:04:53 -0700 Subject: [PATCH 6465/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7c36f2c0d5e3c74d20c684442c3f258658308b2c https://github.com/facebook/rocksdb/commit/760ea373a8bf6ecad250a990779bedcb88f0d3f3 https://github.com/facebookresearch/multimodal/commit/215440bf24b40f1d8f90ec9166b4331a7a14b179 Reviewed By: jailby fbshipit-source-id: ee894c7661083cabf70fd65e27f5383b93baaa93 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e6e3b8b099e7..ea441b666339 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9f60376de40b48561ac50263089468b779195003 +Subproject commit 7c36f2c0d5e3c74d20c684442c3f258658308b2c diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 37b9b3e93082..d4fe50657419 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 75652dbb403981e8eb988509c038067a7be72677 +Subproject commit 49cf61b159d69c960da64902f763005cc40cda02 From ccfa8c00835dcc53cd0fef71e8a33f304ddc4934 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 11 Sep 2023 14:19:33 -0700 Subject: [PATCH 6466/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/3b52ae31aa450be42c933a1562a8a991b4eae11c https://github.com/facebook/mvfst/commit/5213e89a63ca359aaa8ab0e2f8b38981571d5545 https://github.com/facebook/ocamlrep/commit/b8debd72e69b23ebb49b02c46c4e506b19d2cae4 https://github.com/facebook/proxygen/commit/60466a17fd9679ac50139761ea90fc1a73bfd493 https://github.com/facebook/rocksdb/commit/694e49cbb1cff88fbb84a96394a0f76b7bac9e41 https://github.com/facebook/wangle/commit/69732165b1c25291e6448de1957baf35c4540667 https://github.com/facebookexperimental/edencommon/commit/f05888808136d262e3656f9e446737734286af08 https://github.com/facebookincubator/fizz/commit/9ad561b57e6ec2556a57e2609c58be741d5e577c https://github.com/facebookincubator/katran/commit/637ef2476fb68767156b1de4d98f4829bf867151 https://github.com/facebookincubator/velox/commit/a117739a2e1c8e1337121d2313d03a46a80a2fe5 https://github.com/facebookresearch/vrs/commit/2898eb1f3172937d43ac3315468e4ce4d18e90ec Reviewed By: jailby fbshipit-source-id: 5ba42a7e91341714b6c91613dae4e49511bf6818 --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d3ec1e352386..e39f8b0d00e6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 918c108e634c55a377aff29b5e9411a27f3f60dc +Subproject commit 69732165b1c25291e6448de1957baf35c4540667 From 447d03b49c6e51416d0ed069712318ca9de32bc9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 12 Sep 2023 07:09:51 -0700 Subject: [PATCH 6467/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/6e9e689e3287212ecb404f32c486444400541281 https://github.com/facebook/ocamlrep/commit/e3ecfc12c02e136049d31e55b75400932e43ad15 https://github.com/facebook/proxygen/commit/c37b49c347a16daecd6069c492845c5e823cef28 Reviewed By: jailby fbshipit-source-id: 267263120baae6f0abeac812641506b18b9aa256 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ea441b666339..64210f5cacb0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7c36f2c0d5e3c74d20c684442c3f258658308b2c +Subproject commit 6e9e689e3287212ecb404f32c486444400541281 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d4fe50657419..326b6f0bd152 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 49cf61b159d69c960da64902f763005cc40cda02 +Subproject commit 1385306132aa3e34c719f536069f3788c0b49add diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e39f8b0d00e6..0e92fa3aa93e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 69732165b1c25291e6448de1957baf35c4540667 +Subproject commit 730113a6ae3c09316d7c98ce567aec2b6eb85c9c From d9392a33404ac7e1f8dcdd8d52de4571c3304711 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 12 Sep 2023 11:41:58 -0700 Subject: [PATCH 6468/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/868dfa566a6a6da46736e85d9a88a5be288270c6 https://github.com/facebook/fbthrift/commit/8d5261f731566cc30d9b1dde3a72fb5c5eb35f89 https://github.com/facebook/mvfst/commit/189d63ad2c93bedec22d6a45468be82aa5e7a98d https://github.com/facebook/proxygen/commit/f3372a1b0681ccd3ea8be5b11ceada5fdea8a178 https://github.com/facebook/rocksdb/commit/4b123f3a54b8a5980b24c9c58f44b3227aa72c6d https://github.com/facebookexperimental/rust-shed/commit/e8721ad4704626357cb0f8e488abec4bab66f04a https://github.com/facebookincubator/velox/commit/4f7e05cdb6a7e231ba5738d8d19886b2e3c4af64 https://github.com/facebookresearch/multimodal/commit/123f09d0037358bfb5575e09ebd7855078e5531d Reviewed By: jailby fbshipit-source-id: 28de2e8c49f8964c0c0faa9d07ed7c0dc10698f1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 64210f5cacb0..7c1b8e34e860 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6e9e689e3287212ecb404f32c486444400541281 +Subproject commit 8d5261f731566cc30d9b1dde3a72fb5c5eb35f89 From 81f22c1ddfd0c036a5eb0e2650a306bd5d4ea7c1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 12 Sep 2023 14:14:09 -0700 Subject: [PATCH 6469/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/58aeeee6b1c0b656eb5ffdf0318972ce7d60f202 https://github.com/facebook/rocksdb/commit/1e63fc9925919257d0435ea206763acc6b92a1c6 https://github.com/facebookincubator/velox/commit/af1c6810c7b61cc0bc15b3e488a1c55af37c6543 https://github.com/facebookresearch/multimodal/commit/4c1cf86b67eb8960146c18ddbef1bd2ec534c091 Reviewed By: jailby fbshipit-source-id: 98c86a638465a235b63721d3ddcdb47d801dcb24 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7c1b8e34e860..f093451fe5a1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8d5261f731566cc30d9b1dde3a72fb5c5eb35f89 +Subproject commit 58aeeee6b1c0b656eb5ffdf0318972ce7d60f202 From 31638330a6e2ccfaedd84bc20ae1000bee866b08 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 12 Sep 2023 19:09:24 -0700 Subject: [PATCH 6470/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/75fdca715e27d2d9bffbebc085b96fd402322c3d https://github.com/facebook/proxygen/commit/45dd34400604b21b3dde162da85e758c052e1a60 https://github.com/facebook/rocksdb/commit/4b79e8c0039389fc731f8bc9bd6109257c21d9d1 https://github.com/facebookincubator/katran/commit/751c7b1c0973821043499b9ed3022f0cfb533eb7 https://github.com/pytorch/fbgemm/commit/09e0030f2b0daff53f08292a8062c9198d5f0232 Reviewed By: jailby fbshipit-source-id: 4f9d4ce6a2559cf9d7fbdb58f6719ee862fff324 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f093451fe5a1..c795f4ca20c6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 58aeeee6b1c0b656eb5ffdf0318972ce7d60f202 +Subproject commit 75fdca715e27d2d9bffbebc085b96fd402322c3d From 5ff5ae4803f39368815de5d31b93c32f5abe9014 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 12 Sep 2023 21:19:20 -0700 Subject: [PATCH 6471/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/37e459f82d0e3f1b2ea5168355e95e2087cc791d https://github.com/facebook/fb303/commit/b55667ad38fd0d84392dacb2e98331c32a3cbe9e https://github.com/facebook/fbthrift/commit/74f2aae8e09b71d94d85ca283ffeac09a5aad601 https://github.com/facebook/litho/commit/842c7f36ef29eb862b936ffb4ba3895ed736440c https://github.com/facebook/ocamlrep/commit/7fdcb8db85dff61723e71191942d766f61b03b1b https://github.com/facebook/proxygen/commit/95b9f923b03bd04b0ad6d1e93986463f7a4f1321 https://github.com/facebook/watchman/commit/31638330a6e2ccfaedd84bc20ae1000bee866b08 https://github.com/facebookincubator/velox/commit/5389241abd99f12d838fffd824e49bd5c39c9f6a Reviewed By: jailby fbshipit-source-id: 4016a0f781e4c4ad61e04bad2351cdf0389214ed --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c795f4ca20c6..08dc5961415a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 75fdca715e27d2d9bffbebc085b96fd402322c3d +Subproject commit 74f2aae8e09b71d94d85ca283ffeac09a5aad601 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0e92fa3aa93e..fceeb738cb6e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 730113a6ae3c09316d7c98ce567aec2b6eb85c9c +Subproject commit 02d66665376d0ef759d8d5e6b3e4780a2875359e From 0f5f477a68548be19e6ae2824f179f3af143eb89 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 12 Sep 2023 23:26:39 -0700 Subject: [PATCH 6472/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/d85a0f6314f280575e8bc56965bbd8c5bb8b72c9 Reviewed By: jailby fbshipit-source-id: a424a334156d18a5dcebafb5de6f1cbe2319e0c0 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 326b6f0bd152..fa861aacee66 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1385306132aa3e34c719f536069f3788c0b49add +Subproject commit d85a0f6314f280575e8bc56965bbd8c5bb8b72c9 From 383d3ad503190a65ae7357d9d3ea7628a3b8f8bb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 13 Sep 2023 01:21:10 -0700 Subject: [PATCH 6473/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/fbb0d5493886dfe4f75fc03ee81c0f85a099b6d6 Reviewed By: jailby fbshipit-source-id: 29da884e8cffaeadd172843e6570275dac667d88 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 08dc5961415a..e64a673b13ef 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 74f2aae8e09b71d94d85ca283ffeac09a5aad601 +Subproject commit fbb0d5493886dfe4f75fc03ee81c0f85a099b6d6 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index fceeb738cb6e..b5dd8390e7c3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 02d66665376d0ef759d8d5e6b3e4780a2875359e +Subproject commit 329b0dfd50de5382452c85f31d2b2f5e16258ca3 From dbc4e425e26d94825bd1fb4322ee1364faaec2f9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 13 Sep 2023 06:51:15 -0700 Subject: [PATCH 6474/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/ddaa3259634dbd877f6979db41371a6e15cb0633 https://github.com/facebook/litho/commit/78d91d2635cfcd8877b93f535da2d16240f6ba39 https://github.com/facebookincubator/velox/commit/817ed42a6428bc027d0e81ec219e8cc5241e63a1 Reviewed By: jailby fbshipit-source-id: 7b7c03b1d0d26875975d74d821c8ea048dde26fd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e64a673b13ef..5e310cb5befb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit fbb0d5493886dfe4f75fc03ee81c0f85a099b6d6 +Subproject commit ddaa3259634dbd877f6979db41371a6e15cb0633 From 2477202d455b7700eedeca3d207091ee5ddc3e61 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 13 Sep 2023 12:10:58 -0700 Subject: [PATCH 6475/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5b5808db39bfb4b8ca6ab6caaa4487943b8d927b https://github.com/facebook/ocamlrep/commit/61be81cf40ece80ce67c5628a948fd3c36970407 https://github.com/facebookincubator/velox/commit/aff7b73f4ea4ef697045b79fa9ac58e4044eded0 Reviewed By: jailby fbshipit-source-id: 1e039991df638ba2a7ed32301dd76b05748d482f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5e310cb5befb..65ad89fec8fa 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ddaa3259634dbd877f6979db41371a6e15cb0633 +Subproject commit 5b5808db39bfb4b8ca6ab6caaa4487943b8d927b From e85c1fea671ca5d4fd7c462fbeebc4c73edb7776 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 13 Sep 2023 14:40:18 -0700 Subject: [PATCH 6476/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/16851bbbf615a92ba2ac0c39e37ba51b6c5a7975 https://github.com/facebook/litho/commit/fdbcfafb289e1bc5fcc5a7b6ddf4c2bb3b2f2c69 https://github.com/facebook/mvfst/commit/07a2ee7ff2dee12d13841373bf7bbc091d9257dd https://github.com/facebook/ocamlrep/commit/633e1e08cad93e2443b09c191438d36abde6d066 https://github.com/facebookincubator/velox/commit/9c008e308890bb8eafd6f3aeb898a51672108bd4 Reviewed By: jailby fbshipit-source-id: 0be37346e64131cec2136f375f3aa475029257fe --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 65ad89fec8fa..1068ab122d78 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5b5808db39bfb4b8ca6ab6caaa4487943b8d927b +Subproject commit 16851bbbf615a92ba2ac0c39e37ba51b6c5a7975 From 85af7cb49ba4ac6628b3b8bafd97712ad33a45f1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 14 Sep 2023 14:54:13 -0700 Subject: [PATCH 6477/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/1fbf25403a01150b75a5b37fdb6194501e2aa043 https://github.com/facebook/ocamlrep/commit/c3404b50083bd84c4e61e989f4c6e7ccd8979b04 https://github.com/facebook/proxygen/commit/bb1b81241b10c13771105ed96c0e80f76d0ccef0 https://github.com/facebook/rocksdb/commit/3c27f56d0b7e359defbc25bf90061214c889f40b https://github.com/facebookincubator/velox/commit/f26912ed08a335595c97a948debe58ca5e405026 Reviewed By: jailby fbshipit-source-id: fda00ae216abb7590d41a162198f0f906e6067e6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1068ab122d78..0eb4018f739e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 16851bbbf615a92ba2ac0c39e37ba51b6c5a7975 +Subproject commit 1fbf25403a01150b75a5b37fdb6194501e2aa043 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index fa861aacee66..12a261d6928a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d85a0f6314f280575e8bc56965bbd8c5bb8b72c9 +Subproject commit 77101e086860c4d39ab8bfdbaa39b5411995d003 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b5dd8390e7c3..57c89bbe2067 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 329b0dfd50de5382452c85f31d2b2f5e16258ca3 +Subproject commit 483b521713b2bff71d61c50869afb74a4df76714 From 5441968ae5e678a4602a4d7e3825a1057bae6841 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 14 Sep 2023 19:24:23 -0700 Subject: [PATCH 6478/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/aabf07a68f0437b35a5f7e1eb5dce70b56a2f74a https://github.com/facebook/proxygen/commit/e4324015ec852e2e433b27ae17052f1b64b0759e https://github.com/facebook/wangle/commit/011378a05af8d6e536d5f3ce6446e041ec69572a https://github.com/facebookincubator/katran/commit/6c8c1e92635a91f849985600bd45fae71922f063 https://github.com/facebookincubator/velox/commit/92127985c34c0be5e8c307aa4edb28b5c084a445 Reviewed By: jailby fbshipit-source-id: f968e144d154d6466ff3fff8d7d6a343a1441300 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0eb4018f739e..999a4f1fdc05 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1fbf25403a01150b75a5b37fdb6194501e2aa043 +Subproject commit aabf07a68f0437b35a5f7e1eb5dce70b56a2f74a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 12a261d6928a..c19be4b4adea 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 77101e086860c4d39ab8bfdbaa39b5411995d003 +Subproject commit ab1c4891da0afac419ad8c56f05d1f2c2655cd3d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 57c89bbe2067..c07e4df221ba 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 483b521713b2bff71d61c50869afb74a4df76714 +Subproject commit 011378a05af8d6e536d5f3ce6446e041ec69572a From 1151b8f847c035d98c1705865920f31fd798931d Mon Sep 17 00:00:00 2001 From: "Genevieve (Genna) Helsel" Date: Thu, 14 Sep 2023 19:36:52 -0700 Subject: [PATCH 6479/7387] add explicit mapping of ConfigSourceType to precedence Summary: Code review from D37169769 - its not easy to extend implicit precedence in thrift without unsafe reordering - instead lets map this ourselves in the code Reviewed By: xavierd Differential Revision: D48758164 fbshipit-source-id: faab964fae19cacc681628c5f31a6bc184a9a94f --- eden/fs/config/eden_config.thrift | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/eden/fs/config/eden_config.thrift b/eden/fs/config/eden_config.thrift index 0e81f9d9ab95..89ff5648a197 100644 --- a/eden/fs/config/eden_config.thrift +++ b/eden/fs/config/eden_config.thrift @@ -11,10 +11,7 @@ namespace py facebook.eden.eden_config namespace py3 eden.fs.config /** - * Identifies the point of origin of a config setting. It is ordered from - * low to high precedence. Higher precedence configuration values over-ride - * lower precedence values. A config setting of CommandLine takes precedence - * over all other settings. + * Identifies the point of origin of a config setting. Precedence is defined by ConfigSetting::getIdx() */ enum ConfigSourceType { Default = 0, From 78fe9dfbfa3f587dbd3ed52de4219910b242fd03 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 14 Sep 2023 20:29:24 -0700 Subject: [PATCH 6480/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/1d8ab82da0d27300488a1a964ff00d29af91ac3d Reviewed By: jailby fbshipit-source-id: 681a73cbf826862fdf24b9cd14f720adfc46e0e0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 999a4f1fdc05..5c668d2f7391 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit aabf07a68f0437b35a5f7e1eb5dce70b56a2f74a +Subproject commit 1d8ab82da0d27300488a1a964ff00d29af91ac3d From f098a2694bae33856b4dc9777572e87b67ebe593 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 15 Sep 2023 19:52:22 -0700 Subject: [PATCH 6481/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/proxygen/commit/f0500bd3f27af83c3c8b7519f069b0c72041ca93 https://github.com/facebook/wangle/commit/5e139c2dcf78c4e97d7fdd187ce43d598f1b5c86 https://github.com/facebookincubator/velox/commit/0496a055fa4e61bd31d4f6bdfc8a47adbbd63128 https://github.com/pytorch/fbgemm/commit/8e588e6158131814e75faa98259e8be66c9f9faa Reviewed By: jailby fbshipit-source-id: d49d6ee92253c1d91842a3fbef0b4fc2e91f3f2b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5c668d2f7391..842aba3be71c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1d8ab82da0d27300488a1a964ff00d29af91ac3d +Subproject commit 9348992f73c72f641cc8fe5ac82334c6c22cb28d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index c19be4b4adea..e088723c65f9 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ab1c4891da0afac419ad8c56f05d1f2c2655cd3d +Subproject commit 61c11d77eb9a8bdc60f673017fccfbe900125cb6 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c07e4df221ba..010f90173ad0 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 011378a05af8d6e536d5f3ce6446e041ec69572a +Subproject commit 5e139c2dcf78c4e97d7fdd187ce43d598f1b5c86 From 5c758536031339bc0e188bb3197a9cbc0b61930a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 15 Sep 2023 20:54:01 -0700 Subject: [PATCH 6482/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/c0bd6b5b34da1d6d70e88ddf57249a699506821e https://github.com/facebook/proxygen/commit/8e3f986f0e9bd8a607ac31ddc978572dfd2731e7 Reviewed By: jailby fbshipit-source-id: 834f0558cb3d6c80f3b08e6a7d6c113d1e4084da --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 842aba3be71c..fdc01b75011a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9348992f73c72f641cc8fe5ac82334c6c22cb28d +Subproject commit c0bd6b5b34da1d6d70e88ddf57249a699506821e From 29271eabae35d0a6072042f7af0d1f61e6a13064 Mon Sep 17 00:00:00 2001 From: Shashank Kambhampati Date: Sat, 16 Sep 2023 08:00:16 -0700 Subject: [PATCH 6483/7387] Add Hack namespace for Eden thrift files Summary: I want to import these into our Hack server side code so I can write Hack functions to prefetch files. Adding a Hack namespace allows me to do that without hitting classname conflicts. Reviewed By: kmancini Differential Revision: D49322120 fbshipit-source-id: 333e27d245c88b17bd3645cb2103ec3e6ba1f63e --- eden/fs/config/eden_config.thrift | 1 + eden/fs/service/eden.thrift | 1 + 2 files changed, 2 insertions(+) diff --git a/eden/fs/config/eden_config.thrift b/eden/fs/config/eden_config.thrift index 89ff5648a197..c1b2c71ab0c3 100644 --- a/eden/fs/config/eden_config.thrift +++ b/eden/fs/config/eden_config.thrift @@ -9,6 +9,7 @@ namespace cpp2 facebook.eden namespace java com.facebook.eden.thrift namespace py facebook.eden.eden_config namespace py3 eden.fs.config +namespace hack edenfs.config /** * Identifies the point of origin of a config setting. Precedence is defined by ConfigSetting::getIdx() diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index af64c1ea55e3..cf10851eac37 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -12,6 +12,7 @@ namespace cpp2 facebook.eden namespace java com.facebook.eden.thrift namespace py facebook.eden namespace py3 eden.fs.service +namespace hack edenfs.service /** * API style guide. From 29b333b913ec3ef5ce858e9418c49d54c2365bd1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 16 Sep 2023 10:55:14 -0700 Subject: [PATCH 6484/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/f19dcc844c67fda832ec068968b58d5c0e08e761 Reviewed By: jailby fbshipit-source-id: 03d7a05e85af306d8c7b6b6fbe670c0e2cc949cd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index fdc01b75011a..649f47835882 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c0bd6b5b34da1d6d70e88ddf57249a699506821e +Subproject commit f19dcc844c67fda832ec068968b58d5c0e08e761 From 9aba113055d0af1ea3b95be5ac345bcfb63acc96 Mon Sep 17 00:00:00 2001 From: Xinyi Wang Date: Tue, 19 Sep 2023 16:44:35 -0700 Subject: [PATCH 6485/7387] move comment to .h file Summary: Move comment about the method's intention to .h file so that i can easily see it in vscode Reviewed By: kmancini Differential Revision: D49428873 fbshipit-source-id: d20ac80581410fd6df341b7100be3616b82da593 --- watchman/root/watchlist.cpp | 7 ------- watchman/root/watchlist.h | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/watchman/root/watchlist.cpp b/watchman/root/watchlist.cpp index 5c0311ac507a..23218847d453 100644 --- a/watchman/root/watchlist.cpp +++ b/watchman/root/watchlist.cpp @@ -36,13 +36,6 @@ bool Root::removeFromWatched() { return false; } -// Given a filename, walk the current set of watches. -// If a watch is a prefix match for filename then we consider it to -// be an enclosing watch and we'll return the root path and the relative -// path to filename. -// Returns NULL if there were no matches. -// If multiple watches have the same prefix, it is undefined which one will -// match. bool findEnclosingRoot( const w_string& fileName, w_string_piece& prefix, diff --git a/watchman/root/watchlist.h b/watchman/root/watchlist.h index 6927908a598e..38561ecb170c 100644 --- a/watchman/root/watchlist.h +++ b/watchman/root/watchlist.h @@ -22,6 +22,13 @@ extern std::atomic live_roots; extern folly::Synchronized>> watched_roots; +// Given a filename, walk the current set of watches. +// If a watch is a prefix match for filename then we consider it to +// be an enclosing watch and we'll return the root path and the relative +// path to filename. +// Returns NULL if there were no matches. +// If multiple watches have the same prefix, it is undefined which one will +// match. bool findEnclosingRoot( const w_string& fileName, w_string_piece& prefix, From 623be741b6bc361681c4f1c69407dd6822a76e3d Mon Sep 17 00:00:00 2001 From: Xinyi Wang Date: Tue, 19 Sep 2023 16:44:35 -0700 Subject: [PATCH 6486/7387] implement .nowatchman discovery in repo root Summary: Implement .nowatchman check as required in the task If .nowatchman is presented, not spawning watchman As required, we will check .nowatchman under repo root, only .nowatchman under repo root will count. Reviewed By: kmancini Differential Revision: D49429032 fbshipit-source-id: f959f5bbd3e2e08e6bc888000491415829fc14f9 --- watchman/cmds/watch.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/watchman/cmds/watch.cpp b/watchman/cmds/watch.cpp index 98cd89636f4b..7a61afdb0285 100644 --- a/watchman/cmds/watch.cpp +++ b/watchman/cmds/watch.cpp @@ -191,6 +191,17 @@ bool find_project_root( return false; } +void check_no_watchman(w_string resolved_root) { + // check if .nowatchman exists under the resolved path + auto no_watchman_path = w_string::pathCat({resolved_root, ".nowatchman"}); + if (w_path_exists(no_watchman_path.c_str())) { + CommandValidationError::throwf( + "resolve_projpath: the repository is configured to not enable watchman. " + "Found .nowatchman at {}", + no_watchman_path); + } +} + // For watch-project, take a root path string and resolve the // containing project directory, then update the args to reflect // that path. @@ -235,6 +246,7 @@ static w_string resolve_projpath( if (find_project_root(*root_files, resolvedpiece, relpiece)) { relpath = relpiece.asWString(); resolved = resolvedpiece.asWString(); + check_no_watchman(resolved); args[1] = w_string_to_json(resolved); return resolved; } From fcdc2f108634cb52f22dea242a98085b4c0b6001 Mon Sep 17 00:00:00 2001 From: Srikrishna Gopu Date: Thu, 21 Sep 2023 11:18:40 -0700 Subject: [PATCH 6487/7387] move oss to sai 1.13.0 Summary: As titled, move oss to sai 1.13.0 Reviewed By: jasmeetbagga Differential Revision: D49491073 fbshipit-source-id: 61a1c2840d4e154be1342b8d4b14016ede53fc93 --- build/fbcode_builder/manifests/libsai | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/manifests/libsai b/build/fbcode_builder/manifests/libsai index d127f903e5a8..4f772d826e11 100644 --- a/build/fbcode_builder/manifests/libsai +++ b/build/fbcode_builder/manifests/libsai @@ -2,12 +2,12 @@ name = libsai [download] -url = https://github.com/opencomputeproject/SAI/archive/v1.12.0.tar.gz -sha256 = 1e7f43599baf1dcca122bbbb2baaeb9b20e5632d2ca6aaa61a568d1d58afaa97 +url = https://github.com/opencomputeproject/SAI/archive/v1.13.0.tar.gz +sha256 = bb8c5d6cb0c7897422875d0da7b903708d1a15557ad07c6d6266dff83cb8c78d [build] builder = nop -subdir = SAI-1.12.0 +subdir = SAI-1.13.0 [install.files] inc = include From ac553a9b22eaf89ec14feb2ff7d1bae4e34f78e2 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 25 Sep 2023 10:57:52 -0700 Subject: [PATCH 6488/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/f955966efb8395fc0547eba98359dfd26540ae51 https://github.com/facebook/fb303/commit/ede5292ff05473420ed9705a53470ee0cda6194e https://github.com/facebook/fbthrift/commit/e404ea5d69f441576180edaa2edfc42774ad04c4 https://github.com/facebook/folly/commit/333796135523f691e170d94781035e27e67cc26b https://github.com/facebook/litho/commit/3cbabc2265c20463542008c2229345d7f40d69a0 https://github.com/facebook/mcrouter/commit/11a1646bd517385366c7c977d785e76297c3bd10 https://github.com/facebook/mvfst/commit/dd6b48261d49040d8259d5016d359ffc564987ec https://github.com/facebook/ocamlrep/commit/fe8ca8263f577b7cf38190ac8da1a528615f5a41 https://github.com/facebook/proxygen/commit/aa5588c9112b02ec18994e2fabacc3d460c6b5fd https://github.com/facebook/rocksdb/commit/1c871a4d8682ea260ba3b18ed43cd525a2141733 https://github.com/facebook/squangle/commit/a994fd22a12836eb4a6f03539dbb821caf0880c1 https://github.com/facebook/wangle/commit/fbe9d41a6ee66f7f17daf8c1c396207d336b9589 https://github.com/facebook/watchman/commit/fcdc2f108634cb52f22dea242a98085b4c0b6001 https://github.com/facebookexperimental/edencommon/commit/8e985600c95b5967354abfea4eeae6a37758dd7e https://github.com/facebookexperimental/rust-shed/commit/32da0bcc01ec6d1fb243e3cf279e4e4204069147 https://github.com/facebookincubator/fizz/commit/884f8341273520bffe9930c70b6756b15593ddb9 https://github.com/facebookincubator/katran/commit/711a46b694f5a84da595fa2f4fc31bcb53effa7b https://github.com/facebookincubator/sks/commit/15d0a410f02b1714834f93eaf710dd8edcfcf1af https://github.com/facebookincubator/velox/commit/eb4d90873db4de63b089c791234482a834aa70fb https://github.com/facebookresearch/flsim/commit/7f4d60a171f258a47584ce38139f9cdaed8ecfe8 https://github.com/facebookresearch/vrs/commit/ff78a93db2cac7bfa4315835a54fcd7e2aaaff31 https://github.com/fairinternal/egohowto/commit/16926172996ce04fe8fc51d3ab611d5f8ee84c18 https://github.com/pytorch/fbgemm/commit/3647f5a377880430ed2130d6335fffb0bbfc138f https://github.com/pytorch/kineto/commit/5e23653cb8e22f5d33a3c92da3c1d6d03fb7dda5 https://github.com/pytorch/multipy/commit/e26130d97c1df6d07e9949f9e822ed69e3198a11 Reviewed By: bigfootjon fbshipit-source-id: ced6939230599de52fa0e49e7532a7d9d8b1e369 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 649f47835882..cd02270474fd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f19dcc844c67fda832ec068968b58d5c0e08e761 +Subproject commit e404ea5d69f441576180edaa2edfc42774ad04c4 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e088723c65f9..e700cd8da037 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 61c11d77eb9a8bdc60f673017fccfbe900125cb6 +Subproject commit 333796135523f691e170d94781035e27e67cc26b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 010f90173ad0..940ce125de1f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5e139c2dcf78c4e97d7fdd187ce43d598f1b5c86 +Subproject commit fbe9d41a6ee66f7f17daf8c1c396207d336b9589 From b5f819650cd4331d5db0e66e1e2f1812f93f6c9a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 25 Sep 2023 13:05:49 -0700 Subject: [PATCH 6489/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/cd83e626bb052332a1a19187509d1a9891857fae https://github.com/facebookresearch/vrs/commit/90c149f7e51f80ed7cf92eba7c1d50b7ffd13b7c https://github.com/pytorch/fbgemm/commit/85de33b8738c2e882f2944cfd5068439d26c7d01 https://github.com/pytorch/multipy/commit/2460dc6a81d7391cc93d59cdaec349be6e8e86db Reviewed By: bigfootjon fbshipit-source-id: 920fb8986b306f7a6b774734649bdcd92e47b919 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cd02270474fd..6aa3f5c0223e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e404ea5d69f441576180edaa2edfc42774ad04c4 +Subproject commit cd83e626bb052332a1a19187509d1a9891857fae diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 940ce125de1f..4bd8d01686f3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit fbe9d41a6ee66f7f17daf8c1c396207d336b9589 +Subproject commit 1b1a0812736e81bc194f648850ddd4ee9e1041cc From 8efd8a6e7c583dc853550b3069055f1e0fb59e9b Mon Sep 17 00:00:00 2001 From: Muir Manders Date: Mon, 25 Sep 2023 13:58:05 -0700 Subject: [PATCH 6490/7387] rename edenscm to sapling Summary: X-link: https://github.com/facebookincubator/velox/pull/6734 This is phase 1 of "sapling" rename. Later we will move out of the "eden" directory. These were the high level steps I took: 1. "hg mv edenscm sapling" + "hg mv edenscmnative saplingnative" 2. s/edenscm/sapling/g 3. s/EdenSCM/Sapling/g 4. Update autocargo config 5. Update mercurialshim.py to support "edenscm" as legacy module (this is the critical part that keeps backwards compat w/ extensions and hooks that import from "edenscm") Reviewed By: sggutier Differential Revision: D49326692 fbshipit-source-id: 843db9ece03c7b80c666ff805bd855211614ac62 --- build/fbcode_builder/manifests/eden | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/manifests/eden b/build/fbcode_builder/manifests/eden index 161bccb1f1ed..5261fd955b5d 100644 --- a/build/fbcode_builder/manifests/eden +++ b/build/fbcode_builder/manifests/eden @@ -90,7 +90,7 @@ fbcode/configerator/structs/scm/hg/public_autocargo = configerator/structs/scm/h ^fbcode/common/rust/shed(?!/public_autocargo).*/Cargo\.toml$ ^fbcode/configerator/structs/scm/hg(?!/public_autocargo).*/Cargo\.toml$ ^fbcode/eden/fs(?!/public_autocargo).*/Cargo\.toml$ -^fbcode/eden/scm(?!/public_autocargo|/edenscmnative).*/Cargo\.toml$ +^fbcode/eden/scm(?!/public_autocargo|/saplingnative).*/Cargo\.toml$ ^.*/facebook/.*$ ^.*/fb/.*$ From b2d1e94e1aa2ee78932a382009866a75b2b79c08 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 25 Sep 2023 14:54:10 -0700 Subject: [PATCH 6491/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c5db865cc6f1a6385f225fb667bbf0f19171519a https://github.com/facebook/fbthrift/commit/30eeb3dbb8f6b29b059bdc0cd98a05ed5d66b647 https://github.com/facebook/folly/commit/6bd301a6463f8ab67755b107d88a4bbaf40df747 https://github.com/facebook/mvfst/commit/eca35f8b8cf5a225a235322de21044e9d580311a https://github.com/facebook/proxygen/commit/18fad4e74d1b9ae01c59779394c6febb78516997 https://github.com/facebook/wangle/commit/ed614992f8f34a44625412a923befeaa3fb4e5c9 https://github.com/facebook/watchman/commit/8efd8a6e7c583dc853550b3069055f1e0fb59e9b https://github.com/facebookexperimental/edencommon/commit/711f657a589c77a512c432c2d0bd63083f3aa9d0 https://github.com/facebookexperimental/rust-shed/commit/29d8d3dfb36a7840f7d88c901a62acd7c57e37dd https://github.com/facebookincubator/fizz/commit/5539dfc937ce232d1cef3dc318d955a39d5961ea https://github.com/facebookincubator/katran/commit/ba34cf9deb1d9f63e088016d1bf5ac8660f1cdbb https://github.com/facebookincubator/velox/commit/b1772ed1adb68658c35decb0749c4061631eaa02 Reviewed By: bigfootjon fbshipit-source-id: d0b47242731589ca6dcecdbf1c03d56537adb40e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6aa3f5c0223e..683f1325e914 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cd83e626bb052332a1a19187509d1a9891857fae +Subproject commit 30eeb3dbb8f6b29b059bdc0cd98a05ed5d66b647 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e700cd8da037..6e4969259b6c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 333796135523f691e170d94781035e27e67cc26b +Subproject commit 6bd301a6463f8ab67755b107d88a4bbaf40df747 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4bd8d01686f3..c34e6c27aed9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1b1a0812736e81bc194f648850ddd4ee9e1041cc +Subproject commit ed614992f8f34a44625412a923befeaa3fb4e5c9 From a7c3280537dc775cef6cf88b80d2a8aee5437061 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 26 Sep 2023 01:59:59 -0700 Subject: [PATCH 6492/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/06b9dca73c7ddd5038db8d66a90f5635a30b3a83 https://github.com/facebook/proxygen/commit/f45afb9aeac4471c8c68ae17a9eaa70dbd7b8c7e https://github.com/facebookincubator/katran/commit/3f0b3a6adab6060b57048fbf64c2caa745283890 https://github.com/facebookincubator/velox/commit/de7c831c5022d0fa38e6315ab6c7ee66f2eb736d Reviewed By: bigfootjon fbshipit-source-id: 7fd404b3621c8cb0c8cd996d89bc9b649dc8f69a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 683f1325e914..de98cb25efde 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 30eeb3dbb8f6b29b059bdc0cd98a05ed5d66b647 +Subproject commit 06b9dca73c7ddd5038db8d66a90f5635a30b3a83 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6e4969259b6c..8e9570dae39d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 6bd301a6463f8ab67755b107d88a4bbaf40df747 +Subproject commit 7293c3404d27c2f75fd9c3e7ffa53e53d356466e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c34e6c27aed9..24f17279f137 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ed614992f8f34a44625412a923befeaa3fb4e5c9 +Subproject commit 25847a62511347596a859899e261e3a950ec961c From a19f07e4ac293bf2e8e88bded53a0ee2775ce013 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 26 Sep 2023 10:28:10 -0700 Subject: [PATCH 6493/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/496db27cd728ddb314e1f07471be995cfc12facb https://github.com/facebookincubator/velox/commit/a384a2a594ddcaf027148632d3b8b43b6b97274a Reviewed By: bigfootjon fbshipit-source-id: 3fd6a05f060213e22c7425adf9d3e4e373479652 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8e9570dae39d..4189914a9720 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7293c3404d27c2f75fd9c3e7ffa53e53d356466e +Subproject commit 496db27cd728ddb314e1f07471be995cfc12facb From 79831e406c46ee06782d9ea5a84697c0ee5b0a05 Mon Sep 17 00:00:00 2001 From: Manikandan Somasundaram Date: Tue, 26 Sep 2023 11:09:19 -0700 Subject: [PATCH 6494/7387] Remove libmnl dependency for fboss Summary: X-link: https://github.com/facebookincubator/velox/pull/6685 libmnl-static has not been used for fboss in centos8. It is not available in centos9. fboss builds fine without limnl dependency Reviewed By: srikrishnagopu Differential Revision: D49380161 Privacy Context Container: L1125642 fbshipit-source-id: e1382a9d04c0fc962b4083c4aa7edba6bc1e02ae --- build/fbcode_builder/manifests/fboss | 1 - 1 file changed, 1 deletion(-) diff --git a/build/fbcode_builder/manifests/fboss b/build/fbcode_builder/manifests/fboss index 5679c58db2a3..8bcd1cb110c9 100644 --- a/build/fbcode_builder/manifests/fboss +++ b/build/fbcode_builder/manifests/fboss @@ -27,7 +27,6 @@ zstd fatal fbthrift iproute2 -libmnl libusb libcurl libnl From 62435de6a0e66d0c370f86e5325cfa0ac45d63a8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 26 Sep 2023 12:13:22 -0700 Subject: [PATCH 6495/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/77aa51f0f3c9a57e153830a9988472f46a79847c https://github.com/facebook/fb303/commit/16048f21b61c12a633db653cb9d7743f1a784ecd https://github.com/facebook/fbthrift/commit/cbe039dedf56429af6cd6054974520c0b8953122 https://github.com/facebook/folly/commit/c3f2f551c754761146d2accf3fc8759050fd051f https://github.com/facebook/litho/commit/aafc329eb3b32c47ebbdfb83d1bbabd7cb370b16 https://github.com/facebook/mvfst/commit/6d2d00a361ae525276f6e96297b9720a6d36d065 https://github.com/facebook/proxygen/commit/22c199870ca1a65efbf8f290988cde05a4cef70d https://github.com/facebook/rocksdb/commit/719f5511f65d75d5b0332016bb66fa647ab6a76d https://github.com/facebook/wangle/commit/038a86f63754e14ad5501916ee0b4eb4a9d39815 https://github.com/facebook/watchman/commit/79831e406c46ee06782d9ea5a84697c0ee5b0a05 https://github.com/facebookexperimental/edencommon/commit/3b4f7edda709c49450f39f10fc842b008a44c9fe https://github.com/facebookexperimental/rust-shed/commit/1d2bde69e9922c0f17bb57030c32a17e3b68d72e https://github.com/facebookincubator/fizz/commit/c65cbc0a747415d97adee2537ba556e952082386 https://github.com/facebookincubator/katran/commit/2b62e50cafccfc1801d25cf5e90563f001bf8e01 https://github.com/facebookincubator/velox/commit/c1c14e24f4d231524fe60ef977e858dce9624115 https://github.com/fairinternal/egohowto/commit/1c07ec38087ef3b966452bee9fc56886214bee36 Reviewed By: bigfootjon fbshipit-source-id: d8d88e44f65f0fd419fce111fce48f24f81af62c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index de98cb25efde..c7464a94c606 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 06b9dca73c7ddd5038db8d66a90f5635a30b3a83 +Subproject commit cbe039dedf56429af6cd6054974520c0b8953122 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4189914a9720..79675650a206 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 496db27cd728ddb314e1f07471be995cfc12facb +Subproject commit c3f2f551c754761146d2accf3fc8759050fd051f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 24f17279f137..dc1aa883fe94 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 25847a62511347596a859899e261e3a950ec961c +Subproject commit 038a86f63754e14ad5501916ee0b4eb4a9d39815 From 99e6be3421ff602000c8ba6d5162105246f847d1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 26 Sep 2023 16:44:24 -0700 Subject: [PATCH 6496/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/cb19e0b4c4955c7f6041cf9f93094625e4252495 https://github.com/facebook/mvfst/commit/25bde289dcb9faf01035808b0cc3fab55f18258b https://github.com/facebook/ocamlrep/commit/41cbf4cf3cee5b2cfe4ab84195e56e5fdc1f4fc0 https://github.com/facebookincubator/velox/commit/25cadf3e3f53d39d24090444e24c258ecec60de5 https://github.com/pytorch/fbgemm/commit/93bfbe98a7d1d9fc6b67f5995786c7069e7e0ee9 Reviewed By: bigfootjon fbshipit-source-id: 1bae6d1eb49b271cfc508bf982e9ea5b1faa772d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c7464a94c606..e51a02cdc56a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cbe039dedf56429af6cd6054974520c0b8953122 +Subproject commit cb19e0b4c4955c7f6041cf9f93094625e4252495 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index dc1aa883fe94..1298e71dd12b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 038a86f63754e14ad5501916ee0b4eb4a9d39815 +Subproject commit 12b1d9201b2793cb6e3b4892359b59abdfea2c38 From 95c6efc8cb50c2f4e4deebcded3388755b0e7712 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 27 Sep 2023 01:06:37 -0700 Subject: [PATCH 6497/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/9e168d6924e7f11f9e4c56629f87998b1b7cf304 https://github.com/facebookincubator/velox/commit/05386f6a8c3fea277e4f5d03128a8daed1896ae3 Reviewed By: bigfootjon fbshipit-source-id: 41ad24cba0b889058bfd97bd9898b2cb5a06efd1 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 79675650a206..4a2fd9250f4d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c3f2f551c754761146d2accf3fc8759050fd051f +Subproject commit 9e168d6924e7f11f9e4c56629f87998b1b7cf304 From b524957d7c09eb0098699d485abd99d756ab9a75 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 27 Sep 2023 02:28:50 -0700 Subject: [PATCH 6498/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/8e567350d5aa6ce6470d0de91363b254e6f91bbd https://github.com/facebook/fb303/commit/e67c79325421fb5b2cb911f34ad4b5c4fd91df00 https://github.com/facebook/fbthrift/commit/e155cdf5a3c14750d7a89c87a1b60f54a47e1d0a https://github.com/facebook/mvfst/commit/559a351da5b793dc8062e70a203ddba82a2d1e25 https://github.com/facebook/wangle/commit/d014f99ad8c3ca5a3d456a56e651f46e5e8f4537 https://github.com/facebook/watchman/commit/95c6efc8cb50c2f4e4deebcded3388755b0e7712 https://github.com/facebookincubator/katran/commit/2ad22e04b97ee8b3495bcb8d6919b275b1eaa787 https://github.com/facebookincubator/velox/commit/e94c8177e7d67cf07c1c425384164228b4dd2b9c Reviewed By: bigfootjon fbshipit-source-id: d724fca79df1d67b2b1324b9f69daf2c14415b98 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e51a02cdc56a..7fbd7f170602 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cb19e0b4c4955c7f6041cf9f93094625e4252495 +Subproject commit e155cdf5a3c14750d7a89c87a1b60f54a47e1d0a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1298e71dd12b..6351dc4f60d4 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 12b1d9201b2793cb6e3b4892359b59abdfea2c38 +Subproject commit d014f99ad8c3ca5a3d456a56e651f46e5e8f4537 From a5aee681cae5af68c26aed3f23c22d3abcc1ff52 Mon Sep 17 00:00:00 2001 From: Liubov Dmitrieva Date: Wed, 27 Sep 2023 08:53:34 -0700 Subject: [PATCH 6499/7387] pass client request info into EdenFs Summary: pass client request info into EdenFs create an equivalent thrift type to the ClientRequestInfo type we have to use thrift params (adding a new field into existing params) since thrift headers are not supported in the underlying transport used (tried in D49635948). SocketTransport relies on FramedTransport which only transfers a payload, but no header metadata per frame. Reviewed By: genevievehelsel Differential Revision: D49656897 fbshipit-source-id: ac8b1ac22b20470cce903552c46672081478b59d --- eden/fs/service/eden.thrift | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index cf10851eac37..f2cc7608fd38 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1022,6 +1022,11 @@ struct RequestInfo { 2: optional string processName; } +struct ClientRequestInfo { + 1: string correlator; + 2: string entry_point; +} + enum HgEventType { UNKNOWN = 0, QUEUE = 1, @@ -1464,6 +1469,9 @@ struct GetScmStatusParams { * directory) will never be reported even when listIgnored is true. */ 3: bool listIgnored = false; + + // Pass unique identifier of this request's caller. + 4: optional ClientRequestInfo cri; } /** @@ -1514,6 +1522,9 @@ struct CheckOutRevisionParams { * need to look it up. */ 1: optional BinaryHash hgRootManifest; + + // Pass unique identifier of this request's caller. + 2: optional ClientRequestInfo cri; } struct ResetParentCommitsParams { @@ -1528,6 +1539,9 @@ struct ResetParentCommitsParams { * need to look it up. */ 1: optional BinaryHash hgRootManifest; + + // Pass unique identifier of this request's caller. + 2: optional ClientRequestInfo cri; } struct RemoveRecursivelyParams { From 5f6d43269d6e781370e5d582c1b669060447966c Mon Sep 17 00:00:00 2001 From: Xinyi Wang Date: Wed, 27 Sep 2023 09:57:33 -0700 Subject: [PATCH 6500/7387] move the method to look up process to a common place Summary: As title in the task, I need to look up process info using this method. Move it to shared util class so that I can include them else where Reviewed By: kmancini Differential Revision: D49654377 fbshipit-source-id: d071926d023ef3a8cf2c92e1a328e4db11961bc5 --- CMakeLists.txt | 1 + watchman/Client.cpp | 13 ++----------- watchman/ProcessUtil.cpp | 27 +++++++++++++++++++++++++++ watchman/ProcessUtil.h | 22 ++++++++++++++++++++++ 4 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 watchman/ProcessUtil.cpp create mode 100644 watchman/ProcessUtil.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 8252ba5f1b9d..169d847deade 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -605,6 +605,7 @@ watchman/PerfSample.cpp watchman/fs/ParallelWalk.cpp watchman/fs/Pipe.cpp watchman/ProcessLock.cpp +watchman/ProcessUtil.cpp # PubSub.cpp (in liblog) watchman/QueryableView.cpp watchman/SanityCheck.cpp diff --git a/watchman/Client.cpp b/watchman/Client.cpp index 1cc3d3721577..6c981b3905a1 100644 --- a/watchman/Client.cpp +++ b/watchman/Client.cpp @@ -9,11 +9,13 @@ #include +#include "eden/common/utils/ProcessInfoCache.h" #include "watchman/Command.h" #include "watchman/Errors.h" #include "watchman/Logging.h" #include "watchman/MapUtil.h" #include "watchman/Poison.h" +#include "watchman/ProcessUtil.h" #include "watchman/QueryableView.h" #include "watchman/Shutdown.h" #include "watchman/root/Root.h" @@ -23,17 +25,6 @@ namespace watchman { namespace { -using namespace facebook::eden; - -ProcessInfoCache& getProcessInfoCache() { - static auto* pic = new ProcessInfoCache; - return *pic; -} - -ProcessInfoHandle lookupProcessInfo(pid_t pid) { - return getProcessInfoCache().lookup(pid); -} - constexpr size_t kResponseLogLimit = 0; folly::Synchronized> clients; diff --git a/watchman/ProcessUtil.cpp b/watchman/ProcessUtil.cpp new file mode 100644 index 000000000000..867affcbf9bc --- /dev/null +++ b/watchman/ProcessUtil.cpp @@ -0,0 +1,27 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +#include "watchman/ProcessUtil.h" + +#include "eden/common/utils/ProcessInfoCache.h" + +namespace watchman { + +using namespace facebook::eden; + +namespace { +ProcessInfoCache& getProcessInfoCache() { + static auto* pic = new ProcessInfoCache; + return *pic; +} +} // namespace + +ProcessInfoHandle lookupProcessInfo(pid_t pid) { + return getProcessInfoCache().lookup(pid); +} + +} // namespace watchman diff --git a/watchman/ProcessUtil.h b/watchman/ProcessUtil.h new file mode 100644 index 000000000000..c90a386979f0 --- /dev/null +++ b/watchman/ProcessUtil.h @@ -0,0 +1,22 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +#pragma once + +#include + +namespace facebook::eden { +class ProcessInfoHandle; +} + +namespace watchman { + +using ProcessInfoHandle = facebook::eden::ProcessInfoHandle; + +ProcessInfoHandle lookupProcessInfo(pid_t pid); + +} // namespace watchman From 77a3297e507300ed35189d1fe5920e8436ecc502 Mon Sep 17 00:00:00 2001 From: Xinyi Wang Date: Wed, 27 Sep 2023 12:07:06 -0700 Subject: [PATCH 6501/7387] print the process that starts watchman Summary: Print out the parent command of watchman Note watchman can both run in foreground and run as a background daemon, which in the second case it has multiple forks. In this diff, I obtain parent pid before watchman process fork in to client and server and pass it down Reviewed By: chadaustin Differential Revision: D49693503 fbshipit-source-id: 836f916a41cd3fb7ee1e22e33295b4c723200de1 --- watchman/main.cpp | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/watchman/main.cpp b/watchman/main.cpp index 25e12cc20f3f..b3c75d8e0e8a 100644 --- a/watchman/main.cpp +++ b/watchman/main.cpp @@ -29,6 +29,7 @@ #include "watchman/PDU.h" #include "watchman/PerfSample.h" #include "watchman/ProcessLock.h" +#include "watchman/ProcessUtil.h" #include "watchman/ThreadPool.h" #include "watchman/UserDir.h" #include "watchman/WatchmanConfig.h" @@ -107,7 +108,27 @@ void detect_low_process_priority() { #endif } -[[noreturn]] static void run_service(ProcessLock::Handle&&) { +/* + * Detect the command that starts watchman + */ +std::optional detect_starting_command(pid_t ppid) { +#ifndef _WIN32 + try { + auto processInfo = lookupProcessInfo(ppid).get(); + return processInfo.name; + } catch (const std::exception& e) { + logf( + ERR, + "Failed to lookup process info for pid {} exception {} \n", + ppid, + e.what()); + } + +#endif + return std::nullopt; +} + +[[noreturn]] static void run_service(ProcessLock::Handle&&, pid_t ppid) { #ifndef _WIN32 // Before we redirect stdin/stdout to the log files, move any inetd-provided // socket to a different descriptor number. @@ -149,16 +170,18 @@ void detect_low_process_priority() { char hostname[256]; gethostname(hostname, sizeof(hostname)); hostname[sizeof(hostname) - 1] = '\0'; + auto startingCommandName = detect_starting_command(ppid); logf( ERR, - "Watchman {} {} starting up on {}\n", + "Watchman {} {} starting up on {} by command {}\n", PACKAGE_VERSION, #ifdef WATCHMAN_BUILD_INFO WATCHMAN_BUILD_INFO, #else "", #endif - hostname); + hostname, + startingCommandName.value_or("")); } #ifndef _WIN32 @@ -247,7 +270,7 @@ static void close_random_fds() { auto& pid_file = get_pid_file(); auto processLock = ProcessLock::acquire(pid_file); - run_service(processLock.writePid(pid_file)); + run_service(processLock.writePid(pid_file), getppid()); } namespace { @@ -296,6 +319,7 @@ static SpawnResult run_service_as_daemon() { } auto& processLock = std::get(acquireResult); + auto parentPid = getppid(); // the double-fork-and-setsid trick establishes a // child process that runs in its own process group @@ -319,7 +343,7 @@ static SpawnResult run_service_as_daemon() { // We are the child. Let's populate the pid file and start listening on the // socket. - run_service(processLock.writePid(get_pid_file())); + run_service(processLock.writePid(get_pid_file()), parentPid); } #endif From ed6dab92e42b0ad7d9fa60cc5c2512c007626080 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 27 Sep 2023 17:57:18 -0700 Subject: [PATCH 6502/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7929c38989b30a7f963767c5ef92fad1996516b8 https://github.com/pytorch/kineto/commit/4df86b0b1f6dca9a49a6d92514e8ad2866d68297 Reviewed By: bigfootjon fbshipit-source-id: 6b5a1f0dc52344dc5796ced5fd7d498e9ff1a530 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7fbd7f170602..59ad5dd6e784 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e155cdf5a3c14750d7a89c87a1b60f54a47e1d0a +Subproject commit 7929c38989b30a7f963767c5ef92fad1996516b8 From 7aef81ff1915da9ffdea3a19f1a62d060b65828a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 28 Sep 2023 03:24:38 -0700 Subject: [PATCH 6503/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7df5ea88916a875581d4c86fd5588598abac7fd5 https://github.com/facebook/folly/commit/be7b234f87697ab39e6300aa885698a956a78cbd https://github.com/facebook/proxygen/commit/1f2d8193c1f3cc85a5344ec7edbd0be3215d225b https://github.com/facebookexperimental/rust-shed/commit/96285370d926e4aac54c1e8f860077ffe20c1b60 Reviewed By: bigfootjon fbshipit-source-id: d51ebbf407e6a4cd1c9d45d140756a89fdf9f85b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 59ad5dd6e784..d03c3be374db 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7929c38989b30a7f963767c5ef92fad1996516b8 +Subproject commit 7df5ea88916a875581d4c86fd5588598abac7fd5 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4a2fd9250f4d..325dce54e903 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9e168d6924e7f11f9e4c56629f87998b1b7cf304 +Subproject commit be7b234f87697ab39e6300aa885698a956a78cbd diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6351dc4f60d4..8aa4b2ae37e7 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d014f99ad8c3ca5a3d456a56e651f46e5e8f4537 +Subproject commit 48f41b251ea5b212e6569cff3398dfe1d482eda0 From bc8fd419e4441024f95853c9c31712892665e046 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 28 Sep 2023 12:51:33 -0700 Subject: [PATCH 6504/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/b866dcff3f238099c15ea701a3cb9fc99b9c06ea https://github.com/facebook/fbthrift/commit/2b4cabdee8e4a014935aae51b9964a29c7f1f060 https://github.com/facebook/ocamlrep/commit/eb10493849f26e88f581999d3f9583ffc78ed5c2 https://github.com/pytorch/fbgemm/commit/7c9e21d5b7e75358288fc44eaa434cd9c2a050c4 Reviewed By: bigfootjon fbshipit-source-id: d4e8b3d332d82a9ffbfadf9e1fa91a58648a5cf4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d03c3be374db..96fcfce9bcfa 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7df5ea88916a875581d4c86fd5588598abac7fd5 +Subproject commit 2b4cabdee8e4a014935aae51b9964a29c7f1f060 From 8de2cdcda7e8fa467f74f882c471b3c25b5706c1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 28 Sep 2023 15:10:12 -0700 Subject: [PATCH 6505/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/af1b8599325477ddadc47a89cdf0f9881fd6fd3e https://github.com/facebook/proxygen/commit/62730bacf638571b3ad897e90aa7db488f4bd595 https://github.com/facebookincubator/velox/commit/883066d4bc52efde25ad57fed48a7bacf66289d2 Reviewed By: bigfootjon fbshipit-source-id: cdb372cf0cf4c8a6f878460d53c85e0d71e63431 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 96fcfce9bcfa..82d2cb17ac49 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2b4cabdee8e4a014935aae51b9964a29c7f1f060 +Subproject commit af1b8599325477ddadc47a89cdf0f9881fd6fd3e From b5c64af37fe5ad63d68610453a096c640f1ba8de Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 28 Sep 2023 20:29:27 -0700 Subject: [PATCH 6506/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/4160d1e20eb8e0cbfe07e6f3e4e14b570848e4ef https://github.com/facebook/ocamlrep/commit/b41283f442b20e91918c81d4118a67b12c7bb254 https://github.com/facebook/wangle/commit/9456fa23d661699c49b82e57df9f4a15f85230a4 https://github.com/facebookexperimental/edencommon/commit/e8c29815f195f9e83299587fc4b0ff33da53f0b8 https://github.com/facebookincubator/fizz/commit/61b76bbe8769263d3b22a238b7d27c79942c65d8 https://github.com/facebookincubator/katran/commit/a76f936f01e2ead29211f9dcdeb51e2bda55549c https://github.com/facebookincubator/velox/commit/bd151a2c142e226729dd0c34a2c9a662af57c78d https://github.com/pytorch/fbgemm/commit/32c969f98851192ad5439113b17540421ae5f650 Reviewed By: bigfootjon fbshipit-source-id: 03c4f9e951148cf65e5ec768e70ff7f166204b6a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 82d2cb17ac49..f2066232a757 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit af1b8599325477ddadc47a89cdf0f9881fd6fd3e +Subproject commit 4160d1e20eb8e0cbfe07e6f3e4e14b570848e4ef diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8aa4b2ae37e7..b883cac32a92 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 48f41b251ea5b212e6569cff3398dfe1d482eda0 +Subproject commit 9456fa23d661699c49b82e57df9f4a15f85230a4 From 94d3d82f65d2409dccd494767f2278464cb89110 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 29 Sep 2023 06:41:16 -0700 Subject: [PATCH 6507/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/94a484d159077daf219b606148e558fb3ee517ee https://github.com/facebookincubator/velox/commit/b1db9910a5d15ec4e0a04f968381d360ce54d0a2 Reviewed By: zpao fbshipit-source-id: 2c78d39e84075757888e21b1ec050993e9c20c94 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f2066232a757..d0effee24166 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4160d1e20eb8e0cbfe07e6f3e4e14b570848e4ef +Subproject commit 94a484d159077daf219b606148e558fb3ee517ee diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b883cac32a92..156af7de0876 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9456fa23d661699c49b82e57df9f4a15f85230a4 +Subproject commit db8b704fd9052b7ac98a767a2cbaca68bd035541 From 0bfbaca9cab281f3f7cc311edaeb5d94c1d22ec9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 29 Sep 2023 16:41:51 -0700 Subject: [PATCH 6508/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/d13a20809b43ed107b2050738647e29884474eec https://github.com/facebook/folly/commit/f7dc2e654901ea0e58046edc2e6ceaf9f49d9b26 https://github.com/facebook/mvfst/commit/dd0ded14cc453c981f5a33c7ce5944e9b6ee1ef8 https://github.com/facebook/proxygen/commit/e230e7f656fd3a4d075c9b32c09c8778257c5647 https://github.com/facebook/rocksdb/commit/3c4cc6c2cc99c594c7c5569f1e565413bbe8bcdc https://github.com/facebookexperimental/rust-shed/commit/ec3252ca098ec67d43227ae874a57790c20046e4 https://github.com/facebookincubator/velox/commit/143fe66751d828f5bb6f5916353cf993558f1d2a https://github.com/facebookresearch/vrs/commit/08b451c8713c55199e4e4bc028a9b938e672cd60 https://github.com/pytorch/fbgemm/commit/39914eff04dd1d79557ae7be135d6dd81f43b328 https://github.com/pytorch/kineto/commit/288e9553c6579964cd7b765a34f7f9c6f51c5c2b Reviewed By: zpao fbshipit-source-id: 4ade465eb64790b2752701c01a9aa44a3d98e574 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d0effee24166..484ba022e2df 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 94a484d159077daf219b606148e558fb3ee517ee +Subproject commit d13a20809b43ed107b2050738647e29884474eec diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 325dce54e903..4df686db90a4 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit be7b234f87697ab39e6300aa885698a956a78cbd +Subproject commit f7dc2e654901ea0e58046edc2e6ceaf9f49d9b26 From 7e4b46d33806cfe2fa1e190b965bb93bbdfecfde Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 30 Sep 2023 06:59:46 -0700 Subject: [PATCH 6509/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/d8bef8b2e0c64a3c893dceeb9386e027d43d6bcc Reviewed By: zpao fbshipit-source-id: 007fef2fd9ea3522e40c8d256d38eba6620dd010 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 484ba022e2df..b1f85b0dbc42 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d13a20809b43ed107b2050738647e29884474eec +Subproject commit 4242c230e24447e3bbdbe68c103b06cbc9594a44 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4df686db90a4..0e5f38598a14 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f7dc2e654901ea0e58046edc2e6ceaf9f49d9b26 +Subproject commit d8bef8b2e0c64a3c893dceeb9386e027d43d6bcc diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 156af7de0876..52ac0cda419e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit db8b704fd9052b7ac98a767a2cbaca68bd035541 +Subproject commit 1bde95a2e8973fada4b657b60cecbf44480eb328 From bc6db12016470ff0a9be0fb6b4fc62036a687901 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 30 Sep 2023 21:03:50 -0700 Subject: [PATCH 6510/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8a3a2ebad5c26ca10c22ba5340051f0582a6c198 Reviewed By: zpao fbshipit-source-id: 1fc640cc5009ed1b0267ee79e219fe6de3e071ca --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b1f85b0dbc42..0300130f34b6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4242c230e24447e3bbdbe68c103b06cbc9594a44 +Subproject commit 8a3a2ebad5c26ca10c22ba5340051f0582a6c198 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 52ac0cda419e..2798ef730f3e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1bde95a2e8973fada4b657b60cecbf44480eb328 +Subproject commit 0f0200f992667354cfb405e8792a7ecc2ddc91ab From 6d282631f1002e3cf737ba431566b047f9d15348 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 1 Oct 2023 21:25:19 -0700 Subject: [PATCH 6511/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/411a16fea43ddbc5c55cf3dd5cfd438c0a78b49a Reviewed By: zpao fbshipit-source-id: 543a89614899c17f6b23b195ccfe70efad610bad --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0300130f34b6..17184286be88 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8a3a2ebad5c26ca10c22ba5340051f0582a6c198 +Subproject commit 411a16fea43ddbc5c55cf3dd5cfd438c0a78b49a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0e5f38598a14..e62fe1c550e1 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d8bef8b2e0c64a3c893dceeb9386e027d43d6bcc +Subproject commit e363724b7cabe84e14d824e3053a431ca3bd4db2 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2798ef730f3e..ddf10194ebfd 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0f0200f992667354cfb405e8792a7ecc2ddc91ab +Subproject commit 917869abd8a82924c836692ec6607f0ac806e095 From 102c692dcb40ab38873264be7b1aa93c64826fe9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 2 Oct 2023 04:19:46 -0700 Subject: [PATCH 6512/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/92a4d6072e0d1a057432ed22ae15288a1c96e2d4 Reviewed By: zpao fbshipit-source-id: 93db8da6cc6d801185d062f2135cd294af8d0cc8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 17184286be88..1fa0c76b292e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 411a16fea43ddbc5c55cf3dd5cfd438c0a78b49a +Subproject commit 92a4d6072e0d1a057432ed22ae15288a1c96e2d4 From e2ffe82a6411d84518abed14f2d7cade8e8b52a2 Mon Sep 17 00:00:00 2001 From: Xinyi Wang Date: Mon, 2 Oct 2023 12:06:39 -0700 Subject: [PATCH 6513/7387] add thrift definition Summary: Add thrift definition as discussed in https://docs.google.com/document/d/1v7o7i7TZ9EUHCacofR1wvPvgvPGd6dkONlU7NRgLwxA/edit Reviewed By: MichaelCuevas Differential Revision: D49753843 fbshipit-source-id: b7089754d5a7ad581e3c5e2c7df5b085912b50a2 --- eden/fs/service/streamingeden.thrift | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/eden/fs/service/streamingeden.thrift b/eden/fs/service/streamingeden.thrift index 2adf9059c088..c45e7c2ce7a1 100644 --- a/eden/fs/service/streamingeden.thrift +++ b/eden/fs/service/streamingeden.thrift @@ -90,6 +90,18 @@ struct StreamChangesSinceParams { 2: eden.JournalPosition fromPosition; } +struct GlobFilter { + 1: list globs; // a list of globs +} + +/** + * Argument to streamSelectedChangesSince API + */ +struct StreamSelectedChangesSinceParams { + 1: StreamChangesSinceParams changesParams; + 2: GlobFilter filter; +} + struct TraceTaskEventsRequest {} typedef binary EdenStartStatusUpdate @@ -188,6 +200,17 @@ service StreamingEdenService extends eden.EdenService { 1: eden.EdenError ex, ); + /** + * Same as the API above but only returns files that match the globs in filter. + * This API is intend to replace the above API but it's currently under development. + * NOT YET READY FOR PROD USE + */ + ChangesSinceResult, stream< + ChangedFileResult throws (1: eden.EdenError ex) + > streamSelectedChangesSince( + 1: StreamSelectedChangesSinceParams params, + ) throws (1: eden.EdenError ex); + /** * Returns the basic status from EdenFS as one would get from getDaemonInfo * and a stream of updates of the EdenFS startup process if EdenFS is From 93e1ebd224ec70a7c3899082b4d548f059afc841 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 2 Oct 2023 13:20:41 -0700 Subject: [PATCH 6514/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/7e1c9d0b82609887632585245092ff1ed517d525 https://github.com/facebook/litho/commit/8e8c2ae73b3ed5dcb39fbe63f0bf29c30a816cdb https://github.com/facebook/ocamlrep/commit/ccac35c4f268bed33521e85b9a29cfa1ba168339 https://github.com/facebook/watchman/commit/e2ffe82a6411d84518abed14f2d7cade8e8b52a2 Reviewed By: zpao fbshipit-source-id: 7925d13944922e0024734afefe670e92ab05be07 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e62fe1c550e1..d7f6709a4875 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e363724b7cabe84e14d824e3053a431ca3bd4db2 +Subproject commit 7e1c9d0b82609887632585245092ff1ed517d525 From ff584cbd7ea964db9d96e82b77d720582ba5a8ff Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 2 Oct 2023 16:14:49 -0700 Subject: [PATCH 6515/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/adce3c4920d814f76ccb9e5a5787bea0a0327a4b https://github.com/facebook/mvfst/commit/582f952f17c09725a49dd431ae2fa66a37df219d https://github.com/facebook/ocamlrep/commit/7575b695540ad81e541ad34d431715c6c51dc525 https://github.com/facebook/proxygen/commit/eb1636f3c18fc1aa445b35b7d17452bf90ddfecb https://github.com/facebook/wangle/commit/c4076ac4fb9ff49e527236fa5f32687494f56200 https://github.com/facebook/watchman/commit/93e1ebd224ec70a7c3899082b4d548f059afc841 https://github.com/facebookexperimental/edencommon/commit/f43ccfbecc342232b365c9a9ca41daeabd46f5c7 https://github.com/facebookincubator/fizz/commit/f4aaeec19ec1e1f2e02dc03c95121778642f512a https://github.com/facebookincubator/katran/commit/7306ec915dbbd8259077e5e3ae9dbc3bcb9ed983 https://github.com/facebookincubator/velox/commit/8f7d35fd64c1fb90d871ab6a2a5278b79eb2967a Reviewed By: zpao fbshipit-source-id: ead9c52c0acb336794d0da2a9600c5e29703d03f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1fa0c76b292e..04ca8d247a0c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 92a4d6072e0d1a057432ed22ae15288a1c96e2d4 +Subproject commit adce3c4920d814f76ccb9e5a5787bea0a0327a4b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ddf10194ebfd..6be4aeb94198 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 917869abd8a82924c836692ec6607f0ac806e095 +Subproject commit c4076ac4fb9ff49e527236fa5f32687494f56200 From 4a504ecb5ccee0a041e9f7bfcd6d1a563dd5851e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 2 Oct 2023 19:34:49 -0700 Subject: [PATCH 6516/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/01c7ded6e8908e80f5404b4d94317a3f7986d81a https://github.com/facebook/folly/commit/1c16cb2aca4c35b72f0e80f477b1b8da064475f7 https://github.com/facebook/rocksdb/commit/97f6f475bc373360d3a5a153e76a04c5d43487c0 https://github.com/facebookincubator/velox/commit/3b70b0f419de9756b5127786739e63cbbee93a86 Reviewed By: zpao fbshipit-source-id: efdd72c28fb25b0b02c561325f7ade31c9a3e0dc --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 04ca8d247a0c..d4fac757499d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit adce3c4920d814f76ccb9e5a5787bea0a0327a4b +Subproject commit 01c7ded6e8908e80f5404b4d94317a3f7986d81a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d7f6709a4875..274169cabb01 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7e1c9d0b82609887632585245092ff1ed517d525 +Subproject commit 1c16cb2aca4c35b72f0e80f477b1b8da064475f7 From 6e7827b7b989a3c37658bc21c768917a3d640059 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 2 Oct 2023 20:52:08 -0700 Subject: [PATCH 6517/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/15cd3515d6fec5378b722beee321ca19ac26cfdf https://github.com/facebook/folly/commit/97acbe4a62cd7ae620773affc45d9a6956e33cf2 https://github.com/facebook/ocamlrep/commit/b546d4c3a26cbbe6991e5d7b0949df3faa6b8f80 https://github.com/facebook/proxygen/commit/80329a65b572320c1a7e508768398d3d6049142b https://github.com/facebook/watchman/commit/4a504ecb5ccee0a041e9f7bfcd6d1a563dd5851e https://github.com/facebookincubator/velox/commit/365fd7e7e96f4e866aab832a1b28a8197ba6c93a Reviewed By: zpao fbshipit-source-id: 05a61641aa9450e48c836b34acabfa37d67b0422 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d4fac757499d..678d0ed792ea 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 01c7ded6e8908e80f5404b4d94317a3f7986d81a +Subproject commit 15cd3515d6fec5378b722beee321ca19ac26cfdf diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 274169cabb01..7ebb57996c14 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1c16cb2aca4c35b72f0e80f477b1b8da064475f7 +Subproject commit 97acbe4a62cd7ae620773affc45d9a6956e33cf2 From 6844f13da7c14393eb52e70ec489da80f8ed0e74 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 3 Oct 2023 14:50:49 -0700 Subject: [PATCH 6518/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/72f3014baa1e1d755f702ca0393d63186f924004 https://github.com/facebook/wangle/commit/68f12569f46538f5c6ba19cb195768c921b818f0 https://github.com/facebookexperimental/edencommon/commit/260fe10714879ba8b97cf7bd3f27eaaa5d0d7a11 https://github.com/facebookincubator/fizz/commit/37797670d18d2f9eba3e8e4cafd62777b5cecd65 https://github.com/facebookincubator/velox/commit/ef025990f91465a2e313b289c5e0e574d4167ab1 Reviewed By: zpao fbshipit-source-id: 61f58b50d71f42981c7701f4e1f36ca06ea7674f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 678d0ed792ea..1fc3c5fd5c0a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 15cd3515d6fec5378b722beee321ca19ac26cfdf +Subproject commit 72f3014baa1e1d755f702ca0393d63186f924004 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6be4aeb94198..1bfb30bc18ad 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c4076ac4fb9ff49e527236fa5f32687494f56200 +Subproject commit 68f12569f46538f5c6ba19cb195768c921b818f0 From 48298d9e905703ab550c4b6c2c6e3e7434b4a1ff Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 3 Oct 2023 16:47:01 -0700 Subject: [PATCH 6519/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/c4306fde3ee7c91ecfb896fd43937e0bec067907 https://github.com/facebook/litho/commit/2d301c8e7f7500fa38cd75ecba65fdf1dc99cdb9 https://github.com/facebook/rocksdb/commit/40b618f2349b509eabdd175f75faf7ce84cf0696 https://github.com/facebook/watchman/commit/6844f13da7c14393eb52e70ec489da80f8ed0e74 https://github.com/facebookexperimental/rust-shed/commit/af0d9618d7157b8dfdafb5e9b34f2bec6a6c675b https://github.com/facebookincubator/katran/commit/6fa43cd360ada2ad9bb4f2c5c579d1127a95a571 https://github.com/facebookincubator/velox/commit/181762aa3b68b0b1f0874474eb74acf962de269b Reviewed By: zpao fbshipit-source-id: 408a38a2440daa95cb4845efdbd382ef5833703b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1fc3c5fd5c0a..613b3e378fd1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 72f3014baa1e1d755f702ca0393d63186f924004 +Subproject commit c4306fde3ee7c91ecfb896fd43937e0bec067907 From 399fa360c437e40fe705254ea4e7952f09ea9872 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 3 Oct 2023 19:32:42 -0700 Subject: [PATCH 6520/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/311e326ec30b4b4b81d4c1ce3a10fe4f98d65207 https://github.com/facebook/litho/commit/5639861ff9b28b6b9b7323ef291b5af9a27aef26 https://github.com/facebookincubator/velox/commit/06e8bc10c7cf2e973f070307c20298bc62279981 Reviewed By: zpao fbshipit-source-id: 2b8e4c19aeb28d0b523d7c7da9f4dd4552eb5f5b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 613b3e378fd1..a938ac630b18 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c4306fde3ee7c91ecfb896fd43937e0bec067907 +Subproject commit 311e326ec30b4b4b81d4c1ce3a10fe4f98d65207 From e0c589eb3d6b6fc4efaacbf403bce86c88fb6dbb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 3 Oct 2023 22:59:21 -0700 Subject: [PATCH 6521/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ed8ef26d47a063fc58154c6e8ae4a998b558945a https://github.com/facebook/fbthrift/commit/1c2cb9d27b538262a286c54a79074c8b1e779333 https://github.com/facebook/mvfst/commit/a528fffe238095a2da1a5dc09b131b3e994ae225 https://github.com/facebook/wangle/commit/4026a6b2a179af678db74716398c5cd2698b2cf3 https://github.com/facebookincubator/velox/commit/b55002a311e9a2df264b5125b2ab358f585d5d1c Reviewed By: zpao fbshipit-source-id: a3b6dccd6a9c832a08d84242a8a3966e0fe80acd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a938ac630b18..3f145c2c5ff7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 311e326ec30b4b4b81d4c1ce3a10fe4f98d65207 +Subproject commit 1c2cb9d27b538262a286c54a79074c8b1e779333 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1bfb30bc18ad..f2e5e6106f86 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 68f12569f46538f5c6ba19cb195768c921b818f0 +Subproject commit 4026a6b2a179af678db74716398c5cd2698b2cf3 From 8d268a2ed4c6db318463516391f6739a2928390a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 4 Oct 2023 00:13:22 -0700 Subject: [PATCH 6522/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/aa75d55693cf6d971ea9dee5f6d64cf4965be84d https://github.com/facebook/fbthrift/commit/7528c6332804fd132dfa632cde0e796ed856a336 Reviewed By: zpao fbshipit-source-id: bebe1fbe6c75195ad88607fe7af00d97eb63b810 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3f145c2c5ff7..7723442e5bbe 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1c2cb9d27b538262a286c54a79074c8b1e779333 +Subproject commit 7528c6332804fd132dfa632cde0e796ed856a336 From fbdf7dfb6c8bccb16e988c2226d124d660bda0dc Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 4 Oct 2023 17:01:53 -0700 Subject: [PATCH 6523/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/1829b66e248f103f9c6f4230cf34bb8d628a0498 https://github.com/facebook/mvfst/commit/305301384d6a51f8d2c15266cca964c608fa56ee https://github.com/facebook/ocamlrep/commit/8ede242a58c6d1de970a6a099b46d82b73115cbc https://github.com/facebook/proxygen/commit/413a20c6a8bc82c1ecb7802eb284c963e1a3e33f https://github.com/facebook/rocksdb/commit/8e949116f78b03a7c68f262af2fb4b56b427e35b https://github.com/facebookincubator/velox/commit/c4936c125c09816b9c08edc24176e77845f2a55c https://github.com/pytorch/fbgemm/commit/ea18a680b9fe3d82deddfdd677dab516ab2eb8d4 Reviewed By: zpao fbshipit-source-id: 00a3176282bba2b518121e10e74c912c854269dc --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7723442e5bbe..61b75b0b2f5e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7528c6332804fd132dfa632cde0e796ed856a336 +Subproject commit 1829b66e248f103f9c6f4230cf34bb8d628a0498 From e4e3bc1e5e031c30ac57352665a4f45d22ed90a3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 5 Oct 2023 14:05:18 -0700 Subject: [PATCH 6524/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/6a246dd73649391d233c013c1ba26cfff99f0219 https://github.com/facebook/mcrouter/commit/275a7e65f5420d96f3c9b352bfc272ce01be8c75 https://github.com/facebook/ocamlrep/commit/7511a7fba2f636dffb96bb44cde4b9aa6fda6d2b https://github.com/facebook/proxygen/commit/ea7bccbf2f198f150f3faa13b919c949e6aa33aa https://github.com/facebookincubator/katran/commit/37113b056e5e51cdd24f75f91f94c7f3d14beb6f https://github.com/facebookincubator/velox/commit/0ea72cb9fe005be466855e9e0107adc52868eec6 Reviewed By: zpao fbshipit-source-id: 1f4007cebd27ebdbd0dfe99e27592477598bfd9c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 61b75b0b2f5e..9da35e0bea1d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1829b66e248f103f9c6f4230cf34bb8d628a0498 +Subproject commit 6a246dd73649391d233c013c1ba26cfff99f0219 From 2dfa267f7f31af4becd04f4d6b6b816c4c67a10c Mon Sep 17 00:00:00 2001 From: Andres Suarez Date: Thu, 5 Oct 2023 15:20:03 -0700 Subject: [PATCH 6525/7387] Update and pin anyhow to 1.0.72 Summary: anyhow-1.0.73 [uses][1] the new `Error::provide` API. This API is available starting in Rust 1.73. This means that if you want backtraces, you need one: - anyhow-1.0.72 & Rust 1.72 - anyhow-1.0.73 & Rust 1.73 Since we're still on 1.72, pin the version to avoid accidentally losing backtraces. There are no real changes between anyhow-1.0.71 and anyhow-1.0.72. But update to anyhow-1.0.72 so that we're right up until the point where we get backtrace support. [1]: https://github.com/dtolnay/anyhow/pull/319 Reviewed By: shayne-fletcher Differential Revision: D49970958 fbshipit-source-id: 1193611e6d16bc840e63b689e932ea3d33562152 --- watchman/cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index 2a082a408f58..19a6d4c815a1 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] ahash = "0.8" -anyhow = "1.0.71" +anyhow = "=1.0.72" duct = "0.13.6" jwalk = "0.6" serde = { version = "1.0.185", features = ["derive", "rc"] } From 43223be1d7484b720ca44e2077d86b8bba0b547e Mon Sep 17 00:00:00 2001 From: Michael Cuevas Date: Thu, 5 Oct 2023 16:40:21 -0700 Subject: [PATCH 6526/7387] add optional filter parameters to Eden thrift endpoints Summary: After significant discussion, it was decided that the ID of the active filter would be passed into Eden via thrift parameters. Every thrift call that requires a commit to be specified will also take an optional filterID parameter. If Mercurial knows a filter should be applied to the repo (i.e. FilteredFS is in use), it will pass in the optional FilterID parameter in the form of `{path_to_filter}:{commit_hash}` where commit_hash corresponds to the last commit that modified the filter. Eden will parse that parameter and create a RootId in the form `{len_of_commit_hash}{binary_commit_hash}:{path_to_filter}:{hex_commit_hash}` where `len_of_commit_hash` is a varint that indicates how many bytes long the `binary_commit_hash` is. The FilteredBackingStore can then use this information to parse out the `binary_commit_hash` and FilterID from the original RootID. With this info, the FilteredBackingStore can fetch the root tree from the underlying BackingStore, filter the tree using the FilterID, and create a filtered RootTree result that serves as the basis for filtering the repository. Reviewed By: muirdm Differential Revision: D49041136 fbshipit-source-id: c690d21d8b5024066e5deec1c1e432de3d1a06b5 --- eden/fs/service/eden.thrift | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index f2cc7608fd38..66ac4b967f20 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1446,6 +1446,20 @@ struct GetScmStatusResult { 2: string version; } +/** + * Sometimes additional modifiers need to be applied to the RootID that Eden + * receives from clients. This structure contains any such option and should + * only be extended with optional fields. + */ +struct RootIdOptions { + /** + * The ID of the filter that should be applied to the supplied RootId. The + * filter determines which entries in the repository should be hidden from + * the working copy. + */ + 1: optional string filterId; +} + struct GetScmStatusParams { /** * The Eden checkout to query @@ -1472,6 +1486,8 @@ struct GetScmStatusParams { // Pass unique identifier of this request's caller. 4: optional ClientRequestInfo cri; + + 5: optional RootIdOptions rootIdOptions; } /** @@ -1525,6 +1541,8 @@ struct CheckOutRevisionParams { // Pass unique identifier of this request's caller. 2: optional ClientRequestInfo cri; + + 3: optional RootIdOptions rootIdOptions; } struct ResetParentCommitsParams { @@ -1542,6 +1560,8 @@ struct ResetParentCommitsParams { // Pass unique identifier of this request's caller. 2: optional ClientRequestInfo cri; + + 3: optional RootIdOptions rootIdOptions; } struct RemoveRecursivelyParams { From 5dfb0195ea41b1e73a085632c10952e80fe15108 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 5 Oct 2023 17:09:49 -0700 Subject: [PATCH 6527/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/8c9a75c7225746edd3680b56d8825b6aa4a94cd3 https://github.com/facebook/fbthrift/commit/7d4e80582793af1cc94b7cde346ad76841ed793e https://github.com/facebook/folly/commit/bd351502b62c7983eff0b593df010b840bccc11c https://github.com/facebook/mvfst/commit/3a1431d77dbf566426c968f3a6eafa352b04c474 https://github.com/facebook/ocamlrep/commit/0e56765bec79d1de2197aa3d36e5db1d2d9c5c6a https://github.com/facebook/watchman/commit/2dfa267f7f31af4becd04f4d6b6b816c4c67a10c https://github.com/facebookexperimental/rust-shed/commit/6b1e7de93ca86a5e77a00c172c3b57d562886735 https://github.com/facebookincubator/velox/commit/0de536f84e803af2569d2d1c345c28ff447601e1 https://github.com/pytorch/fbgemm/commit/d307673b41d9cd9d68ae7d9997b1dad87d0ce9c4 https://github.com/pytorch/kineto/commit/afdaf5084cc24daf17fd8b13e09529b29bbfaae1 Reviewed By: zpao fbshipit-source-id: c6a8b46247d6c674ca278e3888be33918bfbb9c0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9da35e0bea1d..ba5a96cf05b6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6a246dd73649391d233c013c1ba26cfff99f0219 +Subproject commit 7d4e80582793af1cc94b7cde346ad76841ed793e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7ebb57996c14..d64d762c1f23 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 97acbe4a62cd7ae620773affc45d9a6956e33cf2 +Subproject commit bd351502b62c7983eff0b593df010b840bccc11c From eefbd3aead103348e756687343c1e9fe1d7bdaae Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 6 Oct 2023 11:22:57 -0700 Subject: [PATCH 6528/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/fc2c96de4b6c50dbf2ace9deefbeb96d74e73e77 https://github.com/facebook/litho/commit/4c09e76c526461348ef99c4f268edc8d0c06d77a https://github.com/facebookincubator/velox/commit/6bc05cf5d6f7bbcb5f51430f9113b6fc769bbae8 https://github.com/pytorch/kineto/commit/c448abda77d22e130f544904593a4bb50f685ea2 Reviewed By: bigfootjon fbshipit-source-id: 1a8a6634224056bfe2d220a90454af62346f1f74 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ba5a96cf05b6..58229317f3b2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7d4e80582793af1cc94b7cde346ad76841ed793e +Subproject commit fc2c96de4b6c50dbf2ace9deefbeb96d74e73e77 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f2e5e6106f86..8a1d4d95a0cf 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 4026a6b2a179af678db74716398c5cd2698b2cf3 +Subproject commit fdc3ed377a95916aa6591db3ad32b9467ad3c4e2 From 73168c19483612e3b5ca72e2a7d3daa25c9d9500 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 6 Oct 2023 12:29:02 -0700 Subject: [PATCH 6529/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/af50cfbe85fb54a4bd9c3c44a7b37ae8cbe5f330 https://github.com/facebook/mvfst/commit/e9feed1ff7bc13c17d7d8840de8106b69c58484b https://github.com/facebook/ocamlrep/commit/17ec2b34bd8b9938988dcb99b5f4fe4141d7909a https://github.com/facebook/rocksdb/commit/2dc63c891170a15c672ef16390db73982c7ae975 https://github.com/facebookexperimental/rust-shed/commit/4ad8e26ca80af46f270bd9763ab9b7115e7a83b7 https://github.com/facebookincubator/velox/commit/535e60e93a99f304d3e92e7f82dcb92ebee96109 https://github.com/pytorch/kineto/commit/5d3c309049e30193bfae03720a2e665f09d65447 Reviewed By: bigfootjon fbshipit-source-id: 28a8714baafd31b816983e64fb0456cca290c005 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 58229317f3b2..cc6e506d1c98 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit fc2c96de4b6c50dbf2ace9deefbeb96d74e73e77 +Subproject commit af50cfbe85fb54a4bd9c3c44a7b37ae8cbe5f330 From cbee7a1d23fbf0f332c8320e8e5e7a97e31bfef9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 6 Oct 2023 13:41:06 -0700 Subject: [PATCH 6530/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/740390761df0991803c11926d7ed9cbf738a996f https://github.com/facebook/proxygen/commit/c90421b9bdb9c6f7d5ec7c6abd1d24916aebc20b https://github.com/facebook/watchman/commit/73168c19483612e3b5ca72e2a7d3daa25c9d9500 https://github.com/facebookresearch/multimodal/commit/6f32ca1f14ef48d81cc46f8d0f660b00f16debd9 Reviewed By: bigfootjon fbshipit-source-id: b7a8efcdc57ea23ed3c689ef99fed64e543c409d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cc6e506d1c98..791ce5f2634c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit af50cfbe85fb54a4bd9c3c44a7b37ae8cbe5f330 +Subproject commit 740390761df0991803c11926d7ed9cbf738a996f From 250a3d535b3653ee4147d77bca8e64ecccf172e9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 6 Oct 2023 14:45:27 -0700 Subject: [PATCH 6531/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/6d1521bb5f565db2b019844a4ffd9e0b3ef8bafc https://github.com/facebook/litho/commit/be1dc2a8f502464554bf681144ba0994773f5ddb https://github.com/facebook/mvfst/commit/7b8decc9a1a471d4e380ccd9665da1077c1fed9b https://github.com/facebook/ocamlrep/commit/2781c0d68e99954c4eba2d59503e3b133efccba0 https://github.com/facebook/rocksdb/commit/21a12363e139484bde441c8c43e6b818459ebe02 https://github.com/facebookincubator/fizz/commit/f4aa9d3a9e01be44ba7f5104a3c19f101c148dd6 https://github.com/facebookincubator/velox/commit/e2a61da18f058074c4d7919e3bc45d7a9c4f1a84 Reviewed By: bigfootjon fbshipit-source-id: 875c32aafc5bb838b8534902c8f4b428e3c2ca3f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 791ce5f2634c..1e7ecc7dd932 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 740390761df0991803c11926d7ed9cbf738a996f +Subproject commit 6d1521bb5f565db2b019844a4ffd9e0b3ef8bafc From c9ff165c4e7da4f26de7e317a4316d9d5433b703 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 6 Oct 2023 17:00:47 -0700 Subject: [PATCH 6532/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/b2a38cc2bdf942bbda4b99eb96a081ac2a11131c https://github.com/facebookincubator/velox/commit/0ea956a2939fb67653f26da5b33d816859e043db Reviewed By: bigfootjon fbshipit-source-id: fc724886d16b8e174f4e586cf3b4b669cc8268f7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1e7ecc7dd932..a2e71d150e5c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6d1521bb5f565db2b019844a4ffd9e0b3ef8bafc +Subproject commit b2a38cc2bdf942bbda4b99eb96a081ac2a11131c From 17434ca6ec8dabb305442c8198bb1839a1129f50 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 6 Oct 2023 18:20:41 -0700 Subject: [PATCH 6533/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/3cff44e9b263dcbf5955471bfffe85e84338d9c4 https://github.com/facebook/fbthrift/commit/a70a47c9e1906585fcafd7cf1edba2e487c2251e https://github.com/facebook/wangle/commit/a3969a7263646ea3474339223da417616e407a62 https://github.com/facebookincubator/velox/commit/bec8a10bef36cf004dc11c396345cfb761fc4f9e Reviewed By: bigfootjon fbshipit-source-id: 0f7d7b054339593f71606b9d3934f9ec3523603d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a2e71d150e5c..c33c3e94173f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b2a38cc2bdf942bbda4b99eb96a081ac2a11131c +Subproject commit a70a47c9e1906585fcafd7cf1edba2e487c2251e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8a1d4d95a0cf..2d200b41be30 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit fdc3ed377a95916aa6591db3ad32b9467ad3c4e2 +Subproject commit a3969a7263646ea3474339223da417616e407a62 From 98329f0351e059ced8e705fee89644c09c7e9b82 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 6 Oct 2023 19:21:37 -0700 Subject: [PATCH 6534/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/768dba32d6b625f4e83dbca9f5bc1a437b8bc8ab https://github.com/facebook/proxygen/commit/aa49bbf3112f68156b5e51b16a1b7534b80667fa https://github.com/facebook/watchman/commit/17434ca6ec8dabb305442c8198bb1839a1129f50 Reviewed By: bigfootjon fbshipit-source-id: c5d34125972bb9e58aebe5ab4762169132ebebd8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c33c3e94173f..7cd0e5bdc36e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a70a47c9e1906585fcafd7cf1edba2e487c2251e +Subproject commit 768dba32d6b625f4e83dbca9f5bc1a437b8bc8ab From bdbfdca7112a689c843d106b2c20666675008f7a Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Fri, 6 Oct 2023 21:20:06 -0700 Subject: [PATCH 6535/7387] fix mononoke linux local cargo build with lld Summary: X-link: https://github.com/facebookincubator/velox/pull/6923 fix mononoke linux local cargo build with lld During my recent reviewstack changes I noticed that mononoke links fine on macOS, but github PRs are failing on linux with duplicate zstd symbols during linking. To fix this, switch to lld for the final link on linux by setting the cargo options, which needs a getdeps cargo.py change to ensure they aren't overwritten It works locally but looks like its running our of disk space on github. Next change in stack addresses github CI diskspace X-link: https://github.com/facebook/sapling/pull/697 Reviewed By: sggutier Differential Revision: D49875277 Pulled By: genevievehelsel fbshipit-source-id: 998f525fd71333b31747d0ad0e0dda3ebe2b0796 --- build/fbcode_builder/getdeps/cargo.py | 122 ++++++++++++++---------- build/fbcode_builder/manifests/lld | 13 +++ build/fbcode_builder/manifests/mononoke | 6 +- 3 files changed, 87 insertions(+), 54 deletions(-) create mode 100644 build/fbcode_builder/manifests/lld diff --git a/build/fbcode_builder/getdeps/cargo.py b/build/fbcode_builder/getdeps/cargo.py index 09e00a39cf98..bb41cc3e294b 100644 --- a/build/fbcode_builder/getdeps/cargo.py +++ b/build/fbcode_builder/getdeps/cargo.py @@ -64,7 +64,10 @@ def manifest_dir(self, manifest): def recreate_dir(self, src, dst) -> None: if os.path.isdir(dst): - shutil.rmtree(dst) + if os.path.islink(dst): + os.remove(dst) + else: + shutil.rmtree(dst) shutil.copytree(src, dst) def cargo_config_file(self): @@ -80,10 +83,18 @@ def _create_cargo_config(self): if not os.path.isdir(cargo_config_dir): os.mkdir(cargo_config_dir) - print(f"Writing cargo config for {self.manifest.name} to {cargo_config_file}") - with open(cargo_config_file, "w+") as f: - f.write( - """\ + dep_to_git = self._resolve_dep_to_git() + + if os.path.isfile(cargo_config_file): + with open(cargo_config_file, "r") as f: + print(f"Reading {cargo_config_file}") + cargo_content = f.read() + else: + cargo_content = "" + + new_content = cargo_content + if "# Generated by getdeps.py" not in cargo_content: + new_content += """\ # Generated by getdeps.py [build] target-dir = '''{}''' @@ -92,24 +103,25 @@ def _create_cargo_config(self): debug = false incremental = false """.format( - self.build_dir.replace("\\", "\\\\") - ) + self.build_dir.replace("\\", "\\\\") ) # Point to vendored sources from getdeps manifests - dep_to_git = self._resolve_dep_to_git() for _dep, git_conf in dep_to_git.items(): if "cargo_vendored_sources" in git_conf: - with open(cargo_config_file, "a") as f: - vendored_dir = git_conf["cargo_vendored_sources"].replace( - "\\", "\\\\" - ) - f.write( - f""" -[source."{git_conf["repo_url"]}"] -directory = "{vendored_dir}" -""" - ) + vendored_dir = git_conf["cargo_vendored_sources"].replace("\\", "\\\\") + override = ( + f'[source."{git_conf["repo_url"]}"]\ndirectory = "{vendored_dir}"\n' + ) + if override not in cargo_content: + new_content += override + + if new_content != cargo_content: + with open(cargo_config_file, "w") as f: + print( + f"Writing cargo config for {self.manifest.name} to {cargo_config_file}" + ) + f.write(new_content) if self.build_opts.fbsource_dir: # Point to vendored crates.io if possible @@ -198,23 +210,26 @@ def _patchup_workspace(self, dep_to_git) -> None: producing bad results. """ workspace_dir = self.workspace_dir() - config = self._resolve_config(dep_to_git) - if config: + git_url_to_crates_and_paths = self._resolve_config(dep_to_git) + if git_url_to_crates_and_paths: patch_cargo = os.path.join(workspace_dir, "Cargo.toml") - print(f"writing patch to {patch_cargo}") - with open(patch_cargo, "r+") as f: - manifest_content = f.read() - if "[package]" not in manifest_content: - # A fake manifest has to be crated to change the virtual - # manifest into a non-virtual. The virtual manifests are limited - # in many ways and the inability to define patches on them is - # one. Check https://github.com/rust-lang/cargo/issues/4934 to - # see if it is resolved. - null_file = "/dev/null" - if self.build_opts.is_windows(): - null_file = "nul" - f.write( - f""" + if os.path.isfile(patch_cargo): + with open(patch_cargo, "r") as f: + manifest_content = f.read() + else: + manifest_content = "" + + new_content = manifest_content + if "[package]" not in manifest_content: + # A fake manifest has to be crated to change the virtual + # manifest into a non-virtual. The virtual manifests are limited + # in many ways and the inability to define patches on them is + # one. Check https://github.com/rust-lang/cargo/issues/4934 to + # see if it is resolved. + null_file = "/dev/null" + if self.build_opts.is_windows(): + null_file = "nul" + new_content += f""" [package] name = "fake_manifest_of_{self.manifest.name}" version = "0.0.0" @@ -222,12 +237,25 @@ def _patchup_workspace(self, dep_to_git) -> None: [lib] path = "{null_file}" """ + config = [] + for git_url, crates_to_patch_path in git_url_to_crates_and_paths.items(): + crates_patches = [ + '{} = {{ path = "{}" }}'.format( + crate, + crates_to_patch_path[crate].replace("\\", "\\\\"), ) - else: - f.write("\n") - f.write(config) - - def _resolve_config(self, dep_to_git) -> str: + for crate in sorted(crates_to_patch_path.keys()) + ] + patch_key = f'[patch."{git_url}"]' + if patch_key not in manifest_content: + config.append(f"\n{patch_key}\n" + "\n".join(crates_patches)) + new_content += "\n".join(config) + if new_content != manifest_content: + with open(patch_cargo, "w") as f: + print(f"writing patch to {patch_cargo}") + f.write(new_content) + + def _resolve_config(self, dep_to_git) -> typing.Dict[str, typing.Dict[str, str]]: """ Returns a configuration to be put inside root Cargo.toml file which patches the dependencies git code with local getdeps versions. @@ -235,8 +263,6 @@ def _resolve_config(self, dep_to_git) -> str: """ dep_to_crates = self._resolve_dep_to_crates(self.build_source_dir(), dep_to_git) - config = [] - git_url_to_crates_and_paths = {} for dep_name in sorted(dep_to_git.keys()): git_conf = dep_to_git[dep_name] @@ -257,17 +283,7 @@ def _resolve_config(self, dep_to_git) -> str: if crates_to_patch_path: git_url_to_crates_and_paths[git_url] = crates_to_patch_path - for git_url, crates_to_patch_path in git_url_to_crates_and_paths.items(): - crates_patches = [ - '{} = {{ path = "{}" }}'.format( - crate, - crates_to_patch_path[crate].replace("\\", "\\\\"), - ) - for crate in sorted(crates_to_patch_path.keys()) - ] - config.append(f'\n[patch."{git_url}"]\n' + "\n".join(crates_patches)) - - return "\n".join(config) + return git_url_to_crates_and_paths def _resolve_dep_to_git(self): """ @@ -382,7 +398,7 @@ def _resolve_dep_to_crates(self, build_source_dir, dep_to_git): print( f"Patch {self.manifest.name} uses {dep_name} crate {crates}" ) - existing_crates.insert(c) + existing_crates.add(c) dep_to_crates.setdefault(name, set()).update(existing_crates) return dep_to_crates diff --git a/build/fbcode_builder/manifests/lld b/build/fbcode_builder/manifests/lld new file mode 100644 index 000000000000..39f5b095213e --- /dev/null +++ b/build/fbcode_builder/manifests/lld @@ -0,0 +1,13 @@ +[manifest] +name = lld + +[debs] +lld + +[rpms] +lld + +# We use the system lld where needed on linux and default linker elsewhere +[build] +builder = nop + diff --git a/build/fbcode_builder/manifests/mononoke b/build/fbcode_builder/manifests/mononoke index 2508b4e842c4..9df5bbd484e0 100644 --- a/build/fbcode_builder/manifests/mononoke +++ b/build/fbcode_builder/manifests/mononoke @@ -5,7 +5,7 @@ shipit_project = eden shipit_fbcode_builder = true [git] -repo_url = https://github.com/facebookexperimental/eden.git +repo_url = https://github.com/facebook/sapling.git [build.not(os=windows)] builder = cargo @@ -17,6 +17,7 @@ builder = nop [cargo] build_doc = true workspace_dir = eden/mononoke +cargo_config_file = source/eden/mononoke/.cargo/config [shipit.pathmap] fbcode/configerator/structs/scm/hg = configerator/structs/scm/hg @@ -47,5 +48,8 @@ fb303 fbthrift rust-shed +[dependencies.os=linux] +lld + [dependencies.fb=on] rust From ca20bb00f47459e9d039ec8232dfeab1f50ec63a Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Fri, 6 Oct 2023 21:20:06 -0700 Subject: [PATCH 6536/7387] allow getdeps github actions to free up disk Summary: X-link: https://github.com/facebookincubator/velox/pull/6927 allow getdeps github actions to free up disk Allow getdeps to free up some disk from the runner and intermediate build steps as some runs (notably the linux eden and mononoke ones) are hitting disk space limits X-link: https://github.com/facebook/sapling/pull/689 Reviewed By: sggutier Differential Revision: D49875256 Pulled By: genevievehelsel fbshipit-source-id: b85b6b2f11857670915b64f47d3c0abd4ca8ca31 --- build/fbcode_builder/getdeps.py | 30 ++++++++++++++++++++++- build/fbcode_builder/getdeps/builder.py | 10 ++++++++ build/fbcode_builder/getdeps/buildopts.py | 4 +++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 9358c425e4aa..f7baaf8e231a 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -795,6 +795,12 @@ def setup_project_cmd_parser(self, parser): action="store_true", default=False, ) + parser.add_argument( + "--free-up-disk", + help="Remove unused tools and clean up intermediate files if possible to maximise space for the build", + action="store_true", + default=False, + ) @cmd("fixup-dyn-deps", "Adjusts dynamic dependencies for packaging purposes") @@ -1015,6 +1021,19 @@ def write_job_for_platform(self, platform, args): # noqa: C901 out.write(" - uses: actions/checkout@v2\n") + if build_opts.free_up_disk: + free_up_disk = "--free-up-disk " + if not build_opts.is_windows(): + out.write(" - name: Show disk space at start\n") + out.write(" run: df -h\n") + # remove the unused github supplied android dev tools + out.write(" - name: Free up disk space\n") + out.write(" run: sudo rm -rf /usr/local/lib/android\n") + out.write(" - name: Show disk space after freeing up\n") + out.write(" run: df -h\n") + else: + free_up_disk = "" + allow_sys_arg = "" if ( build_opts.allow_system_packages @@ -1065,7 +1084,7 @@ def write_job_for_platform(self, platform, args): # noqa: C901 has_same_repo_dep = True out.write(" - name: Build %s\n" % m.name) out.write( - f" run: {getdepscmd}{allow_sys_arg} build {src_dir_arg}--no-tests {m.name}\n" + f" run: {getdepscmd}{allow_sys_arg} build {src_dir_arg}{free_up_disk}--no-tests {m.name}\n" ) out.write(" - name: Build %s\n" % manifest.name) @@ -1111,6 +1130,9 @@ def write_job_for_platform(self, platform, args): # noqa: C901 out.write( f" run: {getdepscmd}{allow_sys_arg} test --src-dir=. {manifest.name} {project_prefix}\n" ) + if build_opts.free_up_disk and not build_opts.is_windows(): + out.write(" - name: Show disk space at end\n") + out.write(" run: df -h\n") def setup_project_cmd_parser(self, parser): parser.add_argument( @@ -1155,6 +1177,12 @@ def setup_project_cmd_parser(self, parser): help="add a prefix to all job names", default=None, ) + parser.add_argument( + "--free-up-disk", + help="Remove unused tools and clean up intermediate files if possible to maximise space for the build", + action="store_true", + default=False, + ) def get_arg_var_name(args): diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index e1fae8e0f033..3bcadb5d6e98 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -136,6 +136,16 @@ def build(self, install_dirs, reconfigure: bool) -> None: self._prepare(install_dirs=install_dirs, reconfigure=reconfigure) self._build(install_dirs=install_dirs, reconfigure=reconfigure) + if self.build_opts.free_up_disk: + # don't clean --src-dir=. case as user may want to build again or run tests on the build + if self.src_dir.startswith(self.build_opts.scratch_dir) and os.path.isdir( + self.build_dir + ): + if os.path.islink(self.build_dir): + os.remove(self.build_dir) + else: + shutil.rmtree(self.build_dir) + # On Windows, emit a wrapper script that can be used to run build artifacts # directly from the build directory, without installing them. On Windows $PATH # needs to be updated to include all of the directories containing the runtime diff --git a/build/fbcode_builder/getdeps/buildopts.py b/build/fbcode_builder/getdeps/buildopts.py index de76a9525c47..48b000f90ebc 100644 --- a/build/fbcode_builder/getdeps/buildopts.py +++ b/build/fbcode_builder/getdeps/buildopts.py @@ -51,6 +51,7 @@ def __init__( lfs_path=None, shared_libs: bool = False, facebook_internal=None, + free_up_disk: bool = False, ) -> None: """fbcode_builder_dir - the path to either the in-fbsource fbcode_builder dir, or for shipit-transformed repos, the build dir that @@ -65,6 +66,7 @@ def __init__( use_shipit - use real shipit instead of the simple shipit transformer vcvars_path - Path to external VS toolchain's vsvarsall.bat shared_libs - whether to build shared libraries + free_up_disk - take extra actions to save runner disk space """ if not install_dir: @@ -103,6 +105,7 @@ def __init__( self.allow_system_packages = allow_system_packages self.lfs_path = lfs_path self.shared_libs = shared_libs + self.free_up_disk = free_up_disk lib_path = None if self.is_darwin(): @@ -602,6 +605,7 @@ def setup_build_options(args, host_type=None) -> BuildOptions: "allow_system_packages", "lfs_path", "shared_libs", + "free_up_disk", } } From a164bea094281c7c2b5343aa77f1080728ea3eb1 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Fri, 6 Oct 2023 21:20:06 -0700 Subject: [PATCH 6537/7387] fix getdeps actions generation for rust toolchain Summary: X-link: https://github.com/facebookincubator/velox/pull/6924 fix getdeps actions generation for rust toolchain Generated actions files created from getdeps.py were missing rust toolchain which meant annoying manual edits This change also makes the github actions generation honor the --no-tests argument, which is useful when regenerating the edenfs actions X-link: https://github.com/facebook/sapling/pull/682 Reviewed By: sggutier Differential Revision: D49875258 Pulled By: genevievehelsel fbshipit-source-id: 173f86083ba92bab4063813d3e392df428b9ffe4 --- build/fbcode_builder/getdeps.py | 49 ++++++++++++++++++++--------- build/fbcode_builder/manifests/eden | 3 +- 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index f7baaf8e231a..8a722a947003 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -939,7 +939,8 @@ def write_job_for_platform(self, platform, args): # noqa: C901 # We do this by looking at the builder type in the manifest file # rather than creating a builder and checking its type because we # don't know enough to create the full builder instance here. - if manifest.get("build", "builder", ctx=manifest_ctx) == "nop": + builder_name = manifest.get("build", "builder", ctx=manifest_ctx) + if builder_name == "nop": return None # We want to be sure that we're running things with python 3 @@ -1058,18 +1059,30 @@ def write_job_for_platform(self, platform, args): # noqa: C901 main_repo_url = manifest.get_repo_url(manifest_ctx) has_same_repo_dep = False + # Add the rust dep which doesn't have a manifest for m in projects: - if m != manifest: - if m.name == "rust": - out.write(" - name: Install Rust Stable\n") - out.write(" uses: dtolnay/rust-toolchain@stable\n") - else: - ctx = loader.ctx_gen.get_context(m.name) - if m.get_repo_url(ctx) != main_repo_url: - out.write(" - name: Fetch %s\n" % m.name) - out.write( - f" run: {getdepscmd}{allow_sys_arg} fetch --no-tests {m.name}\n" - ) + if m == manifest: + continue + mbuilder_name = m.get("build", "builder", ctx=manifest_ctx) + if ( + m.name == "rust" + or builder_name == "cargo" + or mbuilder_name == "cargo" + ): + out.write(" - name: Install Rust Stable\n") + out.write(" uses: dtolnay/rust-toolchain@stable\n") + break + + # Normal deps that have manifests + for m in projects: + if m == manifest or m.name == "rust": + continue + ctx = loader.ctx_gen.get_context(m.name) + if m.get_repo_url(ctx) != main_repo_url: + out.write(" - name: Fetch %s\n" % m.name) + out.write( + f" run: {getdepscmd}{allow_sys_arg} fetch --no-tests {m.name}\n" + ) for m in projects: if m != manifest: @@ -1100,8 +1113,12 @@ def write_job_for_platform(self, platform, args): # noqa: C901 if has_same_repo_dep: no_deps_arg = "--no-deps " + no_tests_arg = "" + if not args.enable_tests: + no_tests_arg = "--no-tests " + out.write( - f" run: {getdepscmd}{allow_sys_arg} build {no_deps_arg}--src-dir=. {manifest.name} {project_prefix}\n" + f" run: {getdepscmd}{allow_sys_arg} build {no_tests_arg}{no_deps_arg}--src-dir=. {manifest.name} {project_prefix}\n" ) out.write(" - name: Copy artifacts\n") @@ -1125,7 +1142,11 @@ def write_job_for_platform(self, platform, args): # noqa: C901 out.write(" name: %s\n" % manifest.name) out.write(" path: _artifacts\n") - if manifest.get("github.actions", "run_tests", ctx=manifest_ctx) != "off": + if ( + args.enable_tests + and manifest.get("github.actions", "run_tests", ctx=manifest_ctx) + != "off" + ): out.write(" - name: Test %s\n" % manifest.name) out.write( f" run: {getdepscmd}{allow_sys_arg} test --src-dir=. {manifest.name} {project_prefix}\n" diff --git a/build/fbcode_builder/manifests/eden b/build/fbcode_builder/manifests/eden index 5261fd955b5d..4c32bf698a1c 100644 --- a/build/fbcode_builder/manifests/eden +++ b/build/fbcode_builder/manifests/eden @@ -5,7 +5,7 @@ shipit_project = eden shipit_fbcode_builder = true [git] -repo_url = https://github.com/facebookexperimental/eden.git +repo_url = https://github.com/facebook/sapling.git [github.actions] run_tests = off @@ -30,6 +30,7 @@ pexpect python-toml python-filelock edencommon +rust-shed [dependencies.fbsource=on] rust From 383710c01b72d983138dd9ecb740589bc24ef841 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Fri, 6 Oct 2023 21:20:06 -0700 Subject: [PATCH 6538/7387] fix edenfs oss build, ubuntu googletest is too old Summary: X-link: https://github.com/facebookincubator/velox/pull/6926 fix edenfs oss build, ubuntu googletest is too old Update the googletest manifest as ubuntu's LTS packages are too old. 22.10 on looks fine X-link: https://github.com/facebook/sapling/pull/692 Reviewed By: xavierd Differential Revision: D49874525 Pulled By: genevievehelsel fbshipit-source-id: f13c7cfa6b92eb0775f8d39181b4a4573459e777 --- build/fbcode_builder/manifests/googletest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/fbcode_builder/manifests/googletest b/build/fbcode_builder/manifests/googletest index 134b36ee5343..90b05c635fbc 100644 --- a/build/fbcode_builder/manifests/googletest +++ b/build/fbcode_builder/manifests/googletest @@ -17,7 +17,7 @@ gtest_force_shared_crt=ON [cmake.defines.os=windows] BUILD_SHARED_LIBS=ON -# 18.04 googletest is too old -[debs.not(all(distro=ubuntu,distro_vers="18.04"))] +# packaged googletest is too old +[debs.not(all(distro=ubuntu,any(distro_vers="18.04",distro_vers="20.04",distro_vers="22.04")))] libgtest-dev libgmock-dev From 2b9f832a86f0cf25348eeac82ffe75185172da60 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Fri, 6 Oct 2023 21:20:06 -0700 Subject: [PATCH 6539/7387] save some CI diskspace, use ubuntu 20.04 and later libgit2 Summary: X-link: https://github.com/facebookincubator/velox/pull/6925 save some CI diskspace, use ubuntu 20.04 and later libgit2 Save some time and diskspace in CI builds for github by using the system libraries X-link: https://github.com/facebook/sapling/pull/693 Reviewed By: quark-zju, xavierd Differential Revision: D49874384 Pulled By: genevievehelsel fbshipit-source-id: 09c01eec69446c9bfa95861d9e71617b44b44fce --- build/fbcode_builder/manifests/libgit2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/fbcode_builder/manifests/libgit2 b/build/fbcode_builder/manifests/libgit2 index 27279d513d78..33e6b506f98f 100644 --- a/build/fbcode_builder/manifests/libgit2 +++ b/build/fbcode_builder/manifests/libgit2 @@ -10,8 +10,8 @@ libgit2-devel # Ubuntu 18.04 libgit2 has clash with libcurl4-openssl-dev as it depends on # libcurl4-gnutls-dev. Should be ok from 20.04 again # There is a description at https://github.com/r-hub/sysreqsdb/issues/77 -# [debs] -# libgit2-dev +[debs.not(all(distro=ubuntu,distro_vers="18.04"))] +libgit2-dev [download] url = https://github.com/libgit2/libgit2/archive/v0.28.1.tar.gz From b4cf37c7c4799d2da982c028674f73892d0591e4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 6 Oct 2023 22:50:33 -0700 Subject: [PATCH 6540/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/d8ab6a350a55759ade7a9a695c0107a6ba92d54d https://github.com/facebook/fbthrift/commit/65f89871a4c159bd3153fe5de9ded0493cf983f8 https://github.com/facebook/folly/commit/f230af0ca5f0a2caaaa17c591b20e811a05eb550 https://github.com/facebook/mvfst/commit/372edc82770a4ba23d6e65555ae9c072cdb732c2 https://github.com/facebook/proxygen/commit/ecb4ab97ec592bae2518df70cab738648baf6921 https://github.com/facebook/wangle/commit/42fb553a2e54dd830c8478291391bbd65e317f88 https://github.com/facebook/watchman/commit/2b9f832a86f0cf25348eeac82ffe75185172da60 https://github.com/facebookexperimental/edencommon/commit/9e113ef9c22599f6da9a098cc3553e447e03bddf https://github.com/facebookexperimental/rust-shed/commit/d1da4913a27799c057dea84b0bd80a2e5807c8a4 https://github.com/facebookincubator/fizz/commit/39d745dd32e61575afec5fa4c0390185a20e6449 https://github.com/facebookincubator/katran/commit/f3271d9042a1ecdb431b4257e6649689ed5be240 https://github.com/facebookincubator/velox/commit/a6daaeb786928da3ac26b27e2607176cffc191fb Reviewed By: bigfootjon fbshipit-source-id: 14d154a05b49d942d3207f678a6e86e9ccf98a68 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7cd0e5bdc36e..70637854475a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 768dba32d6b625f4e83dbca9f5bc1a437b8bc8ab +Subproject commit 65f89871a4c159bd3153fe5de9ded0493cf983f8 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d64d762c1f23..a6891e1a581c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit bd351502b62c7983eff0b593df010b840bccc11c +Subproject commit f230af0ca5f0a2caaaa17c591b20e811a05eb550 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2d200b41be30..ba06de8cf68e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a3969a7263646ea3474339223da417616e407a62 +Subproject commit 42fb553a2e54dd830c8478291391bbd65e317f88 From 5186879bb708727ef2bd2f6e752ce9c52d497643 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 7 Oct 2023 02:27:54 -0700 Subject: [PATCH 6541/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/e10db5ee583093725fb6099d937606cfe0e7cb5e https://github.com/facebook/fbthrift/commit/feabf6a4816c2821e1d417c8b28ffbe48fece687 Reviewed By: bigfootjon fbshipit-source-id: ed76a3f0f595e4d400ab807dea450d2cf807b6da --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 70637854475a..9fa70e86ee05 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 65f89871a4c159bd3153fe5de9ded0493cf983f8 +Subproject commit feabf6a4816c2821e1d417c8b28ffbe48fece687 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ba06de8cf68e..989502aed42e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 42fb553a2e54dd830c8478291391bbd65e317f88 +Subproject commit 99e53a503b1ec676bc585c1d5c453a1bd9be0f55 From adb222fa3cac509d583c47d347031ae9e47a3dbe Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 7 Oct 2023 13:57:22 -0700 Subject: [PATCH 6542/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8b9e33a5b46957245cae1b1275162db4dfbcca15 Reviewed By: bigfootjon fbshipit-source-id: 9039b58a15df2b85b08aa9a33efc0d994999b332 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9fa70e86ee05..32293e79cf41 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit feabf6a4816c2821e1d417c8b28ffbe48fece687 +Subproject commit 8b9e33a5b46957245cae1b1275162db4dfbcca15 From 5ebaad98ba4ac71edc1c904b30e7ca6bae4703b3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 8 Oct 2023 00:29:04 -0700 Subject: [PATCH 6543/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/74bfa41c2e6d75b259e8ffb9b5a533ce18c13ccd https://github.com/facebook/mvfst/commit/71859aefe688318251dd186af81143fe1f449fbb https://github.com/facebook/wangle/commit/8303eb5529173053bc0a5733ad1f4aa690233280 https://github.com/facebookexperimental/edencommon/commit/4007022f69dbe71447a7d502b6507ca9c41b4267 https://github.com/facebookexperimental/rust-shed/commit/628ede3412d3afd2fd55b1d16aee4ce8159fc6d7 https://github.com/facebookincubator/fizz/commit/b0f2562795fbdd747543840dd26301166e4b4961 https://github.com/facebookincubator/katran/commit/b94123b43b86ca757bd9ef975bc0f056e0a4d794 Reviewed By: bigfootjon fbshipit-source-id: a4d9cfe2a227fac5c5dafa40b33918c4f46ece67 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 32293e79cf41..93e79e4ae3dd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8b9e33a5b46957245cae1b1275162db4dfbcca15 +Subproject commit 6f7a824a573b62e787bc6efbf4ec0c74adcf72bc diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a6891e1a581c..a282aff86119 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f230af0ca5f0a2caaaa17c591b20e811a05eb550 +Subproject commit 34f110b7e9fafeb319fd65167f19e95c88e1f792 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 989502aed42e..7d84730a4db0 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 99e53a503b1ec676bc585c1d5c453a1bd9be0f55 +Subproject commit 8303eb5529173053bc0a5733ad1f4aa690233280 From 9b26f30c11ff9dc497ed70e17a298cb54c5bfd31 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 8 Oct 2023 21:37:27 -0700 Subject: [PATCH 6544/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/39a490368990882dd7401cf4a7a4fe0f2efba98c https://github.com/facebook/mvfst/commit/5e25c94c2faaa232208c14a535ec34dcbfff6622 https://github.com/facebook/proxygen/commit/f5eba2572bcf2f6a0f2ba6e8c341cd2e2e82b01f https://github.com/facebook/wangle/commit/02b28e3860e3f414252a679f7ebb8c5deab199f2 https://github.com/facebookincubator/katran/commit/e6504877f487a331e535f7609db340f164d3bc68 Reviewed By: bigfootjon fbshipit-source-id: daf71578b15f055804afb23e2d5ea695c23765bc --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 93e79e4ae3dd..db9bc9a5ca24 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6f7a824a573b62e787bc6efbf4ec0c74adcf72bc +Subproject commit 39a490368990882dd7401cf4a7a4fe0f2efba98c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7d84730a4db0..576337b6d6a1 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8303eb5529173053bc0a5733ad1f4aa690233280 +Subproject commit 02b28e3860e3f414252a679f7ebb8c5deab199f2 From dcc8c711e7d25e16fe3638c8d39755b284e27b5a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 9 Oct 2023 00:48:38 -0700 Subject: [PATCH 6545/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/0d08dbf350fd460db293825bcad38821af898217 Reviewed By: bigfootjon fbshipit-source-id: e02ef48ae9f5e3915954bebbce6ea529c512e950 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index db9bc9a5ca24..18816754753b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 39a490368990882dd7401cf4a7a4fe0f2efba98c +Subproject commit 0d08dbf350fd460db293825bcad38821af898217 From 7723c818719952ca8198d761fdfb48eca36a0e2c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 9 Oct 2023 09:36:12 -0700 Subject: [PATCH 6546/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/423558c70f25e52d0df67a34b9d46dfd722c9dbc https://github.com/facebook/ocamlrep/commit/aa8b68a45d84f201f938b57fbd86d270c4b04073 https://github.com/pytorch/kineto/commit/c23f8d8ae113cec7fc3794c354e4798aab90ca8a Reviewed By: jailby fbshipit-source-id: d9ebf3bf1477d6ffc3d61aaacdd6f94c14a563c8 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a282aff86119..f5a52760dca7 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 34f110b7e9fafeb319fd65167f19e95c88e1f792 +Subproject commit 423558c70f25e52d0df67a34b9d46dfd722c9dbc From cb6a161aeb1ec5427a73e3445b7e877c946c844b Mon Sep 17 00:00:00 2001 From: Xavier Deguillard Date: Mon, 9 Oct 2023 10:36:21 -0700 Subject: [PATCH 6547/7387] win32: increment recrawlCount on recrawl Summary: Our telemetry appears to be showing that no sync_to_now request on Windows are timing out, which feels surprising since we would expect queries being serviced right after a recrawl to be timing out. To understand if recrawls are actually happening, let's increment the recrawlCount counter which is being made available in telemetry. Reviewed By: genevievehelsel Differential Revision: D50085940 fbshipit-source-id: 3c0b7e920bf74e28f8292c3687d12f89a38d3528 --- watchman/watcher/win32.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/watchman/watcher/win32.cpp b/watchman/watcher/win32.cpp index dbdd0e07d090..7edf8593c23f 100644 --- a/watchman/watcher/win32.cpp +++ b/watchman/watcher/win32.cpp @@ -236,9 +236,8 @@ void WinWatcher::readChangesThread(const std::shared_ptr& root) { } if (err == ERROR_NOTIFY_ENUM_DIR) { - logf( - ERR, - "GetOverlappedResult failed with ERROR_NOTIFY_ENUM_DIR, recrawling.\n"); + root->recrawlTriggered( + "GetOverlappedResult failed with ERROR_NOTIFY_ENUM_DIR"); items.emplace_back( w_string{root->root_path}, PendingFlags{W_PENDING_IS_DESYNCED | W_PENDING_RECURSIVE}); @@ -249,7 +248,7 @@ void WinWatcher::readChangesThread(const std::shared_ptr& root) { } } else { if (bytes == 0) { - logf(ERR, "ReadDirectoryChangesW overflowed, recrawling.\n"); + root->recrawlTriggered("ReadDirectoryChangesW overflowed"); items.emplace_back( w_string{root->root_path}, PendingFlags{W_PENDING_IS_DESYNCED | W_PENDING_RECURSIVE}); From 57ce54c7ac8163d56ca5ce536ec524613fc865b5 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 9 Oct 2023 11:40:43 -0700 Subject: [PATCH 6548/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/293839e0ecefb9ecb6357a72145cbab65371678e https://github.com/facebook/litho/commit/7de99a82fd31c63ff72d536294520cd903cad403 https://github.com/facebook/mvfst/commit/46c51645fc6e3b40ecd412a2c35ba1f740048207 https://github.com/facebook/ocamlrep/commit/1776dfaa8a0a80bb5c992a16501b1195ee63110b https://github.com/facebook/wangle/commit/1e751ae65a554e19215bb27a9df9fa6a5ad4fff4 https://github.com/facebook/watchman/commit/cb6a161aeb1ec5427a73e3445b7e877c946c844b https://github.com/facebookexperimental/edencommon/commit/c98bdf63e507c0a3e6153b3435bfe3f1f9370e24 https://github.com/facebookincubator/fizz/commit/4b10788ed83ec641201a3d3415ceb4573aa3524f https://github.com/facebookincubator/katran/commit/1112031b3340ae583ed66c5e9040f25c54350e0c https://github.com/facebookincubator/velox/commit/2790b1e7e429fc4a3c0aade2dd82d94fb38e1782 Reviewed By: jailby fbshipit-source-id: 432e0b14dc5e9d4005fc59fd5af2da6ea6c9f5a3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 18816754753b..491d57785560 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0d08dbf350fd460db293825bcad38821af898217 +Subproject commit 293839e0ecefb9ecb6357a72145cbab65371678e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 576337b6d6a1..d324a9652ee6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 02b28e3860e3f414252a679f7ebb8c5deab199f2 +Subproject commit 1e751ae65a554e19215bb27a9df9fa6a5ad4fff4 From 33ea1a5e8cb2de50788d97a7df10083d9bd07909 Mon Sep 17 00:00:00 2001 From: Mark Shroyer Date: Mon, 9 Oct 2023 12:31:42 -0700 Subject: [PATCH 6549/7387] Upgrade to boost 1.83 Summary: X-link: https://github.com/facebookincubator/velox/pull/6943 Update to boost 1.83. This addresses a folly build failure on Xcode 15, due to boost 1.78 referring to the removed std::unary_function. Reviewed By: jdelliot Differential Revision: D49972186 fbshipit-source-id: 8d9fdd27c24ccc5a072b6973b86e0c8ed5b77ac3 --- build/fbcode_builder/getdeps.py | 2 +- build/fbcode_builder/manifests/boost | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 8a722a947003..7f43c91bd53d 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -1009,7 +1009,7 @@ def write_job_for_platform(self, platform, args): # noqa: C901 # https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/ out.write(" - name: Export boost environment\n") out.write( - ' run: "echo BOOST_ROOT=%BOOST_ROOT_1_78_0% >> %GITHUB_ENV%"\n' + ' run: "echo BOOST_ROOT=%BOOST_ROOT_1_83_0% >> %GITHUB_ENV%"\n' ) out.write(" shell: cmd\n") diff --git a/build/fbcode_builder/manifests/boost b/build/fbcode_builder/manifests/boost index 8e95a27286b8..89b4ee4e293b 100644 --- a/build/fbcode_builder/manifests/boost +++ b/build/fbcode_builder/manifests/boost @@ -2,17 +2,17 @@ name = boost [download.not(os=windows)] -url = https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.gz -sha256 = 94ced8b72956591c4775ae2207a9763d3600b30d9d7446562c552f0a14a63be7 +url = https://boostorg.jfrog.io/artifactory/main/release/1.83.0/source/boost_1_83_0.tar.gz +sha256 = c0685b68dd44cc46574cce86c4e17c0f611b15e195be9848dfd0769a0a207628 [download.os=windows] -url = https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.zip -sha256 = f22143b5528e081123c3c5ed437e92f648fe69748e95fa6e2bd41484e2986cc3 +url = https://boostorg.jfrog.io/artifactory/main/release/1.83.0/source/boost_1_83_0.zip +sha256 = c86bd9d9eef795b4b0d3802279419fde5221922805b073b9bd822edecb1ca28e [preinstalled.env] # Here we list the acceptable versions that cmake needs a hint to find BOOST_ROOT_1_69_0 -BOOST_ROOT_1_78_0 +BOOST_ROOT_1_83_0 [debs] libboost-all-dev From 7aa5c879c44183bc8835a210254635cb1c828d58 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 9 Oct 2023 13:20:58 -0700 Subject: [PATCH 6550/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/d1b68a3c2fb7cf5d2c68e2b84eb36f5c340686b6 https://github.com/facebook/litho/commit/d55b1b2b15d2e0ee7b4781bd2135faa13a66922c https://github.com/facebook/ocamlrep/commit/9972604c82065f9bf7d06e7ee65e6f85cf9f5e22 https://github.com/facebook/proxygen/commit/f9dab6056eafd7e9d3982b09b1ee7b5c3f337ab5 https://github.com/facebook/watchman/commit/57ce54c7ac8163d56ca5ce536ec524613fc865b5 https://github.com/facebookincubator/fizz/commit/842547e4483b306e3d927fa3e82252f32d0ddd2c https://github.com/facebookincubator/katran/commit/194f593422b2a8ed59cc012714d4d239a10b24c3 https://github.com/facebookincubator/velox/commit/cb34e5d4b3dc9ecdb3135702add3314a71c92f21 Reviewed By: jailby fbshipit-source-id: 2084f81650638fe92e7381f34fd75fb4da745b92 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 491d57785560..0411c34ee283 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 293839e0ecefb9ecb6357a72145cbab65371678e +Subproject commit d1b68a3c2fb7cf5d2c68e2b84eb36f5c340686b6 From 4a113f2387544bf471e75166ce5e89f05ccc36fb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 9 Oct 2023 14:24:38 -0700 Subject: [PATCH 6551/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/8b33503bb3b9895eaa27c1b8d228121ceb95d30c https://github.com/facebook/fbthrift/commit/cc3a29f9479bba965847ebbb18094e787a9b3dcb https://github.com/facebook/folly/commit/b891b202183e08f441a9048e7122d067e1bc45e2 https://github.com/facebook/mvfst/commit/959e283370530566fc5efcf8c147accb7337b5ee https://github.com/facebook/ocamlrep/commit/367f7a5ad60f74da92f1874bf36e425a66468b73 https://github.com/facebook/proxygen/commit/55ebef5857f0a18dacd5d87d174751f8547f8a99 https://github.com/facebook/wangle/commit/f9beb2b99a4af169975ff6f1d568fe813877cf4e https://github.com/facebook/watchman/commit/7aa5c879c44183bc8835a210254635cb1c828d58 https://github.com/facebookexperimental/edencommon/commit/4d631d610bb1e470cc1d761feb32a1eb7bcc50c8 https://github.com/facebookexperimental/rust-shed/commit/e14f250f4d75508fc603aebb5ec533fccf05f881 https://github.com/facebookincubator/fizz/commit/1b7833423b726306611cc5f5b974ce0c23df97db https://github.com/facebookincubator/katran/commit/5a1506f31cd28860aea4fa3e2603731ef4ec820e Reviewed By: jailby fbshipit-source-id: 7aa412adec846aee7771791fd222abd938595f63 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0411c34ee283..bd2af16d8f34 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d1b68a3c2fb7cf5d2c68e2b84eb36f5c340686b6 +Subproject commit cc3a29f9479bba965847ebbb18094e787a9b3dcb diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f5a52760dca7..00e0e5d0ef15 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 423558c70f25e52d0df67a34b9d46dfd722c9dbc +Subproject commit b891b202183e08f441a9048e7122d067e1bc45e2 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d324a9652ee6..d38990d86a86 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1e751ae65a554e19215bb27a9df9fa6a5ad4fff4 +Subproject commit f9beb2b99a4af169975ff6f1d568fe813877cf4e From 812e043f2af1f75e908d39b8efef40b68aaac21a Mon Sep 17 00:00:00 2001 From: Pierre Wendling Date: Mon, 9 Oct 2023 14:29:21 -0700 Subject: [PATCH 6552/7387] Fix build with fmt 10 (#1141) Summary: Fixes https://github.com/facebook/watchman/issues/1140 Starting version 10, fmt requires enums to be explicitly casted to their underlying type or have a `format_as` overload. This PR addresses this issue by: - defining `format_as` overloads for enums declared within the project, since all enums have type specifier, they can be directly casted to the underlying type. - using `fmt::underlying` for `apache::thrift::transport::TTransportException` since it is provided by a dependency. Pull Request resolved: https://github.com/facebook/watchman/pull/1141 Reviewed By: xavierd Differential Revision: D50095318 Pulled By: genevievehelsel fbshipit-source-id: 981b5efcfaa63ecb932a59dcac916d524345a247 --- watchman/PDU.h | 5 +++++ watchman/thirdparty/jansson/jansson.h | 5 +++++ watchman/watcher/eden.cpp | 2 +- watchman/watchman_string.h | 5 +++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/watchman/PDU.h b/watchman/PDU.h index 62f98ac6ab14..a1720c96d2af 100644 --- a/watchman/PDU.h +++ b/watchman/PDU.h @@ -23,6 +23,11 @@ enum PduType : uint32_t { is_bser_v2 }; +// Required for fmt 10 +inline uint32_t format_as(PduType type) { + return static_cast(type); +} + /** * Specifies the wire encoding of a Watchman request or response. * diff --git a/watchman/thirdparty/jansson/jansson.h b/watchman/thirdparty/jansson/jansson.h index 163f4fd4e7c4..f79c1212d85a 100644 --- a/watchman/thirdparty/jansson/jansson.h +++ b/watchman/thirdparty/jansson/jansson.h @@ -34,6 +34,11 @@ enum json_type : char { JSON_NULL }; +// Required for fmt 10 +inline char format_as(json_type type) { + return static_cast(type); +} + struct json_t { json_type type; std::atomic refcount; diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index d635542a499a..ac581dd981a7 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -680,7 +680,7 @@ std::vector globNameAndDType( "Thrift exception raised from EdenFS when globbing files: {} (errno {}, type {})\n", ex.what(), ex.getErrno(), - ex.getType()); + fmt::underlying(ex.getType())); throw; } catch (const std::exception& ex) { logf( diff --git a/watchman/watchman_string.h b/watchman/watchman_string.h index 414dbe5dd6dc..12a91e602fad 100644 --- a/watchman/watchman_string.h +++ b/watchman/watchman_string.h @@ -35,6 +35,11 @@ enum w_string_type_t : uint8_t { // 32-bit flag next to the reference count. static_assert(sizeof(size_t) == 8); +// Required for fmt 10 +inline uint8_t format_as(w_string_type_t type) { + return static_cast(type); +} + namespace watchman { /** From 2e79e8807640a5cbc5bfe25fc9e4dd573cdbaab7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:27:05 -0700 Subject: [PATCH 6553/7387] Bump postcss from 8.4.21 to 8.4.31 in /website (#1165) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: Bumps [postcss](https://github.com/postcss/postcss) from 8.4.21 to 8.4.31.
Release notes

Sourced from postcss's releases.

8.4.31

  • Fixed \r parsing to fix CVE-2023-44270.

8.4.30

8.4.29

8.4.28

  • Fixed Root.source.end for better source map (by @​romainmenke).
  • Fixed Result.root types when process() has no parser.

8.4.27

  • Fixed Container clone methods types.

8.4.26

  • Fixed clone methods types.

8.4.25

8.4.24

  • Fixed Plugin types.

8.4.23

  • Fixed warnings in TypeDoc.

8.4.22

Changelog

Sourced from postcss's changelog.

8.4.31

  • Fixed \r parsing to fix CVE-2023-44270.

8.4.30

  • Improved source map performance (by Romain Menke).

8.4.29

  • Fixed Node#source.offset (by Ido Rosenthal).
  • Fixed docs (by Christian Oliff).

8.4.28

  • Fixed Root.source.end for better source map (by Romain Menke).
  • Fixed Result.root types when process() has no parser.

8.4.27

  • Fixed Container clone methods types.

8.4.26

  • Fixed clone methods types.

8.4.25

8.4.24

  • Fixed Plugin types.

8.4.23

  • Fixed warnings in TypeDoc.

8.4.22

  • Fixed TypeScript support with node16 (by Remco Haszing).
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=postcss&package-manager=npm_and_yarn&previous-version=8.4.21&new-version=8.4.31)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `dependabot rebase` will rebase this PR - `dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `dependabot merge` will merge this PR after your CI passes on it - `dependabot squash and merge` will squash and merge this PR after your CI passes on it - `dependabot cancel merge` will cancel a previously requested merge and block automerging - `dependabot reopen` will reopen this PR if it is closed - `dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/facebook/watchman/network/alerts).
Pull Request resolved: https://github.com/facebook/watchman/pull/1165 Reviewed By: xavierd Differential Revision: D50095259 Pulled By: genevievehelsel fbshipit-source-id: 262f8e2a86deadc0c7d6cf0b7bdeb21f71750d75 --- website/yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/website/yarn.lock b/website/yarn.lock index 08a2771e7601..0b0f18ae5713 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -6536,10 +6536,10 @@ multicast-dns@^7.2.5: dns-packet "^5.2.2" thunky "^1.0.2" -nanoid@^3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" - integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== +nanoid@^3.3.6: + version "3.3.6" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" + integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== negotiator@0.6.3: version "0.6.3" @@ -7253,11 +7253,11 @@ postcss-zindex@^5.1.0: integrity sha512-fgFMf0OtVSBR1va1JNHYgMxYk73yhn/qb4uQDq1DLGYolz8gHCyr/sesEuGUaYs58E3ZJRcpoGuPVoB7Meiq9A== postcss@^8.3.11, postcss@^8.4.14, postcss@^8.4.17, postcss@^8.4.19: - version "8.4.21" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4" - integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg== + version "8.4.31" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d" + integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== dependencies: - nanoid "^3.3.4" + nanoid "^3.3.6" picocolors "^1.0.0" source-map-js "^1.0.2" From fbc1eaca681e766e044f2228aa9b0d5f00a8bd6f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 9 Oct 2023 15:36:08 -0700 Subject: [PATCH 6554/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/4c8e59c91f83d11cdef3f3f3241a07554715fe50 https://github.com/facebook/ocamlrep/commit/847e043db06675e65f7d673ea00aec63a1e3fd92 https://github.com/facebook/watchman/commit/812e043f2af1f75e908d39b8efef40b68aaac21a https://github.com/facebookexperimental/edencommon/commit/e1158ece2ba58d002134c1e1adffc393707d33a6 https://github.com/facebookincubator/fizz/commit/6ac341cc05c959d5f1e48497da9ababb7d8e3bcf https://github.com/facebookincubator/velox/commit/602e6aadc8f93387aace04b2c2c4b2b7b479180c Reviewed By: jailby fbshipit-source-id: 31096b4585a37a0458adb2c46a9e28819c12174c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bd2af16d8f34..8aac5c7f159f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cc3a29f9479bba965847ebbb18094e787a9b3dcb +Subproject commit 4c8e59c91f83d11cdef3f3f3241a07554715fe50 From 5898f9d8216a5041a2d092037bf7db4b60d528fe Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 10 Oct 2023 00:45:14 -0700 Subject: [PATCH 6555/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/75e4a127f0881eb893f3e9b78476daec1aa7aac5 Reviewed By: jailby fbshipit-source-id: 3707d49ebd87246c2f529fb50a455306507a4c54 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8aac5c7f159f..294f4ec63605 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4c8e59c91f83d11cdef3f3f3241a07554715fe50 +Subproject commit 75e4a127f0881eb893f3e9b78476daec1aa7aac5 From d3ea7123b6dc15fc52d9f2a158818f260324b60b Mon Sep 17 00:00:00 2001 From: Mariano Simone Date: Tue, 10 Oct 2023 08:30:50 -0700 Subject: [PATCH 6556/7387] Fix DEBIAN path in make-deb.sh (#1117) Summary: I was trying to use `make-deb.sh`, and noticed that the path was wrong. Pull Request resolved: https://github.com/facebook/watchman/pull/1117 Reviewed By: xavierd Differential Revision: D50095231 Pulled By: genevievehelsel fbshipit-source-id: a5a362c1fb5567e9d6792eb69380e51d2d62c707 --- watchman/build/package/watchman-deb/make-deb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/build/package/watchman-deb/make-deb.sh b/watchman/build/package/watchman-deb/make-deb.sh index 9dade4bba02d..1e87bfd0c870 100755 --- a/watchman/build/package/watchman-deb/make-deb.sh +++ b/watchman/build/package/watchman-deb/make-deb.sh @@ -50,7 +50,7 @@ trap 'rm -rf -- "$PACKAGE_WORKDIR"' EXIT mkdir -p "$PACKAGE_WORKDIR$PREFIX" cp -ar "$BUILT/bin" "$PACKAGE_WORKDIR$PREFIX/bin" -cp -ar watchman/build/package/DEBIAN "$PACKAGE_WORKDIR" +cp -ar watchman/build/package/watchman-deb/DEBIAN "$PACKAGE_WORKDIR" sed -i "s/%VERSION%/$PACKAGE_VERSION/" "$PACKAGE_WORKDIR/DEBIAN/control" From ff4272f35bc9b7e1b7c216da294c243bcfe6d930 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 10 Oct 2023 10:08:06 -0700 Subject: [PATCH 6557/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/0973c8dbbfddaee02f0aea1057d4db0891650746 https://github.com/facebook/rocksdb/commit/f1aa17c73ff00de3fbf524c8e21614dd5561206b https://github.com/facebook/watchman/commit/d3ea7123b6dc15fc52d9f2a158818f260324b60b https://github.com/facebookincubator/velox/commit/9ae3b236331ee252e5037d68f7e68c69e5d6f96c Reviewed By: jailby fbshipit-source-id: dbc427f394349aa77b207a6437fb896e246e5a29 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 294f4ec63605..1d1f21dd2dbb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 75e4a127f0881eb893f3e9b78476daec1aa7aac5 +Subproject commit 0973c8dbbfddaee02f0aea1057d4db0891650746 From fd745fff99ccb057b9c9349ffa437bc282c7e01d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 10 Oct 2023 14:30:51 -0700 Subject: [PATCH 6558/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/b213dccf7e1364aeae29d67a05a0bb79e2dd3d09 https://github.com/facebook/rocksdb/commit/5b11f5a3a294b8e4f2278f95c4236f5a2737ec03 https://github.com/facebook/wangle/commit/09376740dcbb295543cd772532b76c9e05c907c6 https://github.com/facebookincubator/velox/commit/241f9c6d6ab69506d3b0b6bf21c99afe1f40cd29 https://github.com/facebookresearch/multimodal/commit/f2cfe1a1060f1b7713f08af6eb7fe0fc24472984 Reviewed By: jailby fbshipit-source-id: 8fe3e24e26c52de9cb305798857935249ac782bf --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1d1f21dd2dbb..54a08419e43a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0973c8dbbfddaee02f0aea1057d4db0891650746 +Subproject commit b213dccf7e1364aeae29d67a05a0bb79e2dd3d09 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d38990d86a86..3047d97d4a81 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f9beb2b99a4af169975ff6f1d568fe813877cf4e +Subproject commit 09376740dcbb295543cd772532b76c9e05c907c6 From c80a3f624bdea01ea5b0f411c40948331c13813c Mon Sep 17 00:00:00 2001 From: Mark Shroyer Date: Tue, 10 Oct 2023 14:42:39 -0700 Subject: [PATCH 6559/7387] Include launchd.log entries in rage Summary: Adds entries from launchd.log to `watchmanctl rage` so we can tell which clients asked launchd to stop the watchman service. Reviewed By: genevievehelsel Differential Revision: D50104235 fbshipit-source-id: c1b77df523d90cc575ac5e2fb74754e40b2fea07 --- watchman/cli/src/rage/mod.rs | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/watchman/cli/src/rage/mod.rs b/watchman/cli/src/rage/mod.rs index 93e09dd1b3b8..d3944208d157 100644 --- a/watchman/cli/src/rage/mod.rs +++ b/watchman/cli/src/rage/mod.rs @@ -269,6 +269,31 @@ impl WatchmanRage { "{}", cmd!("launchctl", "list", "com.github.facebook.watchman").read() )?; + + writeln!(self.stream, "launchd.log samples:")?; + match File::open("/var/log/com.apple.xpc.launchd/launchd.log") { + Ok(file) => { + let watchman_lines = BufReader::new(file) + .lines() + .filter_map(|result| { + if let Ok(line) = result { + if line.contains("com.github.facebook.watchman") { + return Some(line); + } + } + None + }) + .take(40); // Limit log entries printed to avoid flooding the rage + + for line in watchman_lines { + writeln!(self.stream, "{}", line)?; + } + } + Err(e) => { + writeln!(self.stream, "Failed to open launchd.log: {}", e)?; + } + } + Ok(()) } From f7e6586ab380c9cd765fcd1eaf9efe0a6a2b450a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 10 Oct 2023 15:53:09 -0700 Subject: [PATCH 6560/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/df7208a51d8afe0d650522ecd279ebea5e124a04 https://github.com/facebook/proxygen/commit/d46f3c1efcc7ab0459f4c6297c95ed5e6fa95adb https://github.com/facebook/watchman/commit/c80a3f624bdea01ea5b0f411c40948331c13813c Reviewed By: jailby fbshipit-source-id: 00951dbb7798ee012c69e9c813c84de75ef6c558 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 54a08419e43a..f9eb5398c738 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b213dccf7e1364aeae29d67a05a0bb79e2dd3d09 +Subproject commit df7208a51d8afe0d650522ecd279ebea5e124a04 From f85ce9b7c81e4324271f3c35045e6ee585061e8e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 10 Oct 2023 17:00:17 -0700 Subject: [PATCH 6561/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/e4409fe9cd4d3fc5e85582b17fcb74cd7143bd51 https://github.com/facebook/ocamlrep/commit/680b8bf6ad72ae2afa9d47788bc790a3d0d0d56c https://github.com/facebook/wangle/commit/63e7fa7e95d236a506b7b23b0923d94ab28ad860 https://github.com/facebook/watchman/commit/f7e6586ab380c9cd765fcd1eaf9efe0a6a2b450a Reviewed By: jailby fbshipit-source-id: 3ddf727721cd86ebc4fcb9feb0362bd2e69295ca --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f9eb5398c738..e10eb4dc784f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit df7208a51d8afe0d650522ecd279ebea5e124a04 +Subproject commit e4409fe9cd4d3fc5e85582b17fcb74cd7143bd51 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3047d97d4a81..7f7267a11c2f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 09376740dcbb295543cd772532b76c9e05c907c6 +Subproject commit 63e7fa7e95d236a506b7b23b0923d94ab28ad860 From 6f0b7274c780b7f22c3f7ba00a1d434b643a27b9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 10 Oct 2023 18:09:53 -0700 Subject: [PATCH 6562/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/d2dfe0856c4ebf5dd5581809ac0718d53f788b97 https://github.com/facebook/proxygen/commit/ad9fd639d74f19fa771ebe04e64f1eb723073e37 https://github.com/facebookincubator/velox/commit/b5a37996a7808b0ea4813e33ebc10023afd77a16 https://github.com/facebookresearch/multimodal/commit/b8226b91948aadd8adfb4c7781798349bd01e7e3 Reviewed By: jailby fbshipit-source-id: c912b6010f230d2b52c336c700af2597d23452e8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e10eb4dc784f..696578aef194 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e4409fe9cd4d3fc5e85582b17fcb74cd7143bd51 +Subproject commit d2dfe0856c4ebf5dd5581809ac0718d53f788b97 From 1e79219a28ca183bd48e81301a02171ddcb45fae Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 11 Oct 2023 00:37:31 -0700 Subject: [PATCH 6563/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/ef2d669dc869b9ae74ba88cdad432d43d9abf906 https://github.com/facebook/mvfst/commit/a467899d525c633ffd8e1fa98ffd27fa74987b23 https://github.com/facebook/wangle/commit/5bb4ff148ac833340b7650507b62f8f9e7511d21 https://github.com/facebookexperimental/edencommon/commit/e7bff06df63240a3d33ec8148a36e782c1c9d0fc https://github.com/facebookincubator/fizz/commit/6d728bd0a1d110fc90614375c1ee085235507996 https://github.com/facebookincubator/katran/commit/f31bdc19a5478a9a161cda5b22c6a82a5e8f09c4 https://github.com/facebookincubator/velox/commit/120458ae2b0b102494dc66a32682f3ceb94ca1cb Reviewed By: jailby fbshipit-source-id: 0c4be8f41f41e22199f12ba1c0f45d90ec4f1da0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 696578aef194..c7cb690fede5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d2dfe0856c4ebf5dd5581809ac0718d53f788b97 +Subproject commit ef2d669dc869b9ae74ba88cdad432d43d9abf906 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 00e0e5d0ef15..c164b168dfcb 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b891b202183e08f441a9048e7122d067e1bc45e2 +Subproject commit 8f8f6cfae4ff021e9ca098c1ed3d337bc41c1510 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7f7267a11c2f..7e60c6c0ef23 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 63e7fa7e95d236a506b7b23b0923d94ab28ad860 +Subproject commit 5bb4ff148ac833340b7650507b62f8f9e7511d21 From 5be84abb85f29076f7f21e83393e2ce6c6691d23 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 11 Oct 2023 09:21:32 -0700 Subject: [PATCH 6564/7387] GitHub Workflows security hardening (#1071) Summary: X-link: https://github.com/facebookincubator/velox/pull/6969 This PR adds explicit [permissions section](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions) to workflows. This is a security best practice because by default workflows run with [extended set of permissions](https://docs.github.com/en/actions/security-guides/automatic-token-authentication#permissions-for-the-github_token) (except from `on: pull_request` [from external forks](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)). By specifying any permission explicitly all others are set to none. By using the principle of least privilege the damage a compromised workflow can do (because of an [injection](https://securitylab.github.com/research/github-actions-untrusted-input/) or compromised third party tool or action) is restricted. It is recommended to have [most strict permissions on the top level](https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions) and grant write permissions on [job level](https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs) case by case. Pull Request resolved: https://github.com/facebook/watchman/pull/1071 Reviewed By: xavierd Differential Revision: D50095358 Pulled By: genevievehelsel fbshipit-source-id: 4fc80c6b7c48df08207f68420b48a90ffcfddf27 --- .github/workflows/getdeps_linux.yml | 3 +++ .github/workflows/getdeps_mac.yml | 3 +++ .github/workflows/getdeps_windows.yml | 3 +++ .github/workflows/release.yml | 4 ++++ .github/workflows/release.yml.in | 3 +++ build/fbcode_builder/getdeps.py | 3 +++ 6 files changed, 19 insertions(+) diff --git a/.github/workflows/getdeps_linux.yml b/.github/workflows/getdeps_linux.yml index 193bb385280a..fd1e2eddead3 100644 --- a/.github/workflows/getdeps_linux.yml +++ b/.github/workflows/getdeps_linux.yml @@ -10,6 +10,9 @@ on: branches: - main +permissions: + contents: read # to fetch code (actions/checkout) + jobs: build: runs-on: ubuntu-20.04 diff --git a/.github/workflows/getdeps_mac.yml b/.github/workflows/getdeps_mac.yml index eabf58c51fdd..892798263b27 100644 --- a/.github/workflows/getdeps_mac.yml +++ b/.github/workflows/getdeps_mac.yml @@ -10,6 +10,9 @@ on: branches: - main +permissions: + contents: read # to fetch code (actions/checkout) + jobs: build: runs-on: macOS-latest diff --git a/.github/workflows/getdeps_windows.yml b/.github/workflows/getdeps_windows.yml index 911dd3e75dc9..a20e0d4e88b1 100644 --- a/.github/workflows/getdeps_windows.yml +++ b/.github/workflows/getdeps_windows.yml @@ -10,6 +10,9 @@ on: branches: - main +permissions: + contents: read # to fetch code (actions/checkout) + jobs: build: runs-on: windows-2019 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d4604f4c9743..3e7548d4fda3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,6 +5,10 @@ name: release push: tags: - v* + +permissions: + contents: write # to create a release + jobs: prepare: runs-on: ubuntu-latest diff --git a/.github/workflows/release.yml.in b/.github/workflows/release.yml.in index fd52f38552da..8123c19ebb0f 100644 --- a/.github/workflows/release.yml.in +++ b/.github/workflows/release.yml.in @@ -5,6 +5,9 @@ on: tags: - v* +permissions: + contents: write # to create a release + jobs: prepare: runs-on: ubuntu-latest diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 7f43c91bd53d..b6ea1aa2c616 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -988,6 +988,9 @@ def write_job_for_platform(self, platform, args): # noqa: C901 on:{run_on} +permissions: + contents: read # to fetch code (actions/checkout) + jobs: """ ) From ce1cd6871c978f22b3772e9634565007ab9167a0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 11 Oct 2023 10:29:35 -0700 Subject: [PATCH 6565/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/5c698f9987c50399dda3e2f87ef927ebdd9b45f2 https://github.com/facebook/fbthrift/commit/8de18a2b8df932dd51fa0b59d60cf4e994e3a451 https://github.com/facebook/folly/commit/43a174818c970a1d1939438c75fab39078cb7c62 https://github.com/facebook/litho/commit/9befab1fa47596ba53e8d4167d810cb4b6e8b98a https://github.com/facebook/mvfst/commit/d2ed328a799bfb96b3764612ea57b044b7ce0318 https://github.com/facebook/ocamlrep/commit/2f215f5bb6c1585ffac4034d2aee84e50a4d0485 https://github.com/facebook/proxygen/commit/75c06de4eb2464e263e64271d42ab9eb389f790b https://github.com/facebook/wangle/commit/df2d7ea152168586e136e02b8b8fb4ffd3c3aaf3 https://github.com/facebook/watchman/commit/5be84abb85f29076f7f21e83393e2ce6c6691d23 https://github.com/facebookexperimental/edencommon/commit/a7d451cdfc60d6c1c1a058de3a10d049dc077eaf https://github.com/facebookexperimental/rust-shed/commit/8a78b7edd6943d7e72be2fa6f9c80bde5fba2b4d https://github.com/facebookincubator/fizz/commit/6b7ea27da70f1669dcb5c5d004d0744c926e4b25 https://github.com/facebookincubator/katran/commit/c026de03061762ec5c63ddd47fec730ff8e31d74 https://github.com/facebookincubator/velox/commit/25728d01fbae8c83279d71eb684c69c03afc4d51 Reviewed By: jailby fbshipit-source-id: 5fcfd3c47ff03a52666cbe6eaf0acfb46be30d42 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c7cb690fede5..434556b8d4e8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ef2d669dc869b9ae74ba88cdad432d43d9abf906 +Subproject commit 8de18a2b8df932dd51fa0b59d60cf4e994e3a451 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index c164b168dfcb..457e56355d7a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 8f8f6cfae4ff021e9ca098c1ed3d337bc41c1510 +Subproject commit 43a174818c970a1d1939438c75fab39078cb7c62 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7e60c6c0ef23..8a1672411876 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5bb4ff148ac833340b7650507b62f8f9e7511d21 +Subproject commit df2d7ea152168586e136e02b8b8fb4ffd3c3aaf3 From 98d8a315df0e0226560e1c9d7815f9bdc90334e0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 11 Oct 2023 18:18:38 -0700 Subject: [PATCH 6566/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/8db18e535005e5e27a1d0f0cec3285a6808edb97 https://github.com/facebook/mvfst/commit/5e1bf4159a597396bd94e3cb39c49368e28c6b4a https://github.com/facebookincubator/katran/commit/745374f1cf04c20f309037c7a1cb202787db5c98 https://github.com/facebookincubator/velox/commit/26142dece6ce11329dad1d8bca3f51d04a48b23c Reviewed By: jailby fbshipit-source-id: b80e220725a12650f96d2db2a2816fbc564e9f00 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 434556b8d4e8..dc8efffbaed2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8de18a2b8df932dd51fa0b59d60cf4e994e3a451 +Subproject commit 8db18e535005e5e27a1d0f0cec3285a6808edb97 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 457e56355d7a..890b8aa6943c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 43a174818c970a1d1939438c75fab39078cb7c62 +Subproject commit 338aee2892ad2d4f480776a01f900c1b366e84df diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8a1672411876..954fbd1fd730 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit df2d7ea152168586e136e02b8b8fb4ffd3c3aaf3 +Subproject commit d9f0c7ca9ad731b201486b58b9f4f31ec789824c From 0739df377b1d0a8a056aad702aac5cc171a04959 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 12 Oct 2023 15:35:15 -0700 Subject: [PATCH 6567/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/59409df63d298e38d74ff0ff377798a61ed7ac32 https://github.com/facebook/ocamlrep/commit/be96e33cad0c5b6948a458d9a5f9f0f093138e5b Reviewed By: jailby fbshipit-source-id: 055504d3b6c5c71799fc76d90d06165f435e000e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index dc8efffbaed2..d6c8785ac84b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8db18e535005e5e27a1d0f0cec3285a6808edb97 +Subproject commit 607b004b36d84757045620827882075de441b0a4 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 890b8aa6943c..a7e73e5c8735 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 338aee2892ad2d4f480776a01f900c1b366e84df +Subproject commit 59409df63d298e38d74ff0ff377798a61ed7ac32 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 954fbd1fd730..d4a82ee1c078 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d9f0c7ca9ad731b201486b58b9f4f31ec789824c +Subproject commit fa932c0a13e58b2a7c8bb669340c998f57f0d7d6 From 4e99f05b49d83da8b110dced8f6def656a9f70eb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 12 Oct 2023 16:41:03 -0700 Subject: [PATCH 6568/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/aae9fcd846342e2919ca260d19290c8e776c72d5 https://github.com/facebook/proxygen/commit/a4e4629271fb177f73363d13f277420fb38e867e https://github.com/facebook/rocksdb/commit/648fe25bc02900266658a89987ed66fe092b7f5e https://github.com/facebookincubator/velox/commit/c1268ced97701712414b278751ca04bd91ea55c3 https://github.com/facebookresearch/multimodal/commit/1fd96dcbc3eac99860b0de4b63dcb08a616fa57e Reviewed By: jailby fbshipit-source-id: f6f0700a4c29f46f274faf11d7ef5dff53832f14 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d6c8785ac84b..6b3e206d3c5a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 607b004b36d84757045620827882075de441b0a4 +Subproject commit aae9fcd846342e2919ca260d19290c8e776c72d5 From 51eaaec4b2f85c1e945a517b5ee2f6e7b54fe689 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 12 Oct 2023 20:54:40 -0700 Subject: [PATCH 6569/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/30be34218213e987f0376f5459d45d45a4af1ddd https://github.com/facebook/ocamlrep/commit/242c15ea201465a4e1fc7f9ae34642b828682b03 Reviewed By: jailby fbshipit-source-id: 2e7950599ce80296d1d1da8b96fe618f97f6e0df --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6b3e206d3c5a..20f0e032641d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit aae9fcd846342e2919ca260d19290c8e776c72d5 +Subproject commit 834caf9ab9675d0bc481717ca726a997641930c1 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a7e73e5c8735..81194148f8e9 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 59409df63d298e38d74ff0ff377798a61ed7ac32 +Subproject commit 30be34218213e987f0376f5459d45d45a4af1ddd diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d4a82ee1c078..46d882abdf21 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit fa932c0a13e58b2a7c8bb669340c998f57f0d7d6 +Subproject commit bcd471af7a324ce0b185f372e7440026b7789ae1 From acb13ccc0fc410db07298556fbbf32eb4145f476 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 12 Oct 2023 23:50:53 -0700 Subject: [PATCH 6570/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/2555802ae711c7ccf5a5a29af4310f6b4a1b23f3 https://github.com/facebookincubator/velox/commit/6e66fff46b65585cba7cc10200bd2253b21de254 Reviewed By: jailby fbshipit-source-id: 37c9fee27722c0a7a2a051669d6356ccf8892eca --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 20f0e032641d..67c2efa98904 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 834caf9ab9675d0bc481717ca726a997641930c1 +Subproject commit 2555802ae711c7ccf5a5a29af4310f6b4a1b23f3 From e36642e0636723d0de220d0a61b6e263f0f161c3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 13 Oct 2023 06:51:33 -0700 Subject: [PATCH 6571/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/735e253e6d6073c0edf159a84bc395d4697473be https://github.com/facebook/proxygen/commit/6b4eb2d982044a1ef222ea5e76b3750a919c3450 Reviewed By: jailby fbshipit-source-id: 1e428fa901b55a3c2ee2726686bfdcffb0221a31 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 67c2efa98904..c47b1ecad749 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2555802ae711c7ccf5a5a29af4310f6b4a1b23f3 +Subproject commit 735e253e6d6073c0edf159a84bc395d4697473be diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 46d882abdf21..5ffcaa4f79be 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit bcd471af7a324ce0b185f372e7440026b7789ae1 +Subproject commit c48b9a4ebc3a3e1a492a711157793da0cb33636b From 9b2037a75af17ebc69624839e79e0c54b9242195 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 13 Oct 2023 09:10:50 -0700 Subject: [PATCH 6572/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/a206d42e553ac077767bd2f73e342e0196338e86 https://github.com/facebook/litho/commit/e46727af69f5888ca3cba3af4d637de052d724ed https://github.com/facebookincubator/velox/commit/33dad1ede9ade18e54838a10edc972fe1661f2d0 Reviewed By: jailby fbshipit-source-id: 477af770ee8bb792edae1c580ea6435ba5aafdda --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c47b1ecad749..602cecf50273 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 735e253e6d6073c0edf159a84bc395d4697473be +Subproject commit a206d42e553ac077767bd2f73e342e0196338e86 From c3a8d697228301cb2fef07b6274c08519b10ea1f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 13 Oct 2023 22:28:36 -0700 Subject: [PATCH 6573/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/3da4d3ccc4ea69bc10800754816e339d912736bd https://github.com/facebook/mvfst/commit/cac4f317a69dcb2f2284210b33871658185f7539 https://github.com/facebookincubator/katran/commit/bbdc3d3156d7623d0a19ac38522f88242942a162 Reviewed By: jailby fbshipit-source-id: f6f9756aca597080e77bdfd57c666a5ac482f48a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 602cecf50273..939e8c8f1d8d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a206d42e553ac077767bd2f73e342e0196338e86 +Subproject commit aed0ba17906360dd1ec566a6184ef02f96c919cd diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 81194148f8e9..438eb2b3db27 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 30be34218213e987f0376f5459d45d45a4af1ddd +Subproject commit 3da4d3ccc4ea69bc10800754816e339d912736bd diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5ffcaa4f79be..51769bff43cc 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c48b9a4ebc3a3e1a492a711157793da0cb33636b +Subproject commit a2bc4c073c48e03159a65c223c14f754cf5cad3d From a8511412e1eece45dcd756628b01e1d47466a42f Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Mon, 16 Oct 2023 12:10:14 -0700 Subject: [PATCH 6574/7387] fix CI warning about node12 by updating actions/checkout version Summary: X-link: https://github.com/facebookincubator/velox/pull/7071 fix CI warning about node12 by updating actions/checkout version Update the actions/checkout version to fix build warning X-link: https://github.com/facebook/sapling/pull/749 Reviewed By: sggutier Differential Revision: D50313430 Pulled By: genevievehelsel fbshipit-source-id: 4d55d36f7509be51bb4e26728ddbce8e45faba40 --- build/fbcode_builder/getdeps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index b6ea1aa2c616..3730f151b852 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -1023,7 +1023,7 @@ def write_job_for_platform(self, platform, args): # noqa: C901 out.write(" - name: Disable autocrlf\n") out.write(" run: git config --system core.autocrlf false\n") - out.write(" - uses: actions/checkout@v2\n") + out.write(" - uses: actions/checkout@v4\n") if build_opts.free_up_disk: free_up_disk = "--free-up-disk " From 4d74ed73cde287715813f17af114d21a67d5e597 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Mon, 16 Oct 2023 12:10:14 -0700 Subject: [PATCH 6575/7387] use system patchelf in eden fs build Summary: X-link: https://github.com/facebookincubator/velox/pull/7072 use system patchelf in eden fs build Saves us from doing a fetch and build of autoconf, libtool, automake and patchelf during the arfifacts part of CI X-link: https://github.com/facebook/sapling/pull/750 Reviewed By: sggutier Differential Revision: D50313417 Pulled By: genevievehelsel fbshipit-source-id: 7c585357c848c15a65c5797d6c8750d1119b6efd --- build/fbcode_builder/getdeps.py | 11 +++++++++++ build/fbcode_builder/getdeps/dyndeps.py | 21 +++++++++++++-------- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 3730f151b852..0c18d5c2eb93 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -497,6 +497,12 @@ def run_project_cmd(self, args, loader, manifest): manifests = [manifest] for m in manifests: + fetcher = loader.create_fetcher(m) + if isinstance(fetcher, SystemPackageFetcher): + # We are guaranteed that if the fetcher is set to + # SystemPackageFetcher then this item is completely + # satisfied by the appropriate system packages + continue inst_dir = loader.get_project_install_dir_respecting_install_prefix(m) print(inst_dir) @@ -1056,6 +1062,11 @@ def write_job_for_platform(self, platform, args): # noqa: C901 out.write( f" run: {sudo_arg}python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive {manifest.name}\n" ) + if build_opts.is_linux() or build_opts.is_freebsd(): + out.write(" - name: Install packaging system deps\n") + out.write( + f" run: {sudo_arg}python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive patchelf\n" + ) projects = loader.manifests_in_dependency_order() diff --git a/build/fbcode_builder/getdeps/dyndeps.py b/build/fbcode_builder/getdeps/dyndeps.py index e33db7940c57..ba0895132e15 100644 --- a/build/fbcode_builder/getdeps/dyndeps.py +++ b/build/fbcode_builder/getdeps/dyndeps.py @@ -336,16 +336,21 @@ def __init__(self, buildopts, install_dirs, strip) -> None: super(ElfDeps, self).__init__(buildopts, install_dirs, strip) # We need patchelf to rewrite deps, so ensure that it is built... - subprocess.check_call([sys.executable, sys.argv[0], "build", "patchelf"]) + args = [sys.executable, sys.argv[0]] + if buildopts.allow_system_packages: + args.append("--allow-system-packages") + subprocess.check_call(args + ["build", "patchelf"]) + # ... and that we know where it lives - self.patchelf = os.path.join( - os.fsdecode( - subprocess.check_output( - [sys.executable, sys.argv[0], "show-inst-dir", "patchelf"] - ).strip() - ), - "bin/patchelf", + patchelf_install = os.fsdecode( + subprocess.check_output(args + ["show-inst-dir", "patchelf"]).strip() ) + if not patchelf_install: + # its a system package, so we assume it is in the path + patchelf_install = "patchelf" + else: + patchelf_install = os.path.join(patchelf_install, "bin", "patchelf") + self.patchelf = patchelf_install def list_dynamic_deps(self, objfile): out = ( From 26f1c4bb3267ec20641113df15957395df964ab4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 17 Oct 2023 12:52:40 -0700 Subject: [PATCH 6576/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/8a949a1a554b1f2a4150669d52a0c705b6d17d9d https://github.com/facebook/fbthrift/commit/ceb19204ea4cb414e4426e10cfdb40eba239ba39 https://github.com/facebook/folly/commit/b518be8b116cd57ef709dea6b00a97212379cdbb https://github.com/facebook/litho/commit/62fb4470955858827690d4e670aa2ffa257148db https://github.com/facebook/mvfst/commit/a4e65c12daa6c919eb15974e2400a10c3eb889e5 https://github.com/facebook/ocamlrep/commit/00482e31a086f8dce00484a8676a0af798889342 https://github.com/facebook/proxygen/commit/09e329f00497d9904f93e5c5c8c99dd967ea4dae https://github.com/facebook/rocksdb/commit/2296c624fa0fd72f61eb706c56bb4fc53ddf7ce6 https://github.com/facebook/wangle/commit/117a58e29cf4a653fedcb972dcbee30c2a64384f https://github.com/facebook/watchman/commit/4d74ed73cde287715813f17af114d21a67d5e597 https://github.com/facebookexperimental/edencommon/commit/54e1b926c04869d1e1ce34855707968273ae3089 https://github.com/facebookexperimental/rust-shed/commit/95204cbfbaa8616651684fd1aff2c289ce6c62e2 https://github.com/facebookincubator/fizz/commit/32aa475c778af4f536dcb02b040bdc4746a1f62e https://github.com/facebookincubator/katran/commit/fdabc8d9473d633b4aae9e35b6f97c9a9465e1a2 https://github.com/facebookincubator/velox/commit/5afb621b1c02dd41346a592bf0838201eb64eb20 https://github.com/facebookresearch/multimodal/commit/7968f32b7d5e90a236af81c5c6866ead876db616 https://github.com/pytorch/fbgemm/commit/70c6e83c29f67278751abd0e28433c50743ccbe9 Reviewed By: bigfootjon fbshipit-source-id: 4ae45ba1167198e925c9df9b07c70a3cdac8e97f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 939e8c8f1d8d..5d4f5de6ee05 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit aed0ba17906360dd1ec566a6184ef02f96c919cd +Subproject commit ceb19204ea4cb414e4426e10cfdb40eba239ba39 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 438eb2b3db27..03b4de5ea15a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 3da4d3ccc4ea69bc10800754816e339d912736bd +Subproject commit b518be8b116cd57ef709dea6b00a97212379cdbb diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 51769bff43cc..f72a41285835 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a2bc4c073c48e03159a65c223c14f754cf5cad3d +Subproject commit 117a58e29cf4a653fedcb972dcbee30c2a64384f From c2fc63a34d131f40a82b723ddb96a28e6620cf73 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 17 Oct 2023 16:30:06 -0700 Subject: [PATCH 6577/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/05c68819953b03b7ebd14ac345edd79235b57335 https://github.com/facebook/fb303/commit/7f3627d451317bbb40f3b32f985a47a81311d916 https://github.com/facebook/fbthrift/commit/e9f368f3e8320bee10178047424a1247e448fb42 https://github.com/facebook/mvfst/commit/79d17dc967a36df0385747da1541ef40de34a0a3 https://github.com/facebook/proxygen/commit/3532b780cfb721c307de68aae1f984425b7b0580 https://github.com/facebook/rocksdb/commit/42266939ab71a958f3112368a30c7d8c6bcd485c https://github.com/facebook/wangle/commit/5c7e2b12831a61223c516eb74dc60413f9d603f2 https://github.com/facebook/watchman/commit/26f1c4bb3267ec20641113df15957395df964ab4 https://github.com/facebookexperimental/edencommon/commit/0fa102fdb05d84e4d409d158df85b9db36380eef https://github.com/facebookexperimental/rust-shed/commit/76b62b36eaf2e5c7886ae22bc9354948bf2d58d6 https://github.com/facebookincubator/fizz/commit/de540c2d24463790a4908bcef0132d0f78198f6b https://github.com/facebookincubator/katran/commit/2b6bcd2d3611ff0f5577d607457ff9adcccd18a1 https://github.com/facebookincubator/velox/commit/3355f492ab36aea0ac0419eb36137362d8e0fb23 https://github.com/facebookresearch/multimodal/commit/2ddb8cdb205f2035e88e4fafb7e88cccb7b99705 https://github.com/pytorch/fbgemm/commit/daf9042e6da9a6348f62323bbcc356cea7d1444c Reviewed By: bigfootjon fbshipit-source-id: 32193c2204432e2bd6739315da02a3919a11e0d6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5d4f5de6ee05..6d9ce24090a3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ceb19204ea4cb414e4426e10cfdb40eba239ba39 +Subproject commit e9f368f3e8320bee10178047424a1247e448fb42 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f72a41285835..df0162f99ca4 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 117a58e29cf4a653fedcb972dcbee30c2a64384f +Subproject commit 5c7e2b12831a61223c516eb74dc60413f9d603f2 From 294b17f90ac2230ab05b2c4f463d7ffb592f2840 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 17 Oct 2023 17:40:55 -0700 Subject: [PATCH 6578/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/499b4a20dc9f2397c9766f58a00399d15844f1de https://github.com/facebook/squangle/commit/44344302135f3736c2372acd30c5c3b6042d1d2c https://github.com/facebookincubator/katran/commit/c25d92256ad007237d3ecc9f82c3c0eba0e220f1 https://github.com/facebookincubator/velox/commit/034b494ab512c01df6e7086a8804d0bc06a44ea4 Reviewed By: bigfootjon fbshipit-source-id: 70ebf73b546964829db092173afacaca1d98fca3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6d9ce24090a3..dc24113e076e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e9f368f3e8320bee10178047424a1247e448fb42 +Subproject commit 499b4a20dc9f2397c9766f58a00399d15844f1de From 2288346c4ae2c67b261e0580a4c5b8f28fb10a32 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 17 Oct 2023 21:30:49 -0700 Subject: [PATCH 6579/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/3fbb2019894ca21d2a249820a5577d3af1a74b5c https://github.com/facebook/fbthrift/commit/f352b1474b6e40f93befd4b9fa38718e14a011f5 https://github.com/facebook/folly/commit/1c17cee212e6863d3f2a5a12882c9c05f01c29b2 https://github.com/facebook/ocamlrep/commit/cce0333bbf03aea3ebd8080769a164db63b38855 Reviewed By: bigfootjon fbshipit-source-id: 12cf5a61665466b21d11a90bac2b3adc4fa7f60d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index dc24113e076e..b8559a59bbcd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 499b4a20dc9f2397c9766f58a00399d15844f1de +Subproject commit f352b1474b6e40f93befd4b9fa38718e14a011f5 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 03b4de5ea15a..0ce0252fc371 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b518be8b116cd57ef709dea6b00a97212379cdbb +Subproject commit 1c17cee212e6863d3f2a5a12882c9c05f01c29b2 From 3e59939e1e24660700128d01e669282a62559efa Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 17 Oct 2023 23:18:48 -0700 Subject: [PATCH 6580/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/2c2c7b268803ebec5a8f2f3f335e6066aa621f7a https://github.com/facebook/fbthrift/commit/0d061333e44eca4f1d33a091c4c94df3449fed53 https://github.com/facebook/litho/commit/30b9985c348db46c794bc7cb1d02409dc861f806 https://github.com/facebook/mvfst/commit/101eb6e77dc0fb1ba8007c06b61c181790d50991 https://github.com/facebook/proxygen/commit/a7d0933dff5d5c7ffa86b8264f293976d5917f44 https://github.com/facebook/wangle/commit/d6705463559cea8722f14b745ba6f429e7072b43 https://github.com/facebookincubator/katran/commit/f18f245d8283ce5f2b97e5206f07bbff77cbb3e5 https://github.com/facebookincubator/velox/commit/6742acdd90bfb5e2efcbe3554a0c67e3b6cd137e Reviewed By: bigfootjon fbshipit-source-id: 6eb177c524c91637792be5995b0536aa0afe1b0b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b8559a59bbcd..2b7bf6289af6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f352b1474b6e40f93befd4b9fa38718e14a011f5 +Subproject commit 0d061333e44eca4f1d33a091c4c94df3449fed53 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index df0162f99ca4..23d40f40a547 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5c7e2b12831a61223c516eb74dc60413f9d603f2 +Subproject commit d6705463559cea8722f14b745ba6f429e7072b43 From 58b35accd267713948cf990f2ed00013564c6e55 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 18 Oct 2023 14:38:24 -0700 Subject: [PATCH 6581/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/e1d7923ed3fa709cac8787e558b23f8bfdb18753 https://github.com/facebook/mvfst/commit/957cb0f1d22f9d60645ffe78d23f1e50f01c806f https://github.com/facebook/rocksdb/commit/55590012ae8157ca311ff38cba0af878810b775b https://github.com/facebookexperimental/edencommon/commit/d4af63c1956a560ee2e15d8ea089738d06bac539 https://github.com/facebookincubator/fizz/commit/bccba48387a7345eeb107330521ba222db7ce7d2 https://github.com/facebookincubator/velox/commit/e22cb88c53e5e41ce6e526d4caa0f02b536ab138 Reviewed By: bigfootjon fbshipit-source-id: 2898a272b9b6ea4a97d847414193f15835d61290 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2b7bf6289af6..efbe86f819c8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0d061333e44eca4f1d33a091c4c94df3449fed53 +Subproject commit e1d7923ed3fa709cac8787e558b23f8bfdb18753 From 5a75553354960d5a0a58a1e4399ff806a5ff848b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 19 Oct 2023 09:26:40 -0700 Subject: [PATCH 6582/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/2030e57ce0e5ff43cb797b74e48fed7f846bf7c5 https://github.com/facebook/litho/commit/808d3bd1dcf5868605579eee0df9efe1b4148e45 https://github.com/facebookexperimental/rust-shed/commit/e99e72ff93d1bca6a2e9096f22095181f86c956c https://github.com/facebookincubator/katran/commit/be5be9ef5a5e1f95b429572d13bb1a3485fd7b2e https://github.com/facebookincubator/velox/commit/efff73f5523ea78f70d0839ebae2ec1978f91ae5 Reviewed By: bigfootjon fbshipit-source-id: ff4a16600aa8faf80df1db695b895aa5ee693c45 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index efbe86f819c8..cc3823db52c7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e1d7923ed3fa709cac8787e558b23f8bfdb18753 +Subproject commit 2030e57ce0e5ff43cb797b74e48fed7f846bf7c5 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 23d40f40a547..e1c22cf2539d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d6705463559cea8722f14b745ba6f429e7072b43 +Subproject commit e621b5c9fa8795edf79ce82573f1f10ddc07ceb6 From 04789e2e67a9d5774fcaf607dfcbf2b0862904da Mon Sep 17 00:00:00 2001 From: "Genevieve (Genna) Helsel" Date: Thu, 19 Oct 2023 17:22:48 -0700 Subject: [PATCH 6583/7387] allow consumption of /etc/eden/edenfs_cfgr.rc Summary: This sets up a new `TomlFileConfigSource` for `edenfs_cfgr.rc`. Note that this config will have priority over configs set by chef, but won't override user or command line configs. Reviewed By: xavierd Differential Revision: D50372549 fbshipit-source-id: 0ded035d88b2ece93f5aae7cdca6a911bee88c8a --- eden/fs/config/eden_config.thrift | 1 + 1 file changed, 1 insertion(+) diff --git a/eden/fs/config/eden_config.thrift b/eden/fs/config/eden_config.thrift index c1b2c71ab0c3..a5d2cc1bb196 100644 --- a/eden/fs/config/eden_config.thrift +++ b/eden/fs/config/eden_config.thrift @@ -19,6 +19,7 @@ enum ConfigSourceType { SystemConfig = 1, UserConfig = 2, CommandLine = 3, + Dynamic = 4, } enum ConfigReloadBehavior { From a164442c9fe543b189071920b33b66510150083e Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Thu, 19 Oct 2023 21:06:59 -0700 Subject: [PATCH 6584/7387] Switch cargo build back to default system ld Summary: If what this comment says is true, `lld` would no longer be required. The zstd-rs fork is gone since {D50419456} + {D50394320}. Reviewed By: zertosh Differential Revision: D50480876 fbshipit-source-id: 95c8bca9bd23c158cc352edfd3776ac5b8d3d41c --- build/fbcode_builder/manifests/mononoke | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build/fbcode_builder/manifests/mononoke b/build/fbcode_builder/manifests/mononoke index 9df5bbd484e0..d9c88454dfa7 100644 --- a/build/fbcode_builder/manifests/mononoke +++ b/build/fbcode_builder/manifests/mononoke @@ -17,7 +17,6 @@ builder = nop [cargo] build_doc = true workspace_dir = eden/mononoke -cargo_config_file = source/eden/mononoke/.cargo/config [shipit.pathmap] fbcode/configerator/structs/scm/hg = configerator/structs/scm/hg @@ -48,8 +47,5 @@ fb303 fbthrift rust-shed -[dependencies.os=linux] -lld - [dependencies.fb=on] rust From 6c139b12217719cd049282bb58eba263c34b9509 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 20 Oct 2023 03:24:00 -0700 Subject: [PATCH 6585/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/d89e0bc61d0d2fc7359a7b61073b0e5af53e17bf https://github.com/facebook/fb303/commit/73dc76765ff0e1343d9cb567410c76fca2db2d8b https://github.com/facebook/fbthrift/commit/240421b97bc64ee53e7011a714686c753cd48aae https://github.com/facebook/folly/commit/c71af83adb058929e841532c7e0fa523f8a3be80 https://github.com/facebook/mvfst/commit/12864e2defc4a2f4ab7ab9ef8f845b191f00c878 https://github.com/facebook/ocamlrep/commit/10e6c42a1293c16e08ec9f0f3b48eef930342116 https://github.com/facebook/proxygen/commit/981468c800b73ab2da78bf65176713914ea80f67 https://github.com/facebook/rocksdb/commit/ef0c3f08fae318d1b1e4159e0437579a36c6cfd8 https://github.com/facebook/wangle/commit/5db676f52879baeca41208179b5963dc2dba3aef https://github.com/facebook/watchman/commit/a164442c9fe543b189071920b33b66510150083e https://github.com/facebookexperimental/edencommon/commit/75c3faf43588ff9c85675a40a698897ddc87bbb3 https://github.com/facebookexperimental/rust-shed/commit/b93cb253351c31a37a991cbca1ddbc958b0c5679 https://github.com/facebookincubator/fizz/commit/0e8b62eb170e9c415af97ee0a22483de8146e047 https://github.com/facebookincubator/katran/commit/f40da254c10996c68ce8294236ea08d1c8eddcf4 https://github.com/facebookincubator/superconsole/commit/23315a8d072e3469ae77982d2639cce15bb19332 https://github.com/facebookincubator/velox/commit/c3b9053e6cf4189b4cf1d413c9d0d929635de0b9 https://github.com/facebookresearch/multimodal/commit/e41659669c3e59db4589704fa2e11798307cd563 https://github.com/fairinternal/egohowto/commit/ff2f1900c841b6dbd9ee94b9457844210a92c673 https://github.com/pytorch/fbgemm/commit/4a97e799879e3a02a6ba541446b99cc02954ebb7 https://github.com/pytorch/kineto/commit/4d61edda59d37cf8d5a9746bc9066f8ac491ebd9 Reviewed By: bigfootjon fbshipit-source-id: 85d53ac15b50b99fb215b379b1eb9b8bc0d4478b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cc3823db52c7..86af861046b0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2030e57ce0e5ff43cb797b74e48fed7f846bf7c5 +Subproject commit 240421b97bc64ee53e7011a714686c753cd48aae diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0ce0252fc371..6809e5e71b07 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1c17cee212e6863d3f2a5a12882c9c05f01c29b2 +Subproject commit c71af83adb058929e841532c7e0fa523f8a3be80 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e1c22cf2539d..1c0af3733192 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e621b5c9fa8795edf79ce82573f1f10ddc07ceb6 +Subproject commit 5db676f52879baeca41208179b5963dc2dba3aef From 9b26e0d912973e7b21f9390d5ed34afc2098881c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 20 Oct 2023 11:46:16 -0700 Subject: [PATCH 6586/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/a5eb22aacc7fb7252c7a55b2228133f44e43d668 https://github.com/facebook/mcrouter/commit/f7b73ea428ec7608fef0bc19de6b782b15661b8b https://github.com/facebook/ocamlrep/commit/cdc18b8ba23ef00b27b6e025d95d52dfd035ad04 https://github.com/facebook/rocksdb/commit/d7567d5eee5a0210376ce25475ae95b88b0a9c14 https://github.com/facebookexperimental/rust-shed/commit/78866ae7d6300a799fdc4731e16c049882da05fc https://github.com/facebookincubator/velox/commit/7acc3374175f0240f66212d1b53e61382e47c4fa Reviewed By: bigfootjon fbshipit-source-id: 99b245b88093b706998d2f570886654bcb5e3ac2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 86af861046b0..92133e5e3d85 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 240421b97bc64ee53e7011a714686c753cd48aae +Subproject commit a5eb22aacc7fb7252c7a55b2228133f44e43d668 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1c0af3733192..12a01f886dbf 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5db676f52879baeca41208179b5963dc2dba3aef +Subproject commit 8ea0d8f23bfcf20403ec232d879335f52ade7650 From 1eaf110cd4cab93b50bc0563b3d294c6173e358d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 20 Oct 2023 15:13:46 -0700 Subject: [PATCH 6587/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/7d809773579a7ca86ebc20a6d2bd26946567ce5e https://github.com/facebook/rocksdb/commit/543191f2eacadf14e3aa6ff9a08f85a8ad82da95 Reviewed By: bigfootjon fbshipit-source-id: 7db8278a63bce191b0251db9c5e4a00e148f0aae --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 92133e5e3d85..bea4ce7b1db5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a5eb22aacc7fb7252c7a55b2228133f44e43d668 +Subproject commit 7d809773579a7ca86ebc20a6d2bd26946567ce5e From 721123ca544f6dc07dcffe1d15d2dac4e85fd84f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 20 Oct 2023 17:30:57 -0700 Subject: [PATCH 6588/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/334f75e6d33ed7a03d10f4e78d222f53d846f542 Reviewed By: bigfootjon fbshipit-source-id: e8a47ee4daf7880cf18cffd5341decd1084d39ee --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bea4ce7b1db5..f64e73560158 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7d809773579a7ca86ebc20a6d2bd26946567ce5e +Subproject commit 334f75e6d33ed7a03d10f4e78d222f53d846f542 From 1d4c373c94da0e4fb0f353806d76147d9f416434 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 20 Oct 2023 20:40:47 -0700 Subject: [PATCH 6589/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/edc39c41b6dc852c82dc4124ae4aa31da0a6b915 Reviewed By: bigfootjon fbshipit-source-id: 4743836379cdc1d41acf55e95897b9cdc0b05a64 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f64e73560158..92e3c183848e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 334f75e6d33ed7a03d10f4e78d222f53d846f542 +Subproject commit edc39c41b6dc852c82dc4124ae4aa31da0a6b915 From 54f12f8d23c093d548a41eceb3c0b84cb487065c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 21 Oct 2023 07:12:14 -0700 Subject: [PATCH 6590/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/72cc23eeb9d696a22c6054d4de0a75a9c18fe46b https://github.com/facebookincubator/velox/commit/55d5636678883ec82ac81cacb5498c02f9cb4449 Reviewed By: bigfootjon fbshipit-source-id: 937e5248675fc50c73e040753ec57733f65a4085 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 92e3c183848e..dc3cfa2b90b7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit edc39c41b6dc852c82dc4124ae4aa31da0a6b915 +Subproject commit 72cc23eeb9d696a22c6054d4de0a75a9c18fe46b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 12a01f886dbf..2baeceba05e3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8ea0d8f23bfcf20403ec232d879335f52ade7650 +Subproject commit c0f871c8fb9d678c3f6d95c5adc788fac30bcbad From 857259783ada21cad38e84e6a6ea41a8211cd2bf Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 23 Oct 2023 11:15:34 -0700 Subject: [PATCH 6591/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/aa30a710d933734d80a36eca39dcdf80fcd11070 https://github.com/facebook/ocamlrep/commit/36a390a02f053853bb3dae9cb3dc34fea3d308cd https://github.com/facebook/rocksdb/commit/41550877460c4c5021c06406827382f219edb9f2 https://github.com/facebookincubator/velox/commit/525c454a599082756690a968882838a81146b44b Reviewed By: jurajh-fb fbshipit-source-id: a254685a48d0b66220ae0eebd14ccf9365da86b7 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6809e5e71b07..2f006b3aadf8 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c71af83adb058929e841532c7e0fa523f8a3be80 +Subproject commit aa30a710d933734d80a36eca39dcdf80fcd11070 From 21ce71b176eb863dcb8161b4378725390bd6797d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 23 Oct 2023 15:34:43 -0700 Subject: [PATCH 6592/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/e4a467589e6216792d467867e9b9184afa69ec41 https://github.com/facebookexperimental/rust-shed/commit/f08023242a3f4fc9f2b6cd20704c939e6ed5e8d8 Reviewed By: jurajh-fb fbshipit-source-id: abc93f0177b276cae18e5f5a9321a279d888c448 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index dc3cfa2b90b7..47bc74a6ffe0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 72cc23eeb9d696a22c6054d4de0a75a9c18fe46b +Subproject commit e4a467589e6216792d467867e9b9184afa69ec41 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 2f006b3aadf8..3d956d89d70e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit aa30a710d933734d80a36eca39dcdf80fcd11070 +Subproject commit a88d147632e0bba209ce9d9ef1c22b65f949f59c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2baeceba05e3..89d9f3821021 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c0f871c8fb9d678c3f6d95c5adc788fac30bcbad +Subproject commit d22d65bd92da6b914150156d13d380ce8f7023c2 From e5438dd825f9ad2379689c14ee6dc461a9c2f6df Mon Sep 17 00:00:00 2001 From: Cody Ohlsen Date: Mon, 23 Oct 2023 16:36:57 -0700 Subject: [PATCH 6593/7387] airserver: remove local/shared bundle cleaners and loadgen from OSS/client build (#1170) Summary: X-link: https://github.com/facebook/openr/pull/149 X-link: https://github.com/facebookexternal/traffixr/pull/2 X-link: https://github.com/facebookincubator/velox/pull/7196 X-link: https://github.com/facebookincubator/fizz/pull/100 X-link: https://github.com/facebookexperimental/edencommon/pull/12 X-link: https://github.com/facebook/proxygen/pull/468 X-link: https://github.com/facebookincubator/zstrong/pull/609 X-link: https://github.com/facebookincubator/hsthrift/pull/118 X-link: https://github.com/facebookincubator/crux/pull/9 X-link: https://github.com/facebookexperimental/rust-shed/pull/42 Pull Request resolved: https://github.com/facebook/watchman/pull/1170 X-link: https://github.com/facebook/mvfst/pull/319 X-link: https://github.com/facebook/fbthrift/pull/581 X-link: https://github.com/facebook/fboss/pull/160 X-link: https://github.com/facebook/fb303/pull/41 some cleanup: remove loadgen and bundle cleaners from client build and OSS build - hopefully will let us move faster in these codebases and avoid needing to upkeep the OSS side Reviewed By: DevSatpathy Differential Revision: D50094943 Privacy Context Container: L1091835 fbshipit-source-id: fda385715f8c792667c942e23ceccd5a6b8696d6 --- build/fbcode_builder/manifests/airstore | 1 - 1 file changed, 1 deletion(-) diff --git a/build/fbcode_builder/manifests/airstore b/build/fbcode_builder/manifests/airstore index 91c38c53cc7f..67ab64c3e971 100644 --- a/build/fbcode_builder/manifests/airstore +++ b/build/fbcode_builder/manifests/airstore @@ -15,7 +15,6 @@ builder = cmake builder = nop [dependencies] -boost libcurl fizz fmt From 540c2f2d4fc7e33a5eafe0b552112a520de36eec Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 23 Oct 2023 16:47:04 -0700 Subject: [PATCH 6594/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/bc20e972587b81fb43a8a74f74f8873087a6af73 https://github.com/facebook/folly/commit/1259bc4ad4510d9509a2a4e30cc5036992227ec5 https://github.com/facebook/ocamlrep/commit/4241b5b2c1f6241eba6f0bcd9838b5e5431c3ff1 https://github.com/facebook/rocksdb/commit/519f2a41fb76e5644c63e4e588addb3b88b36580 Reviewed By: jurajh-fb fbshipit-source-id: 7778462177f6332f44fbad3904c788d263a1a3d3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 47bc74a6ffe0..a6f5d41c2ce8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e4a467589e6216792d467867e9b9184afa69ec41 +Subproject commit bc20e972587b81fb43a8a74f74f8873087a6af73 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 3d956d89d70e..9828f01d6e68 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a88d147632e0bba209ce9d9ef1c22b65f949f59c +Subproject commit 1259bc4ad4510d9509a2a4e30cc5036992227ec5 From e7bb282c9292f6150540d0becccfac6a5549e30b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 24 Oct 2023 00:06:47 -0700 Subject: [PATCH 6595/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/3c2ea0ad04fe96cce85b2153fa22a81216b1dacd https://github.com/pytorch/fbgemm/commit/f94254d24f8dc733a0a8c233e5ca368f0be04989 Reviewed By: jurajh-fb fbshipit-source-id: 03263a8715a738684b6cdb3d6144cf026f68a759 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a6f5d41c2ce8..6fd6838663c4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bc20e972587b81fb43a8a74f74f8873087a6af73 +Subproject commit 3c2ea0ad04fe96cce85b2153fa22a81216b1dacd diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9828f01d6e68..8a0e2618dd38 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1259bc4ad4510d9509a2a4e30cc5036992227ec5 +Subproject commit a270ecc3505619a2a8b07f01757a8dabe34eef8b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 89d9f3821021..07e18bb50468 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d22d65bd92da6b914150156d13d380ce8f7023c2 +Subproject commit 3087bf41c747865ec31c15729b989a03343e584d From e8965d44ce2002f54ed0b4cf464fc7e19d8798a4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 24 Oct 2023 04:46:12 -0700 Subject: [PATCH 6596/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/d6e7b4ff08654063e9a65fb48011171383ec2bc9 https://github.com/facebook/ocamlrep/commit/b8247ece634c76e5e073c3ba68f77ac38926c975 Reviewed By: jurajh-fb fbshipit-source-id: 4af4bc0208968efc36ff6551bc6105dcd7f562a0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6fd6838663c4..9613d78a4015 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3c2ea0ad04fe96cce85b2153fa22a81216b1dacd +Subproject commit d6e7b4ff08654063e9a65fb48011171383ec2bc9 From 61fccb7a33bd3f0857be8f200e4d2062ce4da549 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 24 Oct 2023 10:41:29 -0700 Subject: [PATCH 6597/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/wangle/commit/125e327c02b7d292c5408cee5b591326929ebc97 https://github.com/facebookincubator/velox/commit/8401fb95198bd7c515469a0938428fee479832f8 Reviewed By: jurajh-fb fbshipit-source-id: 623226b2785928a8e3bd42a69f7d4e23078bcf72 --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 07e18bb50468..1ec1b5bec4aa 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3087bf41c747865ec31c15729b989a03343e584d +Subproject commit 125e327c02b7d292c5408cee5b591326929ebc97 From e253ff5e41f6a7907880c8b169f1bcc1361057fa Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 24 Oct 2023 12:08:58 -0700 Subject: [PATCH 6598/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/55918970e7d708c0487ee0aa1e6e4645e1f6815a https://github.com/facebook/fbthrift/commit/90ba5a4fa94e8bdc0a4b0b2bdb4291c3b7b1c2d3 https://github.com/facebook/proxygen/commit/6550fdffb88762fb49748d5fa5ccd6660937849b https://github.com/facebook/rocksdb/commit/99b371b417bb76aaf8f1da56dc361e22e0c51182 https://github.com/facebookincubator/velox/commit/ade1cf0a452ce2212b98b58b25624b024806539d Reviewed By: jurajh-fb fbshipit-source-id: abf7cf2f925c20f1ca5f7c907ea4d489c17e2fb2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9613d78a4015..af07dff6f5f3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d6e7b4ff08654063e9a65fb48011171383ec2bc9 +Subproject commit 90ba5a4fa94e8bdc0a4b0b2bdb4291c3b7b1c2d3 From 109bd633d4dadfc9f64502f93612881da0d98cc1 Mon Sep 17 00:00:00 2001 From: "Genevieve (Genna) Helsel" Date: Tue, 24 Oct 2023 14:59:38 -0700 Subject: [PATCH 6599/7387] remove --silent from edenfsctl prefetch call in copytree.py Summary: X-link: https://github.com/facebookincubator/velox/pull/7073 `--silent` is the default mode for `edenfsctl prefetch` and the flag is deprecated. Removing this flag is a no-op Reviewed By: xavierd Differential Revision: D50287572 fbshipit-source-id: 76f1eaa6ce3b3c7efb58882449fd67787787b4d1 --- build/fbcode_builder/getdeps/copytree.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build/fbcode_builder/getdeps/copytree.py b/build/fbcode_builder/getdeps/copytree.py index e7b3971cf8e7..a3522b31387f 100644 --- a/build/fbcode_builder/getdeps/copytree.py +++ b/build/fbcode_builder/getdeps/copytree.py @@ -59,9 +59,7 @@ def prefetch_dir_if_eden(dirpath) -> None: return glob = f"{os.path.relpath(dirpath, root).replace(os.sep, '/')}/**" print(f"Prefetching {glob}") - subprocess.call( - ["edenfsctl", "prefetch", "--repo", root, "--silent", glob, "--background"] - ) + subprocess.call(["edenfsctl", "prefetch", "--repo", root, glob, "--background"]) PREFETCHED_DIRS.add(dirpath) From 816a457488de6e13c00a262715de0fad0768716d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 24 Oct 2023 15:34:01 -0700 Subject: [PATCH 6600/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/90d8eb16de18ce0a2f53f1a74856d387be6aec2f https://github.com/facebook/litho/commit/fe820b8b21d5442badc09bb81fcde180a7d424a9 https://github.com/facebook/ocamlrep/commit/03995782ce3f789d3d58c0818986c42836456ce4 https://github.com/facebookincubator/velox/commit/763a8acf3cc370e9bea7b899a624222e3594ce52 https://github.com/pytorch/fbgemm/commit/688ad6541dc8462726661bd236bca477b48a5e81 Reviewed By: jurajh-fb fbshipit-source-id: 79c596fd6dd1a7d5fc1b220599aaa1fc52d2dbb6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index af07dff6f5f3..4f1ffe655594 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 90ba5a4fa94e8bdc0a4b0b2bdb4291c3b7b1c2d3 +Subproject commit 90d8eb16de18ce0a2f53f1a74856d387be6aec2f From 7095767af1b454493d2f839cc0973636223b55b3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 25 Oct 2023 14:03:49 -0700 Subject: [PATCH 6601/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/5cd3436ff20bb08177e880db39e74ede6e214831 https://github.com/facebook/fbthrift/commit/f8f3dfcee923ce221bd5eba9b24d91eb88c3ab84 https://github.com/facebook/folly/commit/545a936a578cfbbe6f39ffae7315a38f2ba88f25 https://github.com/facebook/proxygen/commit/997969ba59a8f56f27eb6d73b7a704bc3cf30184 https://github.com/facebook/rocksdb/commit/0f141352d8de2f743d222a6f2ff493a31dd2838c https://github.com/facebookincubator/velox/commit/c04fa1e84d795078952be4098f567463307f7dd2 Reviewed By: jurajh-fb fbshipit-source-id: 069029c84ffa976d060b3cf21be0a7d9a99cd340 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4f1ffe655594..a91595f8e003 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 90d8eb16de18ce0a2f53f1a74856d387be6aec2f +Subproject commit f8f3dfcee923ce221bd5eba9b24d91eb88c3ab84 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8a0e2618dd38..408d93ac24b4 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a270ecc3505619a2a8b07f01757a8dabe34eef8b +Subproject commit 545a936a578cfbbe6f39ffae7315a38f2ba88f25 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1ec1b5bec4aa..02e2bfb6ed3b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 125e327c02b7d292c5408cee5b591326929ebc97 +Subproject commit 9e27815b81d7a8eab615ef69754317ce25a992a9 From 32f990614ec50ff24864a9123a7cd66dd4bd8263 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 25 Oct 2023 15:42:10 -0700 Subject: [PATCH 6602/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/d997987e8c60316cf8612650a017c4602089159d https://github.com/facebook/fbthrift/commit/e2d46cad1cc47aa7173479c2088691def0edbf61 https://github.com/facebook/mvfst/commit/f23ea1cc4efc2643529c64186b38e2cefaac352d https://github.com/facebookexperimental/rust-shed/commit/626b380e0a88e5020a4c2c05e9ef4bce372b05b4 https://github.com/facebookincubator/velox/commit/573d6c7f8761b92d5a7b1845a559862690bf5e6e Reviewed By: jurajh-fb fbshipit-source-id: 15be845f220e1439a82307f030c77aa3ce8b1533 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a91595f8e003..774e559b7383 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f8f3dfcee923ce221bd5eba9b24d91eb88c3ab84 +Subproject commit e2d46cad1cc47aa7173479c2088691def0edbf61 From 5fbe7a0a497eed9cdbd66b903b87e09ad58e6d54 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 25 Oct 2023 16:51:01 -0700 Subject: [PATCH 6603/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/9c60a6600167369554883937b7628ec4d65275fe https://github.com/facebook/folly/commit/b12621520bceb89e6d48abc10d655f9582d0c043 https://github.com/facebook/rocksdb/commit/8ee009f0d806e068f274c63701c2271cb56d1293 https://github.com/facebook/watchman/commit/32f990614ec50ff24864a9123a7cd66dd4bd8263 https://github.com/facebookexperimental/rust-shed/commit/324b9372633f3a9893152a8d51e52cde997267c7 Reviewed By: jurajh-fb fbshipit-source-id: 65fc764fb7e240282d0b1ad9146d70b9ce8da1bb --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 408d93ac24b4..1c6a6139f52d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 545a936a578cfbbe6f39ffae7315a38f2ba88f25 +Subproject commit b12621520bceb89e6d48abc10d655f9582d0c043 From 86cff85ac66db5d934f0437ee651cb198caf00f3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 26 Oct 2023 06:45:37 -0700 Subject: [PATCH 6604/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/litho/commit/1b01b0cba9eff41ad6ebd6845af87bdd861e0837 https://github.com/facebook/wangle/commit/daf3a61fc54f3509cfd44c4602fff9312362cfd6 Reviewed By: jurajh-fb fbshipit-source-id: 9a054b6b10dfee6a5315b34c7fae22f039aafc1a --- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 02e2bfb6ed3b..64aee8f629db 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9e27815b81d7a8eab615ef69754317ce25a992a9 +Subproject commit daf3a61fc54f3509cfd44c4602fff9312362cfd6 From a499668527a280db20b222719c68ae3bc740b73f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 26 Oct 2023 10:44:45 -0700 Subject: [PATCH 6605/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/4700cad0615db93946d433e193c7d5305fedb215 https://github.com/facebook/litho/commit/82c6ebc701a2b514ea715418a6150a64bde81d84 https://github.com/facebook/ocamlrep/commit/d7f569e2c430dd53e55637f30a5db30bf7e0c121 https://github.com/facebookincubator/velox/commit/9d7e77bc2dc44b5acb730e23c4af4fb44872266a Reviewed By: jurajh-fb fbshipit-source-id: f09401e3b011ee3234a5427b1434e954e5753b43 --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 1c6a6139f52d..c8c75f385864 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b12621520bceb89e6d48abc10d655f9582d0c043 +Subproject commit 4700cad0615db93946d433e193c7d5305fedb215 From 76e41e7f5645f3a47ccf1085f9cd4a39dde47048 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 26 Oct 2023 11:59:07 -0700 Subject: [PATCH 6606/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/601c65d4d7632ef170044dc6cc84eb4768392706 https://github.com/facebook/litho/commit/e83d15ce7ccaf8f315465edc8ef9181bc7bb799a https://github.com/facebook/ocamlrep/commit/a399ddb3d4930e2cb8f437798af9d4239cdcebad https://github.com/facebook/proxygen/commit/eacc4acb8f0627e39d15ed6715c44fc8ed664f38 https://github.com/facebookincubator/velox/commit/d02591e4346c7def5762d5a91dc075ad5c1edf72 Reviewed By: jurajh-fb fbshipit-source-id: e96785c190c6a2b209cfb2dca23cf9cc009ead12 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 774e559b7383..484a8bc3bfe8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e2d46cad1cc47aa7173479c2088691def0edbf61 +Subproject commit 601c65d4d7632ef170044dc6cc84eb4768392706 From 40c50a28fbcf6188c96b27392f504adbc13f3208 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 27 Oct 2023 05:48:10 -0700 Subject: [PATCH 6607/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/2698fc2bf4cdf7e8e4bab8883aa49818115bbea7 https://github.com/facebookincubator/velox/commit/a137335f0b858dddde6268f5d91ce81bbccbbe64 Reviewed By: jurajh-fb fbshipit-source-id: c6f5d52eea1b02e3bf180338f06b1f2c20afcde7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 484a8bc3bfe8..c45e7043a6ff 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 601c65d4d7632ef170044dc6cc84eb4768392706 +Subproject commit 2698fc2bf4cdf7e8e4bab8883aa49818115bbea7 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index c8c75f385864..f3212361235f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 4700cad0615db93946d433e193c7d5305fedb215 +Subproject commit b753f7b14328fff661a572f9150af5671b63e8a8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 64aee8f629db..a9a0a5740507 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit daf3a61fc54f3509cfd44c4602fff9312362cfd6 +Subproject commit df831da1188fb6af6456d4e9b5701f02d3039e81 From 32cc3a5552a20f93c407591dbbcf29c643010ee2 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 27 Oct 2023 13:48:05 -0700 Subject: [PATCH 6608/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/95c5e6196c0d42480403151381f6e50003e4087e https://github.com/facebook/fb303/commit/e542d7c3606a2d741c929cbf89fcaae542385b5b https://github.com/facebook/fbthrift/commit/bed933da00f8abc907a40b1a68ca65a5e49d9cc6 https://github.com/facebook/folly/commit/8bb791635f46c9f4a3e8b27d5f03227053668711 https://github.com/facebook/mvfst/commit/d66b8f23aafa7bc6b42f11af1f3eeb26f08bf6c8 https://github.com/facebook/ocamlrep/commit/a4ca3e909841e3939d8b5215ae4c594bcdfb0f2b https://github.com/facebook/watchman/commit/40c50a28fbcf6188c96b27392f504adbc13f3208 https://github.com/facebookexperimental/rust-shed/commit/5e8d7066dd6ce215c4013287d8f93d393db8f2ff https://github.com/facebookincubator/velox/commit/6db69ef7aa9e864e62a8ff53dc84c6df602011fc Reviewed By: jurajh-fb fbshipit-source-id: 05a6417d2d76b662913f98d3cf6d27071142a082 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c45e7043a6ff..25a0ce8349f7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2698fc2bf4cdf7e8e4bab8883aa49818115bbea7 +Subproject commit bed933da00f8abc907a40b1a68ca65a5e49d9cc6 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f3212361235f..110e5e2afc1c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b753f7b14328fff661a572f9150af5671b63e8a8 +Subproject commit 8bb791635f46c9f4a3e8b27d5f03227053668711 From d06cefa53b6aabe0554b84487bf90414ca742e9e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 27 Oct 2023 16:27:22 -0700 Subject: [PATCH 6609/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/7fbcb03f42cde3cefb67fce343b3e9a58d675ce9 https://github.com/facebook/fbthrift/commit/6887640f208df647c47d54a5ad78fa6ff3ddf488 https://github.com/facebook/mvfst/commit/b91419575c248ac1bc3b90c6837d279cb4216ea2 https://github.com/facebook/ocamlrep/commit/a31ebb33f1000185735a63c7dc55b7f6ec7b6efb https://github.com/facebook/proxygen/commit/1a8968e4e3767e91ca95091710d3f84da0c2e29d https://github.com/facebookexperimental/edencommon/commit/6369db618be1d2339b21f8014a4b1fe8ac47817e https://github.com/facebookexperimental/rust-shed/commit/2afcae26dbfb0fd246f2143d83b826c4e2b1fa9f https://github.com/facebookincubator/fizz/commit/bf6b0dbd30d88accd300057c231a5d41a7e9346f https://github.com/facebookincubator/katran/commit/720beb11cb4f90267c28b54832398774a830a524 https://github.com/facebookincubator/velox/commit/b41f040d8ce659971a6749016f6f86c5b052b5a0 Reviewed By: jurajh-fb fbshipit-source-id: 7427d370f39f27d1a35658e738dfcb7793799924 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 25a0ce8349f7..a9eb6367a65a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bed933da00f8abc907a40b1a68ca65a5e49d9cc6 +Subproject commit 6887640f208df647c47d54a5ad78fa6ff3ddf488 From 9130bc1a7eebfca52145a63b43dedb0222b6d6f5 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 28 Oct 2023 15:26:34 -0700 Subject: [PATCH 6610/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/c81ddd270574dfd77851d8441dadc91c66031ffb https://github.com/facebook/mvfst/commit/b1e48163ceab19585b9e152168f9156736c7b41d https://github.com/facebookexperimental/edencommon/commit/37b74eb2dd3d92578996d7891569bcfeb0def50e https://github.com/facebookincubator/fizz/commit/b7b3b0ceafa1953ca0d682d5db0420dbd1c53c04 https://github.com/facebookincubator/katran/commit/822f6b78807588606ee396053e2d1c05c4733c8c Reviewed By: jurajh-fb fbshipit-source-id: 28e5aefa6e0f1ef86efee92e99c53581c82470dc --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a9eb6367a65a..fc80c17f29fb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6887640f208df647c47d54a5ad78fa6ff3ddf488 +Subproject commit c81ddd270574dfd77851d8441dadc91c66031ffb diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 110e5e2afc1c..5532a86b3320 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 8bb791635f46c9f4a3e8b27d5f03227053668711 +Subproject commit 82ce15a756fc7d9a527ab98723de58fa7b429d0a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a9a0a5740507..d79e676c9e1c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit df831da1188fb6af6456d4e9b5701f02d3039e81 +Subproject commit 2bd81cdaf057c8cac24657501ef631a4234311ec From 8585d5500617cdb31a6fa5de36f763edfeab2e6d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 28 Oct 2023 22:22:55 -0700 Subject: [PATCH 6611/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/f22ad0a87b9e66b54bf825c01bd091808079e9ca Reviewed By: jurajh-fb fbshipit-source-id: 621e9bdc6400c6c37c7afc8df6a166055b89d6dd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index fc80c17f29fb..c25035e3a869 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c81ddd270574dfd77851d8441dadc91c66031ffb +Subproject commit f22ad0a87b9e66b54bf825c01bd091808079e9ca diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d79e676c9e1c..4012eb1c395b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2bd81cdaf057c8cac24657501ef631a4234311ec +Subproject commit d4ef0f610fb4d7fadbb7a32812f1592978ee8647 From 9cd2e78e42366c1211ae7fca1905cec77624e00b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 30 Oct 2023 09:52:45 -0700 Subject: [PATCH 6612/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/70c13dda403c17b3b9f223092826bbd27bd7570d https://github.com/facebook/folly/commit/a3393060176c954cfabe57f9dae2fef5682f495f https://github.com/facebook/litho/commit/f012c16db48bc992e50c28a7baf576252ee7767b https://github.com/facebook/mcrouter/commit/6f73c0ea436676e30703984683ceebbbba0521fe https://github.com/facebook/ocamlrep/commit/ae6e95a050c554b8a9a13cd0644279fe660dc130 https://github.com/facebookexperimental/rust-shed/commit/a2e3f2413a4d5de5afe8a7ac71f8779b3789ba39 https://github.com/facebookincubator/velox/commit/ead8a4ca3f9f369475559cc437f76a8afac253df Reviewed By: bigfootjon fbshipit-source-id: b9a2595df202dc74d76ded9b2801b43a0855d16f --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 5532a86b3320..fcda7c82265c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 82ce15a756fc7d9a527ab98723de58fa7b429d0a +Subproject commit a3393060176c954cfabe57f9dae2fef5682f495f From 4429e515ff822cbc8e8f4c029e5a2a67c8035ae4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 30 Oct 2023 11:32:37 -0700 Subject: [PATCH 6613/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/585d5d74790cfd97ce5957af69c78e15d69be0fe https://github.com/facebook/fb303/commit/18d4ddf3feae11a3a43a8efab1fb5dad0cecad2f https://github.com/facebook/fbthrift/commit/315dfe0883ac4d9eed72f3ccac00d4bb59ef0b0e https://github.com/facebook/mvfst/commit/8c934fc4da517ae677e6db01b08d516c351d57de https://github.com/facebook/ocamlrep/commit/218fc62669b01bdea5a1becb67b7e36972b9eb3d https://github.com/facebook/proxygen/commit/11819059e44b0f825703daa67a6ac7ef1a92efa7 https://github.com/facebook/rocksdb/commit/b3fd3838d4cccd0ab0f380436e48904feb259364 https://github.com/facebook/wangle/commit/d7e10bb30d13ff241695b1906a61fb85d1bdaf27 https://github.com/facebook/watchman/commit/9cd2e78e42366c1211ae7fca1905cec77624e00b https://github.com/facebookexperimental/edencommon/commit/f5b0aaf6255585d6254df4a8fcb8baf6df7c0a78 https://github.com/facebookincubator/fizz/commit/079bef31e296a8951a0075bea84823a98320a30c https://github.com/facebookincubator/katran/commit/61baa4acd67dc2847bb9dac67c120e0d4122a1eb https://github.com/facebookincubator/velox/commit/f0f9ac696de4c15f08f4b739ac43b6d41e8b67df Reviewed By: bigfootjon fbshipit-source-id: 088bd704cbfd88bcb2ed1c75418203a8eed772dd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c25035e3a869..b888fc9cf49f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f22ad0a87b9e66b54bf825c01bd091808079e9ca +Subproject commit 315dfe0883ac4d9eed72f3ccac00d4bb59ef0b0e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4012eb1c395b..8b43e1349b97 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d4ef0f610fb4d7fadbb7a32812f1592978ee8647 +Subproject commit d7e10bb30d13ff241695b1906a61fb85d1bdaf27 From da474e3fda2d9fac7bb8e3cd7ce7958c0fe2571d Mon Sep 17 00:00:00 2001 From: John Elliott Date: Mon, 30 Oct 2023 14:03:10 -0700 Subject: [PATCH 6614/7387] Paramatized rust_static_library to enable CXX support Summary: X-link: https://github.com/facebook/fboss/pull/161 X-link: https://github.com/facebookincubator/delos_core/pull/8 X-link: https://github.com/facebookincubator/zstrong/pull/610 X-link: https://github.com/facebookincubator/crux/pull/10 X-link: https://github.com/facebookexternal/traffixr/pull/3 X-link: https://github.com/facebookincubator/katran/pull/205 X-link: https://github.com/facebookincubator/fizz/pull/101 X-link: https://github.com/facebook/sapling/pull/763 X-link: https://github.com/facebookexperimental/rust-shed/pull/43 X-link: https://github.com/facebook/wangle/pull/221 X-link: https://github.com/facebook/openr/pull/150 X-link: https://github.com/facebook/hhvm/pull/9403 X-link: https://github.com/facebook/folly/pull/2092 X-link: https://github.com/facebook/fb303/pull/42 X-link: https://github.com/facebookincubator/velox/pull/7301 We are now using CXX (and not just bindgen/cbindgen) for building our Rust C/C++ APIS, but our OSS tooling did not ergomically support this. This change adds a single option, `USE_CXX_INCLUDE`, to the CMake function, `rust_static_library`, to enable adding the `cxxbridge` path to the include path. Reviewed By: xavierd Differential Revision: D50772544 fbshipit-source-id: caf00ade9b651965b6dd59e2cf0d8797d3ae1dce --- build/fbcode_builder/CMake/RustStaticLibrary.cmake | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/build/fbcode_builder/CMake/RustStaticLibrary.cmake b/build/fbcode_builder/CMake/RustStaticLibrary.cmake index dd57b2b3dcaa..bd1b5f96ac8a 100644 --- a/build/fbcode_builder/CMake/RustStaticLibrary.cmake +++ b/build/fbcode_builder/CMake/RustStaticLibrary.cmake @@ -80,7 +80,7 @@ set_property(GLOBAL APPEND PROPERTY JOB_POOLS rust_job_pool=1) # Cargo build static library. # # ```cmake -# rust_static_library( [CRATE ] [FEATURES ]) +# rust_static_library( [CRATE ] [FEATURES ] [USE_CXX_INCLUDE]) # ``` # # Parameters: @@ -92,6 +92,8 @@ set_property(GLOBAL APPEND PROPERTY JOB_POOLS rust_job_pool=1) # fallback to `${TARGET}`. # - FEATURE_NAME: # Name of the Rust feature to enable. +# - USE_CXX_INCLUDE: +# Include cxx.rs include path in `${TARGET}` INTERFACE. # # This function creates two targets: # - "${TARGET}": an interface library target contains the static library built @@ -103,7 +105,7 @@ set_property(GLOBAL APPEND PROPERTY JOB_POOLS rust_job_pool=1) # headers with the interface library. # function(rust_static_library TARGET) - fb_cmake_parse_args(ARG "" "CRATE;FEATURES" "" "${ARGN}") + fb_cmake_parse_args(ARG "USE_CXX_INCLUDE" "CRATE;FEATURES" "" "${ARGN}") if(DEFINED ARG_CRATE) set(crate_name "${ARG_CRATE}") @@ -158,6 +160,14 @@ function(rust_static_library TARGET) INTERFACE_INSTALL_LIBNAME "${CMAKE_STATIC_LIBRARY_PREFIX}${crate_name}_rs${CMAKE_STATIC_LIBRARY_SUFFIX}" ) + + if(DEFINED ARG_USE_CXX_INCLUDE) + target_include_directories( + ${TARGET} + INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/cxxbridge/ + ) + endif() + target_link_libraries( ${TARGET} INTERFACE "$" From 2a1d4de6bba69862ae3ad6654922b00b95b799be Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 30 Oct 2023 14:58:16 -0700 Subject: [PATCH 6615/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/9e88edb8387f429c2aa62bd3c1710548edbc3ec8 https://github.com/facebook/folly/commit/772ca510a1b69807551ed46b4bf9d11ab9759471 https://github.com/facebook/ocamlrep/commit/30debacbd8594b9a32b5460f698171e421ea1603 https://github.com/facebookincubator/fizz/commit/536283604a2c7a2e8fb544f7794eae88d258ccb5 https://github.com/facebookincubator/katran/commit/f12ad6ddb44e9ce3450c110130c9a34557e581fa https://github.com/facebookincubator/velox/commit/7068200baa140134ee3bb81fbd0f4b9435ce5cd3 Reviewed By: bigfootjon fbshipit-source-id: cad67f956890516db4b859e760c95609c1f9b227 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b888fc9cf49f..14d4175f7aa9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 315dfe0883ac4d9eed72f3ccac00d4bb59ef0b0e +Subproject commit 9e88edb8387f429c2aa62bd3c1710548edbc3ec8 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index fcda7c82265c..9749322e4e23 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a3393060176c954cfabe57f9dae2fef5682f495f +Subproject commit 772ca510a1b69807551ed46b4bf9d11ab9759471 From d549f10cab7453edbecb65f48d47dce5dce153eb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 31 Oct 2023 09:15:52 -0700 Subject: [PATCH 6616/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/3f5b3ebea972dc8402854e9b5618a531290d5b3f https://github.com/facebook/litho/commit/11183ca43c6beb7a00a6299201856e0feafece01 https://github.com/facebook/mvfst/commit/2a96de25f55219b19f3ca66ead505abe21024675 https://github.com/facebook/ocamlrep/commit/8582d3f58a97332f2bfd9a8855b6de10e9412f1e https://github.com/facebook/rocksdb/commit/2818a74b95f0bab434dc65f0d271ac7a27c787a7 https://github.com/facebookexperimental/rust-shed/commit/ff8cf16f4408032e0ef95e38a1af5b0937e53cb4 https://github.com/facebookincubator/velox/commit/0d10b9b52c372e138dbfe11f9c11e074e6a3ce88 https://github.com/facebookresearch/vrs/commit/ab3f96646451be10eeb44199b4d4d858162310f7 https://github.com/pytorch/kineto/commit/a30ca3f9509c2cfd28561abbca51328f0bdf9014 Reviewed By: bigfootjon fbshipit-source-id: 5352a57d196682b52c88bc16157291fb9559a65f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 14d4175f7aa9..2a6c578e379f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9e88edb8387f429c2aa62bd3c1710548edbc3ec8 +Subproject commit 6e15959c89ff9d22d6da0774d73ac73dc1c14a4d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9749322e4e23..4a9999bafee7 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 772ca510a1b69807551ed46b4bf9d11ab9759471 +Subproject commit 3f5b3ebea972dc8402854e9b5618a531290d5b3f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8b43e1349b97..edabf39003b9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d7e10bb30d13ff241695b1906a61fb85d1bdaf27 +Subproject commit 8f6c603b620ea951ab5cc471e73f7575a3953e85 From 8e1e13ffd3c39e2057f159e07c4ccfca054c38aa Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 31 Oct 2023 12:55:52 -0700 Subject: [PATCH 6617/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/04c53919e45e30d82357d61c994b1202b0802c0e https://github.com/facebook/ocamlrep/commit/08d167634753b67fb2c0cf58ff30af7c0f2d80a2 https://github.com/facebookincubator/velox/commit/1eb2b15b9d03832473208029b48785b0160cbd1f Reviewed By: bigfootjon fbshipit-source-id: 102b64ca1a2d500d11a3a88186c1b4b69cdd97f1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2a6c578e379f..e08f639c06d7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6e15959c89ff9d22d6da0774d73ac73dc1c14a4d +Subproject commit 04c53919e45e30d82357d61c994b1202b0802c0e From 417f3920891231e940e70e94bc0b2b61f6202028 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 31 Oct 2023 14:03:41 -0700 Subject: [PATCH 6618/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/eb91eb4c1902152484dbb7f418d6ec72e61cbc0f https://github.com/facebook/folly/commit/7a9e5a7fcd6241c447788f454b6125972ef07821 https://github.com/facebook/rocksdb/commit/e0c45c15a7af615435d1f346cf8b712e6e749f5b https://github.com/facebook/squangle/commit/58bb8b252471db558ec244043ba52ebea5c8eb9e https://github.com/facebook/watchman/commit/8e1e13ffd3c39e2057f159e07c4ccfca054c38aa https://github.com/facebookexperimental/rust-shed/commit/0de50482ce0e3bc1c93c3326a4389c51bbc321fa https://github.com/facebookincubator/fizz/commit/5c92af00168c3ab4fc0d19d88cf2a290ac76415d https://github.com/facebookincubator/velox/commit/faf20478be47c2674905e8df9f6276a3d7bc2939 Reviewed By: bigfootjon fbshipit-source-id: dbdf6ebd452aa4f4420cc566b46dffffbe2c0bad --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e08f639c06d7..23d1c2f1adbd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 04c53919e45e30d82357d61c994b1202b0802c0e +Subproject commit eb91eb4c1902152484dbb7f418d6ec72e61cbc0f diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4a9999bafee7..429f63ed376f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 3f5b3ebea972dc8402854e9b5618a531290d5b3f +Subproject commit 7a9e5a7fcd6241c447788f454b6125972ef07821 From 18819c31bf4592f35584cfc2a350fadaf057d257 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 31 Oct 2023 15:22:43 -0700 Subject: [PATCH 6619/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/83f9f7b3a10946b942558e037a1f8785afb72f47 https://github.com/facebook/proxygen/commit/6db79d85a9361a1b0d39c685203ee01e2366fe5e https://github.com/facebookincubator/fizz/commit/5ec9b73c601b0871cb00e2cd105d510be30be5e7 https://github.com/facebookincubator/velox/commit/207fc682be137335e275839fa87460dfdc1b8ffc Reviewed By: bigfootjon fbshipit-source-id: c06176b322b17a1eb69cd72cb3dbd6ded9148269 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 23d1c2f1adbd..0d3978475066 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit eb91eb4c1902152484dbb7f418d6ec72e61cbc0f +Subproject commit 83f9f7b3a10946b942558e037a1f8785afb72f47 From c67de2ca0fac4bd95ead36aab2f3d84d54e44cf1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 31 Oct 2023 20:12:28 -0700 Subject: [PATCH 6620/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/f4f31751500654ec971e1a884e8fd5b89477a8eb https://github.com/facebookincubator/velox/commit/fcc49a69e050aee99145a2b5c869d4c6e44e3602 Reviewed By: bigfootjon fbshipit-source-id: 703e8eae50e2792ed3528c3a119d9593206edfac --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0d3978475066..5747dc29e18a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 83f9f7b3a10946b942558e037a1f8785afb72f47 +Subproject commit e144a354156b0ce3cbc0b9ea971ca48a343afc8a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 429f63ed376f..571ae10ee4ec 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7a9e5a7fcd6241c447788f454b6125972ef07821 +Subproject commit f4f31751500654ec971e1a884e8fd5b89477a8eb diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index edabf39003b9..50820d6187cf 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8f6c603b620ea951ab5cc471e73f7575a3953e85 +Subproject commit 7252dc6c46e61a45b225d5e11643db023750ec27 From 689b4690a43ee52c23475fae33782ad07efa2592 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 31 Oct 2023 21:34:06 -0700 Subject: [PATCH 6621/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/4bea8c1665d584c9c85fa88ac709e707d10ab09b https://github.com/facebook/litho/commit/34d9b5ef1878efa22227f0c7d49b8e6bccdc8a85 https://github.com/facebook/mvfst/commit/af99251e7ce258ba9ee3682f101668e8653e1f85 https://github.com/facebook/ocamlrep/commit/fdbe4fbf6e35983d4d49650ca0e6d021f9f96542 https://github.com/facebookincubator/velox/commit/c401f7b1e447a98c43f44e05c63e3333051d33b3 Reviewed By: bigfootjon fbshipit-source-id: 600e5f3680d6197b9b4d022bdf568837923f5f76 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5747dc29e18a..11d7c3e4130f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e144a354156b0ce3cbc0b9ea971ca48a343afc8a +Subproject commit 4bea8c1665d584c9c85fa88ac709e707d10ab09b From 245b4843d604ea16d3918450f5036d142358d612 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 1 Nov 2023 09:09:28 -0700 Subject: [PATCH 6622/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/f53ec94db1399eb83f971af5d1b4dadc76643357 https://github.com/facebook/litho/commit/1e6693dbf60ff746ce0b982d702f6e2e807c0c54 https://github.com/facebook/ocamlrep/commit/1420959833e3b84bfcdaeb89a2ae5e32b555725a https://github.com/facebookincubator/velox/commit/69d0a3f1e8f7110e25d285d9f3e173ff8d901745 Reviewed By: jailby fbshipit-source-id: 6335b733aac37b77427aa0cc79ed584c30b2c8db --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 11d7c3e4130f..b7c498409314 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4bea8c1665d584c9c85fa88ac709e707d10ab09b +Subproject commit 0b4f0abd90b821818e8ab9250ae7377cc6d29854 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 571ae10ee4ec..219a2ac307f7 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f4f31751500654ec971e1a884e8fd5b89477a8eb +Subproject commit f53ec94db1399eb83f971af5d1b4dadc76643357 From 7eab1a72e4f06643a5da67be553148bef7970e3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 09:36:07 -0700 Subject: [PATCH 6623/7387] Bump @babel/traverse from 7.21.3 to 7.23.2 in /website (#1168) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: Bumps [babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.21.3 to 7.23.2.
Release notes

Sourced from @​babel/traverse's releases.

v7.23.2 (2023-10-11)

NOTE: This release also re-publishes babel/core, even if it does not appear in the linked release commit.

Thanks @​jimmydief for your first PR!

:bug: Bug Fix

  • babel-traverse
  • babel-preset-typescript
  • babel-helpers
    • #16017 Fix: fallback to typeof when toString is applied to incompatible object (@​JLHwung)
  • babel-helpers, babel-plugin-transform-modules-commonjs, babel-runtime-corejs2, babel-runtime-corejs3, babel-runtime

Committers: 5

v7.23.1 (2023-09-25)

Re-publishing babel/helpers due to a publishing error in 7.23.0.

v7.23.0 (2023-09-25)

Thanks @​lorenzoferre and @​RajShukla1 for your first PRs!

:rocket: New Feature

  • babel-plugin-proposal-import-wasm-source, babel-plugin-syntax-import-source, babel-plugin-transform-dynamic-import
  • babel-helper-module-transforms, babel-helpers, babel-plugin-proposal-import-defer, babel-plugin-syntax-import-defer, babel-plugin-transform-modules-commonjs, babel-runtime-corejs2, babel-runtime-corejs3, babel-runtime, babel-standalone
  • babel-generator, babel-parser, babel-types
  • babel-generator, babel-helper-module-transforms, babel-parser, babel-plugin-transform-dynamic-import, babel-plugin-transform-modules-amd, babel-plugin-transform-modules-commonjs, babel-plugin-transform-modules-systemjs, babel-traverse, babel-types
  • babel-standalone
  • babel-helper-function-name, babel-helper-member-expression-to-functions, babel-helpers, babel-parser, babel-plugin-proposal-destructuring-private, babel-plugin-proposal-optional-chaining-assign, babel-plugin-syntax-optional-chaining-assign, babel-plugin-transform-destructuring, babel-plugin-transform-optional-chaining, babel-runtime-corejs2, babel-runtime-corejs3, babel-runtime, babel-standalone, babel-types
  • babel-helpers, babel-plugin-proposal-decorators
  • babel-traverse, babel-types
  • babel-preset-typescript

... (truncated)

Changelog

Sourced from @​babel/traverse's changelog.

v7.23.2 (2023-10-11)

:bug: Bug Fix

  • babel-traverse
  • babel-preset-typescript
  • babel-helpers
    • #16017 Fix: fallback to typeof when toString is applied to incompatible object (@​JLHwung)
  • babel-helpers, babel-plugin-transform-modules-commonjs, babel-runtime-corejs2, babel-runtime-corejs3, babel-runtime

v7.23.0 (2023-09-25)

:rocket: New Feature

  • babel-plugin-proposal-import-wasm-source, babel-plugin-syntax-import-source, babel-plugin-transform-dynamic-import
  • babel-helper-module-transforms, babel-helpers, babel-plugin-proposal-import-defer, babel-plugin-syntax-import-defer, babel-plugin-transform-modules-commonjs, babel-runtime-corejs2, babel-runtime-corejs3, babel-runtime, babel-standalone
  • babel-generator, babel-parser, babel-types
  • babel-generator, babel-helper-module-transforms, babel-parser, babel-plugin-transform-dynamic-import, babel-plugin-transform-modules-amd, babel-plugin-transform-modules-commonjs, babel-plugin-transform-modules-systemjs, babel-traverse, babel-types
  • babel-standalone
  • babel-helper-function-name, babel-helper-member-expression-to-functions, babel-helpers, babel-parser, babel-plugin-proposal-destructuring-private, babel-plugin-proposal-optional-chaining-assign, babel-plugin-syntax-optional-chaining-assign, babel-plugin-transform-destructuring, babel-plugin-transform-optional-chaining, babel-runtime-corejs2, babel-runtime-corejs3, babel-runtime, babel-standalone, babel-types
  • babel-helpers, babel-plugin-proposal-decorators
  • babel-traverse, babel-types
  • babel-preset-typescript
  • babel-parser

:bug: Bug Fix

  • babel-plugin-transform-block-scoping

:nail_care: Polish

  • babel-traverse
  • babel-plugin-proposal-explicit-resource-management

:microscope: Output optimization

  • babel-core, babel-helper-module-transforms, babel-plugin-transform-async-to-generator, babel-plugin-transform-classes, babel-plugin-transform-dynamic-import, babel-plugin-transform-function-name, babel-plugin-transform-modules-amd, babel-plugin-transform-modules-commonjs, babel-plugin-transform-modules-umd, babel-plugin-transform-parameters, babel-plugin-transform-react-constant-elements, babel-plugin-transform-react-inline-elements, babel-plugin-transform-runtime, babel-plugin-transform-typescript, babel-preset-env

v7.22.20 (2023-09-16)

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=@babel/traverse&package-manager=npm_and_yarn&previous-version=7.21.3&new-version=7.23.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `dependabot rebase` will rebase this PR - `dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `dependabot merge` will merge this PR after your CI passes on it - `dependabot squash and merge` will squash and merge this PR after your CI passes on it - `dependabot cancel merge` will cancel a previously requested merge and block automerging - `dependabot reopen` will reopen this PR if it is closed - `dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/facebook/watchman/network/alerts).
Pull Request resolved: https://github.com/facebook/watchman/pull/1168 Reviewed By: xavierd Differential Revision: D50608791 Pulled By: genevievehelsel fbshipit-source-id: 72dfe636bd4b66ba396c27c818d32311f377ce63 --- website/yarn.lock | 113 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 100 insertions(+), 13 deletions(-) diff --git a/website/yarn.lock b/website/yarn.lock index 0b0f18ae5713..7499eaaa8da9 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -145,6 +145,14 @@ dependencies: "@babel/highlight" "^7.18.6" +"@babel/code-frame@^7.22.13": + version "7.22.13" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e" + integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w== + dependencies: + "@babel/highlight" "^7.22.13" + chalk "^2.4.2" + "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1", "@babel/compat-data@^7.20.5": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.0.tgz#c241dc454e5b5917e40d37e525e2f4530c399298" @@ -203,6 +211,16 @@ "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" +"@babel/generator@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420" + integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g== + dependencies: + "@babel/types" "^7.23.0" + "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" + jsesc "^2.5.1" + "@babel/helper-annotate-as-pure@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb" @@ -268,6 +286,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== +"@babel/helper-environment-visitor@^7.22.20": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" + integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA== + "@babel/helper-explode-assignable-expression@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096" @@ -283,6 +306,14 @@ "@babel/template" "^7.20.7" "@babel/types" "^7.21.0" +"@babel/helper-function-name@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759" + integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw== + dependencies: + "@babel/template" "^7.22.15" + "@babel/types" "^7.23.0" + "@babel/helper-hoist-variables@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" @@ -290,6 +321,13 @@ dependencies: "@babel/types" "^7.18.6" +"@babel/helper-hoist-variables@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" + integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw== + dependencies: + "@babel/types" "^7.22.5" + "@babel/helper-member-expression-to-functions@^7.20.7", "@babel/helper-member-expression-to-functions@^7.21.0": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz#319c6a940431a133897148515877d2f3269c3ba5" @@ -378,16 +416,33 @@ dependencies: "@babel/types" "^7.18.6" +"@babel/helper-split-export-declaration@^7.22.6": + version "7.22.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" + integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== + dependencies: + "@babel/types" "^7.22.5" + "@babel/helper-string-parser@^7.19.4": version "7.19.4" resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== +"@babel/helper-string-parser@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" + integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== + "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": version "7.19.1" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== +"@babel/helper-validator-identifier@^7.22.20": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" + integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== + "@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.21.0": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180" @@ -421,11 +476,25 @@ chalk "^2.0.0" js-tokens "^4.0.0" +"@babel/highlight@^7.22.13": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54" + integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg== + dependencies: + "@babel/helper-validator-identifier" "^7.22.20" + chalk "^2.4.2" + js-tokens "^4.0.0" + "@babel/parser@^7.12.7", "@babel/parser@^7.18.8", "@babel/parser@^7.20.7", "@babel/parser@^7.21.3": version "7.21.3" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.3.tgz#1d285d67a19162ff9daa358d4cb41d50c06220b3" integrity sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ== +"@babel/parser@^7.22.15", "@babel/parser@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719" + integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw== + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2" @@ -1161,19 +1230,28 @@ "@babel/parser" "^7.20.7" "@babel/types" "^7.20.7" -"@babel/traverse@^7.12.9", "@babel/traverse@^7.18.8", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.3": - version "7.21.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.3.tgz#4747c5e7903d224be71f90788b06798331896f67" - integrity sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ== +"@babel/template@^7.22.15": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" + integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w== dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.21.3" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.21.0" - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.21.3" - "@babel/types" "^7.21.3" + "@babel/code-frame" "^7.22.13" + "@babel/parser" "^7.22.15" + "@babel/types" "^7.22.15" + +"@babel/traverse@^7.12.9", "@babel/traverse@^7.18.8", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.3": + version "7.23.2" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8" + integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw== + dependencies: + "@babel/code-frame" "^7.22.13" + "@babel/generator" "^7.23.0" + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-function-name" "^7.23.0" + "@babel/helper-hoist-variables" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/parser" "^7.23.0" + "@babel/types" "^7.23.0" debug "^4.1.0" globals "^11.1.0" @@ -1186,6 +1264,15 @@ "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" +"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb" + integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg== + dependencies: + "@babel/helper-string-parser" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.20" + to-fast-properties "^2.0.0" + "@braintree/sanitize-url@^6.0.0": version "6.0.2" resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-6.0.2.tgz#6110f918d273fe2af8ea1c4398a88774bb9fc12f" @@ -2919,7 +3006,7 @@ ccount@^2.0.0: resolved "https://registry.yarnpkg.com/ccount/-/ccount-2.0.1.tgz#17a3bf82302e0870d6da43a01311a8bc02a3ecf5" integrity sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg== -chalk@^2.0.0, chalk@^2.4.1: +chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== From 28b3a655a2de1b7940ca67440e7489604d199fbb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 1 Nov 2023 10:48:45 -0700 Subject: [PATCH 6624/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/29e29eb4feadcbb4c104f2685237af33c0450b2e https://github.com/facebook/proxygen/commit/7e46d628dd5f099c2bbb07e8055b14d900eef5ea https://github.com/facebook/watchman/commit/7eab1a72e4f06643a5da67be553148bef7970e3d https://github.com/facebookincubator/fizz/commit/e598eabe5cc129b39ab216b9282da8c96a598d41 https://github.com/facebookincubator/velox/commit/0c7dba57fc5693b6ca0883f91fbeb2a9f41b829d https://github.com/pytorch/fbgemm/commit/651ef98651431efb22d663b81ac913e2addbc44a Reviewed By: jailby fbshipit-source-id: 695d825f73ff53116e7512a18857f12fb5cacdc3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b7c498409314..cbd138a256cb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0b4f0abd90b821818e8ab9250ae7377cc6d29854 +Subproject commit 29e29eb4feadcbb4c104f2685237af33c0450b2e From 6637ef52bc4eef36e507819d68a6d8ead20384f9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 2 Nov 2023 10:39:42 -0700 Subject: [PATCH 6625/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/b589527a8451c49abb46fb9aedc22429af326f4e https://github.com/facebook/folly/commit/d62707bf4dc8c58bcc317260611b8cbe25c7f444 https://github.com/facebook/litho/commit/957b12fde53a1b8072a710e30bc5878f54ff2541 https://github.com/facebook/ocamlrep/commit/0eeddc6fe0d260bd9c5219d9d7a612d3ea8e8f1a https://github.com/facebook/proxygen/commit/8785f3780a7af750c660b287b7f64c6f89e92c2d https://github.com/facebook/rocksdb/commit/8e1adab5cecad129131a4eceabe645b9442acb9c https://github.com/facebookexperimental/edencommon/commit/488f147df8314b5f33f3be9b85356ccc4a1d76e8 https://github.com/facebookincubator/fizz/commit/9b6b30735da2da28705ba4aec7abfb45738e0da9 https://github.com/facebookincubator/velox/commit/63618b7cfc22b4e6d07932fece8cc66e777b8a59 https://github.com/pytorch/fbgemm/commit/80eaddf9179aa6b2e086dc8d6ded34f01d79a2f1 Reviewed By: jailby fbshipit-source-id: 89c68e2a53505a5108579971ab78cba3abb5fcbd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cbd138a256cb..c144730c24fa 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 29e29eb4feadcbb4c104f2685237af33c0450b2e +Subproject commit 3ee84a41ca67988d7c239a531025372250b74513 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 219a2ac307f7..24359f7cda78 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f53ec94db1399eb83f971af5d1b4dadc76643357 +Subproject commit d62707bf4dc8c58bcc317260611b8cbe25c7f444 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 50820d6187cf..f590aa1065ae 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7252dc6c46e61a45b225d5e11643db023750ec27 +Subproject commit 123180eb58e2dc31254ea64d55f23775f1ea80dc From fe23d80f105ba2d85bcfa238c5ecf22f14beaae8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 2 Nov 2023 12:31:05 -0700 Subject: [PATCH 6626/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/64b477662756027a4cc0ac71f495eadbe8442beb https://github.com/facebook/folly/commit/1f58e474022e818ea42d0f0a107f8ac1082fc90c https://github.com/facebook/mvfst/commit/af568adc2fc4b0249f87880a6bb70bf8372291cd https://github.com/facebook/ocamlrep/commit/58d8725277c113e9b88c24c551d9b0605c386f7d https://github.com/facebook/wangle/commit/f5a09d0ea7bf7a21f476953fd97a89b3ec0fd8f9 https://github.com/facebook/watchman/commit/6637ef52bc4eef36e507819d68a6d8ead20384f9 https://github.com/facebookincubator/katran/commit/89e383588e4da0cd4ddf37dc48ead98a20ee0550 https://github.com/facebookincubator/velox/commit/2664d257b6d23dc2325b0862ed37feb5b8ea666c https://github.com/pytorch/fbgemm/commit/824ef10481be8e871f66e4fdf34f7b27e735b968 Reviewed By: jailby fbshipit-source-id: 79907aa993724eafc84d50d453a5a8fc05f9d178 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c144730c24fa..d35bc0f21777 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3ee84a41ca67988d7c239a531025372250b74513 +Subproject commit 64b477662756027a4cc0ac71f495eadbe8442beb diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 24359f7cda78..06f883c259ee 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d62707bf4dc8c58bcc317260611b8cbe25c7f444 +Subproject commit 1f58e474022e818ea42d0f0a107f8ac1082fc90c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f590aa1065ae..eb3cea4a92c6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 123180eb58e2dc31254ea64d55f23775f1ea80dc +Subproject commit f5a09d0ea7bf7a21f476953fd97a89b3ec0fd8f9 From d985e4e704ac7e59198e2695f2ab4eb51bb5cfdc Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 2 Nov 2023 13:44:29 -0700 Subject: [PATCH 6627/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/a6e21655bbe18e5c3c2c809442b0f07b99ff4d50 https://github.com/facebook/litho/commit/6a0e1ab17b011ddb676ea28d1098cb0a31b376c9 https://github.com/facebookexperimental/rust-shed/commit/c8c8dfb634671a5608fcbc341db1110112da91cb https://github.com/facebookincubator/velox/commit/ebc61427c5b13cc3d6a298660eaeea38296042da https://github.com/facebookresearch/multimodal/commit/a33a8b888a542a4578b16972aecd072eff02c1a6 Reviewed By: jailby fbshipit-source-id: fd2c4a02514af7436e5fae8c7126826a8c1457d5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d35bc0f21777..81849926c016 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 64b477662756027a4cc0ac71f495eadbe8442beb +Subproject commit a6e21655bbe18e5c3c2c809442b0f07b99ff4d50 From 2f3c02940f4814b03d041365a7aa12f183f73d5d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 2 Nov 2023 16:04:38 -0700 Subject: [PATCH 6628/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/79d37e349e30b4812b1fd0be6dd64d4eca743801 https://github.com/facebook/fbthrift/commit/b7872898359fbe8a38fb015a5ea71744b45dc5db https://github.com/facebookincubator/velox/commit/e0d4bc86f635513977822fac330f999fed5535a7 Reviewed By: jailby fbshipit-source-id: 5490817d2ef5b685d4a42806a4ee34f114a79c92 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 81849926c016..56fe1b50573a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a6e21655bbe18e5c3c2c809442b0f07b99ff4d50 +Subproject commit b7872898359fbe8a38fb015a5ea71744b45dc5db diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 06f883c259ee..9e28455fe619 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1f58e474022e818ea42d0f0a107f8ac1082fc90c +Subproject commit f949ffbabaf9d8129174e70b0a019f84ac5900fd From 74be16ffe71e99ca74833ed92e0d07240bf45a18 Mon Sep 17 00:00:00 2001 From: Michael Cuevas Date: Thu, 2 Nov 2023 16:07:11 -0700 Subject: [PATCH 6629/7387] fix leftover apache licenses Summary: We relicensed to MIT in 2021. We missed a few license headers and declarations in the first relicense. This diff fixes the rest of the stragglers to use the correct license. Reviewed By: genevievehelsel Differential Revision: D50945896 fbshipit-source-id: c788bb86a556658373a9135ab3ff4bee6800acef --- watchman/java/LICENSE | 22 +++++++++++++++++++ .../ReferenceCountedFileDescriptor.java | 17 ++++---------- .../watchman/unixsocket/UnixDomainSocket.java | 17 ++++---------- .../unixsocket/UnixDomainSocketLibrary.java | 17 ++++---------- watchman/node/bser/package.json | 2 +- watchman/node/package.json | 2 +- watchman/rust/serde_bser/Cargo.toml | 2 +- watchman/rust/watchman_client/Cargo.toml | 2 +- 8 files changed, 38 insertions(+), 43 deletions(-) diff --git a/watchman/java/LICENSE b/watchman/java/LICENSE index f433b1a53f5b..11b148ec2df6 100644 --- a/watchman/java/LICENSE +++ b/watchman/java/LICENSE @@ -175,3 +175,25 @@ of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS + +MIT License + +Copyright (c) Facebook, Inc. and its affiliates. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/watchman/java/src/com/facebook/watchman/unixsocket/ReferenceCountedFileDescriptor.java b/watchman/java/src/com/facebook/watchman/unixsocket/ReferenceCountedFileDescriptor.java index 44e9a66c040f..4c7dfd324e58 100644 --- a/watchman/java/src/com/facebook/watchman/unixsocket/ReferenceCountedFileDescriptor.java +++ b/watchman/java/src/com/facebook/watchman/unixsocket/ReferenceCountedFileDescriptor.java @@ -1,17 +1,8 @@ -/* - * Copyright (c) Meta Platforms, Inc, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain - * a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. */ /* diff --git a/watchman/java/src/com/facebook/watchman/unixsocket/UnixDomainSocket.java b/watchman/java/src/com/facebook/watchman/unixsocket/UnixDomainSocket.java index c0aa613f20b2..77e62d558225 100644 --- a/watchman/java/src/com/facebook/watchman/unixsocket/UnixDomainSocket.java +++ b/watchman/java/src/com/facebook/watchman/unixsocket/UnixDomainSocket.java @@ -1,17 +1,8 @@ -/* - * Copyright (c) Meta Platforms, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain - * a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. */ /* diff --git a/watchman/java/src/com/facebook/watchman/unixsocket/UnixDomainSocketLibrary.java b/watchman/java/src/com/facebook/watchman/unixsocket/UnixDomainSocketLibrary.java index e80c39340a03..da765ddb09d9 100644 --- a/watchman/java/src/com/facebook/watchman/unixsocket/UnixDomainSocketLibrary.java +++ b/watchman/java/src/com/facebook/watchman/unixsocket/UnixDomainSocketLibrary.java @@ -1,17 +1,8 @@ -/* - * Copyright (c) Meta Platforms, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain - * a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. */ /* diff --git a/watchman/node/bser/package.json b/watchman/node/bser/package.json index 824f7d417009..4cb27aa9c8d7 100644 --- a/watchman/node/bser/package.json +++ b/watchman/node/bser/package.json @@ -22,7 +22,7 @@ "protocol" ], "author": "Wez Furlong (http://wezfurlong.org)", - "license": "Apache-2.0", + "license": "MIT", "bugs": { "url": "https://github.com/facebook/watchman/issues" }, diff --git a/watchman/node/package.json b/watchman/node/package.json index 23188e6b5436..43327cb283e1 100644 --- a/watchman/node/package.json +++ b/watchman/node/package.json @@ -21,7 +21,7 @@ "utility" ], "author": "Wez Furlong (http://wezfurlong.org)", - "license": "Apache-2.0", + "license": "MIT", "bugs": { "url": "https://github.com/facebook/watchman/issues" }, diff --git a/watchman/rust/serde_bser/Cargo.toml b/watchman/rust/serde_bser/Cargo.toml index eb4e1a0bb805..3e86ed1232dc 100644 --- a/watchman/rust/serde_bser/Cargo.toml +++ b/watchman/rust/serde_bser/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" description = "Implements the Watchman BSER encoding for serde. https://facebook.github.io/watchman/docs/bser.html" documentation = "https://docs.rs/serde_bser" repository = "https://github.com/facebook/watchman/" -license = "Apache-2.0" +license = "MIT" [dependencies] anyhow = "1.0" diff --git a/watchman/rust/watchman_client/Cargo.toml b/watchman/rust/watchman_client/Cargo.toml index 04e39dc91878..2c883c207b72 100644 --- a/watchman/rust/watchman_client/Cargo.toml +++ b/watchman/rust/watchman_client/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" description = "a client for the Watchman file watching service" documentation = "https://docs.rs/watchman_client" repository = "https://github.com/facebook/watchman/" -license = "Apache-2.0" +license = "MIT" exclude = ["examples/*"] [dependencies] From 73e5e064536b077318320a515c66a87044e9103c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 3 Nov 2023 07:34:19 -0700 Subject: [PATCH 6630/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/e7287b3b89f87cc83ba7f1c9c290c96e28358c43 https://github.com/facebook/litho/commit/98bcda8e67e8bb3befeb40b8941dc7c10e3f302e https://github.com/pytorch/fbgemm/commit/0a75b605922bb4431eadb7735edbd2f24cbd832d Reviewed By: jailby fbshipit-source-id: cc1882eefecbb42d31d369a620475a299876f255 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 56fe1b50573a..3ffa2580d43d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b7872898359fbe8a38fb015a5ea71744b45dc5db +Subproject commit e7287b3b89f87cc83ba7f1c9c290c96e28358c43 From daa9bfe08330095a68544e8cc5a3a52d3b83cf90 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 3 Nov 2023 12:41:21 -0700 Subject: [PATCH 6631/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/45c5ea6474cf1dedd43e7cc57fc76beeaffd51fe https://github.com/facebook/mvfst/commit/5fca38ef000567a5072c68fcd2f46b78f69446f9 https://github.com/facebook/rocksdb/commit/8505b26db19871a8c8782a35a7b5be9d321d45e0 https://github.com/facebook/wangle/commit/b27692b50802361ba513fad30694602697c1d2fb https://github.com/facebookincubator/katran/commit/4ff6893cbd69a95dfd1eaec9c58bdd3108e6140b https://github.com/facebookincubator/velox/commit/781caf34e0540ca6b5b03343981f34a21f6aec88 Reviewed By: jailby fbshipit-source-id: ba56e928327ac092d11d1f588b55bdfd43af760e --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9e28455fe619..9464c088b354 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f949ffbabaf9d8129174e70b0a019f84ac5900fd +Subproject commit 45c5ea6474cf1dedd43e7cc57fc76beeaffd51fe diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index eb3cea4a92c6..43614ce06a9f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f5a09d0ea7bf7a21f476953fd97a89b3ec0fd8f9 +Subproject commit b27692b50802361ba513fad30694602697c1d2fb From e8a91aee6bc4e8f38a03e7c02486c9a8eaf7eca1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 3 Nov 2023 14:09:31 -0700 Subject: [PATCH 6632/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/c7d0b62f619369b035d981813555600bc08781aa https://github.com/facebook/litho/commit/957efaed7ff203bb09f52544c98050124c0d57c1 https://github.com/facebook/mvfst/commit/ef2fb2c06ba82efeb8e99830fe1efb661ddf74bb https://github.com/facebookexperimental/rust-shed/commit/c9b94a4887a5a58b90d2537a8052bb3419bb99bf https://github.com/facebookincubator/velox/commit/850c3be8ea2d81dc3dc8bc8879272bf4f7de5af8 Reviewed By: jailby fbshipit-source-id: b944eea46aa235b18d71006f640d0eaedfc45144 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3ffa2580d43d..609aae808e40 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e7287b3b89f87cc83ba7f1c9c290c96e28358c43 +Subproject commit c7d0b62f619369b035d981813555600bc08781aa From 7bd400d1cde200c9ed48b36a847345d5158e2b98 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 3 Nov 2023 19:59:32 -0700 Subject: [PATCH 6633/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/0b9cdde39fcf75b998fb0efbcc800bbed487c8ae https://github.com/facebook/proxygen/commit/d11d74fe621fecd2663ca8242bb8303706947e25 https://github.com/facebookincubator/velox/commit/e52d346cbe1e7fb0e81efdc65020a5567f8f2fb7 Reviewed By: jailby fbshipit-source-id: f93e7aff7a9580509acd161268989ea83a332327 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 609aae808e40..4c025ead87b5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c7d0b62f619369b035d981813555600bc08781aa +Subproject commit 0b9cdde39fcf75b998fb0efbcc800bbed487c8ae diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9464c088b354..3fb464d14688 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 45c5ea6474cf1dedd43e7cc57fc76beeaffd51fe +Subproject commit e516de0b7741cecec0766b35514ac52f224ea605 From 36d6f9c9785fe991b377f1e5bc53d1d01a9d0243 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 3 Nov 2023 21:12:05 -0700 Subject: [PATCH 6634/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/27e873bef5bfd631b54bcf4c9f32dee381283b87 https://github.com/facebook/ocamlrep/commit/52f792d8b1f215c058e5c6bc69026898b6bc6be6 https://github.com/facebookincubator/velox/commit/c11f1b374cc3c559d2dd27800907f3d0855f2b6c Reviewed By: jailby fbshipit-source-id: 953924f9b05f96faee00b015ffe0c8add1570c10 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4c025ead87b5..24c7a3d460f0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0b9cdde39fcf75b998fb0efbcc800bbed487c8ae +Subproject commit 27e873bef5bfd631b54bcf4c9f32dee381283b87 From c4b005413344b79b01cfc155fa5b271afd2075eb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 4 Nov 2023 18:45:15 -0700 Subject: [PATCH 6635/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/mvfst/commit/d1f042b967b1bb94cda0f485ef57e819bd0c11ed https://github.com/facebook/wangle/commit/10c418ee7053210993a2b08f768b497f751180b4 https://github.com/facebookincubator/katran/commit/66a1ee704da8c576f6890f3cd6b744901fe7b775 Reviewed By: jailby fbshipit-source-id: fdfc83655c14d0cca6123448daadcf407f56dfec --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 24c7a3d460f0..def2457ffd00 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 27e873bef5bfd631b54bcf4c9f32dee381283b87 +Subproject commit c14ea4a7389dc3e27f948a8b9bc95e8f99203dc4 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 43614ce06a9f..7ee0bd67070e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b27692b50802361ba513fad30694602697c1d2fb +Subproject commit 10c418ee7053210993a2b08f768b497f751180b4 From 8f1705aa8fc7cd667a24d2df7faa320e4000937a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 5 Nov 2023 03:50:51 -0800 Subject: [PATCH 6636/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/5574820950d59c2df2bfffcca164c53b5208b8a7 Reviewed By: jailby fbshipit-source-id: ad0338c39297327c98e6b6f84f4b9207d8e7e7c8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index def2457ffd00..d76146df849e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c14ea4a7389dc3e27f948a8b9bc95e8f99203dc4 +Subproject commit 5574820950d59c2df2bfffcca164c53b5208b8a7 From c77311aa3c263f7c6b45c0383fb06b224dfbbaf4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 6 Nov 2023 06:00:02 -0800 Subject: [PATCH 6637/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/50b561a348f95503bde48ad919474b717bb9892c https://github.com/facebook/fbthrift/commit/9e5fb91e8f2caf0eca5d254e8de75068d48171cd https://github.com/facebook/folly/commit/d2e577a8c8911d6f394d4cba4467831889efbfb7 https://github.com/facebook/ocamlrep/commit/5b914e9979b2a1aad5f4bb18731e51a98eea7581 https://github.com/facebook/wangle/commit/5c3fe8da13c49adc2138ab261146b282aa6d187f https://github.com/facebookexperimental/rust-shed/commit/20a4d43c843a31750315a454cbb7a98b4fa1e1b4 Reviewed By: jailby fbshipit-source-id: 0c960da1dcffd07afe1211e14ddb9f2056912d05 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d76146df849e..7876018f3374 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5574820950d59c2df2bfffcca164c53b5208b8a7 +Subproject commit 9e5fb91e8f2caf0eca5d254e8de75068d48171cd diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 3fb464d14688..437ea8f15a74 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e516de0b7741cecec0766b35514ac52f224ea605 +Subproject commit d2e577a8c8911d6f394d4cba4467831889efbfb7 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7ee0bd67070e..08a2bfc9baba 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 10c418ee7053210993a2b08f768b497f751180b4 +Subproject commit 5c3fe8da13c49adc2138ab261146b282aa6d187f From 40d4c908604c2fabe2137df56cab96cb87505e84 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 6 Nov 2023 07:09:33 -0800 Subject: [PATCH 6638/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/837f55942eae4a6137b38bb1af61749f34fe01c9 https://github.com/facebook/fbthrift/commit/19890bdbf8ace9df6364162f1d7284b8ecb9df4e https://github.com/facebook/mvfst/commit/6b3e9fa51bad8647196ddd51e4f02246dbdf76d6 https://github.com/facebook/ocamlrep/commit/300230a571a05a34b400c7f970059b638cf8c1eb https://github.com/facebook/proxygen/commit/14f70dc888d170325a855c64507f437b5307a973 https://github.com/facebook/wangle/commit/f95141d995a114e15cf5f862c27307bb209a868c https://github.com/facebook/watchman/commit/c77311aa3c263f7c6b45c0383fb06b224dfbbaf4 https://github.com/facebookexperimental/edencommon/commit/897171cba910978b52c8c25c971a88798e6582dd https://github.com/facebookexperimental/rust-shed/commit/be79415774ecb0b3c291d13e76a5b5f91d00d994 https://github.com/facebookincubator/fizz/commit/725bd18bad6368d4feff9056ced877f57ee4b15e https://github.com/facebookincubator/katran/commit/53930fcd6579c3666dd86bf21d6831f48b942cc5 https://github.com/facebookincubator/velox/commit/5cce9f7a9f83f7375a3972998dea5f589f8911ff Reviewed By: jailby fbshipit-source-id: 376e46bb832265dc6b5b022580982c0d354d503e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7876018f3374..a77f5c656f53 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9e5fb91e8f2caf0eca5d254e8de75068d48171cd +Subproject commit 19890bdbf8ace9df6364162f1d7284b8ecb9df4e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 08a2bfc9baba..39e47f455a8b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5c3fe8da13c49adc2138ab261146b282aa6d187f +Subproject commit f95141d995a114e15cf5f862c27307bb209a868c From 5072ec16272830a5715d352d16844eed32862525 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 6 Nov 2023 09:47:40 -0800 Subject: [PATCH 6639/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/10d22ca4b18607f495f90601fdf021afa62515f2 https://github.com/facebook/fbthrift/commit/fb4c4b4681bba012ac731569e8c4ed655ecc2c06 https://github.com/facebook/mvfst/commit/8c02de96acfbddc22081704faaf8ef8ea2af2489 https://github.com/facebook/proxygen/commit/ee062c8468711aa0236d4a012a35cb01abe0e8d5 https://github.com/facebook/rocksdb/commit/520c64fd2e603488ae1858157898e8c0ff43b368 https://github.com/facebookincubator/fizz/commit/7d37de5c3007e4c34ad549ebe5ada0ce12546747 https://github.com/facebookincubator/katran/commit/992168e4505d8ed87533292d61c87c33c37c1bea https://github.com/facebookincubator/velox/commit/106367938b59044409bb80bd3b86ad554bcf3b06 https://github.com/facebookresearch/pytorch-biggraph/commit/0e7c1010b5b5bb9f20c275dc12477064196536e1 https://github.com/pytorch/fbgemm/commit/6000a5ce23e2b83b5dea8f43182f5e0251f480e1 Reviewed By: jurajh-fb fbshipit-source-id: b7b9c440d5ba83a2dd7cb06811343cdb1f9c1a59 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a77f5c656f53..16ba8b1eaf8d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 19890bdbf8ace9df6364162f1d7284b8ecb9df4e +Subproject commit fb4c4b4681bba012ac731569e8c4ed655ecc2c06 From 7f59e36f233d3101ea9da9914b381b687e8bef88 Mon Sep 17 00:00:00 2001 From: Harvey Hunt Date: Tue, 7 Nov 2023 06:41:39 -0800 Subject: [PATCH 6640/7387] opensource: getdeps: Add show-scratch-dir command Summary: X-link: https://github.com/facebookincubator/velox/pull/7446 Add a new command to show the location of the scratch dir that getdeps will use. Reviewed By: xavierd Differential Revision: D51027807 fbshipit-source-id: 80a7cfc04320002588d5ec8964fc88914771c6c7 --- build/fbcode_builder/getdeps.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 0c18d5c2eb93..7f824c0ebd4f 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -467,6 +467,13 @@ def run(self, args): clean_dirs(opts) +@cmd("show-scratch-dir", "show the scratch dir") +class ShowScratchDirCmd(SubCmd): + def run(self, args): + opts = setup_build_options(args) + print(opts.scratch_dir) + + @cmd("show-build-dir", "print the build dir for a given project") class ShowBuildDirCmd(ProjectCmdBase): def run_project_cmd(self, args, loader, manifest): From 5c4874f5434e50779e0d2a29980f544757f54a84 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 7 Nov 2023 10:44:07 -0800 Subject: [PATCH 6641/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/90d6313971430b35b15455b00af8e14f6c1ee96e https://github.com/facebook/fb303/commit/5cef3774fa5fad6e0baf993bb9ec1a7fceb5766e https://github.com/facebook/fbthrift/commit/6f62a17c120293567c21fafee55450e4cb51447d https://github.com/facebook/folly/commit/28e4df9a6c439532c002081865e3fea89facd766 https://github.com/facebook/litho/commit/4c1491a23eeb3265abff084fe8f5745c31ff14b7 https://github.com/facebook/mvfst/commit/4702f7791e0579899aae278716920cab87709e93 https://github.com/facebook/ocamlrep/commit/f797ecd25b914b472633f74e0f8d7e4b88ba4ff6 https://github.com/facebook/proxygen/commit/044fe10bc10d286dfca1f52754e8df9518b131c2 https://github.com/facebook/rocksdb/commit/2adef5367a68ce099bde51e7d710889d86a1b3d0 https://github.com/facebook/wangle/commit/f228a3ac5e2099740db2ada53f9023749abab348 https://github.com/facebook/watchman/commit/7f59e36f233d3101ea9da9914b381b687e8bef88 https://github.com/facebookexperimental/edencommon/commit/183111bd11172cbf2b7253876ee849faa0ced067 https://github.com/facebookexperimental/rust-shed/commit/2dbf6df6ff2c6c2b0dec9039a4453abcdb41b982 https://github.com/facebookincubator/fizz/commit/e60e7117b6098ff7ff561008ae815e0d9c96250b https://github.com/facebookincubator/katran/commit/7f148ba006fa13e6723e6bcd16dba08b00d5e53d https://github.com/facebookincubator/velox/commit/db352f05a9a98ddd3bbdf97fea8fbb9385ec8028 https://github.com/pytorch/fbgemm/commit/b8f6beb785038e5ee9180010273aa5419e2a3cf9 https://github.com/pytorch/kineto/commit/59506b7fdbda0a4223dfe0574789e59e4b511f21 Reviewed By: jurajh-fb fbshipit-source-id: 45f534672cd60270f8a478a78b4dc0f5ffa4e2a5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 16ba8b1eaf8d..9934ee32d109 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit fb4c4b4681bba012ac731569e8c4ed655ecc2c06 +Subproject commit 6f62a17c120293567c21fafee55450e4cb51447d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 437ea8f15a74..e8ffd4ed778d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d2e577a8c8911d6f394d4cba4467831889efbfb7 +Subproject commit 28e4df9a6c439532c002081865e3fea89facd766 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 39e47f455a8b..87a394329ea1 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f95141d995a114e15cf5f862c27307bb209a868c +Subproject commit f228a3ac5e2099740db2ada53f9023749abab348 From d04a5def34e54cc44ecff16422d370afff0f0aa2 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 8 Nov 2023 09:34:37 -0800 Subject: [PATCH 6642/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/bed7ee7313637a33f10f82bfd330d0c94df06335 https://github.com/facebook/fb303/commit/b10e9813b4852f91ea4c223376a103e53aa33185 https://github.com/facebook/fbthrift/commit/33ebfeb85ce2a2a3bcd885c31d01335d2e90991c https://github.com/facebook/folly/commit/bfc531d279f964a899c76902a2d095915734da2f https://github.com/facebook/litho/commit/470c4ada5fb4004faa5be86da427704780ffb3f7 https://github.com/facebook/mcrouter/commit/dcdb32b087499152ec1311b5f9b1f6e52478d014 https://github.com/facebook/mvfst/commit/cc9ccc8f99ceb5f334abbb57502820b5a0b8733a https://github.com/facebook/ocamlrep/commit/444399ca48d582ca80ba57b233e1d6d65a461c16 https://github.com/facebook/proxygen/commit/d9a43f0d1594b9ec8ae5685a55a3f6e74059cd93 https://github.com/facebook/rocksdb/commit/9af25a392b9565f2f66566b4df3b33c8b7bfaf29 https://github.com/facebook/wangle/commit/b735439eb3ed86d4346dae5e13adf638c30d1ba0 https://github.com/facebook/watchman/commit/5c4874f5434e50779e0d2a29980f544757f54a84 https://github.com/facebookexperimental/edencommon/commit/005ceb29ff4ee6375536e8cc8c1a5a6384f1dc52 https://github.com/facebookexperimental/rust-shed/commit/f59f342c1ad46881dfde4ddbb090ef2911c58b4c https://github.com/facebookincubator/fizz/commit/2afd1a6174553c53f9a4961cba1434d565150cd0 https://github.com/facebookincubator/katran/commit/1e3e06404f933bba535bca8033312304f2edf492 https://github.com/facebookincubator/velox/commit/b3e37fbc6c2b15018912a50dcbb831245e47b49a https://github.com/pytorch/fbgemm/commit/e5236c8d22ad4d18f90adae92dd44d605350e594 https://github.com/pytorch/kineto/commit/8d99b09a2508389885fe20c9b0b5bc0bb7730081 Reviewed By: jurajh-fb fbshipit-source-id: 30fd9b152b08b814f0fabbc8c960611cffbbbdc8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9934ee32d109..994b06c9f615 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6f62a17c120293567c21fafee55450e4cb51447d +Subproject commit 33ebfeb85ce2a2a3bcd885c31d01335d2e90991c diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e8ffd4ed778d..0cdcdc3970ac 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 28e4df9a6c439532c002081865e3fea89facd766 +Subproject commit bfc531d279f964a899c76902a2d095915734da2f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 87a394329ea1..bcf3104481e1 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f228a3ac5e2099740db2ada53f9023749abab348 +Subproject commit b735439eb3ed86d4346dae5e13adf638c30d1ba0 From 7f8e1643bae1a3a3d270e1be5e73efe4434a8244 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 9 Nov 2023 09:32:14 -0800 Subject: [PATCH 6643/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/6d835505db94a0de79146f7db8358f354a10e724 https://github.com/facebook/fb303/commit/b46c00a8d4633bae3945f6217681e73570ecca83 https://github.com/facebook/fbthrift/commit/dd46d65fc093f770c01808bf4a5c20be29f42ff2 https://github.com/facebook/folly/commit/cb336bf35997e76994990ed7c2ab244a22f810b6 https://github.com/facebook/litho/commit/d3d588f3575ae59e5b6bf63a459359fc3946a36f https://github.com/facebook/mvfst/commit/7336b143e4584077c82e5418359d3b61d1235d66 https://github.com/facebook/ocamlrep/commit/fd3c951f0407b94cc8e2fee3a128ec6fae794dd0 https://github.com/facebook/proxygen/commit/9e63f7bcd1fc423a36592f76f7ced4b197b4611a https://github.com/facebook/rocksdb/commit/f337533b6f523c006bb60d647e9f93ada96d8a3f https://github.com/facebook/wangle/commit/fa26c96799159bd148e631de1370aa8b8fef2f99 https://github.com/facebook/watchman/commit/d04a5def34e54cc44ecff16422d370afff0f0aa2 https://github.com/facebookexperimental/edencommon/commit/31aa23254be8dfdc39c7b02a0aaca8e8608309d5 https://github.com/facebookexperimental/rust-shed/commit/30229b25a922f25d7f1ab6463e5dd4c89964aab8 https://github.com/facebookincubator/fizz/commit/10141dd577fb2ac5bb609a86762411eabd5ec637 https://github.com/facebookincubator/katran/commit/7a84d745d7b37896e273911e6725631042cfab6a https://github.com/facebookincubator/velox/commit/9cfa1a6fd4262c355e71f3a1a31f599d682f1597 https://github.com/pytorch/fbgemm/commit/79d1729452c16a939fb04edeb56c7d86e5809c87 Reviewed By: jurajh-fb fbshipit-source-id: 74ee69d5b95fd5a5d2b52003429974cb74dec674 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 994b06c9f615..2fc72045fcbe 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 33ebfeb85ce2a2a3bcd885c31d01335d2e90991c +Subproject commit dd46d65fc093f770c01808bf4a5c20be29f42ff2 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0cdcdc3970ac..a42090549973 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit bfc531d279f964a899c76902a2d095915734da2f +Subproject commit cb336bf35997e76994990ed7c2ab244a22f810b6 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index bcf3104481e1..37737d7eb0ea 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b735439eb3ed86d4346dae5e13adf638c30d1ba0 +Subproject commit fa26c96799159bd148e631de1370aa8b8fef2f99 From 8827452c8ef501559f5ea453db0710271896e0cb Mon Sep 17 00:00:00 2001 From: Xavier Deguillard Date: Thu, 9 Nov 2023 14:37:09 -0800 Subject: [PATCH 6644/7387] win32: use nullStdin instead of /dev/null Summary: On Windows, `/dev/null` is meaningless, use the `nullStdin` method instead. Created from CodeHub with https://fburl.com/edit-in-codehub Reviewed By: genevievehelsel Differential Revision: D51056121 fbshipit-source-id: 08502767a25178d77ed98152a1cc6539c7007d64 --- watchman/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/main.cpp b/watchman/main.cpp index b3c75d8e0e8a..4cbcbc3e8aa0 100644 --- a/watchman/main.cpp +++ b/watchman/main.cpp @@ -354,7 +354,7 @@ static SpawnResult spawn_win32(const std::vector& daemon_argv) { ChildProcess::Options opts; opts.setFlags(POSIX_SPAWN_SETPGROUP); - opts.open(STDIN_FILENO, "/dev/null", O_RDONLY, 0666); + opts.nullStdin(); opts.open( STDOUT_FILENO, logging::log_name.c_str(), From 2423e3ef9e5824f03aaaa7f5bea9e96ad8af1ec8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 13 Nov 2023 09:31:42 -0800 Subject: [PATCH 6645/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/30d8a0c874f96bad2e92ec15c89584850382b82a https://github.com/facebook/fb303/commit/75ddc20b3305cfdf43c5d13d786190225027975c https://github.com/facebook/fbthrift/commit/ebc7d0f77dd49abe280000409954f7672eedd36d https://github.com/facebook/folly/commit/7ed8c613d1881ade6e1b524920d4b40c84549bf3 https://github.com/facebook/litho/commit/bdfc1ea3909c4f55d50d47e3bf85b36e0e7ee0fe https://github.com/facebook/mvfst/commit/c1432e1c7b0632c99af53d0108e30eca8b2bdc1a https://github.com/facebook/ocamlrep/commit/bbca1ba5c74d3ac6c22f66202c7b7114ddde5754 https://github.com/facebook/proxygen/commit/2c9db8e8449765313b5b452aec9086253195bea3 https://github.com/facebook/rocksdb/commit/509947ce2c970d296fd0d868455d560c7f778a57 https://github.com/facebook/wangle/commit/92375ed1f2c7d611f4f1b4825e5ba3e2954804c8 https://github.com/facebook/watchman/commit/8827452c8ef501559f5ea453db0710271896e0cb https://github.com/facebookexperimental/edencommon/commit/7daa8f52a9d2f99c58fb3678b0568f51ccfe51f8 https://github.com/facebookexperimental/rust-shed/commit/2d1c6660741fc2a9cc2d3af279f8195271c9af1a https://github.com/facebookincubator/fizz/commit/a8620439069feb58ac804dc8ce85926aa6dbd061 https://github.com/facebookincubator/katran/commit/3f0883cb226942185137f7f90dcc6d99b9bcd81f https://github.com/facebookincubator/velox/commit/f8d591c2d691f23d7d58d768d01094336c93b5a5 https://github.com/facebookresearch/multimodal/commit/e6b92b589f4aab4adbf3395d767db7a53fd4b984 https://github.com/pytorch/fbgemm/commit/2117dd33d4c4fd53cfadbf037b5fb3c0824cb00e https://github.com/pytorch/kineto/commit/61d911163feb2f5552584d65326e54c15f78e93f Reviewed By: jurajh-fb fbshipit-source-id: 7e566be19678c2fd95f1007911fe42a10f434804 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2fc72045fcbe..419057de1688 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit dd46d65fc093f770c01808bf4a5c20be29f42ff2 +Subproject commit ebc7d0f77dd49abe280000409954f7672eedd36d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a42090549973..2c81365a0df9 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit cb336bf35997e76994990ed7c2ab244a22f810b6 +Subproject commit 7ed8c613d1881ade6e1b524920d4b40c84549bf3 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 37737d7eb0ea..7c75bd322949 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit fa26c96799159bd148e631de1370aa8b8fef2f99 +Subproject commit 92375ed1f2c7d611f4f1b4825e5ba3e2954804c8 From e3bf55c290a93a32974519f26474ef3153a7536c Mon Sep 17 00:00:00 2001 From: "Genevieve (Genna) Helsel" Date: Mon, 13 Nov 2023 12:47:14 -0800 Subject: [PATCH 6646/7387] LMDBInodeCatalog + LMDBFileContentStore Summary: X-link: https://github.com/facebookincubator/velox/pull/7542 ties all of the pieces together. The bulk of the net-new logic is in `OverlayFile`, with the LMDB stuff being ported from other implementations or just delegating calls to other classes. Reviewed By: kmancini Differential Revision: D46914322 fbshipit-source-id: 3434b71c92ece6b94a3c08828df286b04152d50f --- build/fbcode_builder/CMake/FindLMDB.cmake | 19 +++++++++++++++++++ build/fbcode_builder/manifests/eden | 2 ++ build/fbcode_builder/manifests/lmdb | 17 +++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 build/fbcode_builder/CMake/FindLMDB.cmake create mode 100644 build/fbcode_builder/manifests/lmdb diff --git a/build/fbcode_builder/CMake/FindLMDB.cmake b/build/fbcode_builder/CMake/FindLMDB.cmake new file mode 100644 index 000000000000..51635e36ee3b --- /dev/null +++ b/build/fbcode_builder/CMake/FindLMDB.cmake @@ -0,0 +1,19 @@ +# Copyright (c) Meta Platforms, Inc. and affiliates. +# +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2. + +find_library(LMDB_LIBRARIES NAMES lmdb liblmdb) +mark_as_advanced(LMDB_LIBRARIES) + +find_path(LMDB_INCLUDE_DIR NAMES lmdb.h) +mark_as_advanced(LMDB_INCLUDE_DIR) + +find_package_handle_standard_args( + LMDB + REQUIRED_VARS LMDB_LIBRARIES LMDB_INCLUDE_DIR) + +if(LMDB_FOUND) + set(LMDB_LIBRARIES ${LMDB_LIBRARIES}) + set(LMDB_INCLUDE_DIR, ${LMDB_INCLUDE_DIR}) +endif() diff --git a/build/fbcode_builder/manifests/eden b/build/fbcode_builder/manifests/eden index 4c32bf698a1c..b8109360864c 100644 --- a/build/fbcode_builder/manifests/eden +++ b/build/fbcode_builder/manifests/eden @@ -52,6 +52,8 @@ osxfuse libcurl # Added so that OSS doesn't see system "python" which is python 2 on darwin and some linux python +# TODO: teach getdeps to compile lmdb on Windows. +lmdb [shipit.pathmap.fb=on] # for internal builds that use getdeps diff --git a/build/fbcode_builder/manifests/lmdb b/build/fbcode_builder/manifests/lmdb new file mode 100644 index 000000000000..42ca0ab07498 --- /dev/null +++ b/build/fbcode_builder/manifests/lmdb @@ -0,0 +1,17 @@ +[manifest] +name = lmdb + +[build] +builder = make +subdir = lmdb-LMDB_0.9.31/libraries/liblmdb + +[download] +url = https://github.com/LMDB/lmdb/archive/refs/tags/LMDB_0.9.31.tar.gz +sha256 = dd70a8c67807b3b8532b3e987b0a4e998962ecc28643e1af5ec77696b081c9b0 + +[make.build_args] +BUILD_STATIC_ONLY=y + +[make.install_args] +install +BUILD_STATIC_ONLY=y From 8bdd3d231ed672824d1b83841617b75b7cc7f984 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 14 Nov 2023 09:36:37 -0800 Subject: [PATCH 6647/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/b6b5e69bfb956d9a388bc7d12621c0ba5c6bb1d8 https://github.com/facebook/fb303/commit/b7f0a90ea9a653d5dcd0bc94feb002de811cefec https://github.com/facebook/fbthrift/commit/b62fffec1c8beb213d0aeed5e4c4a5026a9e18cd https://github.com/facebook/folly/commit/ced26fe4e6fe64738416c1569ae3692144aa419d https://github.com/facebook/litho/commit/46cb69441ae59228c2db040b670d3d4dc952f1f4 https://github.com/facebook/mvfst/commit/99fe3553488df1ed595702528dba9147e3b196b2 https://github.com/facebook/ocamlrep/commit/0a7d2e50eb3865584b68873813af493924aa8be6 https://github.com/facebook/proxygen/commit/e1fe032249185104ae00e924e085ff174eacca9c https://github.com/facebook/rocksdb/commit/37064d631bff69167afbe759f32aa915027ab192 https://github.com/facebook/wangle/commit/570d3bdcef5913f60046da722870ea5e5049cda2 https://github.com/facebook/watchman/commit/e3bf55c290a93a32974519f26474ef3153a7536c https://github.com/facebookexperimental/edencommon/commit/4d9d236d2d7c7e404aaeabb2b604f36a17948eee https://github.com/facebookexperimental/rust-shed/commit/9b294a0ed70caa88c444f9f52cfb1f1fa572a7f0 https://github.com/facebookincubator/fizz/commit/1304886a45b0e9b643ea89ea493172814deb57a0 https://github.com/facebookincubator/katran/commit/60c25f63bd950674a601c723711ae5ba55a07009 https://github.com/facebookincubator/velox/commit/260ee61077f7ba64c900081825d7fbba42634a5b https://github.com/pytorch/fbgemm/commit/09ab470c7eca954f3314494d8e6b102b18ae6f3b Reviewed By: bigfootjon fbshipit-source-id: 1a3c6ede88f49dc5bcbeda35a4d5b30ba87d2a87 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 419057de1688..97df6320c07f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ebc7d0f77dd49abe280000409954f7672eedd36d +Subproject commit b62fffec1c8beb213d0aeed5e4c4a5026a9e18cd diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 2c81365a0df9..f7369ec637e8 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7ed8c613d1881ade6e1b524920d4b40c84549bf3 +Subproject commit ced26fe4e6fe64738416c1569ae3692144aa419d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7c75bd322949..5c2eef0a0910 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 92375ed1f2c7d611f4f1b4825e5ba3e2954804c8 +Subproject commit 570d3bdcef5913f60046da722870ea5e5049cda2 From 8085006f8a443fae111f62f9c3cd0d5f5a467d7b Mon Sep 17 00:00:00 2001 From: Shai Szulanski Date: Tue, 14 Nov 2023 19:37:41 -0800 Subject: [PATCH 6648/7387] fbcode/eden/ Reviewed By: Mizuchi Differential Revision: D51328901 fbshipit-source-id: d559395a53e7cca9074bced18a8c941d63706a44 --- eden/fs/service/eden.thrift | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 66ac4b967f20..3330dcb8be09 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -422,9 +422,7 @@ union FileAttributeDataOrErrorV2 { * in a certain directory. */ union DirListAttributeDataOrError { - 1: map ( - rust.type = "sorted_vector_map::SortedVectorMap", - ) dirListAttributeData; + 1: map_PathString_FileAttributeDataOrErrorV2_3516 dirListAttributeData; 2: EdenError error; } @@ -2373,3 +2371,8 @@ service EdenService extends fb303_core.BaseService { 1: EdenError ex, ); } + +// The following were automatically generated and may benefit from renaming. +typedef map ( + rust.type = "sorted_vector_map::SortedVectorMap", +) map_PathString_FileAttributeDataOrErrorV2_3516 From b1fa0d11983e072ce898e5d932281beda0976c32 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Tue, 14 Nov 2023 20:10:26 -0800 Subject: [PATCH 6649/7387] Add rust_cxx_bridge CMake function (#1173) Summary: X-link: https://github.com/facebookincubator/hsthrift/pull/120 X-link: https://github.com/facebook/folly/pull/2096 X-link: https://github.com/facebookexperimental/edencommon/pull/14 X-link: https://github.com/facebook/mvfst/pull/322 X-link: https://github.com/facebookincubator/delos_core/pull/9 X-link: https://github.com/facebook/fboss/pull/166 X-link: https://github.com/facebookincubator/zstrong/pull/617 X-link: https://github.com/facebookincubator/katran/pull/208 X-link: https://github.com/facebookincubator/fizz/pull/102 X-link: https://github.com/facebookexternal/traffixr/pull/4 Pull Request resolved: https://github.com/facebook/watchman/pull/1173 X-link: https://github.com/facebook/proxygen/pull/473 X-link: https://github.com/facebook/hhvm/pull/9411 X-link: https://github.com/facebook/fbthrift/pull/587 X-link: https://github.com/facebookincubator/velox/pull/7518 We need a better way to create cxxbridges - something that uses the recommended method of cxxbridge-cmd. This function creates C++ bindings using the [cxx] crate. Original function found here: https://github.com/corrosion-rs/corrosion/blob/master/cmake/Corrosion.cmake#L1390 Reviewed By: xavierd Differential Revision: D51160627 fbshipit-source-id: c293c48ef8fabd043c1746798b6e85212d3d0f76 --- .../CMake/RustStaticLibrary.cmake | 200 ++++++++++++++++++ 1 file changed, 200 insertions(+) diff --git a/build/fbcode_builder/CMake/RustStaticLibrary.cmake b/build/fbcode_builder/CMake/RustStaticLibrary.cmake index bd1b5f96ac8a..9e4be959fb9a 100644 --- a/build/fbcode_builder/CMake/RustStaticLibrary.cmake +++ b/build/fbcode_builder/CMake/RustStaticLibrary.cmake @@ -324,3 +324,203 @@ function(install_rust_static_library TARGET) DESTINATION ${ARG_INSTALL_DIR} ) endfunction() + +# This function creates C++ bindings using the [cxx] crate. +# +# Original function found here: https://github.com/corrosion-rs/corrosion/blob/master/cmake/Corrosion.cmake#L1390 +# Simplified for use as part of RustStaticLibrary module. License below. +# +# MIT License +# +# Copyright (c) 2018 Andrew Gaspar +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# +# The rules approximately do the following: +# - Check which version of `cxx` the Rust crate depends on. +# - Check if the exact same version of `cxxbridge-cmd` is installed +# - If not, create a rule to build the exact same version of `cxxbridge-cmd`. +# - Create rules to run `cxxbridge` and generate +# - The `rust/cxx.h` header +# - A header and source file for the specified CXX_BRIDGE_FILE. +# - The generated sources (and header include directories) are added to the +# `${TARGET}` CMake library target. +# +# ```cmake +# rust_cxx_bridge( [CRATE ]) +# ``` +# +# Parameters: +# - TARGET: +# Name of the target name. The target that the bridge will be included with. +# - CXX_BRIDGE_FILE: +# Name of the file that include the cxxbridge (e.g., "src/ffi.rs"). +# - CRATE_NAME: +# Name of the crate. This parameter is optional. If unspecified, it will +# fallback to `${TARGET}`. +# +function(rust_cxx_bridge TARGET CXX_BRIDGE_FILE) + fb_cmake_parse_args(ARG "" "CRATE" "" "${ARGN}") + + if(DEFINED ARG_CRATE) + set(crate_name "${ARG_CRATE}") + else() + set(crate_name "${TARGET}") + endif() + + if(USE_CARGO_VENDOR) + set(extra_cargo_env "CARGO_HOME=${RUST_CARGO_HOME}") + endif() + + execute_process( + COMMAND + "${CMAKE_COMMAND}" -E env + ${extra_cargo_env} + "${CARGO_COMMAND}" tree -i cxx --depth=0 + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + RESULT_VARIABLE cxx_version_result + OUTPUT_VARIABLE cxx_version_output + ) + + if(NOT "${cxx_version_result}" EQUAL "0") + message(FATAL_ERROR "Crate ${crate_name} does not depend on cxx.") + endif() + if(cxx_version_output MATCHES "cxx v([0-9]+.[0-9]+.[0-9]+)") + set(cxx_required_version "${CMAKE_MATCH_1}") + else() + message( + FATAL_ERROR + "Failed to parse cxx version from cargo tree output: `cxx_version_output`") + endif() + + # First check if a suitable version of cxxbridge is installed + find_program(INSTALLED_CXXBRIDGE cxxbridge PATHS "$ENV{HOME}/.cargo/bin/") + mark_as_advanced(INSTALLED_CXXBRIDGE) + if(INSTALLED_CXXBRIDGE) + execute_process( + COMMAND "${INSTALLED_CXXBRIDGE}" --version + OUTPUT_VARIABLE cxxbridge_version_output + ) + if(cxxbridge_version_output MATCHES "cxxbridge ([0-9]+.[0-9]+.[0-9]+)") + set(cxxbridge_version "${CMAKE_MATCH_1}") + else() + set(cxxbridge_version "") + endif() + endif() + + set(cxxbridge "") + if(cxxbridge_version) + if(cxxbridge_version VERSION_EQUAL cxx_required_version) + set(cxxbridge "${INSTALLED_CXXBRIDGE}") + if(NOT TARGET "cxxbridge_v${cxx_required_version}") + # Add an empty target. + add_custom_target("cxxbridge_v${cxx_required_version}") + endif() + endif() + endif() + + # No suitable version of cxxbridge was installed, + # so use custom target to install correct version. + if(NOT cxxbridge) + if(NOT TARGET "cxxbridge_v${cxx_required_version}") + add_custom_command( + OUTPUT + "${CMAKE_BINARY_DIR}/cxxbridge_v${cxx_required_version}/bin/cxxbridge" + COMMAND + "${CMAKE_COMMAND}" -E make_directory + "${CMAKE_BINARY_DIR}/cxxbridge_v${cxx_required_version}" + COMMAND + "${CMAKE_COMMAND}" -E remove -f "${CMAKE_CURRENT_SOURCE_DIR}/Cargo.lock" + COMMAND + "${CMAKE_COMMAND}" -E env + ${extra_cargo_env} + "${CARGO_COMMAND}" install cxxbridge-cmd + --version "${cxx_required_version}" + --root "${CMAKE_BINARY_DIR}/cxxbridge_v${cxx_required_version}" + --quiet + COMMAND + "${CMAKE_COMMAND}" -E remove -f "${CMAKE_CURRENT_SOURCE_DIR}/Cargo.lock" + COMMENT "Installing cxxbridge (version ${cxx_required_version})" + ) + add_custom_target( + "cxxbridge_v${cxx_required_version}" + DEPENDS "${CMAKE_BINARY_DIR}/cxxbridge_v${cxx_required_version}/bin/cxxbridge" + ) + endif() + set( + cxxbridge + "${CMAKE_BINARY_DIR}/cxxbridge_v${cxx_required_version}/bin/cxxbridge" + ) + endif() + + add_library(${crate_name} STATIC) + target_include_directories( + ${crate_name} + PUBLIC + $ + $ + ) + + file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/rust") + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/rust/cxx.h" + COMMAND + "${cxxbridge}" --header --output "${CMAKE_CURRENT_BINARY_DIR}/rust/cxx.h" + DEPENDS "cxxbridge_v${cxx_required_version}" + COMMENT "Generating rust/cxx.h header" + ) + + get_filename_component(filename_component ${CXX_BRIDGE_FILE} NAME) + get_filename_component(directory_component ${CXX_BRIDGE_FILE} DIRECTORY) + set(directory "") + if(directory_component) + set(directory "${directory_component}") + endif() + + set(cxx_header ${directory}/${filename_component}.h) + set(cxx_source ${directory}/${filename_component}.cc) + set(rust_source_path "${CMAKE_CURRENT_SOURCE_DIR}/${CXX_BRIDGE_FILE}") + + file( + MAKE_DIRECTORY + "${CMAKE_CURRENT_BINARY_DIR}/${directory_component}" + ) + + add_custom_command( + OUTPUT + "${CMAKE_CURRENT_BINARY_DIR}/${cxx_header}" + "${CMAKE_CURRENT_BINARY_DIR}/${cxx_source}" + COMMAND + ${cxxbridge} ${rust_source_path} + --header --output "${CMAKE_CURRENT_BINARY_DIR}/${cxx_header}" + COMMAND + ${cxxbridge} ${rust_source_path} + --output "${CMAKE_CURRENT_BINARY_DIR}/${cxx_source}" + --include "${cxx_header}" + DEPENDS "cxxbridge_v${cxx_required_version}" "${rust_source_path}" + COMMENT "Generating cxx bindings for crate ${crate_name}" + ) + + target_sources(${crate_name} + PRIVATE + "${CMAKE_CURRENT_BINARY_DIR}/${cxx_header}" + "${CMAKE_CURRENT_BINARY_DIR}/rust/cxx.h" + "${CMAKE_CURRENT_BINARY_DIR}/${cxx_source}" + ) +endfunction() From 4bec06637edeb66496e53d678095fb427040b462 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 15 Nov 2023 09:33:52 -0800 Subject: [PATCH 6650/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/8ba425c72b670d6b1afffdc5872a30d041dda0f7 https://github.com/facebook/fb303/commit/49b1c46936e205f6938d0d9b53c20375f868ea9f https://github.com/facebook/fbthrift/commit/ce7e07ab232e16a7eefd17b76372e8a0ccec9b1c https://github.com/facebook/folly/commit/960d0d8eeb37d48983b9a589704ee61d457cb6dc https://github.com/facebook/litho/commit/9b20471572e8bfb1d4965139e46cfbe6549d888b https://github.com/facebook/mcrouter/commit/223584af63b5cefa84d16cb88f949e0cd620d255 https://github.com/facebook/mvfst/commit/fb6ef784bf26662703c1fa584f28460b120a9fb8 https://github.com/facebook/ocamlrep/commit/3cc5ea1393549b5528e7d864ec95b3aee30c8cbe https://github.com/facebook/proxygen/commit/1e067d515fc0ffefaad0e1a55c7771379a9f297b https://github.com/facebook/rocksdb/commit/2222caec9e0648f97b50bbcfffbd94c4f38e43b9 https://github.com/facebook/wangle/commit/459b168c25e53ba859201506bf9c1182cb6df449 https://github.com/facebook/watchman/commit/b1fa0d11983e072ce898e5d932281beda0976c32 https://github.com/facebookexperimental/edencommon/commit/c98d5f723d864ccb01b8b0f8971b5568885308d0 https://github.com/facebookexperimental/rust-shed/commit/75a4586292f13fa5843340068521a978b213df0f https://github.com/facebookincubator/fizz/commit/5a90f41ef807564c33e326457bf033336b14493b https://github.com/facebookincubator/katran/commit/06b5b4ac25ce5324d401215b501846f842ee2edc https://github.com/facebookincubator/velox/commit/c7bc0e0bbb601429196f91edad8631b5f6ba748b https://github.com/facebookresearch/multimodal/commit/4cc6e0d263a5c97ca0732add541755ef8f0d105a https://github.com/fairinternal/egohowto/commit/25b12e91cf02b4ad51379e36a2985b7882ba545f https://github.com/pytorch/fbgemm/commit/975cb0156db3f3b12280ef2198c9e972678bbb61 https://github.com/pytorch/kineto/commit/33fdaada6329b4ff2f24f12af25d177e948378b7 https://github.com/pytorch/multipy/commit/055676de4b02ef399f8c13a23cff6e901eb7d301 Reviewed By: bigfootjon fbshipit-source-id: 5dd4bb3a5ce0317ac4bc22d45d3d6a03fca2ef39 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 97df6320c07f..ffd3c2cf614a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b62fffec1c8beb213d0aeed5e4c4a5026a9e18cd +Subproject commit ce7e07ab232e16a7eefd17b76372e8a0ccec9b1c diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f7369ec637e8..beab8c93d39a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ced26fe4e6fe64738416c1569ae3692144aa419d +Subproject commit 960d0d8eeb37d48983b9a589704ee61d457cb6dc diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5c2eef0a0910..8cd4564c91b5 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 570d3bdcef5913f60046da722870ea5e5049cda2 +Subproject commit 459b168c25e53ba859201506bf9c1182cb6df449 From 44c9ca503a490ab084216ded6eaf9532953805ca Mon Sep 17 00:00:00 2001 From: David Barsky Date: Thu, 16 Nov 2023 07:31:54 -0800 Subject: [PATCH 6651/7387] clippy: prevent holding a span guard over an `.await` Summary: X-link: https://github.com/facebookresearch/Private-ID/pull/119 We should probably lint against using an `.enter()` guard over `.await` points for the reasons outlined in https://docs.rs/tracing/latest/tracing/struct.Span.html#in-asynchronous-code. Reviewed By: zertosh Differential Revision: D50528695 fbshipit-source-id: 82fcc97a83b5d820c8673e6f56794dc47fd4d77f --- clippy.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/clippy.toml b/clippy.toml index f5522e6783eb..3c34d529adbb 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1 +1,5 @@ too-many-lines-threshold = 200 +await-holding-invalid-types = [ + { path = "tracing::span::Entered", reason = "`Entered` is not aware when a function is suspended: https://docs.rs/tracing/latest/tracing/struct.Span.html#in-asynchronous-code" }, + { path = "tracing::span::EnteredSpan", reason = "`EnteredSpan` is not aware when a function is suspended: https://docs.rs/tracing/latest/tracing/struct.Span.html#in-asynchronous-code" }, +] From a1de1a06b3c26121294ef9a8386ee4f97d9de0ea Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 16 Nov 2023 09:34:41 -0800 Subject: [PATCH 6652/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/f7c904926ffe6f57ac2783d26425c3dfc3c0a9d0 https://github.com/facebook/fb303/commit/b43090b2a64a33076412ab593ee1ada5e48a7a9c https://github.com/facebook/fbthrift/commit/ffe42664aa8c2bf3cd5df4e5dacbfde6805baac7 https://github.com/facebook/folly/commit/26a2c0267a0dbf9aa461106fe60aa44e74ce3b01 https://github.com/facebook/litho/commit/23e35c62d5d4a2ec205810322d2cadb287d286a3 https://github.com/facebook/mvfst/commit/b13444210e72c96717192b036b45caf5f9b3da8d https://github.com/facebook/ocamlrep/commit/407dbc919c3f6d28613d18bb2274a2c7f3eb8b7a https://github.com/facebook/proxygen/commit/c697461a083a5c85ae0ce048ab485a3f4fd91ffb https://github.com/facebook/rocksdb/commit/9202db1867e412e51e72fc04062ca3664deb097b https://github.com/facebook/wangle/commit/11607a199593fc78c0eaaaf173d48ae4f04fe752 https://github.com/facebook/watchman/commit/4bec06637edeb66496e53d678095fb427040b462 https://github.com/facebookexperimental/edencommon/commit/2e4a55770b52d4bf8f3ed213fff4a59e9d502484 https://github.com/facebookexperimental/rust-shed/commit/d17bd97085a53e3da27b6349a6c03e9210b15e05 https://github.com/facebookincubator/fizz/commit/362148f210233958309f2c5937b6a59c3a5f271c https://github.com/facebookincubator/superconsole/commit/2802b2cb3bc634a2e11144876380c424cbfe14e2 https://github.com/facebookincubator/velox/commit/8550a15cd6463d18ce1c871708acb448a2188133 https://github.com/facebookresearch/multimodal/commit/6433f8fce39992a20eb629cff2203f27b35d6b0d https://github.com/facebookresearch/vrs/commit/e41be16d0b54d3b2a181ea93faa6430e217151e2 https://github.com/pytorch/fbgemm/commit/5da5a1626e7b34d1dfdb82ee1f9936fdc177b553 https://github.com/pytorch/kineto/commit/d1b7159f9f28c9e65c13e302e6b39879b9a6f2be Reviewed By: bigfootjon fbshipit-source-id: 46ccaac20dd1bf7e9805cf9514828150f811c5f9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ffd3c2cf614a..c92f90c8b43f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ce7e07ab232e16a7eefd17b76372e8a0ccec9b1c +Subproject commit ffe42664aa8c2bf3cd5df4e5dacbfde6805baac7 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index beab8c93d39a..fa6871287451 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 960d0d8eeb37d48983b9a589704ee61d457cb6dc +Subproject commit 26a2c0267a0dbf9aa461106fe60aa44e74ce3b01 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8cd4564c91b5..f490f36cc680 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 459b168c25e53ba859201506bf9c1182cb6df449 +Subproject commit 11607a199593fc78c0eaaaf173d48ae4f04fe752 From c3e7ce813bdd952ffc2200b43c3c11a9007e1572 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 17 Nov 2023 09:31:20 -0800 Subject: [PATCH 6653/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/e9d595d20fb62b86b432f96aefdbbdba7edbd868 https://github.com/facebook/fb303/commit/38afea6b2b1019a0d4f6e3490146f034359ed408 https://github.com/facebook/fbthrift/commit/decfb21b269d516e75c52382f61b5fd1bd2a1186 https://github.com/facebook/litho/commit/9218180ea37fe3266f4da26e6737e11a7ff5cb4e https://github.com/facebook/mvfst/commit/419d6cb54ed2a7ee5e3e4e15777b54fe745dfe65 https://github.com/facebook/ocamlrep/commit/ede708ca924aaf7ff6fa6b7f1ea20c9253949c22 https://github.com/facebook/proxygen/commit/66469d84f724ac039564bd1f0eaec66d988cfcb0 https://github.com/facebook/rocksdb/commit/2f9ea8193f641c536f4a9ada869611a06708956f https://github.com/facebook/wangle/commit/3f80520d073b10decb1efbfb1167141ca3283e7a https://github.com/facebook/watchman/commit/a1de1a06b3c26121294ef9a8386ee4f97d9de0ea https://github.com/facebookexperimental/edencommon/commit/c0fafa2ba488b81be083a615560293459e2777ea https://github.com/facebookexperimental/rust-shed/commit/8a66edcc4438b057402a6fc95fc98eb4b0e5a07b https://github.com/facebookincubator/fizz/commit/c3d011399a411c2f510a59a040c52c7fb5918969 https://github.com/facebookincubator/velox/commit/1974a00b105c053ae51610912f9863a7113413de https://github.com/pytorch/fbgemm/commit/f1bbb608d217f8089f0e678b17ee4c6b7d749d7f https://github.com/pytorch/kineto/commit/76bf290e0b068364f00667a982eb9cccd75a91c2 Reviewed By: jailby fbshipit-source-id: f069ba5be304d6731da4f7a12135cb6aab5951bf --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c92f90c8b43f..7efd976e512a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ffe42664aa8c2bf3cd5df4e5dacbfde6805baac7 +Subproject commit decfb21b269d516e75c52382f61b5fd1bd2a1186 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f490f36cc680..86e63a3d612a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 11607a199593fc78c0eaaaf173d48ae4f04fe752 +Subproject commit 3f80520d073b10decb1efbfb1167141ca3283e7a From da1cd93693a24a2e2af19e3a5cd9d84a805c0d35 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 18 Nov 2023 09:32:15 -0800 Subject: [PATCH 6654/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/b3029744ca721e4b6fec97c6b9d22f1f062b2edb https://github.com/facebook/fb303/commit/d10e7c76eb7900f05ad3dfbfeef4f59275312a10 https://github.com/facebook/fbthrift/commit/f6bd3b52d270e8fbe5539d53271a94d310411193 https://github.com/facebook/litho/commit/737dc8675da91266bd68bfe05337d6f0a10c3b8c https://github.com/facebook/mcrouter/commit/ff4e533c60ef1eff92438ac5e00606c42dcec377 https://github.com/facebook/mvfst/commit/3b2130c5c9710a6370859a22606107ef55d534ce https://github.com/facebook/proxygen/commit/01ef8ea284bf268a246798536bdcbeac06ae55a0 https://github.com/facebook/rocksdb/commit/7780e98268769a80bb611aad8ada9d4eaeeea528 https://github.com/facebook/wangle/commit/ab95051cc45f7bd317fa57521c3b94d1883e66df https://github.com/facebook/watchman/commit/c3e7ce813bdd952ffc2200b43c3c11a9007e1572 https://github.com/facebookexperimental/rust-shed/commit/c85c50363e4bdac580b2d182641036bbe748bed9 https://github.com/facebookincubator/velox/commit/460c4f1d5823f05d75dc3d162a76aab3c6007e5c https://github.com/pytorch/fbgemm/commit/92388c170c0b9b8318fbecfcad50b75a666b923f Reviewed By: bigfootjon fbshipit-source-id: 535ca909542ab59302fbcb73c4d7adde03fc36cd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7efd976e512a..72b69240c43d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit decfb21b269d516e75c52382f61b5fd1bd2a1186 +Subproject commit f6bd3b52d270e8fbe5539d53271a94d310411193 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 86e63a3d612a..0a76f7769e4b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3f80520d073b10decb1efbfb1167141ca3283e7a +Subproject commit ab95051cc45f7bd317fa57521c3b94d1883e66df From 7170681635eb17a176cfdb6633092f26899979b3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 19 Nov 2023 09:31:38 -0800 Subject: [PATCH 6655/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/9e4ee3dd8918b334c1bc588c7b019db9d35e3c2d https://github.com/facebook/fb303/commit/285d0c5c681964293c205c68e176aec585645274 https://github.com/facebook/fbthrift/commit/0d87d2068b9df8ae5b7ab21048ffeb58ba91a9ca https://github.com/facebook/proxygen/commit/577bb7d2874ce0881f5d6b625725a8cd7a25c6d5 https://github.com/facebook/watchman/commit/da1cd93693a24a2e2af19e3a5cd9d84a805c0d35 https://github.com/facebookexperimental/rust-shed/commit/58ff629228b243c2680e4f61997936df617cbf77 https://github.com/facebookincubator/velox/commit/a86cd7be888dc650391dbde771533a48e003fd07 https://github.com/pytorch/fbgemm/commit/4c0fad5aad5e0325a8bd16d6585459fd1fd557e3 Reviewed By: bigfootjon fbshipit-source-id: d6eea19beb2159e1fe5a361dfecf4a3223dde275 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 72b69240c43d..b3503ae7e701 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f6bd3b52d270e8fbe5539d53271a94d310411193 +Subproject commit 0d87d2068b9df8ae5b7ab21048ffeb58ba91a9ca From cfd99dd9087363a0718d181a5bbefa97a7b20222 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Mon, 20 Nov 2023 07:20:07 -0800 Subject: [PATCH 6656/7387] fix eden build with python 3.12 Summary: X-link: https://github.com/facebookincubator/velox/pull/7653 fix eden build with python 3.12 python 3.12 removes many long deprecated unittest features including _TextTestResult (deprecated in Python 3.2) notices as fedora 39 ships with python 3.12 X-link: https://github.com/facebook/sapling/pull/778 Differential Revision: D51455615 fbshipit-source-id: f690f14b24b2645578113f769669179fba476657 --- build/fbcode_builder/CMake/fb_py_test_main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/CMake/fb_py_test_main.py b/build/fbcode_builder/CMake/fb_py_test_main.py index 41626181b1ec..0ee1e8cc68e0 100644 --- a/build/fbcode_builder/CMake/fb_py_test_main.py +++ b/build/fbcode_builder/CMake/fb_py_test_main.py @@ -194,7 +194,7 @@ def fileno(self): return self._fileno -class BuckTestResult(unittest._TextTestResult): +class BuckTestResult(unittest.TextTestResult): """ Our own TestResult class that outputs data in a format that can be easily parsed by buck's test runner. From 616e4ee9522f481d77a75d36eb3aa57a72be218a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 20 Nov 2023 09:31:50 -0800 Subject: [PATCH 6657/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/e61499eff4cd9e62437fe1c5b5163ef4c7f2516a https://github.com/facebook/fb303/commit/f1dcb8d01b5e6c5233ad19bf047522608a1c00f2 https://github.com/facebook/fbthrift/commit/ab82b9493030971e60589bb42a1a5a761e7749ab https://github.com/facebook/folly/commit/df253704bc6aedf80c79977cb97baae2e6311800 https://github.com/facebook/litho/commit/c3b97d3fdd7711927c9bc25c5002aec9da379555 https://github.com/facebook/mvfst/commit/d4350a0987e3cfeac6ae98e3482a737ccec3e9cb https://github.com/facebook/proxygen/commit/6983dc11b2a7039bc02e4900d950236e81252d69 https://github.com/facebook/rocksdb/commit/b059c5680ed3c7252853cfe3e5a478f883959405 https://github.com/facebook/wangle/commit/51983b375f9aa59630a28564cb1e09b45852cade https://github.com/facebook/watchman/commit/cfd99dd9087363a0718d181a5bbefa97a7b20222 https://github.com/facebookexperimental/edencommon/commit/996a1a2ad5cc6306dcd921262ee30cd0f079ae43 https://github.com/facebookexperimental/rust-shed/commit/f6dae422080e17f77573cbe81d00a35f601d9cdd https://github.com/facebookincubator/fizz/commit/f045897e53320aa95a49625f0f093046390d4881 https://github.com/facebookincubator/velox/commit/ead70bc5870d1add1fdefc642b0ad5e8826409d0 https://github.com/pytorch/kineto/commit/b2db47769d97bfc3d7ad0fb7b9b43a32b3d6bc2d Reviewed By: bigfootjon fbshipit-source-id: 569b4b5bdb3aa1db0acaf3284c6491cf762630bd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b3503ae7e701..f709df4098ff 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0d87d2068b9df8ae5b7ab21048ffeb58ba91a9ca +Subproject commit ab82b9493030971e60589bb42a1a5a761e7749ab diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index fa6871287451..82cf0acfb85e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 26a2c0267a0dbf9aa461106fe60aa44e74ce3b01 +Subproject commit df253704bc6aedf80c79977cb97baae2e6311800 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0a76f7769e4b..1a06fa9c1daf 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ab95051cc45f7bd317fa57521c3b94d1883e66df +Subproject commit 51983b375f9aa59630a28564cb1e09b45852cade From 2918dbb172f887c89ef0ef533c15679480729fc4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 21 Nov 2023 09:31:10 -0800 Subject: [PATCH 6658/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/ea810d04bf81a28c22af18f7eafa458c8817b70f https://github.com/facebook/fb303/commit/9d9996f6e0aded4d9fbec05fed9e4aba1a51e978 https://github.com/facebook/fbthrift/commit/2b0df3b3587b11c342b964ec6b00faf222df3fd7 https://github.com/facebook/folly/commit/2fbd5cf24d61ed589304bd5af4ac3b19583cdd56 https://github.com/facebook/litho/commit/258a8f615fb30e051abb5a55b1a5c59bf427dfa0 https://github.com/facebook/mvfst/commit/64a6a5d50ef0529aea9eb5f2fd148521496693e1 https://github.com/facebook/ocamlrep/commit/13884064734a1391932469a6a81dcc53ce7c4e25 https://github.com/facebook/proxygen/commit/1621abd52085783c4a9d5dfbaa931dfb53e91671 https://github.com/facebook/rocksdb/commit/336a74db604f10e1a4cc5d2e480fc8a895137f69 https://github.com/facebook/wangle/commit/83d2aecc12e40d27b7b18d47f8ab328e4eb4a1af https://github.com/facebook/watchman/commit/616e4ee9522f481d77a75d36eb3aa57a72be218a https://github.com/facebookexperimental/edencommon/commit/bad71dabd4e4e73b41099bff2d0b8c97893884f3 https://github.com/facebookexperimental/rust-shed/commit/0a127d76e2ee6550fa5bacd3174363d716c9af8e https://github.com/facebookincubator/fizz/commit/6ed855a77e938dd90f8aa25419c19a79ec6c10c0 https://github.com/facebookincubator/velox/commit/42bbf8cb8ce42afc6c77d8de0490a98e9525a085 https://github.com/facebookresearch/vrs/commit/d4fb0bb63b03224f3f395100631400719ac64041 https://github.com/pytorch/fbgemm/commit/2b3f861528a9767902561c197d4bcb5bcdc9db38 https://github.com/pytorch/kineto/commit/490f305345b2c06169b02e98418645f3def47b95 Reviewed By: jailby fbshipit-source-id: 1cac0ab342ce23822be5e73bfbbfc5761c1535dd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f709df4098ff..84737f06f3d2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ab82b9493030971e60589bb42a1a5a761e7749ab +Subproject commit 2b0df3b3587b11c342b964ec6b00faf222df3fd7 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 82cf0acfb85e..c08f16cb0965 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit df253704bc6aedf80c79977cb97baae2e6311800 +Subproject commit 2fbd5cf24d61ed589304bd5af4ac3b19583cdd56 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1a06fa9c1daf..9fc99ebcf44b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 51983b375f9aa59630a28564cb1e09b45852cade +Subproject commit 83d2aecc12e40d27b7b18d47f8ab328e4eb4a1af From dd02fe980717bf1138a88a015f9f6b2243f9ae69 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Tue, 21 Nov 2023 20:33:33 -0800 Subject: [PATCH 6659/7387] fix eden fs build with GCC 13.2.1 Summary: X-link: https://github.com/facebookincubator/velox/pull/7070 fix eden fs build with GCC 13.2.1 Fixing two problems that broke builds on Fedora 38, which comes with GCC 13.2.1 * GCC 13.2.1 can't build the old rocksdb, so update the version * there was a missing include in BackingStoreType.h X-link: https://github.com/facebook/sapling/pull/748 Reviewed By: mitrandir77 Differential Revision: D50313436 Pulled By: genevievehelsel fbshipit-source-id: 970227f29641768c8314aa0537654470d097d7bf --- build/fbcode_builder/manifests/rocksdb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/build/fbcode_builder/manifests/rocksdb b/build/fbcode_builder/manifests/rocksdb index e1e3e717318f..c560663789df 100644 --- a/build/fbcode_builder/manifests/rocksdb +++ b/build/fbcode_builder/manifests/rocksdb @@ -2,8 +2,8 @@ name = rocksdb [download] -url = https://github.com/facebook/rocksdb/archive/refs/tags/v7.7.3.tar.gz -sha256 = b8ac9784a342b2e314c821f6d701148912215666ac5e9bdbccd93cf3767cb611 +url = https://github.com/facebook/rocksdb/archive/refs/tags/v8.7.3.zip +sha256 = 36c06b61dc167f2455990d60dd88d734b73aa8c4dfc095243efd0243834c6cd3 [dependencies] lz4 @@ -11,7 +11,7 @@ snappy [build] builder = cmake -subdir = rocksdb-7.7.3 +subdir = rocksdb-8.7.3 [cmake.defines] WITH_SNAPPY=ON @@ -22,10 +22,6 @@ WITH_BENCHMARK_TOOLS=OFF # and there's no clear way to make it pick the shared gflags # so just turn it off. WITH_GFLAGS=OFF -# mac pro machines don't have some of the newer features that -# rocksdb enables by default; ask it to disable their use even -# when building on new hardware -PORTABLE = ON # Disable the use of -Werror FAIL_ON_WARNINGS = OFF From f1dcd80d5b1aba75de505dc15a6f7f41092689f0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 22 Nov 2023 09:31:15 -0800 Subject: [PATCH 6660/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/3c0ef499d7405730270c0f12c200eb511ff3c949 https://github.com/facebook/fb303/commit/bf59f038d0779f034d25573c0995ae27efe5978e https://github.com/facebook/fbthrift/commit/8fd52979ec9ec02cbb5e2ccd5d699dbf4435600d https://github.com/facebook/folly/commit/fb047caf8418b9e9480374673ac60e0abdc20888 https://github.com/facebook/litho/commit/12060da5379f8deec497316e98f66704088dc8aa https://github.com/facebook/mvfst/commit/be38175ef297fbc25a1cfedf6dc426fbec571387 https://github.com/facebook/ocamlrep/commit/3d7d59db77bfbd666a1454731ee0919a4fdee5ee https://github.com/facebook/proxygen/commit/f1f0a0dd0462dea380a2fb94913fdf30bff6c968 https://github.com/facebook/rocksdb/commit/324453e5790f52557d02abf64a2dcadbaa54c8fa https://github.com/facebook/wangle/commit/ced899f034d8bb26a0fd07265ccb720a8bc41308 https://github.com/facebook/watchman/commit/dd02fe980717bf1138a88a015f9f6b2243f9ae69 https://github.com/facebookexperimental/edencommon/commit/db9350b978f913d45868d0a371265aabd9ccad6f https://github.com/facebookexperimental/rust-shed/commit/2fe60d1efd656bbeb0f5899b562910e1815c0441 https://github.com/facebookincubator/fizz/commit/f481452b48850691726f2cdd84e2f9f4ccaa936e https://github.com/facebookincubator/superconsole/commit/f3b739c98da5de291ce1ce3e70d59258d01a36c3 https://github.com/facebookincubator/velox/commit/df984bdfcda0b9cd1d14efd4e41531353c85ee85 https://github.com/facebookresearch/vrs/commit/9334e11593b6dd3e55e3ee44131146a44794367c https://github.com/pytorch/fbgemm/commit/37111f54f0b5dc4d9feca41afb1e952b6b94fd07 Reviewed By: jailby fbshipit-source-id: ec2aecce936e33c14422350500e5a19421fc8ae3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 84737f06f3d2..5cc9cf40490d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2b0df3b3587b11c342b964ec6b00faf222df3fd7 +Subproject commit 8fd52979ec9ec02cbb5e2ccd5d699dbf4435600d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index c08f16cb0965..8c5280881d58 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 2fbd5cf24d61ed589304bd5af4ac3b19583cdd56 +Subproject commit fb047caf8418b9e9480374673ac60e0abdc20888 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9fc99ebcf44b..691e7e2a8661 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 83d2aecc12e40d27b7b18d47f8ab328e4eb4a1af +Subproject commit ced899f034d8bb26a0fd07265ccb720a8bc41308 From 2248ab6f1ac719d2e7435ebe5ab12fdd6a6d6b51 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 23 Nov 2023 09:33:38 -0800 Subject: [PATCH 6661/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/41fffcbcd6d06c291a178ce95ca17e8747acceaa https://github.com/facebook/fb303/commit/5f9683faf97cd16b8456fee586dfd1e07cd9f13a https://github.com/facebook/fbthrift/commit/888293ca7f9cc20f49c8bb0ae761942fc018a317 https://github.com/facebook/litho/commit/d901859eafd89e7778bd24ed5837b34809c2ae19 https://github.com/facebook/mcrouter/commit/d855ebc2610e8e629a5e5d1ad808e8b25017e864 https://github.com/facebook/mvfst/commit/f24fc4c36003bb63561115ea4ff592ca747a4a62 https://github.com/facebook/proxygen/commit/b4d37061842a171d962a50fbaac00475d41f91e1 https://github.com/facebook/rocksdb/commit/f6fd4b9dbd15dba36f7e5ad23de407b5c26b1460 https://github.com/facebook/wangle/commit/07854051b2d6cd6a4227f631c50e00f8f4d85b3d https://github.com/facebook/watchman/commit/f1dcd80d5b1aba75de505dc15a6f7f41092689f0 https://github.com/facebookexperimental/edencommon/commit/259aa43b8a2a61f468482b866b338ac83ce9d7e5 https://github.com/facebookexperimental/rust-shed/commit/868a2b614e9c84ae217cd836b705828afdca58c4 https://github.com/facebookincubator/conversionsapi-tag-for-googletagmanager/commit/a495e1bb54b3b1fe6e7a9f10fc64aa12e8731428 https://github.com/facebookincubator/fizz/commit/0ee8dd975cdcea256065c55c5af10c484584adeb https://github.com/facebookincubator/velox/commit/04600443f9e9d93272b4d2b86db760e02a14f41d https://github.com/pytorch/fbgemm/commit/84c7b278be31ea104ae8ae86ee197edbb0103e7a Reviewed By: jailby fbshipit-source-id: f992b82a0df578a702bb97f56c90ec219b8f15ee --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5cc9cf40490d..873cdc49c0cd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8fd52979ec9ec02cbb5e2ccd5d699dbf4435600d +Subproject commit 888293ca7f9cc20f49c8bb0ae761942fc018a317 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 691e7e2a8661..730d4d03edc2 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ced899f034d8bb26a0fd07265ccb720a8bc41308 +Subproject commit 07854051b2d6cd6a4227f631c50e00f8f4d85b3d From 5666635c256ff2864a2ccd4950f1f53020b6f504 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 24 Nov 2023 09:32:07 -0800 Subject: [PATCH 6662/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/8a16fe22c055981155c300cf6b28ee6d3ee14618 https://github.com/facebook/fb303/commit/1c10925996a79be6b6eea85b1bdeda59e079387f https://github.com/facebook/fbthrift/commit/43df0e185fcc99e327c8c759a79b18e82f3b2241 https://github.com/facebook/litho/commit/ba44fb57f3213b9e9722c8cb8a9b598f0a459217 https://github.com/facebook/mvfst/commit/1498517793585fc98af2c6aed81591821fe0eac4 https://github.com/facebook/proxygen/commit/87b2b73b280aacc9b28085fa656ed74ad1443396 https://github.com/facebook/wangle/commit/f7e5fe826acb8103b662e6f3e940c804bd522c3e https://github.com/facebook/watchman/commit/2248ab6f1ac719d2e7435ebe5ab12fdd6a6d6b51 https://github.com/facebookexperimental/rust-shed/commit/683139df6352c188204309501a6acc73af5b8458 https://github.com/facebookincubator/conversionsapi-tag-for-googletagmanager/commit/78c7be8ceb3b16f0733d13c70ad0df83dd27a918 https://github.com/facebookincubator/velox/commit/409877a050f6d53dc820d2f32db8bc4ef4bf8d7f Reviewed By: jailby fbshipit-source-id: 07fa65b390dc1d6b81e569f13a5390d059fea520 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 873cdc49c0cd..bccc1f81bf3f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 888293ca7f9cc20f49c8bb0ae761942fc018a317 +Subproject commit 43df0e185fcc99e327c8c759a79b18e82f3b2241 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 730d4d03edc2..a6a3e6f0169c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 07854051b2d6cd6a4227f631c50e00f8f4d85b3d +Subproject commit f7e5fe826acb8103b662e6f3e940c804bd522c3e From a336b6df03319984e09c08bcfe25dd76fb383972 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 25 Nov 2023 09:31:11 -0800 Subject: [PATCH 6663/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/b06d9daab567d18a7659ba31e58ad6deda0808b2 https://github.com/facebook/fb303/commit/e25ff7e5959dd7624a0e5bc21608d3c949edd269 https://github.com/facebook/fbthrift/commit/909a86274e3a88c7a5c3cc844d4daeaf62d6c74f https://github.com/facebook/litho/commit/fa94647512f5236ddc3bf29969a133aad23b6b8b https://github.com/facebook/ocamlrep/commit/3f484fb230f418e005ac31276eea192447d05196 https://github.com/facebook/proxygen/commit/3179ce7a7dc1494a459cbeda33ae33a43a7b398d https://github.com/facebook/watchman/commit/5666635c256ff2864a2ccd4950f1f53020b6f504 https://github.com/facebookexperimental/rust-shed/commit/ae844d007b853735a711630979965993189e59ec https://github.com/pytorch/fbgemm/commit/b40f4197174bc470bc42ede8c8c6af432058e97a Reviewed By: jailby fbshipit-source-id: d89f77ba9cf8e39f60dc935a657e0510d224fa16 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bccc1f81bf3f..e00f3f94d916 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 43df0e185fcc99e327c8c759a79b18e82f3b2241 +Subproject commit 909a86274e3a88c7a5c3cc844d4daeaf62d6c74f From 5aeaffc2f9f728fa5e3e751d6552078fda8c4fe4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 28 Nov 2023 09:33:21 -0800 Subject: [PATCH 6664/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/115191cf019e01899b9c85e879dd4e3cfdd75a44 https://github.com/facebook/fb303/commit/5a580a6d381ed3341a61486fb4a5445caa01d66f https://github.com/facebook/fbthrift/commit/38c3c408986901c820678bd6624b182956633b08 https://github.com/facebook/litho/commit/3a6e5e0d20745068484e5506d15c9271c4a56176 https://github.com/facebook/mvfst/commit/66ccdc5fc7181a2c3b4355864283160fd5c383ac https://github.com/facebook/ocamlrep/commit/93ba2153099963603904e265bc6e2b1ff9b1f985 https://github.com/facebook/proxygen/commit/e764cb3e935ef1953e9296d6482713012713b55d https://github.com/facebook/rocksdb/commit/4d041385129b626be318610511f14344c500fc0c https://github.com/facebookincubator/fizz/commit/63e3306075f9c99fd2cd2d3ae812563ff1931381 https://github.com/facebookincubator/katran/commit/c2b212f9a2efb3d5ee28e6da7be880127bc25c57 https://github.com/facebookincubator/sks/commit/96a0d4125cad053db59aa38807c9996863c5aafb https://github.com/facebookincubator/velox/commit/93478ae956b4e86bf6deb2b5baedb7a8ca64235a https://github.com/facebookresearch/multimodal/commit/fd42096e8b90b80569948cb44dfccf2bf1bdb773 https://github.com/facebookresearch/vrs/commit/da0a9b5ba791b8338923be7e7f153f5a8a261824 https://github.com/pytorch/fbgemm/commit/035ed1f66b30ce438baf088a3c9053c0824e108e https://github.com/pytorch/kineto/commit/2c67f5859176f6dfa3c4ac1dcc26c6493cd28cad Reviewed By: zpao fbshipit-source-id: a1ebf38f2cd410b8480c1caf6ab9683633e9e1c3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e00f3f94d916..b9b99f2b6d65 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 909a86274e3a88c7a5c3cc844d4daeaf62d6c74f +Subproject commit 38c3c408986901c820678bd6624b182956633b08 From 25b15339d4d299337ad38856e4730212d8a80116 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Tue, 28 Nov 2023 21:33:29 -0800 Subject: [PATCH 6665/7387] Move sapling_backingstore_get_tree_batch to cxx_bridge Summary: X-link: https://github.com/facebookincubator/velox/pull/7781 cxx.rs provides a more ergonomic and opinionated interop layer between Rust and C++ that we would like to leverage for future API chages. This moves sapling_backingstore_get_tree_batch from the existing cbindgen implemenation to the new cxxbridge. Reviewed By: MichaelCuevas Differential Revision: D51645547 fbshipit-source-id: 0b11ea745efe02f282200fe5a325422978a1b466 --- .../CMake/RustStaticLibrary.cmake | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/build/fbcode_builder/CMake/RustStaticLibrary.cmake b/build/fbcode_builder/CMake/RustStaticLibrary.cmake index 9e4be959fb9a..e6f839bdfacb 100644 --- a/build/fbcode_builder/CMake/RustStaticLibrary.cmake +++ b/build/fbcode_builder/CMake/RustStaticLibrary.cmake @@ -363,7 +363,7 @@ endfunction() # `${TARGET}` CMake library target. # # ```cmake -# rust_cxx_bridge( [CRATE ]) +# rust_cxx_bridge( [CRATE ] [LIBS ]) # ``` # # Parameters: @@ -374,9 +374,11 @@ endfunction() # - CRATE_NAME: # Name of the crate. This parameter is optional. If unspecified, it will # fallback to `${TARGET}`. +# - LIBS [ ...]: +# A list of libraries that this library depends on. # function(rust_cxx_bridge TARGET CXX_BRIDGE_FILE) - fb_cmake_parse_args(ARG "" "CRATE" "" "${ARGN}") + fb_cmake_parse_args(ARG "" "CRATE" "LIBS" "${ARGN}") if(DEFINED ARG_CRATE) set(crate_name "${ARG_CRATE}") @@ -476,6 +478,11 @@ function(rust_cxx_bridge TARGET CXX_BRIDGE_FILE) $ $ ) + target_link_libraries( + ${crate_name} + PUBLIC + ${ARG_LIBS} + ) file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/rust") add_custom_command( @@ -517,10 +524,11 @@ function(rust_cxx_bridge TARGET CXX_BRIDGE_FILE) COMMENT "Generating cxx bindings for crate ${crate_name}" ) - target_sources(${crate_name} + target_sources( + ${crate_name} PRIVATE - "${CMAKE_CURRENT_BINARY_DIR}/${cxx_header}" - "${CMAKE_CURRENT_BINARY_DIR}/rust/cxx.h" - "${CMAKE_CURRENT_BINARY_DIR}/${cxx_source}" + "${CMAKE_CURRENT_BINARY_DIR}/${cxx_header}" + "${CMAKE_CURRENT_BINARY_DIR}/rust/cxx.h" + "${CMAKE_CURRENT_BINARY_DIR}/${cxx_source}" ) endfunction() From 242d8b42aeda84a068e6e47c5f96113f93012134 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 29 Nov 2023 09:34:08 -0800 Subject: [PATCH 6666/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/22481f9839cd7667f399dfc6f21f0af90a74a632 https://github.com/facebook/fb303/commit/2bb27b68c483d254dfd3f2b0b48b01c4ed5dbbf4 https://github.com/facebook/fbthrift/commit/897d6a3d5222c4bb63cbc5694b27d8c997a47377 https://github.com/facebook/folly/commit/94e741ce8779b850afe60f8c8058701c47fb79cb https://github.com/facebook/litho/commit/894a555c63b1b098a33e1a937012dacee2aa6eb8 https://github.com/facebook/mcrouter/commit/36197c546db4dca07331e87157ee786038c1a0c8 https://github.com/facebook/mvfst/commit/1786c8bd1f38913f28dfa7edd5c8da20b49cb9a0 https://github.com/facebook/ocamlrep/commit/779f69cb6496fb170adabd151f915c8e833da57d https://github.com/facebook/proxygen/commit/ef4c4f97f91eeb9ac386bbafe5deb70ae09d0664 https://github.com/facebook/rocksdb/commit/acc078f8784d87a4703ff5ecd04df349ef0f44b4 https://github.com/facebook/wangle/commit/971012f5ac7c74d85bd7b8c85e40b9835be60be0 https://github.com/facebook/watchman/commit/25b15339d4d299337ad38856e4730212d8a80116 https://github.com/facebookexperimental/edencommon/commit/76239b6dfb8b786533735530fb213a13ef43c6b6 https://github.com/facebookexperimental/rust-shed/commit/108bc6dca2521cc84d6ce36cd2429e3896ba98bd https://github.com/facebookincubator/fizz/commit/563fc969bfaa3c9c1e8d19f49984d25fce345eb9 https://github.com/facebookincubator/katran/commit/28f59f9d312798cf66dae1286f4c1f857709ecae https://github.com/facebookincubator/velox/commit/168cda5d431bc03067d1b66ba121d728b10b7fc1 https://github.com/facebookresearch/vrs/commit/9e1be7d4e20ac69514ed984f8e2be5d22351bdd8 https://github.com/pytorch/fbgemm/commit/c6e3fa2133197fe777fb85ae966c715641114854 Reviewed By: zpao fbshipit-source-id: 993d1a4c6a1145bdb9805c48febd108f6de241b0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b9b99f2b6d65..3da97462d865 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 38c3c408986901c820678bd6624b182956633b08 +Subproject commit 897d6a3d5222c4bb63cbc5694b27d8c997a47377 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8c5280881d58..8496d95e3b53 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit fb047caf8418b9e9480374673ac60e0abdc20888 +Subproject commit 94e741ce8779b850afe60f8c8058701c47fb79cb diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a6a3e6f0169c..cae6a2dc855e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f7e5fe826acb8103b662e6f3e940c804bd522c3e +Subproject commit 971012f5ac7c74d85bd7b8c85e40b9835be60be0 From 8dd18983880ce07e5242d789d2073aef2968aa20 Mon Sep 17 00:00:00 2001 From: Richard Barnes Date: Wed, 29 Nov 2023 16:07:33 -0800 Subject: [PATCH 6667/7387] printf -> fmt::print in files inc warm_storage/integration/ws_client/tests/CppClientTests.cpp Summary: One of our [C++ 2024 Modern Code Better Engineering Goals](https://fb.workplace.com/groups/fbcode.fyi/posts/6837863056249437) is to reduce or eliminate the use of printf in our codebase, replacing it with safer and more performant alternatives. This diff replaces `printf` with its preferred alternative: `fmt::print`. This diff was auto-generated by fbcode/scripts/rbarnes/printf_upgrader.py, please reach out to r-barnes if you see problems. - If you approve of this diff, please use the "Accept & Ship" button :-) (11 file modified.) Reviewed By: bcardosolopes Differential Revision: D51486601 fbshipit-source-id: 5825c141956e17f40183f08f833cdd73352e617e --- watchman/Options.cpp | 3 ++- watchman/main.cpp | 2 +- watchman/test/BserTest.cpp | 13 +++++++------ watchman/winbuild/susres.cpp | 14 ++++++++------ 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/watchman/Options.cpp b/watchman/Options.cpp index 2142d90c121c..281198336fcf 100644 --- a/watchman/Options.cpp +++ b/watchman/Options.cpp @@ -6,6 +6,7 @@ */ #include "watchman/Options.h" +#include #include #include "watchman/CommandRegistry.h" #include "watchman/LogConfig.h" @@ -446,7 +447,7 @@ std::vector parseOptions(int* argcp, char*** argvp) { usage(opts, stdout); } if (flags.show_version) { - printf("%s\n", PACKAGE_VERSION); + fmt::print("{}\n", PACKAGE_VERSION); exit(0); } return daemon_argv; diff --git a/watchman/main.cpp b/watchman/main.cpp index 4cbcbc3e8aa0..edcc3bff2d83 100644 --- a/watchman/main.cpp +++ b/watchman/main.cpp @@ -882,7 +882,7 @@ static bool try_client_mode_command(const Command& command, bool pretty) { client->responses.front(), stdout, pretty ? JSON_INDENT(4) : JSON_COMPACT); - printf("\n"); + fmt::print("\n"); } return res; diff --git a/watchman/test/BserTest.cpp b/watchman/test/BserTest.cpp index 07a14cad589c..699f35e2f837 100644 --- a/watchman/test/BserTest.cpp +++ b/watchman/test/BserTest.cpp @@ -6,6 +6,7 @@ */ #include "watchman/bser.h" +#include #include #include #include @@ -46,19 +47,19 @@ void hexdump(const char* start, const char* end) { if (limit > maxbytes) { limit = maxbytes; } - printf("# "); + fmt::print("# "); for (i = 0; i < limit; i++) { - printf("%02x", (int)(uint8_t)start[i]); + fmt::print("{:02x}", (int)(uint8_t)start[i]); } while (i <= maxbytes) { - printf(" "); + fmt::print(" "); i++; } - printf(" "); + fmt::print(" "); for (i = 0; i < limit; i++) { - printf("%c", isprint((uint8_t)start[i]) ? start[i] : '.'); + fmt::print("{}", isprint((uint8_t)start[i]) ? start[i] : '.'); } - printf("\n"); + fmt::print("\n"); start += limit; } } diff --git a/watchman/winbuild/susres.cpp b/watchman/winbuild/susres.cpp index dff082f36fb1..586086635b5d 100644 --- a/watchman/winbuild/susres.cpp +++ b/watchman/winbuild/susres.cpp @@ -6,6 +6,7 @@ */ #include +#include #include #include #include @@ -37,8 +38,8 @@ int apply(DWORD pid, BOOL suspend) { func = (sus_res_func)GetProcAddress(GetModuleHandle("ntdll"), name); if (!func) { - printf( - "Failed to GetProcAddress(%s): %s\n", + fmt::print( + "Failed to GetProcAddress({}): {}\n", name, win32_strerror(GetLastError())); return 1; @@ -46,15 +47,16 @@ int apply(DWORD pid, BOOL suspend) { proc = OpenProcess(PROCESS_ALL_ACCESS, FALSE, pid); if (proc == INVALID_HANDLE_VALUE) { - printf( - "Failed to OpenProcess(%d): %s\n", pid, win32_strerror(GetLastError())); + fmt::print( + "Failed to OpenProcess({}): {}\n", pid, win32_strerror(GetLastError())); return 1; } res = func(proc); if (res) { - printf("%s(%d) returns %x: %s\n", name, pid, res, win32_strerror(res)); + fmt::print( + "{}({}) returns {:x}: {}\n", name, pid, res, win32_strerror(res)); } CloseHandle(proc); @@ -63,7 +65,7 @@ int apply(DWORD pid, BOOL suspend) { } void usage() { - printf( + fmt::print( "Usage: susres suspend [pid]\n" " susres resume [pid\n"); exit(1); From 9329d0e4f4626b80fcd3a83ad4d6ac2a7c0fea8f Mon Sep 17 00:00:00 2001 From: Andres Suarez Date: Wed, 29 Nov 2023 18:35:29 -0800 Subject: [PATCH 6668/7387] Update autocargo component on FBS:master Reviewed By: dtolnay Differential Revision: D51692353 fbshipit-source-id: 44864a348711875983de81758bbe05b46ad4c604 --- watchman/cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index 19a6d4c815a1..b546d643577b 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -1,4 +1,4 @@ -# @generated by autocargo +# @generated by autocargo from //watchman/cli:cli [package] name = "watchmanctl" From 8513aa6459ba75cb2eea0ecc1c86e100bf4a8354 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 30 Nov 2023 09:31:44 -0800 Subject: [PATCH 6669/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/e10319806ad803d8083d6f49c990c33cd722b562 https://github.com/facebook/facebook360_dep/commit/a992c153214837378031e9b8cec0a83d0453a1ba https://github.com/facebook/fatal/commit/af9432600985ddbcf6131e1e4d9ce95dead1586e https://github.com/facebook/fb303/commit/86b04a4e103771cb8d13e99e4a6070e8da873c7d https://github.com/facebook/fbthrift/commit/eeda26ddf9418ae48b43f8e34c1a2caa27255a35 https://github.com/facebook/folly/commit/5cc658bb2d6cd133618766f2fa9736227794eb3c https://github.com/facebook/litho/commit/afd3fb0da1d2310c9c3dcdf32f3fc6b27e990c28 https://github.com/facebook/mcrouter/commit/c2825916942de134e5138ed2bad30d338437455d https://github.com/facebook/mvfst/commit/8c68b18df3fe43a8ffede2f62efbc6ca5823d43f https://github.com/facebook/ocamlrep/commit/f110d24d3de8ea529b5c675093a7ee23be524853 https://github.com/facebook/proxygen/commit/5c4be32814206ff34eafe178ccf4c429b3c1f12c https://github.com/facebook/rocksdb/commit/d68f45e777563018453c1506a94dc3a4f2cc7b82 https://github.com/facebook/wangle/commit/5e00d76cd8f292727b24b891f7d692f683a82b38 https://github.com/facebook/watchman/commit/9329d0e4f4626b80fcd3a83ad4d6ac2a7c0fea8f https://github.com/facebookexperimental/edencommon/commit/811f9fc7eada6482e62ced1bf0ecc0bd3001d82d https://github.com/facebookexperimental/rust-shed/commit/d4f5083abe0152c440540de669b8635fc28d5694 https://github.com/facebookincubator/fizz/commit/0ca4b77f3c72c03196df5930fc95502c13687050 https://github.com/facebookincubator/katran/commit/e5a32ccb829d16841850273af3ea8fa2ff901fb8 https://github.com/facebookincubator/velox/commit/12315553416e3c23d5ae8536f4cd07213a5648e3 https://github.com/facebookresearch/param/commit/fd5ad3aae7bfe6a28db7b0070a5135b359a8d4c0 https://github.com/facebookresearch/vrs/commit/aee93be0fbe6f1530d8f2ac8c8ddb99b25b16401 https://github.com/pytorch/fbgemm/commit/453c80e4d6f84706fef2d374cdef01aafdc3e54d https://github.com/pytorch/kineto/commit/c7aeac02222978e7673ee5381bfcaa6b60d5d69c Reviewed By: zpao fbshipit-source-id: 0cf888613beb32387e85582e34999c75bca65a9b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3da97462d865..54ba86800619 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 897d6a3d5222c4bb63cbc5694b27d8c997a47377 +Subproject commit eeda26ddf9418ae48b43f8e34c1a2caa27255a35 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8496d95e3b53..00924a7eb950 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 94e741ce8779b850afe60f8c8058701c47fb79cb +Subproject commit 5cc658bb2d6cd133618766f2fa9736227794eb3c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index cae6a2dc855e..54efdc5253be 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 971012f5ac7c74d85bd7b8c85e40b9835be60be0 +Subproject commit 5e00d76cd8f292727b24b891f7d692f683a82b38 From 55c31b0a419a547fcffdd9e4005aa18d5cedb433 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 1 Dec 2023 09:33:38 -0800 Subject: [PATCH 6670/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/f915b7e0bda01284aa989c092a007e1e0743bce8 https://github.com/facebook/fb303/commit/ce337e3351d356dadbbf0b53c55afcbf0653c79d https://github.com/facebook/fbthrift/commit/f36600230106fdd43f72bf6a51e268783d1a1f9e https://github.com/facebook/folly/commit/fe4cc82773f558eaae63aedeb1ff035246e95ae1 https://github.com/facebook/litho/commit/bd831b54c80cb55bc61de397476e8a0c4e25289e https://github.com/facebook/mvfst/commit/19475b3a063663c5d4142dc8d92859670bb2c44e https://github.com/facebook/ocamlrep/commit/147a930ed7ee660868cf010ec4a3cbfffe4a78fb https://github.com/facebook/proxygen/commit/6119642d6ffe57c1502fe1a243fa00c935ceb22c https://github.com/facebook/rocksdb/commit/b760af321fedd73163c337f184be1c626c294e19 https://github.com/facebook/wangle/commit/7a0a1a03368e4e79afbee06b1335271771edc9d8 https://github.com/facebook/watchman/commit/8513aa6459ba75cb2eea0ecc1c86e100bf4a8354 https://github.com/facebookexperimental/edencommon/commit/55a1076e4ec41c9bd900563d3177364ddc46496c https://github.com/facebookexperimental/rust-shed/commit/c00cbe1e1fb72710f03dde4aa3d9151c87ffbc90 https://github.com/facebookincubator/fizz/commit/2e49da6a6b67ea11c584ae4bb303a387113e1834 https://github.com/facebookincubator/katran/commit/2318318676646b0f15cd0fbfa88d7cf7018080aa https://github.com/facebookincubator/velox/commit/aa60e3d6401bae4d8eef1bcd3dfb42c0ad7933e3 https://github.com/facebookresearch/param/commit/8b87afd58687016f3f7904e2ebf5883de29124b5 https://github.com/facebookresearch/vrs/commit/b6193623636cbf2365c9e7a10fa18b7db2082946 https://github.com/pytorch/fbgemm/commit/0fc0d4e0bfb465a82e51f8e1e48185eacd50b632 https://github.com/pytorch/kineto/commit/1f250d4eb972ae57415ea48fee412b79585e0557 Reviewed By: zpao fbshipit-source-id: 447d3737747c4df8c64c91d6f0dcf75d2dee5772 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 54ba86800619..1a75400ea153 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit eeda26ddf9418ae48b43f8e34c1a2caa27255a35 +Subproject commit f36600230106fdd43f72bf6a51e268783d1a1f9e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 00924a7eb950..ed8a5ee269ce 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 5cc658bb2d6cd133618766f2fa9736227794eb3c +Subproject commit fe4cc82773f558eaae63aedeb1ff035246e95ae1 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 54efdc5253be..b8f2c625ee4b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5e00d76cd8f292727b24b891f7d692f683a82b38 +Subproject commit 7a0a1a03368e4e79afbee06b1335271771edc9d8 From c0630b2aa3cb47503cc775530316486de4f6c2da Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 2 Dec 2023 09:32:27 -0800 Subject: [PATCH 6671/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/67713c2ee31d854d897ce74c8b0eb17f019cc11a https://github.com/facebook/fb303/commit/a2f2bb77643eb4a2d320d7081e05e3de103e9856 https://github.com/facebook/fbthrift/commit/2eed21a30d26a18fd26fad417c56725186878bce https://github.com/facebook/folly/commit/da71502540a99c2e167c0e590f2d4093723c41b5 https://github.com/facebook/mcrouter/commit/db168f7b75308bbc10e9571fd75cc34215fc8934 https://github.com/facebook/mvfst/commit/f54f86a39686a4a466c9e6cdc83ef179ca65bed5 https://github.com/facebook/ocamlrep/commit/bc3e757513681a9ef31dd4eddbf8c32c112be699 https://github.com/facebook/proxygen/commit/0e3448a9ea1e52ba21090b9f01cfa81c19859277 https://github.com/facebook/rocksdb/commit/dce3ca5ab8e3ac93c9e2071e0be8392a52fbab23 https://github.com/facebook/squangle/commit/50bb348ebf3d413c773766fc17bebf7e03b914c2 https://github.com/facebook/wangle/commit/28454a1d96ab7b2602507142b0a6901d155667e3 https://github.com/facebook/watchman/commit/55c31b0a419a547fcffdd9e4005aa18d5cedb433 https://github.com/facebookexperimental/edencommon/commit/3f3064fdf648086d19c0d1e1172ab55031638177 https://github.com/facebookexperimental/rust-shed/commit/1519029b4f72cf8340df13a1a62575c3ccd3789a https://github.com/facebookincubator/fizz/commit/7c51f81b6c2693a7ef5316db693584405144b337 https://github.com/facebookincubator/katran/commit/50e319b68edc34331c16f75be107a421adcb5a86 https://github.com/facebookincubator/velox/commit/a80c388fbf00a95cef3f252520b396f3e787c1a4 https://github.com/pytorch/fbgemm/commit/88fc6e741bc03e09fcdc3cd365fa3aafddb7ec24 https://github.com/pytorch/kineto/commit/127df349b09425adbf46e4390b8d4d8a0154a732 Reviewed By: zpao fbshipit-source-id: a029d5673e7469b82cfbce5c68fdbc585dc268b5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1a75400ea153..ecf933e105e7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f36600230106fdd43f72bf6a51e268783d1a1f9e +Subproject commit 2eed21a30d26a18fd26fad417c56725186878bce diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ed8a5ee269ce..33f6782f3230 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit fe4cc82773f558eaae63aedeb1ff035246e95ae1 +Subproject commit da71502540a99c2e167c0e590f2d4093723c41b5 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b8f2c625ee4b..73bf13b89c3b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7a0a1a03368e4e79afbee06b1335271771edc9d8 +Subproject commit 28454a1d96ab7b2602507142b0a6901d155667e3 From 0dd966c1acd578281ad6e3b7774d3826c11d0d4b Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sat, 2 Dec 2023 13:52:50 -0800 Subject: [PATCH 6672/7387] update platform010 & platform010-aarch64 symlinks Summary: Release notes: https://blog.rust-lang.org/2023/10/05/Rust-1.73.0.html This release is coupled with an update of the `anyhow` and `thiserror` crates because the unstable standard library API for backtraces has changed. Fbcode changes: - `feature(default_free_fn)` deleted (D50300881) - `noop_method_call` lint becomes warn-by-default (D50486032, D50516201) - stronger `invalid_reference_casting` detection (D50488164) - `feature(unix_chown)` has been stabilized - `feature(provide_any)` and `std::provider` deleted - `clippy::unwrap_or_else_default` renamed to `clippy::unwrap_or_default` - type inference ambiguities (D51780425) - `nu-command` build error (D51779062) Reviewed By: AndreasBackx, shayne-fletcher Differential Revision: D50294321 fbshipit-source-id: 0fac87f6ba072ad029f9ce41ce94ed813e855b20 --- watchman/cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index b546d643577b..f9831674ed84 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] ahash = "0.8" -anyhow = "=1.0.72" +anyhow = "1.0.75" duct = "0.13.6" jwalk = "0.6" serde = { version = "1.0.185", features = ["derive", "rc"] } From 1739b31cbebdafd3665983a13dc1293c37f5554d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 3 Dec 2023 09:32:38 -0800 Subject: [PATCH 6673/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/e8abfe7809dbd499513f1958c608b5bc4c066290 https://github.com/facebook/fb303/commit/283b7842334cc8b889073375460bca017bf4392e https://github.com/facebook/fbthrift/commit/c383b5e113b0b74cb768d21bd54d51d8e1a5e964 https://github.com/facebook/folly/commit/f67559532c274fee8a84ab39d5711b422dc963a7 https://github.com/facebook/mcrouter/commit/9483e7926641ef1c8aa6164dd3cbdfe366ef4b4c https://github.com/facebook/mvfst/commit/ed0b502692f2bc0b12893ea61f747a7cc90416d6 https://github.com/facebook/ocamlrep/commit/82206d449a7f1607d4d42d34b0d1828b57ade418 https://github.com/facebook/proxygen/commit/3ca5204a00a9202d8b1613f00f7cf3650ac679a8 https://github.com/facebook/squangle/commit/96966627ca69f0649c6b0c114fbe578172e5800b https://github.com/facebook/wangle/commit/58fe85f39907a7d50b1fe5c36a08f04ac66a1160 https://github.com/facebook/watchman/commit/0dd966c1acd578281ad6e3b7774d3826c11d0d4b https://github.com/facebookexperimental/edencommon/commit/4ac3852a69a4e7aa7f049942d696c2c4830f1d8d https://github.com/facebookexperimental/rust-shed/commit/8581b27d67dd69cbcec62cbef22db75e67ad77a5 https://github.com/facebookincubator/fizz/commit/5d8e4c8b7adeb3a0eaf3bc84a56a670b7e0c9138 https://github.com/facebookincubator/katran/commit/914bb446a2f233723d4c8f37f8c483df51cb56fc https://github.com/facebookincubator/velox/commit/dd2703d6c3156b9ab0fd9d3e1e6d8423a58bb8ed Reviewed By: zpao fbshipit-source-id: 2519ac20dcafec69569a4dc4a36f859d46a0b04d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ecf933e105e7..3a9767b586b2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2eed21a30d26a18fd26fad417c56725186878bce +Subproject commit c383b5e113b0b74cb768d21bd54d51d8e1a5e964 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 33f6782f3230..e66ad095ad85 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit da71502540a99c2e167c0e590f2d4093723c41b5 +Subproject commit f67559532c274fee8a84ab39d5711b422dc963a7 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 73bf13b89c3b..48a252b29e15 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 28454a1d96ab7b2602507142b0a6901d155667e3 +Subproject commit 58fe85f39907a7d50b1fe5c36a08f04ac66a1160 From 064a7e61e6a4b3b10ea993b133a7f1dacbb09631 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 4 Dec 2023 09:34:41 -0800 Subject: [PATCH 6674/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/f2e92a452ae8b1dd0ed70b4dcb8704c0eef914c2 https://github.com/facebook/fb303/commit/4a66b191982b2eeaf9ef8f44954b04643a0f6ec7 https://github.com/facebook/fbthrift/commit/f68ab56df1141ddaf2fa16074041afc62f4078a2 https://github.com/facebook/litho/commit/0b2c9d41066e26e6248be4849ac033ac4b2610a7 https://github.com/facebook/mvfst/commit/a836ddeedb34d01aa33f0080bcee279f0d92511e https://github.com/facebook/ocamlrep/commit/a6d348e6fb1914a2921adba9839b0945afd2ffb3 https://github.com/facebook/proxygen/commit/0d1a24f52fdb707f5191bfca359eee1f01bf2b89 https://github.com/facebook/wangle/commit/3a34646bedda21d388b8f49f8f12dba0e64dbcab https://github.com/facebook/watchman/commit/1739b31cbebdafd3665983a13dc1293c37f5554d https://github.com/facebookexperimental/edencommon/commit/da443c21f304f7a912c74fa489595b47aa1b8b71 https://github.com/facebookexperimental/rust-shed/commit/c240bfab83524e06e2aba4fdf93fdd9261703c55 https://github.com/facebookincubator/fizz/commit/666553a8055f1f07434e54b6c3cf8ae324c8458c https://github.com/facebookincubator/katran/commit/df7dd408a6c2ce920ad5ef34b67a9b5bee1f5668 https://github.com/facebookincubator/velox/commit/24e58e7fdfaea68450e85844c5c0644be44907f7 https://github.com/facebookresearch/flsim/commit/ef856faccdf062870f005e3a329b6ce137a8e983 Reviewed By: zpao fbshipit-source-id: 65ccf5786cdbd5234bdb404d1efef6cc08c16266 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3a9767b586b2..5bfe5d2a23c2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c383b5e113b0b74cb768d21bd54d51d8e1a5e964 +Subproject commit f68ab56df1141ddaf2fa16074041afc62f4078a2 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 48a252b29e15..890fad04a8e5 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 58fe85f39907a7d50b1fe5c36a08f04ac66a1160 +Subproject commit 3a34646bedda21d388b8f49f8f12dba0e64dbcab From 0fd5c51ccb0657ac68ce7c0ab5c8581464f14606 Mon Sep 17 00:00:00 2001 From: Harvey Hunt Date: Mon, 4 Dec 2023 12:52:00 -0800 Subject: [PATCH 6675/7387] getdeps: Don't use system deps on CentOS for gflags and glog Summary: Building projects using `--allow-system-packages` on CentOS for projects that rely on `gflags` fails. I'm not completely sure why this is the case and myself and kmancini have spent some time trying to investigate this. Fix these builds by disabling the system packages on CentOS. Reviewed By: chadaustin Differential Revision: D51813855 fbshipit-source-id: aae48e2723fea94f088af02eace831af9e988c7c --- build/fbcode_builder/manifests/gflags | 3 --- build/fbcode_builder/manifests/glog | 3 --- 2 files changed, 6 deletions(-) diff --git a/build/fbcode_builder/manifests/gflags b/build/fbcode_builder/manifests/gflags index a2704180eb3b..a6af8ba2455d 100644 --- a/build/fbcode_builder/manifests/gflags +++ b/build/fbcode_builder/manifests/gflags @@ -17,6 +17,3 @@ BUILD_gflags_LIB = ON [debs] libgflags-dev - -[rpms] -gflags-devel diff --git a/build/fbcode_builder/manifests/glog b/build/fbcode_builder/manifests/glog index 946d3e359bc5..5c60527ed0d4 100644 --- a/build/fbcode_builder/manifests/glog +++ b/build/fbcode_builder/manifests/glog @@ -23,6 +23,3 @@ HAVE_TR1_UNORDERED_SET=OFF [debs] libgoogle-glog-dev - -[rpms] -glog-devel From 7aa28e198727506c8516ee97509f0a991b0e3387 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 5 Dec 2023 09:31:51 -0800 Subject: [PATCH 6676/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/6b792ab4dc4351f2e84ddec216c5af8cc3ef1325 https://github.com/facebook/fb303/commit/9e9d80d3bca5c06d0ad3fffade9276df8b5709fd https://github.com/facebook/fbthrift/commit/b8cdb5a9408c2539321ce62c2ac0b063633af213 https://github.com/facebook/folly/commit/c9b275e8ac978251db847818e5b8921f8649086f https://github.com/facebook/litho/commit/883d011a777492643c5cba8bc232769e38c0ebcd https://github.com/facebook/mcrouter/commit/de94b8647bb5404971403e657593cc84ff4fbd78 https://github.com/facebook/mvfst/commit/20376c1b0e15a2fbb1b8d5dbd4d56d08e6eefbec https://github.com/facebook/ocamlrep/commit/308d1e30778276e8b13e7ee7855d5225a498582b https://github.com/facebook/proxygen/commit/262523a7ffdc53adbff6ec60fcb215ab074168ed https://github.com/facebook/rocksdb/commit/2045fe4693dd8957796ccce3a4abbf3f689226b3 https://github.com/facebook/wangle/commit/26a4ebed5b876565e861b0412817c8f08e8f4322 https://github.com/facebook/watchman/commit/0fd5c51ccb0657ac68ce7c0ab5c8581464f14606 https://github.com/facebookexperimental/edencommon/commit/f0eab4143f03a1e6771a68bf0180812d6f78785d https://github.com/facebookexperimental/rust-shed/commit/6f916d7421023392d32b05fce419f2a4f3f5022c https://github.com/facebookincubator/fizz/commit/661b953302ee2c4b3b368dcd9631328dae090466 https://github.com/facebookincubator/katran/commit/19eb04d184a6f3e7b7c6ecf99d50112ffc912d55 https://github.com/facebookincubator/velox/commit/975ca3ac942472d6312b54280d8543a7b870d6b0 https://github.com/facebookresearch/vrs/commit/798e3b33d8a5ba250d448d2a94880b9595e5f763 https://github.com/pytorch/fbgemm/commit/dbc3157bf256f1339b3fa1fef2be89ac4078be0e https://github.com/pytorch/kineto/commit/e8a37135a338ec03126f49d8da554544d1a164be Reviewed By: jurajh-fb fbshipit-source-id: 50be4041086b9771484e8d3a3a6020fd59df66a9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5bfe5d2a23c2..0f57771534f4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f68ab56df1141ddaf2fa16074041afc62f4078a2 +Subproject commit b8cdb5a9408c2539321ce62c2ac0b063633af213 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e66ad095ad85..4953be6b981c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f67559532c274fee8a84ab39d5711b422dc963a7 +Subproject commit c9b275e8ac978251db847818e5b8921f8649086f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 890fad04a8e5..fc71c23b81f9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3a34646bedda21d388b8f49f8f12dba0e64dbcab +Subproject commit 26a4ebed5b876565e861b0412817c8f08e8f4322 From bd833e32a0e445d5a16ae1d3953ad348e0546ec5 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 6 Dec 2023 09:35:46 -0800 Subject: [PATCH 6677/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/b59d91e86aacd7e4e3e4553416adcddc0e775d8f https://github.com/facebook/fb303/commit/faf5a18fcff1537ae43933793f997700c04b2b5a https://github.com/facebook/fbthrift/commit/b0dc7adab25d8787348b410c7daaa6fe8e547289 https://github.com/facebook/folly/commit/4930436bc88e5527ae9f189611ed4b5cd888ba53 https://github.com/facebook/litho/commit/934b6149f1abc33de8fb8699aaad73580e1da594 https://github.com/facebook/mvfst/commit/74a9894e2c2d0c44aaea43a1b610f9ced2ac91e7 https://github.com/facebook/ocamlrep/commit/bfc6626a35d2c01e8e83495e4d1f345e6f81e5a0 https://github.com/facebook/proxygen/commit/efced439989324ca064ce4e36ac1374f71d91295 https://github.com/facebook/rocksdb/commit/0ebe1614cb657000127da2dc490fc7a2a706d2f7 https://github.com/facebook/wangle/commit/5729a6512522e637c1a2254c1855d01b039b55f8 https://github.com/facebook/watchman/commit/7aa28e198727506c8516ee97509f0a991b0e3387 https://github.com/facebookexperimental/edencommon/commit/cfe9ccf1b932a30a0721fd91b31bfc1f09001aac https://github.com/facebookexperimental/rust-shed/commit/5c6ba4d339a3f893a702a581fa474b9b0697030f https://github.com/facebookincubator/fizz/commit/dc76e0a3020ed6c6076d363f6b3e66180dc3c54d https://github.com/facebookincubator/katran/commit/6799fc6deea1cf8c335af51388faa46c79e7710e https://github.com/facebookincubator/velox/commit/2e71d8e6adeea25a98d44ea7de79ba6ebcb3b822 https://github.com/facebookresearch/multimodal/commit/fc92ceacbda410491d969d6271778721bec21063 https://github.com/facebookresearch/vrs/commit/96ec2feaed19f974dac9ce45e1123469590348c4 Reviewed By: jurajh-fb fbshipit-source-id: 8154b1831c167359580bf3d6d1cdb0328218650a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0f57771534f4..ec57c963694c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b8cdb5a9408c2539321ce62c2ac0b063633af213 +Subproject commit b0dc7adab25d8787348b410c7daaa6fe8e547289 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4953be6b981c..beca861c66a5 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c9b275e8ac978251db847818e5b8921f8649086f +Subproject commit 4930436bc88e5527ae9f189611ed4b5cd888ba53 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index fc71c23b81f9..3526197d2dcf 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 26a4ebed5b876565e861b0412817c8f08e8f4322 +Subproject commit 5729a6512522e637c1a2254c1855d01b039b55f8 From 9c3b4577834cffcf3bf8414a1be5ffce755d92f1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 7 Dec 2023 09:35:43 -0800 Subject: [PATCH 6678/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/35770f47408da30b76cdabaa0425d6095539b461 https://github.com/facebook/fb303/commit/cd824330b9044e5809da56aff30deb739e66d3de https://github.com/facebook/fbthrift/commit/c1d2d484e49d194553e72b00988ce621c704baad https://github.com/facebook/folly/commit/02849dd4bb4553dfd3a8b455dfc52379d6346429 https://github.com/facebook/litho/commit/8f664556cc301742359c20032c824df9ebe9515c https://github.com/facebook/mvfst/commit/6b242abbbb2c18b042a13e25b629f2991ba23d0e https://github.com/facebook/ocamlrep/commit/42396814151ddb35c988554fd5c4a8a70f836308 https://github.com/facebook/proxygen/commit/0b6bdecf5e7712c56958288e527331f0f9bdca7d https://github.com/facebook/rocksdb/commit/c77b50a4fdd7ff2d21909ccc436bd3d2f3f008fd https://github.com/facebook/wangle/commit/2bcbfd20045759ab6516b963ac9e72b3a705266d https://github.com/facebook/watchman/commit/bd833e32a0e445d5a16ae1d3953ad348e0546ec5 https://github.com/facebookexperimental/edencommon/commit/7b3669c4904714cf3db80045268291067d31ce13 https://github.com/facebookexperimental/rust-shed/commit/1b8965b4595bf72eb2e2333364f3e84ebb0717af https://github.com/facebookincubator/fizz/commit/1608601a8d55545ed12ac1b9ac63e25abb24854a https://github.com/facebookincubator/katran/commit/dd92140a93c0750891c034af0061fe3b2168642e https://github.com/facebookincubator/velox/commit/13d54c49dc346d472d3f174dffe74880f327ee79 https://github.com/facebookresearch/param/commit/ff88397abb20188149533a86ab3b30028a39bbaa https://github.com/facebookresearch/recipes/commit/c903bb96e6ece8989b6510784c7bc61593dc8468 https://github.com/pytorch/fbgemm/commit/a75b43fa3b4912a923f4c89b178a9c0721c553e0 Reviewed By: jurajh-fb fbshipit-source-id: 5bc8e9e2b3143811f3dc7698270d2db2b4020be5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ec57c963694c..a9fb464b245c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b0dc7adab25d8787348b410c7daaa6fe8e547289 +Subproject commit c1d2d484e49d194553e72b00988ce621c704baad diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index beca861c66a5..db90fa509324 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 4930436bc88e5527ae9f189611ed4b5cd888ba53 +Subproject commit 02849dd4bb4553dfd3a8b455dfc52379d6346429 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3526197d2dcf..042729abb9c6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5729a6512522e637c1a2254c1855d01b039b55f8 +Subproject commit 2bcbfd20045759ab6516b963ac9e72b3a705266d From 7dfc341b929f5c12324e325a60c7867d1de4be81 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 8 Dec 2023 09:33:46 -0800 Subject: [PATCH 6679/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/bcc3f62c48860f7fe867cdbd51c8a6cc507d911b https://github.com/facebook/fb303/commit/15fe35d7434a6f5e5fd74711b18609c7cf2ac8ab https://github.com/facebook/fbthrift/commit/c336f240917ff9f206a300307bfc8a6a75187bb2 https://github.com/facebook/folly/commit/77bd2cfeb61850c3630cf9308467e39d2134b0f9 https://github.com/facebook/litho/commit/3cf39e35ea682a6773f17933559618a3d844fb86 https://github.com/facebook/mvfst/commit/940570b80019535fdc2b7a2cb55460559191c195 https://github.com/facebook/ocamlrep/commit/1562395dda3a27b6dfac80d9f62b2e94fdee26fb https://github.com/facebook/proxygen/commit/022203ade3eb57bb3cf6d6005e31bbe5eb481f46 https://github.com/facebook/wangle/commit/1607d313c16e5c8d420119523756d276dfec2d2c https://github.com/facebook/watchman/commit/9c3b4577834cffcf3bf8414a1be5ffce755d92f1 https://github.com/facebookexperimental/edencommon/commit/ada98a666df4a9bee9bec66155183d0577324f36 https://github.com/facebookexperimental/rust-shed/commit/badea6c092812f10f121d5465996fd55a6d2f0d2 https://github.com/facebookincubator/fizz/commit/a0d2d975589e103a35b89080ca89053e0ff085a1 https://github.com/facebookincubator/katran/commit/ae709312129529a539b702e6f985986ca34d2566 https://github.com/facebookincubator/velox/commit/fc0538d982f1ca06af73f5c128a30cfc868673fc https://github.com/pytorch/fbgemm/commit/90e81f51a2eb12cb43688237c16d45caca8f5062 https://github.com/pytorch/kineto/commit/fea669c33474eefb93a4954cd1875203282fb382 Reviewed By: jurajh-fb fbshipit-source-id: eb2e0ee04a47286217caec635b5a34be1cb0f821 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a9fb464b245c..ab536db00acc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c1d2d484e49d194553e72b00988ce621c704baad +Subproject commit c336f240917ff9f206a300307bfc8a6a75187bb2 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index db90fa509324..4fee13a67254 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 02849dd4bb4553dfd3a8b455dfc52379d6346429 +Subproject commit 77bd2cfeb61850c3630cf9308467e39d2134b0f9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 042729abb9c6..c8f4597fd8e3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2bcbfd20045759ab6516b963ac9e72b3a705266d +Subproject commit 1607d313c16e5c8d420119523756d276dfec2d2c From a610042b90940ec4989cc9d56bb02d583260da7d Mon Sep 17 00:00:00 2001 From: Srikrishna Gopu Date: Fri, 8 Dec 2023 11:28:28 -0800 Subject: [PATCH 6680/7387] iproute2 patch file for oss Summary: As titled, create a patch file for iproute2 for iproute version 4.2. This patch will help us compile in both Centos8 and Centos9. NOTE that these changes exist in new releases of iproute and we are backporting to ensure we can compile on Centos9. Patches from 6.4: - https://github.com/iproute2/iproute2/blob/main/ip/ipmroute.c#L41 - https://github.com/iproute2/iproute2/blob/main/ip/xfrm_monitor.c#L21 Reviewed By: shri-khare Differential Revision: D51971639 fbshipit-source-id: c09f93ef9b7a891842f763b7730548f0d0e1f44b --- .../fbcode_builder/patches/iproute2_oss.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 build/fbcode_builder/patches/iproute2_oss.patch diff --git a/build/fbcode_builder/patches/iproute2_oss.patch b/build/fbcode_builder/patches/iproute2_oss.patch new file mode 100644 index 000000000000..7c478afca9ce --- /dev/null +++ b/build/fbcode_builder/patches/iproute2_oss.patch @@ -0,0 +1,36 @@ +diff --git a/bridge/fdb.c b/bridge/fdb.c +--- a/bridge/fdb.c ++++ b/bridge/fdb.c +@@ -31,7 +31,7 @@ + + static unsigned int filter_index, filter_vlan, filter_state; + +-json_writer_t *jw_global; ++static json_writer_t *jw_global; + + static void usage(void) + { +diff --git a/ip/ipmroute.c b/ip/ipmroute.c +--- a/ip/ipmroute.c ++++ b/ip/ipmroute.c +@@ -44,7 +44,7 @@ + exit(-1); + } + +-struct rtfilter { ++static struct rtfilter { + int tb; + int af; + int iif; +diff --git a/ip/xfrm_monitor.c b/ip/xfrm_monitor.c +--- a/ip/xfrm_monitor.c ++++ b/ip/xfrm_monitor.c +@@ -34,7 +34,7 @@ + #include "ip_common.h" + + static void usage(void) __attribute__((noreturn)); +-int listen_all_nsid; ++static int listen_all_nsid; + + static void usage(void) + { From 944bf8e9fe137de837e09f846dd9af8a90f18154 Mon Sep 17 00:00:00 2001 From: Srikrishna Gopu Date: Fri, 8 Dec 2023 11:28:28 -0800 Subject: [PATCH 6681/7387] remove stdint include from iproute2 builder Summary: As titled, remove stdint include from iproute2 patch from iproute2 builder. Also this include is no longer neccessary as 4.12 tc_core.c contains stdint already. Code pointer for stdint: https://github.com/iproute2/iproute2/blob/v4.12.0/tc/tc_core.c#L15 Reviewed By: shri-khare Differential Revision: D51971637 fbshipit-source-id: b9b7a2a1fe24fc93b04c932b3fe4ae6080aeab08 --- build/fbcode_builder/getdeps/builder.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 3bcadb5d6e98..e85b1107214a 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -364,27 +364,12 @@ def __init__(self, build_opts, ctx, manifest, src_dir, build_dir, inst_dir) -> N build_opts, ctx, manifest, src_dir, build_dir, inst_dir ) - def _patch(self) -> None: - # FBOSS build currently depends on an old version of iproute2 (commit - # 7ca63aef7d1b0c808da0040c6b366ef7a61f38c1). This is missing a commit - # (ae717baf15fb4d30749ada3948d9445892bac239) needed to build iproute2 - # successfully. Apply it viz.: include stdint.h - # Reference: https://fburl.com/ilx9g5xm - with open(self.build_dir + "/tc/tc_core.c", "r") as f: - data = f.read() - - with open(self.build_dir + "/tc/tc_core.c", "w") as f: - f.write("#include \n") - f.write(data) - def _build(self, install_dirs, reconfigure) -> None: configure_path = os.path.join(self.src_dir, "configure") - env = self.env.copy() self._run_cmd([configure_path], env=env) shutil.rmtree(self.build_dir) shutil.copytree(self.src_dir, self.build_dir) - self._patch() self._run_cmd(["make", "-j%s" % self.num_jobs], env=env) install_cmd = ["make", "install", "DESTDIR=" + self.inst_dir] From 418bca318ab0cfdeb5d6a1c5b68c5c457e3a8720 Mon Sep 17 00:00:00 2001 From: Srikrishna Gopu Date: Fri, 8 Dec 2023 11:28:28 -0800 Subject: [PATCH 6682/7387] ignore space when applying oss patches Summary: As titled, ignore space when applying oss patches. Certain source code will use tabs instead of spaces (for eg, iproute2) and the patch fails when applying; Reviewed By: shri-khare Differential Revision: D51971636 fbshipit-source-id: 094983d142a039428da4cd9f980d6f30ca3e50fa --- build/fbcode_builder/getdeps/builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index e85b1107214a..0aa937af6c24 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -113,7 +113,7 @@ def _apply_patchfile(self) -> None: patchfile = os.path.join( self.build_opts.fbcode_builder_dir, "patches", self.patchfile ) - patchcmd = ["git", "apply"] + patchcmd = ["git", "apply", "--ignore-space-change"] if self.patchfile_opts: patchcmd.append(self.patchfile_opts) try: From 22ae04e93731a9c476dc6d079553acd6c99f2bec Mon Sep 17 00:00:00 2001 From: Srikrishna Gopu Date: Fri, 8 Dec 2023 11:28:28 -0800 Subject: [PATCH 6683/7387] include patch file to apply for iproute2 Summary: As titled, include patch file to apply for iproute2. builder.py will looks for patchfile from the manifest and apply if a patch exists. Reviewed By: shri-khare Differential Revision: D51971638 fbshipit-source-id: d04901d3aa01b7ad6ae0e3952c1e6f30f818d431 --- build/fbcode_builder/manifests/iproute2 | 1 + 1 file changed, 1 insertion(+) diff --git a/build/fbcode_builder/manifests/iproute2 b/build/fbcode_builder/manifests/iproute2 index 6fb7f77ed9c2..f7f3e766a915 100644 --- a/build/fbcode_builder/manifests/iproute2 +++ b/build/fbcode_builder/manifests/iproute2 @@ -8,6 +8,7 @@ sha256 = 46612a1e2d01bb31932557bccdb1b8618cae9a439dfffc08ef35ed8e197f14ce [build.os=linux] builder = iproute2 subdir = iproute2-4.12.0 +patchfile = iproute2_oss.patch [build.not(os=linux)] builder = nop From 38eee2aca143f72f574f075f281367ffe9b9b8dd Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 9 Dec 2023 09:32:23 -0800 Subject: [PATCH 6684/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/2315a36d9efcec55fe7844559aec37a17605d0c5 https://github.com/facebook/fb303/commit/c8505ade3c9bbd7504d5a075b2b136b74000cb3e https://github.com/facebook/fbthrift/commit/8667fbcaa309b8483dbdaff2a0ac61c9b831a6cb https://github.com/facebook/folly/commit/357c1c77503fa6b9af7ce0afd630004809c6953f https://github.com/facebook/litho/commit/193f2f58ad0fc424a3b634fb5654bd00fb077ea0 https://github.com/facebook/mvfst/commit/198de0702ce39d0ffd259c4959c62e6c33c2ff5c https://github.com/facebook/proxygen/commit/eaf86fb15b2210d4d4dbd4b0d86ef05f1de1d1a1 https://github.com/facebook/rocksdb/commit/4f04f967427007a6ae10d9bc927a3619eed1ab34 https://github.com/facebook/wangle/commit/8d155c250cd1a7d261ef565220c3b6813cf4511e https://github.com/facebook/watchman/commit/22ae04e93731a9c476dc6d079553acd6c99f2bec https://github.com/facebookexperimental/edencommon/commit/3640654e31e5bf7afd8045ef547ea6e442fcc0b5 https://github.com/facebookexperimental/rust-shed/commit/bacc33da8a4ab1207929542f3ad0af32990021e3 https://github.com/facebookincubator/fizz/commit/6aaf0105b3a21f980a9d5ae9743690027d4238c3 https://github.com/facebookincubator/katran/commit/af2057e514dbca7d1243b28d5d461dfae61fb631 https://github.com/facebookincubator/velox/commit/60e3bd810525afb2dbbdbd8e13458177f0ff6cf8 https://github.com/facebookresearch/param/commit/ee4c17cbe1526d52ace0b2968808ca0be663267c https://github.com/pytorch/fbgemm/commit/8724d897f492e5f988d61f4d209667dbb2f6e710 Reviewed By: jurajh-fb fbshipit-source-id: f45470c9af6deec17ccf5ab489dbb19dd52088a2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ab536db00acc..f2d44cbf792a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c336f240917ff9f206a300307bfc8a6a75187bb2 +Subproject commit 8667fbcaa309b8483dbdaff2a0ac61c9b831a6cb diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4fee13a67254..32ba075557d2 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 77bd2cfeb61850c3630cf9308467e39d2134b0f9 +Subproject commit 357c1c77503fa6b9af7ce0afd630004809c6953f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c8f4597fd8e3..bf360b7a0f23 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1607d313c16e5c8d420119523756d276dfec2d2c +Subproject commit 8d155c250cd1a7d261ef565220c3b6813cf4511e From 629875e5405ffc3e6633b6d40653cc9b89e25d7b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 10 Dec 2023 09:33:46 -0800 Subject: [PATCH 6685/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/6d2f6b97214d0b934306e82c2f47ce6d3494acf3 https://github.com/facebook/fb303/commit/be16cd900e7b51417ef67949ea19745d7b65c815 https://github.com/facebook/fbthrift/commit/72fb48f6d0fb2eae37fcad80efb2c1dc62db2926 https://github.com/facebook/litho/commit/b26c8f7e62419e144f84441e72ea29ec79df24cd https://github.com/facebook/mvfst/commit/67524c3fb02061e0c20164fb18245577ad9dd6c3 https://github.com/facebook/proxygen/commit/cee513d0656d028a6326e4838f18d2d64f1ee649 https://github.com/facebook/wangle/commit/fa6a7d60380e40b25960b20781ca696b68910854 https://github.com/facebook/watchman/commit/38eee2aca143f72f574f075f281367ffe9b9b8dd https://github.com/facebookexperimental/edencommon/commit/c1e83a47bb77632b62319ad94c22a5892a17f355 https://github.com/facebookexperimental/rust-shed/commit/437866a56c48f550054fe3b479ff0d3efcc6241b https://github.com/facebookincubator/fizz/commit/ee2dc1b088cf0a6046bd0a17c524eafdd62ccf36 https://github.com/facebookincubator/katran/commit/1798f52e483c56d2b88cb0611118a22a2cb1e1c7 https://github.com/facebookincubator/velox/commit/7a9c4b957a713059862324821b5e7a7cbb5f9657 https://github.com/pytorch/fbgemm/commit/0026ddcb8a7e1bc107040f425d507ab66c3390ca Reviewed By: jurajh-fb fbshipit-source-id: 7891b0649299686e15f18fa9569dd1f7f3d0cda4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f2d44cbf792a..3dcf838d51a3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8667fbcaa309b8483dbdaff2a0ac61c9b831a6cb +Subproject commit 72fb48f6d0fb2eae37fcad80efb2c1dc62db2926 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index bf360b7a0f23..25df206f06b2 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8d155c250cd1a7d261ef565220c3b6813cf4511e +Subproject commit fa6a7d60380e40b25960b20781ca696b68910854 From d1cfb233cbc1f19de01d91f045946e975d274e22 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 11 Dec 2023 09:33:03 -0800 Subject: [PATCH 6686/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/3ed0034e52e8a1e8f09f85c0c322211ff02f74b6 https://github.com/facebook/fb303/commit/e7f30791044db08ef2c03003201b1d524e36c5dd https://github.com/facebook/fbthrift/commit/1678fba0715b526ff7f15571695f179be89eec71 https://github.com/facebook/folly/commit/72fbaa06b93b6f8aec66ba49d3479acb46ccdf16 https://github.com/facebook/litho/commit/6416e22af8bb9850703373c083902e5737f40b99 https://github.com/facebook/mvfst/commit/251f2d864090918bb509dd0631a0ea33e08349f3 https://github.com/facebook/proxygen/commit/1f0712d135b082495bb3061a553c07a0e11e57f0 https://github.com/facebook/wangle/commit/1234736f245f772e972ca8d99d6ba9889448548d https://github.com/facebook/watchman/commit/629875e5405ffc3e6633b6d40653cc9b89e25d7b https://github.com/facebookexperimental/rust-shed/commit/20165cf513f95ebfb9412981d3113bef042b79ac https://github.com/facebookincubator/katran/commit/a68081b983291c08fdcf6c4ed7bb0c6437443d73 https://github.com/facebookincubator/velox/commit/46171003ac22f8312a2a7e7ed9cec73a819e631b https://github.com/pytorch/fbgemm/commit/8f20c5df0ce5a4a90a20b44ababa263495c7f596 Reviewed By: jurajh-fb fbshipit-source-id: c3665873be2ac5f4bbdcd99548fc8ed07612cd18 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3dcf838d51a3..f269d5f1f086 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 72fb48f6d0fb2eae37fcad80efb2c1dc62db2926 +Subproject commit 1678fba0715b526ff7f15571695f179be89eec71 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 32ba075557d2..d5ed81e2623b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 357c1c77503fa6b9af7ce0afd630004809c6953f +Subproject commit 72fbaa06b93b6f8aec66ba49d3479acb46ccdf16 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 25df206f06b2..c62b34398e59 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit fa6a7d60380e40b25960b20781ca696b68910854 +Subproject commit 1234736f245f772e972ca8d99d6ba9889448548d From 14191c431ea93800c8cd54f6728f4d7efbb8a5e6 Mon Sep 17 00:00:00 2001 From: Andres Suarez Date: Mon, 11 Dec 2023 15:49:03 -0800 Subject: [PATCH 6687/7387] Add default crate information Summary: Adds basic info that every crate should have. Reviewed By: dtolnay Differential Revision: D52051107 fbshipit-source-id: 828ac6a752dbb4b419577fca08815014c8b96c42 --- watchman/cli/Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index f9831674ed84..5af5d0849b87 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -5,6 +5,8 @@ name = "watchmanctl" version = "0.1.0" authors = ["Source Control Oncall oncall+source_control@xmail.facebook.com"] edition = "2021" +repository = "https://github.com/facebook/watchman" +license = "MIT" [dependencies] ahash = "0.8" From 1054efe61f73f98effb96d437c270f8b7c84cb60 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 11 Dec 2023 16:12:03 -0800 Subject: [PATCH 6688/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/da6110eebcedfbef076b31507c2cc1a1e2dbbe71 https://github.com/facebook/fb303/commit/aa3f66c0ba265a4f24888fbb74085b37d56c3211 https://github.com/facebook/fbthrift/commit/b66b11f0ea3277077b624a7b55bc1449c0dbdfb7 https://github.com/facebook/folly/commit/b165c375cc9951f29d00f98aca3e9b203e450c0a https://github.com/facebook/litho/commit/f4d1e0518e583f941a9deb73166ebcae8a9407a6 https://github.com/facebook/mvfst/commit/d486d741ce88c5dad6cc5e34a1d366751e4911bf https://github.com/facebook/ocamlrep/commit/2d0bd37bd027dab39f3c313cc548495defcf5f69 https://github.com/facebook/proxygen/commit/dad5b4813dc1713bec415adc7d179c9814819dab https://github.com/facebook/rocksdb/commit/c96d9a0fbbfd2215e7ae88af8a13b94109a349b5 https://github.com/facebook/wangle/commit/3ef76823cb9e293dfb3499a6ac023bd694f96a64 https://github.com/facebook/watchman/commit/d1cfb233cbc1f19de01d91f045946e975d274e22 https://github.com/facebookexperimental/edencommon/commit/96b997a35a6bab6e1776549979dffdbe5599a6b0 https://github.com/facebookexperimental/rust-shed/commit/1216f788db57060715e370d8853b2fb06b8a9ed8 https://github.com/facebookincubator/fizz/commit/34a29da10757c541a4af8f20490dc9fdd8dfdb7f https://github.com/facebookincubator/katran/commit/7fa84f8081b50894247a16904e6e25cb6987e435 https://github.com/facebookincubator/phabtest_fbsource/commit/8a8a43d9ab96cf2441c9f393fd8a69caaeda9616 https://github.com/facebookincubator/velox/commit/e91cdb5b21164c0a09a665d4eb1d785261fc5f14 https://github.com/facebookresearch/param/commit/36b22e25b7fc3072e5df5d2c49bba6e929a46fd6 https://github.com/pytorch/fbgemm/commit/b4db4a7f697942ce0befb5563a6b4c6b06598067 Reviewed By: bigfootjon fbshipit-source-id: 6e892fb2c0aff0c704916677f95dfc903f7688bb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f269d5f1f086..b4572f1ccd1b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1678fba0715b526ff7f15571695f179be89eec71 +Subproject commit b66b11f0ea3277077b624a7b55bc1449c0dbdfb7 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d5ed81e2623b..6da7ebd1335a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 72fbaa06b93b6f8aec66ba49d3479acb46ccdf16 +Subproject commit b165c375cc9951f29d00f98aca3e9b203e450c0a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c62b34398e59..9ffe4f8814f9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1234736f245f772e972ca8d99d6ba9889448548d +Subproject commit 3ef76823cb9e293dfb3499a6ac023bd694f96a64 From 41aa2ee847b6ae0ea07de2373bfcc1d2c2075ff0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 12 Dec 2023 09:35:20 -0800 Subject: [PATCH 6689/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/88870706bb36483ba48227e3e787f59eab23a440 https://github.com/facebook/fb303/commit/894d35496e2102835b3ed0de08f5bf0fd227672d https://github.com/facebook/fbthrift/commit/3272afc9f80b7c7870627d845114756a074f7019 https://github.com/facebook/folly/commit/288a68b081b1698b4b35e76fc546dbe67d11ab1c https://github.com/facebook/litho/commit/25f70dc00766c0b92cb5753b389822206702c860 https://github.com/facebook/mvfst/commit/2a3d08067f433179127ba47cdc6855473a36408e https://github.com/facebook/ocamlrep/commit/bb4de65e6802b4f32a0b1961f6780a091d5468bd https://github.com/facebook/proxygen/commit/9636acc7d55f88beeee595a0f4ea2ec38fd740ff https://github.com/facebook/rocksdb/commit/c1b84d04373928e1f9557cf84c30dd20a71ad9e5 https://github.com/facebook/wangle/commit/a9247653c7f9f3df33ea945e27e881e62256259c https://github.com/facebook/watchman/commit/1054efe61f73f98effb96d437c270f8b7c84cb60 https://github.com/facebookexperimental/edencommon/commit/652fb026fde6fd7ad2cb3009f4b5a8e088d7cb5d https://github.com/facebookexperimental/rust-shed/commit/6cbbbbcd17edbda3ab5144a57b46e1a9e4a11611 https://github.com/facebookincubator/fizz/commit/e9c692acf3ecc81dae649767f426c68372ac1246 https://github.com/facebookincubator/katran/commit/e26e330efaf4dfa6446bb1260ce4024c1721931c https://github.com/facebookincubator/phabtest_fbsource/commit/dbb1ce55a5984d2a315c708d9862e4ad9f5e5d3b https://github.com/facebookincubator/velox/commit/bcb03cdb0ebedff8ea18c4428a659850df5ea037 https://github.com/pytorch/fbgemm/commit/9747336f1bfa61c300547e2ef78e666e7b37bdc1 https://github.com/pytorch/kineto/commit/330c9b4fd593a25acc7db85023b7c6199784a104 Reviewed By: bigfootjon fbshipit-source-id: 2b6e0135fea55973c1afa2ec11393ab0fc5d5013 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b4572f1ccd1b..88b9fa0554fe 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b66b11f0ea3277077b624a7b55bc1449c0dbdfb7 +Subproject commit 3272afc9f80b7c7870627d845114756a074f7019 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6da7ebd1335a..47e83284bd02 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b165c375cc9951f29d00f98aca3e9b203e450c0a +Subproject commit 288a68b081b1698b4b35e76fc546dbe67d11ab1c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9ffe4f8814f9..7443aeea3db6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3ef76823cb9e293dfb3499a6ac023bd694f96a64 +Subproject commit a9247653c7f9f3df33ea945e27e881e62256259c From f3b07b26d0a3998fc40e8f34e112c47f87bb1292 Mon Sep 17 00:00:00 2001 From: generatedunixname89002005307016 Date: Wed, 13 Dec 2023 01:58:02 -0800 Subject: [PATCH 6690/7387] upgrade pyre version in `fbcode/watchman` - batch 1 Differential Revision: D52083795 fbshipit-source-id: 13682f2a2126e64fbb2b20e8b1fc9419b01cc097 --- watchman/python/pywatchman/load.py | 7 ------- watchman/python/pywatchman/windows.py | 3 --- 2 files changed, 10 deletions(-) diff --git a/watchman/python/pywatchman/load.py b/watchman/python/pywatchman/load.py index 42644305055c..f728f6d600e3 100644 --- a/watchman/python/pywatchman/load.py +++ b/watchman/python/pywatchman/load.py @@ -60,9 +60,6 @@ def load(fp, mutable: bool = True, value_encoding=None, value_errors=None): """ buf = ctypes.create_string_buffer(8192) SNIFF_BUFFER_SIZE = len(EMPTY_HEADER) - # pyre-fixme[16]: `int` has no attribute `from_buffer`. - # pyre-fixme[58]: `*` is not supported for operand types `Type[ctypes.c_char]` - # and `int`. header = (ctypes.c_char * SNIFF_BUFFER_SIZE).from_buffer(buf) read_len = _read_bytes(fp, header) if read_len < len(header): @@ -73,8 +70,6 @@ def load(fp, mutable: bool = True, value_encoding=None, value_errors=None): if total_len > len(buf): ctypes.resize(buf, total_len) - # pyre-fixme[58]: `*` is not supported for operand types `Type[ctypes.c_char]` - # and `Any`. body = (ctypes.c_char * (total_len - len(header))).from_buffer(buf, len(header)) read_len = _read_bytes(fp, body) if read_len < len(body): @@ -82,8 +77,6 @@ def load(fp, mutable: bool = True, value_encoding=None, value_errors=None): # pyre-fixme[16]: Module `pywatchman` has no attribute `bser`. return bser.loads( - # pyre-fixme[58]: `*` is not supported for operand types - # `Type[ctypes.c_char]` and `Any`. (ctypes.c_char * total_len).from_buffer(buf, 0), mutable, value_encoding, diff --git a/watchman/python/pywatchman/windows.py b/watchman/python/pywatchman/windows.py index a15fb36fa1fc..80e53d289e5f 100644 --- a/watchman/python/pywatchman/windows.py +++ b/watchman/python/pywatchman/windows.py @@ -195,9 +195,7 @@ class WSAData64(ctypes.Structure): ("iMaxSockets", ctypes.c_ushort), ("iMaxUdpDg", ctypes.c_ushort), ("lpVendorInfo", ctypes.c_char_p), - # pyre-ignore ("szDescription", ctypes.c_ushort * WSADESCRIPTION_LEN), - # pyre-ignore ("szSystemStatus", ctypes.c_ushort * WSASYS_STATUS_LEN), ] @@ -208,7 +206,6 @@ class WSAData64(ctypes.Structure): class SOCKADDR_UN(ctypes.Structure): - # pyre-ignore _fields_ = [("sun_family", ctypes.c_ushort), ("sun_path", ctypes.c_char * 108)] From 09821f26947cd65fcbe2d18c40f2d9037ea54adf Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 13 Dec 2023 09:32:51 -0800 Subject: [PATCH 6691/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/248335be80969fb92e470c7212d77f97af51dc22 https://github.com/facebook/fb303/commit/798c8a1fd4fe2db69bbb0f0e2960e2f65e90da30 https://github.com/facebook/fbthrift/commit/22cb0b66adcb76699dbfd1a78da1029a8e7dc4c2 https://github.com/facebook/folly/commit/f8fbab2b8072b7a04375955b72267cacad814719 https://github.com/facebook/litho/commit/50f75ce829af0c57a67fb1b56cf310103107d85c https://github.com/facebook/mvfst/commit/da89bb7e2a26b92cda4bb50f80460675c80746ff https://github.com/facebook/ocamlrep/commit/8607c796e5c7b7e7b7a651b05a1f3b546344c3d4 https://github.com/facebook/proxygen/commit/c474a92b47e49374a9f9860f80daaea6c37dbc0b https://github.com/facebook/rocksdb/commit/ebb5242d559bd48c90e7a38aa9594c4b593a7031 https://github.com/facebook/wangle/commit/05bb22bf9c08d74eb43db26c06cba962c304f61c https://github.com/facebook/watchman/commit/f3b07b26d0a3998fc40e8f34e112c47f87bb1292 https://github.com/facebookexperimental/edencommon/commit/dcddc8a97895a51f015203dcf0f42ef3b4356ede https://github.com/facebookexperimental/rust-shed/commit/e6eecfb901e84f19a63595107edeb8cf88aa7a0e https://github.com/facebookincubator/fizz/commit/399dedd9444403afee3d3b66cb8a50017d903348 https://github.com/facebookincubator/katran/commit/beb04770665bb8de74029626d43fc1d2f49bdf04 https://github.com/facebookincubator/velox/commit/085c753764a143d444886b4ad71408f5c8f3e0a3 https://github.com/pytorch/fbgemm/commit/af058b0c800d5e75299ecf2acb5595b97cd3633a Reviewed By: bigfootjon fbshipit-source-id: 665553a420180d3873270817881441ee815e5724 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 88b9fa0554fe..9b7ab7e3d44b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3272afc9f80b7c7870627d845114756a074f7019 +Subproject commit 22cb0b66adcb76699dbfd1a78da1029a8e7dc4c2 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 47e83284bd02..bd9f55024e6a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 288a68b081b1698b4b35e76fc546dbe67d11ab1c +Subproject commit f8fbab2b8072b7a04375955b72267cacad814719 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7443aeea3db6..039c19094730 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a9247653c7f9f3df33ea945e27e881e62256259c +Subproject commit 05bb22bf9c08d74eb43db26c06cba962c304f61c From a0864a1d81cbe3649d64190cb65fc49178705bd0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 14 Dec 2023 09:30:50 -0800 Subject: [PATCH 6692/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/a1c7782f53692d1c4b42f45a53e36fa91c26f905 https://github.com/facebook/fb303/commit/828bba5252e51eb6b8e6e41d9e1e1ebf9f864dab https://github.com/facebook/fbthrift/commit/f05460fe2c1b0f61ae176a9a8ec444396e48a796 https://github.com/facebook/folly/commit/a25328a07d6e7824520fc6b30342839a4e24cd2c https://github.com/facebook/litho/commit/f5d6e44d2b66ca74c54c91da989da6776bf40696 https://github.com/facebook/mvfst/commit/7f3c4a0f7bbce3acf0122915f0b0e5bd2ff7e369 https://github.com/facebook/ocamlrep/commit/f4c75d940414d366cc05c57d9a68b2c8d3ce782f https://github.com/facebook/proxygen/commit/b9516ddbb70bd4f73ea4c673237659acf10764f7 https://github.com/facebook/rocksdb/commit/cd21e4e69d76ec4ec3b080c8cdae016ac2309cc5 https://github.com/facebook/wangle/commit/3b143458f1408f9fa2e08180277716f9820ba4ba https://github.com/facebook/watchman/commit/09821f26947cd65fcbe2d18c40f2d9037ea54adf https://github.com/facebookexperimental/edencommon/commit/14fa6c9ad4dafebb77a52eb8b1b33a005589d940 https://github.com/facebookexperimental/rust-shed/commit/01e301b9bc13000ce7810b340589ec4f8171f966 https://github.com/facebookincubator/fizz/commit/1923e8048c14787d6ff91262dd46f997c9328a0b https://github.com/facebookincubator/katran/commit/4c2fa30989e117de53db56cae453664117acdc80 https://github.com/facebookincubator/velox/commit/7822fe154b9d24d4e50bbc41f0c4ca5d39e2db03 https://github.com/facebookresearch/vrs/commit/169f29b3d0ec3736ffba18cd19d909929082a413 https://github.com/pytorch/fbgemm/commit/e6a246dcc1d447d63bbb5799631126f780f90f4c Reviewed By: bigfootjon fbshipit-source-id: 533620e5b07b3b4ed65ed2c1529fe758f1410bfd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9b7ab7e3d44b..76d70718c20d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 22cb0b66adcb76699dbfd1a78da1029a8e7dc4c2 +Subproject commit f05460fe2c1b0f61ae176a9a8ec444396e48a796 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index bd9f55024e6a..bd62bacbffe9 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f8fbab2b8072b7a04375955b72267cacad814719 +Subproject commit a25328a07d6e7824520fc6b30342839a4e24cd2c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 039c19094730..760ef8540bb9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 05bb22bf9c08d74eb43db26c06cba962c304f61c +Subproject commit 3b143458f1408f9fa2e08180277716f9820ba4ba From 1040199a94ea7285a284e612cc5028f9ec2eaea4 Mon Sep 17 00:00:00 2001 From: Jon Janzen Date: Thu, 14 Dec 2023 12:50:26 -0800 Subject: [PATCH 6693/7387] Remove unused manifests Summary: X-link: https://github.com/facebookincubator/velox/pull/7890 I'm investigating some deep surgery to how we do open source builds and reading a bunch of the relevant code here. I noticed that these manifests aren't used by any projects Reviewed By: chadaustin Differential Revision: D51869247 fbshipit-source-id: 5686ff80f10440c1ade271352149fd3e33645963 --- build/fbcode_builder/manifests/date | 10 ----- build/fbcode_builder/manifests/git-lfs | 12 ------ build/fbcode_builder/manifests/gnu-bash | 20 ---------- build/fbcode_builder/manifests/gnu-coreutils | 15 -------- build/fbcode_builder/manifests/gnu-grep | 15 -------- build/fbcode_builder/manifests/gnu-sed | 15 -------- build/fbcode_builder/manifests/googletest_1_8 | 18 --------- build/fbcode_builder/manifests/jq | 24 ------------ .../manifests/libbpf_0_2_0_beta | 26 ------------- build/fbcode_builder/manifests/lld | 13 ------- build/fbcode_builder/manifests/nmap | 25 ------------- build/fbcode_builder/manifests/patchelf | 17 --------- build/fbcode_builder/manifests/pcre | 20 ---------- build/fbcode_builder/manifests/python-click | 9 ----- build/fbcode_builder/manifests/python-dulwich | 19 ---------- build/fbcode_builder/manifests/sqlite3-bin | 28 -------------- build/fbcode_builder/manifests/tcl | 20 ---------- build/fbcode_builder/manifests/tree | 37 ------------------- 18 files changed, 343 deletions(-) delete mode 100644 build/fbcode_builder/manifests/date delete mode 100644 build/fbcode_builder/manifests/git-lfs delete mode 100644 build/fbcode_builder/manifests/gnu-bash delete mode 100644 build/fbcode_builder/manifests/gnu-coreutils delete mode 100644 build/fbcode_builder/manifests/gnu-grep delete mode 100644 build/fbcode_builder/manifests/gnu-sed delete mode 100644 build/fbcode_builder/manifests/googletest_1_8 delete mode 100644 build/fbcode_builder/manifests/jq delete mode 100644 build/fbcode_builder/manifests/libbpf_0_2_0_beta delete mode 100644 build/fbcode_builder/manifests/lld delete mode 100644 build/fbcode_builder/manifests/nmap delete mode 100644 build/fbcode_builder/manifests/patchelf delete mode 100644 build/fbcode_builder/manifests/pcre delete mode 100644 build/fbcode_builder/manifests/python-click delete mode 100644 build/fbcode_builder/manifests/python-dulwich delete mode 100644 build/fbcode_builder/manifests/sqlite3-bin delete mode 100644 build/fbcode_builder/manifests/tcl delete mode 100644 build/fbcode_builder/manifests/tree diff --git a/build/fbcode_builder/manifests/date b/build/fbcode_builder/manifests/date deleted file mode 100644 index 8a4e255c88fc..000000000000 --- a/build/fbcode_builder/manifests/date +++ /dev/null @@ -1,10 +0,0 @@ -[manifest] -name = date - -[download] -url = https://github.com/HowardHinnant/date/archive/refs/tags/v3.0.1.tar.gz -sha256 = 7a390f200f0ccd207e8cff6757e04817c1a0aec3e327b006b7eb451c57ee3538 - -[build] -builder = cmake -subdir = date-3.0.1 diff --git a/build/fbcode_builder/manifests/git-lfs b/build/fbcode_builder/manifests/git-lfs deleted file mode 100644 index 38a5e6aeba58..000000000000 --- a/build/fbcode_builder/manifests/git-lfs +++ /dev/null @@ -1,12 +0,0 @@ -[manifest] -name = git-lfs - -[download.os=linux] -url = https://github.com/git-lfs/git-lfs/releases/download/v2.9.1/git-lfs-linux-amd64-v2.9.1.tar.gz -sha256 = 2a8e60cf51ec45aa0f4332aa0521d60ec75c76e485d13ebaeea915b9d70ea466 - -[build] -builder = nop - -[install.files] -git-lfs = bin/git-lfs diff --git a/build/fbcode_builder/manifests/gnu-bash b/build/fbcode_builder/manifests/gnu-bash deleted file mode 100644 index 89da77ca2b70..000000000000 --- a/build/fbcode_builder/manifests/gnu-bash +++ /dev/null @@ -1,20 +0,0 @@ -[manifest] -name = gnu-bash - -[download.os=darwin] -url = https://ftp.gnu.org/gnu/bash/bash-5.1-rc1.tar.gz -sha256 = 0b2684eb1990329d499c96decfe2459f3e150deb915b0a9d03cf1be692b1d6d3 - -[build.os=darwin] -# The buildin FreeBSD bash on OSX is both outdated and incompatible with the -# modern GNU bash, so for the sake of being cross-platform friendly this -# manifest provides GNU bash. -# NOTE: This is the 5.1-rc1 version, which is almost the same as what Homebrew -# uses (Homebrew installs 5.0 with the 18 patches that in fact make the 5.1-rc1 -# version). -builder = autoconf -subdir = bash-5.1-rc1 -build_in_src_dir = true - -[build.not(os=darwin)] -builder = nop diff --git a/build/fbcode_builder/manifests/gnu-coreutils b/build/fbcode_builder/manifests/gnu-coreutils deleted file mode 100644 index 1ab4d9d4a5a5..000000000000 --- a/build/fbcode_builder/manifests/gnu-coreutils +++ /dev/null @@ -1,15 +0,0 @@ -[manifest] -name = gnu-coreutils - -[download.os=darwin] -url = https://ftp.gnu.org/gnu/coreutils/coreutils-8.32.tar.gz -sha256 = d5ab07435a74058ab69a2007e838be4f6a90b5635d812c2e26671e3972fca1b8 - -[build.os=darwin] -# The buildin FreeBSD version incompatible with the GNU one, so for the sake of -# being cross-platform friendly this manifest provides the GNU version. -builder = autoconf -subdir = coreutils-8.32 - -[build.not(os=darwin)] -builder = nop diff --git a/build/fbcode_builder/manifests/gnu-grep b/build/fbcode_builder/manifests/gnu-grep deleted file mode 100644 index e6a163d37a84..000000000000 --- a/build/fbcode_builder/manifests/gnu-grep +++ /dev/null @@ -1,15 +0,0 @@ -[manifest] -name = gnu-grep - -[download.os=darwin] -url = https://ftp.gnu.org/gnu/grep/grep-3.5.tar.gz -sha256 = 9897220992a8fd38a80b70731462defa95f7ff2709b235fb54864ddd011141dd - -[build.os=darwin] -# The buildin FreeBSD version incompatible with the GNU one, so for the sake of -# being cross-platform friendly this manifest provides the GNU version. -builder = autoconf -subdir = grep-3.5 - -[build.not(os=darwin)] -builder = nop diff --git a/build/fbcode_builder/manifests/gnu-sed b/build/fbcode_builder/manifests/gnu-sed deleted file mode 100644 index 9b458df6ef98..000000000000 --- a/build/fbcode_builder/manifests/gnu-sed +++ /dev/null @@ -1,15 +0,0 @@ -[manifest] -name = gnu-sed - -[download.os=darwin] -url = https://ftp.gnu.org/gnu/sed/sed-4.8.tar.gz -sha256 = 53cf3e14c71f3a149f29d13a0da64120b3c1d3334fba39c4af3e520be053982a - -[build.os=darwin] -# The buildin FreeBSD version incompatible with the GNU one, so for the sake of -# being cross-platform friendly this manifest provides the GNU version. -builder = autoconf -subdir = sed-4.8 - -[build.not(os=darwin)] -builder = nop diff --git a/build/fbcode_builder/manifests/googletest_1_8 b/build/fbcode_builder/manifests/googletest_1_8 deleted file mode 100644 index 76c0ce51f9eb..000000000000 --- a/build/fbcode_builder/manifests/googletest_1_8 +++ /dev/null @@ -1,18 +0,0 @@ -[manifest] -name = googletest_1_8 - -[download] -url = https://github.com/google/googletest/archive/release-1.8.0.tar.gz -sha256 = 58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8 - -[build] -builder = cmake -subdir = googletest-release-1.8.0 - -[cmake.defines] -# Everything else defaults to the shared runtime, so tell gtest that -# it should not use its choice of the static runtime -gtest_force_shared_crt=ON - -[cmake.defines.os=windows] -BUILD_SHARED_LIBS=ON diff --git a/build/fbcode_builder/manifests/jq b/build/fbcode_builder/manifests/jq deleted file mode 100644 index 231818f343e9..000000000000 --- a/build/fbcode_builder/manifests/jq +++ /dev/null @@ -1,24 +0,0 @@ -[manifest] -name = jq - -[rpms] -jq - -[debs] -jq - -[download.not(os=windows)] -url = https://github.com/stedolan/jq/releases/download/jq-1.5/jq-1.5.tar.gz -sha256 = c4d2bfec6436341113419debf479d833692cc5cdab7eb0326b5a4d4fbe9f493c - -[build.not(os=windows)] -builder = autoconf -subdir = jq-1.5 - -[build.os=windows] -builder = nop - -[autoconf.args] -# This argument turns off some developers tool and it is recommended in jq's -# README ---disable-maintainer-mode diff --git a/build/fbcode_builder/manifests/libbpf_0_2_0_beta b/build/fbcode_builder/manifests/libbpf_0_2_0_beta deleted file mode 100644 index 072639817d76..000000000000 --- a/build/fbcode_builder/manifests/libbpf_0_2_0_beta +++ /dev/null @@ -1,26 +0,0 @@ -[manifest] -name = libbpf_0_2_0_beta - -[download] -url = https://github.com/libbpf/libbpf/archive/b6dd2f2.tar.gz -sha256 = 8db9dca90f5c445ef2362e3c6a00f3d6c4bf36e8782f8e27704109c78e541497 - -# BPF only builds on linux, so make it a NOP on other platforms -[build.not(os=linux)] -builder = nop - -[build.os=linux] -builder = make -subdir = libbpf-b6dd2f2b7df4d3bd35d64aaf521d9ad18d766f53/src - -[make.build_args] -BUILD_STATIC_ONLY=y - -# libbpf now requires uapi headers >= 5.8 -[make.install_args] -install -install_uapi_headers -BUILD_STATIC_ONLY=y - -[dependencies] -libelf diff --git a/build/fbcode_builder/manifests/lld b/build/fbcode_builder/manifests/lld deleted file mode 100644 index 39f5b095213e..000000000000 --- a/build/fbcode_builder/manifests/lld +++ /dev/null @@ -1,13 +0,0 @@ -[manifest] -name = lld - -[debs] -lld - -[rpms] -lld - -# We use the system lld where needed on linux and default linker elsewhere -[build] -builder = nop - diff --git a/build/fbcode_builder/manifests/nmap b/build/fbcode_builder/manifests/nmap deleted file mode 100644 index c245e12417be..000000000000 --- a/build/fbcode_builder/manifests/nmap +++ /dev/null @@ -1,25 +0,0 @@ -[manifest] -name = nmap - -[rpms] -nmap - -[debs] -nmap - -[download.not(os=windows)] -url = https://api.github.com/repos/nmap/nmap/tarball/ef8213a36c2e89233c806753a57b5cd473605408 -sha256 = eda39e5a8ef4964fac7db16abf91cc11ff568eac0fa2d680b0bfa33b0ed71f4a - -[build.not(os=windows)] -builder = autoconf -subdir = nmap-nmap-ef8213a -build_in_src_dir = true - -[build.os=windows] -builder = nop - -[autoconf.args] -# Without this option the build was filing to find some third party libraries -# that we don't need -enable_rdma=no diff --git a/build/fbcode_builder/manifests/patchelf b/build/fbcode_builder/manifests/patchelf deleted file mode 100644 index f9d050424a29..000000000000 --- a/build/fbcode_builder/manifests/patchelf +++ /dev/null @@ -1,17 +0,0 @@ -[manifest] -name = patchelf - -[rpms] -patchelf - -[debs] -patchelf - -[download] -url = https://github.com/NixOS/patchelf/archive/0.10.tar.gz -sha256 = b3cb6bdedcef5607ce34a350cf0b182eb979f8f7bc31eae55a93a70a3f020d13 - -[build] -builder = autoconf -subdir = patchelf-0.10 - diff --git a/build/fbcode_builder/manifests/pcre b/build/fbcode_builder/manifests/pcre deleted file mode 100644 index 047f6352b271..000000000000 --- a/build/fbcode_builder/manifests/pcre +++ /dev/null @@ -1,20 +0,0 @@ -[manifest] -name = pcre - -[homebrew] -pcre - -[rpms] -pcre-devel -pcre-static - -[debs] -libpcre3-dev - -[download] -url = https://versaweb.dl.sourceforge.net/project/pcre/pcre/8.43/pcre-8.43.tar.gz -sha256 = 0b8e7465dc5e98c757cc3650a20a7843ee4c3edf50aaf60bb33fd879690d2c73 - -[build] -builder = cmake -subdir = pcre-8.43 diff --git a/build/fbcode_builder/manifests/python-click b/build/fbcode_builder/manifests/python-click deleted file mode 100644 index ea9a9d2d3dc3..000000000000 --- a/build/fbcode_builder/manifests/python-click +++ /dev/null @@ -1,9 +0,0 @@ -[manifest] -name = python-click - -[download] -url = https://files.pythonhosted.org/packages/d2/3d/fa76db83bf75c4f8d338c2fd15c8d33fdd7ad23a9b5e57eb6c5de26b430e/click-7.1.2-py2.py3-none-any.whl -sha256 = dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc - -[build] -builder = python-wheel diff --git a/build/fbcode_builder/manifests/python-dulwich b/build/fbcode_builder/manifests/python-dulwich deleted file mode 100644 index 0d995e12f4b3..000000000000 --- a/build/fbcode_builder/manifests/python-dulwich +++ /dev/null @@ -1,19 +0,0 @@ -[manifest] -name = python-dulwich - -# The below links point to custom github forks of project dulwich, because the -# 0.18.6 version didn't have an official rollout of wheel packages. - -[download.os=linux] -url = https://github.com/lukaspiatkowski/dulwich/releases/download/dulwich-0.18.6-wheel/dulwich-0.18.6-cp36-cp36m-linux_x86_64.whl -sha256 = e96f545f3d003e67236785473caaba2c368e531ea85fd508a3bd016ebac3a6d8 - -[download.os=darwin] -url = https://github.com/lukaspiatkowski/dulwich/releases/download/dulwich-0.18.6-wheel/dulwich-0.18.6-cp37-cp37m-macosx_10_14_x86_64.whl -sha256 = 8373652056284ad40ea5220b659b3489b0a91f25536322345a3e4b5d29069308 - -[build.not(os=windows)] -builder = python-wheel - -[build.os=windows] -builder = nop diff --git a/build/fbcode_builder/manifests/sqlite3-bin b/build/fbcode_builder/manifests/sqlite3-bin deleted file mode 100644 index aa138d499d6b..000000000000 --- a/build/fbcode_builder/manifests/sqlite3-bin +++ /dev/null @@ -1,28 +0,0 @@ -[manifest] -name = sqlite3-bin - -[rpms] -sqlite - -[debs] -sqlite3 - -[download.os=linux] -url = https://github.com/sqlite/sqlite/archive/version-3.33.0.tar.gz -sha256 = 48e5f989eefe9af0ac758096f82ead0f3c7b58118ac17cc5810495bd5084a331 - -[build.os=linux] -builder = autoconf -subdir = sqlite-version-3.33.0 - -[build.not(os=linux)] -# MacOS comes with sqlite3 preinstalled and don't need Windows here -builder = nop - -[dependencies.os=linux] -tcl - -[autoconf.args] -# This flag disabled tcl as a runtime library used for some functionality, -# but tcl is still a required dependency as it is used by the build files ---disable-tcl diff --git a/build/fbcode_builder/manifests/tcl b/build/fbcode_builder/manifests/tcl deleted file mode 100644 index 5e9892f37a6d..000000000000 --- a/build/fbcode_builder/manifests/tcl +++ /dev/null @@ -1,20 +0,0 @@ -[manifest] -name = tcl - -[rpms] -tcl - -[debs] -tcl - -[download] -url = https://github.com/tcltk/tcl/archive/core-8-7a3.tar.gz -sha256 = 22d748f0c9652f3ecc195fed3f24a1b6eea8d449003085e6651197951528982e - -[build.os=linux] -builder = autoconf -subdir = tcl-core-8-7a3/unix - -[build.not(os=linux)] -# This is for sqlite3 on Linux for now -builder = nop diff --git a/build/fbcode_builder/manifests/tree b/build/fbcode_builder/manifests/tree deleted file mode 100644 index ccd0180a74c0..000000000000 --- a/build/fbcode_builder/manifests/tree +++ /dev/null @@ -1,37 +0,0 @@ -[manifest] -name = tree - -[debs] -tree - -[homebrew] -tree - -[rpms] -tree - -[download.os=linux] -url = https://salsa.debian.org/debian/tree-packaging/-/archive/debian/1.8.0-1/tree-packaging-debian-1.8.0-1.tar.gz -sha256 = a841eee1d52bfd64a48f54caab9937b9bd92935055c48885c4ab1ae4dab7fae5 - -[download.os=darwin] -# The official package of tree source requires users of non-Linux platform to -# comment/uncomment certain lines in the Makefile to build for their platform. -# Besauce getdeps.py doesn't have that functionality we just use this custom -# fork of tree which has proper lines uncommented for a OSX build -url = https://github.com/lukaspiatkowski/tree-command/archive/debian/1.8.0-1-macos.tar.gz -sha256 = 9cbe889553d95cf5a2791dd0743795d46a3c092c5bba691769c0e5c52e11229e - -[build.os=linux] -builder = make -subdir = tree-packaging-debian-1.8.0-1 - -[build.os=darwin] -builder = make -subdir = tree-command-debian-1.8.0-1-macos - -[build.os=windows] -builder = nop - -[make.install_args] -install From f817dd703e0e99f0a078aba6fb2944d75b66d4da Mon Sep 17 00:00:00 2001 From: Jon Janzen Date: Thu, 14 Dec 2023 17:20:27 -0800 Subject: [PATCH 6694/7387] Restore patchelf (deleted in D51869247) Summary: X-link: https://github.com/facebookincubator/zstrong/pull/651 Ooops apparently patchelf is a coredep in getdeps: https://github.com/facebookincubator/katran/actions/runs/7214446185/job/19656572548?fbclid=IwAR0VRdoIxZKlcW-M_efD3UUUc2PqcqxeTgUAD9og658VOb-Wkwao8PO7xvw Reviewed By: chadaustin Differential Revision: D52179699 fbshipit-source-id: d946dc0759c493b1da40fabdf3cc497cbf85265d --- build/fbcode_builder/manifests/patchelf | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 build/fbcode_builder/manifests/patchelf diff --git a/build/fbcode_builder/manifests/patchelf b/build/fbcode_builder/manifests/patchelf new file mode 100644 index 000000000000..f9d050424a29 --- /dev/null +++ b/build/fbcode_builder/manifests/patchelf @@ -0,0 +1,17 @@ +[manifest] +name = patchelf + +[rpms] +patchelf + +[debs] +patchelf + +[download] +url = https://github.com/NixOS/patchelf/archive/0.10.tar.gz +sha256 = b3cb6bdedcef5607ce34a350cf0b182eb979f8f7bc31eae55a93a70a3f020d13 + +[build] +builder = autoconf +subdir = patchelf-0.10 + From 9815857c9ec30e112f33e1a2f0b2103660de7ff9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 15 Dec 2023 09:31:17 -0800 Subject: [PATCH 6695/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/7fd41080c457c62e5b6c992319bd289b15b4f09b https://github.com/facebook/fb303/commit/14dc9edd301eaf5c3cf2f0f3e81d7dda73fb476b https://github.com/facebook/fbthrift/commit/a35c177830e9f228ba1f038a454ffdc81da56ac2 https://github.com/facebook/folly/commit/d2f3dc0dd754d2134c8a988f12e0dcd2f84a09b3 https://github.com/facebook/litho/commit/b2f006ee8ba91bd00f57f5a5a7108d13e26b24a4 https://github.com/facebook/mcrouter/commit/49f7a920ed28fae30cc319fb373ef44a57d4ee00 https://github.com/facebook/mvfst/commit/0fbe50d49fe2408045b431cd2561ff763aacdf59 https://github.com/facebook/ocamlrep/commit/5b722ffd177cba38e8f6e37e165f495278d9c5df https://github.com/facebook/proxygen/commit/bdc8f102f93d816dc15901a4fbc5fa4949a5efb0 https://github.com/facebook/rocksdb/commit/88bc91f3cc2b492b8a45ba2c49650f527df97ad8 https://github.com/facebook/wangle/commit/82a6ab450e8f8a57c9f402927e4f33677c8c7e46 https://github.com/facebook/watchman/commit/f817dd703e0e99f0a078aba6fb2944d75b66d4da https://github.com/facebookexperimental/edencommon/commit/8c6331315d6c602355c71e4505e360dac7ebcd47 https://github.com/facebookexperimental/rust-shed/commit/54d3e05623852b5b54c260a95a2a52eb4bd4d0cd https://github.com/facebookincubator/fizz/commit/60286f6f2e420f8bb8fc9c77cbcde92643890e9b https://github.com/facebookincubator/katran/commit/fddbf704e36bb6db359511d90b64e642d64aa38d https://github.com/facebookincubator/velox/commit/4a718cfb600e6b255c63efbdb25a8d139b36a435 https://github.com/facebookresearch/vrs/commit/224deb44f0aaa1acf220eac1b853b62ecdcdf940 https://github.com/pytorch/fbgemm/commit/25f5ed5d1ec64329d64b4efd43b844a04482ac48 Reviewed By: bigfootjon fbshipit-source-id: eba51fbbdcd78f6c9f24e8b86b3f764009b6f132 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 76d70718c20d..317686baef2d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f05460fe2c1b0f61ae176a9a8ec444396e48a796 +Subproject commit a35c177830e9f228ba1f038a454ffdc81da56ac2 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index bd62bacbffe9..ce52e56886c8 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a25328a07d6e7824520fc6b30342839a4e24cd2c +Subproject commit d2f3dc0dd754d2134c8a988f12e0dcd2f84a09b3 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 760ef8540bb9..79edbd18b69a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3b143458f1408f9fa2e08180277716f9820ba4ba +Subproject commit 82a6ab450e8f8a57c9f402927e4f33677c8c7e46 From 26e4fdddfaade0423db000f1ec2206fae290934b Mon Sep 17 00:00:00 2001 From: Jon Janzen Date: Fri, 15 Dec 2023 16:26:31 -0800 Subject: [PATCH 6696/7387] Remove archived/deleted/duplicate manifests Summary: X-link: https://github.com/facebookincubator/zstrong/pull/650 X-link: https://github.com/facebookincubator/velox/pull/7891 In the previous diff I excluded manifests that appeared to be "top level" configs used in ShipIt-synced projects. Now I took a deeper look at those configs and they also appear dead for one of two reasons: 1. Project is archived or deleted on GitHub 2. Project is a duplicate of a non `-source` manifest Reviewed By: chadaustin Differential Revision: D51869329 fbshipit-source-id: 2e53efa397dd902a2175cffcb990580e0741942f --- build/fbcode_builder/manifests/delos_core | 25 ---------------- build/fbcode_builder/manifests/f4d | 30 ------------------- build/fbcode_builder/manifests/fb303-source | 19 ------------ .../fbcode_builder/manifests/fbthrift-source | 21 ------------- build/fbcode_builder/manifests/fbzmq | 29 ------------------ build/fbcode_builder/manifests/libicu | 19 ------------ build/fbcode_builder/manifests/libzmq | 27 ----------------- build/fbcode_builder/manifests/lzo | 22 -------------- build/fbcode_builder/manifests/protobuf | 18 ----------- 9 files changed, 210 deletions(-) delete mode 100644 build/fbcode_builder/manifests/delos_core delete mode 100644 build/fbcode_builder/manifests/f4d delete mode 100644 build/fbcode_builder/manifests/fb303-source delete mode 100644 build/fbcode_builder/manifests/fbthrift-source delete mode 100644 build/fbcode_builder/manifests/fbzmq delete mode 100644 build/fbcode_builder/manifests/libicu delete mode 100644 build/fbcode_builder/manifests/libzmq delete mode 100644 build/fbcode_builder/manifests/lzo delete mode 100644 build/fbcode_builder/manifests/protobuf diff --git a/build/fbcode_builder/manifests/delos_core b/build/fbcode_builder/manifests/delos_core deleted file mode 100644 index 1de6c3342df4..000000000000 --- a/build/fbcode_builder/manifests/delos_core +++ /dev/null @@ -1,25 +0,0 @@ -[manifest] -name = delos_core -fbsource_path = fbcode/delos_core -shipit_project = delos_core -shipit_fbcode_builder = true - -[git] -repo_url = https://github.com/facebookincubator/delos_core.git - -[build.os=linux] -builder = cmake - -[build.not(os=linux)] -builder = nop - -[dependencies] -glog -googletest -folly -fbthrift -fb303 -re2 - -[shipit.pathmap] -fbcode/delos_core = . diff --git a/build/fbcode_builder/manifests/f4d b/build/fbcode_builder/manifests/f4d deleted file mode 100644 index 2f3db2595acb..000000000000 --- a/build/fbcode_builder/manifests/f4d +++ /dev/null @@ -1,30 +0,0 @@ -[manifest] -name = f4d -fbsource_path = fbcode/f4d -shipit_project = f4d -shipit_fbcode_builder = true - -[git] -repo_url = https://github.com/facebookexternal/f4d.git -rev = master - -[build.os=windows] -builder = nop - -[build.not(os=windows)] -builder = cmake - -[dependencies] -double-conversion -folly -glog -googletest -boost -protobuf -lzo -libicu -re2 - -[shipit.pathmap] -fbcode/f4d/public_tld = . -fbcode/f4d = f4d diff --git a/build/fbcode_builder/manifests/fb303-source b/build/fbcode_builder/manifests/fb303-source deleted file mode 100644 index d62ce3b00325..000000000000 --- a/build/fbcode_builder/manifests/fb303-source +++ /dev/null @@ -1,19 +0,0 @@ -[manifest] -name = fb303-source -fbsource_path = fbcode/fb303 -shipit_project = fb303 -shipit_fbcode_builder = false - -[git] -repo_url = https://github.com/facebook/fb303.git - -[build] -builder = nop - -[shipit.pathmap] -fbcode/fb303/github = . -fbcode/fb303/public_autocargo = fb303 -fbcode/fb303 = fb303 - -[shipit.strip] -^fbcode/fb303/(?!public_autocargo).+/Cargo\.toml$ diff --git a/build/fbcode_builder/manifests/fbthrift-source b/build/fbcode_builder/manifests/fbthrift-source deleted file mode 100644 index 7af0d6ddac0e..000000000000 --- a/build/fbcode_builder/manifests/fbthrift-source +++ /dev/null @@ -1,21 +0,0 @@ -[manifest] -name = fbthrift-source -fbsource_path = fbcode/thrift -shipit_project = fbthrift -shipit_fbcode_builder = true - -[git] -repo_url = https://github.com/facebook/fbthrift.git - -[build] -builder = nop - -[shipit.pathmap] -fbcode/thrift/public_tld = . -fbcode/thrift = thrift - -[shipit.strip] -^fbcode/thrift/thrift-config\.h$ -^fbcode/thrift/perf/canary.py$ -^fbcode/thrift/perf/loadtest.py$ -^fbcode/thrift/.castle/.* diff --git a/build/fbcode_builder/manifests/fbzmq b/build/fbcode_builder/manifests/fbzmq deleted file mode 100644 index 5739016c84ac..000000000000 --- a/build/fbcode_builder/manifests/fbzmq +++ /dev/null @@ -1,29 +0,0 @@ -[manifest] -name = fbzmq -fbsource_path = facebook/fbzmq -shipit_project = fbzmq -shipit_fbcode_builder = true - -[git] -repo_url = https://github.com/facebook/fbzmq.git - -[build.os=linux] -builder = cmake - -[build.not(os=linux)] -# boost.fiber is required and that is not available on macos. -# libzmq doesn't currently build on windows. -builder = nop - -[dependencies] -boost -folly -fbthrift -googletest -libzmq - -[shipit.pathmap] -fbcode/fbzmq = fbzmq -fbcode/fbzmq/public_tld = . - -[shipit.strip] diff --git a/build/fbcode_builder/manifests/libicu b/build/fbcode_builder/manifests/libicu deleted file mode 100644 index c1deda503760..000000000000 --- a/build/fbcode_builder/manifests/libicu +++ /dev/null @@ -1,19 +0,0 @@ -[manifest] -name = libicu - -[rpms] -libicu-devel - -[debs] -libicu-dev - -[download] -url = https://github.com/unicode-org/icu/releases/download/release-68-2/icu4c-68_2-src.tgz -sha256 = c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625 - -[build.not(os=windows)] -builder = autoconf -subdir = icu/source - -[build.os=windows] -builder = nop diff --git a/build/fbcode_builder/manifests/libzmq b/build/fbcode_builder/manifests/libzmq deleted file mode 100644 index a36121d67fd7..000000000000 --- a/build/fbcode_builder/manifests/libzmq +++ /dev/null @@ -1,27 +0,0 @@ -[manifest] -name = libzmq - -[debs] -libzmq3-dev - -[homebrew] -zeromq - -[rpms] -zeromq-devel -zeromq - -[download] -url = https://github.com/zeromq/libzmq/releases/download/v4.3.1/zeromq-4.3.1.tar.gz -sha256 = bcbabe1e2c7d0eec4ed612e10b94b112dd5f06fcefa994a0c79a45d835cd21eb - - -[build] -builder = autoconf -subdir = zeromq-4.3.1 - -[autoconf.args] - -[dependencies] -autoconf -libtool diff --git a/build/fbcode_builder/manifests/lzo b/build/fbcode_builder/manifests/lzo deleted file mode 100644 index fd474127bbb1..000000000000 --- a/build/fbcode_builder/manifests/lzo +++ /dev/null @@ -1,22 +0,0 @@ -[manifest] -name = lzo - -[debs] -liblzo2-dev - -[homebrew] -lzo - -[rpms] -lzo-devel - -[download] -url = http://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz -sha256 = c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072 - -[build.not(os=windows)] -builder = autoconf -subdir = lzo-2.10 - -[build.os=windows] -builder = nop diff --git a/build/fbcode_builder/manifests/protobuf b/build/fbcode_builder/manifests/protobuf deleted file mode 100644 index 311775b98179..000000000000 --- a/build/fbcode_builder/manifests/protobuf +++ /dev/null @@ -1,18 +0,0 @@ -[manifest] -name = protobuf - -[rpms] -protobuf-devel - -[debs] -libprotobuf-dev - -[git] -repo_url = https://github.com/protocolbuffers/protobuf.git -rev = master - -[build.not(os=windows)] -builder = autoconf - -[build.os=windows] -builder = nop From 2227d3dbd6fd6152866ad335ac9b2802816faf71 Mon Sep 17 00:00:00 2001 From: Andres Suarez Date: Fri, 15 Dec 2023 20:25:56 -0800 Subject: [PATCH 6697/7387] Remove hostcaps fb feature Summary: `hostcaps`'s `fb` feature enables getting the real `fbwhoami` values during cargo builds. The only cargo-based projects using `hostcaps` are `eden/scm/lib/commitcloudsubscriber` and `eden/scm/lib/config/loader`. Neither is making internal builds with `cargo`, so neither the `fb` feature nor `fbwhoami` are actually used. The `fbwhoami` refs in `eden/mononoke/rate_limiting` `eden/mononoke/server/qps` are from internal code. So that's not used either. The only thing using `fbwhoami` from a cargo build that needs it is `common/rust/scuba` and `scm/telemetry/scm-telem-log` - so both for `scm_telemetry`. Reviewed By: dtolnay Differential Revision: D52216174 fbshipit-source-id: 8c97e20d2eb0dd3152503d40e4796656b932d2a0 --- build/fbcode_builder/manifests/eden | 1 - 1 file changed, 1 deletion(-) diff --git a/build/fbcode_builder/manifests/eden b/build/fbcode_builder/manifests/eden index b8109360864c..168f460e9af7 100644 --- a/build/fbcode_builder/manifests/eden +++ b/build/fbcode_builder/manifests/eden @@ -58,7 +58,6 @@ lmdb [shipit.pathmap.fb=on] # for internal builds that use getdeps fbcode/fb303 = fb303 -fbcode/common/rust/fbwhoami = common/rust/fbwhoami fbcode/common/rust/shed = common/rust/shed fbcode/thrift/lib/rust = thrift/lib/rust From e80b669c9017ca4a2fa585540aa3e523b34f96e0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 16 Dec 2023 09:33:49 -0800 Subject: [PATCH 6698/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/301832d6e18192cb2a6d86e92d55ff018bf9e227 https://github.com/facebook/fb303/commit/76427148863428a5dbb3ea2a0a8c517f2289138e https://github.com/facebook/fbthrift/commit/540c5594eb4c2f7a68a8e3c6dc6981ec3db1ba32 https://github.com/facebook/folly/commit/163293c5392d047e4737babcdbcc01e9277a43af https://github.com/facebook/litho/commit/2c8bb224c8c191ea8528c02f8e3e858b3bfee3a4 https://github.com/facebook/mcrouter/commit/c8ba1ee164baee7efd587898a8d626944985cd8e https://github.com/facebook/mvfst/commit/cc927374d78346a508e8cf377ced558a816082cf https://github.com/facebook/proxygen/commit/83cf8e7441f784aeb7eb70597375f72cbed00ec1 https://github.com/facebook/rocksdb/commit/81765866c4bc055122f2408c2604dfcfb27e915e https://github.com/facebook/wangle/commit/49c5243257027487e0bf59cd67801de303c68358 https://github.com/facebook/watchman/commit/2227d3dbd6fd6152866ad335ac9b2802816faf71 https://github.com/facebookexperimental/edencommon/commit/78cc6f3a01c1bb5ad8a70b76663cc02d5501944f https://github.com/facebookexperimental/rust-shed/commit/768f838ec06c38d198ac7a523b5ec521fff2429b https://github.com/facebookincubator/fizz/commit/97d0339ddc979afac0427294ae1e159cebdbcbc0 https://github.com/facebookincubator/katran/commit/e9c3b635545b0c93d8a488f232b23f881ffdd415 https://github.com/facebookincubator/velox/commit/e3e163bc0c40ab7bf2ce3689abbefa10fe3fdca3 https://github.com/facebookresearch/vrs/commit/969a7e3d7c7f2478ef3bd4ca48e62b9fad4e70da https://github.com/pytorch/fbgemm/commit/a535f22caee964e523a2b9cff512ad4db4068d55 https://github.com/pytorch/kineto/commit/acf03f80228f34a9b4a79d461a27ae30699a2468 Reviewed By: bigfootjon fbshipit-source-id: 660dc72bf9e3a2d43a4e81d029c73dfa322725f2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 317686baef2d..223eb701e63b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a35c177830e9f228ba1f038a454ffdc81da56ac2 +Subproject commit 540c5594eb4c2f7a68a8e3c6dc6981ec3db1ba32 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ce52e56886c8..7ca03d0115d8 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d2f3dc0dd754d2134c8a988f12e0dcd2f84a09b3 +Subproject commit 163293c5392d047e4737babcdbcc01e9277a43af diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 79edbd18b69a..4ab6c5146974 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 82a6ab450e8f8a57c9f402927e4f33677c8c7e46 +Subproject commit 49c5243257027487e0bf59cd67801de303c68358 From ab1895db61e9a27ade5a6d8cb45313107913caa7 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 17 Dec 2023 09:32:15 -0800 Subject: [PATCH 6699/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/fee60945b0c7eda86d0ee599629b1211b81b07be https://github.com/facebook/fb303/commit/8e5906b42b269c12fdf807dbc76794045acfbd16 https://github.com/facebook/fbthrift/commit/1582abd1fed03893056e3f4e913b486d07029c11 https://github.com/facebook/folly/commit/87c45a730c864bb0f4980ac798e3bc9238b8365a https://github.com/facebook/litho/commit/8c7a55ad99b3c34e2e59e53e14003e7e68db032c https://github.com/facebook/mcrouter/commit/fbe8b8dbb8d8a00e4e2018feb794b8e667c07a5f https://github.com/facebook/mvfst/commit/48f87f283f912fd0e4a14237d04cb57d46eb06c5 https://github.com/facebook/ocamlrep/commit/3093b3da6bff1fb69a7d83f51c0113c275c688a1 https://github.com/facebook/proxygen/commit/e99f5b6b1a79ed9b958358f3b9e8c73dad8805e7 https://github.com/facebook/wangle/commit/d1c09cd6122295a4700d37cd45fb6bd6ff133e18 https://github.com/facebook/watchman/commit/e80b669c9017ca4a2fa585540aa3e523b34f96e0 https://github.com/facebookexperimental/edencommon/commit/59262c50b3fb4ece2b9f690efb2a9e3b0a7a4e41 https://github.com/facebookexperimental/rust-shed/commit/0b7a947e1a5707825e6908ea6421029583319ff4 https://github.com/facebookincubator/fizz/commit/9886814be8d40b4fb33504672b83789c6c471139 https://github.com/facebookincubator/katran/commit/31141880218e8d3a5679fdf75a56aa2b89f79aa7 https://github.com/facebookincubator/velox/commit/f0accfd73289c0d2b505b7ea7ec30f144e2080c1 Reviewed By: bigfootjon fbshipit-source-id: ce8a696aa39da3c1514614529d1621815bc281c9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 223eb701e63b..66dd50e3d613 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 540c5594eb4c2f7a68a8e3c6dc6981ec3db1ba32 +Subproject commit 1582abd1fed03893056e3f4e913b486d07029c11 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7ca03d0115d8..dfc2b27b5b3d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 163293c5392d047e4737babcdbcc01e9277a43af +Subproject commit 87c45a730c864bb0f4980ac798e3bc9238b8365a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4ab6c5146974..7ac463078c3f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 49c5243257027487e0bf59cd67801de303c68358 +Subproject commit d1c09cd6122295a4700d37cd45fb6bd6ff133e18 From b291aea8ffde0ddb06e69102e13a5fd93871577d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 18 Dec 2023 09:31:55 -0800 Subject: [PATCH 6700/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/3570bff9f9447c405cab64a23c2a0236df0018e3 https://github.com/facebook/fb303/commit/70c2fb351c251f72adadb7c804bc815533af4f00 https://github.com/facebook/fbthrift/commit/39bc8b3c0c0b37381f96265eccdcef4ac8b7ab36 https://github.com/facebook/folly/commit/a1ff042d51c73341bc6326b86a0d4fe6381846ae https://github.com/facebook/litho/commit/3d6a8c31d3b42c69e170a0532aa361b1af2072b1 https://github.com/facebook/mvfst/commit/bda2053957aead592f758a9979c5735955741151 https://github.com/facebook/ocamlrep/commit/5edc962b1a40fb19bc36d3679b586dca0469bd34 https://github.com/facebook/proxygen/commit/2ed5b2db90d1c8e786473fc241344cee4841275b https://github.com/facebook/rocksdb/commit/5b981b64f4f42754563e50a8025a56f8ff0f3634 https://github.com/facebook/wangle/commit/99630c5f0a8b05e9adf7b7b0dd9e679a7d8ffba9 https://github.com/facebook/watchman/commit/ab1895db61e9a27ade5a6d8cb45313107913caa7 https://github.com/facebookexperimental/edencommon/commit/26f19cd85a1144b642b3133d429166546e4ed5c6 https://github.com/facebookexperimental/rust-shed/commit/ccb2c9766f2e974963ed80b17fc2df5b95c47f69 https://github.com/facebookincubator/fizz/commit/01f158468192b67904ff2c7344c25aa8ba1d8d9d https://github.com/facebookincubator/katran/commit/9a2c84693d5eb3aeb17d78d0e1b0806298db44af https://github.com/facebookincubator/velox/commit/afaaef30b06fea83b7a58055ae7cdb001de1c6ef Reviewed By: jailby fbshipit-source-id: bb6223f94310d147747447515ad0742c71191e74 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 66dd50e3d613..6c03eb097b98 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1582abd1fed03893056e3f4e913b486d07029c11 +Subproject commit 39bc8b3c0c0b37381f96265eccdcef4ac8b7ab36 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index dfc2b27b5b3d..28602a80dc92 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 87c45a730c864bb0f4980ac798e3bc9238b8365a +Subproject commit a1ff042d51c73341bc6326b86a0d4fe6381846ae diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7ac463078c3f..89f3205774f0 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d1c09cd6122295a4700d37cd45fb6bd6ff133e18 +Subproject commit 99630c5f0a8b05e9adf7b7b0dd9e679a7d8ffba9 From c1217673b521adc75790a2b7851443da084a56ce Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 19 Dec 2023 09:33:30 -0800 Subject: [PATCH 6701/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/63bd36ddbbca2d02512ed74da41368cd34610a2c https://github.com/facebook/fb303/commit/1ca1968bbfc3d22882a86da58435bccdff616bd1 https://github.com/facebook/fbthrift/commit/485d6deb2d7e030f99a4fde701e6c085176f2a4f https://github.com/facebook/folly/commit/c5542ed29eacc3615425fc069003cb7ea8177f82 https://github.com/facebook/litho/commit/99d6ba10030ce852600c05d355ecab32e35b0d47 https://github.com/facebook/mcrouter/commit/665e3182a6d616f1b54cd89766ee001294e1476d https://github.com/facebook/mvfst/commit/3ba2147b67e82ac4ba5793eecd0614b9a85c4b90 https://github.com/facebook/ocamlrep/commit/8e77c295d4e908f3b81a20f54b91947d2ed91141 https://github.com/facebook/proxygen/commit/eabbf0214f1d68464c2b0ffca290586b61486b0b https://github.com/facebook/rocksdb/commit/f7486ff6a31884ffd61644fb21a7ceafd7e107d1 https://github.com/facebook/wangle/commit/d81d13eb8887cf26bccb25daf1b0ecdd1de24669 https://github.com/facebook/watchman/commit/b291aea8ffde0ddb06e69102e13a5fd93871577d https://github.com/facebookexperimental/edencommon/commit/08f681bd275de6204a94395d51e11a939b1564df https://github.com/facebookexperimental/rust-shed/commit/611984aefcab96cf572ed9f3c06e7015463d68b8 https://github.com/facebookincubator/fizz/commit/34f5bf52ba822c6317ad377663f4ea72737ca8f8 https://github.com/facebookincubator/katran/commit/dbd51ce1a261a5c888f16702eb7bec796363cdaf https://github.com/facebookincubator/velox/commit/050c16c8cfe1102f9c7a1c1f6e133b38ca344b07 https://github.com/facebookresearch/vrs/commit/0f780245888124a034e1ee5892c02f83f0d636f6 https://github.com/pytorch/fbgemm/commit/9f426bb56ec377f16a066684e0144331b5d97b74 Reviewed By: jailby fbshipit-source-id: 54104f72ee66eabf3f12323101f0e7e0567505af --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6c03eb097b98..41bd73744db9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 39bc8b3c0c0b37381f96265eccdcef4ac8b7ab36 +Subproject commit 485d6deb2d7e030f99a4fde701e6c085176f2a4f diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 28602a80dc92..db0650530d39 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a1ff042d51c73341bc6326b86a0d4fe6381846ae +Subproject commit c5542ed29eacc3615425fc069003cb7ea8177f82 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 89f3205774f0..7c559e163a9c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 99630c5f0a8b05e9adf7b7b0dd9e679a7d8ffba9 +Subproject commit d81d13eb8887cf26bccb25daf1b0ecdd1de24669 From 4b4cd840bb23a9fcb5423f70b068b31bf3d5e776 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Tue, 19 Dec 2023 12:24:39 -0800 Subject: [PATCH 6702/7387] getdeps: add --build-type option to build in Debug or RelWithDebInfo mode Summary: X-link: https://github.com/facebookincubator/zstrong/pull/653 getdeps: add --build-type option to build in Debug or RelWithDebInfo mode Adds a --build-type option so one can force RelWithDebInfo or Debug explicity Default remains RelWithDebInfo for cmake. cargo default is updated to --release to match cmake more closely, if you don't want release use --build-type Debug. If you want to run github CI in Debug mode (faster build, but tests will run slower), then can pass --build-type Debug to getdeps.py generate-github-actions X-link: https://github.com/facebook/sapling/pull/786 Reviewed By: mitrandir77 Differential Revision: D51564770 Pulled By: bigfootjon fbshipit-source-id: ef30332ca193d9805bce005d12b5dbc9f58fcafc --- build/fbcode_builder/getdeps.py | 22 ++++++++++++++++++++-- build/fbcode_builder/getdeps/builder.py | 10 ++++++---- build/fbcode_builder/getdeps/buildopts.py | 8 ++++++++ build/fbcode_builder/getdeps/cargo.py | 18 +++++++++++++----- 4 files changed, 47 insertions(+), 11 deletions(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 7f824c0ebd4f..aeae6bf63467 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -814,6 +814,13 @@ def setup_project_cmd_parser(self, parser): action="store_true", default=False, ) + parser.add_argument( + "--build-type", + help="Set the build type explicitly. Cmake and cargo builders act on them. Only Debug and RelWithDebInfo widely supported.", + choices=["Debug", "Release", "RelWithDebInfo", "MinSizeRel"], + action="store", + default=None, + ) @cmd("fixup-dyn-deps", "Adjusts dynamic dependencies for packaging purposes") @@ -1038,6 +1045,10 @@ def write_job_for_platform(self, platform, args): # noqa: C901 out.write(" - uses: actions/checkout@v4\n") + build_type_arg = "" + if args.build_type: + build_type_arg = f"--build-type {args.build_type} " + if build_opts.free_up_disk: free_up_disk = "--free-up-disk " if not build_opts.is_windows(): @@ -1118,7 +1129,7 @@ def write_job_for_platform(self, platform, args): # noqa: C901 has_same_repo_dep = True out.write(" - name: Build %s\n" % m.name) out.write( - f" run: {getdepscmd}{allow_sys_arg} build {src_dir_arg}{free_up_disk}--no-tests {m.name}\n" + f" run: {getdepscmd}{allow_sys_arg} build {build_type_arg}{src_dir_arg}{free_up_disk}--no-tests {m.name}\n" ) out.write(" - name: Build %s\n" % manifest.name) @@ -1139,7 +1150,7 @@ def write_job_for_platform(self, platform, args): # noqa: C901 no_tests_arg = "--no-tests " out.write( - f" run: {getdepscmd}{allow_sys_arg} build {no_tests_arg}{no_deps_arg}--src-dir=. {manifest.name} {project_prefix}\n" + f" run: {getdepscmd}{allow_sys_arg} build {build_type_arg}{no_tests_arg}{no_deps_arg}--src-dir=. {manifest.name} {project_prefix}\n" ) out.write(" - name: Copy artifacts\n") @@ -1225,6 +1236,13 @@ def setup_project_cmd_parser(self, parser): action="store_true", default=False, ) + parser.add_argument( + "--build-type", + help="Set the build type explicitly. Cmake and cargo builders act on them. Only Debug and RelWithDebInfo widely supported.", + choices=["Debug", "Release", "RelWithDebInfo", "MinSizeRel"], + action="store", + default=None, + ) def get_arg_var_name(args): diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 0aa937af6c24..25e2076e99d6 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -473,7 +473,7 @@ def main(): "--target", target, "--config", - "Release", + "{build_type}", get_jobs_argument(args.num_jobs), ] + args.cmake_args elif args.mode == "test": @@ -595,8 +595,9 @@ def _compute_cmake_define_args(self, env): # unspecified. Some of the deps fail to compile in release mode # due to warning->error promotion. RelWithDebInfo is the happy # medium. - "CMAKE_BUILD_TYPE": "RelWithDebInfo", + "CMAKE_BUILD_TYPE": self.build_opts.build_type, } + if "SANDCASTLE" not in os.environ: # We sometimes see intermittent ccache related breakages on some # of the FB internal CI hosts, so we prefer to disable ccache @@ -693,6 +694,7 @@ def _build(self, install_dirs, reconfigure: bool) -> None: build_dir=self.build_dir, install_dir=self.inst_dir, sys=sys, + build_type=self.build_opts.build_type, ) self._invalidate_cache() @@ -706,7 +708,7 @@ def _build(self, install_dirs, reconfigure: bool) -> None: "--target", self.cmake_target, "--config", - "Release", + self.build_opts.build_type, "-j", str(self.num_jobs), ], @@ -1179,7 +1181,7 @@ def _build(self, install_dirs, reconfigure) -> None: "--target", "install", "--config", - "Release", + self.build_opts.build_type, "-j", str(self.num_jobs), ], diff --git a/build/fbcode_builder/getdeps/buildopts.py b/build/fbcode_builder/getdeps/buildopts.py index 48b000f90ebc..63bf7c696e1a 100644 --- a/build/fbcode_builder/getdeps/buildopts.py +++ b/build/fbcode_builder/getdeps/buildopts.py @@ -52,6 +52,7 @@ def __init__( shared_libs: bool = False, facebook_internal=None, free_up_disk: bool = False, + build_type: Optional[str] = None, ) -> None: """fbcode_builder_dir - the path to either the in-fbsource fbcode_builder dir, or for shipit-transformed repos, the build dir that @@ -67,6 +68,7 @@ def __init__( vcvars_path - Path to external VS toolchain's vsvarsall.bat shared_libs - whether to build shared libraries free_up_disk - take extra actions to save runner disk space + build_type - CMAKE_BUILD_TYPE, used by cmake and cargo builders """ if not install_dir: @@ -107,6 +109,11 @@ def __init__( self.shared_libs = shared_libs self.free_up_disk = free_up_disk + if build_type is None: + build_type = "RelWithDebInfo" + + self.build_type = build_type + lib_path = None if self.is_darwin(): lib_path = "DYLD_LIBRARY_PATH" @@ -606,6 +613,7 @@ def setup_build_options(args, host_type=None) -> BuildOptions: "lfs_path", "shared_libs", "free_up_disk", + "build_type", } } diff --git a/build/fbcode_builder/getdeps/cargo.py b/build/fbcode_builder/getdeps/cargo.py index bb41cc3e294b..315f80b17097 100644 --- a/build/fbcode_builder/getdeps/cargo.py +++ b/build/fbcode_builder/getdeps/cargo.py @@ -148,21 +148,29 @@ def _prepare(self, install_dirs, reconfigure) -> None: def _build(self, install_dirs, reconfigure) -> None: # _prepare has been run already. Actually do the build build_source_dir = self.build_source_dir() + + build_args = [ + "--out-dir", + os.path.join(self.inst_dir, "bin"), + "-Zunstable-options", + ] + + if self.build_opts.build_type != "Debug": + build_args.append("--release") + if self.manifests_to_build is None: self.run_cargo( install_dirs, "build", - ["--out-dir", os.path.join(self.inst_dir, "bin"), "-Zunstable-options"], + build_args, ) else: for manifest in self.manifests_to_build: self.run_cargo( install_dirs, "build", - [ - "--out-dir", - os.path.join(self.inst_dir, "bin"), - "-Zunstable-options", + build_args + + [ "--manifest-path", self.manifest_dir(manifest), ], From a5388a9a483166fff861b87b8d0178bcd957f4c3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 20 Dec 2023 09:33:29 -0800 Subject: [PATCH 6703/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/c4b6dff944b209bd24616736dde5bc0c87919521 https://github.com/facebook/fb303/commit/616aa5c2ecad18124abc3419e71b55e87754bbfd https://github.com/facebook/fbthrift/commit/4b609f93fe0a413e896628d7e39b0d8f5b40914c https://github.com/facebook/folly/commit/1f22c7a8ce875afe2557bf29689a2da7f9983603 https://github.com/facebook/litho/commit/627718f9f3da2aff32f46e6ce47a76319cd390ba https://github.com/facebook/mcrouter/commit/31d546bd3405bb0bf8ba6419e8142979ec0918d9 https://github.com/facebook/mvfst/commit/448460a558098611c352e7c797b94cbd331f95a5 https://github.com/facebook/ocamlrep/commit/5ffee1af7624b8e884a61c0cc057ed1f1536b3c8 https://github.com/facebook/proxygen/commit/4be539c9e9c760ef73fa6e851bde3fc9d9477b7b https://github.com/facebook/rocksdb/commit/7b24dec25d6df81ef3f3a33f12968c5476692acd https://github.com/facebook/wangle/commit/1d4b3054060c61f74f54a9bb6602e682aab018b5 https://github.com/facebook/watchman/commit/4b4cd840bb23a9fcb5423f70b068b31bf3d5e776 https://github.com/facebookexperimental/edencommon/commit/d4a1326b68ffbb3ed44dc0530c429e58484ffc3c https://github.com/facebookexperimental/rust-shed/commit/158e9d0ab41200c20d4056d960d6ad136809ef62 https://github.com/facebookincubator/fizz/commit/603588b01583a711057caeb6a3d6f79290246b78 https://github.com/facebookincubator/katran/commit/ec6f585bd1dd4180dbbb1e5116dc655267a7f090 https://github.com/facebookincubator/superconsole/commit/05e07519791bb2038aee2d70a4e94e3bbbf6c2cf https://github.com/facebookincubator/velox/commit/cdbd4309ba0b22f897141d9048577e5c11bde75e https://github.com/pytorch/fbgemm/commit/74808cdd4bb941ec656eabbf25afe93d64b1d232 Reviewed By: jailby fbshipit-source-id: 864a854656bbad7e96589f0f05cf37144d4dff6c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 41bd73744db9..c2ac1d020ae9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 485d6deb2d7e030f99a4fde701e6c085176f2a4f +Subproject commit 4b609f93fe0a413e896628d7e39b0d8f5b40914c diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index db0650530d39..0eb4691a21ea 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c5542ed29eacc3615425fc069003cb7ea8177f82 +Subproject commit 1f22c7a8ce875afe2557bf29689a2da7f9983603 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7c559e163a9c..45976f8adcb2 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d81d13eb8887cf26bccb25daf1b0ecdd1de24669 +Subproject commit 1d4b3054060c61f74f54a9bb6602e682aab018b5 From 2de8906dd033328540460c5379803960bc9a55f1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 21 Dec 2023 09:31:46 -0800 Subject: [PATCH 6704/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/580d99677a7db0b5b7eb4e7278b0c3276d375a2d https://github.com/facebook/fb303/commit/a4fa7a21fa2e1fcdeacfeda0c97383594a212a56 https://github.com/facebook/fbthrift/commit/b4ee03aa4fda5fd131c2dbb8227c7093e0d2cdec https://github.com/facebook/folly/commit/8b586704202a82d263673f1325490e0bb3fd337b https://github.com/facebook/mvfst/commit/a22487c9428d85e444b8d67e54d735433267f096 https://github.com/facebook/ocamlrep/commit/84806e54da6314bf7f2da82b2fb6de0b09b3cefc https://github.com/facebook/proxygen/commit/9e22bf63180aa9a21b62fbe2277d586309edc779 https://github.com/facebook/rocksdb/commit/8d50a7c9df2352e4949aa456206bbd7b9ee49620 https://github.com/facebook/wangle/commit/4b6bad55f4b7c2d210e29ce69489b591c7a1c4b0 https://github.com/facebook/watchman/commit/a5388a9a483166fff861b87b8d0178bcd957f4c3 https://github.com/facebookexperimental/edencommon/commit/79c02015e9cee12a364e395b27b9537c245648fc https://github.com/facebookexperimental/rust-shed/commit/c6837166445707f570859b3e2e075f2218370de8 https://github.com/facebookincubator/fizz/commit/26086ce671eace620c154a2727f174bbbecc74c2 https://github.com/facebookincubator/katran/commit/ddc224833ae60e6c85025bce257be1c2495ce4f7 https://github.com/facebookincubator/velox/commit/e361a507c753768d801f6b902a8037c56967be00 https://github.com/facebookresearch/vrs/commit/bc36a3814ef86e6be02e5656af24778003e323f3 https://github.com/pytorch/fbgemm/commit/2f5e16e9461527acfab1b48c71f957b786f8dcd8 https://github.com/pytorch/kineto/commit/53e3de8ee6e83abd961d23e0aa251247f10bba6c Reviewed By: jailby fbshipit-source-id: 2951135cc490f3cb5fccc9d970632166d3896bc1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c2ac1d020ae9..90dcdc934d7e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4b609f93fe0a413e896628d7e39b0d8f5b40914c +Subproject commit b4ee03aa4fda5fd131c2dbb8227c7093e0d2cdec diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0eb4691a21ea..aacf9ed9fb5f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1f22c7a8ce875afe2557bf29689a2da7f9983603 +Subproject commit 8b586704202a82d263673f1325490e0bb3fd337b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 45976f8adcb2..6c8ac8ce6941 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1d4b3054060c61f74f54a9bb6602e682aab018b5 +Subproject commit 4b6bad55f4b7c2d210e29ce69489b591c7a1c4b0 From 906b1a04dc8ec7920ece1f78f938f3cdc47c2f6f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 22 Dec 2023 09:31:26 -0800 Subject: [PATCH 6705/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/544fc2864fbe30364adc0c5e029d4e6df67858f8 https://github.com/facebook/fb303/commit/08b0ac1bcf4a12d1e304494e7caab6d05afbdcbe https://github.com/facebook/fbthrift/commit/79c8b9ed4c3f827f829b5c701d3f245fe3a49cd0 https://github.com/facebook/folly/commit/fcbbb3451cab03d0cedc90396f52bd43cc490d0c https://github.com/facebook/litho/commit/c88cf81c828e6486e78ef3a391000d31eb0d6af9 https://github.com/facebook/mvfst/commit/ac3faca141d026685becdd782962b53c4d9d3b5a https://github.com/facebook/proxygen/commit/21a486d9ea1d36c6b51fce4aa7cec1fa16dea4ae https://github.com/facebook/rocksdb/commit/106058c076e44d9dbe3404b1f15428a28531915e https://github.com/facebook/wangle/commit/ef6e469a0bbe782f96be07ecfe42a2ba8a809acf https://github.com/facebook/watchman/commit/2de8906dd033328540460c5379803960bc9a55f1 https://github.com/facebookexperimental/edencommon/commit/ba75dd1ed208114569cf1fe55118cda39243106e https://github.com/facebookexperimental/rust-shed/commit/8683681305ce44fdbe8b04d7d427937376ca4469 https://github.com/facebookincubator/fizz/commit/90f8ea177930107479a5c8cdc6516ec01febad5e https://github.com/facebookincubator/katran/commit/7f197fc1728f08817697fd6d5c1821b2c628d5c2 https://github.com/facebookincubator/velox/commit/8948b9e94f2cb6368328fec7570a828572fc2a5f https://github.com/fairinternal/egohowto/commit/0c5df3fc444da3e7cef8d88cd91c79a62c4965e8 https://github.com/pytorch/fbgemm/commit/eb12cf6866cb925cb2d1cc45a395f329c78d7fc6 Reviewed By: jailby fbshipit-source-id: 60003898b082f3330ba388bb6b07959f0468e73a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 90dcdc934d7e..f116f3301b11 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b4ee03aa4fda5fd131c2dbb8227c7093e0d2cdec +Subproject commit 79c8b9ed4c3f827f829b5c701d3f245fe3a49cd0 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index aacf9ed9fb5f..b9dd576c7ed6 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 8b586704202a82d263673f1325490e0bb3fd337b +Subproject commit fcbbb3451cab03d0cedc90396f52bd43cc490d0c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6c8ac8ce6941..a476dfb204c0 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 4b6bad55f4b7c2d210e29ce69489b591c7a1c4b0 +Subproject commit ef6e469a0bbe782f96be07ecfe42a2ba8a809acf From 7c764da53358dd549bf11ca1f229891ba3d2f905 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 23 Dec 2023 09:31:53 -0800 Subject: [PATCH 6706/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/d3a6efa07fa4ab1e14867c829957f51de03ba2f5 https://github.com/facebook/fb303/commit/07c294bdc62f07fc9d2c39775a4ac0c0a2b676f9 https://github.com/facebook/fbthrift/commit/6b84f87ed91162ea994778a2cd1fd1ee389f77c6 https://github.com/facebook/folly/commit/4618e42839108a6d6622f61af9c75a49bd93bdfc https://github.com/facebook/mvfst/commit/9305d14ed7b46fd24c7f8750693921348b9b4745 https://github.com/facebook/proxygen/commit/c6bcf88f2ae208609e0cc310b2d4ed24549e52be https://github.com/facebook/wangle/commit/969b38116964b8db96b4cb99d348dfb3132ba8c2 https://github.com/facebook/watchman/commit/906b1a04dc8ec7920ece1f78f938f3cdc47c2f6f https://github.com/facebookexperimental/edencommon/commit/70be22a0dc41b656c4a2ed9fbf71a99740331f80 https://github.com/facebookexperimental/rust-shed/commit/19794f4a3af612acc517ca0eff197856d0d5fef6 https://github.com/facebookincubator/fizz/commit/f9301649d05fb51dacb29dfe03f383f460f22f4a https://github.com/facebookincubator/katran/commit/ab8d537f4f7374e6ed9852006ed264f351c200bc https://github.com/facebookincubator/velox/commit/50187434e32bffcbebcd6501898763c56de40065 Reviewed By: jailby fbshipit-source-id: 9ae995125efa36319fed9451ae37e78ca5fa4021 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f116f3301b11..6abc8905fe97 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 79c8b9ed4c3f827f829b5c701d3f245fe3a49cd0 +Subproject commit 6b84f87ed91162ea994778a2cd1fd1ee389f77c6 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b9dd576c7ed6..7a11de10e159 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit fcbbb3451cab03d0cedc90396f52bd43cc490d0c +Subproject commit 4618e42839108a6d6622f61af9c75a49bd93bdfc diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a476dfb204c0..d73e3e51b994 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ef6e469a0bbe782f96be07ecfe42a2ba8a809acf +Subproject commit 969b38116964b8db96b4cb99d348dfb3132ba8c2 From cb47c8fcafae4ee4642d3c04ef7e6ae64bc56bab Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 24 Dec 2023 09:31:42 -0800 Subject: [PATCH 6707/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/3a8d7fbf919380c0da2a278c6155980e875e527f https://github.com/facebook/fb303/commit/ab5c03ce4aca77801424985b76bec782e3768a87 https://github.com/facebook/fbthrift/commit/15598cab28c41b1db1502a76cc74f1b046e266e3 https://github.com/facebook/mvfst/commit/a7dfa2baf7a500fc88e58f2ec5ff98952de2aa3a https://github.com/facebook/proxygen/commit/91ff3149c47e368aa3ccba7ff14f1ea0bdca9516 https://github.com/facebook/wangle/commit/67989235e9feb46552f0be5f76624a4a0415cda1 https://github.com/facebook/watchman/commit/7c764da53358dd549bf11ca1f229891ba3d2f905 https://github.com/facebookexperimental/edencommon/commit/3e3d844d634c629d5246d323ba87f4d210555210 https://github.com/facebookexperimental/rust-shed/commit/5fe2026f7b36d654864d712a5044c0ce5fdf72c6 https://github.com/facebookincubator/fizz/commit/be908f37483a6217bded39c9119d68ecab7a8919 https://github.com/facebookincubator/katran/commit/125a7be08d6103e0b86208873a9015cb96ffd284 https://github.com/facebookincubator/velox/commit/a1e5c346daf0e14bebd03ac454fbeed0ab002d9b https://github.com/facebookresearch/vrs/commit/9ebdc29f331c0e4235df236218381287572b0feb Reviewed By: jailby fbshipit-source-id: 6a91df8e8a4591d5a7edfbfe6814d230c3463366 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6abc8905fe97..2388fb92a97b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6b84f87ed91162ea994778a2cd1fd1ee389f77c6 +Subproject commit 15598cab28c41b1db1502a76cc74f1b046e266e3 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d73e3e51b994..b6501984067f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 969b38116964b8db96b4cb99d348dfb3132ba8c2 +Subproject commit 67989235e9feb46552f0be5f76624a4a0415cda1 From 3cc2a5a0b676cb88b7fb817aeee83de8568b1263 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 25 Dec 2023 09:32:21 -0800 Subject: [PATCH 6708/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/ddd8fcd4a2bea060196f5602e62bb2c8137adeec https://github.com/facebook/fb303/commit/72cf644a2eaee990f83991f59622ccb8a24535dc https://github.com/facebook/fbthrift/commit/f6c7b086422e9c8867bdefa32b7e8131921ff2c6 https://github.com/facebook/litho/commit/7b4f94b42384c8429e4221908f7769e507b7e59e https://github.com/facebook/mvfst/commit/e0acbf8141e3d597f16feeadd3c2986b6665b52e https://github.com/facebook/proxygen/commit/4d19cc66bf23e06a1ea15a9b8dcb2b3914545705 https://github.com/facebook/wangle/commit/938cb044f65fa65fa3f3f434db56f202785c71f3 https://github.com/facebook/watchman/commit/cb47c8fcafae4ee4642d3c04ef7e6ae64bc56bab https://github.com/facebookexperimental/rust-shed/commit/64c974ef5d6d5f3d4bbae7e1ca85a200a2435c13 https://github.com/facebookincubator/katran/commit/080abdad8ce1a2eeff5098997add6035f09e93d4 https://github.com/facebookincubator/velox/commit/c5bcc33e93678e5bf0a7479ba16212035008a302 Reviewed By: bigfootjon fbshipit-source-id: 15b1f6249f95456d82ed4bf6aac4d7ef22275bc9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2388fb92a97b..bbbcdac36f6e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 15598cab28c41b1db1502a76cc74f1b046e266e3 +Subproject commit f6c7b086422e9c8867bdefa32b7e8131921ff2c6 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b6501984067f..8d5e50d70793 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 67989235e9feb46552f0be5f76624a4a0415cda1 +Subproject commit 938cb044f65fa65fa3f3f434db56f202785c71f3 From 159215306b6758fb2e989bd42e162eae8f447e86 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 26 Dec 2023 09:31:19 -0800 Subject: [PATCH 6709/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/ffb2bb43f7805d8cb3954ded273d1b003d421d5f https://github.com/facebook/fb303/commit/4eabc4ba5db2a0f41e7146f216a08eaf1f69131e https://github.com/facebook/fbthrift/commit/62d48b95516fca25b520520f3ac0b9453b865065 https://github.com/facebook/proxygen/commit/d493821f7f4344995dca28f54b6cff20d7a5c686 https://github.com/facebook/watchman/commit/3cc2a5a0b676cb88b7fb817aeee83de8568b1263 https://github.com/facebookexperimental/rust-shed/commit/63b6ff40254b428f86401818ab2a62cf0b05baac Reviewed By: bigfootjon fbshipit-source-id: 092d38d85c175f03c516748ef32b4d92ab3ab4c4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bbbcdac36f6e..df64cd0d02ea 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f6c7b086422e9c8867bdefa32b7e8131921ff2c6 +Subproject commit 62d48b95516fca25b520520f3ac0b9453b865065 From c1ddf3b47fc2001aecbceeaaeb9579406ce168b5 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 27 Dec 2023 09:31:12 -0800 Subject: [PATCH 6710/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/1918ccb41f848151c822db740a8200b46b895c35 https://github.com/facebook/fb303/commit/ca3d42ec609a7f9b3ac5751bc448f4929efef9f4 https://github.com/facebook/fbthrift/commit/f042d0c0df0970fdf2ea5271040588e02feec4ce https://github.com/facebook/ocamlrep/commit/68e01f7e6c51b95228d028321b6403c8bb3658ca https://github.com/facebook/rocksdb/commit/4fefe1fed9092be69d9771f2df7cdfadcf604bc3 https://github.com/facebook/watchman/commit/159215306b6758fb2e989bd42e162eae8f447e86 https://github.com/facebookexperimental/rust-shed/commit/87b724c01ea1ce42c863e0495637c3483a909b34 https://github.com/facebookincubator/velox/commit/ab15325df5fed9c032bb59c9875ef6880aaff55b https://github.com/pytorch/fbgemm/commit/2e9077f700fb6a1607b49eed6c09bd49abe1ac5c https://github.com/pytorch/kineto/commit/0664057728f143a2c399cb62a6da1a4d818805b6 Reviewed By: bigfootjon fbshipit-source-id: b4442618022ae82f79791f59fdb585cb3d8deb18 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index df64cd0d02ea..455b33d627e8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 62d48b95516fca25b520520f3ac0b9453b865065 +Subproject commit f042d0c0df0970fdf2ea5271040588e02feec4ce From 997a6485bf8002f2e2bb5b646c8f574507718409 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 28 Dec 2023 09:33:43 -0800 Subject: [PATCH 6711/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/568be147f1e380c48a3d51156e34720ba2909d76 https://github.com/facebook/fb303/commit/e5a0dc8fe86e8eb759685a427f4e63009d28b58f https://github.com/facebook/fbthrift/commit/2764713d291cf0911e9c463449826228738b655a https://github.com/facebook/rocksdb/commit/01f2edd145e318228936b89834d058060ed600c6 https://github.com/facebook/watchman/commit/c1ddf3b47fc2001aecbceeaaeb9579406ce168b5 https://github.com/facebookexperimental/rust-shed/commit/62fc02079fe3c6559d805cb5748174d015a86500 https://github.com/facebookincubator/phabtest_fbsource/commit/e4b93137e8b32a89384c4c585be0e6c7532c4960 https://github.com/facebookincubator/velox/commit/e6f84e8ac9ef6721f527a2d552a13f7e79bdf72e https://github.com/facebookresearch/vrs/commit/346713e34944002b058681799cd1ebbaff9e1b08 https://github.com/pytorch/fbgemm/commit/a3b44fdc49fcd371e369d00ff0c5f74b4204428f Reviewed By: bigfootjon fbshipit-source-id: 8bb5cd1276682ca6e1e8d74a21e241e01829f3c3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 455b33d627e8..1a91d9c7c10e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f042d0c0df0970fdf2ea5271040588e02feec4ce +Subproject commit 2764713d291cf0911e9c463449826228738b655a From 4ffc579684d08bc91dcbeb43b918e07de6db4b84 Mon Sep 17 00:00:00 2001 From: Yedidya Feldblum Date: Fri, 29 Dec 2023 09:30:29 -0800 Subject: [PATCH 6712/7387] migrate from legacy boost::filesystem::ofstream when via helper namespace fs Summary: Migrate from `boost::filesystem::ofstream`, spelled as `fs::ofstream`, to `std::ofstream`. Differential Revision: D52437152 fbshipit-source-id: 8461af15b036d37eb8eb0c21bc4d414e08a3005b --- watchman/integration/cppclient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/integration/cppclient.cpp b/watchman/integration/cppclient.cpp index 62451863cd6e..44ca153e8538 100644 --- a/watchman/integration/cppclient.cpp +++ b/watchman/integration/cppclient.cpp @@ -88,7 +88,7 @@ int main(int argc, char** argv) { auto empty_file_relative_path = fs::relative(empty_file_path, subdir.path()); { - auto empty_file = fs::ofstream{empty_file_path}; + auto empty_file = std::ofstream{empty_file_path}; if (!empty_file) { LOG(ERROR) << "Failed to create " << empty_file_path; return 1; From 04ede129c6131de66ecdd1f9891f9406d16ee6c6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 29 Dec 2023 09:33:48 -0800 Subject: [PATCH 6713/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/b6f6724c5542f8988c2e29eaa8a4c3279e4356ac https://github.com/facebook/fb303/commit/439c7943cfc9f50f3b121341e7ccda4004d315a4 https://github.com/facebook/fbthrift/commit/628d648490392ad000692a678d896001bb3bf73b https://github.com/facebook/folly/commit/88e79a202aef64ea747bb836089a5a924c4e8d71 https://github.com/facebook/mvfst/commit/6c6c95a08128fe72fa79107b55a4c80f2ad12445 https://github.com/facebook/rocksdb/commit/a036525809a7511ae119488973c953ef7151991b https://github.com/facebook/watchman/commit/997a6485bf8002f2e2bb5b646c8f574507718409 https://github.com/facebookexperimental/rust-shed/commit/d4a279646be78fa2c731fc976fbe74d42d824776 https://github.com/facebookincubator/velox/commit/6080a6a692235134e25a8f5f914710c7fd41de77 https://github.com/facebookresearch/param/commit/c1c6924db2978810e762dfe9844ac5c8e029a394 https://github.com/pytorch/fbgemm/commit/9cd944a52a39f60f0d19b915f6b6866d8ca055e5 Reviewed By: bigfootjon fbshipit-source-id: e1b6ec6857035300bb0ae0cbd13a5aec5e72ade6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1a91d9c7c10e..d1fb735c368c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2764713d291cf0911e9c463449826228738b655a +Subproject commit 628d648490392ad000692a678d896001bb3bf73b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7a11de10e159..c2e3d38919ec 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 4618e42839108a6d6622f61af9c75a49bd93bdfc +Subproject commit 88e79a202aef64ea747bb836089a5a924c4e8d71 From 61c16032da973e5f59e56298e68b8760ed936f8b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 30 Dec 2023 09:31:45 -0800 Subject: [PATCH 6714/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/0ddefc601ee085d4c8c1752c8e67a416525c3dba https://github.com/facebook/fb303/commit/3c4ed497d51e2b6e504f7881943ce0a4d658c5e6 https://github.com/facebook/fbthrift/commit/cdb212df4d196fb3578504ea2209338c1401757b https://github.com/facebook/folly/commit/234d39a36a43106747d10cc19efada72fd810dd3 https://github.com/facebook/mvfst/commit/d25603b5859994463d38bf413ea5f4f84de128db https://github.com/facebook/proxygen/commit/fe2f38b41be67d0c1486b8fb9a7d67af6bbf6efe https://github.com/facebook/rocksdb/commit/06e593376cd5bc6990580f6cf6f4be1461c06614 https://github.com/facebook/wangle/commit/ebbe643fba6d14e2572cf1576d5a2011417785b5 https://github.com/facebook/watchman/commit/04ede129c6131de66ecdd1f9891f9406d16ee6c6 https://github.com/facebookexperimental/edencommon/commit/af5725d0dbec6bc7bef1c81fbaaf33d48e44ff18 https://github.com/facebookexperimental/rust-shed/commit/f9dfa61321c9633f9018ff2ca044a4ae228dbaf2 https://github.com/facebookincubator/fizz/commit/935d6fec8592a38d0c0f33b6cd9c6f01dffb3b33 https://github.com/facebookincubator/katran/commit/59f7e15c5801778f870604ae0384936892525f45 https://github.com/facebookincubator/velox/commit/aae50540fbd256f90293348ef8f2b4d817458d6f Reviewed By: bigfootjon fbshipit-source-id: 3957fcbce50458195d64660179075e3f98c32c42 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d1fb735c368c..c199d7449014 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 628d648490392ad000692a678d896001bb3bf73b +Subproject commit cdb212df4d196fb3578504ea2209338c1401757b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index c2e3d38919ec..1ebc95642093 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 88e79a202aef64ea747bb836089a5a924c4e8d71 +Subproject commit 234d39a36a43106747d10cc19efada72fd810dd3 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8d5e50d70793..677a57e8cc47 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 938cb044f65fa65fa3f3f434db56f202785c71f3 +Subproject commit ebbe643fba6d14e2572cf1576d5a2011417785b5 From 4444bbd9008715f7b4bf15b33a9a0728448db61b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 31 Dec 2023 09:31:17 -0800 Subject: [PATCH 6715/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/474e3eb9f42c5e50f734eab0920317654ce8f127 https://github.com/facebook/fb303/commit/7868603d931dbd1f266962ddf96dc47393ca07e4 https://github.com/facebook/fbthrift/commit/d63c97606803666c3fb07cf211908ca845197819 https://github.com/facebook/mvfst/commit/0cc53c9daebfe3d4801625ae239a48f40a4dd578 https://github.com/facebook/proxygen/commit/bfd78772e2243baee337325855e60a0e4e1ed571 https://github.com/facebook/wangle/commit/019cd37bc290f8a6193c5779938092b9521525cc https://github.com/facebook/watchman/commit/61c16032da973e5f59e56298e68b8760ed936f8b https://github.com/facebookexperimental/edencommon/commit/3247920c4b5949f253f495d60a8ed43e86be4082 https://github.com/facebookexperimental/rust-shed/commit/496611d603f627ffa9e06a61ca0a2bd7d7583fe2 https://github.com/facebookincubator/fizz/commit/8007affa8fb244905daa08edd050cea33c76401c https://github.com/facebookincubator/katran/commit/d04374cfb3d20309b70e5fda6d3617b159dca67a https://github.com/facebookincubator/velox/commit/523e561d3da99a78a33c4e22106ba7d1cf83c8a2 Reviewed By: bigfootjon fbshipit-source-id: 80c46c2b81819e5291f2933fbac115591a359fb5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c199d7449014..8043423e9cfb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cdb212df4d196fb3578504ea2209338c1401757b +Subproject commit d63c97606803666c3fb07cf211908ca845197819 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 677a57e8cc47..609ac7f990e6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ebbe643fba6d14e2572cf1576d5a2011417785b5 +Subproject commit 019cd37bc290f8a6193c5779938092b9521525cc From 78cfe4c602f0bcfc845672277244f7834981368a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 1 Jan 2024 09:32:12 -0800 Subject: [PATCH 6716/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/0ada436e001d585084275e9fb293dbbd5b7633e4 https://github.com/facebook/fb303/commit/bad7df94629e4210a9882e0bdb2e2e7c5301ef03 https://github.com/facebook/fbthrift/commit/193f1fd5edbf64349b261f971d301927a6224ebf https://github.com/facebook/mvfst/commit/c6a5287c0236dc700c076ad02b6df85953291771 https://github.com/facebook/proxygen/commit/074d2f94e3b6b8c352139dd13ce30fadcee49191 https://github.com/facebook/wangle/commit/45f38f4e4796ab35ed47705f55ccc0a7f0f7abce https://github.com/facebook/watchman/commit/4444bbd9008715f7b4bf15b33a9a0728448db61b https://github.com/facebookexperimental/rust-shed/commit/396e73c59485862e3a037cd5ca12783d25859740 https://github.com/facebookincubator/katran/commit/4d5a746cde5d6046b7e078b1f87dc588806fd82d https://github.com/pytorch/fbgemm/commit/905ff664a8e13bad4c67870274d5516bd9966ca1 Reviewed By: bigfootjon fbshipit-source-id: 48b8761c10cd5cf5a716a903566ae3a502be07be --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8043423e9cfb..26360dd3d2a1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d63c97606803666c3fb07cf211908ca845197819 +Subproject commit 193f1fd5edbf64349b261f971d301927a6224ebf diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 609ac7f990e6..b9d8a2b89c89 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 019cd37bc290f8a6193c5779938092b9521525cc +Subproject commit 45f38f4e4796ab35ed47705f55ccc0a7f0f7abce From 3d2f9c7d7a8b80a89eb92feebbeef9f361582a89 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 2 Jan 2024 09:32:04 -0800 Subject: [PATCH 6717/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/4aa5f0f1074915b9bfb3393b1acea895d642bf5b https://github.com/facebook/fb303/commit/a070faae3502a84b7b1aebff0b9b7a6799221873 https://github.com/facebook/fbthrift/commit/fc79c2776ecea3ca20930bdc99db19a3b057e415 https://github.com/facebook/folly/commit/7e99a5c3c2297b1d7288c15fd28470011f80a946 https://github.com/facebook/litho/commit/32d6567b60b516180021d8b39690caca17109dc4 https://github.com/facebook/ocamlrep/commit/b9f3018e11dad56b2308e6410bd93224145f5cd4 https://github.com/facebook/proxygen/commit/5b09291cdb976dadf6d4f9c44d98f5e81fde2c91 https://github.com/facebook/watchman/commit/78cfe4c602f0bcfc845672277244f7834981368a https://github.com/facebookexperimental/rust-shed/commit/3b73142d06e0b7fc90c9865a096de9b17d5660c7 https://github.com/facebookincubator/velox/commit/e907a80013fddca7b38f769b4168a1d7ca1510f6 Reviewed By: jurajh-fb fbshipit-source-id: 7f7fa5fcc5adf7e5159a8ccf53c8095486376c4a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 26360dd3d2a1..e287ccde9f1d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 193f1fd5edbf64349b261f971d301927a6224ebf +Subproject commit fc79c2776ecea3ca20930bdc99db19a3b057e415 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 1ebc95642093..491fa14f1252 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 234d39a36a43106747d10cc19efada72fd810dd3 +Subproject commit 7e99a5c3c2297b1d7288c15fd28470011f80a946 From 2a682968bf96507ef06ebc8ca7b72b8a5376a858 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 3 Jan 2024 09:34:04 -0800 Subject: [PATCH 6718/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/27c01b6a65889364cc89f136b62d80948fbc80a7 https://github.com/facebook/fb303/commit/3bd29089309f3d89ab366ac388f676832ae27505 https://github.com/facebook/fbthrift/commit/cbbe201fe926690ba6b213c5b7fded6434d8d3a8 https://github.com/facebook/folly/commit/3d5c1c397724490f0156b15697bcf8dcca82b85d https://github.com/facebook/litho/commit/015c90d8972da28d584c9ec58070ef708b040680 https://github.com/facebook/mcrouter/commit/10eba7af19ac09ec6605a4eaf622aa4717a2623e https://github.com/facebook/mvfst/commit/157a103cff0da2de2e5179c7456393a4caa6f2bd https://github.com/facebook/ocamlrep/commit/b0274ab967387fd743d0aeca47b127e6caa7a471 https://github.com/facebook/proxygen/commit/a070f435c854fbf16d8109c22367de53f04f4f76 https://github.com/facebook/rocksdb/commit/81b6296c7e5a6a4a0241559d2de878677f160b38 https://github.com/facebook/wangle/commit/b986eebbc077b9d862c2ca07d2d9afadf7499a23 https://github.com/facebook/watchman/commit/3d2f9c7d7a8b80a89eb92feebbeef9f361582a89 https://github.com/facebookexperimental/edencommon/commit/5f25599da14e6633991280e7926941de25ff6e89 https://github.com/facebookexperimental/rust-shed/commit/2586ffbfcdf2112a18894c8fc00c52eada143097 https://github.com/facebookincubator/fizz/commit/d0bf94f24a90bead06d3177148d08f893eb4fe28 https://github.com/facebookincubator/katran/commit/cb7ed3ca3e578e34b668fef3dde1f323cb53cedf https://github.com/facebookincubator/velox/commit/551e82f3facdd48c8832b71bcc4879626d5aecbe https://github.com/pytorch/fbgemm/commit/441697c0481f82b9c328d39f70e4b34fdc890758 https://github.com/pytorch/kineto/commit/eb56921f8cf6f4d14c16c45fe7586d5a6dccaf9e Reviewed By: jurajh-fb fbshipit-source-id: 45417aca7a4816a8a4565783cd14bcbc39f307c6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e287ccde9f1d..2f6cb9d5ee98 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit fc79c2776ecea3ca20930bdc99db19a3b057e415 +Subproject commit cbbe201fe926690ba6b213c5b7fded6434d8d3a8 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 491fa14f1252..2f95824841de 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7e99a5c3c2297b1d7288c15fd28470011f80a946 +Subproject commit 3d5c1c397724490f0156b15697bcf8dcca82b85d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b9d8a2b89c89..aa505aaa7419 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 45f38f4e4796ab35ed47705f55ccc0a7f0f7abce +Subproject commit b986eebbc077b9d862c2ca07d2d9afadf7499a23 From d764edb2a08118b9f11308d720f2b20d9c75984f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 4 Jan 2024 09:31:38 -0800 Subject: [PATCH 6719/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/954ddc042e0b213e0472a1595b471d0bf578ed49 https://github.com/facebook/fb303/commit/fdc2f44ecc41742f36a2712c88beb281d1095370 https://github.com/facebook/fbthrift/commit/b440477745b6b13945cd7e62de7ee61bfda7747a https://github.com/facebook/folly/commit/58bd6ddb71224b1f20ecf62e9870e44950cf44ed https://github.com/facebook/litho/commit/292f563e76221c86c5de5944953086fa3bafcf8c https://github.com/facebook/mvfst/commit/6d722b1f5ba56de7679dc87c8adfa522c1a27523 https://github.com/facebook/ocamlrep/commit/ef32e3aca22bcd679ea6ab831b8a06e78b38de1a https://github.com/facebook/proxygen/commit/0c25f6be3a62d78ef80d5186ec52c0693f97f882 https://github.com/facebook/wangle/commit/a73c800c22a3ff5f079fb3df0c722ada68c7b4a9 https://github.com/facebook/watchman/commit/2a682968bf96507ef06ebc8ca7b72b8a5376a858 https://github.com/facebookexperimental/edencommon/commit/2e6b99d2212f1fe6822fd7f42596c0ae4fd7550c https://github.com/facebookexperimental/rust-shed/commit/0abab0f19d5ce010934303c40113f19b1945fd4e https://github.com/facebookincubator/fizz/commit/34920f9801b5e3cc8564a9cbdb5ed2a036521747 https://github.com/facebookincubator/katran/commit/eeac8891bd822f611ee7ed31f98735758da2ecb7 https://github.com/facebookincubator/velox/commit/a289ac7eb23906b1bacf13a5df609fe55274b470 https://github.com/facebookresearch/multimodal/commit/63c629a031675fe8604f88cbc2145aa00ae410f0 https://github.com/facebookresearch/vrs/commit/83d9db8c9ccd3af29321dc9360b9ebfe335d1d30 https://github.com/pytorch/fbgemm/commit/fe62b66b6a9f1ffff2ee5f6d78b682c8cbe9ca1c Reviewed By: jurajh-fb fbshipit-source-id: 6b77040adba80a2ce8bac97d9f1139e7ccbe009b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2f6cb9d5ee98..23c06075e159 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cbbe201fe926690ba6b213c5b7fded6434d8d3a8 +Subproject commit b440477745b6b13945cd7e62de7ee61bfda7747a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 2f95824841de..ab8c15c4a220 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 3d5c1c397724490f0156b15697bcf8dcca82b85d +Subproject commit 58bd6ddb71224b1f20ecf62e9870e44950cf44ed diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index aa505aaa7419..087a1f2e7acd 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b986eebbc077b9d862c2ca07d2d9afadf7499a23 +Subproject commit a73c800c22a3ff5f079fb3df0c722ada68c7b4a9 From d753acd45728e11f23241c3b6ae603a697fd9ce4 Mon Sep 17 00:00:00 2001 From: Jason Fried Date: Thu, 4 Jan 2024 12:59:20 -0800 Subject: [PATCH 6720/7387] DebugWipeFinder fixes for 3.12 Summary: X-link: https://github.com/facebookincubator/zstrong/pull/662 find_module has been deprecated for some time. Instead use find_spec Reviewed By: itamaro Differential Revision: D52495680 fbshipit-source-id: 9b827a783af2d858816a8d197530874f680502f3 --- build/fbcode_builder/CMake/fb_py_test_main.py | 35 ++++++------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/build/fbcode_builder/CMake/fb_py_test_main.py b/build/fbcode_builder/CMake/fb_py_test_main.py index 0ee1e8cc68e0..2a9b5b4b9eed 100644 --- a/build/fbcode_builder/CMake/fb_py_test_main.py +++ b/build/fbcode_builder/CMake/fb_py_test_main.py @@ -22,11 +22,8 @@ import traceback import unittest import warnings +from importlib.machinery import PathFinder -# Hide warning about importing "imp"; remove once python2 is gone. -with warnings.catch_warnings(): - warnings.filterwarnings("ignore", category=DeprecationWarning) - import imp try: from StringIO import StringIO @@ -82,7 +79,7 @@ def include(self, path): return not self.omit(path) -class DebugWipeFinder(object): +class DebugWipeFinder(PathFinder): """ PEP 302 finder that uses a DebugWipeLoader for all files which do not need coverage @@ -91,28 +88,15 @@ class DebugWipeFinder(object): def __init__(self, matcher): self.matcher = matcher - def find_module(self, fullname, path=None): - _, _, basename = fullname.rpartition(".") - try: - fd, pypath, (_, _, kind) = imp.find_module(basename, path) - except Exception: - # Finding without hooks using the imp module failed. One reason - # could be that there is a zip file on sys.path. The imp module - # does not support loading from there. Leave finding this module to - # the others finders in sys.meta_path. + def find_spec(self, fullname, path=None, target=None): + spec = super().find_spec(fullname, path=path, target=target) + if spec is None or spec.origin is None: return None - - if hasattr(fd, "close"): - fd.close() - if kind != imp.PY_SOURCE: + if not spec.origin.endswith(".py"): return None - if self.matcher.include(pypath): + if self.matcher.include(spec.origin): return None - """ - This is defined to match CPython's PyVarObject struct - """ - class PyVarObject(ctypes.Structure): _fields_ = [ ("ob_refcnt", ctypes.c_long), @@ -126,7 +110,7 @@ class DebugWipeLoader(SourceFileLoader): """ def get_code(self, fullname): - code = super(DebugWipeLoader, self).get_code(fullname) + code = super().get_code(fullname) if code: # Ideally we'd do # code.co_lnotab = b'' @@ -136,7 +120,8 @@ def get_code(self, fullname): code_impl.ob_size = 0 return code - return DebugWipeLoader(fullname, pypath) + spec.loader = DebugWipeLoader(fullname, spec.origin) + return spec def optimize_for_coverage(cov, include_patterns, omit_patterns): From 6b618f4d94d6d5e435fad36a7372a12aba37b0c3 Mon Sep 17 00:00:00 2001 From: Jason Fried Date: Fri, 5 Jan 2024 08:07:42 -0800 Subject: [PATCH 6721/7387] fix DebugWipeLoader being used for zipimporter Summary: X-link: https://github.com/facebookincubator/zstrong/pull/664 Need to insure DebugWipeLoader doesn't get used for zipimporter files. The original imp.find_module that I replaced did not support zipimporter the new importlib find_spec does find the them. Reviewed By: itamaro Differential Revision: D52556833 fbshipit-source-id: bf5892a950a965bb3b17ab951910db2e33b69a34 --- build/fbcode_builder/CMake/fb_py_test_main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/fbcode_builder/CMake/fb_py_test_main.py b/build/fbcode_builder/CMake/fb_py_test_main.py index 2a9b5b4b9eed..a9499e221a4d 100644 --- a/build/fbcode_builder/CMake/fb_py_test_main.py +++ b/build/fbcode_builder/CMake/fb_py_test_main.py @@ -120,7 +120,8 @@ def get_code(self, fullname): code_impl.ob_size = 0 return code - spec.loader = DebugWipeLoader(fullname, spec.origin) + if isinstance(spec.loader, SourceFileLoader): + spec.loader = DebugWipeLoader(fullname, spec.origin) return spec From 4f4911256ca355a18f33aacc85d29e4b424026c8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 5 Jan 2024 09:31:27 -0800 Subject: [PATCH 6722/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/b8a4a40d075f9ee39969e19f38a62971860cb851 https://github.com/facebook/fb303/commit/dfbf46d580d4412f8ca297d56fb3baa5ee25690f https://github.com/facebook/fbthrift/commit/2e9f77b0a89039f8b527c2ccd609f41a050e7fe4 https://github.com/facebook/folly/commit/43d0ff54f7002cc6ccb7250c5c6931a86252605a https://github.com/facebook/litho/commit/b2aad9e7344cc9f65833449205352e26b2c6c858 https://github.com/facebook/mvfst/commit/d51b9a79fb9afa695cd914db84b7d0f7033fc04f https://github.com/facebook/ocamlrep/commit/847327d3ea01c44261efbc03893eb8bbad6000b0 https://github.com/facebook/proxygen/commit/650eb96e4a082421f62171e87de466267d9f15ea https://github.com/facebook/rocksdb/commit/ed46981bea38ad6ccc6258956ceafce08d7b50e9 https://github.com/facebook/wangle/commit/13ca7cabe09695d128843b048553cfd7bae2c646 https://github.com/facebook/watchman/commit/d753acd45728e11f23241c3b6ae603a697fd9ce4 https://github.com/facebookexperimental/edencommon/commit/d81cf3710a0da66201088020539aa30cf78346af https://github.com/facebookexperimental/rust-shed/commit/62a7c8eaffb9c5c8b3c350926f43a3cdbbef3a05 https://github.com/facebookincubator/fizz/commit/3786fd225508f1989e502b53a2ef72f1155cf1ea https://github.com/facebookincubator/katran/commit/161b335ac6d023ad5c1df6f57f507e46fb276b1c https://github.com/facebookincubator/velox/commit/e5355f3663015aa002faa1e639138f99b2cac4a1 Reviewed By: jurajh-fb fbshipit-source-id: 341bce2d02f306def27d3ebb75a23f32432468ac --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 23c06075e159..415a92703d01 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b440477745b6b13945cd7e62de7ee61bfda7747a +Subproject commit 2e9f77b0a89039f8b527c2ccd609f41a050e7fe4 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ab8c15c4a220..f6cf46d0cf2e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 58bd6ddb71224b1f20ecf62e9870e44950cf44ed +Subproject commit 43d0ff54f7002cc6ccb7250c5c6931a86252605a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 087a1f2e7acd..94321f5780e1 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a73c800c22a3ff5f079fb3df0c722ada68c7b4a9 +Subproject commit 13ca7cabe09695d128843b048553cfd7bae2c646 From 0bc8b8349960ff18f62efb6b980deb48016654ca Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 6 Jan 2024 09:31:48 -0800 Subject: [PATCH 6723/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/1110b52605d4f7bbe5a52259fc8d0d77aa5a0056 https://github.com/facebook/fb303/commit/642c061b98e1de81d0bf3fb02db34bb889163962 https://github.com/facebook/fbthrift/commit/1f7224dedfd3ede3ecb5a015836f81674f0dabed https://github.com/facebook/folly/commit/f601d244aac60d591228cfd41a566d0039d4deef https://github.com/facebook/litho/commit/13d33bc23c1cb4c8ca262fa5f706d3fdcb58c6d6 https://github.com/facebook/mvfst/commit/ce9687220e47b01232d2186b610b23958009792a https://github.com/facebook/ocamlrep/commit/f592c1b2beeaa46c42b49ce53ba96d228cbe259a https://github.com/facebook/proxygen/commit/fde32fe8e79631a2b909666bd16a3fb3807d81ce https://github.com/facebook/rocksdb/commit/1de69409805e196dae4daad4975f6f83080f8a7c https://github.com/facebook/wangle/commit/d10c40f0bbd3cc7f1db95da3f5c92c3c00fd4613 https://github.com/facebook/watchman/commit/4f4911256ca355a18f33aacc85d29e4b424026c8 https://github.com/facebookexperimental/edencommon/commit/4d0a11de984b15f7b0cb34d5aca772bee8312169 https://github.com/facebookexperimental/rust-shed/commit/c3e201080caaea38f23413a54b67362f5288effd https://github.com/facebookincubator/fizz/commit/c7666c19e2816b0cd871e9f9f73d49dec294f51e https://github.com/facebookincubator/katran/commit/c098d546e9f9f54b7906fb674d0843f8f4679c6e https://github.com/facebookincubator/velox/commit/75a5dca5735653926d14277ea6fc7908e1ec5f8c https://github.com/facebookresearch/pytorch-biggraph/commit/1bca13c6fe957288e3a836e9a31d2f4acf643a89 https://github.com/pytorch/fbgemm/commit/ca6ac2fd3ca5f8a1a17adce5290ac493d7857efb Reviewed By: jurajh-fb fbshipit-source-id: 4457bc96876248a4b939a4bf37c6003f96e0177d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 415a92703d01..aab41ca25b06 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2e9f77b0a89039f8b527c2ccd609f41a050e7fe4 +Subproject commit 1f7224dedfd3ede3ecb5a015836f81674f0dabed diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f6cf46d0cf2e..e23a51359435 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 43d0ff54f7002cc6ccb7250c5c6931a86252605a +Subproject commit f601d244aac60d591228cfd41a566d0039d4deef diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 94321f5780e1..66b3e401e33b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 13ca7cabe09695d128843b048553cfd7bae2c646 +Subproject commit d10c40f0bbd3cc7f1db95da3f5c92c3c00fd4613 From efe30313a6c85ef8c73a9d8223e18fa33d045e57 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 7 Jan 2024 09:32:02 -0800 Subject: [PATCH 6724/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/c53679110eadf9c5a188cc27b87ef03b5e1c8a26 https://github.com/facebook/fb303/commit/383f36a863ecb8c27b6feb826c1fe1343043ddf0 https://github.com/facebook/fbthrift/commit/f6681150810835c02e9c1efd1ec8f5d615c51618 https://github.com/facebook/mvfst/commit/442f48392eaecb06b0e04aa3da9f232ee094d96d https://github.com/facebook/ocamlrep/commit/3d5015b37c65c515fc5237776a5d790bb7906593 https://github.com/facebook/proxygen/commit/25a521a054a7ce978fbee01c4958564a80e97287 https://github.com/facebook/wangle/commit/0f6bdb225f0eb2a363d9171425966977c2b035d8 https://github.com/facebook/watchman/commit/0bc8b8349960ff18f62efb6b980deb48016654ca https://github.com/facebookexperimental/edencommon/commit/1a990af888867dd0f078d30f95bebf9a44ce0dc2 https://github.com/facebookexperimental/rust-shed/commit/dd542a16d196a1ea6e83c583d12b51fbd3c2414b https://github.com/facebookincubator/fizz/commit/f1ff66035720aee4983b330201956abf0dbb9dfa https://github.com/facebookincubator/katran/commit/65d9108c6f1a7a4a7b9dcd447cf65e29f12e7bd7 Reviewed By: jurajh-fb fbshipit-source-id: eb90031f0a8e3d4aa362585a358443d7bb2ca027 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index aab41ca25b06..25b28408f5fa 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1f7224dedfd3ede3ecb5a015836f81674f0dabed +Subproject commit f6681150810835c02e9c1efd1ec8f5d615c51618 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 66b3e401e33b..b0e1364e5631 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d10c40f0bbd3cc7f1db95da3f5c92c3c00fd4613 +Subproject commit 0f6bdb225f0eb2a363d9171425966977c2b035d8 From 87bd1415fb67c2b7ca1ee2c2cd522b4e2791e32a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 8 Jan 2024 09:31:29 -0800 Subject: [PATCH 6725/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/ef65925cd9570226452af909341ba68943babcac https://github.com/facebook/fb303/commit/754947b0d83659313ad432346bab51085308cea7 https://github.com/facebook/fbthrift/commit/337dfa0e5a9d7bb2f7a24acc9a996b9e030b2535 https://github.com/facebook/litho/commit/f4c886025410603fa2158fa1a0f9c9b7f1446adb https://github.com/facebook/mvfst/commit/070ee5eebd8a321aea3edfd680463855ac55cdd5 https://github.com/facebook/ocamlrep/commit/95429d5f79897789a95d111bbcbd5413f01cb8c2 https://github.com/facebook/proxygen/commit/22a08ad562a08970b7f8bea04db29a96ad6012b3 https://github.com/facebook/wangle/commit/d72e57336f354d5505a4ad4ca9b02c2ffe162fd6 https://github.com/facebook/watchman/commit/efe30313a6c85ef8c73a9d8223e18fa33d045e57 https://github.com/facebookexperimental/rust-shed/commit/6530a45e5636597f8c11fc7b9ff3c16bf4a92457 https://github.com/facebookincubator/katran/commit/1c8a29638f5030d25787d288f5eba8e9a176effa Reviewed By: jailby fbshipit-source-id: 2dd4c316adc5ef4b317a4f644faacad06fcc73a1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 25b28408f5fa..b9f250a8dcee 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f6681150810835c02e9c1efd1ec8f5d615c51618 +Subproject commit 337dfa0e5a9d7bb2f7a24acc9a996b9e030b2535 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b0e1364e5631..c450a8212e01 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0f6bdb225f0eb2a363d9171425966977c2b035d8 +Subproject commit d72e57336f354d5505a4ad4ca9b02c2ffe162fd6 From 126b6cb16073991f17979acf8d8cfe6109dfabb1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 9 Jan 2024 09:34:06 -0800 Subject: [PATCH 6726/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/e2262af3c8727883da80101d9d0ed68305bcce64 https://github.com/facebook/fb303/commit/d521aa0aa2595793b536b97f323db4880eec4d36 https://github.com/facebook/fbthrift/commit/4355fcc922cf0b02db63df48f5df6efd7c30497e https://github.com/facebook/folly/commit/3cfe240994a92102e9bc10dce26be8f37f8b08ed https://github.com/facebook/litho/commit/f06c209b9783bd2e600fa556975db6b74ff8205d https://github.com/facebook/mcrouter/commit/5f48072d439c180090c4a4e143bc2ed3e14006a1 https://github.com/facebook/ocamlrep/commit/b5dfcd1da30f1733745cdcb1588bcec718d11a0e https://github.com/facebook/proxygen/commit/fa4c88d2d3b6e461e8b5adbbc1eff9ac21febe69 https://github.com/facebook/watchman/commit/87bd1415fb67c2b7ca1ee2c2cd522b4e2791e32a https://github.com/facebookexperimental/rust-shed/commit/cca961eacd0af777218746242522c4ace21f0b68 https://github.com/facebookincubator/velox/commit/cb1dd4393504db5df17be1cdb4e2f24e7200afa8 https://github.com/pytorch/fbgemm/commit/127474c35efeef9916e1863a66ab1115dd483622 Reviewed By: jailby fbshipit-source-id: 6d5426f1c02dbb3a6132f5d53ec858143a97aeee --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b9f250a8dcee..1ddac77d158f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 337dfa0e5a9d7bb2f7a24acc9a996b9e030b2535 +Subproject commit 4355fcc922cf0b02db63df48f5df6efd7c30497e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e23a51359435..77c738fdca10 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f601d244aac60d591228cfd41a566d0039d4deef +Subproject commit 3cfe240994a92102e9bc10dce26be8f37f8b08ed From e6048d51f0d317d332453afb99aff7aba3b5ea2e Mon Sep 17 00:00:00 2001 From: Dave Nicolson Date: Tue, 9 Jan 2024 11:02:49 -0800 Subject: [PATCH 6727/7387] Fix pluralization (#1180) Summary: This replaces "Recrawled this watch 1 times" with "Recrawled this watch 1 time". Pull Request resolved: https://github.com/facebook/watchman/pull/1180 Reviewed By: genevievehelsel Differential Revision: D52463712 fbshipit-source-id: 8b46f6f57836d562525606103972944b671e2c81 --- watchman/root/threading.cpp | 4 +++- website/docs/troubleshooting.md | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) mode change 100644 => 100755 watchman/root/threading.cpp diff --git a/watchman/root/threading.cpp b/watchman/root/threading.cpp old mode 100644 new mode 100755 index 5b83c94e3ea0..05886c770078 --- a/watchman/root/threading.cpp +++ b/watchman/root/threading.cpp @@ -28,7 +28,9 @@ void Root::scheduleRecrawl(const char* why) { info->warning = w_string::build( "Recrawled this watch ", info->recrawlCount, - " times, most recently because:\n", + " time", + info->recrawlCount != 1 ? "s" : "", + ", most recently because:\n", why, "To resolve, please review the information on\n", cfg_get_trouble_url(), diff --git a/website/docs/troubleshooting.md b/website/docs/troubleshooting.md index f91ae5d201cf..251496b7f715 100644 --- a/website/docs/troubleshooting.md +++ b/website/docs/troubleshooting.md @@ -56,7 +56,7 @@ macOS has a similar internal limit and behavior when that limit is exceeded. If you're encountering a message like: ``` -Recrawled this watch 1 times, most recently because: +Recrawled this watch 1 time, most recently because: /some/path: kFSEventStreamEventFlagUserDropped ``` From 23fe5a76487f3d120fe116bbcc86af54518f2f9d Mon Sep 17 00:00:00 2001 From: Alex Schneidman Date: Tue, 9 Jan 2024 15:28:32 -0800 Subject: [PATCH 6728/7387] Use archives.boost.io instead of jfrog for fetching boost Summary: X-link: https://github.com/facebook/proxygen/pull/478 X-link: https://github.com/facebook/folly/pull/2122 X-link: https://github.com/facebookincubator/zstrong/pull/667 X-link: https://github.com/facebook/wangle/pull/224 AIRStore's contbuild broke a few days ago with a failure to unpack the boost tarball. This is because boost's jfrog subscription expired. The recommended workaround is to use `archive.boost.io` instead. The checksums are the same. https://github.com/facebook/react-native/issues/42180 Reviewed By: chadaustin Differential Revision: D52612598 fbshipit-source-id: c0f7a6a8ea2ebde1bd9bd60ed0888e9a6c0ebf9a --- build/fbcode_builder/manifests/boost | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/fbcode_builder/manifests/boost b/build/fbcode_builder/manifests/boost index 89b4ee4e293b..a164cc6f96ec 100644 --- a/build/fbcode_builder/manifests/boost +++ b/build/fbcode_builder/manifests/boost @@ -2,11 +2,11 @@ name = boost [download.not(os=windows)] -url = https://boostorg.jfrog.io/artifactory/main/release/1.83.0/source/boost_1_83_0.tar.gz +url = https://archives.boost.io/release/1.83.0/source/boost_1_83_0.tar.gz sha256 = c0685b68dd44cc46574cce86c4e17c0f611b15e195be9848dfd0769a0a207628 [download.os=windows] -url = https://boostorg.jfrog.io/artifactory/main/release/1.83.0/source/boost_1_83_0.zip +url = https://archives.boost.io/release/1.83.0/source/boost_1_83_0.zip sha256 = c86bd9d9eef795b4b0d3802279419fde5221922805b073b9bd822edecb1ca28e [preinstalled.env] From fe14d8e85e373f586ee81eebc33d2c2a71f41b13 Mon Sep 17 00:00:00 2001 From: Stiopa Koltsov Date: Tue, 9 Jan 2024 17:44:52 -0800 Subject: [PATCH 6729/7387] format_code_in_doc_comments = true Summary: D52632085 Reviewed By: chadaustin, zertosh Differential Revision: D52639860 fbshipit-source-id: 170172ac9ed6b2703cb5dfa85da86565797a9452 --- watchman/rust/watchman_client/src/fields.rs | 2 +- watchman/rust/watchman_client/src/lib.rs | 44 ++++++++++----------- watchman/rust/watchman_client/src/pdu.rs | 6 +-- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/watchman/rust/watchman_client/src/fields.rs b/watchman/rust/watchman_client/src/fields.rs index 6ffc46606594..3807b0c105df 100644 --- a/watchman/rust/watchman_client/src/fields.rs +++ b/watchman/rust/watchman_client/src/fields.rs @@ -282,8 +282,8 @@ define_field!( /// list of field names: /// /// ``` -/// use watchman_client::prelude::*; /// use serde::Deserialize; +/// use watchman_client::prelude::*; /// /// query_result_type! { /// struct NameAndHash { diff --git a/watchman/rust/watchman_client/src/lib.rs b/watchman/rust/watchman_client/src/lib.rs index a68228d9a507..17759df0a075 100644 --- a/watchman/rust/watchman_client/src/lib.rs +++ b/watchman/rust/watchman_client/src/lib.rs @@ -22,15 +22,15 @@ //! use watchman_client::prelude::*; //! #[tokio::main] //! async fn main() -> Result<(), Box> { -//! let mut client = Connector::new().connect().await?; -//! let resolved = client -//! .resolve_root(CanonicalPath::canonicalize(".")?) -//! .await?; +//! let mut client = Connector::new().connect().await?; +//! let resolved = client +//! .resolve_root(CanonicalPath::canonicalize(".")?) +//! .await?; //! -//! // Basic globs -> names -//! let files = client.glob(&resolved, &["**/*.rs"]).await?; -//! println!("files: {:#?}", files); -//! Ok(()) +//! // Basic globs -> names +//! let files = client.glob(&resolved, &["**/*.rs"]).await?; +//! println!("files: {:#?}", files); +//! Ok(()) //! } //! ``` #![deny(warnings)] @@ -957,8 +957,8 @@ impl Client { /// [NameOnly](struct.NameOnly.html) struct. /// /// ``` - /// use watchman_client::prelude::*; /// use serde::Deserialize; + /// use watchman_client::prelude::*; /// /// query_result_type! { /// struct NameAndType { @@ -968,20 +968,20 @@ impl Client { /// } /// /// async fn query( - /// client: &mut Client, - /// resolved: &ResolvedRoot + /// client: &mut Client, + /// resolved: &ResolvedRoot, /// ) -> Result<(), Box> { - /// let response: QueryResult = client - /// .query( - /// &resolved, - /// QueryRequestCommon { - /// glob: Some(vec!["**/*.rs".to_string()]), - /// ..Default::default() - /// }, - /// ) - /// .await?; - /// println!("response: {:#?}", response); - /// Ok(()) + /// let response: QueryResult = client + /// .query( + /// &resolved, + /// QueryRequestCommon { + /// glob: Some(vec!["**/*.rs".to_string()]), + /// ..Default::default() + /// }, + /// ) + /// .await?; + /// println!("response: {:#?}", response); + /// Ok(()) /// } /// ``` /// diff --git a/watchman/rust/watchman_client/src/pdu.rs b/watchman/rust/watchman_client/src/pdu.rs index 9cde1d1a8126..f4a2a4df2c4e 100644 --- a/watchman/rust/watchman_client/src/pdu.rs +++ b/watchman/rust/watchman_client/src/pdu.rs @@ -736,9 +736,9 @@ pub enum ContentSha1Hex { /// use watchman_client::prelude::*; /// #[derive(Deserialize, Debug, Clone)] /// struct NameAndType { -/// name: std::path::PathBuf, -/// #[serde(rename = "type")] -/// file_type: FileType, +/// name: std::path::PathBuf, +/// #[serde(rename = "type")] +/// file_type: FileType, /// } /// ``` #[derive(Serialize, Deserialize, Debug, Clone, Copy)] From 367b6c7664ae44e08713b6caaf3a3edac7edadcb Mon Sep 17 00:00:00 2001 From: Stiopa Koltsov Date: Tue, 9 Jan 2024 22:59:04 -0800 Subject: [PATCH 6730/7387] format_code_in_doc_comments = true Summary: Another attempt to enable the option. [We agreed](https://fb.workplace.com/groups/rust.language/posts/24184800024475285) we want it everywhere by default. # Help us, help yourself If you can help enabling this option, consider running this command ahead of time: ``` hg files . -I 'your_project/**/*.rs' | \ xargs arc rustfmt --config format_code_in_doc_comments=true ``` Fix the which is not landed yet: ``` hg st --rev .~1 -n -ma -I '**/*.rs' | \ xargs arc rustfmt --config format_code_in_doc_comments=true ``` Fix the stack of commits: checkout the top commit, and then: ``` # must include changes from D52632478 fbcode/scripts/nga/stack-rustfmt-new ``` # Previous attempt D42766542 Reviewed By: zertosh, dtolnay Differential Revision: D52632085 fbshipit-source-id: f45998c76076470d66339eb99f585856d2114999 --- rustfmt.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/rustfmt.toml b/rustfmt.toml index b7258ed0a8d8..336df502642e 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,6 +1,7 @@ # Get help on options with `rustfmt --help=config` # Please keep these in alphabetical order. edition = "2021" +format_code_in_doc_comments = true group_imports = "StdExternalCrate" imports_granularity = "Item" merge_derives = false From 1219e733c231a17418100511fda8761055654820 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 10 Jan 2024 09:31:42 -0800 Subject: [PATCH 6731/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/bb48170cb861e67cb51700295e2eed8f13ba5c92 https://github.com/facebook/fb303/commit/7ce25e86043d35d38aac61e382dcfc3594faeccc https://github.com/facebook/fbthrift/commit/8de73fec1b68a4881ab65c1c19c9ebed2e3dd237 https://github.com/facebook/folly/commit/a8318792992593989f0a87fe3ce53b99f947c6c9 https://github.com/facebook/litho/commit/ee97494c87782652a9bf94ac9a5680c34badc371 https://github.com/facebook/mcrouter/commit/6b59e589332e17f3e07f7ebe53ed5b483629b6bf https://github.com/facebook/mvfst/commit/e8eff25a13f5c27196a27e88ead88f0bd9dcd8d9 https://github.com/facebook/ocamlrep/commit/144904d1d443d65545cf09ffc1d1068e097d20ff https://github.com/facebook/proxygen/commit/9e47439539b9204d8850980653aff9e03fd1b5e4 https://github.com/facebook/rocksdb/commit/c5fbfd7ad807867f85fb992a61a228e4417b55ea https://github.com/facebook/wangle/commit/484d573fd4d4a6bddbe51cf3dccc8a2824a892a0 https://github.com/facebook/watchman/commit/367b6c7664ae44e08713b6caaf3a3edac7edadcb https://github.com/facebookexperimental/edencommon/commit/a7b586b1ee384261bbaeffe7fd2a6756cf0ebe4a https://github.com/facebookexperimental/rust-shed/commit/fd4456a12f3b4ad5efa7470a352bd2890f6edd94 https://github.com/facebookincubator/fizz/commit/7d49e57b866ba8cbd0e89f1783f5b93adba7e16f https://github.com/facebookincubator/katran/commit/c6d86c6afaddb0168d3052b3b5d2d626c83d0c02 https://github.com/facebookincubator/sks/commit/6cd29d75fbcde212e4a612ccd24172b45dd86a9c https://github.com/facebookincubator/superconsole/commit/0531d255d8d5c4c9ddbdc3d4372b7314310fd9f0 https://github.com/facebookincubator/velox/commit/561cb69cbcc846670a7ac8735ce048202751bda0 https://github.com/pytorch/fbgemm/commit/86bf95d498806873f73c4e1f04551e0aa7bdf417 Reviewed By: jailby fbshipit-source-id: 4a1d771a48625735bd0fe45891df9c74500aa9c7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1ddac77d158f..24987e978250 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4355fcc922cf0b02db63df48f5df6efd7c30497e +Subproject commit 8de73fec1b68a4881ab65c1c19c9ebed2e3dd237 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 77c738fdca10..d572275dc9be 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 3cfe240994a92102e9bc10dce26be8f37f8b08ed +Subproject commit a8318792992593989f0a87fe3ce53b99f947c6c9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c450a8212e01..eb9bb8bce5a5 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d72e57336f354d5505a4ad4ca9b02c2ffe162fd6 +Subproject commit 484d573fd4d4a6bddbe51cf3dccc8a2824a892a0 From a893b04308e518fe68b3ca29ff3a239f638d0c35 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 11 Jan 2024 09:31:25 -0800 Subject: [PATCH 6732/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/c3f6bf7dae0ef1475eb53c2291ba3cb24faeff0e https://github.com/facebook/fb303/commit/0ddd5fda959ce7d63d29385a61be9eb53b0a8dcf https://github.com/facebook/fbthrift/commit/9c8d26a31594a317cc8024f796389fc3cf9ba4fd https://github.com/facebook/folly/commit/beb3e5dd6a996510b5f5c7204f3935c24c976d28 https://github.com/facebook/litho/commit/6ebd9fb56ef3f84f728ea6a63411177942834d7d https://github.com/facebook/mvfst/commit/bfda236102d42fd760af547dd5580a09c2e27978 https://github.com/facebook/ocamlrep/commit/a550828f8a7af3a3a46d23d79b4107749a4a3faa https://github.com/facebook/proxygen/commit/70a21d56ea7ca7be497501d30b47f93ba12a07bb https://github.com/facebook/rocksdb/commit/0758271d519bcc5d7266fec26ae1f3ab887aa130 https://github.com/facebook/wangle/commit/a23216bb57fb37b16fc6626e2992982faa1ab9a3 https://github.com/facebook/watchman/commit/1219e733c231a17418100511fda8761055654820 https://github.com/facebookexperimental/edencommon/commit/218b21ad045c7602a6016615c476936dfc316284 https://github.com/facebookexperimental/rust-shed/commit/bef1221c50e19ba8d475d7869bf0b9d6b1dfa2f2 https://github.com/facebookincubator/fizz/commit/6a878d03ec29eb9114b50e4b1589a6d3bc13d683 https://github.com/facebookincubator/katran/commit/0a4aad966f77bdfb8b99e317e3aab1e894ce6159 https://github.com/facebookincubator/velox/commit/b6e6e581e0468449f6a93aeb6fc8399fd7d7bed8 https://github.com/pytorch/fbgemm/commit/cf86516a2dbe7dd0813495172c7a6416033c75df Reviewed By: jailby fbshipit-source-id: 189c6232c8a98cb515a5d0296fd1a80e3cd04d61 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 24987e978250..67ed7c2be22c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8de73fec1b68a4881ab65c1c19c9ebed2e3dd237 +Subproject commit 9c8d26a31594a317cc8024f796389fc3cf9ba4fd diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d572275dc9be..e67f169070a8 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a8318792992593989f0a87fe3ce53b99f947c6c9 +Subproject commit beb3e5dd6a996510b5f5c7204f3935c24c976d28 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index eb9bb8bce5a5..a5be918cd2f9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 484d573fd4d4a6bddbe51cf3dccc8a2824a892a0 +Subproject commit a23216bb57fb37b16fc6626e2992982faa1ab9a3 From 5426ce6730156be268ca8c63554c52795a08c2a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 16:13:20 -0800 Subject: [PATCH 6733/7387] Bump follow-redirects from 1.15.2 to 1.15.4 in /website (#1184) Summary: Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.4.
Commits
  • 6585820 Release version 1.15.4 of the npm package.
  • 7a6567e Disallow bracketed hostnames.
  • 05629af Prefer native URL instead of deprecated url.parse.
  • 1cba8e8 Prefer native URL instead of legacy url.resolve.
  • 72bc2a4 Simplify _processResponse error handling.
  • 3d42aec Add bracket tests.
  • bcbb096 Do not directly set Error properties.
  • 192dbe7 Release version 1.15.3 of the npm package.
  • bd8c81e Fix resource leak on destroy.
  • 9c728c3 Split linting and testing.
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=follow-redirects&package-manager=npm_and_yarn&previous-version=1.15.2&new-version=1.15.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `dependabot rebase` will rebase this PR - `dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `dependabot merge` will merge this PR after your CI passes on it - `dependabot squash and merge` will squash and merge this PR after your CI passes on it - `dependabot cancel merge` will cancel a previously requested merge and block automerging - `dependabot reopen` will reopen this PR if it is closed - `dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/facebook/watchman/network/alerts).
Pull Request resolved: https://github.com/facebook/watchman/pull/1184 Reviewed By: kmancini Differential Revision: D52658579 fbshipit-source-id: c475c4ffc84c55db46c6405257bedbaa10d6dd54 --- website/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/yarn.lock b/website/yarn.lock index 7499eaaa8da9..9a18219720c4 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -4587,9 +4587,9 @@ flux@^4.0.1: fbjs "^3.0.1" follow-redirects@^1.0.0, follow-redirects@^1.14.7: - version "1.15.2" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" - integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== + version "1.15.4" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf" + integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw== for-each@^0.3.3: version "0.3.3" From d898b2577dbdb84bedf530a54229ddd0af4cb9d0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 12 Jan 2024 09:32:01 -0800 Subject: [PATCH 6734/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/9f5e430e95323b6a6f3cc8e5e47a49c3d4757cdf https://github.com/facebook/fb303/commit/4c296319cc7e83d2cd57bc5e49852bd28e4818a8 https://github.com/facebook/fbthrift/commit/e448ef5d3a91ed9406e3fdc684105daa21732feb https://github.com/facebook/folly/commit/76467128741b21ce830eecf211d7d62be67746e8 https://github.com/facebook/litho/commit/4f137005e3159da27aaa81f1639c8908d297526c https://github.com/facebook/mcrouter/commit/9cef1287d75704456f9a56c9e90da9444d39cfaa https://github.com/facebook/mvfst/commit/7a531a2c6d9f4110a7fce3285bdf9e0e6057299e https://github.com/facebook/ocamlrep/commit/a8481f3e718f697c2db05a31f35075240a83605d https://github.com/facebook/proxygen/commit/87ade9df5aec58a8e9df13c76759157d210ca071 https://github.com/facebook/rocksdb/commit/fdfd044bb2c53a322a2b104891a997f6c569c989 https://github.com/facebook/wangle/commit/a7e6e34018e246e57cbdf8c293208a0b8ed6cd7f https://github.com/facebook/watchman/commit/5426ce6730156be268ca8c63554c52795a08c2a4 https://github.com/facebookexperimental/edencommon/commit/8f640e6cd5f9ba64222753815dd40d0f3e07ebfd https://github.com/facebookexperimental/rust-shed/commit/e254fc8d40b0d48bd8cbdbf6de014035febdfac2 https://github.com/facebookincubator/fizz/commit/fb06de61e2d70f3e8cac77feb6ca5be9e72deabd https://github.com/facebookincubator/katran/commit/dcb222e38ad6c0ea479112818c45b19a55ca7643 https://github.com/facebookincubator/velox/commit/373eda093ae37571e12a91e5dbab627844fa0c27 https://github.com/facebookresearch/param/commit/d9d657931f4b103207f0fd4730ce7e37ffe1c4d2 https://github.com/pytorch/fbgemm/commit/530097423edde5974b94a5219e7ab517050fa617 Reviewed By: jailby fbshipit-source-id: 83b807245e990631a1dcbf3b8d3412a4a5d2599c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 67ed7c2be22c..7d8baf5eb1f2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9c8d26a31594a317cc8024f796389fc3cf9ba4fd +Subproject commit e448ef5d3a91ed9406e3fdc684105daa21732feb diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e67f169070a8..009427b49e31 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit beb3e5dd6a996510b5f5c7204f3935c24c976d28 +Subproject commit 76467128741b21ce830eecf211d7d62be67746e8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a5be918cd2f9..1a01cd64a1e8 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a23216bb57fb37b16fc6626e2992982faa1ab9a3 +Subproject commit a7e6e34018e246e57cbdf8c293208a0b8ed6cd7f From 448a51c55ff1ae28c4638e2d74e1f86690d16e22 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 13 Jan 2024 09:31:47 -0800 Subject: [PATCH 6735/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/f404572a1f5f7e3587179704046f31372f674dae https://github.com/facebook/fb303/commit/bcce72272c468df22ddb44090680b65fabded4b5 https://github.com/facebook/fbthrift/commit/bb1c2aa4ee981fc698cfc60c4b23dbd1b070dd57 https://github.com/facebook/folly/commit/0fd59700acaafb5bb5c995cf43ff27f8e386a135 https://github.com/facebook/litho/commit/99fb022468d068926d9ebd7bbf1025f8043f9abc https://github.com/facebook/mcrouter/commit/eb800827faf141e2cef7c1b8a5b0c9cac1881878 https://github.com/facebook/mvfst/commit/c276e9b2f8a76251e95f21ade73dacb287225345 https://github.com/facebook/ocamlrep/commit/0c3f0e73f4433a5d88eb0452315de620f3329394 https://github.com/facebook/proxygen/commit/e73ded88fe6d27df26dadf77b56c3c59f1c961cd https://github.com/facebook/rocksdb/commit/21d5a8f54f06e01ca49d4e6bae89bb42ba78dfdd https://github.com/facebook/wangle/commit/a74d1515d1c764172f8a2f64c65edd791b974354 https://github.com/facebook/watchman/commit/d898b2577dbdb84bedf530a54229ddd0af4cb9d0 https://github.com/facebookexperimental/edencommon/commit/2921e1e9f79bc96a07da955e55eba16a87d1d929 https://github.com/facebookexperimental/rust-shed/commit/a8581344f658428853974842df71a9f4716da673 https://github.com/facebookincubator/fizz/commit/7cf5626a2c6b359daa45c51d7f90a3743ff0d9df https://github.com/facebookincubator/katran/commit/b46a41485abf8db8b4cca448218897c8039ffa3d https://github.com/facebookincubator/velox/commit/3cb4ec9275d11c007b5df899811dcbea6f13445a https://github.com/facebookresearch/vrs/commit/8aa70cc603b78bb7dcd18de62b9c3e73f2698824 https://github.com/pytorch/fbgemm/commit/7e50cd9de88e481c787c3a5111028604be81b63e Reviewed By: jailby fbshipit-source-id: 0ec2885238fc0134b9b50479d10103e8be710593 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7d8baf5eb1f2..5f86b19db936 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e448ef5d3a91ed9406e3fdc684105daa21732feb +Subproject commit bb1c2aa4ee981fc698cfc60c4b23dbd1b070dd57 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 009427b49e31..b6b8c09c3de6 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 76467128741b21ce830eecf211d7d62be67746e8 +Subproject commit 0fd59700acaafb5bb5c995cf43ff27f8e386a135 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1a01cd64a1e8..5c5f080d3858 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a7e6e34018e246e57cbdf8c293208a0b8ed6cd7f +Subproject commit a74d1515d1c764172f8a2f64c65edd791b974354 From 323624a6ec88769b6aa634f24ab430f605a912f3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 14 Jan 2024 09:32:39 -0800 Subject: [PATCH 6736/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/08fac9710696a57d7505db9698474b4d9ab5ec99 https://github.com/facebook/fb303/commit/e4e059467db33625a6241054a1f01de168f32615 https://github.com/facebook/fbthrift/commit/01297c8b9e8afde55e1913e989c902a4174255be https://github.com/facebook/folly/commit/7e9cbfe076fa59a832336ce928d84a9432f5d741 https://github.com/facebook/mvfst/commit/907162fcf74cf81bb404973e1cbaa07b2285f211 https://github.com/facebook/ocamlrep/commit/81fde0c63d9b2064086c43a33868619378e05cdd https://github.com/facebook/proxygen/commit/fd652f57d805b3aeb56b29c84af4ac0957a139b0 https://github.com/facebook/wangle/commit/b768b85e50a20ad2b79738d9088a66846e079dfc https://github.com/facebook/watchman/commit/448a51c55ff1ae28c4638e2d74e1f86690d16e22 https://github.com/facebookexperimental/edencommon/commit/70d100aed002653d14adb3ac0d93a61a5e54b4bd https://github.com/facebookexperimental/rust-shed/commit/4a0f1acf31c24a5d73b03b30c8e1927173f4d8ca https://github.com/facebookincubator/fizz/commit/b8ca1c0127c8b8dd4ccfbb5d19488304b9ed2e97 https://github.com/facebookincubator/katran/commit/bdf42ef667492c9ccf14c2ac6db84af8a1b7a80e Reviewed By: jailby fbshipit-source-id: 04b03519fb9d8c7a6cfb27a4524b0466831c300b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5f86b19db936..a14159100011 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bb1c2aa4ee981fc698cfc60c4b23dbd1b070dd57 +Subproject commit 01297c8b9e8afde55e1913e989c902a4174255be diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b6b8c09c3de6..bed4ea8ebd7c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0fd59700acaafb5bb5c995cf43ff27f8e386a135 +Subproject commit 7e9cbfe076fa59a832336ce928d84a9432f5d741 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5c5f080d3858..3ae143dad44e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a74d1515d1c764172f8a2f64c65edd791b974354 +Subproject commit b768b85e50a20ad2b79738d9088a66846e079dfc From dedd500a7812657d399f6862511eeded674c0502 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 15 Jan 2024 09:31:47 -0800 Subject: [PATCH 6737/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/10b2901388412325238c83355f79c5397b4165e8 https://github.com/facebook/fb303/commit/35b53c159ee584f0f15822260e12c95fd9b4eb58 https://github.com/facebook/fbthrift/commit/d1b93d92a26325c2b991fe37e5e1808a4ae8c72b https://github.com/facebook/folly/commit/19f74a48a3d8f19d9af0a39c6ef58eece6470cea https://github.com/facebook/litho/commit/74183a7b5da52f97efd0e678c71572c231ef99e6 https://github.com/facebook/mvfst/commit/4920e7fedfb35199b603bc969d511918e6602554 https://github.com/facebook/ocamlrep/commit/56b2e039742a50755e2d0d21cb04198c91d7aa4e https://github.com/facebook/proxygen/commit/d4dbf2a6850833c53ebb90686e70613f1b247342 https://github.com/facebook/wangle/commit/a7abf8d88e82ccb9ff9027a143d8c600f810aa04 https://github.com/facebook/watchman/commit/323624a6ec88769b6aa634f24ab430f605a912f3 https://github.com/facebookexperimental/edencommon/commit/f9fbcd3f72b51f2f613d496686c6066ab2172cad https://github.com/facebookexperimental/rust-shed/commit/55485ab0bcf68f95418fba63f059bbd8071ba3bf https://github.com/facebookincubator/fizz/commit/63a4a9201df6b978b8cd4ddb1a38589d16617eb3 https://github.com/facebookincubator/katran/commit/4c003b2e455cb4fefc3fbaecee8debf5601ba4bf https://github.com/facebookincubator/velox/commit/5dc23c6fe8bf03a17cce76c025daa3ab8f0fe260 https://github.com/pytorch/fbgemm/commit/5782e7eabe616444bb8a2815fd259313fd353728 Reviewed By: jailby fbshipit-source-id: c389dbc9d3e0b9203838c66afb7292e1e0944994 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a14159100011..9bb6856f108f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 01297c8b9e8afde55e1913e989c902a4174255be +Subproject commit d1b93d92a26325c2b991fe37e5e1808a4ae8c72b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index bed4ea8ebd7c..78e35701fd31 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7e9cbfe076fa59a832336ce928d84a9432f5d741 +Subproject commit 19f74a48a3d8f19d9af0a39c6ef58eece6470cea diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3ae143dad44e..d562017f738c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b768b85e50a20ad2b79738d9088a66846e079dfc +Subproject commit a7abf8d88e82ccb9ff9027a143d8c600f810aa04 From 4c608bfea3d818590f074a91ab451210216a881e Mon Sep 17 00:00:00 2001 From: Richard Barnes Date: Mon, 15 Jan 2024 19:22:54 -0800 Subject: [PATCH 6738/7387] Fix shadowed variable in watchman/root/Root.h Summary: Our upcoming compiler upgrade will require us not to have shadowed variables. Such variables have a _high_ bug rate and reduce readability, so we would like to avoid them even if the compiler was not forcing us to do so. This codemod attempts to fix an instance of a shadowed variable. Please review with care: if it's failed the result will be a silent bug. **What's a shadowed variable?** Shadowed variables are variables in an inner scope with the same name as another variable in an outer scope. Having the same name for both variables might be semantically correct, but it can make the code confusing to read! It can also hide subtle bugs. This diff fixes such an issue by renaming the variable. - If you approve of this diff, please use the "Accept & Ship" button :-) Reviewed By: palmje Differential Revision: D52582786 fbshipit-source-id: c5099d76d5d16886b0e9c4b060e8ff20a56e6429 --- watchman/root/Root.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/watchman/root/Root.h b/watchman/root/Root.h index 0eab40651a5d..c0f561c60442 100644 --- a/watchman/root/Root.h +++ b/watchman/root/Root.h @@ -155,8 +155,9 @@ struct RootQueryInfo : serde::Object { x("state", state); x("client-pid", client_pid); x("request-id", request_id); - x.skip_if( - "query", query, [](const auto& query) { return !query.has_value(); }); + x.skip_if("query", query, [](const auto& query_2) { + return !query_2.has_value(); + }); } }; From 8136505c0d3e08eae00302156c7cbecdbe2e5356 Mon Sep 17 00:00:00 2001 From: Richard Barnes Date: Mon, 15 Jan 2024 19:28:17 -0800 Subject: [PATCH 6739/7387] Fix shadowed variable in watchman/InMemoryView.cpp Summary: Our upcoming compiler upgrade will require us not to have shadowed variables. Such variables have a _high_ bug rate and reduce readability, so we would like to avoid them even if the compiler was not forcing us to do so. This codemod attempts to fix an instance of a shadowed variable. Please review with care: if it's failed the result will be a silent bug. **What's a shadowed variable?** Shadowed variables are variables in an inner scope with the same name as another variable in an outer scope. Having the same name for both variables might be semantically correct, but it can make the code confusing to read! It can also hide subtle bugs. This diff fixes such an issue by renaming the variable. - If you approve of this diff, please use the "Accept & Ship" button :-) Reviewed By: palmje Differential Revision: D52582892 fbshipit-source-id: a8f8c776432297f9ccd6cd74084eb89d7f17ee9d --- watchman/InMemoryView.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/watchman/InMemoryView.cpp b/watchman/InMemoryView.cpp index ecd3ecf63ee4..79a6af6d08d2 100644 --- a/watchman/InMemoryView.cpp +++ b/watchman/InMemoryView.cpp @@ -1224,9 +1224,9 @@ void InMemoryView::warmContentCache() { f->stat.mtime}; log(DBG, "warmContentCache: lookup ", key.relativePath, "\n"); - auto f = caches_.contentHashCache.get(key); + auto f_2 = caches_.contentHashCache.get(key); if (syncContentCacheWarming_) { - futures.emplace_back(std::move(f)); + futures.emplace_back(std::move(f_2)); } ++n; } From e75c6e47529dc43055de6ed3c15df659e3967822 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 16 Jan 2024 09:31:54 -0800 Subject: [PATCH 6740/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/9440b7fdb0def242f1a19ca2553048e419e2a182 https://github.com/facebook/fb303/commit/abcac8ab1b0a3a79b7de3224a82b9dd02a64efaf https://github.com/facebook/fbthrift/commit/695cd4fb17ec28e08273306662533ed869f3e7be https://github.com/facebook/folly/commit/6fadf4d72835606829ca8cac95532834061d1359 https://github.com/facebook/litho/commit/a3fef00d33ce1fd4df73acce25578345b8dbb663 https://github.com/facebook/mvfst/commit/57a36c2a1a8785468a332baac3229b53d0d9a580 https://github.com/facebook/ocamlrep/commit/c7517079da21399e370679836264bd44edc6a969 https://github.com/facebook/proxygen/commit/d433767c1891e3ed57ed576d08528db505936f1b https://github.com/facebook/rocksdb/commit/2dda7a0dd2f2866b85bbbe48a57406b79d7ceb4c https://github.com/facebook/wangle/commit/81d16d3c1c9306f41233b767c701c6bc5062d6ec https://github.com/facebook/watchman/commit/8136505c0d3e08eae00302156c7cbecdbe2e5356 https://github.com/facebookexperimental/edencommon/commit/a24347d4032917e0fd3812953fb458945198dbfe https://github.com/facebookexperimental/rust-shed/commit/d0d2c62335d55ef75ae526d91e3b750200ec8744 https://github.com/facebookincubator/fizz/commit/701a21c15e855d7c2076057bb4c86324ec3301d4 https://github.com/facebookincubator/katran/commit/37098558b0dc6363ada40d9403f5cb231cd3cd65 https://github.com/facebookincubator/velox/commit/8f0dd8b72240b48f77bfa98a2ad326e845d6879c https://github.com/pytorch/fbgemm/commit/fc780fc5fe1fa77e2ebbabb3ecc731fe7dcc3fcf Reviewed By: jurajh-fb fbshipit-source-id: e848c8e424c5b61d45b30a2a8d6a2c4834858cb0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9bb6856f108f..1d352a2a414f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d1b93d92a26325c2b991fe37e5e1808a4ae8c72b +Subproject commit 695cd4fb17ec28e08273306662533ed869f3e7be diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 78e35701fd31..37b2b89ee24d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 19f74a48a3d8f19d9af0a39c6ef58eece6470cea +Subproject commit 6fadf4d72835606829ca8cac95532834061d1359 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d562017f738c..2920d1427b8e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a7abf8d88e82ccb9ff9027a143d8c600f810aa04 +Subproject commit 81d16d3c1c9306f41233b767c701c6bc5062d6ec From f27069b8a874e80f3e2e3c6f6bcb77786efec1d2 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 17 Jan 2024 09:31:29 -0800 Subject: [PATCH 6741/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/f611694fce3a389005fa17c487cb55a63ea3b0c7 https://github.com/facebook/fb303/commit/789a812ab033e2001c86548d906bcf2115d3105b https://github.com/facebook/fbthrift/commit/bc513be0fe2ca9f0557461b0ef6b7561c1422a98 https://github.com/facebook/folly/commit/bc44ceb4eba9816eb21e17ec8a08865405d34c17 https://github.com/facebook/litho/commit/127b55a7ca9a3bbfa9e57f4ac205885162897e82 https://github.com/facebook/mvfst/commit/930024f8b5965dd61037c845a4ec30a325585d78 https://github.com/facebook/ocamlrep/commit/175e65da9431de6480ea74b6ade4d8b96107a7d4 https://github.com/facebook/proxygen/commit/85222511e2d8c472b1ca5502162ee6584509b09b https://github.com/facebook/rocksdb/commit/65e162bf09e6d81d5de533539753d80c008717fd https://github.com/facebook/wangle/commit/61bbafaff087a3a561b105d59c8931efd80fe05b https://github.com/facebook/watchman/commit/e75c6e47529dc43055de6ed3c15df659e3967822 https://github.com/facebookexperimental/edencommon/commit/eda69f98911679044188e029dba62fa3b3d5512b https://github.com/facebookexperimental/rust-shed/commit/7b27ce583cff2060cf414ff6cf1b57646dd5b3b3 https://github.com/facebookincubator/fizz/commit/a068a99cf45562d47bc03cafb88f3cbbd093b549 https://github.com/facebookincubator/katran/commit/1c1e1b6e1ede810ea3125b5315f5ee0343d5adf6 https://github.com/facebookincubator/velox/commit/eb09be01b0079dc356d5fdad15e441863b040c23 https://github.com/facebookresearch/vrs/commit/7e06027e2e756445ab8fd6a40467a20a6d70d1cb https://github.com/fairinternal/egohowto/commit/167c701dfc5c7b91c11eb94bc4beb085ed72aa6e https://github.com/pytorch/fbgemm/commit/54a56f0dd6ad0e95329f712d67594a79a614f337 Reviewed By: jurajh-fb fbshipit-source-id: ef3c2d5e2786a40bbcc188beaefdd4644aa3b1be --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1d352a2a414f..0a852347ea06 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 695cd4fb17ec28e08273306662533ed869f3e7be +Subproject commit bc513be0fe2ca9f0557461b0ef6b7561c1422a98 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 37b2b89ee24d..cc8466884262 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 6fadf4d72835606829ca8cac95532834061d1359 +Subproject commit bc44ceb4eba9816eb21e17ec8a08865405d34c17 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2920d1427b8e..032e2acd95eb 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 81d16d3c1c9306f41233b767c701c6bc5062d6ec +Subproject commit 61bbafaff087a3a561b105d59c8931efd80fe05b From d52738785ded4c290fb08adcb244e4c34ef1ffdd Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 18 Jan 2024 09:32:26 -0800 Subject: [PATCH 6742/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/ad221a0fa5c8d37aa4bf1d8849d26adf0cd8f2b7 https://github.com/facebook/fb303/commit/a66463ff1e0731b0b89a3fe5522d18c3824f3532 https://github.com/facebook/fbthrift/commit/cb95862b6d9e91395f1c5db441b91024175e3d9e https://github.com/facebook/folly/commit/45c366ed7c611290b74e0821b528eb828145543c https://github.com/facebook/litho/commit/11c82b37e2cce1aaa1401e0598394ae95ed7a6cf https://github.com/facebook/mvfst/commit/9ce6a4295a9d6a608275b675acec122352264315 https://github.com/facebook/ocamlrep/commit/b1bbf802a8b7954829ce98e0fc159119ab6bd5c5 https://github.com/facebook/proxygen/commit/a3d7bfd9227705fe666a3766e99efca1145d62b4 https://github.com/facebook/rocksdb/commit/4835c11cce4d7c0b59170cfdb5ab3c4afdeda19e https://github.com/facebook/squangle/commit/c837ac20bbf38fe3deabc734dd0ea7448b019aea https://github.com/facebook/wangle/commit/b29433050686000cc57732ab4e55dd2905475ad9 https://github.com/facebook/watchman/commit/f27069b8a874e80f3e2e3c6f6bcb77786efec1d2 https://github.com/facebookexperimental/edencommon/commit/509ce74cec768561bf1152cd6cbda02e634a20fa https://github.com/facebookexperimental/rust-shed/commit/634dc94b132241c09c4d21ae69035008c6ef863e https://github.com/facebookincubator/fizz/commit/d1e60ef13f46c91f835c1d2a36fa395f6c5e7306 https://github.com/facebookincubator/katran/commit/5b1712e59f174c2f1f9cb6471763f5552cad316a https://github.com/facebookincubator/velox/commit/ec3bb6be2ba7f0a289524f0773fecaaaf31be4e0 https://github.com/facebookresearch/param/commit/d4b62fec3ab1fb865926d40f42fd3972efb95706 https://github.com/facebookresearch/vrs/commit/794a8159261f7383d90a86bdf9e72e147de84459 https://github.com/fairinternal/egohowto/commit/d0efb668582f083372c31cbc01b8b91d3e9644fb https://github.com/pytorch/fbgemm/commit/9a3c5b20267cba573670c742e2f7dcb5a2453fb0 Reviewed By: jurajh-fb fbshipit-source-id: ee5e981d4d95bb8c24d9cd7c915ce923337498a6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0a852347ea06..70ec05485616 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bc513be0fe2ca9f0557461b0ef6b7561c1422a98 +Subproject commit cb95862b6d9e91395f1c5db441b91024175e3d9e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index cc8466884262..c44d69baf765 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit bc44ceb4eba9816eb21e17ec8a08865405d34c17 +Subproject commit 45c366ed7c611290b74e0821b528eb828145543c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 032e2acd95eb..9ec1f9f11f1d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 61bbafaff087a3a561b105d59c8931efd80fe05b +Subproject commit b29433050686000cc57732ab4e55dd2905475ad9 From 86802e6e8de01bf07a6a906a12e2b20766378add Mon Sep 17 00:00:00 2001 From: Xinyi Wang Date: Fri, 19 Jan 2024 09:15:08 -0800 Subject: [PATCH 6743/7387] bridge to mercurial for partial glob matching Summary: This version is working, see integration test in following diff It can correctly do partial glob matching so that directories won't be filtered out prematurely However, this version still needs improvement: 1. I can probably do similar thing to Michael's promise in HgSparseFilter 2. pass u8 to rust instead of a vec of string 3. check on windows Reviewed By: kmancini Differential Revision: D50427596 fbshipit-source-id: b95f1c6333978ee79ad1ba1f28cac9cd64441fc5 --- eden/fs/service/streamingeden.thrift | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/eden/fs/service/streamingeden.thrift b/eden/fs/service/streamingeden.thrift index c45e7c2ce7a1..ac968f2d27ed 100644 --- a/eden/fs/service/streamingeden.thrift +++ b/eden/fs/service/streamingeden.thrift @@ -90,16 +90,12 @@ struct StreamChangesSinceParams { 2: eden.JournalPosition fromPosition; } -struct GlobFilter { - 1: list globs; // a list of globs -} - /** * Argument to streamSelectedChangesSince API */ struct StreamSelectedChangesSinceParams { 1: StreamChangesSinceParams changesParams; - 2: GlobFilter filter; + 2: list globs; } struct TraceTaskEventsRequest {} From 54c5bbc63bc9fb4f7f2e43e2f22189ebf885bd6d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 19 Jan 2024 09:31:56 -0800 Subject: [PATCH 6744/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/da0c695fb38aea93f24f30f22add8071b5b673a6 https://github.com/facebook/fatal/commit/3cda2f95571b537596531494080b2ef6de14f09d https://github.com/facebook/fb303/commit/1dd3544a29690edacb8da2910cd6e788a9f6c66b https://github.com/facebook/fbthrift/commit/f0eefaa2734bce13d861e0182b90a98d13250f17 https://github.com/facebook/folly/commit/4a2f1aaa23d3a4c755b5dc500360ce1011b2e149 https://github.com/facebook/litho/commit/68c8368d8d612176bb5b2959fb3992e58b382d2c https://github.com/facebook/mvfst/commit/e67432281cb44398123f68383d2acb894b4007f0 https://github.com/facebook/ocamlrep/commit/8caf42feda905629c3a40d7879f3fc0e2cc7dba5 https://github.com/facebook/proxygen/commit/343ffcbba4f97ddc2a31570b429ac71ea59f670e https://github.com/facebook/rocksdb/commit/b5bb553d5e79d9fe04b4b62aa5c34255a252c813 https://github.com/facebook/wangle/commit/222491e51f8901d039a6e0771909ddbecd6267dd https://github.com/facebook/watchman/commit/d52738785ded4c290fb08adcb244e4c34ef1ffdd https://github.com/facebookexperimental/edencommon/commit/cbcd568f7bea42df4ddd9f77ac8becb4277403b8 https://github.com/facebookexperimental/rust-shed/commit/76d2159747b056901daa362c3404b6d7b781eec5 https://github.com/facebookincubator/fizz/commit/dda7105a6ef1febe6890464266df2521b84c5f67 https://github.com/facebookincubator/katran/commit/ec80b01a482b2434d28591e6ee8475141ad62464 https://github.com/facebookincubator/velox/commit/3154f7a31338a5c15f861255fa4aa330c22f72a3 https://github.com/facebookresearch/vrs/commit/fb3ffbec14955d1c57131d7dbd4386778acdafbc https://github.com/pytorch/kineto/commit/1703751e9d08aedb9735f1718877a6defd73851d Reviewed By: jurajh-fb fbshipit-source-id: 10a4ebdecba3ff7b4a367a67203330fb8d1b08fe --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 70ec05485616..a4f52c8181c9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cb95862b6d9e91395f1c5db441b91024175e3d9e +Subproject commit f0eefaa2734bce13d861e0182b90a98d13250f17 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index c44d69baf765..67765c2a97a9 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 45c366ed7c611290b74e0821b528eb828145543c +Subproject commit 4a2f1aaa23d3a4c755b5dc500360ce1011b2e149 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9ec1f9f11f1d..e57bb00b5691 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b29433050686000cc57732ab4e55dd2905475ad9 +Subproject commit 222491e51f8901d039a6e0771909ddbecd6267dd From 8c78929648df4ab32ad0105f710d9a00ac326be4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 20 Jan 2024 09:31:49 -0800 Subject: [PATCH 6745/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/22d960c6f99f41ebc6f7b19ac1f8f5b338377faa https://github.com/facebook/fb303/commit/cd9a2ed0db3f6e58bda1b96c1e05e48c62dda65a https://github.com/facebook/fbthrift/commit/e11f1a565e1874324e41c0f79b14ecc3fcd05b61 https://github.com/facebook/folly/commit/b930cba17f84b789ced1c51c134275f1f20082cc https://github.com/facebook/litho/commit/223a9f66c44f62b532dc8b90ff8e6e8c3e780105 https://github.com/facebook/mcrouter/commit/30b22ae9cee8bd540454f43ad88b8dea745a3e6c https://github.com/facebook/mvfst/commit/1cf6517078987a6b0dcee5722f022fe0d435920f https://github.com/facebook/ocamlrep/commit/3ec582ce79e483742024e4fde980133818041ac9 https://github.com/facebook/proxygen/commit/9fa45fa15e12bb459b959862d26876a5da999650 https://github.com/facebook/rocksdb/commit/cb08a682d4631527c095cccdf22c5f52ef7d3a35 https://github.com/facebook/wangle/commit/b0c689ccbd3f524c519161c72464847c228b75f7 https://github.com/facebook/watchman/commit/54c5bbc63bc9fb4f7f2e43e2f22189ebf885bd6d https://github.com/facebookexperimental/edencommon/commit/a3a683a9704cefd3767092879672654fc4d74a08 https://github.com/facebookexperimental/rust-shed/commit/6b960b3c32dec428722be729641eaf18f80c0614 https://github.com/facebookincubator/fizz/commit/5c04392a498197a789c1d02494b28410a96ff3c4 https://github.com/facebookincubator/katran/commit/bc664096f9c05d6b78a3dce892d304f5cb5759ce https://github.com/facebookincubator/velox/commit/e4d05f4770308a18ef373baff0906d3443cfed95 https://github.com/facebookresearch/multimodal/commit/6bf3779a064dc72cde48793521a5be151695fc62 https://github.com/pytorch/fbgemm/commit/f78a12b88935ee7befd7769d596c783b47b3c9b8 https://github.com/pytorch/kineto/commit/3799f96e28f41478f899d484feaef0fb9cfc6322 Reviewed By: jurajh-fb fbshipit-source-id: 0555bde48210a4e6fe7d2ce8688005c8ab7e5b8e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a4f52c8181c9..87976a1e7c96 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f0eefaa2734bce13d861e0182b90a98d13250f17 +Subproject commit e11f1a565e1874324e41c0f79b14ecc3fcd05b61 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 67765c2a97a9..a3fb4f44ba86 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 4a2f1aaa23d3a4c755b5dc500360ce1011b2e149 +Subproject commit b930cba17f84b789ced1c51c134275f1f20082cc diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e57bb00b5691..bf60ae74e566 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 222491e51f8901d039a6e0771909ddbecd6267dd +Subproject commit b0c689ccbd3f524c519161c72464847c228b75f7 From 7fa892d1a27ec64cc587db5d72e1c743d82a3e9e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 21 Jan 2024 09:31:35 -0800 Subject: [PATCH 6746/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/a20b3688a21f380f28cbca20f4817202cb24e9de https://github.com/facebook/fb303/commit/3ceb9107440c11c45b0dd0d8c4c5ec01422b5ce2 https://github.com/facebook/fbthrift/commit/275badd3fb78e2c9dc083eaaeedcf307bfdf4d3e https://github.com/facebook/folly/commit/311ca18458afe62d62ed93534680fe5a2370b244 https://github.com/facebook/mvfst/commit/edfffc5fd539a5e91565bc02fda60f2d36233194 https://github.com/facebook/proxygen/commit/baa18b49bc1a5d708f087d7d6408cf0100d60c7d https://github.com/facebook/rocksdb/commit/800cfae9872f6ec58224e720d8276b1ca1ac042a https://github.com/facebook/wangle/commit/05ab4ed16f37f47bbb9c9b00cfa5e4a7e727b771 https://github.com/facebook/watchman/commit/8c78929648df4ab32ad0105f710d9a00ac326be4 https://github.com/facebookexperimental/edencommon/commit/5aef9ab24440f4d1a3c4c09a265d9dd133fe4977 https://github.com/facebookexperimental/rust-shed/commit/33d150e711027a36dbfa5e78a356bfd996088eae https://github.com/facebookincubator/fizz/commit/9fb4a7b40eefa41198a8cd927883b27358ce7abc https://github.com/facebookincubator/katran/commit/964381157c1bc703f71574a2f10a23ab2e737523 Reviewed By: jurajh-fb fbshipit-source-id: 2e13006de8c896fffba54d1ef1672c633d6f9805 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 87976a1e7c96..4ba39c07d70a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e11f1a565e1874324e41c0f79b14ecc3fcd05b61 +Subproject commit 275badd3fb78e2c9dc083eaaeedcf307bfdf4d3e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a3fb4f44ba86..5a124d931f71 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b930cba17f84b789ced1c51c134275f1f20082cc +Subproject commit 311ca18458afe62d62ed93534680fe5a2370b244 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index bf60ae74e566..70de68a7df0d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b0c689ccbd3f524c519161c72464847c228b75f7 +Subproject commit 05ab4ed16f37f47bbb9c9b00cfa5e4a7e727b771 From abf541e0683e569d920f20a6441542136fb6aac9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 22 Jan 2024 10:22:40 -0800 Subject: [PATCH 6747/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/9dfe20a97b6825f3dcbf14e7ebabc667d1c995f1 https://github.com/facebook/fb303/commit/66de43c8d9d9df1eb025e42e9103d8ec74031921 https://github.com/facebook/fbthrift/commit/2a58d40acdf81bfc6949f2c571c46ff5fb9e2f27 https://github.com/facebook/folly/commit/97386490ea72606d7d5ba4dd6937b0de59ff134f https://github.com/facebook/litho/commit/8cf81bfbebe91a7bd9727161e7c628fd1538edc1 https://github.com/facebook/mvfst/commit/5ff1cf500f37fd98be50d3bc2e9a1bc5656817cd https://github.com/facebook/ocamlrep/commit/e09b2df7346f47c10e93687fc2a4300b14f39329 https://github.com/facebook/proxygen/commit/479c86d7ef1d0dc6186fd2691434ffb67813fcff https://github.com/facebook/wangle/commit/2067a90c59fad597b8a1d6edde62b39ec63bb85b https://github.com/facebook/watchman/commit/7fa892d1a27ec64cc587db5d72e1c743d82a3e9e https://github.com/facebookexperimental/edencommon/commit/0a31dbcee82c26138f337d0d60ae5e336a51033d https://github.com/facebookexperimental/rust-shed/commit/dd043ac547fa653bd5ace9e705f63e984543d778 https://github.com/facebookincubator/fizz/commit/94669f810935331e9c869831009ec2e5cf2132c5 https://github.com/facebookincubator/katran/commit/12efb4d6a0db92a05c7579233971701a5855f95b https://github.com/facebookincubator/velox/commit/0d71afa12aa290983e0ae63c8f66aca4c2e4a3b3 Reviewed By: bigfootjon fbshipit-source-id: 364db2b7500831cc9bd4e2c8e344f4d41b2480c1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4ba39c07d70a..c65f285e82de 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 275badd3fb78e2c9dc083eaaeedcf307bfdf4d3e +Subproject commit 2a58d40acdf81bfc6949f2c571c46ff5fb9e2f27 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 5a124d931f71..7c7b0737fdcb 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 311ca18458afe62d62ed93534680fe5a2370b244 +Subproject commit 97386490ea72606d7d5ba4dd6937b0de59ff134f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 70de68a7df0d..0f9d20737017 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 05ab4ed16f37f47bbb9c9b00cfa5e4a7e727b771 +Subproject commit 2067a90c59fad597b8a1d6edde62b39ec63bb85b From b25f0b3792a139d52b5fc7e382cca951fc68027b Mon Sep 17 00:00:00 2001 From: Richard Barnes Date: Tue, 23 Jan 2024 08:39:53 -0800 Subject: [PATCH 6748/7387] Fix shadowed variable in watchman/root/dir.cpp Summary: Our upcoming compiler upgrade will require us not to have shadowed variables. Such variables have a _high_ bug rate and reduce readability, so we would like to avoid them even if the compiler was not forcing us to do so. This codemod attempts to fix an instance of a shadowed variable. Please review with care: if it's failed the result will be a silent bug. **What's a shadowed variable?** Shadowed variables are variables in an inner scope with the same name as another variable in an outer scope. Having the same name for both variables might be semantically correct, but it can make the code confusing to read! It can also hide subtle bugs. This diff fixes such an issue by renaming the variable. - If you approve of this diff, please use the "Accept & Ship" button :-) Reviewed By: dmm-fb Differential Revision: D52959138 fbshipit-source-id: d2d0c60763db913b715bdb1127cbaac47bcb3145 --- watchman/root/dir.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/watchman/root/dir.cpp b/watchman/root/dir.cpp index 60b679d2ddc6..c97f126f1855 100644 --- a/watchman/root/dir.cpp +++ b/watchman/root/dir.cpp @@ -19,16 +19,16 @@ w_string watchman_dir::getFullPath() const { return getFullPathToChild(w_string_piece()); } -watchman_file* watchman_dir::getChildFile(w_string_piece name) const { - auto it = files.find(name); +watchman_file* watchman_dir::getChildFile(w_string_piece name_2) const { + auto it = files.find(name_2); if (it == files.end()) { return nullptr; } return it->second.get(); } -watchman_dir* watchman_dir::getChildDir(w_string_piece name) const { - auto it = dirs.find(name); +watchman_dir* watchman_dir::getChildDir(w_string_piece name_2) const { + auto it = dirs.find(name_2); if (it == dirs.end()) { return nullptr; } From f9659c0e7d3d4445d210c293654ef2579ba196f3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 23 Jan 2024 09:35:59 -0800 Subject: [PATCH 6749/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/c2bef950bf530e16a6ba033ca78d760fd84f27b7 https://github.com/facebook/fatal/commit/95eba95bda80e58bef54705d925c13dcd80180e8 https://github.com/facebook/fb303/commit/9b3ea17f26e361da656ddee46195a4c0ed1984b7 https://github.com/facebook/fbthrift/commit/d390c54928a3349c5747407548a8fbd9c1d90d11 https://github.com/facebook/folly/commit/49c7ed927f18e6f5ad0a9694809c4e0663aaa254 https://github.com/facebook/litho/commit/11135c710206860412b2aa986fc7f9a3724078c0 https://github.com/facebook/mvfst/commit/c6032bb3bdd8b892fb80c05f2854b090cfa91de5 https://github.com/facebook/ocamlrep/commit/f5894f38d791cd2d3427246079b4b2150473c1b3 https://github.com/facebook/proxygen/commit/7457628ad61b49e20fbe40ff770f8b61d047009a https://github.com/facebook/rocksdb/commit/51ecdd3e8f8eca912c87dfd96e129c57cec14689 https://github.com/facebook/wangle/commit/557ac0066816af0f4c2afcc9248ba717ba2a4d60 https://github.com/facebook/watchman/commit/abf541e0683e569d920f20a6441542136fb6aac9 https://github.com/facebookexperimental/edencommon/commit/2855510c11b226d6dd9259abdc88c89fe3f3cb0c https://github.com/facebookexperimental/rust-shed/commit/fe31e0a12225fbb3412977fa4dc86d17c5a52064 https://github.com/facebookincubator/fizz/commit/03516ec593214286da2c8fabedb55b3b3223f5d8 https://github.com/facebookincubator/katran/commit/c4339fcfbee805aed4a9eacbd7f3044d82515eb9 https://github.com/facebookincubator/velox/commit/3949a3bb3c3bf65c1c6593b4dd85eb7bef57002b https://github.com/facebookresearch/param/commit/686e8f3f77121f6548fbc37f135ec03a1f724678 https://github.com/facebookresearch/vrs/commit/83f0f0d68127d71d7479b7f92ab5d6d6871b3716 https://github.com/fairinternal/egohowto/commit/f569182ee4adebaadff3fb3d9b40d6bdbf749586 https://github.com/pytorch/fbgemm/commit/da695161bfb6db9c1042404060401ccdf7a90955 https://github.com/pytorch/kineto/commit/0e14caa7ac555c785a735bb8d92968e17e600831 Reviewed By: bigfootjon fbshipit-source-id: 44ef6633156393c167f5c2de02189a04cee75429 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c65f285e82de..70ac2474d6a0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2a58d40acdf81bfc6949f2c571c46ff5fb9e2f27 +Subproject commit d390c54928a3349c5747407548a8fbd9c1d90d11 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7c7b0737fdcb..3050ebf33215 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 97386490ea72606d7d5ba4dd6937b0de59ff134f +Subproject commit 49c7ed927f18e6f5ad0a9694809c4e0663aaa254 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0f9d20737017..9aeabd7dbc77 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2067a90c59fad597b8a1d6edde62b39ec63bb85b +Subproject commit 557ac0066816af0f4c2afcc9248ba717ba2a4d60 From 093b40b8269defd13eb3d7426989a5db319f38b7 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 24 Jan 2024 09:33:18 -0800 Subject: [PATCH 6750/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/767e458115142c5de958393ed88e65c8df180a41 https://github.com/facebook/fb303/commit/0dfc2739920b6a1fe14981d5f35093bd4e31a070 https://github.com/facebook/fbthrift/commit/8d11a285ff4501051319fcae7513a2e87e68e3e0 https://github.com/facebook/folly/commit/d7c9cf700194295496afeffb83c8cbd10c435d0e https://github.com/facebook/litho/commit/a3578d10cf0077de3a7c409fe757164bce55c092 https://github.com/facebook/mcrouter/commit/561bfa43aa91e1d10fd73d52ff085c8c6c412769 https://github.com/facebook/mvfst/commit/3749a5357e942c1d79d7261f141508a2b1600b5e https://github.com/facebook/ocamlrep/commit/18feaf2a2e4c9dea464bae9baefff5bfaf996eba https://github.com/facebook/proxygen/commit/800d3cdff2120c45266dc7f53beb725706d3cd78 https://github.com/facebook/rocksdb/commit/f0990321311d87cff830a911712043a95495f7a7 https://github.com/facebook/wangle/commit/97a3df0930c81b609a9dc24a06aebf5cd14181f2 https://github.com/facebook/watchman/commit/f9659c0e7d3d4445d210c293654ef2579ba196f3 https://github.com/facebookexperimental/edencommon/commit/3de59737ca40ffccd1fecea627e824598b3ecafb https://github.com/facebookexperimental/rust-shed/commit/3b4945d71e2799990581c502638e376f804170d4 https://github.com/facebookincubator/fizz/commit/25079451c70cf8e3334f09efd83a4ca29f4de5fc https://github.com/facebookincubator/katran/commit/c351b9a05b4d620f36a8a4bb6a5e7106416a177b https://github.com/facebookincubator/velox/commit/5fa64970fb9b6a9c7bf3103829c4132fc4f4942f https://github.com/pytorch/fbgemm/commit/97d6a0ff59f61cbfacb2a8c27ab2df231a7521c0 Reviewed By: bigfootjon fbshipit-source-id: 4c8fb85851a7532f3ef52ef9305a8dc19aaf0c68 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 70ac2474d6a0..863185aaf740 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d390c54928a3349c5747407548a8fbd9c1d90d11 +Subproject commit 8d11a285ff4501051319fcae7513a2e87e68e3e0 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 3050ebf33215..57b3db63133b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 49c7ed927f18e6f5ad0a9694809c4e0663aaa254 +Subproject commit d7c9cf700194295496afeffb83c8cbd10c435d0e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9aeabd7dbc77..1a59e8de438f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 557ac0066816af0f4c2afcc9248ba717ba2a4d60 +Subproject commit 97a3df0930c81b609a9dc24a06aebf5cd14181f2 From e99be538692180a913d565b360f410401b64fe13 Mon Sep 17 00:00:00 2001 From: "Vivek (FAIR) Pai" Date: Thu, 25 Jan 2024 02:13:59 -0800 Subject: [PATCH 6751/7387] upgrade zlib to 1.3.1 Summary: X-link: https://github.com/facebookincubator/zstrong/pull/673 Zlib's latest version is 1.3.1 - switch to that Reviewed By: chadaustin Differential Revision: D53005300 fbshipit-source-id: 191c9022c1ee288a6f117763428a9a85db54ed8f --- build/fbcode_builder/manifests/zlib | 6 ++--- .../zlib_dont_build_more_than_needed.patch | 26 ++++++++++--------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/build/fbcode_builder/manifests/zlib b/build/fbcode_builder/manifests/zlib index 86647fc9275e..dda100aa9e3c 100644 --- a/build/fbcode_builder/manifests/zlib +++ b/build/fbcode_builder/manifests/zlib @@ -12,10 +12,10 @@ zlib-devel zlib-static [download] -url = https://zlib.net/zlib-1.3.tar.gz -sha256 = ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e +url = https://zlib.net/zlib-1.3.1.tar.gz +sha256 = 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23 [build] builder = cmake -subdir = zlib-1.3 +subdir = zlib-1.3.1 patchfile = zlib_dont_build_more_than_needed.patch diff --git a/build/fbcode_builder/patches/zlib_dont_build_more_than_needed.patch b/build/fbcode_builder/patches/zlib_dont_build_more_than_needed.patch index 919f4ec8adc0..2ef115714919 100644 --- a/build/fbcode_builder/patches/zlib_dont_build_more_than_needed.patch +++ b/build/fbcode_builder/patches/zlib_dont_build_more_than_needed.patch @@ -1,28 +1,30 @@ -diff -Naur ../zlib-1.2.13/CMakeLists.txt ./CMakeLists.txt ---- ../zlib-1.2.13/CMakeLists.txt 2022-10-12 22:06:55.000000000 -0700 -+++ ./CMakeLists.txt 2022-10-14 14:50:28.000000000 -0700 -@@ -147,8 +147,7 @@ +diff -Naur ../zlib-1.3.1/CMakeLists.txt ./CMakeLists.txt +--- ../zlib-1.3.1/CMakeLists.txt 2024-01-22 10:32:37.000000000 -0800 ++++ ./CMakeLists.txt 2024-01-23 13:14:09.870289968 -0800 +@@ -149,10 +149,8 @@ set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) endif(MINGW) - + -add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) --add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +add_library(zlib ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) + target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) +-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +-target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) set_target_properties(zlib PROPERTIES SOVERSION 1) - -@@ -165,7 +164,7 @@ - + +@@ -169,7 +167,7 @@ + if(UNIX) # On unix-like platforms the library is almost always called libz - set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) + set_target_properties(zlib PROPERTIES OUTPUT_NAME z) - if(NOT APPLE) + if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX)) set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") endif() -@@ -175,7 +174,7 @@ +@@ -179,7 +177,7 @@ endif() - + if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) - install(TARGETS zlib zlibstatic + install(TARGETS zlib From 612a1c54e1f71a71be52de33c1152b69a27e1d0b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 25 Jan 2024 09:33:43 -0800 Subject: [PATCH 6752/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/1c8a21bf6cf435c516e21b78d1c68589c2ddd716 https://github.com/facebook/fatal/commit/0874680f7c1929b14525210b4246ba3a3d05614c https://github.com/facebook/fb303/commit/6cce626ee89ca403e6e10145d1badc2b7c2e6b36 https://github.com/facebook/fbthrift/commit/156fd876db314155dc655bd36837899031dacfd8 https://github.com/facebook/folly/commit/f088ada2987cfca0e0c1af4705575e01ba6a442e https://github.com/facebook/litho/commit/e3613a306f0cc07c41f4566ced5c351a521d9250 https://github.com/facebook/mcrouter/commit/e92ac513af8e5d7155f4ff5a3b708521eac0f012 https://github.com/facebook/mvfst/commit/e8185446e826c64b89139d953790fcb5a266b79f https://github.com/facebook/ocamlrep/commit/37b3eda591979af3236eb0fb21b92f057a82b3b7 https://github.com/facebook/proxygen/commit/2e9f484119b23278ab508b6ed2d580952a21511e https://github.com/facebook/rocksdb/commit/928aca835f2a048913a2d07701fe3b8434849939 https://github.com/facebook/wangle/commit/044b3963df3ec2c6421fb7c433bde2a410d8a2a4 https://github.com/facebook/watchman/commit/e99be538692180a913d565b360f410401b64fe13 https://github.com/facebookexperimental/edencommon/commit/3146004a602bce86cdc019afd6a8d03e665b2967 https://github.com/facebookexperimental/rust-shed/commit/92bf1f1bf53d841de3c5c9fe35536a5e7ed20ddc https://github.com/facebookincubator/fizz/commit/fc7f93cbbbc854195d958747cdefc10e594c4893 https://github.com/facebookincubator/katran/commit/2f48d0bcbb5ac43d1c0cc6bfbe15e815802ba91e https://github.com/facebookincubator/velox/commit/6d2f0d40cd2b33bd7df95fd98d611c4099a557fc https://github.com/pytorch/fbgemm/commit/5e9722a92fe2db330ee1955247d4f79054e89ab8 Reviewed By: bigfootjon fbshipit-source-id: eb142be5b8750a0f13efb55475649039b18f71d9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 863185aaf740..5eb8d8324143 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8d11a285ff4501051319fcae7513a2e87e68e3e0 +Subproject commit 156fd876db314155dc655bd36837899031dacfd8 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 57b3db63133b..a2ca38f1c89a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d7c9cf700194295496afeffb83c8cbd10c435d0e +Subproject commit f088ada2987cfca0e0c1af4705575e01ba6a442e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1a59e8de438f..7bff58ceabcc 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 97a3df0930c81b609a9dc24a06aebf5cd14181f2 +Subproject commit 044b3963df3ec2c6421fb7c433bde2a410d8a2a4 From cf57b1e444f1f6865c18501a513cd5183e79ee9e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 26 Jan 2024 09:35:35 -0800 Subject: [PATCH 6753/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/e574660b055e5010c70e7206b630a394d90182e7 https://github.com/facebook/fb303/commit/829cee36202f22736a34fc12c9fb4ec716c2466a https://github.com/facebook/fbthrift/commit/a6583f6b910a9ba2e40dc9f2aa4ae3f0509fac18 https://github.com/facebook/folly/commit/a7b803c9bba59088d0c2523c39424bdb6295e82b https://github.com/facebook/litho/commit/fb23ca15debbb26647486c90dc2815b1b3844325 https://github.com/facebook/mcrouter/commit/b2a28f93ba2010f351c6e7303dedcc2a93ae576b https://github.com/facebook/mvfst/commit/7cf6b19fa1dcb9f1c3aeb6be2bc2b6ce7dd4bcab https://github.com/facebook/ocamlrep/commit/4f6131b5ba548e8bab67fbd75da85840ace90e41 https://github.com/facebook/proxygen/commit/790ae16b2db3ef41528e09230d0d3096dc725f71 https://github.com/facebook/rocksdb/commit/a31fded2539eb5f54921b6fb86fb7b63c6ab5024 https://github.com/facebook/wangle/commit/9aed518b48a5dc60d3d0a08c0fd96a4f8953d7e3 https://github.com/facebook/watchman/commit/612a1c54e1f71a71be52de33c1152b69a27e1d0b https://github.com/facebookexperimental/edencommon/commit/5fb812e7677feb688671f26cdaa008141d507e09 https://github.com/facebookexperimental/rust-shed/commit/0fae673b0a98e40a36e8b84a2466fd759f5c4aca https://github.com/facebookincubator/fizz/commit/35c341968a05400929b64d0546903e44754e0103 https://github.com/facebookincubator/katran/commit/fb301fa2ca7893e0060ee94bd5edb2ad67cc1074 https://github.com/facebookincubator/velox/commit/62fff838b156e8df1a985dd6442b44e49d080a44 https://github.com/facebookresearch/param/commit/369d5c65a8dd275e800d9dad73700810a69a2b62 https://github.com/facebookresearch/vrs/commit/406cf4a76b123baa734d626af499d56e23cadc3b https://github.com/pytorch/fbgemm/commit/9bf4b81940fcf5ce2159c2b0f7c552432338b910 Reviewed By: jurajh-fb fbshipit-source-id: 30758eb7785266e1edbc80fd393282d4aa68bd8d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5eb8d8324143..e53ebccf0db2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 156fd876db314155dc655bd36837899031dacfd8 +Subproject commit a6583f6b910a9ba2e40dc9f2aa4ae3f0509fac18 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a2ca38f1c89a..b4a1402c0e5f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f088ada2987cfca0e0c1af4705575e01ba6a442e +Subproject commit a7b803c9bba59088d0c2523c39424bdb6295e82b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7bff58ceabcc..faa4e25165f1 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 044b3963df3ec2c6421fb7c433bde2a410d8a2a4 +Subproject commit 9aed518b48a5dc60d3d0a08c0fd96a4f8953d7e3 From a76f994b90f3b5bc257a4e7e79ed7622aa0403c2 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 27 Jan 2024 09:31:35 -0800 Subject: [PATCH 6754/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/359c6a0ddd808c6cab4698b08063fa0dbcf4fcea https://github.com/facebook/fb303/commit/76d79cc3996b8dfde8743277667787ae4ab3dadd https://github.com/facebook/fbthrift/commit/cdef2eb8363b1e73bd8b29b36bed531c18fb0da4 https://github.com/facebook/folly/commit/ac55469304602e64a13cb28b081b4114737f7cb2 https://github.com/facebook/litho/commit/a639c6c02dbaeb51ad28233dfd09480886805185 https://github.com/facebook/mvfst/commit/b2db0631399fd157a276c466267cfbd9887faaf8 https://github.com/facebook/proxygen/commit/020db5b15510aea4342a508d9bd97ca0efc77e3a https://github.com/facebook/rocksdb/commit/36704e9227a355fcb8b10bd6d29cf0f9f43d80f8 https://github.com/facebook/wangle/commit/99e07f6d57ba9478630b4dfeaeaa11b9fca723aa https://github.com/facebook/watchman/commit/cf57b1e444f1f6865c18501a513cd5183e79ee9e https://github.com/facebookexperimental/edencommon/commit/bfb6981234f4e0d37c6f1534660ccf245b63a1c2 https://github.com/facebookexperimental/rust-shed/commit/652aba9e3884c93f348407cefa312f5f8979b648 https://github.com/facebookincubator/fizz/commit/c76d6d710052e24e68688deb94b946492b8783d0 https://github.com/facebookincubator/katran/commit/5abf2ce707e47d576ce53a334c50ab0270c5c1ce https://github.com/facebookincubator/velox/commit/7df715557c6b11aafdf01bf2aa062f0f00dd6a7e https://github.com/fairinternal/egohowto/commit/9c7cc5ff8889b039086536dfa60320288008a341 https://github.com/pytorch/fbgemm/commit/d6edaabf2f33dab6f3f1ff2cf35c2f7941e576d6 https://github.com/pytorch/kineto/commit/40a884218a4b4ccc3f29bc88fe95e9d2111bd29e Reviewed By: bigfootjon fbshipit-source-id: acda4b0e6454fe65b8edbc4403e223fa391720b8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e53ebccf0db2..421a4c732cca 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a6583f6b910a9ba2e40dc9f2aa4ae3f0509fac18 +Subproject commit cdef2eb8363b1e73bd8b29b36bed531c18fb0da4 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b4a1402c0e5f..b0d7fcd49475 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a7b803c9bba59088d0c2523c39424bdb6295e82b +Subproject commit ac55469304602e64a13cb28b081b4114737f7cb2 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index faa4e25165f1..dfb8099dc81c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9aed518b48a5dc60d3d0a08c0fd96a4f8953d7e3 +Subproject commit 99e07f6d57ba9478630b4dfeaeaa11b9fca723aa From 7bd2081316f03b5a29585f7442f1f409d33264ce Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 28 Jan 2024 09:31:42 -0800 Subject: [PATCH 6755/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/246a4d1b9131092de94778ff0b5caa77ec28cce5 https://github.com/facebook/fb303/commit/e688c011fd9243c29bcbf3f389b934d27374958b https://github.com/facebook/fbthrift/commit/564bf50b9d173d54c8a01a3090f0e2ee9adeb729 https://github.com/facebook/mvfst/commit/5bf2abbc87b470c290b97c046a1de722528d23e0 https://github.com/facebook/proxygen/commit/6b349045579b5809ee56bd221939ec801851c400 https://github.com/facebook/wangle/commit/9d0dc399681ec974aa55cdc8bd8fdbd0bf74730d https://github.com/facebook/watchman/commit/a76f994b90f3b5bc257a4e7e79ed7622aa0403c2 https://github.com/facebookexperimental/edencommon/commit/f3a58d7bb994b52d6020a00832fa0c1a1ffc15b2 https://github.com/facebookexperimental/rust-shed/commit/0b57fe5d1d918828ad121334949aca4160daa777 https://github.com/facebookincubator/fizz/commit/020b2a13aaaebc3a30d155f7c95915f1cd75cb09 https://github.com/facebookincubator/katran/commit/75a0daed4847edd573531ec5e45e791bdbdf8380 https://github.com/facebookresearch/vrs/commit/ee02184ff63b8c5da8cf9afe620c7b059a0df5b3 Reviewed By: bigfootjon fbshipit-source-id: d6ca902a49b30d0fcf88322c586720f441437d6d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 421a4c732cca..41422970800f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cdef2eb8363b1e73bd8b29b36bed531c18fb0da4 +Subproject commit 564bf50b9d173d54c8a01a3090f0e2ee9adeb729 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index dfb8099dc81c..c8a9502d712f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 99e07f6d57ba9478630b4dfeaeaa11b9fca723aa +Subproject commit 9d0dc399681ec974aa55cdc8bd8fdbd0bf74730d From 780dfe96be65a133ff78abb5deb0ecbeb9fa133e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 29 Jan 2024 09:33:45 -0800 Subject: [PATCH 6756/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/6762969fa3de0904263dde1593ecaa2a3c93711a https://github.com/facebook/fb303/commit/b7f5bb7f7392fe8df3d9ce35d4250fcc23b613bb https://github.com/facebook/fbthrift/commit/2a84ddacc7472f951f95595970051daf95376e04 https://github.com/facebook/litho/commit/54627feaa47148340cc7b3a3cce33ae46197f5a7 https://github.com/facebook/mvfst/commit/12f5bccfb9a06a233be801e331b86087574f6785 https://github.com/facebook/proxygen/commit/20ad222f53a12a5cde1be35baf22711be09b9ca8 https://github.com/facebook/wangle/commit/b41a3df9810341e67e1b28f5aca0eba19f71f1c8 https://github.com/facebook/watchman/commit/7bd2081316f03b5a29585f7442f1f409d33264ce https://github.com/facebookexperimental/rust-shed/commit/4d4c5fc266a9877c29397661ec17da45453e7a7d https://github.com/facebookincubator/katran/commit/e980f432fdf52afaf6af3d1718b6bad2332f5f9e https://github.com/facebookincubator/velox/commit/2d7388611e76f5577f8586184287c0692ec68f64 https://github.com/facebookresearch/vrs/commit/51f2e586854ad6eb05d032ca6de4cad1b73c98dd https://github.com/pytorch/fbgemm/commit/7caf97e63f4017d1b8abe139ed20472cbcdc2076 Reviewed By: jailby fbshipit-source-id: 12d1d107f0bab24bb9fe5da97c0677c229d5be09 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 41422970800f..dbbc415f3029 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 564bf50b9d173d54c8a01a3090f0e2ee9adeb729 +Subproject commit 2a84ddacc7472f951f95595970051daf95376e04 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c8a9502d712f..368d356debf3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9d0dc399681ec974aa55cdc8bd8fdbd0bf74730d +Subproject commit b41a3df9810341e67e1b28f5aca0eba19f71f1c8 From 0fede136da7b24344b50087129c704655556b257 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 30 Jan 2024 09:32:17 -0800 Subject: [PATCH 6757/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/9853dfa0b2e64584fd5765092248abd4a5076e6a https://github.com/facebook/fb303/commit/0a968ca5bd53404c662e4f5070d80aa799277ba3 https://github.com/facebook/fbthrift/commit/4b1e282ca048da25a104a4ffdf6315ab67dab6aa https://github.com/facebook/folly/commit/46a84647f71701a73db281da2dd2be42a8af37a1 https://github.com/facebook/litho/commit/5bd0972739a157f14f102140b4add3792aa17a7f https://github.com/facebook/mcrouter/commit/efd59d92d8c28b704d026bd39de090cf1473328e https://github.com/facebook/mvfst/commit/303c405e106bb63e53d1a82a80b74e18dad5c241 https://github.com/facebook/ocamlrep/commit/ea68bc546833588241d9f45c3328cfdd1aea9306 https://github.com/facebook/proxygen/commit/ee1bbafd8a78054f9cfa99506bedaf305587ed5a https://github.com/facebook/rocksdb/commit/aacf60dda2a138f9d3826c25818a3bcf250859fd https://github.com/facebook/watchman/commit/780dfe96be65a133ff78abb5deb0ecbeb9fa133e https://github.com/facebookexperimental/rust-shed/commit/d632c39aa48394c1c43905baa1016abb02009652 https://github.com/facebookincubator/fizz/commit/7faea9d557da75e2b6467744554dddd2be819de3 https://github.com/facebookincubator/velox/commit/5b8b4bdfebda8d39b037f5a7aa3f05613fac68bb https://github.com/facebookresearch/vrs/commit/154df378edb25e50a2e5cdb457c7e9148ca4a055 https://github.com/fairinternal/egohowto/commit/dd05b799566ce15d4510c0696f7e840d6a61edc7 https://github.com/pytorch/fbgemm/commit/0c7fa1a5856473d71814be019446f90b1baa37e3 Reviewed By: jailby fbshipit-source-id: 0e2e0102007b2f7eb307e8a91a99e9b32a90a7b5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index dbbc415f3029..5b18194881b1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2a84ddacc7472f951f95595970051daf95376e04 +Subproject commit 4b1e282ca048da25a104a4ffdf6315ab67dab6aa diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b0d7fcd49475..468faa40e31a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ac55469304602e64a13cb28b081b4114737f7cb2 +Subproject commit 46a84647f71701a73db281da2dd2be42a8af37a1 From 2c31a807b52a8d3ce0fc162377779055b6c210fa Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 31 Jan 2024 09:31:26 -0800 Subject: [PATCH 6758/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/2d1ac7867135abe56ba5b17e568495c0fd1446c7 https://github.com/facebook/fb303/commit/6899ef909d12160e6a6542f671e077b131d1ef0b https://github.com/facebook/fbthrift/commit/8dd9c86d90ef3cb7560f647ce8585a31eb354641 https://github.com/facebook/folly/commit/060d1d29480b7e77c73d80902e564c6b0071d15f https://github.com/facebook/litho/commit/3d42a6fdba12e224e7565d65b049d4f7d4614c17 https://github.com/facebook/mcrouter/commit/a0c8e675f68c692ec445d0af30c5d43899220f0c https://github.com/facebook/mvfst/commit/3eb7c16af64af5356fd0eec77449fe0e2cf2fd8a https://github.com/facebook/proxygen/commit/c3295efe7265c237a8487cf1ba7f5c94860abafc https://github.com/facebook/rocksdb/commit/acf77e1bfee9ebb0867ac277927ed2e37276c493 https://github.com/facebook/squangle/commit/f511fdabda31c53793b82586f6ddbc273da739ca https://github.com/facebook/wangle/commit/c4994a12f389d972e0aecb45db8b55e6e1da6448 https://github.com/facebook/watchman/commit/0fede136da7b24344b50087129c704655556b257 https://github.com/facebookexperimental/edencommon/commit/2ea682b7444924d979b201400abb6cabc6efe561 https://github.com/facebookexperimental/rust-shed/commit/3437f98d0cbbd178feb0f7e2b1f7eb7f0ceb4038 https://github.com/facebookincubator/fizz/commit/e49b4340abfda0ec9adcfe127304545523b96822 https://github.com/facebookincubator/katran/commit/05ae172ec6193971f54e7bdca1d7f0a9734d93d1 https://github.com/facebookincubator/velox/commit/280fc86111b36d77fb93a970fa1eb46dda964ad9 https://github.com/fairinternal/egohowto/commit/e53c91aff40fcc450b33acaa550ac66a3934533a https://github.com/pytorch/fbgemm/commit/2a7b3ab54341705dc554ee39e8f3aa19be896134 Reviewed By: jailby fbshipit-source-id: 2e65ae3c20e7512c1e5facc5d38b5e2a46bea6b8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5b18194881b1..b55c54bb1dda 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4b1e282ca048da25a104a4ffdf6315ab67dab6aa +Subproject commit 8dd9c86d90ef3cb7560f647ce8585a31eb354641 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 468faa40e31a..8be88440dd54 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 46a84647f71701a73db281da2dd2be42a8af37a1 +Subproject commit 060d1d29480b7e77c73d80902e564c6b0071d15f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 368d356debf3..bc094b8860c7 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b41a3df9810341e67e1b28f5aca0eba19f71f1c8 +Subproject commit c4994a12f389d972e0aecb45db8b55e6e1da6448 From f9da88de193ffac1e9a8a157261b75c04abb97f3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 1 Feb 2024 09:33:41 -0800 Subject: [PATCH 6759/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/f8dfc24a478e7f64716832b6978800839e960e63 https://github.com/facebook/fb303/commit/930cea047b2443d829a6e3d358c003f5ffff1054 https://github.com/facebook/fbthrift/commit/202c9cb7c54c25d7bbe590c54cbc9c119df48422 https://github.com/facebook/folly/commit/0825f6490a7d4fc05e39fd62eed80fa91e6be9ec https://github.com/facebook/litho/commit/e50b04d5f7f938946fe873bdfdf65566e3398587 https://github.com/facebook/mcrouter/commit/c14687b4e322e1328a490e28e2cb6d62618a8fa3 https://github.com/facebook/mvfst/commit/2e46add01347587ee60ec5c233c8aac457b42894 https://github.com/facebook/proxygen/commit/c80c56dea19db53b49777ba0e92e000a514ebbf7 https://github.com/facebook/rocksdb/commit/f9d45358ca3d5e90650cc4c4d55916a247fe66e5 https://github.com/facebook/wangle/commit/d809608d36acecac7930045dfc987b16bba2bff0 https://github.com/facebook/watchman/commit/2c31a807b52a8d3ce0fc162377779055b6c210fa https://github.com/facebookexperimental/edencommon/commit/380d657120a0857143c5272d51c251cb8fde723b https://github.com/facebookexperimental/rust-shed/commit/6d023842d4041766e482159750f42c1b0b04981b https://github.com/facebookincubator/fizz/commit/82f673e6e2406be1db1b7c7da9d8c440768d2f28 https://github.com/facebookincubator/katran/commit/3633c41e7770cff595542d656098732ed17915b2 https://github.com/facebookincubator/velox/commit/887b12ef4416d32880ef656c8959e9eff3ed36b5 https://github.com/fairinternal/egohowto/commit/16460de9cd22d40318fa5493b5f540094dc83b8a https://github.com/pytorch/fbgemm/commit/3f1fe5d1f0344b0690f9830937e8e0ce06d520f6 https://github.com/pytorch/kineto/commit/3f30237e868ca92b46b309da17d84b37be373a6e Reviewed By: jailby fbshipit-source-id: 65d398ef6f264e6421d5ac74bedda553c049a6c9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b55c54bb1dda..85cb3d9a06b3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8dd9c86d90ef3cb7560f647ce8585a31eb354641 +Subproject commit 202c9cb7c54c25d7bbe590c54cbc9c119df48422 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8be88440dd54..1ff4d5476bbf 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 060d1d29480b7e77c73d80902e564c6b0071d15f +Subproject commit 0825f6490a7d4fc05e39fd62eed80fa91e6be9ec diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index bc094b8860c7..99d5b0674755 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c4994a12f389d972e0aecb45db8b55e6e1da6448 +Subproject commit d809608d36acecac7930045dfc987b16bba2bff0 From beaa1df9fa198f50fa3042dc16f581b86c337c5a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 2 Feb 2024 09:35:08 -0800 Subject: [PATCH 6760/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/c003afe29db434dfab2c7f6d79a099a12ef96e2c https://github.com/facebook/fb303/commit/d24b1194062d70959b306a92a8729fa604873c2e https://github.com/facebook/fbthrift/commit/f55d02f8132d810cb6ec7834b64b72ad272bb720 https://github.com/facebook/folly/commit/e85f6341065d4c807e819a4fc9e5ebfff567ac16 https://github.com/facebook/litho/commit/ba0dfa54943d4eed00e254381bdd0b51bd084146 https://github.com/facebook/mcrouter/commit/8c161efbe4498a6890260564cec9afc5abf9a318 https://github.com/facebook/mvfst/commit/8ff1b414a612aa04c614ac1c10057cf950d4d73a https://github.com/facebook/proxygen/commit/0380f4a5441ce3a498c245db741dcd16650ef56a https://github.com/facebook/rocksdb/commit/046ac91a7f887b1c1a970a7a950dd1e1689189e0 https://github.com/facebook/wangle/commit/91d3e371e0f1b92ecfd1adaf15f17470c73de69e https://github.com/facebook/watchman/commit/f9da88de193ffac1e9a8a157261b75c04abb97f3 https://github.com/facebookexperimental/edencommon/commit/f814a98c25b66ba1f0fab8508b849f4c9126a11a https://github.com/facebookexperimental/rust-shed/commit/535e240ba0c60862a5f22a215d56b74bbd868590 https://github.com/facebookincubator/fizz/commit/ba1ace5fd81d4227a2f48edbc1817752270ea577 https://github.com/facebookincubator/katran/commit/8df9759464ee5767243665b4be187fc8fc2b87e7 https://github.com/facebookincubator/velox/commit/f9c9738a5ffa2648c4b15ad68bec16c4c84905af https://github.com/facebookresearch/vrs/commit/3c7e7cc82a98cc53e9276276e228b386516fdbbe https://github.com/fairinternal/egohowto/commit/ff83fc2a873fd888e0dbfd1d8773678c8f2f85e3 https://github.com/pytorch/fbgemm/commit/c218dc31e3ff2207c33860d46a407300447a2f86 Reviewed By: jailby fbshipit-source-id: 756b40a82844ffcdd04f598518f62e8888d4eec5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 85cb3d9a06b3..debd73f4010f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 202c9cb7c54c25d7bbe590c54cbc9c119df48422 +Subproject commit f55d02f8132d810cb6ec7834b64b72ad272bb720 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 1ff4d5476bbf..17ce3785a509 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0825f6490a7d4fc05e39fd62eed80fa91e6be9ec +Subproject commit e85f6341065d4c807e819a4fc9e5ebfff567ac16 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 99d5b0674755..a0c21c07e815 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d809608d36acecac7930045dfc987b16bba2bff0 +Subproject commit 91d3e371e0f1b92ecfd1adaf15f17470c73de69e From 9251157b9fe0e1af772af4d096939a67bb0127cd Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 3 Feb 2024 09:32:30 -0800 Subject: [PATCH 6761/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/f1156f70eb9001319738d9aadd23f87be2b69e0e https://github.com/facebook/fb303/commit/23edb9f8e86de33fb2b0454f2f33e79d42a823b4 https://github.com/facebook/fbthrift/commit/54146275cb0dddd9eac44bbd812fe513c14f4375 https://github.com/facebook/folly/commit/0fb2b8a1b12405111f1a8b186886b87c93ed0883 https://github.com/facebook/litho/commit/071b63963957aaa906f4a4edd74aee8ecbc58592 https://github.com/facebook/mcrouter/commit/f7b27b5411024cd196aeb84e3fb5780479bcf17b https://github.com/facebook/mvfst/commit/46369b94df0ba5190fe59e83bf0e0b9876ae300a https://github.com/facebook/proxygen/commit/d5654558a3ca90811b6a4776020b2e800b39ac36 https://github.com/facebook/rocksdb/commit/4eaa771c01727a6785b81f5f4a09840d38e31cf6 https://github.com/facebook/wangle/commit/036067d2bf787890706aa51ce639a3196957f53d https://github.com/facebook/watchman/commit/beaa1df9fa198f50fa3042dc16f581b86c337c5a https://github.com/facebookexperimental/edencommon/commit/4dd9eb24f581877e9ac95b848070d61684a62197 https://github.com/facebookexperimental/rust-shed/commit/181580f1e0c958caa796956e5865786c1594e9d2 https://github.com/facebookincubator/fizz/commit/a9d0289c9c91170a2bea70e67899935045f28f21 https://github.com/facebookincubator/katran/commit/221d2ef3e610acb9c70c9b46f9a1681e73728612 https://github.com/facebookincubator/velox/commit/6a8f16f37fe8d1ad9a1b974b8988d9ad4fdfc0ad https://github.com/facebookresearch/vrs/commit/c9c8403da24609d57bf977dcf0b834cbd170f251 https://github.com/pytorch/fbgemm/commit/aabb4ae8599311f5be3803b20167ff3c8d2f0fd9 https://github.com/pytorch/kineto/commit/3143bf14b6974cb4a128269846cdb4b048979632 Reviewed By: jailby fbshipit-source-id: 6a269746f7eebf00833dda7961cd2f34291d6d0a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index debd73f4010f..4451777b8f79 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f55d02f8132d810cb6ec7834b64b72ad272bb720 +Subproject commit 54146275cb0dddd9eac44bbd812fe513c14f4375 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 17ce3785a509..a6a97bbd98ad 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e85f6341065d4c807e819a4fc9e5ebfff567ac16 +Subproject commit 0fb2b8a1b12405111f1a8b186886b87c93ed0883 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a0c21c07e815..bd242bcd040d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 91d3e371e0f1b92ecfd1adaf15f17470c73de69e +Subproject commit 036067d2bf787890706aa51ce639a3196957f53d From e68feda29a218a0d36ee8bb829d056c4519b7083 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 4 Feb 2024 09:33:11 -0800 Subject: [PATCH 6762/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/e040b5d3629b9f69dc15f9c680d88ed44dc2c93f https://github.com/facebook/fb303/commit/3091c9593e332745b02f59249242547ac0902c65 https://github.com/facebook/fbthrift/commit/03c2fd0a4d23ba8ed9ecd7cd65f9956d4ca9787d https://github.com/facebook/folly/commit/718e60213d159401916acc932c1f3766aad3beb8 https://github.com/facebook/mvfst/commit/6362aaffeba6a9a2e922043ca2f58f7f0b1bcbf9 https://github.com/facebook/proxygen/commit/9cd5d3fef0de9f9ce8cdd6ca6ba6e39bf102284a https://github.com/facebook/wangle/commit/2d07ba7485e2f67685c38541e2931664ffe2cbdc https://github.com/facebook/watchman/commit/9251157b9fe0e1af772af4d096939a67bb0127cd https://github.com/facebookexperimental/edencommon/commit/17b269fcbb7ad796befe7e5bdcb67964ac0fe641 https://github.com/facebookexperimental/rust-shed/commit/2335e047b45e99a98eab5c345f4bce3abdab6f30 https://github.com/facebookincubator/fizz/commit/4c5850481df9598253576189be3adc5e959f59dc https://github.com/facebookincubator/katran/commit/631dc400c8ccd14263acfa36862b99fe2917d6b0 https://github.com/facebookincubator/superconsole/commit/5f1b4079b15b5988a8c18fef8618d34428852e54 https://github.com/facebookincubator/velox/commit/735b8f4c0feb73f93bfe1983abd348fdfb2c451f https://github.com/pytorch/fbgemm/commit/dad9720397a4ceb13da32127f97c515e9a8c8d26 Reviewed By: jailby fbshipit-source-id: be997aa3d80d7feff156d30e2168581eeae1be6d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4451777b8f79..83893432d4a9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 54146275cb0dddd9eac44bbd812fe513c14f4375 +Subproject commit 03c2fd0a4d23ba8ed9ecd7cd65f9956d4ca9787d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a6a97bbd98ad..9c7f700ca682 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0fb2b8a1b12405111f1a8b186886b87c93ed0883 +Subproject commit 718e60213d159401916acc932c1f3766aad3beb8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index bd242bcd040d..cce79d1f8886 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 036067d2bf787890706aa51ce639a3196957f53d +Subproject commit 2d07ba7485e2f67685c38541e2931664ffe2cbdc From 37aa438554ca3b41d041a4c6e85ec3d14d82a137 Mon Sep 17 00:00:00 2001 From: Itamar Oren Date: Mon, 5 Feb 2024 08:37:34 -0800 Subject: [PATCH 6763/7387] Use "python" from fbsource//third-party/python Summary: tp2 is not the source of truth for 3.10+, and doesn't even exist for Python 3.12. for 3.8, `fbsource//third-party/python` takes care of redirecting to tp2. Reviewed By: zsol Differential Revision: D53368430 fbshipit-source-id: 77a44a60251c5be21b5f013c99b8dcc33fa30d9f --- watchman/python/pywatchman/bser.h | 2 +- watchman/python/pywatchman/bsermodule.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/watchman/python/pywatchman/bser.h b/watchman/python/pywatchman/bser.h index 61ca5227a2f4..d29f14371bc8 100644 --- a/watchman/python/pywatchman/bser.h +++ b/watchman/python/pywatchman/bser.h @@ -8,7 +8,7 @@ #pragma once #define PY_SSIZE_T_CLEAN -#include // @manual=third-party//python:python +#include // @manual=fbsource//third-party/python:python #ifdef __cplusplus extern "C" { diff --git a/watchman/python/pywatchman/bsermodule.c b/watchman/python/pywatchman/bsermodule.c index 70726c1b7ff9..ec93ff905073 100644 --- a/watchman/python/pywatchman/bsermodule.c +++ b/watchman/python/pywatchman/bsermodule.c @@ -6,8 +6,8 @@ */ #define PY_SSIZE_T_CLEAN -#include -#include +#include // @manual=fbsource//third-party/python:python +#include // @manual=fbsource//third-party/python:python #ifdef _MSC_VER #define inline __inline #if _MSC_VER >= 1800 From a54da7fb7980022cb519ee7e456d34b1b4613bff Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 5 Feb 2024 09:33:05 -0800 Subject: [PATCH 6764/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/43409a68dd96aee77c7abc1a32ff22c90679ec81 https://github.com/facebook/fb303/commit/898b4bb0a175c9aac80c74f69c1a9dc92c90d34f https://github.com/facebook/fbthrift/commit/7573c03f256b606e986ccef3f1fe41e7075dbc3c https://github.com/facebook/folly/commit/50a3753e00756cb54b606502f8d96f84a4ffee99 https://github.com/facebook/mvfst/commit/a94812925810691dd66aa076dd87381542a4f521 https://github.com/facebook/proxygen/commit/ef63139c092237216aeb23f5401b08d7e07d571d https://github.com/facebook/wangle/commit/628e104f74b720a4ca1916d69219d7be1d877358 https://github.com/facebook/watchman/commit/e68feda29a218a0d36ee8bb829d056c4519b7083 https://github.com/facebookexperimental/edencommon/commit/1fa8c46494d16c675bddecf44d3266067d42d59b https://github.com/facebookexperimental/rust-shed/commit/06e9ee987799e21d4b2d5c0afa226ae8ee080dab https://github.com/facebookincubator/fizz/commit/fe77446a243a58af13769d62dfbf2c70aebd38e7 https://github.com/facebookincubator/katran/commit/7f43df4a4f9ad5ad8147fb254c703c1caef4988b https://github.com/fairinternal/egohowto/commit/54fac8fbef72f3c94cc2674dc6d3acc874f47a5f Reviewed By: jurajh-fb fbshipit-source-id: 0eec7b1b1f92d2eb0360be1a2fb7ad98542a3872 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 83893432d4a9..7b8878279d9f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 03c2fd0a4d23ba8ed9ecd7cd65f9956d4ca9787d +Subproject commit 7573c03f256b606e986ccef3f1fe41e7075dbc3c diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9c7f700ca682..9ea560cb7c58 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 718e60213d159401916acc932c1f3766aad3beb8 +Subproject commit 50a3753e00756cb54b606502f8d96f84a4ffee99 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index cce79d1f8886..3a1f6134e781 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2d07ba7485e2f67685c38541e2931664ffe2cbdc +Subproject commit 628e104f74b720a4ca1916d69219d7be1d877358 From 0afd5dc4d13c10f63486bcfede6b186d762e9933 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 6 Feb 2024 09:37:43 -0800 Subject: [PATCH 6765/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/9c46befa9716b304840832263e9b68a5df7d83fe https://github.com/facebook/fb303/commit/c0fdb33be7668348f285c25457160617ec13c682 https://github.com/facebook/fbthrift/commit/b6679ef5bf5f12203e6cef5d0f719a1701060ac3 https://github.com/facebook/folly/commit/e5fac9ed4c93bcb43f09f96a1db28879f358a3dd https://github.com/facebook/litho/commit/3ac61b62e1e9e846c39dced1b0200ac75a503540 https://github.com/facebook/mcrouter/commit/91e11f121733f0565acce75cdce04fe39d842073 https://github.com/facebook/mvfst/commit/7af75fc0f5fa50f528826883e9fdacd8966b709c https://github.com/facebook/proxygen/commit/68e5513f86c54572d39719b70ba82d39c4abe350 https://github.com/facebook/rocksdb/commit/0088f777889bd627b4332e9851e15c2c460c89fa https://github.com/facebook/wangle/commit/3c35cdee128f7d2950439833fd4154ba2777b4b7 https://github.com/facebook/watchman/commit/a54da7fb7980022cb519ee7e456d34b1b4613bff https://github.com/facebookexperimental/edencommon/commit/1b06702bb32aef872fc5bd650d590e6599a95580 https://github.com/facebookexperimental/rust-shed/commit/86a290c84207570736dc62a8ae585628cadc6325 https://github.com/facebookincubator/fizz/commit/3d4b8b26cfc4759ce0cc80ad46d188b842ffda88 https://github.com/facebookincubator/katran/commit/3e2e2f627c3e358c817685b34f8ceb6177d1607d https://github.com/facebookincubator/velox/commit/a3f4dcbecd134b52bcc95b921f96ac7b9efd87ba https://github.com/pytorch/fbgemm/commit/86acdbd0500469460f608fbd6c96b75a8ba84752 Reviewed By: jurajh-fb fbshipit-source-id: f26bba2a50c4319755d173b374cf131944884bb4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7b8878279d9f..fe198675bb12 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7573c03f256b606e986ccef3f1fe41e7075dbc3c +Subproject commit b6679ef5bf5f12203e6cef5d0f719a1701060ac3 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9ea560cb7c58..f9b3d3c3260b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 50a3753e00756cb54b606502f8d96f84a4ffee99 +Subproject commit e5fac9ed4c93bcb43f09f96a1db28879f358a3dd diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3a1f6134e781..1a1b336539d3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 628e104f74b720a4ca1916d69219d7be1d877358 +Subproject commit 3c35cdee128f7d2950439833fd4154ba2777b4b7 From 179d3a2a3092e470552c129f4a66b02cdf49de5b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 7 Feb 2024 09:36:10 -0800 Subject: [PATCH 6766/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/8401cda07b3e686fa8b06513f403ea3e9a414385 https://github.com/facebook/fb303/commit/4e77f4e33d58a0fb846a6d60a5626ad2989c164c https://github.com/facebook/fbthrift/commit/14307765712830b6048d4ea7baaaa260e1a54cd8 https://github.com/facebook/folly/commit/b64a246f68bacecacc8ba691611a8b52091fb58e https://github.com/facebook/litho/commit/9d24d94b5bfd11d14003a439b79beb4febec1615 https://github.com/facebook/mvfst/commit/4c3d91842fbbcef152b7a3d4684e85893d3c4832 https://github.com/facebook/proxygen/commit/11e0f6f39427a5ee39b960e2766ccdd864086e0c https://github.com/facebook/rocksdb/commit/e3e8fbb497240dca68820604ef463065146f9fe2 https://github.com/facebook/squangle/commit/d34bd4867a95a89f7b27e36869b53a69115d15e4 https://github.com/facebook/wangle/commit/c4e70b86883f3f747b9f4903ceea44161d1d4432 https://github.com/facebook/watchman/commit/0afd5dc4d13c10f63486bcfede6b186d762e9933 https://github.com/facebookexperimental/edencommon/commit/d28b7252a28f8a3b1626aa17863b49b94ea51493 https://github.com/facebookexperimental/rust-shed/commit/81c3c51c82c46107848709db0675ed1c8bbd1c04 https://github.com/facebookincubator/fizz/commit/55a39946243b776652a96a4aa7a834b76766a8f3 https://github.com/facebookincubator/katran/commit/09da98309ccdca5ff87308c60bae2cd82e6eee40 https://github.com/facebookincubator/velox/commit/fe52e60a09e6468d2886c195fef70d99cf5cdce6 https://github.com/fairinternal/egohowto/commit/1cdc8992559d1e5eb39204fb4dfa2390b6b76272 https://github.com/pytorch/fbgemm/commit/af41af1f21918a300136f47fe996b5c68446682b Reviewed By: jurajh-fb fbshipit-source-id: 1f96075a8f2487d8f5abc893c6413e31bb15dc06 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index fe198675bb12..5ba05c31977e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b6679ef5bf5f12203e6cef5d0f719a1701060ac3 +Subproject commit 14307765712830b6048d4ea7baaaa260e1a54cd8 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f9b3d3c3260b..fa40acee5207 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e5fac9ed4c93bcb43f09f96a1db28879f358a3dd +Subproject commit b64a246f68bacecacc8ba691611a8b52091fb58e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1a1b336539d3..5bfb187f8b10 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3c35cdee128f7d2950439833fd4154ba2777b4b7 +Subproject commit c4e70b86883f3f747b9f4903ceea44161d1d4432 From 9b1d88a0a112bbaf9785330020ecee12d19bd57c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 8 Feb 2024 09:35:44 -0800 Subject: [PATCH 6767/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/57311995d33d8f7ff84fcd60334471da7fb0d3ed https://github.com/facebook/fb303/commit/bfd6cce4785075622c1a17d9a5a7630d73e8546a https://github.com/facebook/fbthrift/commit/9259538ce554f0f181605d4032ba21c837a4e0e0 https://github.com/facebook/folly/commit/6b0e92e7df5fe455d8ec14528af0293b83b0ffa7 https://github.com/facebook/litho/commit/72702b4ddf239d701ace3f83042c27905cfaa735 https://github.com/facebook/mcrouter/commit/5ab88bd364b459d1a0db91e4bfc81e6f1cf4c737 https://github.com/facebook/mvfst/commit/8d14b97fb15adcc28998e67ea2d450643003833b https://github.com/facebook/proxygen/commit/98c079b8fe3e434c0e3cb7d4981d987544710ffc https://github.com/facebook/rocksdb/commit/b46f5707c4092a2972941aad3308464887857157 https://github.com/facebook/wangle/commit/687688552f8a15faec88a6f1a786b2e61831208b https://github.com/facebook/watchman/commit/179d3a2a3092e470552c129f4a66b02cdf49de5b https://github.com/facebookexperimental/edencommon/commit/5637b948a196eaf407d9427cf5bc1b5be7719dad https://github.com/facebookexperimental/rust-shed/commit/ab5c3ca24c038e85877da8b02f84f1f8f5803218 https://github.com/facebookincubator/fizz/commit/b46065ff43ddd9a0c6b6fc532f696138a483008e https://github.com/facebookincubator/katran/commit/452479432eb4aa7485f305a4bfff3f986cf5ab0d https://github.com/facebookincubator/velox/commit/2abff36c5472f3c239d2eae3488357dbf75d488c https://github.com/facebookresearch/vrs/commit/cb317b7caf60c1ea37912834e5309f4fe0fb2883 https://github.com/fairinternal/egohowto/commit/dbb9fc589975ad0ad0d1de667eb85fe7f9906a68 https://github.com/pytorch/fbgemm/commit/86ea895c6e680d03a59283b40ae614f16a1a10ae https://github.com/pytorch/kineto/commit/b34efb3f62c58d91ee482ca4903d6bca2cc02e1b Reviewed By: jurajh-fb fbshipit-source-id: 166747a045c7e701ae631880f215b0f4ac496080 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5ba05c31977e..826207c5df53 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 14307765712830b6048d4ea7baaaa260e1a54cd8 +Subproject commit 9259538ce554f0f181605d4032ba21c837a4e0e0 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index fa40acee5207..30eaf536474e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b64a246f68bacecacc8ba691611a8b52091fb58e +Subproject commit 6b0e92e7df5fe455d8ec14528af0293b83b0ffa7 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5bfb187f8b10..6ab15f2119ab 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c4e70b86883f3f747b9f4903ceea44161d1d4432 +Subproject commit 687688552f8a15faec88a6f1a786b2e61831208b From 3dd8139bceb44a0d173cc3d07d89cc255851d340 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 9 Feb 2024 09:32:16 -0800 Subject: [PATCH 6768/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/7ba3e9c63c3ff1b752ee73c5cc86ddd0a48fd467 https://github.com/facebook/fb303/commit/798a7b86c2ba0668c8bd4eccbf32b2566f74c874 https://github.com/facebook/fbthrift/commit/f4a55fe16ddc65612870fede9ecd9fd6fc1505f7 https://github.com/facebook/folly/commit/a016c5ed8028bcd253046716eeb92717983a1d96 https://github.com/facebook/litho/commit/5e9f0385c64d2187712b7c1a34d8b2c6f2c5ca76 https://github.com/facebook/mcrouter/commit/fb234514b3a4149062030f24a8a981e22fc9d576 https://github.com/facebook/mvfst/commit/92f0708a4bb957f240f7a5de9632a05f6e3a1be6 https://github.com/facebook/proxygen/commit/063d0ae44aa7249919bb61cdd3950dafedde3dcb https://github.com/facebook/squangle/commit/abc634e1891d21b75c15c68ad8c9612e306ce882 https://github.com/facebook/wangle/commit/2fb04fb46815ce8f10b19a462ac3ea78203fe6f5 https://github.com/facebook/watchman/commit/9b1d88a0a112bbaf9785330020ecee12d19bd57c https://github.com/facebookexperimental/edencommon/commit/231eaab1a26b18c8062a6319a41f2e27561439ee https://github.com/facebookexperimental/rust-shed/commit/d9f9de2d1511560c64a585144e0a8a9490bc2dd7 https://github.com/facebookincubator/fizz/commit/bd72c4e638d8257a7e77b9b102f56bd76a5bd888 https://github.com/facebookincubator/katran/commit/b328aa46dcc7f94125894b4e0dd9c2d6b71b2071 https://github.com/facebookincubator/superconsole/commit/8254a5cd67b1c1aa127436d96d9618695350e354 https://github.com/facebookincubator/velox/commit/9838c7e105b84731d9e8ce57fab0d308d4a038ea https://github.com/pytorch/fbgemm/commit/533c4bb0d12b0f84358657be02871447787f975c https://github.com/pytorch/kineto/commit/43a5bd9ddc68bbd47ad27c0635f9b6f2c41bc913 Reviewed By: jurajh-fb fbshipit-source-id: aff4603c57d5f5a34db134ab2da9af0804124aeb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 826207c5df53..d3257317048c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9259538ce554f0f181605d4032ba21c837a4e0e0 +Subproject commit f4a55fe16ddc65612870fede9ecd9fd6fc1505f7 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 30eaf536474e..7daf7f106963 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 6b0e92e7df5fe455d8ec14528af0293b83b0ffa7 +Subproject commit a016c5ed8028bcd253046716eeb92717983a1d96 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6ab15f2119ab..35ef09402f1c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 687688552f8a15faec88a6f1a786b2e61831208b +Subproject commit 2fb04fb46815ce8f10b19a462ac3ea78203fe6f5 From a88b5268bfecf7720803cca8196f24f8ab456feb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 10 Feb 2024 09:32:23 -0800 Subject: [PATCH 6769/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/e7011f282d149f5dd979d8ad716a88b560b879d5 https://github.com/facebook/fb303/commit/ed5ad8e1d385fa579f0ce553351d366a285c9c98 https://github.com/facebook/fbthrift/commit/cd82357bedb4386b977e780de9b26d2ff68e6c26 https://github.com/facebook/folly/commit/6d79e8b74f8aafaedce87b5695632353046ef9e0 https://github.com/facebook/litho/commit/c9a4de22db039ab2b5e8126e2b26c1584dbf5ad8 https://github.com/facebook/mvfst/commit/479286da124b2e0cb723a33fa1b66285cae5d0e9 https://github.com/facebook/proxygen/commit/7c853a98a08f0cb40d3c2b611d5da9c4393a74ff https://github.com/facebook/rocksdb/commit/daf06f1361140bb4ca9304b27b0aa36ef5842f56 https://github.com/facebook/wangle/commit/c69a3b5c4a328500d654a6d5aa569c4c4b926d15 https://github.com/facebook/watchman/commit/3dd8139bceb44a0d173cc3d07d89cc255851d340 https://github.com/facebookexperimental/edencommon/commit/e72468ae34ea76f59d10e3d0d4f6e796566f4e7c https://github.com/facebookexperimental/rust-shed/commit/97a69022a66e83d1c6e027c6b15259af28158a19 https://github.com/facebookincubator/fizz/commit/3a88ef1917933f4972770e4c3ee3316b9dc318db https://github.com/facebookincubator/katran/commit/d427b63d51caf84d41a3be6266bb94827b82250b https://github.com/facebookincubator/velox/commit/9cf0ef0f59485a31e871a2311278af08a980cd0e https://github.com/facebookresearch/vrs/commit/3c4249e78557d175634329cc1e27acca97158c6d https://github.com/pytorch/fbgemm/commit/eb3c304e6c213b81f2b2077813d3c6d16597aa97 https://github.com/pytorch/kineto/commit/a774f041be6bd8837aae6facc4e33d4f4a89caa6 Reviewed By: jurajh-fb fbshipit-source-id: d1c856f189e91f0626e1205e4aad5ae2b1e84fa7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d3257317048c..202cdfef0d30 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f4a55fe16ddc65612870fede9ecd9fd6fc1505f7 +Subproject commit cd82357bedb4386b977e780de9b26d2ff68e6c26 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7daf7f106963..e432ec27a62b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a016c5ed8028bcd253046716eeb92717983a1d96 +Subproject commit 6d79e8b74f8aafaedce87b5695632353046ef9e0 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 35ef09402f1c..3a273fe4aaea 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2fb04fb46815ce8f10b19a462ac3ea78203fe6f5 +Subproject commit c69a3b5c4a328500d654a6d5aa569c4c4b926d15 From 237b87ff6314d852af1271e426fdf78f41c67d37 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 11 Feb 2024 09:36:23 -0800 Subject: [PATCH 6770/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/6e6c0f2e97aff8ba775ce6e8b860a51aaa55f8b0 https://github.com/facebook/fb303/commit/0b1e4c1048c39dda319b495e8f6bdc03db10b95a https://github.com/facebook/fbthrift/commit/0f1fb2d6e61bb4e847da858d7628b9774fd44664 https://github.com/facebook/mvfst/commit/0750a899c164bae8d1e4eedddb4cff5b513286a3 https://github.com/facebook/proxygen/commit/3bf86e46ef8cc16be639c4773dcce4d7be8891fd https://github.com/facebook/wangle/commit/5637b21867286ad8b07c604a618415f17b934375 https://github.com/facebook/watchman/commit/a88b5268bfecf7720803cca8196f24f8ab456feb https://github.com/facebookexperimental/edencommon/commit/27d8f5ea31104553dc3765b2d32d6914bfb7504b https://github.com/facebookexperimental/rust-shed/commit/82d763d152da7ee9c4b8f1d5ab04b533bba0d130 https://github.com/facebookincubator/fizz/commit/71222fc661760d49dae3424a0dc722df289b7f60 https://github.com/facebookincubator/katran/commit/d53e54a40a234626738a84544797db70cd816cd3 https://github.com/facebookincubator/velox/commit/7b68a82638fa1a27ecb5cf4d3f82100481a812da Reviewed By: jurajh-fb fbshipit-source-id: 75ebf727c3949fc7efbde73d50f214386f8bfc79 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 202cdfef0d30..7459fc71e8ee 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cd82357bedb4386b977e780de9b26d2ff68e6c26 +Subproject commit 0f1fb2d6e61bb4e847da858d7628b9774fd44664 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3a273fe4aaea..e4a7414e2990 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c69a3b5c4a328500d654a6d5aa569c4c4b926d15 +Subproject commit 5637b21867286ad8b07c604a618415f17b934375 From de9ad9be32a1ac247ec26dbfc4c2a661eeba63ac Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 12 Feb 2024 09:34:42 -0800 Subject: [PATCH 6771/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/609fcbb8131ee3e1540d2637095933cf2d48faec https://github.com/facebook/fb303/commit/4277a2c08f4d9459533916734c2d78d9e2450808 https://github.com/facebook/fbthrift/commit/40da953192406043eb00d8045195a769c9b0bfad https://github.com/facebook/litho/commit/07cab21e0eb6283f4580205c17cf4448b6988408 https://github.com/facebook/mvfst/commit/36460fa679988c129b7d39a0681edbd6af4623c8 https://github.com/facebook/proxygen/commit/a7377495a906e2d2cd1ebff8472c76c92c2e2fa4 https://github.com/facebook/wangle/commit/ee57fad680cf005d3db080dd91d80503c7e34fc4 https://github.com/facebook/watchman/commit/237b87ff6314d852af1271e426fdf78f41c67d37 https://github.com/facebookexperimental/rust-shed/commit/a2b2eaac09a2276c270b80d0c8e01805331fd2aa https://github.com/facebookincubator/katran/commit/3380e2f62e40b1d3809c50f4ff8280f5873d39f6 https://github.com/facebookincubator/velox/commit/76b5d0e9267d7608b82c5e66f671f6b2f6685dd1 https://github.com/pytorch/kineto/commit/8c357fb3d0b413a8eeaaab21159ef717b20b078a Reviewed By: bigfootjon fbshipit-source-id: 6099911d53940fa6a922652b346987216aa618ca --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7459fc71e8ee..aaf7a63f7e18 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0f1fb2d6e61bb4e847da858d7628b9774fd44664 +Subproject commit 40da953192406043eb00d8045195a769c9b0bfad diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e4a7414e2990..ad57c83e65bc 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5637b21867286ad8b07c604a618415f17b934375 +Subproject commit ee57fad680cf005d3db080dd91d80503c7e34fc4 From 7aea12751fda27aeca789372e9ecef42b23ed15a Mon Sep 17 00:00:00 2001 From: Richard Barnes Date: Mon, 12 Feb 2024 11:04:57 -0800 Subject: [PATCH 6772/7387] Fix implicit fallthroughs where it is simple to do so in watchman Reviewed By: xavierd Differential Revision: D53666016 fbshipit-source-id: 70ef6ebf98de3fd6d9ffab987d1f7f39c0aa7bd0 --- watchman/Clock.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/Clock.cpp b/watchman/Clock.cpp index 8049731f3922..c06d05341b04 100644 --- a/watchman/Clock.cpp +++ b/watchman/Clock.cpp @@ -106,8 +106,8 @@ ClockSpec::ClockSpec(const json_ref& value) { /* fall through to default case and throw error. * The redundant looking comment below is a hint to * gcc that it is ok to fall through. */ + [[fallthrough]]; } - /* fall through */ default: throw std::domain_error("invalid clockspec"); From a65b018a405322ba45687c7798582a0047334abb Mon Sep 17 00:00:00 2001 From: jbs Date: Mon, 12 Feb 2024 13:42:08 -0800 Subject: [PATCH 6773/7387] pop!_os synonym for ubuntu. Use deb package manager. Summary: Use Deb package manager on Pop! OS. X-link: https://github.com/facebook/folly/pull/2135 Reviewed By: Gownta Differential Revision: D53441949 Pulled By: Orvid fbshipit-source-id: a88f01aa5d251a57005a050c0fd7068f187a15a8 --- build/fbcode_builder/getdeps/platform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/getdeps/platform.py b/build/fbcode_builder/getdeps/platform.py index d8ac41b46be4..7f0cb502b0dc 100644 --- a/build/fbcode_builder/getdeps/platform.py +++ b/build/fbcode_builder/getdeps/platform.py @@ -270,7 +270,7 @@ def get_package_manager(self): return "homebrew" if self.distro in ("fedora", "centos", "centos_stream"): return "rpm" - if self.distro.startswith(("debian", "ubuntu")): + if self.distro.startswith(("debian", "ubuntu", "pop!_os")): return "deb" return None From 1095d910883c994ab479cb07d40faac90661d3fc Mon Sep 17 00:00:00 2001 From: Facebook Community Bot Date: Tue, 13 Feb 2024 09:16:39 -0800 Subject: [PATCH 6774/7387] Re-sync with internal repository (#1189) The internal and external repositories are out of sync. This Pull Request attempts to brings them back in sync by patching the GitHub repository. Please carefully review this patch. You must disable ShipIt for your project in order to merge this pull request. DO NOT IMPORT this pull request. Instead, merge it directly on GitHub using the MERGE BUTTON. Re-enable ShipIt after merging. --- BUCK | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 BUCK diff --git a/BUCK b/BUCK deleted file mode 100644 index bc4b0ce22883..000000000000 --- a/BUCK +++ /dev/null @@ -1,6 +0,0 @@ -load("@fbsource//tools/build_defs:fb_native_wrapper.bzl", "fb_native") - -fb_native.export_file( - name = "clippy.toml", - visibility = ["PUBLIC"], -) From a0309dbbefd61e8e34acae7cc0222c01caea7af0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 13 Feb 2024 09:35:10 -0800 Subject: [PATCH 6775/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/c09ee7cabae9ff8eb6083f9646cd3c698746eb2d https://github.com/facebook/fb303/commit/762f799a24afda94449898187a21cccd9444a08c https://github.com/facebook/fbthrift/commit/239fe8d5124fb9f8400de25be766c76d8d4eeaf4 https://github.com/facebook/folly/commit/395e168dbfe652846c0a6f5f48506202f7fb37e9 https://github.com/facebook/litho/commit/64b1f9b244d2b3ea9b98faab5992d394ad2cbd8e https://github.com/facebook/mvfst/commit/3f490c2e9c948fd3d6546f3d6648c39074d024aa https://github.com/facebook/proxygen/commit/b0cc72d0c270a2fb040c7ffc5a1bdcac50b8c609 https://github.com/facebook/rocksdb/commit/de1e3ff6eab9bc562ef262b1a49ec002b7bbbaef https://github.com/facebook/squangle/commit/ee9269363d88ab069909df5eb36058f7ca63f859 https://github.com/facebook/wangle/commit/3aa4eea68eecf1a77bdb4992f26302d488814227 https://github.com/facebook/watchman/commit/a65b018a405322ba45687c7798582a0047334abb https://github.com/facebookexperimental/edencommon/commit/5d5cc89d1d75c4b00ded4ec0a451f4e0d6d9b3a0 https://github.com/facebookexperimental/rust-shed/commit/353231d0f872aab20f44ded0e0fac27696c43596 https://github.com/facebookincubator/fizz/commit/4cf09ae7b816883574093bddebfb94df4d1193d4 https://github.com/facebookincubator/katran/commit/53f3ca25dffc879c9e325baa5ce373ef3f2e2144 https://github.com/facebookincubator/velox/commit/42b10d9432f1f211e9641d327282f1dfc4dc2325 https://github.com/facebookresearch/vrs/commit/6c0a80ad46808658469d134ce57b16ede2144795 https://github.com/pytorch/fbgemm/commit/2c519bef568e91f2f89373cc79d9ae6c07eb8614 Reviewed By: bigfootjon fbshipit-source-id: ae11806c45032e314508db52a608042d51fe5503 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index aaf7a63f7e18..082302703cdc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 40da953192406043eb00d8045195a769c9b0bfad +Subproject commit 239fe8d5124fb9f8400de25be766c76d8d4eeaf4 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e432ec27a62b..9c6e5242f4a6 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 6d79e8b74f8aafaedce87b5695632353046ef9e0 +Subproject commit 395e168dbfe652846c0a6f5f48506202f7fb37e9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ad57c83e65bc..a42986c801ea 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ee57fad680cf005d3db080dd91d80503c7e34fc4 +Subproject commit 3aa4eea68eecf1a77bdb4992f26302d488814227 From 0237ce61df45c442e045a665bfde1e228a794666 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 14 Feb 2024 09:34:37 -0800 Subject: [PATCH 6776/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/5610792678a854006082c3c997d2b5a6676133a6 https://github.com/facebook/fb303/commit/ec0d5903f9e701f5ec78e73b3f72b609944ce984 https://github.com/facebook/fbthrift/commit/cc0028678a5888e03cb5b46b6a8b8d27bcdaec81 https://github.com/facebook/folly/commit/6ffa77bcdd4a2f9f7f151a654ffdbc18c5a59916 https://github.com/facebook/litho/commit/5ff4caf91143faa8abe1999b5b393e20c8291b8c https://github.com/facebook/mvfst/commit/762eeade382c39cb713f8f20be663a861a8fe11c https://github.com/facebook/proxygen/commit/68c3f144742412146a857846f7d91204532f3b2a https://github.com/facebook/rocksdb/commit/f405e55cfa1e8a722b23223407e0d3a600cb0855 https://github.com/facebook/wangle/commit/18418dd8764d74b2c45c126a798b8bc1b7a7ef58 https://github.com/facebook/watchman/commit/a0309dbbefd61e8e34acae7cc0222c01caea7af0 https://github.com/facebookexperimental/edencommon/commit/686031516ebfcd33127de860e2e83d1380494afc https://github.com/facebookexperimental/rust-shed/commit/b7520ae168653f45bb52877234f56111dfa408f4 https://github.com/facebookincubator/fizz/commit/a17f82ae9915bc1f00df95b0300d15e09999f30a https://github.com/facebookincubator/katran/commit/d5777792ca91a6ee3c43195a6c4302cc9335bee9 https://github.com/facebookincubator/velox/commit/5d1d2a3fa5055b1ff14f2b5154cfd9570ce35984 https://github.com/facebookresearch/vrs/commit/3090a341eece1ca237fcfde82aee5c57c8aec691 https://github.com/pytorch/fbgemm/commit/5ca556a41a2dd4dc9d6fd157ed032bc7f5a37373 Reviewed By: bigfootjon fbshipit-source-id: f61b0de31025f5a8b45328beb95b0e6b86d35ea8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 082302703cdc..19185441b586 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 239fe8d5124fb9f8400de25be766c76d8d4eeaf4 +Subproject commit cc0028678a5888e03cb5b46b6a8b8d27bcdaec81 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9c6e5242f4a6..4b6464ad802f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 395e168dbfe652846c0a6f5f48506202f7fb37e9 +Subproject commit 6ffa77bcdd4a2f9f7f151a654ffdbc18c5a59916 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a42986c801ea..2604ca847039 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3aa4eea68eecf1a77bdb4992f26302d488814227 +Subproject commit 18418dd8764d74b2c45c126a798b8bc1b7a7ef58 From b54425901a332a3069f8cf009378e1248828eddc Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 15 Feb 2024 09:33:18 -0800 Subject: [PATCH 6777/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/f5c4a70efd6b64fc6c802f8af92b74d9b967dbac https://github.com/facebook/fb303/commit/ca60002379e9e49527171a6dba6ffe5ad295b4f0 https://github.com/facebook/fbthrift/commit/7b9fde6c8e86bb905835f8b9a4797ac62394a504 https://github.com/facebook/folly/commit/b6762ac6b9a29f66e966a1da07f5e7b3ba3551be https://github.com/facebook/litho/commit/4b33f61ca8ab372211b78202340bc3519e799346 https://github.com/facebook/mvfst/commit/10fbedc3c487ec1ecd759a8238097cdc96aedccd https://github.com/facebook/proxygen/commit/e289d7527d5253e30080bf05d8e9a7e456db8f52 https://github.com/facebook/rocksdb/commit/d201e59941b0a5a8e058925f8149fe26dbd0c011 https://github.com/facebook/wangle/commit/56d58615b4979f6c33293bbaf5a0d4fb95eb6585 https://github.com/facebook/watchman/commit/0237ce61df45c442e045a665bfde1e228a794666 https://github.com/facebookexperimental/edencommon/commit/62613ac202c5b84bc55bb140ca54d5dda1f2171b https://github.com/facebookexperimental/rust-shed/commit/fada55a09d14c32e0712c8ec8f3a8c6fc234b8f6 https://github.com/facebookincubator/fizz/commit/71095a693cbb2237720cb0dd84b0f0f3542bc394 https://github.com/facebookincubator/katran/commit/2603989f659ab2726fcd64102033dcc8cf6eedfe https://github.com/facebookincubator/velox/commit/615af5158b57cf1593fbe69a1c365fc44aede396 https://github.com/facebookresearch/vrs/commit/c4b7620ea47096a1b1b22ce761a051b7df411512 https://github.com/pytorch/fbgemm/commit/d00b5d53481fae53d3450fcce37aff60457fcabe https://github.com/pytorch/kineto/commit/a1c3fea49769bbf31343554cdb569d5e88ac7242 Reviewed By: bigfootjon fbshipit-source-id: 1f45c12489cd9100c00716cdc5fbc7e80495aa8e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 19185441b586..66ec9d017f4c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cc0028678a5888e03cb5b46b6a8b8d27bcdaec81 +Subproject commit 7b9fde6c8e86bb905835f8b9a4797ac62394a504 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4b6464ad802f..b3ff9c22479c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 6ffa77bcdd4a2f9f7f151a654ffdbc18c5a59916 +Subproject commit b6762ac6b9a29f66e966a1da07f5e7b3ba3551be diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2604ca847039..b8d60ce3e820 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 18418dd8764d74b2c45c126a798b8bc1b7a7ef58 +Subproject commit 56d58615b4979f6c33293bbaf5a0d4fb95eb6585 From 4307373b4b15392e8f75bdf214e913e254f2b43f Mon Sep 17 00:00:00 2001 From: Muir Manders Date: Thu, 15 Feb 2024 17:37:17 -0800 Subject: [PATCH 6778/7387] goto: support watchman "hg.update" state events Summary: Emit "hg.update" state enter/leave events from Rust. Should match Python behavior, except I didn't fill in the "distance" field yet. Not sure if that is important. Reviewed By: quark-zju Differential Revision: D53553923 fbshipit-source-id: 8eb5f9cfb05692bef90a071af4979405971d65c1 --- watchman/rust/watchman_client/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/rust/watchman_client/src/lib.rs b/watchman/rust/watchman_client/src/lib.rs index 17759df0a075..a53e60a48cbe 100644 --- a/watchman/rust/watchman_client/src/lib.rs +++ b/watchman/rust/watchman_client/src/lib.rs @@ -56,7 +56,7 @@ use futures::future::FutureExt; use futures::stream::StreamExt; use serde_bser::de::Bunser; use serde_bser::de::SliceRead; -use serde_bser::value::Value; +pub use serde_bser::value::Value; use thiserror::Error; use tokio::io::AsyncRead; use tokio::io::AsyncWrite; From 63865e47512cbbd73b1fb940b107db12467c067b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 16 Feb 2024 09:32:34 -0800 Subject: [PATCH 6779/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/362ab87c1a44311a42bffe20edae28f288a1d1e4 https://github.com/facebook/fb303/commit/1fad48d7e4950afb140443159bb8ff78394ffcb9 https://github.com/facebook/fbthrift/commit/599122000d80db1804c763dfdb628dff37ec04e7 https://github.com/facebook/folly/commit/323e467e2375e535e10bda62faf2569e8f5c9b19 https://github.com/facebook/litho/commit/de67ef681c5b7d9b8dfb19261307f6e93d193077 https://github.com/facebook/mcrouter/commit/664737d89a4995a70488cac040cfddf0a024f71d https://github.com/facebook/mvfst/commit/5d6bd547c33640459a0bf52fcdf518b717e5a682 https://github.com/facebook/proxygen/commit/ed938d2bd598cb898e4b0aecc4bcd2c11adf3d0b https://github.com/facebook/rocksdb/commit/28c1c15c2989a783d0bc4db77a1bbad3218eb51c https://github.com/facebook/squangle/commit/d24dedf86a5382c29f06e1e4c2ebe1920943d572 https://github.com/facebook/wangle/commit/3fbb5387c92b1d040065e9c534a6b5620a70b9d7 https://github.com/facebook/watchman/commit/4307373b4b15392e8f75bdf214e913e254f2b43f https://github.com/facebookexperimental/edencommon/commit/b25e8f660d9974fe49b51f44444a8881bd6f15d6 https://github.com/facebookexperimental/rust-shed/commit/f3e4fc2bc14e72cb0006fd4820da11631280ef80 https://github.com/facebookincubator/katran/commit/b3f1e01eaac687bc6cb26e19b7e8396724523263 https://github.com/facebookincubator/velox/commit/dadade0d423c1458052e84c00cd4fd3aa7d0b9bc https://github.com/facebookresearch/multimodal/commit/1cccc584d0c4b6c632ace3cf9426609b03aef276 https://github.com/facebookresearch/vrs/commit/b8e8e64b11c90c94ca7bb7f2dfdb674f785a92d7 https://github.com/pytorch/kineto/commit/dcb3aab827122555b2303ef61a94716ad33f96c2 Reviewed By: bigfootjon fbshipit-source-id: ab8b2023c57a151279117f6c4225affa454a2aae --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 66ec9d017f4c..64185d5dc538 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7b9fde6c8e86bb905835f8b9a4797ac62394a504 +Subproject commit 599122000d80db1804c763dfdb628dff37ec04e7 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b3ff9c22479c..340cd21ae64b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b6762ac6b9a29f66e966a1da07f5e7b3ba3551be +Subproject commit 323e467e2375e535e10bda62faf2569e8f5c9b19 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b8d60ce3e820..9a3107b4c891 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 56d58615b4979f6c33293bbaf5a0d4fb95eb6585 +Subproject commit 3fbb5387c92b1d040065e9c534a6b5620a70b9d7 From 4be7f32fd3710109657fb7a8a68f259049fda44d Mon Sep 17 00:00:00 2001 From: Nicholas Ormrod Date: Fri, 16 Feb 2024 11:30:00 -0800 Subject: [PATCH 6780/7387] Deshim //folly:dynamic to //folly/json:dynamic in watchman Summary: The following headers were shimmed in //folly:dynamic and were modded: - folly/DynamicConverter.h -> folly/json/DynamicConverter.h - folly/dynamic.h -> folly/json/dynamic.h - folly/dynamic-inl.h -> folly/json/dynamic-inl.h - folly/json.h -> folly/json/json.h `arc lint` was applied Reviewed By: MichaelCuevas Differential Revision: D53837653 fbshipit-source-id: 871dc362779e3de73107e8dc0508234a42b09122 --- watchman/cppclient/CLI.cpp | 2 +- watchman/cppclient/WatchmanClient.h | 2 +- watchman/cppclient/WatchmanConnection.h | 2 +- watchman/integration/cppclient.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/watchman/cppclient/CLI.cpp b/watchman/cppclient/CLI.cpp index 36b0eda6a92d..a1adebfc5bcf 100644 --- a/watchman/cppclient/CLI.cpp +++ b/watchman/cppclient/CLI.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include using namespace folly; using namespace watchman; diff --git a/watchman/cppclient/WatchmanClient.h b/watchman/cppclient/WatchmanClient.h index 072704e0f1fa..45a7246e60ee 100644 --- a/watchman/cppclient/WatchmanClient.h +++ b/watchman/cppclient/WatchmanClient.h @@ -74,8 +74,8 @@ #include #include #include -#include #include +#include namespace watchman { diff --git a/watchman/cppclient/WatchmanConnection.h b/watchman/cppclient/WatchmanConnection.h index 2050f3a740d4..c5cabaccd99f 100644 --- a/watchman/cppclient/WatchmanConnection.h +++ b/watchman/cppclient/WatchmanConnection.h @@ -13,11 +13,11 @@ #include #include -#include #include #include #include #include +#include namespace watchman { diff --git a/watchman/integration/cppclient.cpp b/watchman/integration/cppclient.cpp index 44ca153e8538..b48bbf5a1e33 100644 --- a/watchman/integration/cppclient.cpp +++ b/watchman/integration/cppclient.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include using namespace folly; From 1d6ecb5582b640f6be767a250905aaf398e51e18 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 17 Feb 2024 09:34:16 -0800 Subject: [PATCH 6781/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/af319c558e264845cb1e64051a691d6152f1c1ac https://github.com/facebook/fb303/commit/4816112f9108c82b32b3c50f1260fa3d8e5640a6 https://github.com/facebook/fbthrift/commit/eca43d4980a147304be41de85ae1e4f24e128fc3 https://github.com/facebook/litho/commit/509ddaa077b3f686d1d619856f7580b239a9e57b https://github.com/facebook/mvfst/commit/77ba7e7b54d72a551f5b17f109ba53e8ebc46257 https://github.com/facebook/proxygen/commit/9095290ec58f9f1fb493b1e41406d0639093905d https://github.com/facebook/rocksdb/commit/f2732d05863a8c30b6fea229f9c2b02b048c2dce https://github.com/facebook/squangle/commit/505288fdb88cd5d658479c8d1c31b91ee1541186 https://github.com/facebook/wangle/commit/4bbb245dd8e80a88348e19cfaf499cc8e607536d https://github.com/facebook/watchman/commit/63865e47512cbbd73b1fb940b107db12467c067b https://github.com/facebookexperimental/edencommon/commit/a4935781322649f1c2639d7cd3730932a79b7ed8 https://github.com/facebookexperimental/rust-shed/commit/dd07461f79ea3494744fe12fac783fe087deef04 https://github.com/facebookincubator/fizz/commit/6182dd9102947ec15dcc56fabd9094294b2aeb21 https://github.com/facebookincubator/katran/commit/c60a7ec7738d2f85da83ddd6f882bd94d776566c https://github.com/facebookresearch/vrs/commit/fe46daf50799e2337bb94ed2978e2a28c970a4d2 https://github.com/pytorch/fbgemm/commit/66a87797d88ea1ba2fde98fddf87596bd641f1bb Reviewed By: bigfootjon fbshipit-source-id: 5eb28051321fb97f12b0ab45c704495c82eb4b5f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 64185d5dc538..1f6b3a4085c3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 599122000d80db1804c763dfdb628dff37ec04e7 +Subproject commit eca43d4980a147304be41de85ae1e4f24e128fc3 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9a3107b4c891..f182b8671423 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3fbb5387c92b1d040065e9c534a6b5620a70b9d7 +Subproject commit 4bbb245dd8e80a88348e19cfaf499cc8e607536d From e6f58e7bbe3dce355e962ee22cda4403a895fe20 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Wed, 21 Feb 2024 13:59:42 -0800 Subject: [PATCH 6782/7387] Provide differentiated error when watching mount that disconnects Summary: Watchman returns a single error (`RootResolveError`) for all errors related to resolving a watched root. However, there are cases where it would be good to know the different conditions of such a failure. One such case is when a mounted directory (e.g. FUSE) has become disconnected - often due to expired certificates. Under cetain conditions, the root directoy `.watchmanconfig` can be opend but returns an ENOTCONN error when attempting to read. With the current error reporting, this appears to be a malformed `.watchmanconfig` file and not an unmounted directory. Let's fix that, by detecting when we are reading a file on a mount that has been disconnected and return a new error, `RootNotConnectedError`. Reviewed By: quark-zju Differential Revision: D53691381 fbshipit-source-id: d8133cca4374676461d0ff09352c839b356ad116 --- watchman/Errors.h | 9 +++++ watchman/root/resolve.cpp | 60 +++++++++++++++++----------- watchman/thirdparty/jansson/load.cpp | 33 ++++++++++++--- 3 files changed, 73 insertions(+), 29 deletions(-) diff --git a/watchman/Errors.h b/watchman/Errors.h index b68e8158e74b..403c56a4277a 100644 --- a/watchman/Errors.h +++ b/watchman/Errors.h @@ -165,6 +165,15 @@ class RootResolveError : public WatchmanError { using WatchmanError::WatchmanError; }; +/** + * Represents an error when root is not conntected. + */ +class RootNotConnectedError : public WatchmanError { + public: + static constexpr const char* prefix = "root not connected"; + using WatchmanError::WatchmanError; +}; + } // namespace watchman // Allow watchman::error_code to implicitly convert to std::error_condition diff --git a/watchman/root/resolve.cpp b/watchman/root/resolve.cpp index ca95656f3b36..3ed64277369a 100644 --- a/watchman/root/resolve.cpp +++ b/watchman/root/resolve.cpp @@ -7,6 +7,7 @@ #include #include +#include #include "watchman/Errors.h" #include "watchman/InMemoryView.h" #include "watchman/fs/FSDetect.h" @@ -232,32 +233,45 @@ root_resolve(const char* filename_cstr, bool auto_watch, bool* created) { root_files_list); } - auto config_file = load_root_config(root_str.c_str()); - Configuration config{config_file}; - root = std::make_shared( - realFileSystem, - root_str, - fs_type, - config_file, - config, - WatcherRegistry::initWatcher(root_str, fs_type, config), - &w_state_save); + try { + auto config_file = load_root_config(root_str.c_str()); + Configuration config{config_file}; + root = std::make_shared( + realFileSystem, + root_str, + fs_type, + config_file, + config, + WatcherRegistry::initWatcher(root_str, fs_type, config), + &w_state_save); + + { + auto wlock = watched_roots.wlock(); + auto& map = *wlock; + auto& existing = map[root->root_path]; + if (existing) { + // Someone beat us in this race + root = existing; + *created = false; + } else { + existing = root; + *created = true; + } + } - { - auto wlock = watched_roots.wlock(); - auto& map = *wlock; - auto& existing = map[root->root_path]; - if (existing) { - // Someone beat us in this race - root = existing; - *created = false; - } else { - existing = root; - *created = true; + return root; + } catch (const std::system_error& exc) { + if (exc.code() == std::errc::not_connected) { + RootNotConnectedError::throwf( + "\"{}\" was able to be opened, but we were unable to read its " + "contents. If \"{}\" is located on a FUSE or network mount, " + "please ensure that you have mounted it correctly, including " + "validating any required credentials or certificates.\n", + filename, + filename); } + throw; } - - return root; } std::shared_ptr w_root_resolve(const char* filename, bool auto_watch) { diff --git a/watchman/thirdparty/jansson/load.cpp b/watchman/thirdparty/jansson/load.cpp index 340d66f8951b..e1b5592ea67b 100644 --- a/watchman/thirdparty/jansson/load.cpp +++ b/watchman/thirdparty/jansson/load.cpp @@ -50,6 +50,11 @@ behaviour of fgetc(). */ typedef int (*get_func)(void* data); +/* When an get_func returns EOF, it can be end of file or an error. This + returns non-zero (1) when an error occured. This corresponds to the + behaviour of ferror(). */ +typedef int (*error_func)(void* data); + namespace { // We could write the JSON parser to use O(1) stack depth, but in the short term @@ -58,6 +63,7 @@ constexpr size_t kMaximumDepth = 1000; typedef struct { get_func get; + error_func error; void* data; char buffer[5]; size_t buffer_pos; @@ -161,8 +167,9 @@ error_set(json_error_t* error, const lex_t* lex, const char* msg, ...) { /*** lexical analyzer ***/ -static void stream_init(stream_t* stream, get_func get, void* data) { +static void stream_init(stream_t* stream, get_func get, error_func error, void* data) { stream->get = get; + stream->error = error; stream->data = data; stream->buffer[0] = '\0'; stream->buffer_pos = 0; @@ -182,6 +189,12 @@ static int stream_get(stream_t* stream, json_error_t* error) { if (!stream->buffer[stream->buffer_pos]) { c = stream->get(stream->data); if (c == EOF) { + if (stream->error(stream->data)) { + auto err = errno; + throw std::system_error( + err, std::generic_category(), "error occurred when reading from stream"); + } + stream->state = STREAM_STATE_EOF; return STREAM_STATE_EOF; } @@ -630,8 +643,8 @@ static std::string lex_steal_string(lex_t* lex) { return result; } -static int lex_init(lex_t* lex, get_func get, void* data) { - stream_init(&lex->stream, get, data); +static int lex_init(lex_t* lex, get_func get, error_func error, void* data) { + stream_init(&lex->stream, get, error, data); lex->token = TOKEN_INVALID; return 0; @@ -828,6 +841,10 @@ static int string_get(void* data) { } } +static int string_error(void*) { + return 0; +} + std::optional json_loads(const char* string, size_t flags, json_error_t* error) { lex_t lex; @@ -843,7 +860,7 @@ json_loads(const char* string, size_t flags, json_error_t* error) { stream_data.data = string; stream_data.pos = 0; - if (lex_init(&lex, string_get, (void*)&stream_data)) + if (lex_init(&lex, string_get, string_error, (void*)&stream_data)) return std::nullopt; return parse_json(&lex, flags, error); @@ -866,6 +883,10 @@ static int buffer_get(void* data) { return (unsigned char)c; } +static int buffer_error(void*) { + return 0; +} + std::optional json_loadb( const char* buffer, size_t buflen, @@ -885,7 +906,7 @@ std::optional json_loadb( stream_data.pos = 0; stream_data.len = buflen; - if (lex_init(&lex, buffer_get, (void*)&stream_data)) + if (lex_init(&lex, buffer_get, buffer_error, (void*)&stream_data)) return std::nullopt; return parse_json(&lex, flags, error); @@ -908,7 +929,7 @@ json_loadf(FILE* input, size_t flags, json_error_t* error) { return std::nullopt; } - if (lex_init(&lex, (get_func)fgetc, input)) + if (lex_init(&lex, (get_func)fgetc, (error_func)ferror, input)) return std::nullopt; return parse_json(&lex, flags, error); From e72f57746d95ec5e381e483cc2e6301bf04dd7a0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 22 Feb 2024 09:32:16 -0800 Subject: [PATCH 6783/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/bdddfc0a138bed660ed87fef832860d6dbb137c6 https://github.com/facebook/fb303/commit/c62d95447ff3013929688ce947b08558fa77381c https://github.com/facebook/fbthrift/commit/b3344b524dc94ba5f72fd103e7b4bb4bcce17c7a https://github.com/facebook/folly/commit/2459e172518a7b5d55292b0d8b741ff14def87ba https://github.com/facebook/litho/commit/769168ef735ee7cd0d6aacb611e8970345507624 https://github.com/facebook/mcrouter/commit/d579bfb5b0d0dd672bb59178ea0d23cb63c7e41b https://github.com/facebook/mvfst/commit/b9974b9875d4bad9feb7a4e7830e166c95c02a33 https://github.com/facebook/ocamlrep/commit/d6d0a16cbf57036fcf72c6ea253802b95fdd0aac https://github.com/facebook/proxygen/commit/65980b1705371e8ff50b44a88ab1307f33507c0c https://github.com/facebook/rocksdb/commit/cb4f4381f6d3f00b81e693f602839536261ee5f6 https://github.com/facebook/wangle/commit/5085d6e43f8d6bdf34d89a701d73d25fd749a3d5 https://github.com/facebook/watchman/commit/e6f58e7bbe3dce355e962ee22cda4403a895fe20 https://github.com/facebookexperimental/rust-shed/commit/735fdc091a75bb8739775eba30c7043f78ffb1f5 https://github.com/facebookincubator/katran/commit/e63614af437a46f3be7b81afe66a936dae559c5a https://github.com/facebookincubator/momentum/commit/ea0ddc32841bd6a2e81b5735adfb4a463aa457f4 https://github.com/facebookincubator/superconsole/commit/03348b94403374c58c380f9cd93404dc9727881d https://github.com/facebookincubator/velox/commit/ffd136fdc31ab0c7644047fd8721eb93c0d9a6c5 https://github.com/facebookresearch/multimodal/commit/2cbab1f089ae84b557bf19bd91ff03d4efd4b1d9 https://github.com/facebookresearch/pytorch-biggraph/commit/a2f6757d5ee0faa9589e3ec9876e85a6ed452340 https://github.com/fairinternal/egohowto/commit/0dbc90e99508845d89dd2eadb37c3f9c8abf67e3 https://github.com/pytorch/fbgemm/commit/ad27fd5d995e4531803fb5ffe8f125de0c94243b https://github.com/pytorch/kineto/commit/594c63c50dd9684a592ad7670ecdef6dd5e36be7 Reviewed By: jailby fbshipit-source-id: 476c4560928d36708f917ec118128d379432a196 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1f6b3a4085c3..adf3d5795594 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit eca43d4980a147304be41de85ae1e4f24e128fc3 +Subproject commit b3344b524dc94ba5f72fd103e7b4bb4bcce17c7a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 340cd21ae64b..448b61555bf5 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 323e467e2375e535e10bda62faf2569e8f5c9b19 +Subproject commit 2459e172518a7b5d55292b0d8b741ff14def87ba diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f182b8671423..c841116c5746 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 4bbb245dd8e80a88348e19cfaf499cc8e607536d +Subproject commit 5085d6e43f8d6bdf34d89a701d73d25fd749a3d5 From cbd5c6544c595646f24333db31fd1e6a8843869a Mon Sep 17 00:00:00 2001 From: Mark Juggurnauth-Thomas Date: Thu, 22 Feb 2024 11:46:24 -0800 Subject: [PATCH 6784/7387] getdeps: add thrift built-in includes to THRIFT_INCLUDE_PATH Summary: X-link: https://github.com/facebookincubator/zstrong/pull/709 The thrift compiler includes some additional thrift files for built-in features, e.g. annotations. Unlike other thrift libraries, these thrift files are installed directly to `include` instead of `include/thrift-files`. If we detect `include/thrift`, then consider that to be an indication that we should add `include` to the `THRIFT_INCLUDE_PATH`, so that these can be picked up by things that depend on the built-in thrift files. Reviewed By: mitrandir77 Differential Revision: D53943880 Privacy Context Container: L1122763 fbshipit-source-id: d30c3e2598ca8904c1b054965aca2057733ecd20 --- build/fbcode_builder/getdeps/buildopts.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/fbcode_builder/getdeps/buildopts.py b/build/fbcode_builder/getdeps/buildopts.py index 63bf7c696e1a..dcf551cb8c33 100644 --- a/build/fbcode_builder/getdeps/buildopts.py +++ b/build/fbcode_builder/getdeps/buildopts.py @@ -368,6 +368,11 @@ def add_prefix_to_env( elif "/bz2-" in d: add_flag(env, "CPPFLAGS", f"-I{includedir}", append=append) + # The thrift compiler's built-in includes are installed directly to the include dir + includethriftdir = os.path.join(d, "include", "thrift") + if os.path.exists(includethriftdir): + add_path_entry(env, "THRIFT_INCLUDE_PATH", includedir, append=append) + # Map from FB python manifests to PYTHONPATH pydir = os.path.join(d, "lib", "fb-py-libs") if os.path.exists(pydir): From 05e6c908d14681e928eaf69d9d2dd5aa288cc1d8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 23 Feb 2024 09:33:11 -0800 Subject: [PATCH 6785/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/5fadf50ff280814985156bd0069d83ca60a5270b https://github.com/facebook/fb303/commit/dcf759426490697cd28f3794759babbf7ec6b37b https://github.com/facebook/fbthrift/commit/15ea14c8b17d88c720a18a13aa778dff023a8d15 https://github.com/facebook/folly/commit/6ace96b741ac5e0b5902acdaed1a1828ab8efbdf https://github.com/facebook/litho/commit/3df1df4b6a66e8030a1791f2114c1525c9a2cf05 https://github.com/facebook/mcrouter/commit/92a620093d040876207a0b337ab65ed6d15dbebc https://github.com/facebook/mvfst/commit/7d0b5fef4b6da84be3ae93d3d0fbd28c1bd50d25 https://github.com/facebook/ocamlrep/commit/7ed0191a6b5b4da2741556dbf332471212aaf3c6 https://github.com/facebook/proxygen/commit/9f28af70bead89683133ba2526f198c398dcc427 https://github.com/facebook/rocksdb/commit/d1386de632333e936b5bed63510c5d89d6cd18b4 https://github.com/facebook/wangle/commit/69a269748da2c4e665fe7debc13c94145f0e218a https://github.com/facebook/watchman/commit/cbd5c6544c595646f24333db31fd1e6a8843869a https://github.com/facebookexperimental/edencommon/commit/848ef399896b095fb9a330cb8e138b7bbe3fb26f https://github.com/facebookexperimental/rust-shed/commit/f70422ded2704a0c43fd0adc9cb273e66e970968 https://github.com/facebookincubator/fizz/commit/8006dfc8dd54bc517f7148cea6388ea885410b03 https://github.com/facebookincubator/katran/commit/802d5194356447760484051ea284b7a0d8188904 https://github.com/facebookincubator/momentum/commit/31ac01e7c63f4c48a5a6188b19e998fea3191598 https://github.com/facebookincubator/velox/commit/0d02c8f9f3030a08cce25c63901e07c117a0414f https://github.com/facebookresearch/multimodal/commit/c261d7199f6e0ba2af5f217b4a4f141921861f88 https://github.com/pytorch/fbgemm/commit/3f21d173d4e0d08948136fde73866a016d57ef62 Reviewed By: jailby fbshipit-source-id: 23539599211afe8c003eb3c1899c20d282412914 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index adf3d5795594..cd92a39960fb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b3344b524dc94ba5f72fd103e7b4bb4bcce17c7a +Subproject commit 15ea14c8b17d88c720a18a13aa778dff023a8d15 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 448b61555bf5..a49d3d897f14 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 2459e172518a7b5d55292b0d8b741ff14def87ba +Subproject commit 6ace96b741ac5e0b5902acdaed1a1828ab8efbdf diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c841116c5746..9132b940cc12 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5085d6e43f8d6bdf34d89a701d73d25fd749a3d5 +Subproject commit 69a269748da2c4e665fe7debc13c94145f0e218a From 7d3517529d0d8ba07154003f851ead5fa5531c8e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 23 Feb 2024 21:44:42 -0800 Subject: [PATCH 6786/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/34a165993083d71b442c89b9ab86e0c34682d0c8 https://github.com/facebook/fatal/commit/fa438c98f87e9693f7721bb3196db9edc537acf2 https://github.com/facebook/fb303/commit/f2d9ebb68b6a28addeab2cc75676d145fa440595 https://github.com/facebook/fbthrift/commit/7352c9ffa672d910f8a32190bdddac18043ca2db https://github.com/facebook/folly/commit/ec680d269386c81af5e2aae0ae543432db13827b https://github.com/facebook/litho/commit/332029fe818238e579aadd845a1642315555c859 https://github.com/facebook/mcrouter/commit/23892d22d3717650a4cb8aa80acc5c9cd1cd7ff0 https://github.com/facebook/mvfst/commit/05c2df2e867a9a5bc23b9020e28d447cca039c88 https://github.com/facebook/ocamlrep/commit/707aa9b1cda0ac4bd2fcf167f2c43009aa40dce3 https://github.com/facebook/proxygen/commit/9f939745c60d64040a6849fef338c5073a843515 https://github.com/facebook/rocksdb/commit/2940acac0088384b9fd146ce2a2ba5e2a298d5d5 https://github.com/facebook/wangle/commit/dd4425b49d8ee4cbc3cf022f56721967df329ed6 https://github.com/facebook/watchman/commit/05e6c908d14681e928eaf69d9d2dd5aa288cc1d8 https://github.com/facebookexperimental/edencommon/commit/11c0b6b8c2d996f927325c54d657f8ebd6df572e https://github.com/facebookexperimental/rust-shed/commit/9deb5e943938cd32e9a2a0abadb2cfae9fb52584 https://github.com/facebookincubator/fizz/commit/a1a39764cd05c7b8c46bb37f5e305c9b81919995 https://github.com/facebookincubator/katran/commit/b2bb68ba7d131e82ae8741acdc6d0657830505ad https://github.com/facebookincubator/velox/commit/3e4a26a05ae96c56af0eec0b274d2dd8633733f0 https://github.com/pytorch/fbgemm/commit/dc209666f0ee78d404ed20b269fe17f7934074c2 Reviewed By: jailby fbshipit-source-id: a189d0888ca0739de17c4fd236ae515ebab7866d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cd92a39960fb..0c5863a83c31 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 15ea14c8b17d88c720a18a13aa778dff023a8d15 +Subproject commit 7352c9ffa672d910f8a32190bdddac18043ca2db diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a49d3d897f14..bc339bf313c1 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 6ace96b741ac5e0b5902acdaed1a1828ab8efbdf +Subproject commit ec680d269386c81af5e2aae0ae543432db13827b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9132b940cc12..b7883270f2ed 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 69a269748da2c4e665fe7debc13c94145f0e218a +Subproject commit dd4425b49d8ee4cbc3cf022f56721967df329ed6 From 55cc0f1b88fb2e6c5862ad77ebe387a5d915ae7b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 24 Feb 2024 09:34:25 -0800 Subject: [PATCH 6787/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/1b3a4867a3e1e4613f7b958a2aeeae5159a19f66 https://github.com/facebook/fb303/commit/fe588ff738b640eb49b629d521ca22c9290751eb https://github.com/facebook/fbthrift/commit/a1ca956542989c14cea4f7224c4bbfd3d5973cce https://github.com/facebook/folly/commit/ff3463a6b459a4046d2bef3b231e32c8a3265d0e https://github.com/facebook/mcrouter/commit/55cda7aebdc207130c1182371a9cdf171af4e0fe https://github.com/facebook/mvfst/commit/1596979507c8d6b7e30ece02b68514d1b24b37a0 https://github.com/facebook/proxygen/commit/b88e4f47064473bd546edcf80cc94cbacab457c7 https://github.com/facebook/wangle/commit/d70f9fa509a8a6c45681fdcc907a0a24b71faa05 https://github.com/facebook/watchman/commit/7d3517529d0d8ba07154003f851ead5fa5531c8e https://github.com/facebookexperimental/edencommon/commit/a0d6569d287eb490550d5b3b3669b6e5a31db75a https://github.com/facebookexperimental/rust-shed/commit/1657484135d04cdbf8a05b45e6cfd5d7a6f217fa https://github.com/facebookincubator/fizz/commit/10f6050d4112808eac2d3ab8a7b591eebdfad269 https://github.com/facebookincubator/katran/commit/25d38a48068eb4b0fcaa11d584cab1bf2333c71b Reviewed By: jailby fbshipit-source-id: 4f0cff0fbe0c74496408890c1a8ceb0c43b2ec6d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0c5863a83c31..af73a5ddb6bb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7352c9ffa672d910f8a32190bdddac18043ca2db +Subproject commit a1ca956542989c14cea4f7224c4bbfd3d5973cce diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index bc339bf313c1..e322d2c49c36 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ec680d269386c81af5e2aae0ae543432db13827b +Subproject commit ff3463a6b459a4046d2bef3b231e32c8a3265d0e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b7883270f2ed..8ac2a588c81f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit dd4425b49d8ee4cbc3cf022f56721967df329ed6 +Subproject commit d70f9fa509a8a6c45681fdcc907a0a24b71faa05 From 3aef8dea5be9a86229e76966ea795706952f5146 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 25 Feb 2024 09:32:01 -0800 Subject: [PATCH 6788/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/0d46256eba33579e7d037d87a8f52b5a0e791aba https://github.com/facebook/fb303/commit/3c42c03718c1735ed04c1b171dabf80183e0e957 https://github.com/facebook/fbthrift/commit/708dd9f4207214aaade1d050ee5406036ce09be7 https://github.com/facebook/mvfst/commit/82230956da24bf1122bdfd9472d118200c05cc57 https://github.com/facebook/proxygen/commit/697c3ab0c4f3f2b5e48f7a67f539e8e23f2f1092 https://github.com/facebook/wangle/commit/ec40fccc076e016088103f81b23e4ff14a257f91 https://github.com/facebook/watchman/commit/55cc0f1b88fb2e6c5862ad77ebe387a5d915ae7b https://github.com/facebookexperimental/edencommon/commit/6de9c814de43f4f1b0a3221620bdc8bde67f6d87 https://github.com/facebookexperimental/rust-shed/commit/0fb315837c6cc5a823f759332f11d8a4885e826f https://github.com/facebookincubator/fizz/commit/d02e7ac78f168a6d62ad67abe98ac6426ebf8f1c https://github.com/facebookincubator/katran/commit/9d69010fd702f9151f1db21589f4963fc1f0df8c https://github.com/pytorch/fbgemm/commit/2bba5ccd87d7fc85d9e1a7ee6e8d8a99910c5791 Reviewed By: jailby fbshipit-source-id: 2d40d325c51ffb8274d17108a3c836f4aa4f06ae --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index af73a5ddb6bb..530b8df576e9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a1ca956542989c14cea4f7224c4bbfd3d5973cce +Subproject commit 708dd9f4207214aaade1d050ee5406036ce09be7 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8ac2a588c81f..9e7901344365 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d70f9fa509a8a6c45681fdcc907a0a24b71faa05 +Subproject commit ec40fccc076e016088103f81b23e4ff14a257f91 From 210340fe3e7c8d4df6878cc01c0a9c6e5256d181 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 26 Feb 2024 09:32:18 -0800 Subject: [PATCH 6789/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/cc713504bbeb5f2e821859ba78b7917dc28896a0 https://github.com/facebook/fb303/commit/06808be0880cc59493b68011b5d3ce67a0b67852 https://github.com/facebook/fbthrift/commit/3e7a61f1c11b89f66b712adb8be9c48ccedee73e https://github.com/facebook/folly/commit/4c624e288cf810601d0938aedec5b621dd78d833 https://github.com/facebook/litho/commit/b40f483a30653fe7fd214c9f3d28eccae9e02477 https://github.com/facebook/mvfst/commit/6e20579bc0b452e770013ded9cf8110fb4c29b17 https://github.com/facebook/proxygen/commit/01bb875ec79e06e130a994c0bf66aeb326de5aae https://github.com/facebook/rocksdb/commit/a4ff83d1b25479829249e658aa06fd10561f5f29 https://github.com/facebook/squangle/commit/503cce4670ae4973da771228c8c0d18411457695 https://github.com/facebook/wangle/commit/07cb41a412521443cceb19ec6122274cb0534073 https://github.com/facebook/watchman/commit/3aef8dea5be9a86229e76966ea795706952f5146 https://github.com/facebookexperimental/rust-shed/commit/fc7180a31448fddeed2910250314bc70f3bbc16f https://github.com/facebookincubator/fizz/commit/383e52b4983cabcd71055ce8830f4caefe18f6ab https://github.com/facebookincubator/katran/commit/8d7459b368c8d2466e986387d0d51dc26b0d5826 https://github.com/facebookincubator/velox/commit/52ad7f56ba9bdbdee9363b62a259908135a0fdcd https://github.com/pytorch/kineto/commit/3fd333fa3384bb6c2961233f912da223d9ca534c Reviewed By: jurajh-fb fbshipit-source-id: 4c32ff60b9819f363207e4409915044445cb460a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 530b8df576e9..eb5cfe09e766 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 708dd9f4207214aaade1d050ee5406036ce09be7 +Subproject commit 3e7a61f1c11b89f66b712adb8be9c48ccedee73e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e322d2c49c36..b9cee5dd9df9 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ff3463a6b459a4046d2bef3b231e32c8a3265d0e +Subproject commit 4c624e288cf810601d0938aedec5b621dd78d833 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9e7901344365..8019e06d8630 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ec40fccc076e016088103f81b23e4ff14a257f91 +Subproject commit 07cb41a412521443cceb19ec6122274cb0534073 From b75b922d63aaef8ed8280b4d9bfc82947a2d6ceb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 27 Feb 2024 09:33:20 -0800 Subject: [PATCH 6790/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/folly/commit/2d434eea5f582401b4c63515569fa25539029dc2 Reviewed By: jurajh-fb fbshipit-source-id: dba56fdfaacddcfa69ce6ec4c2065c0569f1cc1b --- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b9cee5dd9df9..53b907be9104 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 4c624e288cf810601d0938aedec5b621dd78d833 +Subproject commit 2d434eea5f582401b4c63515569fa25539029dc2 From a6630a7e3497537c76ef98daa995540bf8dd563c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 27 Feb 2024 15:28:55 -0800 Subject: [PATCH 6791/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/c7b7dc8d26add3c4c8ef29cd83a03a3ef72987f5 https://github.com/facebook/fatal/commit/2602114b4814b5cc6693456521cc880e8c427461 https://github.com/facebook/fb303/commit/e6cb657a8596c84c590da1fbd1114540bae696d2 https://github.com/facebook/fbthrift/commit/9c4f973283f4672bece44bd7b0814e7e60cb8dbf https://github.com/facebook/folly/commit/5fafaa5810fcc29c3246a38fdce97eaaf6a9d70d https://github.com/facebook/litho/commit/e30968ac2ef7eab601cb2ef86ce9755e57110020 https://github.com/facebook/mcrouter/commit/8a7eb218fc9d2de3e490542b66d65604cfabcaf0 https://github.com/facebook/mvfst/commit/cdc2d2c2458f2c668a4c5aacc6fc54a4441f135f https://github.com/facebook/ocamlrep/commit/70bfc11368dcb403f38ee285fa5a0b8318774b8a https://github.com/facebook/proxygen/commit/0321a3df251407efeb0ccc1ae6070a000d841541 https://github.com/facebook/rocksdb/commit/a43481b3d06f132e0b4d0d9d272d59eedbf09065 https://github.com/facebook/wangle/commit/9d06d7f0e0d1db86c0fa6a1f31f8fd6278e279ba https://github.com/facebook/watchman/commit/b75b922d63aaef8ed8280b4d9bfc82947a2d6ceb https://github.com/facebookexperimental/edencommon/commit/dda1c92cbe2b1193b1ab84b04d045caa65b5bae8 https://github.com/facebookexperimental/rust-shed/commit/6795ae80d7439668bed22fc0c2c8a163368a3225 https://github.com/facebookincubator/fizz/commit/104b9fe3b7e3784b9ba4c627865c8fcac389fe27 https://github.com/facebookincubator/katran/commit/d6af849ec1ccc37271ab807508324c0cb2388189 https://github.com/facebookincubator/momentum/commit/124aa4041d80da232182636700ec35f1c5ba227b https://github.com/facebookincubator/velox/commit/2b2030ae92235a17d25924097df84ee762c932b4 https://github.com/facebookresearch/vrs/commit/382e06f49797b634b48367cf93001b0fa9abd19f https://github.com/pytorch/fbgemm/commit/0431e5a3a1c8ed222f0c4fe4dc54ddcd53f768c2 https://github.com/pytorch/kineto/commit/1392766fa379718f7bc9f18710ed51cea694f368 Reviewed By: jurajh-fb fbshipit-source-id: 84ac987d633716a4b29ef5c2012f049eff818ed2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index eb5cfe09e766..49e0cd00eefc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3e7a61f1c11b89f66b712adb8be9c48ccedee73e +Subproject commit 9c4f973283f4672bece44bd7b0814e7e60cb8dbf diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 53b907be9104..f11ac99a2d1c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 2d434eea5f582401b4c63515569fa25539029dc2 +Subproject commit 5fafaa5810fcc29c3246a38fdce97eaaf6a9d70d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8019e06d8630..09eb811f15d9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 07cb41a412521443cceb19ec6122274cb0534073 +Subproject commit 9d06d7f0e0d1db86c0fa6a1f31f8fd6278e279ba From 2e9244a82606a81dd58e6281597f268c9a3a86a3 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Wed, 28 Feb 2024 10:39:47 -0800 Subject: [PATCH 6792/7387] Workaround for build errors caused by vcvarsall.bat returning ERRORLEVEL=1 Summary: An update to the Windows toolchain broke OSS getdeps builds. This was caused by the execution of `vcvarsall.bat` returning an ERRORLEVEL=1 when any extension (optional tools) was absent. Given we don't install many extensions this meant that the setup script was failing. The resultant behavior was to fail all build steps. The fix was to wrap the invocation of `vcvarsall.bat` in a different batch file that always returns ERRORLEVEL=0. This should be OK as any real build failures will come by running the actual build scripts. NOTE: There are other known failures (i.e. folly not building due to new compiler) that will be exposed after this change. They will not be causing any new job failures, but should be addressed as well. Reviewed By: chadaustin Differential Revision: D54280190 fbshipit-source-id: 7bf38bb2cb084cf5c4cd5650b5f0f06bb1dbcd9b --- build/fbcode_builder/getdeps/builder.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 25e2076e99d6..4ad75b346858 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -62,7 +62,18 @@ def _get_cmd_prefix(self): # the cmd quoting rules to assemble a command that calls the script # to prep the environment and then triggers the actual command that # we wanted to run. - return [vcvarsall, "amd64", "&&"] + + # Due to changes in vscrsall.bat, it now reports an ERRORLEVEL of 1 + # even when succeeding. This occurs when an extension is not present. + # To continue, we must ignore the ERRORLEVEL returned. We do this by + # wrapping the call in a batch file that always succeeds. + wrapper = os.path.join(self.build_dir, "succeed.bat") + with open(wrapper, "w") as f: + f.write("@echo off\n") + f.write(f"call {vcvarsall} amd64\n") + f.write("set ERRORLEVEL=0\n") + f.write("exit /b 0\n") + return [wrapper, "&&"] return [] def _run_cmd( From aa708f2db9c66912f95a070bf60b3e32f0f7031b Mon Sep 17 00:00:00 2001 From: Yedidya Feldblum Date: Wed, 28 Feb 2024 13:28:26 -0800 Subject: [PATCH 6793/7387] migrate from FOLLY_MAYBE_UNUSED to [[maybe_unused]] Reviewed By: ot, Orvid, xinchenguo Differential Revision: D54089810 fbshipit-source-id: c88eb520404590c9759e0e29966d1399c26a2244 --- watchman/test/CacheTest.cpp | 2 +- watchman/test/PendingCollectionTest.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/watchman/test/CacheTest.cpp b/watchman/test/CacheTest.cpp index 7d82effe4f9a..6c5724b801c7 100644 --- a/watchman/test/CacheTest.cpp +++ b/watchman/test/CacheTest.cpp @@ -20,7 +20,7 @@ static constexpr const std::chrono::milliseconds kErrorTTL(1000); namespace watchman::lrucache { template -FOLLY_MAYBE_UNUSED static std::ostream& operator<<( +[[maybe_unused]] static std::ostream& operator<<( std::ostream& out, Node const& node) { return out << (const void*)&node; diff --git a/watchman/test/PendingCollectionTest.cpp b/watchman/test/PendingCollectionTest.cpp index 4e4543c18229..a7ef257efb86 100644 --- a/watchman/test/PendingCollectionTest.cpp +++ b/watchman/test/PendingCollectionTest.cpp @@ -15,12 +15,12 @@ using namespace watchman; namespace watchman { -FOLLY_MAYBE_UNUSED static std::ostream& operator<<( +[[maybe_unused]] static std::ostream& operator<<( std::ostream& out, PendingChanges const& item) { return out << (const void*)&item; } -FOLLY_MAYBE_UNUSED static std::ostream& operator<<( +[[maybe_unused]] static std::ostream& operator<<( std::ostream& out, watchman_pending_fs const& item) { return out << (const void*)&item; From 1dfa08db04446143473b1ed851b21887e56f792d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 1 Mar 2024 14:20:56 -0800 Subject: [PATCH 6794/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/5f022c1894d4fa29191744723970ef49f61eed9b https://github.com/facebook/fb303/commit/62e748d95a1b519f718a2a3ed0684f3e9488f2e5 https://github.com/facebook/fbthrift/commit/c7d462f1dcf08ab42ea12ab256673b4021e35bf5 https://github.com/facebook/folly/commit/9a4ece8899cce971497ab82ce69c7bc0fdeaa68d https://github.com/facebook/mcrouter/commit/27f4d40154d3ea9ffe316ccef7c7de0d67ec723a https://github.com/facebook/mvfst/commit/13271fcc0a742c7b1c9ace077aea9baf15a0a9c7 https://github.com/facebook/proxygen/commit/0c1125274a0e0fb1220d51ace2183a710fa70d50 https://github.com/facebook/wangle/commit/eb633b93c442d7549a2940dc639978b8537d50cf https://github.com/facebook/watchman/commit/aa708f2db9c66912f95a070bf60b3e32f0f7031b https://github.com/facebookexperimental/edencommon/commit/a6d5a033eb8bd801e2a13c93761aa589e2d67cbb https://github.com/facebookexperimental/rust-shed/commit/54ec4e4db73fc438a3e8f4ed96f7c3d6f8311fc9 https://github.com/facebookincubator/fizz/commit/aa445f0e5aa7e68f602d5fab9f9eefa2ab1ca6a8 https://github.com/facebookincubator/superconsole/commit/30e0b2ab29da204519ddae3d93ac9f228ea8edc1 Reviewed By: jurajh-fb fbshipit-source-id: 5e54b7519ced523950540c4d2b03cc824e57252b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 49e0cd00eefc..30358a68e84e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9c4f973283f4672bece44bd7b0814e7e60cb8dbf +Subproject commit c7d462f1dcf08ab42ea12ab256673b4021e35bf5 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f11ac99a2d1c..2a72936ba5da 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 5fafaa5810fcc29c3246a38fdce97eaaf6a9d70d +Subproject commit 9a4ece8899cce971497ab82ce69c7bc0fdeaa68d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 09eb811f15d9..8297600d8edf 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9d06d7f0e0d1db86c0fa6a1f31f8fd6278e279ba +Subproject commit eb633b93c442d7549a2940dc639978b8537d50cf From 9b06d0bf4dd3ca9e84ab1f05c8f4943261c55949 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Fri, 1 Mar 2024 15:34:10 -0800 Subject: [PATCH 6795/7387] Forward fix github build break due to D54280190 Summary: X-link: https://github.com/facebookincubator/zstrong/pull/720 When running getdeps as part of Github CI, the toolchains employed are found in "C:\Program Files" or "C:\Program Files(x86)" - both requiring quoting to execute. Lets add quotes and fix tha. Reviewed By: vitaut Differential Revision: D54433098 fbshipit-source-id: d3570486a2a2b12f4649becc987f9da1ca65c796 --- build/fbcode_builder/getdeps/builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 4ad75b346858..090291e87144 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -70,7 +70,7 @@ def _get_cmd_prefix(self): wrapper = os.path.join(self.build_dir, "succeed.bat") with open(wrapper, "w") as f: f.write("@echo off\n") - f.write(f"call {vcvarsall} amd64\n") + f.write(f'call "{vcvarsall}" amd64\n') f.write("set ERRORLEVEL=0\n") f.write("exit /b 0\n") return [wrapper, "&&"] From 77220e8dcfdd733eaee6d9719f91b5f5c38e89a6 Mon Sep 17 00:00:00 2001 From: "Zeyi (Rice) Fan" Date: Fri, 1 Mar 2024 16:13:47 -0800 Subject: [PATCH 6796/7387] fix fmt dependency on Windows Summary: Missing a fmt dependency in CMake Reviewed By: jdelliot Differential Revision: D54395923 fbshipit-source-id: 8102300fdde437c51440b2d4ee8083c0c4b8e92f --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 169d847deade..360efe7f4a67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -757,6 +757,7 @@ add_custom_target(check if(Python3_Interpreter_FOUND) if (WIN32) add_executable(susres watchman/winbuild/susres.cpp) + target_link_libraries(susres third_party_deps) add_custom_target(make_susres ALL DEPENDS susres) endif() From da29f87b4fef91c26231e0625b38b1ced0b5fce7 Mon Sep 17 00:00:00 2001 From: "Zeyi (Rice) Fan" Date: Fri, 1 Mar 2024 16:13:47 -0800 Subject: [PATCH 6797/7387] modernize Python packaging for pywatchman Summary: X-link: https://github.com/facebookincubator/zstrong/pull/721 Mostly following practice in: https://packaging.python.org/en/latest/tutorials/packaging-projects/ Switching pywatchman to be built with PEP517. After this we can publish new pywatchman packages to PyPI continuously. Reviewed By: jdelliot Differential Revision: D54343676 fbshipit-source-id: 48a4538db4176662b8af189538dae32b9289d712 --- CMakeLists.txt | 8 ++- .../manifests/python-setuptools | 9 +++ build/fbcode_builder/manifests/watchman | 1 + watchman/python/MANIFEST.in | 1 + watchman/python/pyproject.toml | 41 ++++++++++++ watchman/python/setup.py | 66 +++---------------- 6 files changed, 66 insertions(+), 60 deletions(-) create mode 100644 build/fbcode_builder/manifests/python-setuptools create mode 100644 watchman/python/MANIFEST.in create mode 100644 watchman/python/pyproject.toml diff --git a/CMakeLists.txt b/CMakeLists.txt index 360efe7f4a67..88a31d651f15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -395,17 +395,20 @@ endif() if(Python3_Development_FOUND) - set(PYOUT "${CMAKE_CURRENT_BINARY_DIR}/build/pytimestamp") + set(PYOUT "${CMAKE_CURRENT_BINARY_DIR}/pywatchman") set(SETUP_PY "${CMAKE_CURRENT_SOURCE_DIR}/watchman/python/setup.py") + set(PYWATCHMAN_BASE ${CMAKE_CURRENT_SOURCE_DIR}/watchman/python) file(GLOB PYWATCHMAN_PY_SRCS "watchman/python/pywatchman/*.py") + file(MAKE_DIRECTORY ${PYOUT}) add_custom_command( COMMENT "Building pywatchman" OUTPUT ${PYOUT} DEPENDS ${PYWATCHMAN_PY_SRCS} "watchman/python/pywatchman/bser.c" + WORKING_DIRECTORY ${PYWATCHMAN_BASE} COMMAND ${CMAKE_COMMAND} -E env CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} CMAKE_CURRENT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} - ${Python3_EXECUTABLE} ${SETUP_PY} build + ${Python3_EXECUTABLE} ${SETUP_PY} build --build-base ${PYOUT} COMMAND ${CMAKE_COMMAND} -E touch ${PYOUT} ) add_custom_target(pybuild ALL DEPENDS ${PYOUT}) @@ -415,6 +418,7 @@ if(Python3_Development_FOUND) CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} ${Python3_EXECUTABLE} ${SETUP_PY} install --root $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} + WORKING_DIRECTORY ${PYWATCHMAN_BASE} RESULT_VARIABLE STATUS) if (NOT STATUS STREQUAL 0) message(FATAL_ERROR \"pywatchman install failed\") diff --git a/build/fbcode_builder/manifests/python-setuptools b/build/fbcode_builder/manifests/python-setuptools new file mode 100644 index 000000000000..7ca2e1e498cb --- /dev/null +++ b/build/fbcode_builder/manifests/python-setuptools @@ -0,0 +1,9 @@ +[manifest] +name = python-setuptools + +[download] +url = https://files.pythonhosted.org/packages/c0/7a/3da654f49c95d0cc6e9549a855b5818e66a917e852ec608e77550c8dc08b/setuptools-69.1.1-py3-none-any.whl +sha256 = 02fa291a0471b3a18b2b2481ed902af520c69e8ae0919c13da936542754b4c56 + +[build] +builder = python-wheel diff --git a/build/fbcode_builder/manifests/watchman b/build/fbcode_builder/manifests/watchman index b733a0c09c37..31596bc938d3 100644 --- a/build/fbcode_builder/manifests/watchman +++ b/build/fbcode_builder/manifests/watchman @@ -19,6 +19,7 @@ fbthrift folly pcre2 googletest +python-setuptools [dependencies.fbsource=on] rust diff --git a/watchman/python/MANIFEST.in b/watchman/python/MANIFEST.in new file mode 100644 index 000000000000..9e7008981431 --- /dev/null +++ b/watchman/python/MANIFEST.in @@ -0,0 +1 @@ +include pywatchman/bser.h diff --git a/watchman/python/pyproject.toml b/watchman/python/pyproject.toml new file mode 100644 index 000000000000..7720ef89a55b --- /dev/null +++ b/watchman/python/pyproject.toml @@ -0,0 +1,41 @@ +[project] +name = "pywatchman" +version = "2.0.0" +authors = [ + { name = "Meta Source Control Team", email = "sourcecontrol-dev@fb.com" }, +] +description = "Watchman client for Python" +license = { file = "LICENSE" } +readme = "../README.md" +requires-python = ">=3.8" +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "Topic :: System :: Filesystems", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", +] +keywords = [ + "watchman", + "inotify", + "fsevents", + "kevent", + "kqueue", + "portfs", + "filesystem", + "watcher", +] + +[project.urls] +Homepage = "https://github.com/facebook/watchman" +Issues = "https://github.com/facebook/watchman/issues" + + +[build-system] +requires = ["setuptools>=61.0", "wheel>=0.37.0"] +build-backend = "setuptools.build_meta" diff --git a/watchman/python/setup.py b/watchman/python/setup.py index c94620c40c81..b21a13311e8e 100755 --- a/watchman/python/setup.py +++ b/watchman/python/setup.py @@ -8,72 +8,22 @@ import os -try: - from setuptools import Extension, setup -except ImportError: - from distutils.core import Extension, setup - -watchman_src_dir = os.environ.get("CMAKE_CURRENT_SOURCE_DIR") -if watchman_src_dir is None: - watchman_src_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..") - -# Setuptools is very picky about the path on Windows. They have to be relative -# paths, and on Windows that means we have to be on the same drive as the source -# files. Otherwise it is impossible to obtain a relative path across different -# drives. However this has an implication that we will not be able to build this -# package outside the repository. Not great but it works. -py_dir = os.path.join(watchman_src_dir, "watchman", "python") -if os.name == "nt": - os.chdir(py_dir) - py_dir = os.path.relpath(py_dir) - - -def srcs(names): - """transform a list of sources to be relative to py_dir""" - return ["%s/%s" % (py_dir, n) for n in names] - +from setuptools import Extension, setup setup( - name="pywatchman", - version="1.4.1", - package_dir={"": py_dir}, - description="Watchman client for python", - author="Wez Furlong, Rain", - author_email="wez@fb.com", - maintainer="Wez Furlong", - maintainer_email="wez@fb.com", - url="https://github.com/facebook/watchman", - long_description="Connect and query Watchman to discover file changes", - keywords=("watchman inotify fsevents kevent kqueue portfs filesystem watcher"), - license="BSD", packages=["pywatchman"], ext_modules=[ Extension( "pywatchman.bser", - sources=srcs(["pywatchman/bsermodule.c", "pywatchman/bser.c"]), + sources=["pywatchman/bsermodule.c", "pywatchman/bser.c"], + include_dirs=["./pywatchman"], ) ], - platforms="Platform Independent", - classifiers=[ - "Development Status :: 5 - Production/Stable", - "Intended Audience :: Developers", - "Topic :: System :: Filesystems", - "License :: OSI Approved :: BSD License", - "Operating System :: OS Independent", - "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.6", - "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.5", - "Programming Language :: Python :: 3.6", - ], zip_safe=True, - scripts=srcs( - [ - "bin/watchman-make", - "bin/watchman-wait", - "bin/watchman-replicate-subscription", - ] - ), + scripts=[ + "bin/watchman-make", + "bin/watchman-wait", + "bin/watchman-replicate-subscription", + ], test_suite="tests", ) From f33e24df5f708930d7412fff6daa4f4833166677 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Fri, 1 Mar 2024 18:09:03 -0800 Subject: [PATCH 6798/7387] Move FileUtils and PathFuncs from eden to edencommon Summary: To support better telemetry and logging in watchman we want to use Eden's components. Lets migrate and detangle the needed pieces. This change moves FileUtils and PathFuncs from eden to edencommon. NOTE: FileUtils and PathFuncs are mutally dependent so they were migrated togehter. Most of the files touched, however, was due to PathFuncs. Reviewed By: genevievehelsel Differential Revision: D54393041 fbshipit-source-id: 6dc404b1b1066704584da512220475e9ee486247 --- watchman/fs/ParallelWalk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/fs/ParallelWalk.h b/watchman/fs/ParallelWalk.h index f06f28bc30b1..b84f3471d432 100644 --- a/watchman/fs/ParallelWalk.h +++ b/watchman/fs/ParallelWalk.h @@ -16,7 +16,7 @@ namespace watchman { -// Consider eden/fs/utils/PathFuncs.h, if builds. +// Consider eden/common/utils/PathFuncs.h, if builds. using PathComponent = folly::fbstring; using AbsolutePath = folly::fbstring; From cde491f2bbebc2a917b53a69eb54a16384e51c9a Mon Sep 17 00:00:00 2001 From: Amethyst Reese Date: Sat, 2 Mar 2024 17:31:19 -0800 Subject: [PATCH 6799/7387] apply Black 2024 style in fbcode (4/16) Summary: Formats the covered files with pyfmt. paintitblack Reviewed By: aleivag Differential Revision: D54447727 fbshipit-source-id: 8844b1caa08de94d04ac4df3c768dbf8c865fd2f --- watchman/integration/lib/WatchmanTestCase.py | 2 +- watchman/integration/test_dirname.py | 2 +- watchman/integration/test_size.py | 2 +- watchman/python/tests/tests.py | 2 +- watchman/runtests.py | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/watchman/integration/lib/WatchmanTestCase.py b/watchman/integration/lib/WatchmanTestCase.py index b456a2cb959c..2de3e6ead460 100644 --- a/watchman/integration/lib/WatchmanTestCase.py +++ b/watchman/integration/lib/WatchmanTestCase.py @@ -575,7 +575,7 @@ def setDefaultConfiguration(self): except unittest.SkipTest: pass - for (transport, encoding, parallel, split, suffix) in matrix: + for transport, encoding, parallel, split, suffix in matrix: make_class(transport, encoding, suffix, parallel == "parallel", split) return None diff --git a/watchman/integration/test_dirname.py b/watchman/integration/test_dirname.py index 0adffe3d0a97..77667923ce8c 100644 --- a/watchman/integration/test_dirname.py +++ b/watchman/integration/test_dirname.py @@ -96,7 +96,7 @@ def test_dirname(self) -> None: ["1", 4, []], ] - for (dirname, depth, expect) in tests: + for dirname, depth, expect in tests: if depth is None: # equivalent to `depth ge 0` term = ["dirname", dirname] diff --git a/watchman/integration/test_size.py b/watchman/integration/test_size.py index 0f24a6f5ce10..29854e460f6b 100644 --- a/watchman/integration/test_size.py +++ b/watchman/integration/test_size.py @@ -35,7 +35,7 @@ def test_size_expr(self) -> None: ["lt", 3, ["empty"]], ] - for (op, operand, expect) in tests: + for op, operand, expect in tests: res = self.watchmanCommand( "query", root, {"expression": ["size", op, operand], "fields": ["name"]} ) diff --git a/watchman/python/tests/tests.py b/watchman/python/tests/tests.py index eed1c5ef9e87..d2637bf3f3b5 100755 --- a/watchman/python/tests/tests.py +++ b/watchman/python/tests/tests.py @@ -131,7 +131,7 @@ def expand_bser_mods(test_class): caller_scope = inspect.currentframe().f_back.f_locals flavors = [(bser, "Bser"), (pybser, "PyBser")] - for (mod, suffix) in flavors: + for mod, suffix in flavors: def make_class(mod, suffix): subclass_name = test_class.__name__ + suffix diff --git a/watchman/runtests.py b/watchman/runtests.py index 40b4fbdd7a0a..d5269c32f6d6 100755 --- a/watchman/runtests.py +++ b/watchman/runtests.py @@ -387,6 +387,7 @@ def loadTestsFromModule(self, module, *args, **kw): tls = threading.local() + # Manage printing from concurrent threads # http://stackoverflow.com/a/3030755/149111 class ThreadSafeFile: From 9c38fb4a58d0652d675b2b452da8d22706e7cad9 Mon Sep 17 00:00:00 2001 From: Amethyst Reese Date: Sat, 2 Mar 2024 17:31:19 -0800 Subject: [PATCH 6800/7387] apply Black 2024 style in fbcode (5/16) Summary: Formats the covered files with pyfmt. paintitblack Reviewed By: aleivag Differential Revision: D54447730 fbshipit-source-id: 85ed104b2f8f5e26ae0dea9ee17392ecad8b9407 --- build/fbcode_builder/getdeps/builder.py | 2 +- build/fbcode_builder/getdeps/cargo.py | 4 ++-- build/fbcode_builder/getdeps/load.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 090291e87144..f3246fe85c22 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -334,7 +334,7 @@ def _build(self, install_dirs, reconfigure) -> None: env = self._compute_env(install_dirs) # Some configure scripts need additional env values passed derived from cmds - for (k, cmd_args) in self.conf_env_args.items(): + for k, cmd_args in self.conf_env_args.items(): out = ( subprocess.check_output(cmd_args, env=dict(env.items())) .decode("utf-8") diff --git a/build/fbcode_builder/getdeps/cargo.py b/build/fbcode_builder/getdeps/cargo.py index 315f80b17097..15996ad5154f 100644 --- a/build/fbcode_builder/getdeps/cargo.py +++ b/build/fbcode_builder/getdeps/cargo.py @@ -336,7 +336,7 @@ def _resolve_dep_to_git(self): crate_source_map = {} if dep_crate_map: - for (crate, subpath) in dep_crate_map.items(): + for crate, subpath in dep_crate_map.items(): if crate not in crate_source_map: if self.build_opts.is_windows(): subpath = subpath.replace("/", "\\") @@ -444,7 +444,7 @@ def _resolve_crate_to_path(self, crate, crate_source_map): """ search_pattern = '[package]\nname = "{}"'.format(crate) - for (_crate, crate_source_dir) in crate_source_map.items(): + for _crate, crate_source_dir in crate_source_map.items(): for crate_root, _, files in os.walk(crate_source_dir): if "Cargo.toml" in files: with open(os.path.join(crate_root, "Cargo.toml"), "r") as f: diff --git a/build/fbcode_builder/getdeps/load.py b/build/fbcode_builder/getdeps/load.py index 6390f2fb14b4..478e1b4cdbef 100644 --- a/build/fbcode_builder/getdeps/load.py +++ b/build/fbcode_builder/getdeps/load.py @@ -19,7 +19,7 @@ class Loader(object): def _list_manifests(self, build_opts): """Returns a generator that iterates all the available manifests""" - for (path, _, files) in os.walk(build_opts.manifests_dir): + for path, _, files in os.walk(build_opts.manifests_dir): for name in files: # skip hidden files if name.startswith("."): From f73f0f77aba7a852aca85cc76a8f97e502a8b171 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 4 Mar 2024 09:46:12 -0800 Subject: [PATCH 6801/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/50da3609a1e752de750ec15603e0a243e20a02d7 https://github.com/facebook/fb303/commit/0994824480d187934594c4a450be9fbc6f481d26 https://github.com/facebook/fbthrift/commit/d010d835186f19b763c39e6aedca974bdc7c6596 https://github.com/facebook/folly/commit/080d2a3b8229d80a93766899242e55b07bcabad1 https://github.com/facebook/mcrouter/commit/5bdd3f33a9e50699ffdb3e907706aef1bc406af5 https://github.com/facebook/mvfst/commit/919f98bba76184f859a4ef0d758a3176392b0975 https://github.com/facebook/proxygen/commit/6393c2daf37021c7b4cf45e38c2652496da1deca https://github.com/facebook/wangle/commit/f1b340f60cd197e74c55a513bd98fb557d00a632 https://github.com/facebook/watchman/commit/9c38fb4a58d0652d675b2b452da8d22706e7cad9 https://github.com/facebookexperimental/edencommon/commit/7c733b292557848f27b8c43b714d5225eb9b9b2c https://github.com/facebookexperimental/rust-shed/commit/3b45d38dc11155f307c4976bec74f0807fc8cbc8 https://github.com/facebookincubator/fizz/commit/69337e58fe540e8236eb31c36000584a06bf421b https://github.com/facebookresearch/flsim/commit/4f155be5b557741b024e5e225d6298852b36f323 https://github.com/facebookresearch/multimodal/commit/dbeed9724bc9099be173c86871df7d41f3b7e58c https://github.com/facebookresearch/recipes/commit/ee8b2facbce5b55dd1c4bc288c044f78d3119c87 Reviewed By: bigfootjon fbshipit-source-id: 45f8431eb0459dc34d66fbec7c5cff918486d336 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 30358a68e84e..80d88f072aed 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c7d462f1dcf08ab42ea12ab256673b4021e35bf5 +Subproject commit d010d835186f19b763c39e6aedca974bdc7c6596 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 2a72936ba5da..f7f9998eb6ee 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9a4ece8899cce971497ab82ce69c7bc0fdeaa68d +Subproject commit 080d2a3b8229d80a93766899242e55b07bcabad1 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8297600d8edf..7772e6fb8003 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit eb633b93c442d7549a2940dc639978b8537d50cf +Subproject commit f1b340f60cd197e74c55a513bd98fb557d00a632 From 71c6f8afef422e9ad25e72cab7118532573cd2ce Mon Sep 17 00:00:00 2001 From: John Elliott Date: Mon, 4 Mar 2024 12:22:09 -0800 Subject: [PATCH 6802/7387] Move SpawnedProcess from eden to edencommon Summary: To support better telemetry and logging in watchman we want to use Eden's components. Lets migrate and detangle the needed pieces. This change moves SpawnedProcess from eden to edencommon. Reviewed By: genevievehelsel Differential Revision: D54471128 fbshipit-source-id: 5c8caa7d6388ba9a3753cb483ba8d11adc5eb87c --- watchman/cppclient/WatchmanConnection.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/cppclient/WatchmanConnection.cpp b/watchman/cppclient/WatchmanConnection.cpp index 919ad249d202..00c90d0d9861 100644 --- a/watchman/cppclient/WatchmanConnection.cpp +++ b/watchman/cppclient/WatchmanConnection.cpp @@ -17,7 +17,7 @@ #include #ifdef _WIN32 -#include // @manual +#include // @manual #else #include // @manual #endif From 5366a05ff8ee74a94837e7b56d8ce2f2612c85d1 Mon Sep 17 00:00:00 2001 From: Conner Nilsen Date: Mon, 4 Mar 2024 18:15:44 -0800 Subject: [PATCH 6803/7387] Pyre Configurationless migration for] [batch:88/244] (#723) Summary: Pull Request resolved: https://github.com/facebookincubator/zstrong/pull/723 Reviewed By: grievejia Differential Revision: D54471437 fbshipit-source-id: bc644553e31464ceb632034e4ce3f05ba30fbbcd --- build/fbcode_builder/getdeps/builder.py | 2 ++ build/fbcode_builder/getdeps/buildopts.py | 2 ++ build/fbcode_builder/getdeps/cache.py | 2 ++ build/fbcode_builder/getdeps/cargo.py | 2 ++ build/fbcode_builder/getdeps/copytree.py | 2 ++ build/fbcode_builder/getdeps/dyndeps.py | 2 ++ build/fbcode_builder/getdeps/envfuncs.py | 2 ++ build/fbcode_builder/getdeps/errors.py | 2 ++ build/fbcode_builder/getdeps/expr.py | 2 ++ build/fbcode_builder/getdeps/fetcher.py | 2 ++ build/fbcode_builder/getdeps/load.py | 2 ++ build/fbcode_builder/getdeps/manifest.py | 2 ++ build/fbcode_builder/getdeps/platform.py | 2 ++ build/fbcode_builder/getdeps/py_wheel_builder.py | 2 ++ build/fbcode_builder/getdeps/runcmd.py | 2 ++ build/fbcode_builder/getdeps/subcmd.py | 2 ++ build/fbcode_builder/getdeps/test/expr_test.py | 2 ++ build/fbcode_builder/getdeps/test/manifest_test.py | 2 ++ build/fbcode_builder/getdeps/test/platform_test.py | 2 ++ build/fbcode_builder/getdeps/test/scratch_test.py | 2 ++ 20 files changed, 40 insertions(+) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index f3246fe85c22..43542e04c61c 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import glob import json import os diff --git a/build/fbcode_builder/getdeps/buildopts.py b/build/fbcode_builder/getdeps/buildopts.py index dcf551cb8c33..bf70265b2a48 100644 --- a/build/fbcode_builder/getdeps/buildopts.py +++ b/build/fbcode_builder/getdeps/buildopts.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import errno import glob import ntpath diff --git a/build/fbcode_builder/getdeps/cache.py b/build/fbcode_builder/getdeps/cache.py index 4d2786e7e1b5..ed0d45bfd2a5 100644 --- a/build/fbcode_builder/getdeps/cache.py +++ b/build/fbcode_builder/getdeps/cache.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + class ArtifactCache(object): """The ArtifactCache is a small abstraction that allows caching diff --git a/build/fbcode_builder/getdeps/cargo.py b/build/fbcode_builder/getdeps/cargo.py index 15996ad5154f..779fa8333d5e 100644 --- a/build/fbcode_builder/getdeps/cargo.py +++ b/build/fbcode_builder/getdeps/cargo.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import re import shutil diff --git a/build/fbcode_builder/getdeps/copytree.py b/build/fbcode_builder/getdeps/copytree.py index a3522b31387f..2297bd3aa80a 100644 --- a/build/fbcode_builder/getdeps/copytree.py +++ b/build/fbcode_builder/getdeps/copytree.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import shutil import subprocess diff --git a/build/fbcode_builder/getdeps/dyndeps.py b/build/fbcode_builder/getdeps/dyndeps.py index ba0895132e15..0dd9a4557eca 100644 --- a/build/fbcode_builder/getdeps/dyndeps.py +++ b/build/fbcode_builder/getdeps/dyndeps.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import errno import glob import os diff --git a/build/fbcode_builder/getdeps/envfuncs.py b/build/fbcode_builder/getdeps/envfuncs.py index 60de6b23143e..f32418c93782 100644 --- a/build/fbcode_builder/getdeps/envfuncs.py +++ b/build/fbcode_builder/getdeps/envfuncs.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import shlex import sys diff --git a/build/fbcode_builder/getdeps/errors.py b/build/fbcode_builder/getdeps/errors.py index 92240c9538c2..1d01ad0ec758 100644 --- a/build/fbcode_builder/getdeps/errors.py +++ b/build/fbcode_builder/getdeps/errors.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + class TransientFailure(Exception): """Raising this error causes getdeps to return with an error code diff --git a/build/fbcode_builder/getdeps/expr.py b/build/fbcode_builder/getdeps/expr.py index df8c3022732d..0f51521d6581 100644 --- a/build/fbcode_builder/getdeps/expr.py +++ b/build/fbcode_builder/getdeps/expr.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import re import shlex diff --git a/build/fbcode_builder/getdeps/fetcher.py b/build/fbcode_builder/getdeps/fetcher.py index ae96ac133426..b1c113f46781 100644 --- a/build/fbcode_builder/getdeps/fetcher.py +++ b/build/fbcode_builder/getdeps/fetcher.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import errno import hashlib import os diff --git a/build/fbcode_builder/getdeps/load.py b/build/fbcode_builder/getdeps/load.py index 478e1b4cdbef..c737142d063e 100644 --- a/build/fbcode_builder/getdeps/load.py +++ b/build/fbcode_builder/getdeps/load.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import base64 import copy import hashlib diff --git a/build/fbcode_builder/getdeps/manifest.py b/build/fbcode_builder/getdeps/manifest.py index 15f69af7d4e8..eab64c95bb8d 100644 --- a/build/fbcode_builder/getdeps/manifest.py +++ b/build/fbcode_builder/getdeps/manifest.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import configparser import io import os diff --git a/build/fbcode_builder/getdeps/platform.py b/build/fbcode_builder/getdeps/platform.py index 7f0cb502b0dc..4def6f0d7687 100644 --- a/build/fbcode_builder/getdeps/platform.py +++ b/build/fbcode_builder/getdeps/platform.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import platform diff --git a/build/fbcode_builder/getdeps/py_wheel_builder.py b/build/fbcode_builder/getdeps/py_wheel_builder.py index 53e807927f7c..92bf7a382115 100644 --- a/build/fbcode_builder/getdeps/py_wheel_builder.py +++ b/build/fbcode_builder/getdeps/py_wheel_builder.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import codecs import collections import email diff --git a/build/fbcode_builder/getdeps/runcmd.py b/build/fbcode_builder/getdeps/runcmd.py index dc35b6f02660..e0b9d2b22fd5 100644 --- a/build/fbcode_builder/getdeps/runcmd.py +++ b/build/fbcode_builder/getdeps/runcmd.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import select import subprocess diff --git a/build/fbcode_builder/getdeps/subcmd.py b/build/fbcode_builder/getdeps/subcmd.py index 3c338642d840..acbeb93f113c 100644 --- a/build/fbcode_builder/getdeps/subcmd.py +++ b/build/fbcode_builder/getdeps/subcmd.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + class SubCmd(object): NAME = None diff --git a/build/fbcode_builder/getdeps/test/expr_test.py b/build/fbcode_builder/getdeps/test/expr_test.py index f12f68985ed8..4f4b957ce641 100644 --- a/build/fbcode_builder/getdeps/test/expr_test.py +++ b/build/fbcode_builder/getdeps/test/expr_test.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import unittest diff --git a/build/fbcode_builder/getdeps/test/manifest_test.py b/build/fbcode_builder/getdeps/test/manifest_test.py index e48b05f321d0..05b2c58b1885 100644 --- a/build/fbcode_builder/getdeps/test/manifest_test.py +++ b/build/fbcode_builder/getdeps/test/manifest_test.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import sys import unittest diff --git a/build/fbcode_builder/getdeps/test/platform_test.py b/build/fbcode_builder/getdeps/test/platform_test.py index ce0de7a67f5e..1fcab7a58614 100644 --- a/build/fbcode_builder/getdeps/test/platform_test.py +++ b/build/fbcode_builder/getdeps/test/platform_test.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import unittest diff --git a/build/fbcode_builder/getdeps/test/scratch_test.py b/build/fbcode_builder/getdeps/test/scratch_test.py index b57d8b583fe4..4075e0a3d686 100644 --- a/build/fbcode_builder/getdeps/test/scratch_test.py +++ b/build/fbcode_builder/getdeps/test/scratch_test.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import unittest From 924f3495f4694de703b21b886a41f54b3426f3cf Mon Sep 17 00:00:00 2001 From: Conner Nilsen Date: Mon, 4 Mar 2024 18:30:37 -0800 Subject: [PATCH 6804/7387] Pyre Configurationless migration for] [batch:85/112] [shard:6/N] Reviewed By: inseokhwang Differential Revision: D54438157 fbshipit-source-id: a6acfe146ed29fff82123b5e458906d4b4cee6a2 --- watchman/integration/eden/test_eden_glob_upper_bound.py | 2 ++ watchman/integration/eden/test_eden_journal.py | 2 ++ watchman/integration/eden/test_eden_pathgen.py | 2 ++ watchman/integration/eden/test_eden_query.py | 2 ++ watchman/integration/eden/test_eden_scm.py | 2 ++ watchman/integration/eden/test_eden_sha1.py | 2 ++ watchman/integration/eden/test_eden_since.py | 2 ++ watchman/integration/eden/test_eden_subscribe.py | 2 ++ watchman/integration/eden/test_eden_unmount.py | 2 ++ watchman/integration/eden/test_eden_watch_parent.py | 2 ++ watchman/integration/eden/test_eden_watch_root.py | 2 ++ watchman/integration/lib/Interrupt.py | 2 ++ watchman/integration/lib/TempDir.py | 2 ++ watchman/integration/lib/WatchmanEdenTestCase.py | 2 ++ watchman/integration/lib/WatchmanInstance.py | 2 ++ watchman/integration/lib/WatchmanSCMTestCase.py | 2 ++ watchman/integration/lib/WatchmanTestCase.py | 2 ++ watchman/integration/lib/__init__.py | 2 ++ watchman/integration/lib/node.py | 2 ++ watchman/integration/lib/path_utils.py | 2 ++ watchman/integration/test_absroot.py | 2 ++ watchman/integration/test_age_file.py | 2 ++ watchman/integration/test_age_watch.py | 2 ++ watchman/integration/test_auth.py | 2 ++ watchman/integration/test_big.py | 2 ++ watchman/integration/test_big_file.py | 2 ++ watchman/integration/test_bsdish.py | 2 ++ watchman/integration/test_bser_cli.py | 2 ++ watchman/integration/test_bulkstat.py | 2 ++ watchman/integration/test_capabilities.py | 2 ++ watchman/integration/test_case_sensitive.py | 2 ++ watchman/integration/test_clock.py | 2 ++ watchman/integration/test_command.py | 2 ++ watchman/integration/test_content_hash.py | 2 ++ watchman/integration/test_cookie.py | 2 ++ watchman/integration/test_cppclient.py | 2 ++ watchman/integration/test_cursor.py | 2 ++ watchman/integration/test_dir_move.py | 2 ++ watchman/integration/test_dirname.py | 2 ++ watchman/integration/test_empty.py | 2 ++ watchman/integration/test_fields.py | 2 ++ watchman/integration/test_find.py | 2 ++ watchman/integration/test_fishy.py | 2 ++ watchman/integration/test_force_recrawl.py | 2 ++ watchman/integration/test_fork.py | 2 ++ watchman/integration/test_fsevents_resync.py | 2 ++ watchman/integration/test_fstype.py | 2 ++ watchman/integration/test_glob.py | 2 ++ watchman/integration/test_ignore.py | 2 ++ watchman/integration/test_info.py | 2 ++ watchman/integration/test_invalid_expr.py | 2 ++ watchman/integration/test_invalid_watchmanconfig.py | 2 ++ watchman/integration/test_kqueue_and_fsevents_recrawl.py | 2 ++ watchman/integration/test_local_saved_state.py | 2 ++ watchman/integration/test_log.py | 2 ++ watchman/integration/test_match.py | 2 ++ watchman/integration/test_name.py | 2 ++ watchman/integration/test_nice.py | 2 ++ watchman/integration/test_nodejs.py | 2 ++ watchman/integration/test_path_generator.py | 2 ++ watchman/integration/test_pcre.py | 2 ++ watchman/integration/test_perms.py | 2 ++ watchman/integration/test_remove.py | 2 ++ watchman/integration/test_remove_then_add.py | 2 ++ watchman/integration/test_request_id.py | 2 ++ watchman/integration/test_restrictions.py | 2 ++ watchman/integration/test_saved_state.py | 2 ++ watchman/integration/test_scm.py | 2 ++ watchman/integration/test_since.py | 2 ++ watchman/integration/test_since_term.py | 2 ++ watchman/integration/test_site_spawn.py | 2 ++ watchman/integration/test_size.py | 2 ++ watchman/integration/test_sock_perms.py | 2 ++ watchman/integration/test_subscribe.py | 2 ++ watchman/integration/test_suffix.py | 2 ++ watchman/integration/test_suffix_generator.py | 2 ++ watchman/integration/test_trigger.py | 2 ++ watchman/integration/test_trigger_chdir.py | 2 ++ watchman/integration/test_trigger_error.py | 2 ++ watchman/integration/test_two_deep.py | 2 ++ watchman/integration/test_type.py | 2 ++ watchman/integration/test_watch_del_all.py | 2 ++ watchman/integration/test_watch_project.py | 2 ++ watchman/integration/test_wm_wait.py | 2 ++ 84 files changed, 168 insertions(+) diff --git a/watchman/integration/eden/test_eden_glob_upper_bound.py b/watchman/integration/eden/test_eden_glob_upper_bound.py index ef76cc0eb72e..0e7c7710b476 100644 --- a/watchman/integration/eden/test_eden_glob_upper_bound.py +++ b/watchman/integration/eden/test_eden_glob_upper_bound.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import json import re diff --git a/watchman/integration/eden/test_eden_journal.py b/watchman/integration/eden/test_eden_journal.py index 6f7fa693bb70..66f7ba010aa7 100644 --- a/watchman/integration/eden/test_eden_journal.py +++ b/watchman/integration/eden/test_eden_journal.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import time from os import path diff --git a/watchman/integration/eden/test_eden_pathgen.py b/watchman/integration/eden/test_eden_pathgen.py index fc980dfe1e84..9efcd8a4b047 100644 --- a/watchman/integration/eden/test_eden_pathgen.py +++ b/watchman/integration/eden/test_eden_pathgen.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/eden/test_eden_query.py b/watchman/integration/eden/test_eden_query.py index 7d6106db5ead..b78b3ee1ee85 100644 --- a/watchman/integration/eden/test_eden_query.py +++ b/watchman/integration/eden/test_eden_query.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + from watchman.integration.lib import WatchmanEdenTestCase diff --git a/watchman/integration/eden/test_eden_scm.py b/watchman/integration/eden/test_eden_scm.py index 413c9b374eb2..240c7d08e86d 100644 --- a/watchman/integration/eden/test_eden_scm.py +++ b/watchman/integration/eden/test_eden_scm.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + from watchman.integration.lib import WatchmanEdenTestCase from watchman.integration.lib.WatchmanSCMTestCase import HgMixin diff --git a/watchman/integration/eden/test_eden_sha1.py b/watchman/integration/eden/test_eden_sha1.py index eb3498798775..d6445fdd3fca 100644 --- a/watchman/integration/eden/test_eden_sha1.py +++ b/watchman/integration/eden/test_eden_sha1.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import hashlib import os diff --git a/watchman/integration/eden/test_eden_since.py b/watchman/integration/eden/test_eden_since.py index 3730f3272eeb..4cccb0b1d8a1 100644 --- a/watchman/integration/eden/test_eden_since.py +++ b/watchman/integration/eden/test_eden_since.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import json import os diff --git a/watchman/integration/eden/test_eden_subscribe.py b/watchman/integration/eden/test_eden_subscribe.py index 12568510dc42..423c85072e69 100644 --- a/watchman/integration/eden/test_eden_subscribe.py +++ b/watchman/integration/eden/test_eden_subscribe.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/eden/test_eden_unmount.py b/watchman/integration/eden/test_eden_unmount.py index 51a7b32c2e5a..f812561de67c 100644 --- a/watchman/integration/eden/test_eden_unmount.py +++ b/watchman/integration/eden/test_eden_unmount.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import pywatchman from watchman.integration.lib import WatchmanEdenTestCase diff --git a/watchman/integration/eden/test_eden_watch_parent.py b/watchman/integration/eden/test_eden_watch_parent.py index fe009b3c75d9..75056f213558 100644 --- a/watchman/integration/eden/test_eden_watch_parent.py +++ b/watchman/integration/eden/test_eden_watch_parent.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/eden/test_eden_watch_root.py b/watchman/integration/eden/test_eden_watch_root.py index a01f2b40961c..07e710102045 100644 --- a/watchman/integration/eden/test_eden_watch_root.py +++ b/watchman/integration/eden/test_eden_watch_root.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/lib/Interrupt.py b/watchman/integration/lib/Interrupt.py index c39331001be6..83973359c26b 100644 --- a/watchman/integration/lib/Interrupt.py +++ b/watchman/integration/lib/Interrupt.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + interrupted = False diff --git a/watchman/integration/lib/TempDir.py b/watchman/integration/lib/TempDir.py index 2e4a167fcfae..df79aea1e9dc 100644 --- a/watchman/integration/lib/TempDir.py +++ b/watchman/integration/lib/TempDir.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import atexit import errno diff --git a/watchman/integration/lib/WatchmanEdenTestCase.py b/watchman/integration/lib/WatchmanEdenTestCase.py index 2221a1c815a6..60ea7205c5ec 100644 --- a/watchman/integration/lib/WatchmanEdenTestCase.py +++ b/watchman/integration/lib/WatchmanEdenTestCase.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + # no unicode literals import os diff --git a/watchman/integration/lib/WatchmanInstance.py b/watchman/integration/lib/WatchmanInstance.py index 7c4b98ae12f8..3224bddb8376 100644 --- a/watchman/integration/lib/WatchmanInstance.py +++ b/watchman/integration/lib/WatchmanInstance.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import atexit import hashlib diff --git a/watchman/integration/lib/WatchmanSCMTestCase.py b/watchman/integration/lib/WatchmanSCMTestCase.py index 5062e32f2330..471cfaeb7db4 100644 --- a/watchman/integration/lib/WatchmanSCMTestCase.py +++ b/watchman/integration/lib/WatchmanSCMTestCase.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import subprocess diff --git a/watchman/integration/lib/WatchmanTestCase.py b/watchman/integration/lib/WatchmanTestCase.py index 2de3e6ead460..c0a5de7d405f 100644 --- a/watchman/integration/lib/WatchmanTestCase.py +++ b/watchman/integration/lib/WatchmanTestCase.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import errno import functools diff --git a/watchman/integration/lib/__init__.py b/watchman/integration/lib/__init__.py index d1c14a29f4c0..52881297a8dc 100644 --- a/watchman/integration/lib/__init__.py +++ b/watchman/integration/lib/__init__.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os.path if "WATCHMAN_INTEGRATION_HELPERS" in os.environ: diff --git a/watchman/integration/lib/node.py b/watchman/integration/lib/node.py index 0e0756199065..d360e8b1ddab 100644 --- a/watchman/integration/lib/node.py +++ b/watchman/integration/lib/node.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import distutils.spawn import os import subprocess diff --git a/watchman/integration/lib/path_utils.py b/watchman/integration/lib/path_utils.py index 7f7d6cb527be..4f64bf426f71 100644 --- a/watchman/integration/lib/path_utils.py +++ b/watchman/integration/lib/path_utils.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import ctypes import os diff --git a/watchman/integration/test_absroot.py b/watchman/integration/test_absroot.py index 149d5015af48..abee2aa6aa44 100644 --- a/watchman/integration/test_absroot.py +++ b/watchman/integration/test_absroot.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import os.path diff --git a/watchman/integration/test_age_file.py b/watchman/integration/test_age_file.py index a3ff0bf32637..b3e5e98c7f35 100644 --- a/watchman/integration/test_age_file.py +++ b/watchman/integration/test_age_file.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import os.path diff --git a/watchman/integration/test_age_watch.py b/watchman/integration/test_age_watch.py index 069e2f04cbbc..79d6ba43c63d 100644 --- a/watchman/integration/test_age_watch.py +++ b/watchman/integration/test_age_watch.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import json import os diff --git a/watchman/integration/test_auth.py b/watchman/integration/test_auth.py index c75f64a24369..2913d311a1c6 100644 --- a/watchman/integration/test_auth.py +++ b/watchman/integration/test_auth.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import pywatchman from watchman.integration.lib import WatchmanTestCase diff --git a/watchman/integration/test_big.py b/watchman/integration/test_big.py index ae77c49f398f..cf3d7f6d877e 100644 --- a/watchman/integration/test_big.py +++ b/watchman/integration/test_big.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os from typing import List diff --git a/watchman/integration/test_big_file.py b/watchman/integration/test_big_file.py index 86deeb86d81b..3bc65b06c99c 100644 --- a/watchman/integration/test_big_file.py +++ b/watchman/integration/test_big_file.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import os.path diff --git a/watchman/integration/test_bsdish.py b/watchman/integration/test_bsdish.py index 81cde8bbad24..c95205d4e16f 100644 --- a/watchman/integration/test_bsdish.py +++ b/watchman/integration/test_bsdish.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/test_bser_cli.py b/watchman/integration/test_bser_cli.py index 0502a5a7646f..4dfa1811c95d 100644 --- a/watchman/integration/test_bser_cli.py +++ b/watchman/integration/test_bser_cli.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import binascii import json diff --git a/watchman/integration/test_bulkstat.py b/watchman/integration/test_bulkstat.py index a756301b63c4..1e75be3ba38c 100644 --- a/watchman/integration/test_bulkstat.py +++ b/watchman/integration/test_bulkstat.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + from watchman.integration.lib import WatchmanInstance, WatchmanTestCase diff --git a/watchman/integration/test_capabilities.py b/watchman/integration/test_capabilities.py index d315d2d55904..098e6a6cb875 100644 --- a/watchman/integration/test_capabilities.py +++ b/watchman/integration/test_capabilities.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import sys diff --git a/watchman/integration/test_case_sensitive.py b/watchman/integration/test_case_sensitive.py index 8bfc1f82df8a..cba071d6f749 100644 --- a/watchman/integration/test_case_sensitive.py +++ b/watchman/integration/test_case_sensitive.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/test_clock.py b/watchman/integration/test_clock.py index 620596bcbc6c..2e88bf9faca9 100644 --- a/watchman/integration/test_clock.py +++ b/watchman/integration/test_clock.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + from watchman.integration.lib import WatchmanTestCase diff --git a/watchman/integration/test_command.py b/watchman/integration/test_command.py index 6bca8c6d4d59..2fd885e43620 100644 --- a/watchman/integration/test_command.py +++ b/watchman/integration/test_command.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import json diff --git a/watchman/integration/test_content_hash.py b/watchman/integration/test_content_hash.py index 7e57541b0cdb..d96784e0b089 100644 --- a/watchman/integration/test_content_hash.py +++ b/watchman/integration/test_content_hash.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import hashlib import json diff --git a/watchman/integration/test_cookie.py b/watchman/integration/test_cookie.py index 0937d1957592..d8974b94a2b3 100644 --- a/watchman/integration/test_cookie.py +++ b/watchman/integration/test_cookie.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import socket diff --git a/watchman/integration/test_cppclient.py b/watchman/integration/test_cppclient.py index 545a2839f7a2..20a95164e792 100644 --- a/watchman/integration/test_cppclient.py +++ b/watchman/integration/test_cppclient.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import os.path import signal diff --git a/watchman/integration/test_cursor.py b/watchman/integration/test_cursor.py index 4421d06bcdf7..b0efa88b37e2 100644 --- a/watchman/integration/test_cursor.py +++ b/watchman/integration/test_cursor.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/test_dir_move.py b/watchman/integration/test_dir_move.py index a9757c4f67aa..07058c7ca44d 100644 --- a/watchman/integration/test_dir_move.py +++ b/watchman/integration/test_dir_move.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import os.path diff --git a/watchman/integration/test_dirname.py b/watchman/integration/test_dirname.py index 77667923ce8c..3f8d77accc03 100644 --- a/watchman/integration/test_dirname.py +++ b/watchman/integration/test_dirname.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/test_empty.py b/watchman/integration/test_empty.py index a215434df40d..ebd572bbe00e 100644 --- a/watchman/integration/test_empty.py +++ b/watchman/integration/test_empty.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/test_fields.py b/watchman/integration/test_fields.py index 4b10ff765612..e8df1a15358a 100644 --- a/watchman/integration/test_fields.py +++ b/watchman/integration/test_fields.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/test_find.py b/watchman/integration/test_find.py index 313ec790438c..c4ca17fa819e 100644 --- a/watchman/integration/test_find.py +++ b/watchman/integration/test_find.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import os.path diff --git a/watchman/integration/test_fishy.py b/watchman/integration/test_fishy.py index 8c2ae8888c6b..214b956f9583 100644 --- a/watchman/integration/test_fishy.py +++ b/watchman/integration/test_fishy.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import subprocess import sys diff --git a/watchman/integration/test_force_recrawl.py b/watchman/integration/test_force_recrawl.py index e7f9a70891b7..12846bd831b6 100644 --- a/watchman/integration/test_force_recrawl.py +++ b/watchman/integration/test_force_recrawl.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/test_fork.py b/watchman/integration/test_fork.py index c70ff2a816b0..ca0eb9d50c90 100644 --- a/watchman/integration/test_fork.py +++ b/watchman/integration/test_fork.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/test_fsevents_resync.py b/watchman/integration/test_fsevents_resync.py index 5ab7d0ece01a..bb7883026b61 100644 --- a/watchman/integration/test_fsevents_resync.py +++ b/watchman/integration/test_fsevents_resync.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import json import os diff --git a/watchman/integration/test_fstype.py b/watchman/integration/test_fstype.py index a26c88f8d9d1..ba75162fdee4 100644 --- a/watchman/integration/test_fstype.py +++ b/watchman/integration/test_fstype.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import pywatchman from watchman.integration.lib import WatchmanInstance, WatchmanTestCase diff --git a/watchman/integration/test_glob.py b/watchman/integration/test_glob.py index 37b3ca7c8f00..a22f489642ee 100644 --- a/watchman/integration/test_glob.py +++ b/watchman/integration/test_glob.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import os.path diff --git a/watchman/integration/test_ignore.py b/watchman/integration/test_ignore.py index 5a9aa053b596..bef7a2d70e64 100644 --- a/watchman/integration/test_ignore.py +++ b/watchman/integration/test_ignore.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import json import os diff --git a/watchman/integration/test_info.py b/watchman/integration/test_info.py index 9d720ce593e6..9d4201896d9e 100644 --- a/watchman/integration/test_info.py +++ b/watchman/integration/test_info.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import json import os diff --git a/watchman/integration/test_invalid_expr.py b/watchman/integration/test_invalid_expr.py index 2a976789799a..d6d46fd48406 100644 --- a/watchman/integration/test_invalid_expr.py +++ b/watchman/integration/test_invalid_expr.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import pywatchman from watchman.integration.lib import WatchmanTestCase diff --git a/watchman/integration/test_invalid_watchmanconfig.py b/watchman/integration/test_invalid_watchmanconfig.py index 56140add294e..d0d8b98f7981 100644 --- a/watchman/integration/test_invalid_watchmanconfig.py +++ b/watchman/integration/test_invalid_watchmanconfig.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/test_kqueue_and_fsevents_recrawl.py b/watchman/integration/test_kqueue_and_fsevents_recrawl.py index ce1fd92fe60a..447e8bbe29b3 100644 --- a/watchman/integration/test_kqueue_and_fsevents_recrawl.py +++ b/watchman/integration/test_kqueue_and_fsevents_recrawl.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import os.path diff --git a/watchman/integration/test_local_saved_state.py b/watchman/integration/test_local_saved_state.py index 3bf11229912a..573c466a84c3 100644 --- a/watchman/integration/test_local_saved_state.py +++ b/watchman/integration/test_local_saved_state.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/test_log.py b/watchman/integration/test_log.py index bf84d3c29c87..5af616acd812 100644 --- a/watchman/integration/test_log.py +++ b/watchman/integration/test_log.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import pywatchman from watchman.integration.lib import WatchmanTestCase diff --git a/watchman/integration/test_match.py b/watchman/integration/test_match.py index 5b17c5e8452c..6ff742b1de07 100644 --- a/watchman/integration/test_match.py +++ b/watchman/integration/test_match.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import os.path diff --git a/watchman/integration/test_name.py b/watchman/integration/test_name.py index 71b88eaa832d..4f80fc7350bb 100644 --- a/watchman/integration/test_name.py +++ b/watchman/integration/test_name.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/test_nice.py b/watchman/integration/test_nice.py index 6962fe9100a4..1d199f3c37dd 100644 --- a/watchman/integration/test_nice.py +++ b/watchman/integration/test_nice.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import sys diff --git a/watchman/integration/test_nodejs.py b/watchman/integration/test_nodejs.py index de281b83de08..e8edc8f618bd 100644 --- a/watchman/integration/test_nodejs.py +++ b/watchman/integration/test_nodejs.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import distutils.spawn import glob diff --git a/watchman/integration/test_path_generator.py b/watchman/integration/test_path_generator.py index 8d15e2f08481..e5cbd05326ef 100644 --- a/watchman/integration/test_path_generator.py +++ b/watchman/integration/test_path_generator.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/test_pcre.py b/watchman/integration/test_pcre.py index f11721660a7f..d02ef953170c 100644 --- a/watchman/integration/test_pcre.py +++ b/watchman/integration/test_pcre.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import pywatchman from watchman.integration.lib import WatchmanTestCase diff --git a/watchman/integration/test_perms.py b/watchman/integration/test_perms.py index 71469d77b0f5..b4f1147b059c 100644 --- a/watchman/integration/test_perms.py +++ b/watchman/integration/test_perms.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import unittest diff --git a/watchman/integration/test_remove.py b/watchman/integration/test_remove.py index 20d72c494fda..17e5bf7079bf 100644 --- a/watchman/integration/test_remove.py +++ b/watchman/integration/test_remove.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import shutil diff --git a/watchman/integration/test_remove_then_add.py b/watchman/integration/test_remove_then_add.py index 126b8c0320aa..1b6960609fa0 100644 --- a/watchman/integration/test_remove_then_add.py +++ b/watchman/integration/test_remove_then_add.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import shutil diff --git a/watchman/integration/test_request_id.py b/watchman/integration/test_request_id.py index b47bcf121317..ffa7ee56521b 100644 --- a/watchman/integration/test_request_id.py +++ b/watchman/integration/test_request_id.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import errno import os diff --git a/watchman/integration/test_restrictions.py b/watchman/integration/test_restrictions.py index 1d97a6ce93ff..a181ae5cfb3c 100644 --- a/watchman/integration/test_restrictions.py +++ b/watchman/integration/test_restrictions.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/test_saved_state.py b/watchman/integration/test_saved_state.py index 4019222aed13..db37a0f17937 100644 --- a/watchman/integration/test_saved_state.py +++ b/watchman/integration/test_saved_state.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import pywatchman from watchman.integration.lib import WatchmanSCMTestCase, WatchmanTestCase diff --git a/watchman/integration/test_scm.py b/watchman/integration/test_scm.py index bd8c69cdb219..38d43aa84535 100644 --- a/watchman/integration/test_scm.py +++ b/watchman/integration/test_scm.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import unittest diff --git a/watchman/integration/test_since.py b/watchman/integration/test_since.py index bb7a02878586..4399121ef31a 100644 --- a/watchman/integration/test_since.py +++ b/watchman/integration/test_since.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import json import os diff --git a/watchman/integration/test_since_term.py b/watchman/integration/test_since_term.py index 74bfd714adeb..546e55029fd2 100644 --- a/watchman/integration/test_since_term.py +++ b/watchman/integration/test_since_term.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import time diff --git a/watchman/integration/test_site_spawn.py b/watchman/integration/test_site_spawn.py index 298327488cb0..6881d7492904 100644 --- a/watchman/integration/test_site_spawn.py +++ b/watchman/integration/test_site_spawn.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import json import os diff --git a/watchman/integration/test_size.py b/watchman/integration/test_size.py index 29854e460f6b..4784d4d5be02 100644 --- a/watchman/integration/test_size.py +++ b/watchman/integration/test_size.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/test_sock_perms.py b/watchman/integration/test_sock_perms.py index d048f1bb849f..42b078bd8e20 100644 --- a/watchman/integration/test_sock_perms.py +++ b/watchman/integration/test_sock_perms.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import random diff --git a/watchman/integration/test_subscribe.py b/watchman/integration/test_subscribe.py index 36ed07e985ca..0a32497e4727 100644 --- a/watchman/integration/test_subscribe.py +++ b/watchman/integration/test_subscribe.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import json import os diff --git a/watchman/integration/test_suffix.py b/watchman/integration/test_suffix.py index df12da475274..0b8783e89aa1 100644 --- a/watchman/integration/test_suffix.py +++ b/watchman/integration/test_suffix.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/test_suffix_generator.py b/watchman/integration/test_suffix_generator.py index 84f7b420dce3..bfc335e7a973 100644 --- a/watchman/integration/test_suffix_generator.py +++ b/watchman/integration/test_suffix_generator.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/test_trigger.py b/watchman/integration/test_trigger.py index 09f40f48cd90..b2eafa7d97f9 100644 --- a/watchman/integration/test_trigger.py +++ b/watchman/integration/test_trigger.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import json import os diff --git a/watchman/integration/test_trigger_chdir.py b/watchman/integration/test_trigger_chdir.py index f0043269c1cb..a624b66f5a3e 100644 --- a/watchman/integration/test_trigger_chdir.py +++ b/watchman/integration/test_trigger_chdir.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import json import os diff --git a/watchman/integration/test_trigger_error.py b/watchman/integration/test_trigger_error.py index 7bd64f7aefc8..2de631cf620c 100644 --- a/watchman/integration/test_trigger_error.py +++ b/watchman/integration/test_trigger_error.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import pywatchman from watchman.integration.lib import WatchmanTestCase diff --git a/watchman/integration/test_two_deep.py b/watchman/integration/test_two_deep.py index 0d25d8f95c44..17102a6368f3 100644 --- a/watchman/integration/test_two_deep.py +++ b/watchman/integration/test_two_deep.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import time diff --git a/watchman/integration/test_type.py b/watchman/integration/test_type.py index e654effd1474..07a1c05952ff 100644 --- a/watchman/integration/test_type.py +++ b/watchman/integration/test_type.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/test_watch_del_all.py b/watchman/integration/test_watch_del_all.py index 161e45447725..0cb7318f2115 100644 --- a/watchman/integration/test_watch_del_all.py +++ b/watchman/integration/test_watch_del_all.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/test_watch_project.py b/watchman/integration/test_watch_project.py index 520d1fd436d9..5e972caad112 100644 --- a/watchman/integration/test_watch_project.py +++ b/watchman/integration/test_watch_project.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os diff --git a/watchman/integration/test_wm_wait.py b/watchman/integration/test_wm_wait.py index 026c5fe5282f..a50edad35a91 100644 --- a/watchman/integration/test_wm_wait.py +++ b/watchman/integration/test_wm_wait.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import os import subprocess From a7c2e97cd981a4911fe0ba7b24dac25df0b42835 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 5 Mar 2024 03:36:19 -0800 Subject: [PATCH 6805/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/a711a7c1e771496cf7fb1cb4c85e530b2cde8dbd https://github.com/facebook/fb303/commit/61218a6d0a8735ee10beceb741f95481b9bfcf5d https://github.com/facebook/fbthrift/commit/970556c490a8a2bc6aff828cfba723815f537997 https://github.com/facebook/folly/commit/0561b260d7a2a8641d2e27b80a0b78de47f629f3 https://github.com/facebook/mvfst/commit/540433e7e0fff6f6d49a7c64f3578c6c3d3694e5 https://github.com/facebook/proxygen/commit/cf2e8bc5d40eb7549c581dba76af67666c7279e5 https://github.com/facebook/wangle/commit/c3da6afc5697d5e8eaa8cefc3f51589610ede3b3 https://github.com/facebook/watchman/commit/924f3495f4694de703b21b886a41f54b3426f3cf https://github.com/facebookexperimental/edencommon/commit/4eb424a3da723868a20498b4069a69734663461f https://github.com/facebookexperimental/rust-shed/commit/7b459c67cddb813ba5983bcf08a9fe9bb1acad26 https://github.com/facebookincubator/fizz/commit/e1b77c7f22507ce5da4cf98f8b16d941a235a4c0 https://github.com/facebookresearch/flsim/commit/6a41f5f25d1ac2aa37857037ece96f0043b18e39 Reviewed By: bigfootjon fbshipit-source-id: 8d650706db41b35b5486720a92959ec6cfae19d5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 80d88f072aed..983bc84e63eb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d010d835186f19b763c39e6aedca974bdc7c6596 +Subproject commit 970556c490a8a2bc6aff828cfba723815f537997 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f7f9998eb6ee..e252804555a0 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 080d2a3b8229d80a93766899242e55b07bcabad1 +Subproject commit 0561b260d7a2a8641d2e27b80a0b78de47f629f3 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7772e6fb8003..3bef413ba0f8 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f1b340f60cd197e74c55a513bd98fb557d00a632 +Subproject commit c3da6afc5697d5e8eaa8cefc3f51589610ede3b3 From 1a20c2036446a11819e55e94462fd18e21b8a0e8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 5 Mar 2024 09:33:47 -0800 Subject: [PATCH 6806/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/cachelib/commit/759166d76f31f20c67a3b9369303938e6d125de5 https://github.com/facebook/fb303/commit/a77ef20277e8e192a2bd9e69a06873ad6d545f32 https://github.com/facebook/fbthrift/commit/f5b7bd02f42b3d641f2b8925d06cc0ddc9085748 https://github.com/facebook/mvfst/commit/22784dc38bff0cbac41e972825c3e0ea6034161b https://github.com/facebook/proxygen/commit/c3379d1c468ad0b70f6d791a00d6fedf4f163c23 https://github.com/facebook/wangle/commit/64999be18544e53e775cca818b3adc7c1ef54745 https://github.com/facebook/watchman/commit/a7c2e97cd981a4911fe0ba7b24dac25df0b42835 https://github.com/facebookexperimental/edencommon/commit/905835009fa9c7ea802eaf7cff2af645f62649b9 https://github.com/facebookexperimental/rust-shed/commit/42bb4e5665fb07f753efa77bddbb62285f26f8bc https://github.com/facebookincubator/fizz/commit/84cc65870765fee799f1d47d6a3c73936493e6d5 Reviewed By: bigfootjon fbshipit-source-id: 8eb8a37db268e4beb73a19b66c219941a2350fce --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 983bc84e63eb..a8daf9e580ac 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 970556c490a8a2bc6aff828cfba723815f537997 +Subproject commit f5b7bd02f42b3d641f2b8925d06cc0ddc9085748 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3bef413ba0f8..3fa816dfd0fa 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c3da6afc5697d5e8eaa8cefc3f51589610ede3b3 +Subproject commit 64999be18544e53e775cca818b3adc7c1ef54745 From 3c8938594fc70a759fbbf3922285df8f8f153d40 Mon Sep 17 00:00:00 2001 From: liuyaoxin Date: Tue, 5 Mar 2024 12:25:41 -0800 Subject: [PATCH 6807/7387] Fix a broken download link of xz Summary: The old download link [xz-5.2.5.tar.gz](https://tukaani.org/xz/xz-5.2.5.tar.gz) is broken, so replace it with a more stable one [xz-5.6.0.tar.gz](https://github.com/tukaani-project/xz/releases/download/v5.6.0/xz-5.6.0.tar.gz). X-link: https://github.com/facebook/folly/pull/2153 Reviewed By: Gownta Differential Revision: D54324964 Pulled By: Orvid fbshipit-source-id: 7ab62323827d724d415bd61c59bf179518a47086 --- build/fbcode_builder/manifests/xz | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/manifests/xz b/build/fbcode_builder/manifests/xz index 0b27ad63cc91..751616b72995 100644 --- a/build/fbcode_builder/manifests/xz +++ b/build/fbcode_builder/manifests/xz @@ -11,12 +11,12 @@ xz xz-devel [download] -url = https://tukaani.org/xz/xz-5.2.5.tar.gz -sha256 = f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10 +url = https://github.com/tukaani-project/xz/releases/download/v5.6.0/xz-5.6.0.tar.gz +sha256 = 0f5c81f14171b74fcc9777d302304d964e63ffc2d7b634ef023a7249d9b5d875 [build] builder = autoconf -subdir = xz-5.2.5 +subdir = xz-5.6.0 [autoconf.args] --disable-shared From 054272ce136d7b6c0cf13d2cc2242d1c57767c21 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 6 Mar 2024 09:31:39 -0800 Subject: [PATCH 6808/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/1178665549517a90ba65546161f667e381a93219 https://github.com/facebook/fbthrift/commit/fd59ac8b29cb3402b375a36239baecb1223b1528 https://github.com/facebook/folly/commit/7182612f946d764089bc8112d3842c0e94e3f58d https://github.com/facebook/mvfst/commit/825d6bf31e4f028f8b3aeac6761be25781709928 https://github.com/facebook/wangle/commit/c570e02a4ba8ee9ab178f9825735992013b5707e https://github.com/facebookexperimental/edencommon/commit/ba11606e10dacc9f438530e742edbb7856cd8254 https://github.com/facebookexperimental/rust-shed/commit/fe16e58a1442b6db185fd7b7ac8771b16307c2ac https://github.com/facebookincubator/fizz/commit/0e83bc4cfed8eb868d043acc236e5db86d2f155a Reviewed By: bigfootjon fbshipit-source-id: 2430cb9098e7982ad6534a660db1a6de7959fe8a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a8daf9e580ac..4485ccef2aca 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f5b7bd02f42b3d641f2b8925d06cc0ddc9085748 +Subproject commit fd59ac8b29cb3402b375a36239baecb1223b1528 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e252804555a0..388d66901f00 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0561b260d7a2a8641d2e27b80a0b78de47f629f3 +Subproject commit 7182612f946d764089bc8112d3842c0e94e3f58d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3fa816dfd0fa..7da3dda545ad 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 64999be18544e53e775cca818b3adc7c1ef54745 +Subproject commit c570e02a4ba8ee9ab178f9825735992013b5707e From 7510f021379415f55b4fb08c4a6583b16b1cad74 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 7 Mar 2024 09:33:14 -0800 Subject: [PATCH 6809/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/a095abf28a7291395502c440476afa170e0fe9ff https://github.com/facebook/fbthrift/commit/6d06eae482bab0eb48661b9e24204d53b9b861b8 https://github.com/facebook/folly/commit/81de68225d97dacb869e75c6595884a750d21949 https://github.com/facebook/mvfst/commit/9e0487544d6e14efc5d3b6a13171f25b1e8a3e16 https://github.com/facebook/wangle/commit/efdf9d2984e097af1fbf91c972759daa008e0c7b https://github.com/facebookexperimental/edencommon/commit/db2b3f77610b854c9c3c6219e7df7555ebeaf140 https://github.com/facebookexperimental/rust-shed/commit/5d45c6ef35fcebbf1c6361235bcbcf47e0a51952 https://github.com/facebookincubator/fizz/commit/563b43b7f121b7ab5125bb84d8479f018191384a Reviewed By: ajb85 fbshipit-source-id: bb43bd00fa03f369218ee24ac98307c1e3f60d68 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4485ccef2aca..51c33afb4266 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit fd59ac8b29cb3402b375a36239baecb1223b1528 +Subproject commit 6d06eae482bab0eb48661b9e24204d53b9b861b8 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 388d66901f00..58db908a8a43 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7182612f946d764089bc8112d3842c0e94e3f58d +Subproject commit 81de68225d97dacb869e75c6595884a750d21949 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7da3dda545ad..177595d18d45 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c570e02a4ba8ee9ab178f9825735992013b5707e +Subproject commit efdf9d2984e097af1fbf91c972759daa008e0c7b From 5372b59a4b55b6f98703ce15c7c47029cefb388c Mon Sep 17 00:00:00 2001 From: Richard Barnes Date: Thu, 7 Mar 2024 10:58:55 -0800 Subject: [PATCH 6810/7387] Remove unused variables in watchman/PDU.cpp Summary: LLVM-15 has a warning `-Wunused-but-set-variable` which we treat as an error because it's so often diagnostic of a code issue. Unused variables can compromise readability or, worse, performance. This diff either (a) removes an unused variable and, possibly, it's associated code, or (b) qualifies the variable with `[[maybe_unused]]`, mostly in cases where the variable _is_ used, but, eg, in an `assert` statement that isn't present in production code. - If you approve of this diff, please use the "Accept & Ship" button :-) Reviewed By: dmm-fb Differential Revision: D54378404 fbshipit-source-id: 2a35a65f6b78a9b37eec4733d0f12b09834b34c8 --- watchman/PDU.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/watchman/PDU.cpp b/watchman/PDU.cpp index 840f5d37c547..8d47556d553d 100644 --- a/watchman/PDU.cpp +++ b/watchman/PDU.cpp @@ -379,8 +379,6 @@ bool PduBuffer::streamN( watchman_stream* stm, json_int_t len, json_error_t* jerr) { - uint32_t total = 0; - if (!output_bytes(buf, rpos)) { snprintf( jerr->text, @@ -426,7 +424,6 @@ bool PduBuffer::streamN( return false; } wpos += r; - total += r; } return true; } From cf9ccd07ac81273aade694ad3ad9fb01bff8b5d1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 8 Mar 2024 09:34:07 -0800 Subject: [PATCH 6811/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/20d9e408756e89beca6f47de59a511a43fa7e8af https://github.com/facebook/fbthrift/commit/9276a0558f206fbf5c79b59d5481f55fce7d4bb9 https://github.com/facebook/folly/commit/69a1b93df285457cd0799a6898e2e5390a09cd73 https://github.com/facebook/mvfst/commit/ebda6b32749165d6b6673a14c28004238c112781 https://github.com/facebook/wangle/commit/361d57783c1af946ab319fdab904f6bc94c71f32 https://github.com/facebookexperimental/edencommon/commit/788762a222523e43a2937640ab1dda8eb7ddeff3 https://github.com/facebookexperimental/rust-shed/commit/2e01a77feb97f64933795360e4c95b10c59cabf4 https://github.com/facebookincubator/fizz/commit/2c1956f91b9bb61a42bbf304d56e2ce5350dc2fe Reviewed By: ajb85 fbshipit-source-id: 051d50b89d847a3df5d9447df8549fabca6dcfeb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 51c33afb4266..86a946eb96e6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6d06eae482bab0eb48661b9e24204d53b9b861b8 +Subproject commit 9276a0558f206fbf5c79b59d5481f55fce7d4bb9 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 58db908a8a43..d33bf655a425 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 81de68225d97dacb869e75c6595884a750d21949 +Subproject commit 69a1b93df285457cd0799a6898e2e5390a09cd73 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 177595d18d45..1b8bf3d3d089 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit efdf9d2984e097af1fbf91c972759daa008e0c7b +Subproject commit 361d57783c1af946ab319fdab904f6bc94c71f32 From fe4f8da3dbc23c8ea83339cc774e619638d8e254 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 9 Mar 2024 09:32:41 -0800 Subject: [PATCH 6812/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/8c04fbdceff0b0dac8071462cf713d132dd6e9a4 https://github.com/facebook/fbthrift/commit/d44d84c3e660163f2b746c4b0af6d3373e12aff4 https://github.com/facebook/folly/commit/213881d77db9d36335ebca18d2d30fcf4c51b2d5 https://github.com/facebook/mvfst/commit/04557a2977322f00543304ca7141783f83294e5d https://github.com/facebook/wangle/commit/3b40d6cd3a9c4a28182e8825ac9d4042468db358 https://github.com/facebookexperimental/edencommon/commit/7b7d3f372e9c92e982ae79ea37bd51a116be5ff6 https://github.com/facebookexperimental/rust-shed/commit/195d9fa2a8de4f4d785e0ac0d9b7452761f70459 https://github.com/facebookincubator/fizz/commit/6ae3a3c5c5dc9aef260291f6f9a9bf32f94159c5 Reviewed By: bigfootjon fbshipit-source-id: 1c6943d500bd70673ff2235348338635578186ed --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 86a946eb96e6..e40919de5eb3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9276a0558f206fbf5c79b59d5481f55fce7d4bb9 +Subproject commit d44d84c3e660163f2b746c4b0af6d3373e12aff4 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d33bf655a425..929394b1d80e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 69a1b93df285457cd0799a6898e2e5390a09cd73 +Subproject commit 213881d77db9d36335ebca18d2d30fcf4c51b2d5 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1b8bf3d3d089..2c7354b7ece0 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 361d57783c1af946ab319fdab904f6bc94c71f32 +Subproject commit 3b40d6cd3a9c4a28182e8825ac9d4042468db358 From 5c88cc3225337ccfe5b9349a34eb19fcf0e4008d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 10 Mar 2024 09:32:07 -0700 Subject: [PATCH 6813/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/33a7bc0f3c890e77cf72bb3d4d854db2b6bced68 https://github.com/facebook/fbthrift/commit/84b8096fe16f47d06de1b273cf5813d3861a1952 https://github.com/facebook/mvfst/commit/57a9c43ae003309d662ae1d58b8ff9601db7c97b https://github.com/facebook/wangle/commit/6552a4228fa95af93b7f7cb73692d39355c785fc https://github.com/facebookexperimental/edencommon/commit/ad9d787f01d16a987818586dd6d772e91049e65a https://github.com/facebookexperimental/rust-shed/commit/d83205251537e18bfbe1e0ccb5d21c985797b5ad https://github.com/facebookincubator/fizz/commit/0ca87b07b95e8bbbf039de12973788a1cb240da9 Reviewed By: bigfootjon fbshipit-source-id: 21af241151ceee05fdc5f1e0581fb1146e40f471 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e40919de5eb3..97c3c78e42a3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d44d84c3e660163f2b746c4b0af6d3373e12aff4 +Subproject commit 84b8096fe16f47d06de1b273cf5813d3861a1952 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2c7354b7ece0..8bb885b8360b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3b40d6cd3a9c4a28182e8825ac9d4042468db358 +Subproject commit 6552a4228fa95af93b7f7cb73692d39355c785fc From 568512e8baadbb6f9e68789d7de62b9ed4d9e41f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 11 Mar 2024 09:32:17 -0700 Subject: [PATCH 6814/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/b05a1586978514896763951dab503dd492ac6769 https://github.com/facebook/fbthrift/commit/74cfb013c6e389341339b72cac40d56dcf8ed4a8 https://github.com/facebook/mvfst/commit/ce26554e3c00f58689452d9e483d83ebd5487694 https://github.com/facebook/wangle/commit/e53fbcc0bb8fa68c3bf1568749f608d089f28986 https://github.com/facebookexperimental/rust-shed/commit/cd3930fc4cfad02a9764b3e930e55a17472295eb Reviewed By: jailby fbshipit-source-id: a466e4f991d9a88a8d0adf4395b4894834edd535 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 97c3c78e42a3..dfa5d0d9ba54 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 84b8096fe16f47d06de1b273cf5813d3861a1952 +Subproject commit 74cfb013c6e389341339b72cac40d56dcf8ed4a8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8bb885b8360b..8598284198fe 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6552a4228fa95af93b7f7cb73692d39355c785fc +Subproject commit e53fbcc0bb8fa68c3bf1568749f608d089f28986 From 8d9b8c1a02b7d311e5b628b06dc879d0837af85c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 12 Mar 2024 09:32:17 -0700 Subject: [PATCH 6815/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/54e2c22ab5e9b97f7c59fea35a853d63e11914e7 https://github.com/facebook/fbthrift/commit/a136de5870d073cf612be2b4b28414142aa88151 https://github.com/facebook/folly/commit/b1273aac09cb7c56248990110734ec0e5b47070a https://github.com/facebook/mvfst/commit/9df65b1a3b494965d3d21dd9940e050d2a2fc382 https://github.com/facebookexperimental/edencommon/commit/ce9e03bcbcacade7d234b1463bed1a515d7f49d7 https://github.com/facebookexperimental/rust-shed/commit/d827e25822b286f1b60b1d341dfeba1493e206a9 Reviewed By: jailby fbshipit-source-id: 089784e0b4614443d3754b7e961f0e0640b95038 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index dfa5d0d9ba54..d8dbccfbbd22 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 74cfb013c6e389341339b72cac40d56dcf8ed4a8 +Subproject commit a136de5870d073cf612be2b4b28414142aa88151 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 929394b1d80e..afdb8a36ecf2 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 213881d77db9d36335ebca18d2d30fcf4c51b2d5 +Subproject commit b1273aac09cb7c56248990110734ec0e5b47070a From 967e289d59380f2c573808b133523d9d9d65f99e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 13 Mar 2024 09:47:14 -0700 Subject: [PATCH 6816/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/492d431e7d17209bf213a9aebdff0b738cfd44a3 https://github.com/facebook/fbthrift/commit/49cc53da2c5924c913d88bcb0a3d4cf5f11f1cd5 https://github.com/facebook/folly/commit/9e04f6ec044eecc7a5131b6e494635d1cbb125c1 https://github.com/facebook/mvfst/commit/9ecfd23fd00be7219c1d8ffbee9aa9bbb9cf9457 https://github.com/facebook/wangle/commit/d49dbe95890d3c78504bae14f2d8d95302496c61 https://github.com/facebookexperimental/edencommon/commit/9e6f7b0ed31375cca7b0936f887de431d671bcfd https://github.com/facebookexperimental/rust-shed/commit/426e0fdcd58b46cc6de474ec865b8642d2519f88 https://github.com/facebookincubator/fizz/commit/c122b39d42359a61902d337a3a7a0e6207562de6 Reviewed By: jailby fbshipit-source-id: f6d1e2d09542c16cacc90330a8caabcd0d5139b5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d8dbccfbbd22..e6a3dd35e014 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a136de5870d073cf612be2b4b28414142aa88151 +Subproject commit 49cc53da2c5924c913d88bcb0a3d4cf5f11f1cd5 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index afdb8a36ecf2..8eabbeba9ef7 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b1273aac09cb7c56248990110734ec0e5b47070a +Subproject commit 9e04f6ec044eecc7a5131b6e494635d1cbb125c1 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8598284198fe..da462628a1ac 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e53fbcc0bb8fa68c3bf1568749f608d089f28986 +Subproject commit d49dbe95890d3c78504bae14f2d8d95302496c61 From 43cc499008a1c8c541a05582c9354cf6ee4ece1b Mon Sep 17 00:00:00 2001 From: Richard Barnes Date: Wed, 13 Mar 2024 09:52:26 -0700 Subject: [PATCH 6817/7387] Use `nullptr` in vision/vogue/gans/stylegan2-ada-pytorch-main/torch_utils/ops/bias_act.cpp Summary: `nullptr` is preferable to `0` or `NULL`. Let's use it everywhere so we can enable `-Wzero-as-null-pointer-constant`. - If you approve of this diff, please use the "Accept & Ship" button :-) Reviewed By: dmm-fb Differential Revision: D54835554 fbshipit-source-id: a3a162e20eb4a1d4c94053b3d85e16c309d37e9a --- watchman/Clock.cpp | 2 +- watchman/Logging.cpp | 2 +- watchman/SignalHandler.cpp | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/watchman/Clock.cpp b/watchman/Clock.cpp index c06d05341b04..b2b8df45c559 100644 --- a/watchman/Clock.cpp +++ b/watchman/Clock.cpp @@ -21,7 +21,7 @@ void ClockSpec::init() { struct timeval tv; proc_pid = (int)::getpid(); - if (gettimeofday(&tv, NULL) == -1) { + if (gettimeofday(&tv, nullptr) == -1) { logf(FATAL, "gettimeofday failed: {}\n", folly::errnoStr(errno)); } proc_start_time = (uint64_t)tv.tv_sec; diff --git a/watchman/Logging.cpp b/watchman/Logging.cpp index 2a49ec324bd2..e0f717858db2 100644 --- a/watchman/Logging.cpp +++ b/watchman/Logging.cpp @@ -124,7 +124,7 @@ char* Log::timeString(char* buf, size_t bufsize, timeval tv) { char* Log::currentTimeString(char* buf, size_t bufsize) { struct timeval tv; - gettimeofday(&tv, NULL); + gettimeofday(&tv, nullptr); return timeString(buf, bufsize, tv); } diff --git a/watchman/SignalHandler.cpp b/watchman/SignalHandler.cpp index d264af722d18..8606b9c4dd85 100644 --- a/watchman/SignalHandler.cpp +++ b/watchman/SignalHandler.cpp @@ -167,13 +167,13 @@ void setup_signal_handlers() { sa.sa_sigaction = crash_handler; sa.sa_flags = SA_SIGINFO | SA_RESETHAND; - sigaction(SIGSEGV, &sa, NULL); + sigaction(SIGSEGV, &sa, nullptr); #ifdef SIGBUS - sigaction(SIGBUS, &sa, NULL); + sigaction(SIGBUS, &sa, nullptr); #endif - sigaction(SIGFPE, &sa, NULL); - sigaction(SIGILL, &sa, NULL); - sigaction(SIGTERM, &sa, NULL); + sigaction(SIGFPE, &sa, nullptr); + sigaction(SIGILL, &sa, nullptr); + sigaction(SIGTERM, &sa, nullptr); #else // Don't show error dialogs for background service failures SetErrorMode(SEM_FAILCRITICALERRORS); From f626874a5b5f71484d6e6e30fb799715c14bc2d7 Mon Sep 17 00:00:00 2001 From: Richard Barnes Date: Wed, 13 Mar 2024 09:54:12 -0700 Subject: [PATCH 6818/7387] Use `nullptr` in watchman/portability/WinError.cpp Summary: `nullptr` is preferable to `0` or `NULL`. Let's use it everywhere so we can enable `-Wzero-as-null-pointer-constant`. - If you approve of this diff, please use the "Accept & Ship" button :-) Reviewed By: dmm-fb Differential Revision: D54835536 fbshipit-source-id: f7e85888cfb51293d31dac27be864f3dc8f9090c --- watchman/portability/WinError.cpp | 4 ++-- watchman/query/glob.cpp | 2 +- watchman/root/iothread.cpp | 2 +- watchman/root/resolve.cpp | 2 +- watchman/root/watchlist.cpp | 2 +- watchman/test/IgnoreTest.cpp | 4 ++-- watchman/winbuild/susres.cpp | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/watchman/portability/WinError.cpp b/watchman/portability/WinError.cpp index 8b5346ac603b..edf92c6eab46 100644 --- a/watchman/portability/WinError.cpp +++ b/watchman/portability/WinError.cpp @@ -16,12 +16,12 @@ const char* win32_strerror(uint32_t err) { FormatMessageA( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, + nullptr, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), msgbuf, sizeof(msgbuf) - 1, - NULL); + nullptr); return msgbuf; } diff --git a/watchman/query/glob.cpp b/watchman/query/glob.cpp index 9b5713f747c1..5da5e4b87b62 100644 --- a/watchman/query/glob.cpp +++ b/watchman/query/glob.cpp @@ -64,7 +64,7 @@ const char* find_sep_and_specials( ++pattern; } // No separator found - return NULL; + return nullptr; } // Simple brute force lookup of pattern within a node. diff --git a/watchman/root/iothread.cpp b/watchman/root/iothread.cpp index 9520b9542bba..987d9045cbd3 100644 --- a/watchman/root/iothread.cpp +++ b/watchman/root/iothread.cpp @@ -1000,7 +1000,7 @@ void InMemoryView::statPath( watcher_->startWatchFile(file); if (st.isDir()) { - if (dir_ent == NULL) { + if (dir_ent == nullptr) { recursive = true; } else { // Ensure that we believe that this node exists diff --git a/watchman/root/resolve.cpp b/watchman/root/resolve.cpp index 3ed64277369a..4b414574c048 100644 --- a/watchman/root/resolve.cpp +++ b/watchman/root/resolve.cpp @@ -61,7 +61,7 @@ bool root_check_restrict(const char* watch_path) { } static void check_allowed_fs(const char* filename, const w_string& fs_type) { - const char* advice = NULL; + const char* advice = nullptr; // Report this to the log always, as it is helpful in understanding // problem reports diff --git a/watchman/root/watchlist.cpp b/watchman/root/watchlist.cpp index 23218847d453..33340c0f5f86 100644 --- a/watchman/root/watchlist.cpp +++ b/watchman/root/watchlist.cpp @@ -307,7 +307,7 @@ void w_root_free_watched_roots() { if (current == 0) { break; } - if (time(NULL) > started + 3) { + if (time(nullptr) > started + 3) { logf(ERR, "{} roots were still live at exit\n", current); break; } diff --git a/watchman/test/IgnoreTest.cpp b/watchman/test/IgnoreTest.cpp index e0717bb67f54..aaf8099d1706 100644 --- a/watchman/test/IgnoreTest.cpp +++ b/watchman/test/IgnoreTest.cpp @@ -165,13 +165,13 @@ void bench_list(const char* label, const char* prefix) { init_state(&state); auto strings = build_list_with_prefix(prefix, kWordLimit); - gettimeofday(&start, NULL); + gettimeofday(&start, nullptr); for (n = 0; n < 100; n++) { for (i = 0; i < kWordLimit; i++) { state.isIgnored(strings[i].data(), strings[i].size()); } } - gettimeofday(&end, NULL); + gettimeofday(&end, nullptr); XLOG(ERR) << label << ": took " << w_timeval_diff(start, end); } diff --git a/watchman/winbuild/susres.cpp b/watchman/winbuild/susres.cpp index 586086635b5d..cc686912c10a 100644 --- a/watchman/winbuild/susres.cpp +++ b/watchman/winbuild/susres.cpp @@ -20,12 +20,12 @@ const char* win32_strerror(DWORD err) { static char msgbuf[1024]; FormatMessageA( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, + nullptr, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), msgbuf, sizeof(msgbuf) - 1, - NULL); + nullptr); return msgbuf; } From 46f716ed79225467d16579ca635a503f146ea60c Mon Sep 17 00:00:00 2001 From: Srikrishna Gopu Date: Wed, 13 Mar 2024 11:16:31 -0700 Subject: [PATCH 6819/7387] move re2 to use newer version Summary: As titled, move re2 to use newer version. This is required to compile using both c++17 and c++20. Upstream patch that is required to support the compilation - https://fburl.com/3ghdrtra Reviewed By: shri-khare Differential Revision: D54839190 fbshipit-source-id: 564f26f2a8b42d10bce8839dd53f5ee7c14a0a48 --- build/fbcode_builder/manifests/re2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/manifests/re2 b/build/fbcode_builder/manifests/re2 index 945750afd6cb..060f342c1ee1 100644 --- a/build/fbcode_builder/manifests/re2 +++ b/build/fbcode_builder/manifests/re2 @@ -12,9 +12,9 @@ re2 re2-devel [download] -url = https://github.com/google/re2/archive/2019-06-01.tar.gz -sha256 = 02b7d73126bd18e9fbfe5d6375a8bb13fadaf8e99e48cbb062e4500fc18e8e2e +url = https://github.com/google/re2/archive/2020-11-01.tar.gz +sha256 = 8903cc66c9d34c72e2bc91722288ebc7e3ec37787ecfef44d204b2d6281954d7 [build] builder = cmake -subdir = re2-2019-06-01 +subdir = re2-2020-11-01 From b308ecc528a0020a8bbfd64d2d3f5f51ce3d3820 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Wed, 13 Mar 2024 12:57:44 -0700 Subject: [PATCH 6820/7387] Move telemetry from eden to edencommon Summary: To support better telemetry and logging in watchman we want to use Eden's components. Lets migrate and detangle the needed pieces. This change moves telemetry from eden to edencommon. Reviewed By: kmancini Differential Revision: D54814487 fbshipit-source-id: 44a7aa4af2f864e626207e17baee601b7c0a10d0 --- build/fbcode_builder/manifests/edencommon | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/fbcode_builder/manifests/edencommon b/build/fbcode_builder/manifests/edencommon index 772c9407ed9f..e2c1b1167817 100644 --- a/build/fbcode_builder/manifests/edencommon +++ b/build/fbcode_builder/manifests/edencommon @@ -11,6 +11,8 @@ repo_url = https://github.com/facebookexperimental/edencommon.git builder = cmake [dependencies] +fbthrift +fb303 fmt folly gflags From c96807307c5d45c183921ea5e4c2383020904730 Mon Sep 17 00:00:00 2001 From: Richard Barnes Date: Wed, 13 Mar 2024 13:48:06 -0700 Subject: [PATCH 6821/7387] Use `nullptr` in watchman/cmds/debug.cpp Summary: `nullptr` is preferable to `0` or `NULL`. Let's use it everywhere so we can enable `-Wzero-as-null-pointer-constant`. - If you approve of this diff, please use the "Accept & Ship" button :-) Reviewed By: bunnypak Differential Revision: D54835718 fbshipit-source-id: 16863334a399b7623ee04850f2176ab56f73bb97 --- watchman/cmds/debug.cpp | 6 +++--- watchman/cmds/heapprof.cpp | 2 +- watchman/cmds/info.cpp | 4 ++-- watchman/cmds/log.cpp | 6 +++--- watchman/cmds/watch.cpp | 8 ++++++-- watchman/listener-user.cpp | 2 +- watchman/listener.cpp | 12 ++++++------ watchman/main.cpp | 4 ++-- watchman/portability/Backtrace.cpp | 4 ++-- watchman/portability/PosixSpawn.cpp | 8 ++++---- 10 files changed, 30 insertions(+), 26 deletions(-) diff --git a/watchman/cmds/debug.cpp b/watchman/cmds/debug.cpp index 9042616b1339..8a7acb90c221 100644 --- a/watchman/cmds/debug.cpp +++ b/watchman/cmds/debug.cpp @@ -117,7 +117,7 @@ static UntypedResponse cmd_debug_drop_privs(Client* client, const json_ref&) { resp.set("owner", json_boolean(client->client_is_owner)); return resp; } -W_CMD_REG("debug-drop-privs", cmd_debug_drop_privs, CMD_DAEMON, NULL); +W_CMD_REG("debug-drop-privs", cmd_debug_drop_privs, CMD_DAEMON, nullptr); struct DebugSetParallelCrawlCommand : TypedCommand { @@ -391,7 +391,7 @@ static UntypedResponse cmd_debug_watcher_info( response.set("watcher-debug-info", root->view()->getWatcherDebugInfo()); return response; } -W_CMD_REG("debug-watcher-info", cmd_debug_watcher_info, CMD_DAEMON, NULL); +W_CMD_REG("debug-watcher-info", cmd_debug_watcher_info, CMD_DAEMON, nullptr); static UntypedResponse cmd_debug_watcher_info_clear( Client* clientbase, @@ -407,7 +407,7 @@ W_CMD_REG( "debug-watcher-info-clear", cmd_debug_watcher_info_clear, CMD_DAEMON, - NULL); + nullptr); void addCacheStats(UntypedResponse& resp, const CacheStats& stats) { resp.set( diff --git a/watchman/cmds/heapprof.cpp b/watchman/cmds/heapprof.cpp index b6a02f71322c..d30c9dcfc4fb 100644 --- a/watchman/cmds/heapprof.cpp +++ b/watchman/cmds/heapprof.cpp @@ -31,6 +31,6 @@ static UntypedResponse cmd_debug_prof_dump(Client*, const json_ref&) { .c_str())); return resp; } -W_CMD_REG("debug-prof-dump", cmd_debug_prof_dump, CMD_DAEMON, NULL); +W_CMD_REG("debug-prof-dump", cmd_debug_prof_dump, CMD_DAEMON, nullptr); #endif diff --git a/watchman/cmds/info.cpp b/watchman/cmds/info.cpp index 4fa8ada811ba..3ea9c3e15b5e 100644 --- a/watchman/cmds/info.cpp +++ b/watchman/cmds/info.cpp @@ -124,7 +124,7 @@ W_CMD_REG( "list-capabilities", cmd_list_capabilities, CMD_DAEMON | CMD_CLIENT | CMD_ALLOW_ANY_USER, - NULL); + nullptr); /* get-sockname */ static UntypedResponse cmd_get_sockname(Client*, const json_ref&) { @@ -154,7 +154,7 @@ W_CMD_REG( "get-sockname", cmd_get_sockname, CMD_DAEMON | CMD_CLIENT | CMD_ALLOW_ANY_USER, - NULL); + nullptr); static UntypedResponse cmd_get_config(Client* client, const json_ref& args) { if (json_array_size(args) != 2) { diff --git a/watchman/cmds/log.cpp b/watchman/cmds/log.cpp index 0709a11e025f..a3713744e6a8 100644 --- a/watchman/cmds/log.cpp +++ b/watchman/cmds/log.cpp @@ -51,7 +51,7 @@ static UntypedResponse cmd_loglevel(Client* client, const json_ref& args) { resp.set("log_level", json_ref(args.at(1))); return resp; } -W_CMD_REG("log-level", cmd_loglevel, CMD_DAEMON, NULL); +W_CMD_REG("log-level", cmd_loglevel, CMD_DAEMON, nullptr); // log "debug" "text to log" static UntypedResponse cmd_log(Client*, const json_ref& args) { @@ -74,7 +74,7 @@ static UntypedResponse cmd_log(Client*, const json_ref& args) { resp.set("logged", json_true()); return resp; } -W_CMD_REG("log", cmd_log, CMD_DAEMON | CMD_ALLOW_ANY_USER, NULL); +W_CMD_REG("log", cmd_log, CMD_DAEMON | CMD_ALLOW_ANY_USER, nullptr); // change the server log level for the logs static UntypedResponse cmd_global_log_level(Client*, const json_ref& args) { @@ -111,7 +111,7 @@ static UntypedResponse cmd_get_log(Client*, const json_ref& args) { resp.set("log", w_string_to_json(w_string::build(logging::log_name))); return resp; } -W_CMD_REG("get-log", cmd_get_log, CMD_DAEMON | CMD_ALLOW_ANY_USER, NULL); +W_CMD_REG("get-log", cmd_get_log, CMD_DAEMON | CMD_ALLOW_ANY_USER, nullptr); /* vim:ts=2:sw=2:et: */ diff --git a/watchman/cmds/watch.cpp b/watchman/cmds/watch.cpp index 7a61afdb0285..75bf759f9aa7 100644 --- a/watchman/cmds/watch.cpp +++ b/watchman/cmds/watch.cpp @@ -128,7 +128,7 @@ W_CMD_REG( "watch-del-all", cmd_watch_del_all, CMD_DAEMON | CMD_POISON_IMMUNE, - NULL); + nullptr); /* watch-list * Returns a list of watched roots */ @@ -138,7 +138,11 @@ static UntypedResponse cmd_watch_list(Client*, const json_ref&) { resp.set("roots", std::move(root_paths)); return resp; } -W_CMD_REG("watch-list", cmd_watch_list, CMD_DAEMON | CMD_ALLOW_ANY_USER, NULL); +W_CMD_REG( + "watch-list", + cmd_watch_list, + CMD_DAEMON | CMD_ALLOW_ANY_USER, + nullptr); // For each directory component in candidate_dir to the root of the filesystem, // look for root_file. If root_file is present, update relpath to reflect the diff --git a/watchman/listener-user.cpp b/watchman/listener-user.cpp index 08c920d27a6e..2607676d1d8a 100644 --- a/watchman/listener-user.cpp +++ b/watchman/listener-user.cpp @@ -30,7 +30,7 @@ W_CMD_REG( "shutdown-server", cmd_shutdown, CMD_DAEMON | CMD_POISON_IMMUNE, - NULL); + nullptr); void add_root_warnings_to_response( UntypedResponse& response, diff --git a/watchman/listener.cpp b/watchman/listener.cpp index 70746fe7ce6c..43ca76bcb075 100644 --- a/watchman/listener.cpp +++ b/watchman/listener.cpp @@ -167,7 +167,7 @@ static void named_pipe_accept_loop_internal( std::shared_ptr listener_event) { HANDLE handles[2]; auto olap = OVERLAPPED(); - HANDLE connected_event = CreateEvent(NULL, FALSE, TRUE, NULL); + HANDLE connected_event = CreateEvent(nullptr, FALSE, TRUE, nullptr); auto path = get_named_pipe_sock_path(); if (!connected_event) { @@ -390,7 +390,7 @@ bool w_start_listener() { size_t len; len = sizeof(maxperproc); - sysctl(mib, 2, &maxperproc, &len, NULL, 0); + sysctl(mib, 2, &maxperproc, &len, nullptr, 0); logf( ERR, "file limit is {} kern.maxfilesperproc={}\n", @@ -442,13 +442,13 @@ bool w_start_listener() { memset(&sa, 0, sizeof(sa)); sa.sa_handler = [](int) {}; sa.sa_flags = 0; - sigaction(SIGUSR1, &sa, NULL); - sigaction(SIGCHLD, &sa, NULL); + sigaction(SIGUSR1, &sa, nullptr); + sigaction(SIGCHLD, &sa, nullptr); // Block SIGCHLD everywhere sigemptyset(&sigset); sigaddset(&sigset, SIGCHLD); - sigprocmask(SIG_BLOCK, &sigset, NULL); + sigprocmask(SIG_BLOCK, &sigset, nullptr); #endif // TODO: We are trying out folly signal handling on Linux. Eventually we // should remove this if and use folly signal handling on all platforms. @@ -555,7 +555,7 @@ static UntypedResponse cmd_get_pid(Client*, const json_ref&) { resp.set("pid", json_integer(::getpid())); return resp; } -W_CMD_REG("get-pid", cmd_get_pid, CMD_DAEMON, NULL); +W_CMD_REG("get-pid", cmd_get_pid, CMD_DAEMON, nullptr); /* vim:ts=2:sw=2:et: */ diff --git a/watchman/main.cpp b/watchman/main.cpp index edcc3bff2d83..8775fafdcbcb 100644 --- a/watchman/main.cpp +++ b/watchman/main.cpp @@ -194,7 +194,7 @@ std::optional detect_starting_command(pid_t ppid) { sigemptyset(&sigset); sigaddset(&sigset, SIGCHLD); - sigprocmask(SIG_BLOCK, &sigset, NULL); + sigprocmask(SIG_BLOCK, &sigset, nullptr); } #endif @@ -350,7 +350,7 @@ static SpawnResult run_service_as_daemon() { #ifdef _WIN32 static SpawnResult spawn_win32(const std::vector& daemon_argv) { char module_name[WATCHMAN_NAME_MAX]; - GetModuleFileName(NULL, module_name, sizeof(module_name)); + GetModuleFileName(nullptr, module_name, sizeof(module_name)); ChildProcess::Options opts; opts.setFlags(POSIX_SPAWN_SETPGROUP); diff --git a/watchman/portability/Backtrace.cpp b/watchman/portability/Backtrace.cpp index 9bb402fed9ef..a916173b826a 100644 --- a/watchman/portability/Backtrace.cpp +++ b/watchman/portability/Backtrace.cpp @@ -40,7 +40,7 @@ static constexpr size_t kMaxSymbolLen = 4096; static void sym_init() { proc = GetCurrentProcess(); - SymInitialize(proc, NULL, TRUE); + SymInitialize(proc, nullptr, TRUE); SymSetOptions( SYMOPT_LOAD_LINES | SYMOPT_FAIL_CRITICAL_ERRORS | SYMOPT_NO_PROMPTS | SYMOPT_UNDNAME); @@ -50,7 +50,7 @@ size_t backtrace(void** frames, size_t n_frames) { std::call_once(sym_init_once, sym_init); // Skip the first three frames; they're always going to show // w_log, log_stack_trace and backtrace - return CaptureStackBackTrace(3, (DWORD)n_frames, frames, NULL); + return CaptureStackBackTrace(3, (DWORD)n_frames, frames, nullptr); } char** backtrace_symbols(void** array, size_t n_frames) { diff --git a/watchman/portability/PosixSpawn.cpp b/watchman/portability/PosixSpawn.cpp index a12c1c3b0232..6185e1b86115 100644 --- a/watchman/portability/PosixSpawn.cpp +++ b/watchman/portability/PosixSpawn.cpp @@ -71,7 +71,7 @@ int posix_spawnattr_getflags(posix_spawnattr_t* attrp, short* flags) { } int posix_spawnattr_setcwd_np(posix_spawnattr_t* attrp, const char* path) { - char* path_dup = NULL; + char* path_dup = nullptr; if (path) { path_dup = strdup(path); @@ -178,18 +178,18 @@ int posix_spawn_file_actions_destroy(posix_spawn_file_actions_t* actions) { static char* build_command_line(char* const argv[]) { int argc = 0, i = 0; size_t size = 0; - char *cmdbuf = NULL, *cur = NULL; + char *cmdbuf = nullptr, *cur = nullptr; // Note: includes trailing NUL which we count as the closing quote size = sizeof(CMD_EXE_PREFIX); - for (argc = 0; argv[argc] != NULL; argc++) { + for (argc = 0; argv[argc] != nullptr; argc++) { size += 4 * (strlen(argv[argc]) + 1); } cmdbuf = (char*)malloc(size); if (!cmdbuf) { - return NULL; + return nullptr; } // Here be dragons. More gory details in http://stackoverflow.com/q/4094699 From af33c063894e614ef3fadaf0bcf8046d10ffa894 Mon Sep 17 00:00:00 2001 From: Kevin Hui Date: Wed, 13 Mar 2024 16:43:00 -0700 Subject: [PATCH 6822/7387] Upgrade to v0.3.26 Summary: Updating `structopt` to `v0.3.26` since `snphost` in D51869681 has a dependency on a more recent version Reviewed By: cfsmp3 Differential Revision: D52708468 fbshipit-source-id: 53a4c9917fd2e7b6adf701d3825d80dde3efd7f6 --- watchman/cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index 5af5d0849b87..94dc14eea5d7 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -15,7 +15,7 @@ duct = "0.13.6" jwalk = "0.6" serde = { version = "1.0.185", features = ["derive", "rc"] } serde_json = { version = "1.0.100", features = ["float_roundtrip", "unbounded_depth"] } -structopt = "0.3.23" +structopt = "0.3.26" sysinfo = "0.26.8" tabular = "0.2.0" tokio = { version = "1.29.1", features = ["full", "test-util", "tracing"] } From 09f390a34d5a121dda322df780bdbd1c13ceb58d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 14 Mar 2024 09:34:53 -0700 Subject: [PATCH 6823/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/5204e6639c5af50e71cfbb33c56b4d18e2da0660 https://github.com/facebook/fbthrift/commit/0495a5fa49c63be9640ad3b3c0915fbce09ec5dd https://github.com/facebook/folly/commit/81613b81915b8b6637ea3f61feb7db63a45b8f83 https://github.com/facebook/mvfst/commit/a55625f50841b32f05f911a5407406d6718cb3bf https://github.com/facebook/wangle/commit/8638b104ebc216d8de2169bcc8d7ebc09628b52c https://github.com/facebookexperimental/edencommon/commit/5f7a673ac279a0f0ba6db7e017e77a1d5f707f03 https://github.com/facebookexperimental/rust-shed/commit/4a0b610c2330822216f706f6f3475b3b6fc4b4fd https://github.com/facebookincubator/fizz/commit/2ba3c8ecd35145ae2d545ff0e0731c0dc75da7d1 Reviewed By: jailby fbshipit-source-id: bbada24d195f645c50d45135335f5fe7a322a2c1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e6a3dd35e014..9fdfb18066a3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 49cc53da2c5924c913d88bcb0a3d4cf5f11f1cd5 +Subproject commit 0495a5fa49c63be9640ad3b3c0915fbce09ec5dd diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8eabbeba9ef7..cf6ac5917573 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9e04f6ec044eecc7a5131b6e494635d1cbb125c1 +Subproject commit 81613b81915b8b6637ea3f61feb7db63a45b8f83 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index da462628a1ac..4d76d00454c9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d49dbe95890d3c78504bae14f2d8d95302496c61 +Subproject commit 8638b104ebc216d8de2169bcc8d7ebc09628b52c From dd06b9ea5641c03fc6dcd082de3a9ad227d3268b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 15 Mar 2024 09:33:12 -0700 Subject: [PATCH 6824/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/4a23c23a09c478ab1897a211935a9022121471e1 https://github.com/facebook/fbthrift/commit/0fa48a8d8ffb870582001584ba607e78cb1af631 https://github.com/facebook/folly/commit/b5297454d520bafdcf1fcb23e67cf6f67575e018 https://github.com/facebook/mvfst/commit/c9abaad36c231cddce5d72d7e4737dbde5cda58f https://github.com/facebook/wangle/commit/31df87bea1186d4086c7bc29da0fe879fd64f25a https://github.com/facebookexperimental/edencommon/commit/cd1f11bd77bfd2769fa8fd5065392a176b49f6dc https://github.com/facebookexperimental/rust-shed/commit/194e9de24e83144a926989367350194c48c457ef https://github.com/facebookincubator/fizz/commit/578c6038d1763d62b76867c674ad2f8dbb5f89f8 Reviewed By: jailby fbshipit-source-id: 521f6dba5b85a89194e43bb16b6d9d4555fdc814 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9fdfb18066a3..c5a4354d4971 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0495a5fa49c63be9640ad3b3c0915fbce09ec5dd +Subproject commit 0fa48a8d8ffb870582001584ba607e78cb1af631 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index cf6ac5917573..c63f2a527895 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 81613b81915b8b6637ea3f61feb7db63a45b8f83 +Subproject commit b5297454d520bafdcf1fcb23e67cf6f67575e018 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4d76d00454c9..50a7ad0bc492 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8638b104ebc216d8de2169bcc8d7ebc09628b52c +Subproject commit 31df87bea1186d4086c7bc29da0fe879fd64f25a From bdf24692e72b7ddcf1f8ae1a299127888964120a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 16 Mar 2024 09:31:11 -0700 Subject: [PATCH 6825/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/57656f8bd0ab0889bd976c985b823181c9814a6f https://github.com/facebook/fbthrift/commit/a20c5e1c963d2a29a0339b26db037c8376570ed1 https://github.com/facebook/folly/commit/8aceb9bf727c42de013dd3fff8c89bd5d75ff11b https://github.com/facebook/mvfst/commit/ace18c3a1162a45ce49ad88df4c6245c7d5d61da https://github.com/facebook/wangle/commit/de1189e172f3e94e8fb75254f271c29060edae78 https://github.com/facebookexperimental/edencommon/commit/aeef5df757ca4a52d5dcc87cc92d74918cb0fff2 https://github.com/facebookexperimental/rust-shed/commit/e66cb98460fc77f16eb08f67d502ef24f9437d35 https://github.com/facebookincubator/fizz/commit/9bf8074f2fb36ddaa54cbac55f3f178d51f2e3e5 Reviewed By: jailby fbshipit-source-id: dc99f9ef4d5d48197aa5c4b5de530cbc237aa3f2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c5a4354d4971..6f23137d41c0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0fa48a8d8ffb870582001584ba607e78cb1af631 +Subproject commit a20c5e1c963d2a29a0339b26db037c8376570ed1 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index c63f2a527895..e9466111a6a6 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b5297454d520bafdcf1fcb23e67cf6f67575e018 +Subproject commit 8aceb9bf727c42de013dd3fff8c89bd5d75ff11b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 50a7ad0bc492..83284c0a2eba 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 31df87bea1186d4086c7bc29da0fe879fd64f25a +Subproject commit de1189e172f3e94e8fb75254f271c29060edae78 From 1bba2f98403391d1b809456ae50f468727e813fa Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 17 Mar 2024 09:32:34 -0700 Subject: [PATCH 6826/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/b6b14a6b1e3c580f9703fc0c4782e9140c7caf5a https://github.com/facebook/fbthrift/commit/fd6b474f5709d2ab62543f3550a6708a0831247f https://github.com/facebook/mvfst/commit/faaab73b20f58a9045eb9e4f34f6a84a44c63403 https://github.com/facebook/wangle/commit/a89cafe5098062326b8c39f07ac52844b21f7ee4 https://github.com/facebookexperimental/edencommon/commit/9614b4e8e18c8388b555fbfac83d97ce09f35e5f https://github.com/facebookexperimental/rust-shed/commit/5ce3173550550eea5ce660c90f489bb3efc69c33 https://github.com/facebookincubator/fizz/commit/3b4bc6fd1520c8c10fc4989c6f495d9f091e27f2 Reviewed By: jailby fbshipit-source-id: 1782dfd3f494ee0492d19dbed3c2d5f7b1fa24ba --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6f23137d41c0..d45341f2abab 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a20c5e1c963d2a29a0339b26db037c8376570ed1 +Subproject commit fd6b474f5709d2ab62543f3550a6708a0831247f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 83284c0a2eba..cc158b7bdaba 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit de1189e172f3e94e8fb75254f271c29060edae78 +Subproject commit a89cafe5098062326b8c39f07ac52844b21f7ee4 From abead3f12cec3356f6d7e5a70b22760c9d11b893 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 18 Mar 2024 09:32:41 -0700 Subject: [PATCH 6827/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/20c4cd0fdffaf9d5eeb84e538796db57592ead87 https://github.com/facebook/fbthrift/commit/e8322cfa3e7a571d05113145387c1dfa5b9bbc21 https://github.com/facebook/mvfst/commit/db68ea0f18a065cf6fae0ffac474532c1e4616ed https://github.com/facebook/wangle/commit/0f423e92dec6f274500080de1f6e9b46a3fdf165 https://github.com/facebookexperimental/rust-shed/commit/cba30bbb33d57ae9cdbe5cffc4e2b371ca2d9074 Reviewed By: ajb85 fbshipit-source-id: a6546d78da425d9a9dae374ca96233d61e72cd80 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d45341f2abab..e8415f8b5265 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit fd6b474f5709d2ab62543f3550a6708a0831247f +Subproject commit e8322cfa3e7a571d05113145387c1dfa5b9bbc21 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index cc158b7bdaba..e140e464d57b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a89cafe5098062326b8c39f07ac52844b21f7ee4 +Subproject commit 0f423e92dec6f274500080de1f6e9b46a3fdf165 From 931aeb93a0895c178cf1c2a84ed8c9a7d6e390f6 Mon Sep 17 00:00:00 2001 From: Seyed Pouria Mousavizadeh Tehrani Date: Mon, 18 Mar 2024 16:16:11 -0700 Subject: [PATCH 6828/7387] python: fix on readme warning + remove import os from setup.py (#1200) Summary: - Remove unnecessary import from `setup.py` - Add `README.md` under python directory. - Fix readme location in `pyproject.toml` to silence the warning below: ```txt * Installing packages in isolated environment... (wheel) * Building wheel... /tmp/user/1000/build-env-8lb52uj7/lib/python3.10/site-packages/setuptools/config/expand.py:133: SetuptoolsWarning: File '/tmp/user/1000/build-via-sdist-6yl9pr_s/pywatchman-2.0.0/../README.md' cannot be found ``` Pull Request resolved: https://github.com/facebook/watchman/pull/1200 Reviewed By: fanzeyi Differential Revision: D55039358 fbshipit-source-id: 13e342beae3d7f8e2dbc22d1196588ad88e28e4a --- watchman/python/README.md | 9 +++++++++ watchman/python/pyproject.toml | 2 +- watchman/python/setup.py | 2 -- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 watchman/python/README.md diff --git a/watchman/python/README.md b/watchman/python/README.md new file mode 100644 index 000000000000..9386ff06c7dd --- /dev/null +++ b/watchman/python/README.md @@ -0,0 +1,9 @@ +# Watchman client for Python + +This directory contains the Watchman client for Python. + +## Build + +```sh +python -m build +``` diff --git a/watchman/python/pyproject.toml b/watchman/python/pyproject.toml index 7720ef89a55b..83b5cf7c3af8 100644 --- a/watchman/python/pyproject.toml +++ b/watchman/python/pyproject.toml @@ -6,7 +6,7 @@ authors = [ ] description = "Watchman client for Python" license = { file = "LICENSE" } -readme = "../README.md" +readme = "README.md" requires-python = ">=3.8" classifiers = [ "Development Status :: 5 - Production/Stable", diff --git a/watchman/python/setup.py b/watchman/python/setup.py index b21a13311e8e..a865305950fd 100755 --- a/watchman/python/setup.py +++ b/watchman/python/setup.py @@ -6,8 +6,6 @@ # LICENSE file in the root directory of this source tree. -import os - from setuptools import Extension, setup setup( From 5566db25a7793af3da183dcfe0dbc6daa8968814 Mon Sep 17 00:00:00 2001 From: Stiopa Koltsov Date: Mon, 18 Mar 2024 16:57:05 -0700 Subject: [PATCH 6829/7387] Upgrade tokio Summary: Need to add some third-party, which is pulling newer tokio. Land upgrade separately for visibility and for easier bisect and revert. Reviewed By: Imxset21, JakobDegen Differential Revision: D55030643 fbshipit-source-id: 47b509ce2103d1dd64c66aa250133eb25758a750 --- watchman/cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index 94dc14eea5d7..6cdfc143ad6b 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -18,7 +18,7 @@ serde_json = { version = "1.0.100", features = ["float_roundtrip", "unbounded_de structopt = "0.3.26" sysinfo = "0.26.8" tabular = "0.2.0" -tokio = { version = "1.29.1", features = ["full", "test-util", "tracing"] } +tokio = { version = "1.36.0", features = ["full", "test-util", "tracing"] } watchman_client = { version = "0.8.0", path = "../rust/watchman_client" } [target.'cfg(target_os = "linux")'.dependencies] From ebeb2427595e8c758a05fe9e6f9a63797216c4ab Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 19 Mar 2024 09:32:49 -0700 Subject: [PATCH 6830/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/1d767c9dcfb5caf91a5d4e2504884bc9d83a9501 https://github.com/facebook/fbthrift/commit/f4e8d2dedba7a9698685605cd361dbe6c431a8fe https://github.com/facebook/folly/commit/7a0c65a0f3d08e6224e4b3b547a719f3d76f98ea https://github.com/facebook/mvfst/commit/4b03b63802990ac79bc549f92d585bcdd9631e79 https://github.com/facebookexperimental/edencommon/commit/786372865536310ae9d7b44262201df6f9eeefbb https://github.com/facebookexperimental/rust-shed/commit/8e615dcc3e36cac1afb0fa93ee546a7b26578fb4 https://github.com/facebookincubator/fizz/commit/5576ab83869f2f9ebb54639988a782506a232e82 Reviewed By: ajb85 fbshipit-source-id: 607c1ac54b2580534827d395df23fa85530c6ad2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e8415f8b5265..7eafc481c5da 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e8322cfa3e7a571d05113145387c1dfa5b9bbc21 +Subproject commit f4e8d2dedba7a9698685605cd361dbe6c431a8fe diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e9466111a6a6..374407e79e01 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 8aceb9bf727c42de013dd3fff8c89bd5d75ff11b +Subproject commit 7a0c65a0f3d08e6224e4b3b547a719f3d76f98ea From 623340090f6baaf20e72960bbde4212506668a05 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 20 Mar 2024 09:32:30 -0700 Subject: [PATCH 6831/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/44bf4422533d7fff9ca932d96e58d9aecc29c8aa https://github.com/facebook/fbthrift/commit/d1ae1b5ab0e99968806aa1fea2ab2b57935be5f0 https://github.com/facebook/folly/commit/17be1d518a8f7b5aa2a943282be44fad7a048ddf https://github.com/facebook/mvfst/commit/aa7ac347f580f33f2a391fd5d0b0658b54850e84 https://github.com/facebook/wangle/commit/0c80d9eec3c1aea2d93b3aec9f8b41a19782b5ca https://github.com/facebookexperimental/edencommon/commit/117aee16ae2304a48c9cd7e7acff374d297f74e5 https://github.com/facebookexperimental/rust-shed/commit/93e4940e4e0696f46d86d91eb4da7a217829f143 https://github.com/facebookincubator/fizz/commit/f213a8f8e4fa8a3514bd49553ead926dd8cd2dc6 Reviewed By: ajb85 fbshipit-source-id: 14be7e829c8bfecb8bdfc75cbcfdb184c113f229 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7eafc481c5da..cce9e5270e8b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f4e8d2dedba7a9698685605cd361dbe6c431a8fe +Subproject commit d1ae1b5ab0e99968806aa1fea2ab2b57935be5f0 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 374407e79e01..67ff0ddef621 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7a0c65a0f3d08e6224e4b3b547a719f3d76f98ea +Subproject commit 17be1d518a8f7b5aa2a943282be44fad7a048ddf diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e140e464d57b..2e99a9c5ed87 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0f423e92dec6f274500080de1f6e9b46a3fdf165 +Subproject commit 0c80d9eec3c1aea2d93b3aec9f8b41a19782b5ca From 37e14a464bbcf76224d569741b36c531375751ec Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 20 Mar 2024 14:49:13 -0700 Subject: [PATCH 6832/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/d742bb43c81482e0e39fa917aea715c4ab531fc6 https://github.com/facebook/fbthrift/commit/c21dccc272e59fb611d5a9dd882414537723cf46 https://github.com/facebook/folly/commit/8cf0542290f818367a63e7e6a2f73266a06101da https://github.com/facebook/mvfst/commit/a4c6d4714badf8bb1a3fe495f76915ca31cd4f7c https://github.com/facebook/wangle/commit/449114a3c9decf808bab97a0c7be99431771626a https://github.com/facebookexperimental/edencommon/commit/1a6ad8baf8124279e3a73e7510c87f2a584116e1 https://github.com/facebookexperimental/rust-shed/commit/190f75cf7d9d5debc6613190a170edc10f30a68c https://github.com/facebookincubator/fizz/commit/e72df1a09b79fa49f235b3c8a7c26adf7749b87e Reviewed By: jurajh-fb fbshipit-source-id: b8e4ebd16e4f527ae0bf6ff5b4707093ff1d8a8c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cce9e5270e8b..4741dfd3934e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d1ae1b5ab0e99968806aa1fea2ab2b57935be5f0 +Subproject commit c21dccc272e59fb611d5a9dd882414537723cf46 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 67ff0ddef621..6fe5010924ec 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 17be1d518a8f7b5aa2a943282be44fad7a048ddf +Subproject commit 8cf0542290f818367a63e7e6a2f73266a06101da diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2e99a9c5ed87..739a4d05f315 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0c80d9eec3c1aea2d93b3aec9f8b41a19782b5ca +Subproject commit 449114a3c9decf808bab97a0c7be99431771626a From 8fa1f58fbf1fb146b4f9c324bcffed14b2befc8a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 21 Mar 2024 09:33:44 -0700 Subject: [PATCH 6833/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ccc2f4681577cdc2f3b3b92f893f7123371f44cb https://github.com/facebook/fbthrift/commit/ebeb41d1106f63ff794542055cd566946634147f https://github.com/facebook/folly/commit/d35c0f148ad7172ce089dd25233af9f8409f78c0 https://github.com/facebook/mvfst/commit/7c9775ea7f3cf5a5130b7d7f068a41983e1d863b https://github.com/facebook/wangle/commit/fd764b0427fdd1e2c081f523d87fca4ef927ff70 https://github.com/facebookexperimental/edencommon/commit/19f17bc57c4dd0ca81f29d15e1de2e1140af60a2 https://github.com/facebookexperimental/rust-shed/commit/825c5ae4c4e221d4284834bb1223f8a1cbd5f33e https://github.com/facebookincubator/fizz/commit/c633ba735b1ee4edcfe1e0f012b65ef8767bf806 Reviewed By: jurajh-fb fbshipit-source-id: 25904a651353be25a9fbc242cacc2a8453f5ae91 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4741dfd3934e..7db3593a432f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c21dccc272e59fb611d5a9dd882414537723cf46 +Subproject commit ebeb41d1106f63ff794542055cd566946634147f diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6fe5010924ec..302b3bbdc8b9 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 8cf0542290f818367a63e7e6a2f73266a06101da +Subproject commit d35c0f148ad7172ce089dd25233af9f8409f78c0 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 739a4d05f315..544cbd038eca 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 449114a3c9decf808bab97a0c7be99431771626a +Subproject commit fd764b0427fdd1e2c081f523d87fca4ef927ff70 From ca436cf4a9c8874008984eb2e6edcbd4ea86e614 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 22 Mar 2024 09:32:09 -0700 Subject: [PATCH 6834/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/8e73f88a185ebe1a23eb9a491e6418b00db201a8 https://github.com/facebook/fbthrift/commit/2000ba7e1d4bcc7e01d76ae56567f2c4602186dd https://github.com/facebook/folly/commit/faedbb468779075a022a9b97c70979a64bf13369 https://github.com/facebook/mvfst/commit/da36d5c12fe7f07892b0ecf85e024d6c75fd3169 https://github.com/facebook/wangle/commit/3fa2dfa4792469a82293352e981fa06d1fe906a3 https://github.com/facebookexperimental/edencommon/commit/ea770d6412f3bd838be36d28669118cdb3493c3d https://github.com/facebookexperimental/rust-shed/commit/dc33bc5e9bac0a65243f10e9d34ceea638333eaa https://github.com/facebookincubator/fizz/commit/f5c5c5ca4bf463037767995a10b15a8630c51136 Reviewed By: jurajh-fb fbshipit-source-id: 8b584d54e5e7e8cf40b778e2ce4737af7b68f1ae --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7db3593a432f..b1af35664c16 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ebeb41d1106f63ff794542055cd566946634147f +Subproject commit 2000ba7e1d4bcc7e01d76ae56567f2c4602186dd diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 302b3bbdc8b9..e8293a6d7cfd 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d35c0f148ad7172ce089dd25233af9f8409f78c0 +Subproject commit faedbb468779075a022a9b97c70979a64bf13369 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 544cbd038eca..9e54466f220e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit fd764b0427fdd1e2c081f523d87fca4ef927ff70 +Subproject commit 3fa2dfa4792469a82293352e981fa06d1fe906a3 From ac87623729a8147b1b1da43371f9421d97f10896 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 25 Mar 2024 10:51:12 -0700 Subject: [PATCH 6835/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/e85734c3d852b40d323b38f7df820253e9528176 https://github.com/facebook/fbthrift/commit/edd804b6f8004e5cbb149868a27c2989f954a1a9 https://github.com/facebook/folly/commit/50825b2d8b34aba4617e147082e7420b4a25d735 https://github.com/facebook/mvfst/commit/263b4ef8372c6a085b25250c132c4a04eca1a18f https://github.com/facebook/wangle/commit/25e4709c5abed785986434ad919c4ace2f9aef8f https://github.com/facebookexperimental/edencommon/commit/b9cb66265afbd0734a28a6b534f6c1715a6a60c8 https://github.com/facebookexperimental/rust-shed/commit/ee9f79b65fa17f89fd5048402a8b7d89f3a66a48 https://github.com/facebookincubator/fizz/commit/61c4ffbf6b23b837a6d78df72f09ed2faae94c4d Reviewed By: bigfootjon fbshipit-source-id: d4226ce239ca6e6c0fe1e7ec5eba17048c8c685c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b1af35664c16..3a64a979043e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2000ba7e1d4bcc7e01d76ae56567f2c4602186dd +Subproject commit edd804b6f8004e5cbb149868a27c2989f954a1a9 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e8293a6d7cfd..4904bc40e627 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit faedbb468779075a022a9b97c70979a64bf13369 +Subproject commit 50825b2d8b34aba4617e147082e7420b4a25d735 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9e54466f220e..902807a8a6fa 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3fa2dfa4792469a82293352e981fa06d1fe906a3 +Subproject commit 25e4709c5abed785986434ad919c4ace2f9aef8f From da3f591cc2cd20f6898854eedc42c6476f1d5766 Mon Sep 17 00:00:00 2001 From: Yedidya Feldblum Date: Mon, 25 Mar 2024 15:38:33 -0700 Subject: [PATCH 6836/7387] migrate from folly::in_place (assorted) Summary: Under c++17, `folly::in_place` is just an alias for `std::in_place`. Migrate existing uses. Reviewed By: Gownta Differential Revision: D55085626 fbshipit-source-id: b5aac12834a4507319331db2111215f8a6284ddd --- watchman/InMemoryView.cpp | 2 +- watchman/PendingCollection.cpp | 2 +- watchman/PerfSample.cpp | 2 +- watchman/test/lib/FakeFileSystem.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/watchman/InMemoryView.cpp b/watchman/InMemoryView.cpp index 79a6af6d08d2..5b83d5b1afa3 100644 --- a/watchman/InMemoryView.cpp +++ b/watchman/InMemoryView.cpp @@ -459,7 +459,7 @@ InMemoryView::InMemoryView( : QueryableView{root_path, /*requiresCrawl=*/true}, fileSystem_{fileSystem}, config_(std::move(config)), - view_(folly::in_place, root_path), + view_(std::in_place, root_path), rootNumber_(next_root_number++), rootPath_(root_path), watcher_(std::move(watcher)), diff --git a/watchman/PendingCollection.cpp b/watchman/PendingCollection.cpp index 26ff2000db6c..c92eb8063e16 100644 --- a/watchman/PendingCollection.cpp +++ b/watchman/PendingCollection.cpp @@ -318,7 +318,7 @@ bool PendingCollectionBase::checkAndResetPinged() { PendingCollection::PendingCollection() : folly::Synchronized{ - folly::in_place, + std::in_place, cond_} {} PendingCollection::LockedPtr PendingCollection::lockAndWait( diff --git a/watchman/PerfSample.cpp b/watchman/PerfSample.cpp index 10b38ab6b5d5..1cca6014d3e9 100644 --- a/watchman/PerfSample.cpp +++ b/watchman/PerfSample.cpp @@ -36,7 +36,7 @@ class PerfLogThread { void loop() noexcept; public: - explicit PerfLogThread(bool start) : state_(folly::in_place, start) { + explicit PerfLogThread(bool start) : state_(std::in_place, start) { if (start) { thread_ = std::thread([this] { loop(); }); } diff --git a/watchman/test/lib/FakeFileSystem.cpp b/watchman/test/lib/FakeFileSystem.cpp index ac1142468591..1db0e8eac533 100644 --- a/watchman/test/lib/FakeFileSystem.cpp +++ b/watchman/test/lib/FakeFileSystem.cpp @@ -160,7 +160,7 @@ class FakeDirHandle : public DirHandle { FakeFileSystem::Flags::Flags() = default; FakeFileSystem::FakeFileSystem(Flags flags) - : flags_{flags}, root_{folly::in_place, FakeInode{fakeDir()}} {} + : flags_{flags}, root_{std::in_place, FakeInode{fakeDir()}} {} std::unique_ptr FakeFileSystem::openDir( const char* path, From 3d74a3ae8919cdd84d2bc806e0a84e7ea7ab5e7d Mon Sep 17 00:00:00 2001 From: Yedidya Feldblum Date: Mon, 25 Mar 2024 16:10:33 -0700 Subject: [PATCH 6837/7387] Add LibUnwind as a dependency of glog::glog (#1058) Summary: X-link: https://github.com/facebookincubator/zstrong/pull/738 X-link: https://github.com/facebook/folly/pull/1916 X-link: https://github.com/facebook/folly/pull/1857 X-link: https://github.com/facebook/hhvm/pull/9179 X-link: https://github.com/facebook/fboss/pull/119 X-link: https://github.com/facebook/fb303/pull/32 X-link: https://github.com/facebook/openr/pull/141 X-link: https://github.com/facebook/fbthrift/pull/524 X-link: https://github.com/facebook/wangle/pull/209 X-link: https://github.com/facebook/proxygen/pull/429 X-link: https://github.com/facebookexperimental/eden/pull/128 X-link: https://github.com/facebookexperimental/rust-shed/pull/35 Pull Request resolved: https://github.com/facebook/watchman/pull/1058 X-link: https://github.com/facebookincubator/reindeer/pull/5 X-link: https://github.com/facebook/sapling-staging/pull/8 X-link: https://github.com/facebookexperimental/edencommon/pull/5 X-link: https://github.com/facebookincubator/fizz/pull/82 X-link: https://github.com/facebookincubator/velox/pull/2487 X-link: https://github.com/facebookincubator/hsthrift/pull/101 X-link: https://github.com/facebookincubator/katran/pull/172 X-link: https://github.com/facebookincubator/mvfst/pull/273 X-link: https://github.com/fairinternal/AIRStore/pull/38 `LibUnwind` is a dependency of `glog` according to [objdump](https://www.internalfb.com/intern/skycastle/run/117093590319624253/artifact/actionlog.117093590478433674.stdout). This diff adds ${LIBUNWIND_LIBRARY} to the CMake imported library `glog::glog` as an element in the `IMPORTED_LINK_INTERFACE_LIBRARIES` property. Without this diff, there will be a linker error like this: ``` /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libglog.so: undefined reference to symbol '_Ux86_64_getcontext' //usr/lib/x86_64-linux-gnu/libunwind.so.8: error adding symbols: DSO missing from command line collect2: error: ld returned 1 exit status ``` Reviewed By: Wilfred Differential Revision: D42509278 fbshipit-source-id: ea80449ccc6b91d658bbe9cee954fc8a4a17926f --- build/fbcode_builder/CMake/FindGlog.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build/fbcode_builder/CMake/FindGlog.cmake b/build/fbcode_builder/CMake/FindGlog.cmake index 38ee54a7cf89..19bfa187e5f2 100644 --- a/build/fbcode_builder/CMake/FindGlog.cmake +++ b/build/fbcode_builder/CMake/FindGlog.cmake @@ -38,6 +38,12 @@ if (NOT TARGET glog::glog) find_package(Gflags) if(GFLAGS_FOUND) message(STATUS "Found gflags as a dependency of glog::glog, include=${LIBGFLAGS_INCLUDE_DIR}, libs=${LIBGFLAGS_LIBRARY}") - set_target_properties(glog::glog PROPERTIES IMPORTED_LINK_INTERFACE_LIBRARIES ${LIBGFLAGS_LIBRARY}) + set_property(TARGET glog::glog APPEND PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES ${LIBGFLAGS_LIBRARY}) + endif() + + find_package(LibUnwind) + if(LIBUNWIND_FOUND) + message(STATUS "Found LibUnwind as a dependency of glog::glog, include=${LIBUNWIND_INCLUDE_DIR}, libs=${LIBUNWIND_LIBRARY}") + set_property(TARGET glog::glog APPEND PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES ${LIBUNWIND_LIBRARY}) endif() endif() From e3a49c76f28870cdcdfd8cd17d251ffb17c2d19a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 25 Mar 2024 21:37:49 -0700 Subject: [PATCH 6838/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/2379aa904aac5d309c6dd157e26e330ab483aaeb https://github.com/facebook/fb303/commit/b1388c2fc1c9e865e4058aedeb1d2e3c43f8ceb2 https://github.com/facebook/fbthrift/commit/752953c47a1ff0f9bdffa0a18a98d904e9e0e42b https://github.com/facebook/folly/commit/13f418a32f2096837d90924c667b31f01b82ef7b https://github.com/facebook/mvfst/commit/86a0f44f36938cfdaf60a60881533de4384de05e https://github.com/facebook/wangle/commit/78d5802d78e901a474e40c8886f5e4934d5f2631 https://github.com/facebookexperimental/edencommon/commit/00a0edb6a20ce5e0590cdb675e60ea6494824b8d https://github.com/facebookexperimental/rust-shed/commit/1a6803fe106fe11428765c92500233e88d16c93a https://github.com/facebookincubator/fizz/commit/df5ddd9da60be5aa24e5e1922dd9edb928167248 Reviewed By: bigfootjon fbshipit-source-id: 800311674ffa6e0a534ea4e676a41614402a6bfc --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3a64a979043e..dfaa243ad164 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit edd804b6f8004e5cbb149868a27c2989f954a1a9 +Subproject commit 752953c47a1ff0f9bdffa0a18a98d904e9e0e42b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4904bc40e627..d9efbd2bab24 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 50825b2d8b34aba4617e147082e7420b4a25d735 +Subproject commit 13f418a32f2096837d90924c667b31f01b82ef7b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 902807a8a6fa..173f09b8c174 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 25e4709c5abed785986434ad919c4ace2f9aef8f +Subproject commit 78d5802d78e901a474e40c8886f5e4934d5f2631 From e82aa8cd36cedf6459529841b22a9aa4a3c9092e Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Tue, 26 Mar 2024 00:21:29 -0700 Subject: [PATCH 6839/7387] expose active filter Summary: There are a few use cases where want to gate other scm logic based on filtered repos. Recently, www devX has opened up testing to more environments. Myles www searchability was previously gated on the only beta tester www in fbsource OD type. So that we don't have to keep allow listing different environments for filesearch and other things, we will expose the filter and clients can gate their behavior by the active filter. Reviewed By: MichaelCuevas Differential Revision: D55295101 fbshipit-source-id: 102d42653d30d51fb1755012e099bb523fc2d78d --- eden/fs/service/eden.thrift | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 3330dcb8be09..c3ada34079e2 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1562,6 +1562,17 @@ struct ResetParentCommitsParams { 3: optional RootIdOptions rootIdOptions; } +struct GetCurrentSnapshotInfoRequest { + // Mount for which you want information. + 1: MountId mountId; + // Pass unique identifier of this request's caller. + 2: optional ClientRequestInfo cri; +} + +struct GetCurrentSnapshotInfoResponse { + 1: optional string filterId; +} + struct RemoveRecursivelyParams { 1: PathString mountPoint; 2: PathString path; @@ -1651,6 +1662,15 @@ service EdenService extends fb303_core.BaseService { 3: ResetParentCommitsParams params, ) throws (1: EdenError ex); + /** + * Gets information about the current snapshot (i.e. last checked out commit) + * Currently, we only expose thethe current filter for the working copy. If + * the working copy is not filtered then the returned filter will be none. + */ + GetCurrentSnapshotInfoResponse getCurrentSnapshotInfo( + 1: GetCurrentSnapshotInfoRequest params, + ) throws (1: EdenError ex); + /** * Ensure that all inflight working copy modification have completed. * From 4fd3160830c8ce6e7cced99603fc8ff83ae54153 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 26 Mar 2024 21:35:55 -0700 Subject: [PATCH 6840/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/e6cee6b635b55af6fd2dc145bb1035d828f6eef0 https://github.com/facebook/fb303/commit/24c5f10806e41c589deda71a71f4336c2144329b https://github.com/facebook/fbthrift/commit/1bc78822c3ba5fd971baaae221521c9cd426e5e1 https://github.com/facebook/folly/commit/95d2b008c5314ffa063da237104bde289df2f980 https://github.com/facebook/mvfst/commit/22c661ad6de13fbcbffd841720e422502c89d152 https://github.com/facebook/wangle/commit/3aaa7f51a6017fe8f749b773acb5c3b45b2c2e7d https://github.com/facebookexperimental/edencommon/commit/16e163ad162284b7410b0a224125c59f5c8dc1d1 https://github.com/facebookexperimental/rust-shed/commit/cd81829305d49aae0e52a6c6fe19b3f105e7d8fc https://github.com/facebookincubator/fizz/commit/12fe476c3b5bb53c003ff1db78672616a83c54f3 Reviewed By: bigfootjon fbshipit-source-id: 1f7815ff2fdb2cc9a5a1ec5c4c8edc9227404958 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index dfaa243ad164..67c612c4790c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 752953c47a1ff0f9bdffa0a18a98d904e9e0e42b +Subproject commit 1bc78822c3ba5fd971baaae221521c9cd426e5e1 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d9efbd2bab24..e9d4d6091afb 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 13f418a32f2096837d90924c667b31f01b82ef7b +Subproject commit 95d2b008c5314ffa063da237104bde289df2f980 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 173f09b8c174..34cdf4e487a9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 78d5802d78e901a474e40c8886f5e4934d5f2631 +Subproject commit 3aaa7f51a6017fe8f749b773acb5c3b45b2c2e7d From 86e6c33049d32ad37bca26cf8e08160471009950 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 27 Mar 2024 09:33:20 -0700 Subject: [PATCH 6841/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/a8b57f8e99a1725381c9408aeb2c5f4ad59a3e3b https://github.com/facebook/fb303/commit/08326990ebc9c947361ba320dfbb421807d8ee0f https://github.com/facebook/fbthrift/commit/8fce7e812d512491ee4e0b8f757d28e5d2889176 https://github.com/facebook/mvfst/commit/632794fa8232c9f43091b5aae6fdb75f1ce847b9 https://github.com/facebook/wangle/commit/d3a32e29e8a334ac2e9b65d3a99811c0dd2dd51e https://github.com/facebookexperimental/edencommon/commit/5b3effb79befd0ef30737490fd74423dc4eacf75 https://github.com/facebookexperimental/rust-shed/commit/cd672cff568609eb5a4184499990bd7bde05814c https://github.com/facebookincubator/fizz/commit/98ab219440d6c02cbcea47224990443ae979bc9e Reviewed By: bigfootjon fbshipit-source-id: 8127e44c3c279ff734f75e0c1b9e92d164def29f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 67c612c4790c..259c462220df 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1bc78822c3ba5fd971baaae221521c9cd426e5e1 +Subproject commit 8fce7e812d512491ee4e0b8f757d28e5d2889176 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 34cdf4e487a9..d3271479fa37 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3aaa7f51a6017fe8f749b773acb5c3b45b2c2e7d +Subproject commit d3a32e29e8a334ac2e9b65d3a99811c0dd2dd51e From 24dc171d38579701dc394545c3cb4d27364d5bb3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 28 Mar 2024 09:33:26 -0700 Subject: [PATCH 6842/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/ccf82204c098784b75894fe885228e488d5ee84c https://github.com/facebook/fb303/commit/05b61ee655890a46010c85986f3ee5f51b39407a https://github.com/facebook/fbthrift/commit/790a92a8d0efc6452fc7f3657c21b799aecb572a https://github.com/facebook/folly/commit/e128a4b231aee5f1378027a9309f43f243391c6f https://github.com/facebook/mvfst/commit/dca0463acb1c82ceaea276f4193b38f4046c625d https://github.com/facebook/wangle/commit/2c9fdbc521967f1263f7408069db2fb82d021b18 https://github.com/facebookexperimental/rust-shed/commit/db1c33b61c5f180d1d9fe8c01981c285d1de22c2 Reviewed By: bigfootjon fbshipit-source-id: c18b2982717e152ff28af37c051bc7fc732292de --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 259c462220df..84a2cf04eb0b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8fce7e812d512491ee4e0b8f757d28e5d2889176 +Subproject commit 790a92a8d0efc6452fc7f3657c21b799aecb572a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e9d4d6091afb..3f6a6733b3d2 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 95d2b008c5314ffa063da237104bde289df2f980 +Subproject commit e128a4b231aee5f1378027a9309f43f243391c6f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d3271479fa37..727d84453760 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d3a32e29e8a334ac2e9b65d3a99811c0dd2dd51e +Subproject commit 2c9fdbc521967f1263f7408069db2fb82d021b18 From e315dcc9cb0a4b0ce7a59c9bc2cbedc8c71e3ebf Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 29 Mar 2024 09:31:55 -0700 Subject: [PATCH 6843/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/362f83b414706b1c36b6cbcc40f723c45ee623b7 https://github.com/facebook/fb303/commit/c76167201203413884d3aec55dce228ea7899469 https://github.com/facebook/fbthrift/commit/64c0535a3cbfa481aeb5efb35ebe0c25f953210e https://github.com/facebook/folly/commit/cd2ed1e6016a7e0433d48e22640d01489d8982c3 https://github.com/facebook/mvfst/commit/c0ecb9e3ff6510f1506e79c494a8a6fd89328638 https://github.com/facebook/wangle/commit/66e4f3b23bdeae80548963f69dbe9338992d0531 https://github.com/facebookexperimental/edencommon/commit/2478467430b1a762083869d3f42f77be2ef54d62 https://github.com/facebookexperimental/rust-shed/commit/d41e3d0eb0aa683aa17dd3beac0d332a0a2739b8 https://github.com/facebookincubator/fizz/commit/4b0cb7913849dee98a563aac1ca217cbb7151833 Reviewed By: bigfootjon fbshipit-source-id: e18e0f8b109ce8957da35a8249662f01457196b7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 84a2cf04eb0b..b6cc494f9604 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 790a92a8d0efc6452fc7f3657c21b799aecb572a +Subproject commit 64c0535a3cbfa481aeb5efb35ebe0c25f953210e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 3f6a6733b3d2..ce0008e05db4 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e128a4b231aee5f1378027a9309f43f243391c6f +Subproject commit cd2ed1e6016a7e0433d48e22640d01489d8982c3 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 727d84453760..5d03503f6210 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2c9fdbc521967f1263f7408069db2fb82d021b18 +Subproject commit 66e4f3b23bdeae80548963f69dbe9338992d0531 From 55b37ff38ec5f61cd9bfc5ba73f9174fd066354d Mon Sep 17 00:00:00 2001 From: Orvid King Date: Fri, 29 Mar 2024 10:22:29 -0700 Subject: [PATCH 6844/7387] Back out "Fix a broken download link of xz" Summary: Original commit changeset: 7ab62323827d Original Phabricator Diff: D54324964 Reviewed By: FBNeal, davide125 Differential Revision: D55529441 fbshipit-source-id: 69373249d792276cb130f75beedaaaae1a89d77e --- build/fbcode_builder/manifests/xz | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/manifests/xz b/build/fbcode_builder/manifests/xz index 751616b72995..0b27ad63cc91 100644 --- a/build/fbcode_builder/manifests/xz +++ b/build/fbcode_builder/manifests/xz @@ -11,12 +11,12 @@ xz xz-devel [download] -url = https://github.com/tukaani-project/xz/releases/download/v5.6.0/xz-5.6.0.tar.gz -sha256 = 0f5c81f14171b74fcc9777d302304d964e63ffc2d7b634ef023a7249d9b5d875 +url = https://tukaani.org/xz/xz-5.2.5.tar.gz +sha256 = f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10 [build] builder = autoconf -subdir = xz-5.6.0 +subdir = xz-5.2.5 [autoconf.args] --disable-shared From 50345ef1301a6fae9121567883443eca496cc95d Mon Sep 17 00:00:00 2001 From: Xavier Deguillard Date: Fri, 29 Mar 2024 12:14:27 -0700 Subject: [PATCH 6845/7387] eden: also accept fuse.edenfs FS Summary: This is needed so that EdenFS can mount itself with the fstype fuse.edenfs. Reviewed By: kmancini Differential Revision: D55531179 fbshipit-source-id: b61059f16ad87cecf7bef61405fc7721b9049767 --- watchman/watcher/eden.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index ac581dd981a7..c599da2a53ad 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -1446,7 +1446,7 @@ std::shared_ptr detectEden( #else if (!is_edenfs_fs_type(fstype) && fstype != "fuse" && fstype != "osxfuse_eden" && fstype != "macfuse_eden" && - fstype != "edenfs_eden") { + fstype != "edenfs_eden" && fstype != "fuse.edenfs") { // Not an active EdenFS mount. Perhaps it isn't mounted yet? auto readme = fmt::format("{}/README_EDEN.txt", root_path); try { From 00a7b136f667c6032ba32af30b8128c11f308cee Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 30 Mar 2024 09:31:06 -0700 Subject: [PATCH 6846/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/9d29f3ce6d158c5b96121096289c44c8a1fba8c4 https://github.com/facebook/fb303/commit/c94516cf69a7e7fbf41db9cc92f46a133b5c38ca https://github.com/facebook/fbthrift/commit/e15ea167294f9b1c5f652a4da3c97daea059ea3f https://github.com/facebook/folly/commit/8203c08cb45c65dd5dfb3d6762a03531bbf1e5b2 https://github.com/facebook/mvfst/commit/362a85c07194527d4b6abe7c39f1524ddc46f4ae https://github.com/facebook/wangle/commit/2691b683ee516e212b730171bf4e042b25c683af https://github.com/facebookexperimental/edencommon/commit/312e264dc6ad9c45b8943a49d2e467f32a8e6a9e https://github.com/facebookexperimental/rust-shed/commit/3de59245556d1514eabf79e6456881645fd334e2 https://github.com/facebookincubator/fizz/commit/1c0c061b5e5aeda261ff5d0b5ada120373e82875 Reviewed By: bigfootjon fbshipit-source-id: 68ed7964f1e75ceb35bb46fb37936b02c3ded843 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b6cc494f9604..23167532424e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 64c0535a3cbfa481aeb5efb35ebe0c25f953210e +Subproject commit e15ea167294f9b1c5f652a4da3c97daea059ea3f diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ce0008e05db4..bcb0fb887f67 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit cd2ed1e6016a7e0433d48e22640d01489d8982c3 +Subproject commit 8203c08cb45c65dd5dfb3d6762a03531bbf1e5b2 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5d03503f6210..8e9cd16b6a31 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 66e4f3b23bdeae80548963f69dbe9338992d0531 +Subproject commit 2691b683ee516e212b730171bf4e042b25c683af From cdf77b4b429ae8e436414c6107b57ddeae50bd86 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 31 Mar 2024 09:31:51 -0700 Subject: [PATCH 6847/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/c6f483c05f81464b314e24bf1a2a4115a4e4c874 https://github.com/facebook/fb303/commit/bb2992183c3d0688d7ecae13905243393579c701 https://github.com/facebook/fbthrift/commit/f80363cbd5f2089abdca1959c1d5acc88a8b689a https://github.com/facebook/folly/commit/ed02a7fbefc3db23a8bbe7560f108d3bd9be764a https://github.com/facebook/mvfst/commit/296b81478ebe60fbdb075c557ee24e099ffdd992 https://github.com/facebook/wangle/commit/4cff85dde9e2213a95d16368fa47b14cfaa55130 https://github.com/facebookexperimental/edencommon/commit/5a56bbceb7ac32036ed6dab8ca28d27984442ed9 https://github.com/facebookexperimental/rust-shed/commit/fcff13bcfc4bd52b8eee53e473e218f3dc7eebc5 https://github.com/facebookincubator/fizz/commit/3404385e632f4c748a9a1f976fa9e2c084b20a5b Reviewed By: bigfootjon fbshipit-source-id: ebb51bb92e649055ee90e56a99c76c626b65c654 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 23167532424e..2de3e3bc29e0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e15ea167294f9b1c5f652a4da3c97daea059ea3f +Subproject commit f80363cbd5f2089abdca1959c1d5acc88a8b689a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index bcb0fb887f67..25d002d5f852 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 8203c08cb45c65dd5dfb3d6762a03531bbf1e5b2 +Subproject commit ed02a7fbefc3db23a8bbe7560f108d3bd9be764a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8e9cd16b6a31..5fb6fdd9c179 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2691b683ee516e212b730171bf4e042b25c683af +Subproject commit 4cff85dde9e2213a95d16368fa47b14cfaa55130 From 518e8d4a1d3b7e1c750cf088b965a07176c6cee2 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 1 Apr 2024 09:32:53 -0700 Subject: [PATCH 6848/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/04ced8b4145c70ff30781e338f2bf232b077a90c https://github.com/facebook/fb303/commit/9c7b6c30a7e6080f3479b524532b0c4004ed5d3a https://github.com/facebook/fbthrift/commit/1de93f4bd143c4187c0313adbfbf672cf68b8b36 https://github.com/facebook/folly/commit/3e001b85f4cbfcf962a696b89c1284a00083fce1 https://github.com/facebook/mvfst/commit/981c7682dd109a6dedad062be83e9befeb949c54 https://github.com/facebook/wangle/commit/e6872eb402ddc9ed022de04b2fa38fe19a43e3ec https://github.com/facebookexperimental/edencommon/commit/5caa37e56fbe3195740374fcb10fdb60c79028d2 https://github.com/facebookexperimental/rust-shed/commit/7b226adeb303b5fbf8d8b6835f65c66b4bb7e3ae https://github.com/facebookincubator/fizz/commit/ca4d555d153ca4d3eb50002a582adb53b02c8131 Reviewed By: jailby fbshipit-source-id: 8f99aa02313a5a72228350b54e9db9c57eafaf0f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2de3e3bc29e0..e305e13da909 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f80363cbd5f2089abdca1959c1d5acc88a8b689a +Subproject commit 1de93f4bd143c4187c0313adbfbf672cf68b8b36 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 25d002d5f852..47f05e62c693 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ed02a7fbefc3db23a8bbe7560f108d3bd9be764a +Subproject commit 3e001b85f4cbfcf962a696b89c1284a00083fce1 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5fb6fdd9c179..c375005f5e27 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 4cff85dde9e2213a95d16368fa47b14cfaa55130 +Subproject commit e6872eb402ddc9ed022de04b2fa38fe19a43e3ec From d4135131a1a8866d9b1711638b971d3297808d71 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 2 Apr 2024 09:32:24 -0700 Subject: [PATCH 6849/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/cdc210d824f412ce924bcfa58fd64715e69cf626 https://github.com/facebook/fb303/commit/3b05d1994050d4b6adab4104b41af5941101ad1d https://github.com/facebook/fbthrift/commit/172d08253a59f1eb328c58b4d7931973fb393788 https://github.com/facebook/folly/commit/f98afc01c1c5701c89d2777d8d81181cd8cae875 https://github.com/facebook/mvfst/commit/2f7b16ea26c3a80fe73cd7f7e04e81f794218d00 https://github.com/facebook/wangle/commit/7b42fc77b9bb8b3d45d33e91c8ef8ce4afbaf7b2 https://github.com/facebookexperimental/edencommon/commit/7e85f4ce7bc11ef985d120f198826a7f4eb24199 https://github.com/facebookexperimental/rust-shed/commit/5e2653a4ea37d8416cbc799fd7b7ca12c80aa50c https://github.com/facebookincubator/fizz/commit/785804d7a19e2b31365622fa91b11af8bc0bf834 Reviewed By: jailby fbshipit-source-id: 7afcf12b37a1c856d5f3929f328145ee024976e5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e305e13da909..a0c6b78f4275 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1de93f4bd143c4187c0313adbfbf672cf68b8b36 +Subproject commit 172d08253a59f1eb328c58b4d7931973fb393788 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 47f05e62c693..e7129427cd71 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 3e001b85f4cbfcf962a696b89c1284a00083fce1 +Subproject commit f98afc01c1c5701c89d2777d8d81181cd8cae875 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c375005f5e27..32b325811b7d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e6872eb402ddc9ed022de04b2fa38fe19a43e3ec +Subproject commit 7b42fc77b9bb8b3d45d33e91c8ef8ce4afbaf7b2 From a8783973bc21492e9427dd53ef0c8b6d60ba991b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 3 Apr 2024 09:32:16 -0700 Subject: [PATCH 6850/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/d61ab2a035c2548cf39877ad44a493ecf40366bb https://github.com/facebook/fb303/commit/2df47db69096c9b0de1c96edb17edf6205017a8b https://github.com/facebook/fbthrift/commit/e6176f5569cb3e0dd505e1dc8a26eda84f448d76 https://github.com/facebook/folly/commit/9f194cd6de89fdaaf61c1a313f5ed4b36c394396 https://github.com/facebook/mvfst/commit/d2dfb9ba761ff85dc2d3e9f1eb125403de350297 https://github.com/facebook/wangle/commit/0cae98b477c5343f5aa0dcf2ef57f26db2303aae https://github.com/facebookexperimental/edencommon/commit/40b2c4bd962c08864a03525f2a96337f72202cde https://github.com/facebookexperimental/rust-shed/commit/1306b1163ce7de06af91db002229e56f52280a4e https://github.com/facebookincubator/fizz/commit/abe519c6357cbd7ed59a4b894710e91652064a00 Reviewed By: jailby fbshipit-source-id: f9e11b0003c684d02c03303036b88e1862b20ca4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a0c6b78f4275..eac0e78d86ef 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 172d08253a59f1eb328c58b4d7931973fb393788 +Subproject commit e6176f5569cb3e0dd505e1dc8a26eda84f448d76 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e7129427cd71..5c29e9a0bfa4 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f98afc01c1c5701c89d2777d8d81181cd8cae875 +Subproject commit 9f194cd6de89fdaaf61c1a313f5ed4b36c394396 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 32b325811b7d..9aa7dddba63a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7b42fc77b9bb8b3d45d33e91c8ef8ce4afbaf7b2 +Subproject commit 0cae98b477c5343f5aa0dcf2ef57f26db2303aae From 4744a9d434caec403a651411853cc9d9de5c5a75 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 4 Apr 2024 09:31:43 -0700 Subject: [PATCH 6851/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/73d0744bce9dd1e19d7f466ae952be84a0de2868 https://github.com/facebook/fb303/commit/294642b228a715529cade7496f218222e270b0df https://github.com/facebook/fbthrift/commit/245b886fe40ca2cd2685d31de13dff538dd9eb59 https://github.com/facebook/folly/commit/1683617733dc2666c9b7e439f36ca6ea3caf12f4 https://github.com/facebook/mvfst/commit/49a0d23f315e3e5ab94623ec238170c9dbf769fd https://github.com/facebook/wangle/commit/4023298d1b6b6d4914eb885d51208d1ba6595623 https://github.com/facebookexperimental/edencommon/commit/8ed24a27a283201d4b282d25e89278eee31c9eb7 https://github.com/facebookexperimental/rust-shed/commit/c34c0d342086369a26c49cd91e0d0c675d535119 https://github.com/facebookincubator/fizz/commit/00674a5f6685e54270e1c6fc6ed3e0ef1e489d35 Reviewed By: jailby fbshipit-source-id: f5d5ee25582b074389be38e11559b39a68431c57 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index eac0e78d86ef..49a379bceaf6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e6176f5569cb3e0dd505e1dc8a26eda84f448d76 +Subproject commit 245b886fe40ca2cd2685d31de13dff538dd9eb59 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 5c29e9a0bfa4..f764ef530a51 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9f194cd6de89fdaaf61c1a313f5ed4b36c394396 +Subproject commit 1683617733dc2666c9b7e439f36ca6ea3caf12f4 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9aa7dddba63a..40105c3b73b5 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0cae98b477c5343f5aa0dcf2ef57f26db2303aae +Subproject commit 4023298d1b6b6d4914eb885d51208d1ba6595623 From 8f9841daff63eadf16b524052c6bfc484f867883 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 5 Apr 2024 09:32:05 -0700 Subject: [PATCH 6852/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/620b2252d5f8367de5ca2fa01b2eb167bad84a33 https://github.com/facebook/fb303/commit/eff71cbf3cf9ffce3c5fc4f22c2f67c5146d1124 https://github.com/facebook/fbthrift/commit/5616652608ae2e5b3846746380fa5bd8f92c4200 https://github.com/facebook/folly/commit/13b2c15b2d887cdb0cb2457ef8599de867edb142 https://github.com/facebook/mvfst/commit/19908073de2ac8573e42713134cd9a9577fbf46d https://github.com/facebook/wangle/commit/490cfe3e00a87abc4e91702409be2d659851184c https://github.com/facebookexperimental/edencommon/commit/101b9f671033cb59f89ddf27471f4536eb1a3022 https://github.com/facebookexperimental/rust-shed/commit/01938fc9e5952a397be7782781220eb543ed9a64 https://github.com/facebookincubator/fizz/commit/4b96c721697665a7a15e605dea42648af1d81dc4 Reviewed By: jailby fbshipit-source-id: f213237264bc0b5e22d754c999f86cb9b482106f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 49a379bceaf6..0955eefedda6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 245b886fe40ca2cd2685d31de13dff538dd9eb59 +Subproject commit 5616652608ae2e5b3846746380fa5bd8f92c4200 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f764ef530a51..9f93282bd0bb 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1683617733dc2666c9b7e439f36ca6ea3caf12f4 +Subproject commit 13b2c15b2d887cdb0cb2457ef8599de867edb142 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 40105c3b73b5..c7245ef1144c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 4023298d1b6b6d4914eb885d51208d1ba6595623 +Subproject commit 490cfe3e00a87abc4e91702409be2d659851184c From a3f2f0128b525c828c8bec6a56e625dba66639bd Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 6 Apr 2024 09:33:03 -0700 Subject: [PATCH 6853/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/05d7a2f5284c62398ee6c2a94c9987a9c72d91b3 https://github.com/facebook/fb303/commit/6fb890a4b668cd7e1c6cc058bddef4724e2d2fab https://github.com/facebook/fbthrift/commit/6428579d3e25e93d7d9db025d929ca58ff1fe17a https://github.com/facebook/folly/commit/f16c79b9873e435264378367582adda546d8b593 https://github.com/facebook/mvfst/commit/de0349d682f625fdb54f589b32c8b6efb8813c33 https://github.com/facebook/wangle/commit/0bc8f7c8ebf1e149a29e92640f266b265ff39048 https://github.com/facebookexperimental/edencommon/commit/cba8554c0403c8f647e8b3cee38fb3509604aa41 https://github.com/facebookexperimental/rust-shed/commit/463336000f5ab4dc9033ccf8784affb4603c0673 https://github.com/facebookincubator/fizz/commit/cd80f33e85931685e16229af58a6de5fc141bc29 Reviewed By: jailby fbshipit-source-id: e99c0b149a1034b15387203434829f8fa579a816 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0955eefedda6..b04605a14fc4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5616652608ae2e5b3846746380fa5bd8f92c4200 +Subproject commit 6428579d3e25e93d7d9db025d929ca58ff1fe17a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9f93282bd0bb..4b85c1960002 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 13b2c15b2d887cdb0cb2457ef8599de867edb142 +Subproject commit f16c79b9873e435264378367582adda546d8b593 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c7245ef1144c..1b55ad81b165 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 490cfe3e00a87abc4e91702409be2d659851184c +Subproject commit 0bc8f7c8ebf1e149a29e92640f266b265ff39048 From cb5a8dd608f4fcef659a98c5dba380cd8a76565a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 7 Apr 2024 09:33:13 -0700 Subject: [PATCH 6854/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/6b7e6c48a315a960726988205f03316e285a4b9f https://github.com/facebook/fbthrift/commit/36cf07db220c7e8c713a6cccb7324512905227b0 https://github.com/facebook/mvfst/commit/4524f39bbad00856adff8c65732dc17278c07da3 https://github.com/facebook/wangle/commit/1db564751b7ce98aafa27c40a9bf209a839f90ec https://github.com/facebookexperimental/edencommon/commit/6c256b1fcbf9b3afbb6790da5f9a4fc0f6ab4e6b https://github.com/facebookexperimental/rust-shed/commit/2e71630f5090d40f7f5b61c816c9aa0eddceb8ca https://github.com/facebookincubator/fizz/commit/a726bc2f30b92737758365bcf1b561b691fae922 Reviewed By: jailby fbshipit-source-id: 813d821c29914b3bf03b89534c1ccde4b5144cba --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b04605a14fc4..da7529b93a98 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6428579d3e25e93d7d9db025d929ca58ff1fe17a +Subproject commit 36cf07db220c7e8c713a6cccb7324512905227b0 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1b55ad81b165..166172127472 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0bc8f7c8ebf1e149a29e92640f266b265ff39048 +Subproject commit 1db564751b7ce98aafa27c40a9bf209a839f90ec From 33ee3501447249b4042c185aa49c30b45b5cb425 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 8 Apr 2024 09:31:59 -0700 Subject: [PATCH 6855/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/b3fb26721a5fbc9dbe8658aa525ca555a8ba259d https://github.com/facebook/fb303/commit/6b061ba4ebfe43165c5ada2e2d0ebf22008b4a2a https://github.com/facebook/fbthrift/commit/16a33484e4037394b213ee33d3e75ee0f3279293 https://github.com/facebook/mvfst/commit/8b591d1191962b202d82200c22492440febaab10 https://github.com/facebook/wangle/commit/9eaf85a8b49ed3e7b3e1c81c04b283f2fc8c98eb https://github.com/facebookexperimental/rust-shed/commit/fb1da3d9d360cfd667d967059aab6317039ddc3b Reviewed By: jailby fbshipit-source-id: 899da7a5f248c73f1db1c141c7d1908ce376eb78 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index da7529b93a98..82b1887fe9b3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 36cf07db220c7e8c713a6cccb7324512905227b0 +Subproject commit 16a33484e4037394b213ee33d3e75ee0f3279293 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 166172127472..e6f1bcf467be 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1db564751b7ce98aafa27c40a9bf209a839f90ec +Subproject commit 9eaf85a8b49ed3e7b3e1c81c04b283f2fc8c98eb From 760694e802f810af86d16a49f722077cf553a6ce Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 9 Apr 2024 09:31:15 -0700 Subject: [PATCH 6856/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/e218340c0876bdd856126ef40688e3ccb2da57bb https://github.com/facebook/fb303/commit/3dedaac44fadb58498b34d25188b8ea809e07ac8 https://github.com/facebook/fbthrift/commit/804bab0c02781d4f28c20989dc3bc85635f2e1a6 https://github.com/facebook/folly/commit/d40da56da426cf5a1d897ec1f6959c5959695fca https://github.com/facebook/mvfst/commit/875bca11da1dab92158a917786166ca8a918572e https://github.com/facebookexperimental/rust-shed/commit/d8cf6101d9947d5580651b5554d019ba80db9f1d Reviewed By: jurajh-fb fbshipit-source-id: cee0dd13b95fa23a31f971c4b96d428256fd3901 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 82b1887fe9b3..cbab22130f48 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 16a33484e4037394b213ee33d3e75ee0f3279293 +Subproject commit 804bab0c02781d4f28c20989dc3bc85635f2e1a6 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4b85c1960002..fdac47ceebfd 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f16c79b9873e435264378367582adda546d8b593 +Subproject commit d40da56da426cf5a1d897ec1f6959c5959695fca From 3c79474d5bb94c2d39dc313cfa3ba3395376ec6f Mon Sep 17 00:00:00 2001 From: Tarun Manchala <50692429+Tarun-Manchala@users.noreply.github.com> Date: Tue, 9 Apr 2024 17:56:16 -0700 Subject: [PATCH 6857/7387] Update README.markdown (#1211) Summary: In the Readme file, the contributing guidelines link redirects to an empty page with the error "page not found". Now, I updated it's path. Pull Request resolved: https://github.com/facebook/watchman/pull/1211 Reviewed By: genevievehelsel Differential Revision: D55915861 fbshipit-source-id: 732c31d4bc34dfe0595b3a2ed363f838eb90fe31 --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index 4845cbcd3fc9..257b21aba448 100644 --- a/README.markdown +++ b/README.markdown @@ -38,4 +38,4 @@ Please submit a [GitHub issue](https://github.com/facebook/watchman/issues/) to ## Contributing -Please see the [contributing guide](https://facebook.github.io/watchman/contributing.html). +Please see the [contributing guide](https://facebook.github.io/watchman/docs/contributing). From c08670fc7fbc1c2aa9b0e76ddf8c71deeb0a04aa Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 10 Apr 2024 09:32:41 -0700 Subject: [PATCH 6858/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/cf5ca0d255d2858a2631c4b57289c66a42733d19 https://github.com/facebook/fb303/commit/c4e1d5407e60486eccb03778ca43261f2599b10c https://github.com/facebook/fbthrift/commit/b1652320496b27199945342ea435ad0c49fb3c76 https://github.com/facebook/folly/commit/dbc9e565f54eabb40ad6600656ad9dea919f51c0 https://github.com/facebook/mvfst/commit/1730ed8a73d9a3c1e07dd97da736b889da25d85c https://github.com/facebook/wangle/commit/7d1e9f53ae1a7cd88eb673ccce4f2957bd383b14 https://github.com/facebookexperimental/edencommon/commit/b9ce3886f9c74cfe371dc7229b7327abab8c8770 https://github.com/facebookexperimental/rust-shed/commit/7fd4752ec6512b08bbd843f1de362f83f8993f0c https://github.com/facebookincubator/fizz/commit/3b579d47c465c391582b82b983a6c1f03da912e2 Reviewed By: jurajh-fb fbshipit-source-id: 43a6dce6f4c27c371f530d4e0d7549c445c2dcab --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cbab22130f48..4b4cd9021e72 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 804bab0c02781d4f28c20989dc3bc85635f2e1a6 +Subproject commit b1652320496b27199945342ea435ad0c49fb3c76 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index fdac47ceebfd..96a9e5daf42d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d40da56da426cf5a1d897ec1f6959c5959695fca +Subproject commit dbc9e565f54eabb40ad6600656ad9dea919f51c0 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e6f1bcf467be..f960cafee9ed 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9eaf85a8b49ed3e7b3e1c81c04b283f2fc8c98eb +Subproject commit 7d1e9f53ae1a7cd88eb673ccce4f2957bd383b14 From 23b630a46c7afcdf828cd810560ba09c1543ea04 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 11 Apr 2024 09:32:05 -0700 Subject: [PATCH 6859/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/36a2c3098cd34e3e7df996a42f7ca4ab5ec729c6 https://github.com/facebook/fb303/commit/770f72623767a63f3d3021db6987fa3508f89321 https://github.com/facebook/fbthrift/commit/e8d18708f1c09b38b1aa1b161b07b68a3c4180a9 https://github.com/facebook/folly/commit/5f460657f2259794c5aae52a695b9bd74ffb80c0 https://github.com/facebook/mvfst/commit/0aa19f6897ce9bebd4aba5b677920208d06e30b4 https://github.com/facebook/wangle/commit/ea6efd3d2da02eb4d895372e52c95958599d6522 https://github.com/facebookexperimental/edencommon/commit/fcabce6f2151c3e8167c1a09902bbdfe512ac5a8 https://github.com/facebookexperimental/rust-shed/commit/b6698c3d1721a2e36fae3a86110e82a69e20c0b8 https://github.com/facebookincubator/fizz/commit/f7f9f59f90a2df521fc2012b66af9959fa552a15 Reviewed By: jurajh-fb fbshipit-source-id: a9c0ab6033bc63fd419d5bece1b273f524fb94ee --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4b4cd9021e72..7a529dafb5e7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b1652320496b27199945342ea435ad0c49fb3c76 +Subproject commit e8d18708f1c09b38b1aa1b161b07b68a3c4180a9 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 96a9e5daf42d..2328fc71c220 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit dbc9e565f54eabb40ad6600656ad9dea919f51c0 +Subproject commit 5f460657f2259794c5aae52a695b9bd74ffb80c0 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f960cafee9ed..46583bfaa276 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7d1e9f53ae1a7cd88eb673ccce4f2957bd383b14 +Subproject commit ea6efd3d2da02eb4d895372e52c95958599d6522 From d3c4085a12d7cb13dcfeb65bcc9b484186355350 Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Thu, 11 Apr 2024 17:12:18 -0700 Subject: [PATCH 6860/7387] recognize fuse.edenfs as eden part 2 Summary: Were gonna block list eden from being crawled by updatedb - the indexer on fedora. We block list by vfstype, and currently eden uses fuse. That's a bit generic so were gonna switch to fuse.edenfs. This teaches watchman to treat them the same. Should not effect detecting an eden repo. But this gets fanned out in a lot of places. better safe than sorry. Reviewed By: genevievehelsel Differential Revision: D55829067 fbshipit-source-id: 625f84f00b6476d0e0c3bc7ce256b6858da22c23 --- watchman/fs/FSDetect.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/watchman/fs/FSDetect.cpp b/watchman/fs/FSDetect.cpp index b31d3e34ce52..1cc355f3c9dc 100644 --- a/watchman/fs/FSDetect.cpp +++ b/watchman/fs/FSDetect.cpp @@ -76,8 +76,8 @@ std::optional find_fstype_in_linux_proc_mounts( // This is a better match than any prior mount point bestMountPoint = mountPoint; - if (vfstype == "fuse") { - // For example: edenfs registers with fstype "fuse" + if (vfstype == "fuse" || vfstype == "fuse.edenfs") { + // For example: edenfs registers with fstype "fuse" or "fuse.edenfs" // and device "edenfs", so we take the device node // as the filesystem type bestVfsType = device; From 4a2b8332ecbb0339a1ea4cae1a63ff12e330c422 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 12 Apr 2024 09:32:41 -0700 Subject: [PATCH 6861/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/f216366c47d6eb250e3c5e3dd9ee73ae62a4a7ea https://github.com/facebook/fb303/commit/dcaafdc253d0ba2b49c003cc0dca0762a3376736 https://github.com/facebook/fbthrift/commit/4ea4959916e30eda53d652491e27b5917636a317 https://github.com/facebook/folly/commit/f395e536bb36b081f108f3f226dcd3b32baadb37 https://github.com/facebook/mvfst/commit/1af8ca8bad4d667e7580d7540daba8acf4f251c3 https://github.com/facebook/wangle/commit/92128c49a7740bee56da6fa32743ce7ab613ca0f https://github.com/facebookexperimental/edencommon/commit/2155a229b4d1866257ae3b0f1981da9c609269f0 https://github.com/facebookexperimental/rust-shed/commit/c24954aa3cd8bbac96cfef14773ee4e65bf10b40 https://github.com/facebookincubator/fizz/commit/a2ca1336d57041aec17871c2b1566e7d0ea516b5 Reviewed By: jurajh-fb fbshipit-source-id: 0c1f8805f2427e418de863aea66a44bca2b83db8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7a529dafb5e7..0235080077af 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e8d18708f1c09b38b1aa1b161b07b68a3c4180a9 +Subproject commit 4ea4959916e30eda53d652491e27b5917636a317 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 2328fc71c220..4b674d6ff4e9 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 5f460657f2259794c5aae52a695b9bd74ffb80c0 +Subproject commit f395e536bb36b081f108f3f226dcd3b32baadb37 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 46583bfaa276..a4cb2328befa 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ea6efd3d2da02eb4d895372e52c95958599d6522 +Subproject commit 92128c49a7740bee56da6fa32743ce7ab613ca0f From 2cf6d2e9454541f07fd02e6382997cb146a0a08e Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 12 Apr 2024 17:31:35 -0700 Subject: [PATCH 6862/7387] add "rocky" as a known distro using rpm Summary: X-link: https://github.com/facebookincubator/zstrong/pull/746 this allows us to use the preinstalled package on a "rocky" box as the build dependencies. Signed-off-by: Kefu Chai X-link: https://github.com/facebook/folly/pull/1741 Reviewed By: dmm-fb Differential Revision: D35348932 Pulled By: yfeldblum fbshipit-source-id: 956cd6a7a8ddeffb090ef0c141feb5b946368e0d --- build/fbcode_builder/getdeps/platform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/getdeps/platform.py b/build/fbcode_builder/getdeps/platform.py index 4def6f0d7687..f258f3994182 100644 --- a/build/fbcode_builder/getdeps/platform.py +++ b/build/fbcode_builder/getdeps/platform.py @@ -270,7 +270,7 @@ def get_package_manager(self): return None if self.is_darwin(): return "homebrew" - if self.distro in ("fedora", "centos", "centos_stream"): + if self.distro in ("fedora", "centos", "centos_stream", "rocky"): return "rpm" if self.distro.startswith(("debian", "ubuntu", "pop!_os")): return "deb" From 762240668ecb7e242fded4d3d3bef3544f8a3296 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 13 Apr 2024 09:33:16 -0700 Subject: [PATCH 6863/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/fd0b16ac1085797ba46e7916f7441dd716a58658 https://github.com/facebook/fb303/commit/63a9ba0eff9ad14d5e6814b6e502154e52ae9b46 https://github.com/facebook/fbthrift/commit/07a04182cda15bcb25a23864ef2906ab410a67bd https://github.com/facebook/folly/commit/434ce292fdb59374b83bfe03aa0be3c90ef26a1d https://github.com/facebook/mvfst/commit/dcc6bbbe3cff5ef1a978e548a2501bc590e98a1f https://github.com/facebook/wangle/commit/33465b5c115ed386bd596c60d0d959739b95e93e https://github.com/facebookexperimental/edencommon/commit/4792c89024d4516784c7697b37bd5d736ff8c189 https://github.com/facebookexperimental/rust-shed/commit/390cf5714d91a8ea8a5c01d0ed5e75c94e975524 https://github.com/facebookincubator/fizz/commit/68b41ca9962b95efe26a06e22918881859b886b4 Reviewed By: jurajh-fb fbshipit-source-id: f3f2704446bfe2a03fb3677328b333b4fc6029e2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0235080077af..20759c545ef0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4ea4959916e30eda53d652491e27b5917636a317 +Subproject commit 07a04182cda15bcb25a23864ef2906ab410a67bd diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4b674d6ff4e9..b09093a76b11 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f395e536bb36b081f108f3f226dcd3b32baadb37 +Subproject commit 434ce292fdb59374b83bfe03aa0be3c90ef26a1d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a4cb2328befa..1b1cfadc60a6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 92128c49a7740bee56da6fa32743ce7ab613ca0f +Subproject commit 33465b5c115ed386bd596c60d0d959739b95e93e From c734220a4779d3acd2288f097e0141d68e8599ee Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 14 Apr 2024 09:31:17 -0700 Subject: [PATCH 6864/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/36321f97fc20b57efb5864606d61f4568e42a7fd https://github.com/facebook/fb303/commit/47f98d9025ca2989002fbcd661d2f7e7d17d354e https://github.com/facebook/fbthrift/commit/19ab5b9fb8008a169e5cadf94d4e89f714ab4276 https://github.com/facebook/mvfst/commit/4b3f0d06f2aa4cc30b1a2f3d722b2b074f1fa0e6 https://github.com/facebook/wangle/commit/c220a41471b0e35a4b9f539de3bb692fa69a6ddf https://github.com/facebookexperimental/edencommon/commit/56d1ff78f6ecdf94bfb6912587015b3745a43548 https://github.com/facebookexperimental/rust-shed/commit/dba509db4adf73ffd4ce8c25768e33db9e9731b6 https://github.com/facebookincubator/fizz/commit/0f83485890870c7d9baba9f0d6e55f0380c64651 Reviewed By: jurajh-fb fbshipit-source-id: a334b41465353712bb9972d3b91a9446cb7fa466 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 20759c545ef0..090afdf674ca 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 07a04182cda15bcb25a23864ef2906ab410a67bd +Subproject commit 19ab5b9fb8008a169e5cadf94d4e89f714ab4276 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1b1cfadc60a6..9d55483bdd83 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 33465b5c115ed386bd596c60d0d959739b95e93e +Subproject commit c220a41471b0e35a4b9f539de3bb692fa69a6ddf From 8d0e02e0842eaf73dcaaf8e619ff3801df5d5e5e Mon Sep 17 00:00:00 2001 From: Andres Suarez Date: Sun, 14 Apr 2024 11:28:32 -0700 Subject: [PATCH 6865/7387] Apply clang-format 18 Summary: Previously this code conformed from clang-format 12. Reviewed By: igorsugak Differential Revision: D56065247 fbshipit-source-id: f5a985dd8f8b84f2f9e1818b3719b43c5a1b05b3 --- watchman/watcher/win32.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/watchman/watcher/win32.cpp b/watchman/watcher/win32.cpp index 7edf8593c23f..e586b7aa6ee6 100644 --- a/watchman/watcher/win32.cpp +++ b/watchman/watcher/win32.cpp @@ -298,8 +298,8 @@ void WinWatcher::readChangesThread(const std::shared_ptr& root) { if (notify->NextEntryOffset == 0) { break; } - notify = - (PFILE_NOTIFY_INFORMATION)(notify->NextEntryOffset + (char*)notify); + notify = (PFILE_NOTIFY_INFORMATION)(notify->NextEntryOffset + + (char*)notify); } } From 992c1c21e17c01387ae36353897c42ffa6847a64 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 15 Apr 2024 09:34:31 -0700 Subject: [PATCH 6866/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/7090ea7481607d9955669e869c8016df23be2cbd https://github.com/facebook/fb303/commit/1b7544f1d995eeacb5083186ff6e4ae846dcfe04 https://github.com/facebook/fbthrift/commit/6a48e4ebb87db90aa0e550a6dc4b93b5d11d2f06 https://github.com/facebook/folly/commit/d3a569dd9fa041c1883f83fade8aa8b309a940c2 https://github.com/facebook/mvfst/commit/71fac54812b271e0530698ffa36ea90289bece45 https://github.com/facebook/wangle/commit/8389b30607d4213999dafa571ec83f475ad165bd https://github.com/facebookexperimental/edencommon/commit/bcfa404a46f97d344744679792b913205287ad70 https://github.com/facebookexperimental/rust-shed/commit/323c008b7df1c0b056dd9f4c697a5b87bfcddd05 https://github.com/facebookincubator/fizz/commit/89ddbcc4d6dd69477ae510de5ad3b5700e53395c Reviewed By: ajb85 fbshipit-source-id: a1c9a061e258c6b4a7519209ed970b0e5843b44f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 090afdf674ca..24cdb56576e3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 19ab5b9fb8008a169e5cadf94d4e89f714ab4276 +Subproject commit 6a48e4ebb87db90aa0e550a6dc4b93b5d11d2f06 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b09093a76b11..2e6c1178620c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 434ce292fdb59374b83bfe03aa0be3c90ef26a1d +Subproject commit d3a569dd9fa041c1883f83fade8aa8b309a940c2 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9d55483bdd83..6f2488a046bb 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c220a41471b0e35a4b9f539de3bb692fa69a6ddf +Subproject commit 8389b30607d4213999dafa571ec83f475ad165bd From b28fc2e8546c0435200087bda5f65725f43828ba Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 16 Apr 2024 09:31:57 -0700 Subject: [PATCH 6867/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/0f661d16372ffdf372e7bb86b9ab26e197bf5e1f https://github.com/facebook/fb303/commit/ec160720b82f14ade483b82c2542af1326e91528 https://github.com/facebook/fbthrift/commit/221f8b18097c3bcd61424d977a3a7f4da0ed6f02 https://github.com/facebook/folly/commit/7f1cf32e1b74fcc5c25d5bfc5d54e98548efe999 https://github.com/facebook/mvfst/commit/a09c81fc968c900eb3c2ff2fd4562145c3584495 https://github.com/facebook/wangle/commit/566e8a5fc99fd53c37e018e5e4ea0bc47e9ef96b https://github.com/facebookexperimental/edencommon/commit/ab084d8a6d4123658c91632e54ff4aa125b653b5 https://github.com/facebookexperimental/rust-shed/commit/8f6b9aaca409311ffd1e029537f5f9b1b370850b https://github.com/facebookincubator/fizz/commit/878fa2433d3387ec5829b8fa6f8d8a73db753548 Reviewed By: ajb85 fbshipit-source-id: 1997be0eab7e4511dd36eea02e9ddfbe96f1edc8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 24cdb56576e3..4f2acfcc175b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6a48e4ebb87db90aa0e550a6dc4b93b5d11d2f06 +Subproject commit 221f8b18097c3bcd61424d977a3a7f4da0ed6f02 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 2e6c1178620c..63539048377e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d3a569dd9fa041c1883f83fade8aa8b309a940c2 +Subproject commit 7f1cf32e1b74fcc5c25d5bfc5d54e98548efe999 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6f2488a046bb..d5c60e14401c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8389b30607d4213999dafa571ec83f475ad165bd +Subproject commit 566e8a5fc99fd53c37e018e5e4ea0bc47e9ef96b From b517b8340b3c0a729b59507561291b6a9ed53ba5 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 17 Apr 2024 09:35:29 -0700 Subject: [PATCH 6868/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/918cec2296fbcd76a9b50e286c9fabb38176a78e https://github.com/facebook/fb303/commit/661a52500146c13612e1c52d4b984dc9c4d17ef9 https://github.com/facebook/fbthrift/commit/96dfbc394a77145cd5b93b086adb8906028cd27f https://github.com/facebook/folly/commit/427a1ef2c1641e0cfaec5c9300487d084175b00e https://github.com/facebook/mvfst/commit/b6d0633e844b37c2a5a1655e2d31e3e88540cd0d https://github.com/facebook/wangle/commit/a88cea3b3119fe1b6e6e74ab853aa2080ab3a3d4 https://github.com/facebookexperimental/edencommon/commit/dee05230c0f60fd593acd386ea742e35a3ced1b8 https://github.com/facebookexperimental/rust-shed/commit/b48e4112014c1243bee0d806058e45487c2609cc https://github.com/facebookincubator/fizz/commit/712b1f6feb5e17bfd7d13396ab8445d74d183704 Reviewed By: ajb85 fbshipit-source-id: e06087cbd38b02598ef67f75a480d4bcad439bbb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4f2acfcc175b..bf75ee053338 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 221f8b18097c3bcd61424d977a3a7f4da0ed6f02 +Subproject commit 96dfbc394a77145cd5b93b086adb8906028cd27f diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 63539048377e..e8807ecee089 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7f1cf32e1b74fcc5c25d5bfc5d54e98548efe999 +Subproject commit 427a1ef2c1641e0cfaec5c9300487d084175b00e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d5c60e14401c..e1caa9c1e2f1 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 566e8a5fc99fd53c37e018e5e4ea0bc47e9ef96b +Subproject commit a88cea3b3119fe1b6e6e74ab853aa2080ab3a3d4 From e6c8d9df597ef346d1748e355e55e014ddc27f8e Mon Sep 17 00:00:00 2001 From: Cat Core <34719527+thecatcore@users.noreply.github.com> Date: Wed, 17 Apr 2024 13:05:49 -0700 Subject: [PATCH 6869/7387] Fix github package upload being forbidden from ci (#1209) Summary: `release` workflow started failing since https://github.com/facebook/watchman/issues/1071 as upload was only allowed for github release and not github packages. Resulting in docker image failing to upload which is required for building linux packages. Pull Request resolved: https://github.com/facebook/watchman/pull/1209 Reviewed By: MichaelCuevas Differential Revision: D55878304 Pulled By: chadaustin fbshipit-source-id: 7cf6a0fc4b80cd516401e40f5a5a4a853223b660 --- .github/workflows/release.yml.in | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml.in b/.github/workflows/release.yml.in index 8123c19ebb0f..91c83436a3a6 100644 --- a/.github/workflows/release.yml.in +++ b/.github/workflows/release.yml.in @@ -7,6 +7,7 @@ on: permissions: contents: write # to create a release + packages: write # to upload a package jobs: prepare: From aaea4c6ca621c38d89beb632b73b3bdb166a399c Mon Sep 17 00:00:00 2001 From: John Elliott Date: Wed, 17 Apr 2024 16:03:32 -0700 Subject: [PATCH 6870/7387] Add initial watchman stats Summary: To support better telemetry and logging in watchman we want to use Eden's components. Lets migrate and detangle the needed pieces. This change copies the pattern for stats from Eden. Reviewed By: genevievehelsel Differential Revision: D55374958 fbshipit-source-id: 5bfcf8798569a7f209b55060cce29600c21fba05 --- watchman/telemetry/WatchmanStats.cpp | 22 +++++++++ watchman/telemetry/WatchmanStats.h | 69 ++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 watchman/telemetry/WatchmanStats.cpp create mode 100644 watchman/telemetry/WatchmanStats.h diff --git a/watchman/telemetry/WatchmanStats.cpp b/watchman/telemetry/WatchmanStats.cpp new file mode 100644 index 000000000000..71ea00c9181e --- /dev/null +++ b/watchman/telemetry/WatchmanStats.cpp @@ -0,0 +1,22 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +#include "watchman/telemetry/WatchmanStats.h" + +#include + +namespace watchman { + +void WatchmanStats::flush() { + // This method is only really useful while testing to ensure that the service + // data singleton instance has the latest stats. Since all our stats are now + // quantile stat based, flushing the quantile stat map is sufficient for that + // use case. + facebook::fb303::ServiceData::get()->getQuantileStatMap()->flushAll(); +} + +} // namespace watchman diff --git a/watchman/telemetry/WatchmanStats.h b/watchman/telemetry/WatchmanStats.h new file mode 100644 index 000000000000..67799328e20e --- /dev/null +++ b/watchman/telemetry/WatchmanStats.h @@ -0,0 +1,69 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +#pragma once + +#include + +#include + +#include "eden/common/telemetry/DurationScope.h" +#include "eden/common/telemetry/Stats.h" +#include "eden/common/telemetry/StatsGroup.h" +#include "eden/common/utils/RefPtr.h" + +namespace watchman { + +using StatsGroupBase = facebook::eden::StatsGroupBase; +using TelemetryStats = facebook::eden::TelemetryStats; + +class WatchmanStats : public facebook::eden::RefCounted { + public: + /** + * Records a specified elapsed duration. Updates thread-local storage, and + * aggregates into the fb303 ServiceData in the background and on reads. + */ + template + void addDuration( + StatsGroupBase::Duration T::*duration, + std::chrono::duration elapsed) { + (getStatsForCurrentThread().*duration).addDuration(elapsed); + } + + template + void increment(StatsGroupBase::Counter T::*counter, double value = 1.0) { + (getStatsForCurrentThread().*counter).addValue(value); + } + + /** + * Aggregates thread-locals into fb303's ServiceData. + * + * This function can be called on any thread. + */ + void flush(); + + template + T& getStatsForCurrentThread() = delete; + + private: + class ThreadLocalTag {}; + + template + using ThreadLocal = folly::ThreadLocal; + + ThreadLocal telemetryStats_; +}; + +using WatchmanStatsPtr = facebook::eden::RefPtr; + +template <> +inline TelemetryStats& +WatchmanStats::getStatsForCurrentThread() { + return *telemetryStats_.get(); +} + +} // namespace watchman From be46eac4a34780d9b87c8fe326004a76cacdc7d0 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Wed, 17 Apr 2024 16:03:32 -0700 Subject: [PATCH 6871/7387] Don't crash watchman when detected Eden root is not connected Summary: When watchman detects a root as an Eden root, but later dicovers that the Eden has stopped the mount or the mount is no longer connected - watchman SIGABRTs. This happens on Linux, when Eden had a partially successful graceful takeover, but failed to start the FUSE channel (typically due to some authentication issues). Lets make watchman more resliant to this situation by returning an TerminalWatcherError rather than passing through a std::system_exception. This will still fail the watchman command, but not crash the daemon - often resulting in a crash loop. Reviewed By: kmancini Differential Revision: D56043760 fbshipit-source-id: 728f862c0dd326fc75f6d38e80ad06fd117ccaa5 --- .../integration/eden/test_eden_takeover.py | 26 +++++++++++++++++++ .../integration/eden/test_eden_unmount.py | 19 +++++++++++--- .../integration/lib/WatchmanEdenTestCase.py | 2 +- watchman/watcher/eden.cpp | 21 +++++++++++++-- 4 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 watchman/integration/eden/test_eden_takeover.py diff --git a/watchman/integration/eden/test_eden_takeover.py b/watchman/integration/eden/test_eden_takeover.py new file mode 100644 index 000000000000..931ab2becf04 --- /dev/null +++ b/watchman/integration/eden/test_eden_takeover.py @@ -0,0 +1,26 @@ +# vim:ts=4:sw=4:et: +# Copyright (c) Meta Platforms, Inc. and affiliates. +# +# This source code is licensed under the MIT license found in the +# LICENSE file in the root directory of this source tree. + +# pyre-unsafe + +from watchman.integration.lib import WatchmanEdenTestCase + + +def populate(repo): + repo.write_file(".watchmanconfig", '{"ignore_dirs":[".buckd"]}') + repo.write_file("hello", "hola\n") + repo.commit("initial commit.") + + +class TestEdenTakeover(WatchmanEdenTestCase.WatchmanEdenTestCase): + def test_eden_takeover(self) -> None: + root = self.makeEdenMount(populate) + self.eden.graceful_restart() + + self.watchmanCommand("watch", root) + watch_list = self.getWatchList() + self.assertEqual(len(watch_list), 1) + self.assertEqual(watch_list[0], root) diff --git a/watchman/integration/eden/test_eden_unmount.py b/watchman/integration/eden/test_eden_unmount.py index f812561de67c..d440412b3054 100644 --- a/watchman/integration/eden/test_eden_unmount.py +++ b/watchman/integration/eden/test_eden_unmount.py @@ -11,12 +11,14 @@ from watchman.integration.lib import WatchmanEdenTestCase +def populate(repo): + repo.write_file(".watchmanconfig", '{"ignore_dirs":[".buckd"]}') + repo.write_file("hello", "hola\n") + repo.commit("initial commit.") + + class TestEdenUnmount(WatchmanEdenTestCase.WatchmanEdenTestCase): def test_eden_unmount(self) -> None: - def populate(repo): - repo.write_file(".watchmanconfig", '{"ignore_dirs":[".buckd"]}') - repo.write_file("hello", "hola\n") - repo.commit("initial commit.") root = self.makeEdenMount(populate) self.watchmanCommand("watch", root) @@ -30,3 +32,12 @@ def populate(repo): self.watchmanCommand("query", root, {"fields": ["name"], "since": clock}) self.assertRegex(str(ctx.exception), "unable to resolve root") + + def test_eden_unmount_watch(self) -> None: + root = self.makeEdenMount(populate) + self.eden.unmount(root) + + with self.assertRaises(pywatchman.CommandError) as ctx: + self.watchmanCommand("watch", root) + + self.assertRegex(str(ctx.exception), "unable to resolve root") diff --git a/watchman/integration/lib/WatchmanEdenTestCase.py b/watchman/integration/lib/WatchmanEdenTestCase.py index 60ea7205c5ec..fa38fbaca6fb 100644 --- a/watchman/integration/lib/WatchmanEdenTestCase.py +++ b/watchman/integration/lib/WatchmanEdenTestCase.py @@ -88,7 +88,7 @@ def setUp(self) -> None: os.environ["CHGDISABLE"] = "1" # Start the EdenFS instance - self.eden.start() + self.eden.start(extra_args=["--enable_fault_injection"]) def _restoreHome(self) -> None: assert self.save_home is not None diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index c599da2a53ad..8797e4e2e571 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -1474,8 +1474,25 @@ std::shared_ptr detectEden( } // Given that the readlink() succeeded, assume this is an Eden mount. - auto edenRoot = - readSymbolicLink(fmt::format("{}/.eden/root", root_path).c_str()); + w_string edenRoot; + try { + edenRoot = + readSymbolicLink(fmt::format("{}/.eden/root", root_path).c_str()); + } catch (const std::system_error& e) { + if (e.code() == std::errc::not_connected) { + // When Eden fails during graceful takeover, the mount can exist, but it + // is disconnected. In this case, we can't use the eden watcher. Log this + // error and throw. + log(DBG, "Failed to read EdenFS root when mount exists: ", e.what()); + throw TerminalWatcherError(fmt::format( + "{} appears to be a disconnected EdenFS mount. " + "Try running `eden doctor` to bring it back online and " + "then retry your watch", + root_path)); + } else { + throw; + } + } #endif if (edenRoot != root_path) { From d84ff12a287d13e0249577a43d6395fff823b4d5 Mon Sep 17 00:00:00 2001 From: Cody Ohlsen Date: Wed, 17 Apr 2024 17:24:31 -0700 Subject: [PATCH 6872/7387] getdeps: support GETDEPS_WGET_ARGS in wget version, support skipping lfs/upload steps Summary: X-link: https://github.com/facebookincubator/katran/pull/229 X-link: https://github.com/facebookexperimental/edencommon/pull/18 X-link: https://github.com/facebook/sapling/pull/878 X-link: https://github.com/facebook/openr/pull/154 X-link: https://github.com/facebook/folly/pull/2177 X-link: https://github.com/facebookincubator/zstrong/pull/748 I found it useful to be able to set `GETDEPS_WGET_ARGS` to change some of the flags to `wget` while it's in that fetch mode :) I also need to skip the lfs upload part in my environment Reviewed By: mackorone Differential Revision: D56263907 fbshipit-source-id: ae45c31ebb10123e0358544d294fe2f2979dd59a --- build/fbcode_builder/getdeps.py | 27 ++++++++++++++++++++++++- build/fbcode_builder/getdeps/fetcher.py | 7 +++++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index aeae6bf63467..4ab21537f06d 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -561,6 +561,10 @@ def run_project_cmd(self, args, loader, manifest): for m in projects: fetcher = loader.create_fetcher(m) + if args.build_skip_lfs_download and hasattr(fetcher, "skip_lfs_download"): + print("skipping lfs download for %s" % m.name) + fetcher.skip_lfs_download() + if isinstance(fetcher, SystemPackageFetcher): # We are guaranteed that if the fetcher is set to # SystemPackageFetcher then this item is completely @@ -652,7 +656,11 @@ def run_project_cmd(self, args, loader, manifest): # Only populate the cache from continuous build runs, and # only if we have a built_marker. - if args.schedule_type == "continuous" and has_built_marker: + if ( + not args.skip_upload + and args.schedule_type == "continuous" + and has_built_marker + ): cached_project.upload() elif args.verbose: print("found good %s" % built_marker) @@ -1322,11 +1330,28 @@ def add_common_arg(*args, **kwargs): action="store_true", default=False, ) + add_common_arg( + "-su", + "--skip-upload", + help="skip upload steps", + action="store_true", + default=False, + ) add_common_arg( "--lfs-path", help="Provide a parent directory for lfs when fbsource is unavailable", default=None, ) + add_common_arg( + "--build-skip-lfs-download", + action="store_true", + default=False, + help=( + "Download from the URL, rather than LFS. This is useful " + "in cases where the upstream project has uploaded a new " + "version of the archive with a different hash" + ), + ) ap = argparse.ArgumentParser( description="Get and build dependencies and projects", parents=[common_args] diff --git a/build/fbcode_builder/getdeps/fetcher.py b/build/fbcode_builder/getdeps/fetcher.py index b1c113f46781..f02dd447bf75 100644 --- a/build/fbcode_builder/getdeps/fetcher.py +++ b/build/fbcode_builder/getdeps/fetcher.py @@ -683,15 +683,18 @@ def progress_pycurl(self, total, amount, _uploadtotal, _uploadamount): start = time.time() try: if os.environ.get("GETDEPS_USE_WGET") is not None: - subprocess.run( + procargs = ( [ "wget", + ] + + os.environ.get("GETDEPS_WGET_ARGS", "").split() + + [ "-O", file_name, url, ] ) - + subprocess.run(procargs, capture_output=True) headers = None elif os.environ.get("GETDEPS_USE_LIBCURL") is not None: From 8ae58f1b8899142462d10d8b88c41dc07bf3759c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 18 Apr 2024 09:34:07 -0700 Subject: [PATCH 6873/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/914f871f150ed5b2fdc5693b035a32f8060af40a https://github.com/facebook/fb303/commit/bec981d3434aad266f446383c1921e67145788e2 https://github.com/facebook/fbthrift/commit/b1b6dee683e852d5a576a257431a58d83c3712d1 https://github.com/facebook/folly/commit/c3e6f338e2c7d6c7b5e80569f0b956ae84a3230a https://github.com/facebook/mvfst/commit/a0b10580484453836fad60f322529afc02cb3dac https://github.com/facebook/proxygen/commit/220ffee5dbd693e315acd10622086d577c5f092f https://github.com/facebook/wangle/commit/701acb77c19df3abc25402e09dcd62bdc845bf69 https://github.com/facebookexperimental/edencommon/commit/85b076a3c26aab362c4b4d9c052622f06511e2b2 https://github.com/facebookexperimental/rust-shed/commit/42fefe4e40a2e2e4cd45026c2852a6c7ef3c43a8 https://github.com/facebookincubator/fizz/commit/92e7ee6b992209d6eca83732db34f23521aea64e Reviewed By: ajb85 fbshipit-source-id: 947ca9d51c4e1cd80b156a594bd940ee55ac96d4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bf75ee053338..0fde1608cd96 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 96dfbc394a77145cd5b93b086adb8906028cd27f +Subproject commit b1b6dee683e852d5a576a257431a58d83c3712d1 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e8807ecee089..9c0d6dd8fe1e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 427a1ef2c1641e0cfaec5c9300487d084175b00e +Subproject commit c3e6f338e2c7d6c7b5e80569f0b956ae84a3230a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e1caa9c1e2f1..3ae91cc05c75 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a88cea3b3119fe1b6e6e74ab853aa2080ab3a3d4 +Subproject commit 701acb77c19df3abc25402e09dcd62bdc845bf69 From c5e0c50685642ed9f9cf9cf7a7e72afca8367b14 Mon Sep 17 00:00:00 2001 From: Richard Barnes Date: Fri, 19 Apr 2024 09:10:48 -0700 Subject: [PATCH 6874/7387] Enable various warnings in watchman/PACKAGE + 1 Summary: This diff enables compilation warning flags for the directory in question. Further details are in [this workplace post](https://fb.workplace.com/permalink.php?story_fbid=pfbid02XaWNiCVk69r1ghfvDVpujB8Hr9Y61uDvNakxiZFa2jwiPHscVdEQwCBHrmWZSyMRl&id=100051201402394). This is a low-risk diff. There are **no run-time effects** and the diff has already been observed to compile locally. **If the code compiles, it work; test errors are spurious.** Reviewed By: palmje, dmm-fb Differential Revision: D56223962 fbshipit-source-id: 51e7f9465de48417f4d6ed351987da1428426893 --- watchman/thirdparty/wildmatch/wildmatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/thirdparty/wildmatch/wildmatch.c b/watchman/thirdparty/wildmatch/wildmatch.c index 3e24c384e1a2..5cd7b1d764ad 100644 --- a/watchman/thirdparty/wildmatch/wildmatch.c +++ b/watchman/thirdparty/wildmatch/wildmatch.c @@ -87,7 +87,7 @@ static int dowild(const uchar *p, const uchar *text, unsigned int flags) /* Literal match with following character. Note that the test * in "default" handles the p[1] == '\0' failure case. */ p_ch = *++p; - /* FALLTHROUGH */ + __attribute__((fallthrough)); default: if (p_ch == '/') { /* Consume any number of consecutive slashes. */ From 2b16662e5d2cb499a5b07deedd8edf592c7b46a6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 19 Apr 2024 09:32:51 -0700 Subject: [PATCH 6875/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/566fd9701122f750714d5ab9a8f6122115bc3e1d https://github.com/facebook/fb303/commit/20b01ef8421e72a10003a5c4faae8edfb5096de8 https://github.com/facebook/fbthrift/commit/986255c102241cace2a0cab4023e5504ded831e7 https://github.com/facebook/folly/commit/91fe8db604986f1637d9e5afb8ba15ab95568abc https://github.com/facebook/mvfst/commit/f3f1191994a9a0c67a56bf9d243bed7ba213f549 https://github.com/facebook/proxygen/commit/40c30f6606856bea4263b86ab0684f35a0923f01 https://github.com/facebook/wangle/commit/dd9582f3d154f8da0fb9f02993962771b047e01a https://github.com/facebookexperimental/edencommon/commit/cb1254112f3c149bcf7bc9f7c9f1825d7f472a48 https://github.com/facebookexperimental/rust-shed/commit/a4bda3d40d69dd61eebb87e38273ec8f5c3e7f90 https://github.com/facebookincubator/fizz/commit/8d003c22cf2e94734962d39918a2834ffc3148ef Reviewed By: ajb85 fbshipit-source-id: a0ad2d8a676b1dc56a01457d990483e448588112 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0fde1608cd96..5b3ecb9d8b96 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b1b6dee683e852d5a576a257431a58d83c3712d1 +Subproject commit 986255c102241cace2a0cab4023e5504ded831e7 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9c0d6dd8fe1e..b5f55945af44 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c3e6f338e2c7d6c7b5e80569f0b956ae84a3230a +Subproject commit 91fe8db604986f1637d9e5afb8ba15ab95568abc diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3ae91cc05c75..80b289c32608 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 701acb77c19df3abc25402e09dcd62bdc845bf69 +Subproject commit dd9582f3d154f8da0fb9f02993962771b047e01a From 84ed8fbbfdec7602bd7151022414b01bb9056f9e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 20 Apr 2024 09:33:31 -0700 Subject: [PATCH 6876/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/d5311f9e0f822f3fe1538819716e6d1f019d0a3d https://github.com/facebook/fb303/commit/efcb91bcf2a3a316850b1678a72eb8745b32fb42 https://github.com/facebook/fbthrift/commit/88e8b7ae1e26fc433550636d409f40b5a28a348b https://github.com/facebook/folly/commit/0540a5259c816167eb2f5839aac682067f59207c https://github.com/facebook/mvfst/commit/f7bea5eb0ea70555af5f99f85f31e71fe020d096 https://github.com/facebook/proxygen/commit/8999e9d7b452dcaa4fe535c7f8c9f708efcf8cd1 https://github.com/facebook/wangle/commit/c49dc3c858b6ee13ac8f1a9406f306ef7128fe07 https://github.com/facebookexperimental/edencommon/commit/0b0d0e11900692d679afcef22417afea088f934d https://github.com/facebookexperimental/rust-shed/commit/2307997daadca50e3301e57c73b70c6d17b22683 https://github.com/facebookexternal/plc-code/commit/04da460509a5668730853f85b4b87c9d2fe3b320 https://github.com/facebookincubator/fizz/commit/fe905ab7d5f5e7eaeb70a145612e29839b672b50 Reviewed By: ajb85 fbshipit-source-id: 3764a89e3dd167c7865af9113b6022bff471bd6a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5b3ecb9d8b96..28671c4e4a9f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 986255c102241cace2a0cab4023e5504ded831e7 +Subproject commit 88e8b7ae1e26fc433550636d409f40b5a28a348b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b5f55945af44..33cc0148f9a9 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 91fe8db604986f1637d9e5afb8ba15ab95568abc +Subproject commit 0540a5259c816167eb2f5839aac682067f59207c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 80b289c32608..164726d70f59 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit dd9582f3d154f8da0fb9f02993962771b047e01a +Subproject commit c49dc3c858b6ee13ac8f1a9406f306ef7128fe07 From 90c8309fb952d04a9024837931db3a082b266fa4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 21 Apr 2024 09:32:13 -0700 Subject: [PATCH 6877/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/12d766f3d4bd72945672d959064c181eae7e299c https://github.com/facebook/fb303/commit/5f5f7bde86ce06d5724812c76615691196d11117 https://github.com/facebook/fbthrift/commit/d331d78b0fd22b160081f08d129c99d95aa16c42 https://github.com/facebook/folly/commit/c2cf03536e74ada0073d371b962284220279a709 https://github.com/facebook/mvfst/commit/fc21b6c1f30bb261f34e06e8050b9be55f286118 https://github.com/facebook/proxygen/commit/adefdbcd3af8783a4bd42289eab9359e9d170351 https://github.com/facebook/wangle/commit/07052bda218f502e114fac4f9389cfb899d4c94f https://github.com/facebookexperimental/edencommon/commit/b89e521b3b7bbe77ad3c8739e7ca4e8b9ce73a03 https://github.com/facebookexperimental/rust-shed/commit/d6dfa53d6c451845c7a95a437105298380175307 https://github.com/facebookincubator/fizz/commit/d2b27ad61f3405d8fc478ce71567bf6bfd7026ae Reviewed By: ajb85 fbshipit-source-id: d9a3a2228c46a6b93f6c136042a3c532afabbd7b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 28671c4e4a9f..bc7168a1dd39 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 88e8b7ae1e26fc433550636d409f40b5a28a348b +Subproject commit d331d78b0fd22b160081f08d129c99d95aa16c42 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 33cc0148f9a9..390e5b260e5d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0540a5259c816167eb2f5839aac682067f59207c +Subproject commit c2cf03536e74ada0073d371b962284220279a709 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 164726d70f59..52e6e091a4fe 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c49dc3c858b6ee13ac8f1a9406f306ef7128fe07 +Subproject commit 07052bda218f502e114fac4f9389cfb899d4c94f From 4c2d58c2025b7d5fb8b6b3900b6df9093c20ed15 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 22 Apr 2024 09:32:17 -0700 Subject: [PATCH 6878/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/a114ff3c42ab58c086b8e7a300d75973d9eab6fa https://github.com/facebook/fb303/commit/1e6b7a09e46be18c83ff641fd3ca2739ea0ac7b3 https://github.com/facebook/fbthrift/commit/a1067af97a4a6070f4247657faf66ff25c1caffd https://github.com/facebook/mvfst/commit/e1fe8da2b1fb5a540eaafa02b3d31442b0e24995 https://github.com/facebook/proxygen/commit/0fe62f60f75a02a9a5fbe91976597ba5aa0b11a8 https://github.com/facebook/wangle/commit/1a935e5872c9a52fcb9da5e44e8346ebbeac04ce https://github.com/facebookexperimental/edencommon/commit/f081689ef55f3cc737e8b210855521c2c6c7866b https://github.com/facebookexperimental/rust-shed/commit/b291f8f6cc910dce56e5b781eddbdf9524ae7092 https://github.com/facebookincubator/fizz/commit/32ddfef7884ff504efb3b3224bf34d21d3fdb183 Reviewed By: bigfootjon fbshipit-source-id: d9e8a229205798bdfe7905159ac1f4f5ae869cf0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bc7168a1dd39..49b0c75019ed 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d331d78b0fd22b160081f08d129c99d95aa16c42 +Subproject commit a1067af97a4a6070f4247657faf66ff25c1caffd diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 52e6e091a4fe..030c219f7461 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 07052bda218f502e114fac4f9389cfb899d4c94f +Subproject commit 1a935e5872c9a52fcb9da5e44e8346ebbeac04ce From edfe11c14ab9060d7782cb54c584499fe4f9f45b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 23 Apr 2024 09:36:26 -0700 Subject: [PATCH 6879/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/e067c780240eb28ce6507e4155c52ca35195b7b9 https://github.com/facebook/fb303/commit/e015fa8853963535d96cc9b56b49257fcee46dcb https://github.com/facebook/fbthrift/commit/943000366d8ea3e64626450c3c2047395106ff8c https://github.com/facebook/folly/commit/42205ed185b48ff79dd2c64dbfc842cdd080fe6b https://github.com/facebook/mvfst/commit/6e1db763352b8d359bfc2d05da28490286c4679c https://github.com/facebook/proxygen/commit/012f14e2180b11451b5160f60a1571d059840b02 https://github.com/facebook/wangle/commit/3629670f652f73290ac61dacbb8a30805725442a https://github.com/facebookexperimental/rust-shed/commit/954e881f23525049f6b92eeeb073cf9fc71ce0dd Reviewed By: bigfootjon fbshipit-source-id: c7a2c0bf667a6a6b0dc6e05b13efc340534d5435 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 49b0c75019ed..6fe9296f945a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a1067af97a4a6070f4247657faf66ff25c1caffd +Subproject commit 943000366d8ea3e64626450c3c2047395106ff8c diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 390e5b260e5d..b39e2bb5a106 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c2cf03536e74ada0073d371b962284220279a709 +Subproject commit 42205ed185b48ff79dd2c64dbfc842cdd080fe6b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 030c219f7461..ce2bcfe07334 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1a935e5872c9a52fcb9da5e44e8346ebbeac04ce +Subproject commit 3629670f652f73290ac61dacbb8a30805725442a From 39c31769bf05e5db534c522e44ab50a6c9a14f8e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 24 Apr 2024 09:31:49 -0700 Subject: [PATCH 6880/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/6b267be3d72a0ab0916b5cf28e68d3bd947d6647 https://github.com/facebook/fb303/commit/3c1f6e5599734f1159594c73b3cd441e2807c672 https://github.com/facebook/fbthrift/commit/b58eccc5b5cb7deb84f7399c2dae8fcc728e73b0 https://github.com/facebook/mvfst/commit/447e3ec81d78fe7600a354ba336fb3a95a355843 https://github.com/facebook/proxygen/commit/da75177a9387a572ac6521703648612bf2693794 https://github.com/facebook/wangle/commit/ed7d5a67441a8e33d9e74a4d136921131c557a28 https://github.com/facebookexperimental/edencommon/commit/0f0e732b1a9823aa41facade2f61c78d03c6a051 https://github.com/facebookexperimental/rust-shed/commit/f0132ad074c50c3cdb1b84e11cb3d0ed7f8a37a4 https://github.com/facebookexternal/plc-code/commit/a26c91ad3d83e489920d4d4a352d33ea0adcb574 https://github.com/facebookincubator/fizz/commit/2d5b4218c48a8a87d2d0e5d9a5d2316d9d1908b3 Reviewed By: bigfootjon fbshipit-source-id: c74eb8ec952a1c1ca8b5dec925399f02dc2096e3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6fe9296f945a..63b519bd6df1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 943000366d8ea3e64626450c3c2047395106ff8c +Subproject commit b58eccc5b5cb7deb84f7399c2dae8fcc728e73b0 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ce2bcfe07334..dbd70621d8e2 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3629670f652f73290ac61dacbb8a30805725442a +Subproject commit ed7d5a67441a8e33d9e74a4d136921131c557a28 From 79ece5fb895327cff949c8751577708a18ac51c1 Mon Sep 17 00:00:00 2001 From: Henry Swanson Date: Wed, 24 Apr 2024 09:47:11 -0700 Subject: [PATCH 6881/7387] Update tokio: 1.36.0 -> 1.37.0 Summary: Followed the wiki page here: https://www.internalfb.com/intern/wiki/Rust/Third_Party_Libraries/Adding_or_Updating_Libraries/ Reviewed By: capickett Differential Revision: D56484070 fbshipit-source-id: e1ed52d58f7db8ad32ce67b67df2e83a567db123 --- watchman/cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index 6cdfc143ad6b..b4f37ad1c73e 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -18,7 +18,7 @@ serde_json = { version = "1.0.100", features = ["float_roundtrip", "unbounded_de structopt = "0.3.26" sysinfo = "0.26.8" tabular = "0.2.0" -tokio = { version = "1.36.0", features = ["full", "test-util", "tracing"] } +tokio = { version = "1.37.0", features = ["full", "test-util", "tracing"] } watchman_client = { version = "0.8.0", path = "../rust/watchman_client" } [target.'cfg(target_os = "linux")'.dependencies] From dc75f82d91e2033bf41ddaca1517217c4178b4af Mon Sep 17 00:00:00 2001 From: Paul O'Shannessy Date: Wed, 24 Apr 2024 15:36:57 -0700 Subject: [PATCH 6882/7387] Rebuild GitHub Actions workflows Summary: X-link: https://github.com/facebookincubator/zstrong/pull/749 Updating generated workflow files to account for recent changes. Most notably, this updates the checkout action to v4 and sets an explicit read-only permission. This also adds support for `--cron` in the codegen to account for only running CI on a schedule (useful for managing costs). Reviewed By: ahornby Differential Revision: D56165825 fbshipit-source-id: 298b16effefb6b8a2dc6cbcf07d4ec4a61f48364 --- .github/workflows/getdeps_linux.yml | 54 +++++++++++++++------------ .github/workflows/getdeps_mac.yml | 30 +++++++++------ .github/workflows/getdeps_windows.yml | 32 ++++++++++------ build/fbcode_builder/getdeps.py | 9 +++++ 4 files changed, 79 insertions(+), 46 deletions(-) diff --git a/.github/workflows/getdeps_linux.yml b/.github/workflows/getdeps_linux.yml index fd1e2eddead3..bd73a6bcedb6 100644 --- a/.github/workflows/getdeps_linux.yml +++ b/.github/workflows/getdeps_linux.yml @@ -17,23 +17,23 @@ jobs: build: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 - - name: Fetch boost - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests boost + - uses: actions/checkout@v4 - name: Install Rust Stable uses: dtolnay/rust-toolchain@stable + - name: Fetch boost + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests boost - name: Fetch ninja run: python3 build/fbcode_builder/getdeps.py fetch --no-tests ninja - name: Fetch cmake run: python3 build/fbcode_builder/getdeps.py fetch --no-tests cmake - name: Fetch cpptoml run: python3 build/fbcode_builder/getdeps.py fetch --no-tests cpptoml + - name: Fetch fmt + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fmt - name: Fetch gflags run: python3 build/fbcode_builder/getdeps.py fetch --no-tests gflags - name: Fetch glog run: python3 build/fbcode_builder/getdeps.py fetch --no-tests glog - - name: Fetch fmt - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fmt - name: Fetch googletest run: python3 build/fbcode_builder/getdeps.py fetch --no-tests googletest - name: Fetch python-six @@ -50,6 +50,8 @@ jobs: run: python3 build/fbcode_builder/getdeps.py fetch --no-tests snappy - name: Fetch pcre2 run: python3 build/fbcode_builder/getdeps.py fetch --no-tests pcre2 + - name: Fetch python-setuptools + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests python-setuptools - name: Fetch zlib run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zlib - name: Fetch bz2 @@ -62,26 +64,28 @@ jobs: run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libtool - name: Fetch libsodium run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libsodium - - name: Fetch libffi - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libffi - - name: Fetch ncurses - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests ncurses - - name: Fetch python - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests python - name: Fetch xz run: python3 build/fbcode_builder/getdeps.py fetch --no-tests xz - name: Fetch folly run: python3 build/fbcode_builder/getdeps.py fetch --no-tests folly - name: Fetch fizz run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fizz + - name: Fetch mvfst + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests mvfst + - name: Fetch libffi + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libffi + - name: Fetch ncurses + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests ncurses + - name: Fetch python + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests python - name: Fetch wangle run: python3 build/fbcode_builder/getdeps.py fetch --no-tests wangle - name: Fetch fbthrift run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fbthrift - - name: Fetch edencommon - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests edencommon - name: Fetch fb303 run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fb303 + - name: Fetch edencommon + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests edencommon - name: Build boost run: python3 build/fbcode_builder/getdeps.py build --no-tests boost - name: Build ninja @@ -90,12 +94,12 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --no-tests cmake - name: Build cpptoml run: python3 build/fbcode_builder/getdeps.py build --no-tests cpptoml + - name: Build fmt + run: python3 build/fbcode_builder/getdeps.py build --no-tests fmt - name: Build gflags run: python3 build/fbcode_builder/getdeps.py build --no-tests gflags - name: Build glog run: python3 build/fbcode_builder/getdeps.py build --no-tests glog - - name: Build fmt - run: python3 build/fbcode_builder/getdeps.py build --no-tests fmt - name: Build googletest run: python3 build/fbcode_builder/getdeps.py build --no-tests googletest - name: Build python-six @@ -112,6 +116,8 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --no-tests snappy - name: Build pcre2 run: python3 build/fbcode_builder/getdeps.py build --no-tests pcre2 + - name: Build python-setuptools + run: python3 build/fbcode_builder/getdeps.py build --no-tests python-setuptools - name: Build zlib run: python3 build/fbcode_builder/getdeps.py build --no-tests zlib - name: Build bz2 @@ -124,26 +130,28 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --no-tests libtool - name: Build libsodium run: python3 build/fbcode_builder/getdeps.py build --no-tests libsodium - - name: Build libffi - run: python3 build/fbcode_builder/getdeps.py build --no-tests libffi - - name: Build ncurses - run: python3 build/fbcode_builder/getdeps.py build --no-tests ncurses - - name: Build python - run: python3 build/fbcode_builder/getdeps.py build --no-tests python - name: Build xz run: python3 build/fbcode_builder/getdeps.py build --no-tests xz - name: Build folly run: python3 build/fbcode_builder/getdeps.py build --no-tests folly - name: Build fizz run: python3 build/fbcode_builder/getdeps.py build --no-tests fizz + - name: Build mvfst + run: python3 build/fbcode_builder/getdeps.py build --no-tests mvfst + - name: Build libffi + run: python3 build/fbcode_builder/getdeps.py build --no-tests libffi + - name: Build ncurses + run: python3 build/fbcode_builder/getdeps.py build --no-tests ncurses + - name: Build python + run: python3 build/fbcode_builder/getdeps.py build --no-tests python - name: Build wangle run: python3 build/fbcode_builder/getdeps.py build --no-tests wangle - name: Build fbthrift run: python3 build/fbcode_builder/getdeps.py build --no-tests fbthrift - - name: Build edencommon - run: python3 build/fbcode_builder/getdeps.py build --no-tests edencommon - name: Build fb303 run: python3 build/fbcode_builder/getdeps.py build --no-tests fb303 + - name: Build edencommon + run: python3 build/fbcode_builder/getdeps.py build --no-tests edencommon - name: Build watchman run: python3 build/fbcode_builder/getdeps.py build --src-dir=. watchman --project-install-prefix watchman:/usr/local - name: Copy artifacts diff --git a/.github/workflows/getdeps_mac.yml b/.github/workflows/getdeps_mac.yml index 892798263b27..b301972cd01a 100644 --- a/.github/workflows/getdeps_mac.yml +++ b/.github/workflows/getdeps_mac.yml @@ -17,23 +17,23 @@ jobs: build: runs-on: macOS-latest steps: - - uses: actions/checkout@v2 - - name: Fetch boost - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests boost + - uses: actions/checkout@v4 - name: Install Rust Stable uses: dtolnay/rust-toolchain@stable + - name: Fetch boost + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests boost - name: Fetch ninja run: python3 build/fbcode_builder/getdeps.py fetch --no-tests ninja - name: Fetch cmake run: python3 build/fbcode_builder/getdeps.py fetch --no-tests cmake - name: Fetch cpptoml run: python3 build/fbcode_builder/getdeps.py fetch --no-tests cpptoml + - name: Fetch fmt + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fmt - name: Fetch gflags run: python3 build/fbcode_builder/getdeps.py fetch --no-tests gflags - name: Fetch glog run: python3 build/fbcode_builder/getdeps.py fetch --no-tests glog - - name: Fetch fmt - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fmt - name: Fetch googletest run: python3 build/fbcode_builder/getdeps.py fetch --no-tests googletest - name: Fetch python-six @@ -50,6 +50,8 @@ jobs: run: python3 build/fbcode_builder/getdeps.py fetch --no-tests snappy - name: Fetch pcre2 run: python3 build/fbcode_builder/getdeps.py fetch --no-tests pcre2 + - name: Fetch python-setuptools + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests python-setuptools - name: Fetch libevent run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libevent - name: Fetch zlib @@ -68,14 +70,16 @@ jobs: run: python3 build/fbcode_builder/getdeps.py fetch --no-tests folly - name: Fetch fizz run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fizz + - name: Fetch mvfst + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests mvfst - name: Fetch wangle run: python3 build/fbcode_builder/getdeps.py fetch --no-tests wangle - name: Fetch fbthrift run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fbthrift - - name: Fetch edencommon - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests edencommon - name: Fetch fb303 run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fb303 + - name: Fetch edencommon + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests edencommon - name: Build boost run: python3 build/fbcode_builder/getdeps.py build --no-tests boost - name: Build ninja @@ -84,12 +88,12 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --no-tests cmake - name: Build cpptoml run: python3 build/fbcode_builder/getdeps.py build --no-tests cpptoml + - name: Build fmt + run: python3 build/fbcode_builder/getdeps.py build --no-tests fmt - name: Build gflags run: python3 build/fbcode_builder/getdeps.py build --no-tests gflags - name: Build glog run: python3 build/fbcode_builder/getdeps.py build --no-tests glog - - name: Build fmt - run: python3 build/fbcode_builder/getdeps.py build --no-tests fmt - name: Build googletest run: python3 build/fbcode_builder/getdeps.py build --no-tests googletest - name: Build python-six @@ -106,6 +110,8 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --no-tests snappy - name: Build pcre2 run: python3 build/fbcode_builder/getdeps.py build --no-tests pcre2 + - name: Build python-setuptools + run: python3 build/fbcode_builder/getdeps.py build --no-tests python-setuptools - name: Build libevent run: python3 build/fbcode_builder/getdeps.py build --no-tests libevent - name: Build zlib @@ -124,14 +130,16 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --no-tests folly - name: Build fizz run: python3 build/fbcode_builder/getdeps.py build --no-tests fizz + - name: Build mvfst + run: python3 build/fbcode_builder/getdeps.py build --no-tests mvfst - name: Build wangle run: python3 build/fbcode_builder/getdeps.py build --no-tests wangle - name: Build fbthrift run: python3 build/fbcode_builder/getdeps.py build --no-tests fbthrift - - name: Build edencommon - run: python3 build/fbcode_builder/getdeps.py build --no-tests edencommon - name: Build fb303 run: python3 build/fbcode_builder/getdeps.py build --no-tests fb303 + - name: Build edencommon + run: python3 build/fbcode_builder/getdeps.py build --no-tests edencommon - name: Build watchman run: python3 build/fbcode_builder/getdeps.py build --src-dir=. watchman --project-install-prefix watchman:/usr/local - name: Copy artifacts diff --git a/.github/workflows/getdeps_windows.yml b/.github/workflows/getdeps_windows.yml index a20e0d4e88b1..f62e950f66d4 100644 --- a/.github/workflows/getdeps_windows.yml +++ b/.github/workflows/getdeps_windows.yml @@ -18,29 +18,29 @@ jobs: runs-on: windows-2019 steps: - name: Export boost environment - run: "echo BOOST_ROOT=%BOOST_ROOT_1_78_0% >> %GITHUB_ENV%" + run: "echo BOOST_ROOT=%BOOST_ROOT_1_83_0% >> %GITHUB_ENV%" shell: cmd - name: Fix Git config run: git config --system core.longpaths true - name: Disable autocrlf run: git config --system core.autocrlf false - - uses: actions/checkout@v2 - - name: Fetch boost - run: python build/fbcode_builder/getdeps.py fetch --no-tests boost + - uses: actions/checkout@v4 - name: Install Rust Stable uses: dtolnay/rust-toolchain@stable + - name: Fetch boost + run: python build/fbcode_builder/getdeps.py fetch --no-tests boost - name: Fetch ninja run: python build/fbcode_builder/getdeps.py fetch --no-tests ninja - name: Fetch cmake run: python build/fbcode_builder/getdeps.py fetch --no-tests cmake - name: Fetch cpptoml run: python build/fbcode_builder/getdeps.py fetch --no-tests cpptoml + - name: Fetch fmt + run: python build/fbcode_builder/getdeps.py fetch --no-tests fmt - name: Fetch gflags run: python build/fbcode_builder/getdeps.py fetch --no-tests gflags - name: Fetch glog run: python build/fbcode_builder/getdeps.py fetch --no-tests glog - - name: Fetch fmt - run: python build/fbcode_builder/getdeps.py fetch --no-tests fmt - name: Fetch googletest run: python build/fbcode_builder/getdeps.py fetch --no-tests googletest - name: Fetch libsodium @@ -59,6 +59,8 @@ jobs: run: python build/fbcode_builder/getdeps.py fetch --no-tests zlib - name: Fetch pcre2 run: python build/fbcode_builder/getdeps.py fetch --no-tests pcre2 + - name: Fetch python-setuptools + run: python build/fbcode_builder/getdeps.py fetch --no-tests python-setuptools - name: Fetch perl run: python build/fbcode_builder/getdeps.py fetch --no-tests perl - name: Fetch openssl @@ -67,16 +69,18 @@ jobs: run: python build/fbcode_builder/getdeps.py fetch --no-tests libevent - name: Fetch folly run: python build/fbcode_builder/getdeps.py fetch --no-tests folly - - name: Fetch edencommon - run: python build/fbcode_builder/getdeps.py fetch --no-tests edencommon - name: Fetch fizz run: python build/fbcode_builder/getdeps.py fetch --no-tests fizz + - name: Fetch mvfst + run: python build/fbcode_builder/getdeps.py fetch --no-tests mvfst - name: Fetch wangle run: python build/fbcode_builder/getdeps.py fetch --no-tests wangle - name: Fetch fbthrift run: python build/fbcode_builder/getdeps.py fetch --no-tests fbthrift - name: Fetch fb303 run: python build/fbcode_builder/getdeps.py fetch --no-tests fb303 + - name: Fetch edencommon + run: python build/fbcode_builder/getdeps.py fetch --no-tests edencommon - name: Build boost run: python build/fbcode_builder/getdeps.py build --no-tests boost - name: Build ninja @@ -85,12 +89,12 @@ jobs: run: python build/fbcode_builder/getdeps.py build --no-tests cmake - name: Build cpptoml run: python build/fbcode_builder/getdeps.py build --no-tests cpptoml + - name: Build fmt + run: python build/fbcode_builder/getdeps.py build --no-tests fmt - name: Build gflags run: python build/fbcode_builder/getdeps.py build --no-tests gflags - name: Build glog run: python build/fbcode_builder/getdeps.py build --no-tests glog - - name: Build fmt - run: python build/fbcode_builder/getdeps.py build --no-tests fmt - name: Build googletest run: python build/fbcode_builder/getdeps.py build --no-tests googletest - name: Build libsodium @@ -109,6 +113,8 @@ jobs: run: python build/fbcode_builder/getdeps.py build --no-tests zlib - name: Build pcre2 run: python build/fbcode_builder/getdeps.py build --no-tests pcre2 + - name: Build python-setuptools + run: python build/fbcode_builder/getdeps.py build --no-tests python-setuptools - name: Build perl run: python build/fbcode_builder/getdeps.py build --no-tests perl - name: Build openssl @@ -117,16 +123,18 @@ jobs: run: python build/fbcode_builder/getdeps.py build --no-tests libevent - name: Build folly run: python build/fbcode_builder/getdeps.py build --no-tests folly - - name: Build edencommon - run: python build/fbcode_builder/getdeps.py build --no-tests edencommon - name: Build fizz run: python build/fbcode_builder/getdeps.py build --no-tests fizz + - name: Build mvfst + run: python build/fbcode_builder/getdeps.py build --no-tests mvfst - name: Build wangle run: python build/fbcode_builder/getdeps.py build --no-tests wangle - name: Build fbthrift run: python build/fbcode_builder/getdeps.py build --no-tests fbthrift - name: Build fb303 run: python build/fbcode_builder/getdeps.py build --no-tests fb303 + - name: Build edencommon + run: python build/fbcode_builder/getdeps.py build --no-tests edencommon - name: Build watchman run: python build/fbcode_builder/getdeps.py build --src-dir=. watchman - name: Copy artifacts diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 4ab21537f06d..3b15bd3429d9 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -944,6 +944,11 @@ def run_project_cmd(self, args, loader, manifest): def get_run_on(self, args): if args.run_on_all_branches: return self.RUN_ON_ALL + if args.cron: + return f""" + schedule: + - cron: '{args.cron}'""" + return f""" push: branches: @@ -1213,6 +1218,10 @@ def setup_project_cmd_parser(self, parser): parser.add_argument( "--ubuntu-version", default="20.04", help="Version of Ubuntu to use" ) + parser.add_argument( + "--cron", + help="Specify that the job runs on a cron schedule instead of on pushes", + ) parser.add_argument( "--main-branch", default="main", From 6675443ff199460eeafbb267faa5ec42df31deb0 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Thu, 25 Apr 2024 04:31:02 -0700 Subject: [PATCH 6883/7387] fix darwin boost break on std::piecewise_construct Summary: Since Xcode 15.3 std::piecewise_construct is only visible in c++17 and later modes std::piecewise_construct used to be visible in c++03 and later as extensions, see https://developer.apple.com/documentation/xcode-release-notes/xcode-15_3-release-notes#Deprecations Reviewed By: lebentle Differential Revision: D56539492 fbshipit-source-id: 25706bec5aa5a4343a8429eb3d3eeeae9d9a0469 --- build/fbcode_builder/manifests/boost | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/fbcode_builder/manifests/boost b/build/fbcode_builder/manifests/boost index a164cc6f96ec..a7474e287681 100644 --- a/build/fbcode_builder/manifests/boost +++ b/build/fbcode_builder/manifests/boost @@ -105,6 +105,8 @@ pch=off [b2.args.os=darwin] toolset=clang +# Since Xcode 15.3 std::piecewise_construct is only visible in C++17 and later modes +cxxflags="-DBOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT=0" [b2.args.all(os=windows,fb=on)] toolset=msvc-14.2 From 3d27fc74db15fe7b7aefb7ae641611d67a0b46b9 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Thu, 25 Apr 2024 05:24:11 -0700 Subject: [PATCH 6884/7387] fix windows build break in wildmatch Summary: Windows CI was breaking with: ```Z:\shipit\watchman\watchman\thirdparty\wildmatch\wildmatch.c(90): error C2065: 'fallthrough': undeclared identifier``` Looks like this was introduced in D56223962 which broke it as the windows compiler doesn't support the attribute Reviewed By: xavierd Differential Revision: D56567731 fbshipit-source-id: 315ff8165f31e6055ccd39ee63081bc63b564689 --- watchman/thirdparty/wildmatch/wildmatch.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/watchman/thirdparty/wildmatch/wildmatch.c b/watchman/thirdparty/wildmatch/wildmatch.c index 5cd7b1d764ad..89c2ea81e3f1 100644 --- a/watchman/thirdparty/wildmatch/wildmatch.c +++ b/watchman/thirdparty/wildmatch/wildmatch.c @@ -87,7 +87,9 @@ static int dowild(const uchar *p, const uchar *text, unsigned int flags) /* Literal match with following character. Note that the test * in "default" handles the p[1] == '\0' failure case. */ p_ch = *++p; +#ifndef _WIN32 __attribute__((fallthrough)); +#endif default: if (p_ch == '/') { /* Consume any number of consecutive slashes. */ From e9e5a5dd4bf18b47e4977e369382791f60d6bee3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 25 Apr 2024 09:34:51 -0700 Subject: [PATCH 6885/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/a156bf5b5802fea889670a185f56fb8f5e83b543 https://github.com/facebook/fb303/commit/d579e4943b385c557eca79f7fe3c188ee777a609 https://github.com/facebook/fbthrift/commit/585872675400afb40139ef6946b1bbabef71c2ad https://github.com/facebook/folly/commit/e08f6ee4ab9006013c98842a18e027a6ed7ee24c https://github.com/facebook/mvfst/commit/5986d37294eeac59b83f56debc5aa66ab226e342 https://github.com/facebook/proxygen/commit/cf7b3f572701131698071ab3800d428944fa0833 https://github.com/facebook/wangle/commit/f745afd6786b9489ac6986f825a40fe24bfd6ab3 https://github.com/facebookexperimental/edencommon/commit/207fa0e8c10ceb8c0181057e8fda68afdbd75fdf https://github.com/facebookexperimental/rust-shed/commit/3ef213393d366edb6b50b40bb4079dd7985b7b03 https://github.com/facebookincubator/fizz/commit/e32f88fad7da73ae65f4777916d5aea6b83ca7b4 Reviewed By: bigfootjon fbshipit-source-id: a4c272829581a8d1fb23afa174f397fb59503361 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 63b519bd6df1..06e06857c029 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b58eccc5b5cb7deb84f7399c2dae8fcc728e73b0 +Subproject commit 585872675400afb40139ef6946b1bbabef71c2ad diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b39e2bb5a106..89ec4cee06bc 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 42205ed185b48ff79dd2c64dbfc842cdd080fe6b +Subproject commit e08f6ee4ab9006013c98842a18e027a6ed7ee24c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index dbd70621d8e2..ca7011decd11 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ed7d5a67441a8e33d9e74a4d136921131c557a28 +Subproject commit f745afd6786b9489ac6986f825a40fe24bfd6ab3 From cd23daf10c363bc04f66b35d3f748a19d5d31dbd Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 26 Apr 2024 09:32:14 -0700 Subject: [PATCH 6886/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/3157f20aadac7bc5214e5c91812223b3aa14900a https://github.com/facebook/fb303/commit/52676f344defb57e3b4b600a3cf038d8e278f058 https://github.com/facebook/fbthrift/commit/1b261fc731aee539d58cf0b71fb52eba0166695b https://github.com/facebook/folly/commit/47c7d9ad14a2e6e00ddab284916490b601b6cfa9 https://github.com/facebook/mvfst/commit/5ac73ff08ed6324c2a709e919ecffdea7fae033f https://github.com/facebook/proxygen/commit/d2d9c80267918673306655f3c04e7f5482cb5c48 https://github.com/facebook/wangle/commit/f9ac285d3dff18f4862dc0049e3a76524c3fe110 https://github.com/facebookexperimental/edencommon/commit/7ca7bf1e93c31252f08215ebeedc8e4f7d267436 https://github.com/facebookexperimental/rust-shed/commit/35866548b543a95bcf8a33afc2e815b82506ff97 https://github.com/facebookincubator/fizz/commit/3b2468f5f6d4dda0a9147e71294d12462a1eff13 Reviewed By: bigfootjon fbshipit-source-id: bc0cd5260755634c9262a25b4b4cee4f8a69396a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 06e06857c029..a6430267cc04 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 585872675400afb40139ef6946b1bbabef71c2ad +Subproject commit 1b261fc731aee539d58cf0b71fb52eba0166695b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 89ec4cee06bc..8fa1dbda85f7 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e08f6ee4ab9006013c98842a18e027a6ed7ee24c +Subproject commit 47c7d9ad14a2e6e00ddab284916490b601b6cfa9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ca7011decd11..6bb54d4cae2e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f745afd6786b9489ac6986f825a40fe24bfd6ab3 +Subproject commit f9ac285d3dff18f4862dc0049e3a76524c3fe110 From 74f1783f813995d49ae7d6ed61f615c692b7a45c Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Fri, 26 Apr 2024 09:40:38 -0700 Subject: [PATCH 6887/7387] add libdwarf manifest for folly to use Summary: Give folly depends on and picks up libdwarf, add a manifest for libdwarf to make it explicit and stop it being found via other means Reviewed By: markbt Differential Revision: D56630711 fbshipit-source-id: 7b9386b4b93788e7efda13e51e35c9fec4fd6df2 --- build/fbcode_builder/manifests/folly | 1 + build/fbcode_builder/manifests/libdwarf | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 build/fbcode_builder/manifests/libdwarf diff --git a/build/fbcode_builder/manifests/folly b/build/fbcode_builder/manifests/folly index 3c17c184e053..5d57cdba8793 100644 --- a/build/fbcode_builder/manifests/folly +++ b/build/fbcode_builder/manifests/folly @@ -16,6 +16,7 @@ gflags glog googletest boost +libdwarf libevent libsodium double-conversion diff --git a/build/fbcode_builder/manifests/libdwarf b/build/fbcode_builder/manifests/libdwarf new file mode 100644 index 000000000000..e93ba16bc9a4 --- /dev/null +++ b/build/fbcode_builder/manifests/libdwarf @@ -0,0 +1,20 @@ +[manifest] +name = libdwarf + +[rpms] +libdwarf-devel +libdwarf + +[debs] +libdwarf-dev + +[homebrew] +dwarfutils + +[download] +url = https://www.prevanders.net/libdwarf-0.9.2.tar.xz +sha256 = 22b66d06831a76f6a062126cdcad3fcc58540b89a1acb23c99f8861f50999ec3 + +[build] +builder = cmake +subdir = libdwarf-0.9.2 From 69c99e6ad9bb28a8751047a8218c4ae7a5de2384 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Fri, 26 Apr 2024 15:26:31 -0700 Subject: [PATCH 6888/7387] Improve readSymbolicLink failure messaging and harden eden watcher startup Summary: Watchman's eden watcher reads a symlink on startup. If Eden is in a non-connected state, this will fail. Recently, we added logic to catch this type of failure and not crash, but it appears that the contraints were too tight. As this is difficult to test or repro, lets try relaxing the constraints and adding some additional logging. Ideally this will stop the crashing along with informing us why we weren't catching it previously. Reviewed By: quark-zju Differential Revision: D56642271 fbshipit-source-id: e73ed2b7599c2d62aa1fd441a7a2de7b2fff125f --- watchman/fs/FileSystem.cpp | 15 +++++++++++---- watchman/watcher/eden.cpp | 22 +++++++++------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/watchman/fs/FileSystem.cpp b/watchman/fs/FileSystem.cpp index 95c3195ff96c..7cc159a6bd1c 100644 --- a/watchman/fs/FileSystem.cpp +++ b/watchman/fs/FileSystem.cpp @@ -8,6 +8,7 @@ #include "watchman/fs/FileSystem.h" #include #include +#include #include "watchman/fs/FSDetect.h" #include "watchman/portability/WinError.h" #include "watchman/watchman_stream.h" @@ -349,7 +350,9 @@ w_string readSymbolicLink(const char* path) { auto len = readlink(path, &result[0], result.size()); if (len < 0) { throw std::system_error( - errno, std::generic_category(), "readlink for readSymbolicLink"); + errno, + std::system_category(), + fmt::format("readlink for readSymbolicLink(\"{}\")", path)); } if (size_t(len) < result.size()) { return w_string(result.data(), len); @@ -359,7 +362,9 @@ w_string readSymbolicLink(const char* path) { struct stat st; if (lstat(path, &st)) { throw std::system_error( - errno, std::generic_category(), "lstat for readSymbolicLink"); + errno, + std::system_category(), + fmt::format("lstat for readSymbolicLink(\"{}\")", path)); } result.resize(st.st_size + 1, 0); @@ -367,8 +372,10 @@ w_string readSymbolicLink(const char* path) { throw std::system_error( E2BIG, - std::generic_category(), - "readlink for readSymbolicLink: symlink changed while reading it"); + std::system_category(), + fmt::format( + "readlink for readSymbolicLink(\"{}\"): symlink changed while reading it", + path)); #else return openFileHandle(path, OpenFileHandleOptions::queryFileInfo()) .readSymbolicLink(); diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index 8797e4e2e571..c80e06283ff0 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -1479,19 +1479,15 @@ std::shared_ptr detectEden( edenRoot = readSymbolicLink(fmt::format("{}/.eden/root", root_path).c_str()); } catch (const std::system_error& e) { - if (e.code() == std::errc::not_connected) { - // When Eden fails during graceful takeover, the mount can exist, but it - // is disconnected. In this case, we can't use the eden watcher. Log this - // error and throw. - log(DBG, "Failed to read EdenFS root when mount exists: ", e.what()); - throw TerminalWatcherError(fmt::format( - "{} appears to be a disconnected EdenFS mount. " - "Try running `eden doctor` to bring it back online and " - "then retry your watch", - root_path)); - } else { - throw; - } + // When Eden fails during graceful takeover, the mount can exist, but it + // is disconnected. In this case, we can't use the eden watcher. Log this + // error and throw. + log(DBG, "Failed to read EdenFS root when mount exists: ", e.what()); + throw TerminalWatcherError(fmt::format( + "{} appears to be a disconnected EdenFS mount. " + "Try running `eden doctor` to bring it back online and " + "then retry your watch", + root_path)); } #endif From f9039c77a1ff8b81dd77d70361a0827084709c81 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Fri, 26 Apr 2024 19:01:13 -0700 Subject: [PATCH 6889/7387] Add Meyer's singleton for structured logger to log data to scribe/scuba backends Summary: Watchman logs any strucutred data via PerfSample. This is not ideal, but just to get to status quo with the new logging support, add in a singleton factory method to get a structured logger. Subsequent diffs will make use of this logger to shadow the existing setup by logging to new backend. Reviewed By: MichaelCuevas Differential Revision: D56335749 fbshipit-source-id: a5e67356f7a38d942b0cbf1cfd3479bd4d858b63 --- CMakeLists.txt | 4 ++ watchman/PerfSample.cpp | 6 +++ watchman/telemetry/WatchmanStats.cpp | 8 ++++ watchman/telemetry/WatchmanStats.h | 2 + .../telemetry/WatchmanStructuredLogger.cpp | 46 +++++++++++++++++++ watchman/telemetry/WatchmanStructuredLogger.h | 36 +++++++++++++++ 6 files changed, 102 insertions(+) create mode 100644 watchman/telemetry/WatchmanStructuredLogger.cpp create mode 100644 watchman/telemetry/WatchmanStructuredLogger.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 88a31d651f15..b3fb7f92be0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -462,8 +462,10 @@ target_link_libraries(third_party_deps INTERFACE glog::glog gflags ${Boost_LIBRARIES} + fb303::fb303 fmt::fmt edencommon::edencommon_utils + edencommon::edencommon_telemetry ) target_include_directories(third_party_deps INTERFACE ${FOLLY_INCLUDE_DIR} @@ -688,6 +690,8 @@ watchman/saved_state/SavedStateInterface.cpp watchman/scm/Git.cpp watchman/scm/Mercurial.cpp watchman/scm/SCM.cpp +watchman/telemetry/WatchmanStats.cpp +watchman/telemetry/WatchmanStructuredLogger.cpp watchman/thirdparty/getopt/GetOpt.cpp watchman/watcher/Watcher.cpp watchman/watcher/WatcherRegistry.cpp diff --git a/watchman/PerfSample.cpp b/watchman/PerfSample.cpp index 1cca6014d3e9..bb3a1757a885 100644 --- a/watchman/PerfSample.cpp +++ b/watchman/PerfSample.cpp @@ -6,14 +6,17 @@ */ #include "watchman/PerfSample.h" + #include #include #include + #include "watchman/ChildProcess.h" #include "watchman/Logging.h" #include "watchman/Options.h" #include "watchman/WatchmanConfig.h" #include "watchman/sockname.h" +#include "watchman/telemetry/WatchmanStructuredLogger.h" #include "watchman/watchman_system.h" #include "watchman/watchman_time.h" @@ -324,6 +327,9 @@ void PerfSample::log() { auto dumped = json_dumps(info, 0); watchman::log(ERR, "PERF: ", dumped, "\n"); + // TODO: Log to structured logger + auto logger = getLogger(); + if (!cfg_get_json("perf_logger_command")) { return; } diff --git a/watchman/telemetry/WatchmanStats.cpp b/watchman/telemetry/WatchmanStats.cpp index 71ea00c9181e..d2779320078d 100644 --- a/watchman/telemetry/WatchmanStats.cpp +++ b/watchman/telemetry/WatchmanStats.cpp @@ -19,4 +19,12 @@ void WatchmanStats::flush() { facebook::fb303::ServiceData::get()->getQuantileStatMap()->flushAll(); } +WatchmanStatsPtr getWatchmanStats() { + // A running Watchman daemon only needs a single WatchmanStats instance. Avoid + // atomic reference counts with RefPtr::singleton. We could use + // folly::Singleton but that makes unit testing harder. + static WatchmanStats* gWatchmanStats = new WatchmanStats; + return WatchmanStatsPtr::singleton(*gWatchmanStats); +} + } // namespace watchman diff --git a/watchman/telemetry/WatchmanStats.h b/watchman/telemetry/WatchmanStats.h index 67799328e20e..e56cf15c36a4 100644 --- a/watchman/telemetry/WatchmanStats.h +++ b/watchman/telemetry/WatchmanStats.h @@ -66,4 +66,6 @@ WatchmanStats::getStatsForCurrentThread() { return *telemetryStats_.get(); } +WatchmanStatsPtr getWatchmanStats(); + } // namespace watchman diff --git a/watchman/telemetry/WatchmanStructuredLogger.cpp b/watchman/telemetry/WatchmanStructuredLogger.cpp new file mode 100644 index 000000000000..42a156d9c7cb --- /dev/null +++ b/watchman/telemetry/WatchmanStructuredLogger.cpp @@ -0,0 +1,46 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +#include "watchman/telemetry/WatchmanStructuredLogger.h" + +#include "eden/common/telemetry/StructuredLoggerFactory.h" +#include "watchman/WatchmanConfig.h" +#include "watchman/telemetry/WatchmanStats.h" + +namespace watchman { + +using UserInfo = facebook::eden::UserInfo; + +WatchmanStructuredLogger::WatchmanStructuredLogger( + std::shared_ptr scribeLogger, + SessionInfo sessionInfo) + : ScubaStructuredLogger{std::move(scribeLogger), std::move(sessionInfo)} {} + +std::shared_ptr getLogger() { + static std::shared_ptr logger = facebook::eden:: + makeDefaultStructuredLogger( + cfg_get_string("scribe-cat", ""), + cfg_get_string("scribe-category", ""), + facebook::eden::makeSessionInfo( + UserInfo::lookup(), + facebook::eden::getHostname(), + PACKAGE_VERSION), + getWatchmanStats()); + return logger; +} + +DynamicEvent WatchmanStructuredLogger::populateDefaultFields(const char* type) { + DynamicEvent event = StructuredLogger::populateDefaultFields(type); + if (sessionInfo_.ciInstanceId.has_value()) { + event.addInt("sandcastle_instance_id", *sessionInfo_.ciInstanceId); + } + event.addString("version", sessionInfo_.appVersion); + event.addString("logged_by", "watchman"); + return event; +} + +} // namespace watchman diff --git a/watchman/telemetry/WatchmanStructuredLogger.h b/watchman/telemetry/WatchmanStructuredLogger.h new file mode 100644 index 000000000000..ea1147424687 --- /dev/null +++ b/watchman/telemetry/WatchmanStructuredLogger.h @@ -0,0 +1,36 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +#pragma once + +#include "eden/common/telemetry/ScribeLogger.h" +#include "eden/common/telemetry/ScubaStructuredLogger.h" +#include "eden/common/telemetry/SessionInfo.h" +#include "eden/common/telemetry/StructuredLogger.h" + +namespace watchman { + +using DynamicEvent = facebook::eden::DynamicEvent; +using SessionInfo = facebook::eden::SessionInfo; +using ScribeLogger = facebook::eden::ScribeLogger; +using ScubaStructuredLogger = facebook::eden::ScubaStructuredLogger; +using StructuredLogger = facebook::eden::StructuredLogger; + +class WatchmanStructuredLogger : public ScubaStructuredLogger { + public: + explicit WatchmanStructuredLogger( + std::shared_ptr scribeLogger, + SessionInfo sessionInfo); + virtual ~WatchmanStructuredLogger() override = default; + + protected: + virtual DynamicEvent populateDefaultFields(const char* type) override; +}; + +std::shared_ptr getLogger(); + +} // namespace watchman From bdb88ada48bd0f60e3e2cfda3ec98ced40a74d19 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Fri, 26 Apr 2024 19:01:13 -0700 Subject: [PATCH 6890/7387] Refactor collection of root metadata to enable future resuse in structured logging Summary: Collecting some metadata from the root for logging is fairly involved. This change does not address that. :) However, we will be adding a new way to log some of this collected data via structured logging and the existing mechanism would not readily support this. To address, we will collect the root metadata into a new struct (`RootMetadata`) and then add that to `PerfSample`, where used. Future diffs will use the same to add to structured logging events. Reviewed By: MichaelCuevas Differential Revision: D56578021 fbshipit-source-id: ac664595c8c76c8b9970edff8467dec7c7b0325c --- watchman/PerfSample.cpp | 11 +++++++++++ watchman/PerfSample.h | 14 ++++++++++++++ watchman/listener-user.cpp | 3 ++- watchman/query/eval.cpp | 8 +++++--- watchman/root/Root.h | 8 +++++--- watchman/root/ageout.cpp | 2 +- watchman/root/init.cpp | 21 ++++++++++++--------- watchman/root/iothread.cpp | 2 +- watchman/root/sync.cpp | 4 ++-- watchman/saved_state/SavedStateFactory.cpp | 7 ++++--- watchman/saved_state/SavedStateFactory.h | 4 ++-- watchman/saved_state/SavedStateInterface.h | 4 ++-- watchman/watcher/fsevents.cpp | 2 +- 13 files changed, 62 insertions(+), 28 deletions(-) diff --git a/watchman/PerfSample.cpp b/watchman/PerfSample.cpp index bb3a1757a885..d56c52cb1798 100644 --- a/watchman/PerfSample.cpp +++ b/watchman/PerfSample.cpp @@ -163,6 +163,17 @@ bool PerfSample::finish() { return will_log; } +void PerfSample::add_root_metadata(const RootMetadata& root_metadata) { + auto meta = json_object( + {{"path", w_string_to_json(root_metadata.root_path)}, + {"recrawl_count", json_integer(root_metadata.recrawl_count)}, + {"case_sensitive", json_boolean(root_metadata.case_sensitive)}}); + if (!root_metadata.watcher.empty()) { + meta.set({{"watcher", w_string_to_json(root_metadata.watcher)}}); + } + add_meta("root", std::move(meta)); +} + void PerfSample::add_meta(const char* key, json_ref&& val) { meta_data.set(key, std::move(val)); } diff --git a/watchman/PerfSample.h b/watchman/PerfSample.h index d19a751b79e2..04fea31059bf 100644 --- a/watchman/PerfSample.h +++ b/watchman/PerfSample.h @@ -10,12 +10,23 @@ #include #include #include + #include "watchman/thirdparty/jansson/jansson.h" // Performance metrics sampling namespace watchman { +/** + * Contains metadata regarding root used in structured logging. + */ +struct RootMetadata { + w_string root_path; + int64_t recrawl_count; + bool case_sensitive; + w_string watcher; +}; + class PerfSample { public: // What we're sampling across @@ -69,6 +80,9 @@ class PerfSample { // sample. This allows the caller to conditionally build and add metadata bool finish(); + // Annotate sample with Root metadata. + void add_root_metadata(const RootMetadata& root_metadata); + // Annotate the sample with metadata void add_meta(const char* key, json_ref&& val); diff --git a/watchman/listener-user.cpp b/watchman/listener-user.cpp index 2607676d1d8a..9534980d4fc9 100644 --- a/watchman/listener-user.cpp +++ b/watchman/listener-user.cpp @@ -6,6 +6,7 @@ */ #include + #include "watchman/Client.h" #include "watchman/Errors.h" #include "watchman/Logging.h" @@ -87,7 +88,7 @@ resolveRootByName(Client* client, const char* rootName, bool create) { } if (client->perf_sample) { - root->addPerfSampleMetadata(*client->perf_sample); + client->perf_sample->add_root_metadata(root->getRootMetadata()); } return root; diff --git a/watchman/query/eval.cpp b/watchman/query/eval.cpp index 5c16a3632374..48a52f1eba5d 100644 --- a/watchman/query/eval.cpp +++ b/watchman/query/eval.cpp @@ -6,8 +6,10 @@ */ #include "watchman/query/eval.h" + #include #include + #include "watchman/CommandRegistry.h" #include "watchman/Errors.h" #include "watchman/PerfSample.h" @@ -221,7 +223,7 @@ static void execute_common( } if (sample && sample->finish()) { - ctx->root->addPerfSampleMetadata(*sample); + sample->add_root_metadata(ctx->root->getRootMetadata()); auto meta = json_object({ {"fresh_instance", json_boolean(res->isFreshInstance)}, {"num_deduped", json_integer(ctx->num_deduped)}, @@ -297,8 +299,8 @@ QueryResult w_query_execute( query->since_spec->savedStateConfig.value(), scm, root->config, - [root](PerfSample& sample) { - root->addPerfSampleMetadata(sample); + [root](RootMetadata& root_metadata) { + root->collectRootMetadata(root_metadata); }); auto savedStateResult = savedStateInterface->getMostRecentSavedState( resultClock.scmMergeBase ? resultClock.scmMergeBase->piece() diff --git a/watchman/root/Root.h b/watchman/root/Root.h index c0f561c60442..967b5d95a376 100644 --- a/watchman/root/Root.h +++ b/watchman/root/Root.h @@ -9,6 +9,7 @@ #include #include + #include "watchman/Clock.h" #include "watchman/CookieSync.h" #include "watchman/IgnoreSet.h" @@ -30,7 +31,7 @@ class Root; struct TriggerCommand; class QueryableView; struct QueryContext; -class PerfSample; +struct RootMetadata; enum ClientStateDisposition { PendingEnter, @@ -343,8 +344,9 @@ class Root : public RootConfig, public std::enable_shared_from_this { static std::vector getStatusForAllRoots(); RootDebugStatus getStatus() const; - // Annotate the sample with some standard metadata taken from a root. - void addPerfSampleMetadata(PerfSample& sample) const; + // Collect standard metadata taken from a root. + RootMetadata getRootMetadata() const; + void collectRootMetadata(RootMetadata& rootMetadata) const; SaveGlobalStateHook getSaveGlobalStateHook() const { return saveGlobalStateHook_; diff --git a/watchman/root/ageout.cpp b/watchman/root/ageout.cpp index 2b490039739c..629f2f8af499 100644 --- a/watchman/root/ageout.cpp +++ b/watchman/root/ageout.cpp @@ -47,7 +47,7 @@ void Root::performAgeOut(std::chrono::seconds min_age) { } } if (sample.finish()) { - addPerfSampleMetadata(sample); + sample.add_root_metadata(getRootMetadata()); sample.log(); } } diff --git a/watchman/root/init.cpp b/watchman/root/init.cpp index c271f9a4afc1..8227e319c13c 100644 --- a/watchman/root/init.cpp +++ b/watchman/root/init.cpp @@ -290,24 +290,27 @@ Root::~Root() { --live_roots; } -void Root::addPerfSampleMetadata(PerfSample& sample) const { +RootMetadata Root::getRootMetadata() const { + RootMetadata root_metadata; + collectRootMetadata(root_metadata); + return root_metadata; +} + +void Root::collectRootMetadata(RootMetadata& rootMetadata) const { // Note: if the root lock isn't held, we may read inaccurate numbers for // some of these properties. We're ok with that, and don't want to force // the root lock to be re-acquired just for this. - auto meta = json_object( - {{"path", w_string_to_json(root_path)}, - {"recrawl_count", json_integer(recrawlInfo.rlock()->recrawlCount)}, - {"case_sensitive", - json_boolean(case_sensitive == CaseSensitivity::CaseSensitive)}}); + rootMetadata.root_path = root_path; + rootMetadata.recrawl_count = recrawlInfo.rlock()->recrawlCount; + rootMetadata.case_sensitive = + case_sensitive == CaseSensitivity::CaseSensitive; // During recrawl, the view may be re-assigned. Protect against // reading a nullptr. auto view = this->view(); if (view) { - meta.set({{"watcher", w_string_to_json(view->getName())}}); + rootMetadata.watcher = view->getName(); } - - sample.add_meta("root", std::move(meta)); } } // namespace watchman diff --git a/watchman/root/iothread.cpp b/watchman/root/iothread.cpp index 987d9045cbd3..13990b68a4fd 100644 --- a/watchman/root/iothread.cpp +++ b/watchman/root/iothread.cpp @@ -79,7 +79,7 @@ void InMemoryView::fullCrawl( root->cookies.abortAllCookies(); - root->addPerfSampleMetadata(sample); + sample.add_root_metadata(root->getRootMetadata()); sample.finish(); sample.force_log(); diff --git a/watchman/root/sync.cpp b/watchman/root/sync.cpp index d62d4ee1a516..86ed5a999cb9 100644 --- a/watchman/root/sync.cpp +++ b/watchman/root/sync.cpp @@ -22,7 +22,7 @@ CookieSync::SyncResult Root::syncToNow(std::chrono::milliseconds timeout) { try { auto result = view()->syncToNow(root, timeout); if (sample.finish()) { - root->addPerfSampleMetadata(sample); + sample.add_root_metadata(root->getRootMetadata()); sample.add_meta( "sync_to_now", json_object( @@ -34,7 +34,7 @@ CookieSync::SyncResult Root::syncToNow(std::chrono::milliseconds timeout) { } catch (const std::exception& exc) { sample.force_log(); sample.finish(); - root->addPerfSampleMetadata(sample); + sample.add_root_metadata(root->getRootMetadata()); sample.add_meta( "sync_to_now", json_object( diff --git a/watchman/saved_state/SavedStateFactory.cpp b/watchman/saved_state/SavedStateFactory.cpp index f14b99b67735..0e60dd0e43cf 100644 --- a/watchman/saved_state/SavedStateFactory.cpp +++ b/watchman/saved_state/SavedStateFactory.cpp @@ -7,6 +7,7 @@ #include "watchman/saved_state/SavedStateFactory.h" #include "watchman/Errors.h" +#include "watchman/root/Root.h" #include "watchman/saved_state/LocalSavedStateInterface.h" #if HAVE_MANIFOLD @@ -20,16 +21,16 @@ std::unique_ptr getInterface( const json_ref& savedStateConfig, const SCM* scm, Configuration config, - std::function extraSampleMetadata) { + std::function collectRootMetadata) { unused_parameter(config); - unused_parameter(extraSampleMetadata); + unused_parameter(collectRootMetadata); #if HAVE_MANIFOLD if (storageType == "manifold") { return std::make_unique( savedStateConfig, scm, std::move(config), - std::move(extraSampleMetadata)); + std::move(collectRootMetadata)); } #endif if (storageType == "local") { diff --git a/watchman/saved_state/SavedStateFactory.h b/watchman/saved_state/SavedStateFactory.h index c00eecc2cbde..1ccab5d719a4 100644 --- a/watchman/saved_state/SavedStateFactory.h +++ b/watchman/saved_state/SavedStateFactory.h @@ -13,7 +13,7 @@ namespace watchman { -class PerfSample; +struct RootMetadata; class SCM; class SavedStateInterface; @@ -29,6 +29,6 @@ std::unique_ptr getInterface( const json_ref& savedStateConfig, const SCM* scm, Configuration config, - std::function extraSampleMetadata); + std::function collectRootMetadata); } // namespace watchman diff --git a/watchman/saved_state/SavedStateInterface.h b/watchman/saved_state/SavedStateInterface.h index 370e8cbde3ee..0b45605aa67c 100644 --- a/watchman/saved_state/SavedStateInterface.h +++ b/watchman/saved_state/SavedStateInterface.h @@ -12,7 +12,7 @@ namespace watchman { class Configuration; -class PerfSample; +struct RootMetadata; class SavedStateInterface; class SCM; @@ -21,7 +21,7 @@ using SavedStateFactory = std::unique_ptr (*)( const json_ref& savedStateConfig, const SCM* scm, Configuration config, - std::function extraSampleMetadata); + std::function collectRootMetadata); // An interface that returns information about saved states associated with // specific source control commits. Clients using scm-aware queries can diff --git a/watchman/watcher/fsevents.cpp b/watchman/watcher/fsevents.cpp index a0ed05dd4718..3eff595f1db6 100644 --- a/watchman/watcher/fsevents.cpp +++ b/watchman/watcher/fsevents.cpp @@ -132,7 +132,7 @@ std::shared_ptr watcherFromRoot( /** Generate a perf event for the drop */ static void log_drop_event(const std::shared_ptr& root, bool isKernel) { PerfSample sample(isKernel ? "KernelDropped" : "UserDropped"); - root->addPerfSampleMetadata(sample); + sample.add_root_metadata(root->getRootMetadata()); sample.finish(); sample.force_log(); sample.log(); From dc98b6293c5bb83b5fa486369e7f2c49d2282e2b Mon Sep 17 00:00:00 2001 From: John Elliott Date: Fri, 26 Apr 2024 19:01:13 -0700 Subject: [PATCH 6891/7387] Log DispatchCommand events directly to StructuredLogger Summary: Watchman only logs to the structured logger via a sampled logging "hook". It would be better to directly log structured events directly. Let's fix that. This change includes creating a new DispatchCommand event, including buildinfo as a default field in all events, and plumbing through this event from where client events are dispatched. One of the fields, `args`, is represented as a JSON string - this required adding in a simple JSON to string converter. Reviewed By: MichaelCuevas Differential Revision: D56381900 fbshipit-source-id: 8b1fd9934ca678828cec585158a8b085430cb79f --- watchman/Client.cpp | 19 +++++ watchman/Client.h | 6 +- watchman/PerfSample.cpp | 4 - watchman/PerfSample.h | 8 ++ watchman/listener-user.cpp | 6 ++ watchman/root/Root.h | 1 + watchman/telemetry/LogEvent.h | 73 +++++++++++++++++++ .../telemetry/WatchmanStructuredLogger.cpp | 3 + watchman/thirdparty/jansson/jansson.h | 5 ++ watchman/thirdparty/jansson/value.cpp | 49 +++++++++++++ 10 files changed, 169 insertions(+), 5 deletions(-) create mode 100644 watchman/telemetry/LogEvent.h diff --git a/watchman/Client.cpp b/watchman/Client.cpp index 6c981b3905a1..73257f1032b9 100644 --- a/watchman/Client.cpp +++ b/watchman/Client.cpp @@ -8,6 +8,7 @@ #include "watchman/Client.h" #include +#include #include "eden/common/utils/ProcessInfoCache.h" #include "watchman/Command.h" @@ -19,6 +20,8 @@ #include "watchman/QueryableView.h" #include "watchman/Shutdown.h" #include "watchman/root/Root.h" +#include "watchman/telemetry/LogEvent.h" +#include "watchman/telemetry/WatchmanStructuredLogger.h" #include "watchman/watchman_cmd.h" namespace watchman { @@ -76,6 +79,10 @@ void Client::sendErrorResponse(std::string_view formatted) { UntypedResponse resp; resp.set("error", typed_string_to_json(formatted)); + if (dispatch_command) { + dispatch_command->error = formatted; + } + if (perf_sample) { perf_sample->add_meta("error", typed_string_to_json(formatted)); } @@ -129,10 +136,16 @@ bool Client::dispatchCommand(const Command& command, CommandFlags mode) { // Scope for the perf sample { logf(DBG, "dispatch_command: {}\n", def->name); + folly::stop_watch<> dispatchCommandStart; + DispatchCommand dispatchCommand; + dispatchCommand.command = command.name(); + dispatch_command = &dispatchCommand; auto sample_name = "dispatch_command:" + std::string{def->name}; PerfSample sample(sample_name.c_str()); perf_sample = &sample; + SCOPE_EXIT { + dispatch_command = nullptr; perf_sample = nullptr; }; @@ -148,9 +161,15 @@ bool Client::dispatchCommand(const Command& command, CommandFlags mode) { enqueueResponse(def->handler(this, rendered)); } catch (const ErrorResponse& e) { sendErrorResponse(e.what()); + dispatchCommand.error = e.what(); } catch (const ResponseWasHandledManually&) { } + dispatchCommand.duration = + std::chrono::duration{dispatchCommandStart.elapsed()}.count(); + dispatchCommand.args = rendered.toString(); + getLogger()->logEvent(dispatchCommand); + if (sample.finish()) { sample.add_meta("args", std::move(rendered)); sample.add_meta( diff --git a/watchman/Client.h b/watchman/Client.h index ca817063e1fa..8a4005bcad83 100644 --- a/watchman/Client.h +++ b/watchman/Client.h @@ -7,18 +7,19 @@ #pragma once -#include #include #include #include #include +#include "eden/common/utils/ProcessInfoCache.h" #include "watchman/Clock.h" #include "watchman/CommandRegistry.h" #include "watchman/Logging.h" #include "watchman/PDU.h" #include "watchman/PerfSample.h" +#include "watchman/telemetry/LogEvent.h" #include "watchman/watchman_stream.h" namespace watchman { @@ -55,6 +56,9 @@ class Client : public std::enable_shared_from_this { // The PerfSample wrapping the current command's execution. Only set by the // client thread. PerfSample* perf_sample = nullptr; + // The DispatchCommand wrapping the current command's execution. Only set by + // the client thread. + DispatchCommand* dispatch_command = nullptr; // Queue of things to send to the client. std::deque responses; diff --git a/watchman/PerfSample.cpp b/watchman/PerfSample.cpp index d56c52cb1798..ae2823ec72f3 100644 --- a/watchman/PerfSample.cpp +++ b/watchman/PerfSample.cpp @@ -16,7 +16,6 @@ #include "watchman/Options.h" #include "watchman/WatchmanConfig.h" #include "watchman/sockname.h" -#include "watchman/telemetry/WatchmanStructuredLogger.h" #include "watchman/watchman_system.h" #include "watchman/watchman_time.h" @@ -338,9 +337,6 @@ void PerfSample::log() { auto dumped = json_dumps(info, 0); watchman::log(ERR, "PERF: ", dumped, "\n"); - // TODO: Log to structured logger - auto logger = getLogger(); - if (!cfg_get_json("perf_logger_command")) { return; } diff --git a/watchman/PerfSample.h b/watchman/PerfSample.h index 04fea31059bf..8a7a04210650 100644 --- a/watchman/PerfSample.h +++ b/watchman/PerfSample.h @@ -27,6 +27,14 @@ struct RootMetadata { w_string watcher; }; +template +void addRootMetadataToEvent(const RootMetadata& root_metadata, T& event) { + event.root = root_metadata.root_path.string(); + event.recrawl = root_metadata.recrawl_count; + event.case_sensitive = root_metadata.case_sensitive; + event.watcher = root_metadata.watcher.string(); +} + class PerfSample { public: // What we're sampling across diff --git a/watchman/listener-user.cpp b/watchman/listener-user.cpp index 9534980d4fc9..b319cc767971 100644 --- a/watchman/listener-user.cpp +++ b/watchman/listener-user.cpp @@ -10,6 +10,7 @@ #include "watchman/Client.h" #include "watchman/Errors.h" #include "watchman/Logging.h" +#include "watchman/PerfSample.h" #include "watchman/Shutdown.h" #include "watchman/root/Root.h" #include "watchman/root/resolve.h" @@ -87,6 +88,11 @@ resolveRootByName(Client* client, const char* rootName, bool create) { root = w_root_resolve(rootName, create); } + if (client->dispatch_command) { + addRootMetadataToEvent( + root->getRootMetadata(), *client->dispatch_command); + } + if (client->perf_sample) { client->perf_sample->add_root_metadata(root->getRootMetadata()); } diff --git a/watchman/root/Root.h b/watchman/root/Root.h index 967b5d95a376..e5f9bb6f5b49 100644 --- a/watchman/root/Root.h +++ b/watchman/root/Root.h @@ -15,6 +15,7 @@ #include "watchman/IgnoreSet.h" #include "watchman/PendingCollection.h" #include "watchman/PubSub.h" +#include "watchman/QueryableView.h" #include "watchman/Serde.h" #include "watchman/WatchmanConfig.h" #include "watchman/fs/FileSystem.h" diff --git a/watchman/telemetry/LogEvent.h b/watchman/telemetry/LogEvent.h new file mode 100644 index 000000000000..8b6057c68dfd --- /dev/null +++ b/watchman/telemetry/LogEvent.h @@ -0,0 +1,73 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +#pragma once + +#include +#include +#include +#include + +#include "eden/common/telemetry/DynamicEvent.h" + +namespace watchman { + +using DynamicEvent = facebook::eden::DynamicEvent; + +struct BaseEvent { + std::string root; + std::string error; + + void populate(DynamicEvent& event) const { + if (!root.empty()) { + event.addString("root", root); + } + if (!error.empty()) { + event.addString("error", error); + } + } +}; + +struct MetadataEvent : public BaseEvent { + int64_t recrawl = 0; + bool case_sensitive = false; + std::string watcher; + + void populate(DynamicEvent& event) const { + BaseEvent::populate(event); + + event.addInt("recrawl", recrawl); + event.addBool("case_sensitive", case_sensitive); + if (!watcher.empty()) { + event.addString("watcher", watcher); + } + } +}; + +struct DispatchCommand : public MetadataEvent { + static constexpr const char* type = "dispatch_command"; + + double duration = 0.0; + std::string command; + std::string args; + pid_t client_pid = 0; + + void populate(DynamicEvent& event) const { + MetadataEvent::populate(event); + + event.addDouble("duration", duration); + event.addString("command", command); + if (!args.empty()) { + event.addString("args", args); + } + if (client_pid != 0) { + event.addInt("client_pid", client_pid); + } + } +}; + +} // namespace watchman diff --git a/watchman/telemetry/WatchmanStructuredLogger.cpp b/watchman/telemetry/WatchmanStructuredLogger.cpp index 42a156d9c7cb..1bb4bb17c373 100644 --- a/watchman/telemetry/WatchmanStructuredLogger.cpp +++ b/watchman/telemetry/WatchmanStructuredLogger.cpp @@ -39,6 +39,9 @@ DynamicEvent WatchmanStructuredLogger::populateDefaultFields(const char* type) { event.addInt("sandcastle_instance_id", *sessionInfo_.ciInstanceId); } event.addString("version", sessionInfo_.appVersion); +#ifdef WATCHMAN_BUILD_INFO + event.addString("buildinfo", WATCHMAN_BUILD_INFO); +#endif event.addString("logged_by", "watchman"); return event; } diff --git a/watchman/thirdparty/jansson/jansson.h b/watchman/thirdparty/jansson/jansson.h index f79c1212d85a..3f520d2b1ed7 100644 --- a/watchman/thirdparty/jansson/jansson.h +++ b/watchman/thirdparty/jansson/jansson.h @@ -209,6 +209,11 @@ class json_ref { */ std::optional asOptionalString() const; + /** + * Converts to a JSON formatted string. + */ + std::string toString() const; + const char* asCString() const; bool asBool() const; json_int_t asInt() const; diff --git a/watchman/thirdparty/jansson/value.cpp b/watchman/thirdparty/jansson/value.cpp index f8af99d9418e..5c241421f650 100644 --- a/watchman/thirdparty/jansson/value.cpp +++ b/watchman/thirdparty/jansson/value.cpp @@ -13,7 +13,9 @@ #include #include +#include #include +#include #include "utf.h" #include "watchman/watchman_string.h" @@ -106,6 +108,53 @@ std::optional json_ref::asOptionalString() const { return json_to_string(ref_)->value; } +std::string json_ref::toString() const { + switch (this->type()) { + case JSON_OBJECT: + { + std::stringstream ss; + const auto& obj = this->object(); + ss << "{"; + for (auto itr = obj.begin(); itr != obj.end(); itr++) { + ss << itr->first.c_str() << ":" << itr->second.toString() << ","; + } + if (obj.size() > 0) { + // remove last comma + ss.seekp(-1, std::ios_base::end); + } + ss << "}"; + return ss.str(); + } + case JSON_ARRAY: + { + std::stringstream ss; + const auto& arr = this->array(); + ss << "["; + for (const auto& elem: arr) { + ss << elem.toString() << ","; + } + if (arr.size() > 0) { + // remove last comma + ss.seekp(-1, std::ios_base::end); + } + ss << "]"; + return ss.str(); + } + case JSON_STRING: + return fmt::format("\"{}\"", json_string_value(*this)); + case JSON_INTEGER: + case JSON_REAL: + return std::to_string(json_number_value(*this)); + case JSON_TRUE: + return "true"; + case JSON_FALSE: + return "false"; + case JSON_NULL: + return "null"; + } + return std::string(); +} + const char* json_ref::asCString() const { return asString().c_str(); } From 9d04832c88bdcfab74705a38a15ddbe458ae1e02 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Fri, 26 Apr 2024 19:01:13 -0700 Subject: [PATCH 6892/7387] Log ClockTest events directly to StructuredLogger Summary: Watchman only logs to the structured logger via a sampled logging "hook". It would be better to directly log structured events directly. Let's fix that. This change includes creating a new ClockTest event. Reviewed By: MichaelCuevas Differential Revision: D56403480 fbshipit-source-id: 7f6ef376ec2fa3b1f55ece8d8007787c303d28a8 --- watchman/SanityCheck.cpp | 8 ++++++++ watchman/telemetry/LogEvent.h | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/watchman/SanityCheck.cpp b/watchman/SanityCheck.cpp index 4fefa32149d1..87cc45f66589 100644 --- a/watchman/SanityCheck.cpp +++ b/watchman/SanityCheck.cpp @@ -7,11 +7,14 @@ #include #include + #include "watchman/Connect.h" #include "watchman/Logging.h" #include "watchman/PDU.h" #include "watchman/PerfSample.h" #include "watchman/Shutdown.h" +#include "watchman/telemetry/LogEvent.h" +#include "watchman/telemetry/WatchmanStructuredLogger.h" #include "watchman/watchman_stream.h" namespace watchman { @@ -154,15 +157,20 @@ void do_clock_check(watchman_stream* client) { try { auto roots = get_watch_list(client); for (auto& r : roots.array()) { + ClockTest clockTest; + clockTest.root = r.toString(); PerfSample sample("clock-test"); sample.add_meta("root", json_object({{"path", r}})); try { check_clock_command(client, r); } catch (const std::exception& ex) { log(watchman::ERR, "Failed do_clock_check : ", ex.what(), "\n"); + clockTest.error = ex.what(); sample.add_meta("error", w_string_to_json(ex.what())); sample.force_log(); } + + getLogger()->logEvent(clockTest); sample.finish(); sample.log(); } diff --git a/watchman/telemetry/LogEvent.h b/watchman/telemetry/LogEvent.h index 8b6057c68dfd..e6fc45c3bd5b 100644 --- a/watchman/telemetry/LogEvent.h +++ b/watchman/telemetry/LogEvent.h @@ -70,4 +70,12 @@ struct DispatchCommand : public MetadataEvent { } }; +struct ClockTest : public BaseEvent { + static constexpr const char* type = "clock_test"; + + void populate(DynamicEvent& event) const { + BaseEvent::populate(event); + } +}; + } // namespace watchman From fec85cb6c4039d46ce865b0f0d0005ceb07eb584 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Fri, 26 Apr 2024 19:01:13 -0700 Subject: [PATCH 6893/7387] Log AgeOut events directly to StructuredLogger Summary: Watchman only logs to the structured logger via a sampled logging "hook". It would be better to directly log structured events directly. Let's fix that. This change includes creating a new AgeOut event. Reviewed By: MichaelCuevas Differential Revision: D56491513 fbshipit-source-id: 179ae496a518e21dd22c0c3dd03d9e3da17b7d28 --- watchman/InMemoryView.cpp | 26 ++++++++++++------------- watchman/InMemoryView.h | 6 +++++- watchman/QueryableView.cpp | 3 ++- watchman/QueryableView.h | 8 +++++++- watchman/root/ageout.cpp | 36 +++++++++++++++++++++++++++++++++-- watchman/telemetry/LogEvent.h | 16 ++++++++++++++++ 6 files changed, 77 insertions(+), 18 deletions(-) diff --git a/watchman/InMemoryView.cpp b/watchman/InMemoryView.cpp index 5b83d5b1afa3..bea32ac7e829 100644 --- a/watchman/InMemoryView.cpp +++ b/watchman/InMemoryView.cpp @@ -510,9 +510,13 @@ ClockStamp InMemoryView::ageOutFile( return ageOutOtime; } -void InMemoryView::ageOut(PerfSample& sample, std::chrono::seconds minAge) { - uint32_t num_aged_files = 0; - uint32_t num_walked = 0; +void InMemoryView::ageOut( + int64_t& walked, + int64_t& files, + int64_t& dirs, + std::chrono::seconds minAge) { + files = 0; + walked = 0; std::unordered_set dirs_to_erase; auto now = std::chrono::system_clock::now(); @@ -522,7 +526,7 @@ void InMemoryView::ageOut(PerfSample& sample, std::chrono::seconds minAge) { watchman_file* file = view->getLatestFile(); watchman_file* prior = nullptr; while (file) { - ++num_walked; + ++walked; if (file->exists || std::chrono::system_clock::from_time_t(file->otime.timestamp) + minAge > now) { @@ -536,7 +540,7 @@ void InMemoryView::ageOut(PerfSample& sample, std::chrono::seconds minAge) { // Revise tick for fresh instance reporting lastAgeOutTick_ = std::max(lastAgeOutTick_, agedOtime.ticks); - num_aged_files++; + files++; // Go back to last good file node; we can't trust that the // value of file->next saved before age_out_file is a valid @@ -552,15 +556,11 @@ void InMemoryView::ageOut(PerfSample& sample, std::chrono::seconds minAge) { } } - if (num_aged_files + dirs_to_erase.size()) { - logf(ERR, "aged {} files, {} dirs\n", num_aged_files, dirs_to_erase.size()); + if (files + dirs_to_erase.size()) { + logf(ERR, "aged {} files, {} dirs\n", files, dirs_to_erase.size()); } - sample.add_meta( - "age_out", - json_object( - {{"walked", json_integer(num_walked)}, - {"files", json_integer(num_aged_files)}, - {"dirs", json_integer(dirs_to_erase.size())}})); + + dirs = dirs_to_erase.size(); } void InMemoryView::timeGenerator(const Query* query, QueryContext* ctx) const { diff --git a/watchman/InMemoryView.h b/watchman/InMemoryView.h index 3ba2ad31cd24..57a43c91a9f9 100644 --- a/watchman/InMemoryView.h +++ b/watchman/InMemoryView.h @@ -164,7 +164,11 @@ class InMemoryView final : public QueryableView { }; } - void ageOut(PerfSample& sample, std::chrono::seconds minAge) override; + void ageOut( + int64_t& walked, + int64_t& files, + int64_t& dirs, + std::chrono::seconds minAge) override; folly::SemiFuture waitForSettle( std::chrono::milliseconds settle_period) override; diff --git a/watchman/QueryableView.cpp b/watchman/QueryableView.cpp index 7894de7a4ae7..832a11e5c1a5 100644 --- a/watchman/QueryableView.cpp +++ b/watchman/QueryableView.cpp @@ -44,7 +44,8 @@ std::chrono::system_clock::time_point QueryableView::getLastAgeOutTimeStamp() return std::chrono::system_clock::time_point{}; } -void QueryableView::ageOut(PerfSample&, std::chrono::seconds) {} +void QueryableView::ageOut(int64_t&, int64_t&, int64_t&, std::chrono::seconds) { +} bool QueryableView::isVCSOperationInProgress() const { static const std::vector lockFiles{".hg/wlock", ".git/index.lock"}; diff --git a/watchman/QueryableView.h b/watchman/QueryableView.h index 3121155e338c..6fdbd7451ab8 100644 --- a/watchman/QueryableView.h +++ b/watchman/QueryableView.h @@ -9,9 +9,11 @@ #include #include + #include "watchman/Clock.h" #include "watchman/CookieSync.h" #include "watchman/PerfSample.h" +#include "watchman/telemetry/LogEvent.h" #include "watchman/watchman_string.h" namespace watchman { @@ -50,7 +52,11 @@ class QueryableView : public std::enable_shared_from_this { virtual w_string getCurrentClockString() const = 0; virtual ClockTicks getLastAgeOutTickValue() const; virtual std::chrono::system_clock::time_point getLastAgeOutTimeStamp() const; - virtual void ageOut(PerfSample& sample, std::chrono::seconds minAge); + virtual void ageOut( + int64_t& walked, + int64_t& files, + int64_t& dirs, + std::chrono::seconds minAge); virtual folly::SemiFuture waitForSettle( std::chrono::milliseconds settle_period) = 0; diff --git a/watchman/root/ageout.cpp b/watchman/root/ageout.cpp index 629f2f8af499..33e36ae374c7 100644 --- a/watchman/root/ageout.cpp +++ b/watchman/root/ageout.cpp @@ -7,6 +7,8 @@ #include "watchman/QueryableView.h" #include "watchman/root/Root.h" +#include "watchman/telemetry/LogEvent.h" +#include "watchman/telemetry/WatchmanStructuredLogger.h" using namespace watchman; @@ -32,7 +34,10 @@ void Root::performAgeOut(std::chrono::seconds min_age) { // of build tooling or atomic renames) watchman::PerfSample sample("age_out"); - view()->ageOut(sample, std::chrono::seconds(min_age)); + int64_t walked = 0; + int64_t files = 0; + int64_t dirs = 0; + view()->ageOut(walked, files, dirs, std::chrono::seconds(min_age)); // Age out cursors too. { @@ -46,8 +51,35 @@ void Root::performAgeOut(std::chrono::seconds min_age) { } } } + + auto root_metadata = getRootMetadata(); + auto ageOut = AgeOut{ + // MetadataEvent + { + // BaseEvent + { + root_metadata.root_path.string(), // root + std::string() // error + }, + root_metadata.recrawl_count, // recrawl + root_metadata.case_sensitive, // case_sensitive + root_metadata.watcher.string() // watcher + }, + walked, // walked + files, // files + dirs // dirs + }; + getLogger()->logEvent(ageOut); + if (sample.finish()) { - sample.add_root_metadata(getRootMetadata()); + sample.add_meta( + "age_out", + json_object( + {{"walked", json_integer(walked)}, + {"files", json_integer(files)}, + {"dirs", json_integer(dirs)}})); + + sample.add_root_metadata(root_metadata); sample.log(); } } diff --git a/watchman/telemetry/LogEvent.h b/watchman/telemetry/LogEvent.h index e6fc45c3bd5b..537ded942455 100644 --- a/watchman/telemetry/LogEvent.h +++ b/watchman/telemetry/LogEvent.h @@ -78,4 +78,20 @@ struct ClockTest : public BaseEvent { } }; +struct AgeOut : public MetadataEvent { + static constexpr const char* type = "age_out"; + + int64_t walked = 0; + int64_t files = 0; + int64_t dirs = 0; + + void populate(DynamicEvent& event) const { + MetadataEvent::populate(event); + + event.addInt("walked", walked); + event.addInt("files", files); + event.addInt("dirs", dirs); + } +}; + } // namespace watchman From b9c8d9776f6b0f8fbf540605cbad2f52ccd6d1e3 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Fri, 26 Apr 2024 19:01:13 -0700 Subject: [PATCH 6894/7387] Log SyncToNow events directly to StructuredLogger Summary: Watchman only logs to the structured logger via a sampled logging "hook". It would be better to directly log structured events directly. Let's fix that. This change includes creating a new SyncToNow event. Reviewed By: MichaelCuevas Differential Revision: D56501217 fbshipit-source-id: cae18d9289d9f9480d7d9573b7a3844769a444dc --- watchman/root/sync.cpp | 43 +++++++++++++++++++++++++++++++++-- watchman/telemetry/LogEvent.h | 14 ++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/watchman/root/sync.cpp b/watchman/root/sync.cpp index 86ed5a999cb9..6507dcac6661 100644 --- a/watchman/root/sync.cpp +++ b/watchman/root/sync.cpp @@ -8,6 +8,8 @@ #include "watchman/PerfSample.h" #include "watchman/QueryableView.h" #include "watchman/root/Root.h" +#include "watchman/telemetry/LogEvent.h" +#include "watchman/telemetry/WatchmanStructuredLogger.h" using namespace watchman; @@ -21,8 +23,27 @@ CookieSync::SyncResult Root::syncToNow(std::chrono::milliseconds timeout) { auto root = shared_from_this(); try { auto result = view()->syncToNow(root, timeout); + + auto root_metadata = getRootMetadata(); + auto syncToNow = SyncToNow{ + // MetadataEvent + { + // BaseEvent + { + root_metadata.root_path.string(), // root + std::string() // error + }, + root_metadata.recrawl_count, // recrawl + root_metadata.case_sensitive, // case_sensitive + root_metadata.watcher.string() // watcher + }, + true, // success + timeout.count() // timeoutms + }; + getLogger()->logEvent(syncToNow); + if (sample.finish()) { - sample.add_root_metadata(root->getRootMetadata()); + sample.add_root_metadata(root_metadata); sample.add_meta( "sync_to_now", json_object( @@ -32,9 +53,27 @@ CookieSync::SyncResult Root::syncToNow(std::chrono::milliseconds timeout) { } return result; } catch (const std::exception& exc) { + auto root_metadata = getRootMetadata(); + auto syncToNow = SyncToNow{ + // MetadataEvent + { + // BaseEvent + { + root_metadata.root_path.string(), // root + exc.what() // error + }, + root_metadata.recrawl_count, // recrawl + root_metadata.case_sensitive, // case_sensitive + root_metadata.watcher.string() // watcher + }, + false, // success + timeout.count() // timeoutms + }; + getLogger()->logEvent(syncToNow); + sample.force_log(); sample.finish(); - sample.add_root_metadata(root->getRootMetadata()); + sample.add_root_metadata(root_metadata); sample.add_meta( "sync_to_now", json_object( diff --git a/watchman/telemetry/LogEvent.h b/watchman/telemetry/LogEvent.h index 537ded942455..6c30bde1d21a 100644 --- a/watchman/telemetry/LogEvent.h +++ b/watchman/telemetry/LogEvent.h @@ -94,4 +94,18 @@ struct AgeOut : public MetadataEvent { } }; +struct SyncToNow : public MetadataEvent { + static constexpr const char* type = "sync_to_now"; + + bool success = false; + int64_t timeoutms = 0; + + void populate(DynamicEvent& event) const { + MetadataEvent::populate(event); + + event.addBool("success", success); + event.addInt("timeoutms", timeoutms); + } +}; + } // namespace watchman From dd75e9e66edd8d99dbbd84e2f6102d06b0bc257c Mon Sep 17 00:00:00 2001 From: John Elliott Date: Fri, 26 Apr 2024 19:01:13 -0700 Subject: [PATCH 6895/7387] Log SavedState events directly to StructuredLogger Summary: Watchman only logs to the structured logger via a sampled logging "hook". It would be better to directly log structured events directly. Let's fix that. This change includes creating a new SavedState event. Reviewed By: MichaelCuevas Differential Revision: D56594788 fbshipit-source-id: 655f77c3d15af8631a6757971edb0e20f5dd7a44 --- watchman/telemetry/LogEvent.h | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/watchman/telemetry/LogEvent.h b/watchman/telemetry/LogEvent.h index 6c30bde1d21a..9191f65e626d 100644 --- a/watchman/telemetry/LogEvent.h +++ b/watchman/telemetry/LogEvent.h @@ -108,4 +108,39 @@ struct SyncToNow : public MetadataEvent { } }; +struct SavedState : public MetadataEvent { + enum Target { Manifold = 1, Xdb = 2 }; + enum Action { GetProperties = 1, Connect = 2, Query = 3 }; + + static constexpr const char* type = "saved_state"; + + Target target = Manifold; + Action action = GetProperties; + std::string project; + std::string path; + int64_t commit_date = 0; + std::string metadata; + std::string properties; + bool success = false; + + void populate(DynamicEvent& event) const { + MetadataEvent::populate(event); + + event.addInt("target", target); + event.addInt("action", action); + event.addString("project", project); + if (!path.empty()) { + event.addString("path", path); + } + event.addInt("commit_date", commit_date); + if (!metadata.empty()) { + event.addString("metadata", metadata); + } + if (!properties.empty()) { + event.addString("properties", properties); + } + event.addBool("success", success); + } +}; + } // namespace watchman From 63af0257409cfe74974845fcb4a509cc16446380 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Fri, 26 Apr 2024 19:01:13 -0700 Subject: [PATCH 6896/7387] Log QueryExeucte events directly to StructuredLogger Summary: Watchman only logs to the structured logger via a sampled logging "hook". It would be better to directly log structured events directly. Let's fix that. This change includes creating a new QueryExecute event. Reviewed By: MichaelCuevas Differential Revision: D56600092 fbshipit-source-id: 21a8a996b5609a406f8d48e4013dfdffaf9f0766 --- watchman/query/eval.cpp | 49 +++++++++++++++++++++++++---------- watchman/telemetry/LogEvent.h | 32 +++++++++++++++++++++++ 2 files changed, 68 insertions(+), 13 deletions(-) diff --git a/watchman/query/eval.cpp b/watchman/query/eval.cpp index 48a52f1eba5d..14b1fbb7ed65 100644 --- a/watchman/query/eval.cpp +++ b/watchman/query/eval.cpp @@ -22,6 +22,8 @@ #include "watchman/root/Root.h" #include "watchman/saved_state/SavedStateInterface.h" #include "watchman/scm/SCM.h" +#include "watchman/telemetry/LogEvent.h" +#include "watchman/telemetry/WatchmanStructuredLogger.h" using namespace watchman; @@ -158,6 +160,7 @@ static void default_generators( static void execute_common( QueryContext* ctx, + QueryExecute* queryExecute, PerfSample* sample, QueryResult* res, QueryGenerator generator) { @@ -214,6 +217,10 @@ static void execute_common( } } + // NOTE: sample and queryExecute are either both non-null or both null + queryExecute->num_special_files = ctx->namesToLog.size(); + queryExecute->special_files = json_array(std::move(nameList)).toString(); + sample->add_meta( "num_special_files_in_result_set", json_integer(ctx->namesToLog.size())); @@ -222,19 +229,33 @@ static void execute_common( sample->force_log(); } - if (sample && sample->finish()) { - sample->add_root_metadata(ctx->root->getRootMetadata()); - auto meta = json_object({ - {"fresh_instance", json_boolean(res->isFreshInstance)}, - {"num_deduped", json_integer(ctx->num_deduped)}, - {"num_results", json_integer(ctx->resultsArray.size())}, - {"num_walked", json_integer(ctx->getNumWalked())}, - }); + if (sample) { + // NOTE: sample and queryExecute are either both non-null or both null + RootMetadata root_metadata = ctx->root->getRootMetadata(); + addRootMetadataToEvent(root_metadata, *queryExecute); + queryExecute->fresh_instance = res->isFreshInstance; + queryExecute->deduped = ctx->num_deduped; + queryExecute->results = ctx->resultsArray.size(); + queryExecute->walked = ctx->getNumWalked(); if (ctx->query->query_spec) { - meta.set("query", json_ref(*ctx->query->query_spec)); + queryExecute->query = ctx->query->query_spec->toString(); + } + getLogger()->logEvent(*queryExecute); + + if (sample->finish()) { + sample->add_root_metadata(root_metadata); + auto meta = json_object({ + {"fresh_instance", json_boolean(res->isFreshInstance)}, + {"num_deduped", json_integer(ctx->num_deduped)}, + {"num_results", json_integer(ctx->resultsArray.size())}, + {"num_walked", json_integer(ctx->getNumWalked())}, + }); + if (ctx->query->query_spec) { + meta.set("query", json_ref(*ctx->query->query_spec)); + } + sample->add_meta("query_execute", std::move(meta)); + sample->log(); } - sample->add_meta("query_execute", std::move(meta)); - sample->log(); } res->resultsArray = ctx->renderResults(); @@ -254,9 +275,11 @@ QueryResult w_query_execute( bool disableFreshInstance{false}; auto requestId = query->request_id; + QueryExecute queryExecute; PerfSample sample("query_execute"); if (requestId && !requestId->empty()) { log(DBG, "request_id = ", *requestId, "\n"); + queryExecute.request_id = requestId->string(); sample.add_meta("request_id", w_string_to_json(*requestId)); } @@ -447,11 +470,11 @@ QueryResult w_query_execute( QueryResult r; c.clockAtStartOfQuery = ctx.clockAtStartOfQuery; c.since = ctx.since; - execute_common(&c, nullptr, &r, generator); + execute_common(&c, nullptr, nullptr, &r, generator); } } - execute_common(&ctx, &sample, &res, generator); + execute_common(&ctx, &queryExecute, &sample, &res, generator); return res; } diff --git a/watchman/telemetry/LogEvent.h b/watchman/telemetry/LogEvent.h index 9191f65e626d..bed086c4246f 100644 --- a/watchman/telemetry/LogEvent.h +++ b/watchman/telemetry/LogEvent.h @@ -143,4 +143,36 @@ struct SavedState : public MetadataEvent { } }; +struct QueryExecute : public MetadataEvent { + static constexpr const char* type = "query_execute"; + + std::string request_id; + int64_t num_special_files = 0; + std::string special_files; + bool fresh_instance = false; + int64_t deduped = 0; + int64_t results = 0; + int64_t walked = 0; + std::string query; + + void populate(DynamicEvent& event) const { + MetadataEvent::populate(event); + + if (!request_id.empty()) { + event.addString("request_id", request_id); + } + event.addInt("num_special_files", num_special_files); + if (!special_files.empty()) { + event.addString("special_files", special_files); + } + event.addBool("fresh_instance", fresh_instance); + event.addInt("deduped", deduped); + event.addInt("results", results); + event.addInt("walked", walked); + if (!query.empty()) { + event.addString("query", query); + } + } +}; + } // namespace watchman From 2a79b605395fc9cef539cddb62d39ab9fe6adcd4 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Fri, 26 Apr 2024 19:01:13 -0700 Subject: [PATCH 6897/7387] Log FullCrawl events directly to StructuredLogger Summary: Watchman only logs to the structured logger via a sampled logging "hook". It would be better to directly log structured events directly. Let's fix that. This change includes creating a new FullCrawl event. Reviewed By: MichaelCuevas Differential Revision: D56603729 fbshipit-source-id: 2767c12a6d7dd1f5756fb3435cfb45fecaa2004b --- watchman/root/iothread.cpp | 21 ++++++++++++++++++++- watchman/telemetry/LogEvent.h | 4 ++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/watchman/root/iothread.cpp b/watchman/root/iothread.cpp index 13990b68a4fd..82536921a06b 100644 --- a/watchman/root/iothread.cpp +++ b/watchman/root/iothread.cpp @@ -7,11 +7,15 @@ #include #include + #include "watchman/Errors.h" #include "watchman/InMemoryView.h" +#include "watchman/PerfSample.h" #include "watchman/fs/ParallelWalk.h" #include "watchman/root/Root.h" #include "watchman/root/warnerr.h" +#include "watchman/telemetry/LogEvent.h" +#include "watchman/telemetry/WatchmanStructuredLogger.h" #include "watchman/watcher/Watcher.h" #include "watchman/watchman_dir.h" #include "watchman/watchman_file.h" @@ -79,8 +83,23 @@ void InMemoryView::fullCrawl( root->cookies.abortAllCookies(); - sample.add_root_metadata(root->getRootMetadata()); + RootMetadata root_metadata = root->getRootMetadata(); + auto fullCrawl = FullCrawl{ + // MetadataEvent + { + // BaseEvent + { + root_metadata.root_path.string(), // root + std::string() // error + }, + root_metadata.recrawl_count, // recrawl + root_metadata.case_sensitive, // case_sensitive + root_metadata.watcher.string() // watcher + }, + }; + getLogger()->logEvent(fullCrawl); + sample.add_root_metadata(root_metadata); sample.finish(); sample.force_log(); sample.log(); diff --git a/watchman/telemetry/LogEvent.h b/watchman/telemetry/LogEvent.h index bed086c4246f..dd0823731922 100644 --- a/watchman/telemetry/LogEvent.h +++ b/watchman/telemetry/LogEvent.h @@ -175,4 +175,8 @@ struct QueryExecute : public MetadataEvent { } }; +struct FullCrawl : public MetadataEvent { + static constexpr const char* type = "full_crawl"; +}; + } // namespace watchman From 716547d9f71255951607ca0bbdee8a17d6042766 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Fri, 26 Apr 2024 19:01:13 -0700 Subject: [PATCH 6898/7387] Log Dropped events directly to StructuredLogger Summary: Watchman only logs to the structured logger via a sampled logging "hook". It would be better to directly log structured events directly. Let's fix that. This change includes creating a new Dropped event. Reviewed By: MichaelCuevas Differential Revision: D56608150 fbshipit-source-id: 7b10a6440a54427312911314cc32a4dc5603fcf0 --- watchman/telemetry/LogEvent.h | 12 ++++++++++++ watchman/watcher/fsevents.cpp | 31 +++++++++++++++++++++++++++---- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/watchman/telemetry/LogEvent.h b/watchman/telemetry/LogEvent.h index dd0823731922..b817aaad6f8b 100644 --- a/watchman/telemetry/LogEvent.h +++ b/watchman/telemetry/LogEvent.h @@ -179,4 +179,16 @@ struct FullCrawl : public MetadataEvent { static constexpr const char* type = "full_crawl"; }; +struct Dropped : public MetadataEvent { + static constexpr const char* type = "dropped"; + + bool isKernel = false; + + void populate(DynamicEvent& event) const { + MetadataEvent::populate(event); + + event.addBool("isKernel", isKernel); + } +}; + } // namespace watchman diff --git a/watchman/watcher/fsevents.cpp b/watchman/watcher/fsevents.cpp index 3eff595f1db6..4d7b577384d4 100644 --- a/watchman/watcher/fsevents.cpp +++ b/watchman/watcher/fsevents.cpp @@ -5,24 +5,30 @@ * LICENSE file in the root directory of this source tree. */ -#include "watchman/watcher/fsevents.h" #include #include #include #include #include -#include + #include "watchman/Client.h" #include "watchman/FlagMap.h" #include "watchman/InMemoryView.h" #include "watchman/LogConfig.h" #include "watchman/fs/Pipe.h" -#include "watchman/root/Root.h" #include "watchman/watcher/WatcherRegistry.h" #include "watchman/watchman_cmd.h" #if HAVE_FSEVENTS +#include "watchman/watcher/fsevents.h" + +#include + +#include "watchman/root/Root.h" +#include "watchman/telemetry/LogEvent.h" +#include "watchman/telemetry/WatchmanStructuredLogger.h" + namespace watchman { namespace { @@ -131,8 +137,25 @@ std::shared_ptr watcherFromRoot( /** Generate a perf event for the drop */ static void log_drop_event(const std::shared_ptr& root, bool isKernel) { + auto root_metadata = root->getRootMetadata(); + auto dropped = Dropped{ + // MetdataEvent + { + // BaseEvent + { + root_metadata.root_path.string(), // root + std::string() // error + }, + root_metadata.recrawl_count, // recrawl + root_metadata.case_sensitive, // case_sensitive + root_metadata.watcher.string() // watcher + }, + isKernel // isKernel + }; + getLogger()->logEvent(dropped); + PerfSample sample(isKernel ? "KernelDropped" : "UserDropped"); - sample.add_root_metadata(root->getRootMetadata()); + sample.add_root_metadata(root_metadata); sample.finish(); sample.force_log(); sample.log(); From eaf5c537e8ae13f58e64a8254ca47821c72b4adf Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 27 Apr 2024 09:33:08 -0700 Subject: [PATCH 6899/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/7ce08d1c5dfb750fec8e83dae39302849849b3d0 https://github.com/facebook/fb303/commit/3deaa5cbe71225b4232dea44006898a2d3f38938 https://github.com/facebook/fbthrift/commit/741b04e40fc1c2bc470e1af973d7dccd948101e5 https://github.com/facebook/folly/commit/83cad68ea9bc51835926658b8816c5bde7043eab https://github.com/facebook/mvfst/commit/cfc16e7720286eae61850b4856a85d7b8eae51f2 https://github.com/facebook/proxygen/commit/49a78488c220b8af1e29118662b7d1111402b368 https://github.com/facebook/wangle/commit/97db82591fb524ac35dd1775b92b3d941662cf46 https://github.com/facebookexperimental/edencommon/commit/adab903019c1be9b038bf20f5383cb0a730bb519 https://github.com/facebookexperimental/rust-shed/commit/8c8dd20ea5c8fe84b23d56bb64012e0db289fb7d https://github.com/facebookincubator/fizz/commit/614e24127187a53d711290ffdc85d4236d2f8502 Reviewed By: bigfootjon fbshipit-source-id: 6d9c8e903d3df29fd50e5116437cf9b12f1f96d6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a6430267cc04..02f1df9ec057 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1b261fc731aee539d58cf0b71fb52eba0166695b +Subproject commit 741b04e40fc1c2bc470e1af973d7dccd948101e5 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8fa1dbda85f7..c684fd1d0619 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 47c7d9ad14a2e6e00ddab284916490b601b6cfa9 +Subproject commit 83cad68ea9bc51835926658b8816c5bde7043eab diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6bb54d4cae2e..916a030c479f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f9ac285d3dff18f4862dc0049e3a76524c3fe110 +Subproject commit 97db82591fb524ac35dd1775b92b3d941662cf46 From de52d3b4f2a096bfe3f44225b7624eae89bc3ac3 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Sun, 28 Apr 2024 10:08:51 -0700 Subject: [PATCH 6900/7387] add libunwind manifest for folly to use Summary: Add a manifest for libunwind so that folly open source builds pick it up and show stack traces Reviewed By: dmm-fb Differential Revision: D56679859 fbshipit-source-id: 1fd3321ba1e80c4569b870974737be7bc65b77b9 --- build/fbcode_builder/manifests/folly | 3 +++ build/fbcode_builder/manifests/libunwind | 17 +++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 build/fbcode_builder/manifests/libunwind diff --git a/build/fbcode_builder/manifests/folly b/build/fbcode_builder/manifests/folly index 5d57cdba8793..d22e94d859c3 100644 --- a/build/fbcode_builder/manifests/folly +++ b/build/fbcode_builder/manifests/folly @@ -43,6 +43,9 @@ openssl openssl zlib +[dependencies.os=linux] +libunwind + # xz depends on autoconf which does not build on # Windows [dependencies.not(os=windows)] diff --git a/build/fbcode_builder/manifests/libunwind b/build/fbcode_builder/manifests/libunwind new file mode 100644 index 000000000000..0a4f03bc8fef --- /dev/null +++ b/build/fbcode_builder/manifests/libunwind @@ -0,0 +1,17 @@ +[manifest] +name = libunwind + +[rpms] +libunwind-devel +libunwind + +[debs] +libunwind-dev + +[download] +url = https://github.com/libunwind/libunwind/releases/download/v1.8.1/libunwind-1.8.1.tar.gz +sha256 = ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157 + +[build] +builder = autoconf +subdir = libunwind-1.8.1 From 5556426bfb7b534de33cfa3bf9306b5ab18f8081 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Sun, 28 Apr 2024 10:08:51 -0700 Subject: [PATCH 6901/7387] add libiberty manifest for folly to use Summary: Add a manifest for libiberty so that folly open source builds pick it up and use the demangler when showing stack traces Reviewed By: dmm-fb Differential Revision: D56679872 fbshipit-source-id: 622090112e19a5dd0d2b58a36dead0ea81e89026 --- build/fbcode_builder/manifests/folly | 1 + build/fbcode_builder/manifests/libiberty | 27 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 build/fbcode_builder/manifests/libiberty diff --git a/build/fbcode_builder/manifests/folly b/build/fbcode_builder/manifests/folly index d22e94d859c3..5fc5297f942a 100644 --- a/build/fbcode_builder/manifests/folly +++ b/build/fbcode_builder/manifests/folly @@ -44,6 +44,7 @@ openssl zlib [dependencies.os=linux] +libiberty libunwind # xz depends on autoconf which does not build on diff --git a/build/fbcode_builder/manifests/libiberty b/build/fbcode_builder/manifests/libiberty new file mode 100644 index 000000000000..da022dfcab3e --- /dev/null +++ b/build/fbcode_builder/manifests/libiberty @@ -0,0 +1,27 @@ +[manifest] +name = libiberty + +[rpms] +binutils-devel +binutils + +[debs] +binutils-dev + +[download] +url = https://ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz +sha256 = f6e4d41fd5fc778b06b7891457b3620da5ecea1006c6a4a41ae998109f85a800 + +[dependencies] +zlib + +[build] +builder = autoconf +subdir = binutils-2.42/libiberty + +# only build the parts needed for demangling +# as we still want to use system linker and assembler etc +[autoconf.args] +--disable-shared +--disable-testsuite +--enable-install-libiberty From a36b6f9fa116f33842e66ffb1fff7a5251874cbe Mon Sep 17 00:00:00 2001 From: Cody Ohlsen Date: Mon, 29 Apr 2024 10:52:35 -0700 Subject: [PATCH 6902/7387] airstore next: bundle V4: thrift working in OSS build Summary: this diff adds support for thrift in the OSS client build. it changes the `getdeps` airstore manifest to gain access to the thrift cpp2 compiler, then uses a rule similar to other projects to generate the cpp type headers. It changes the OSS `libbundle` library to depend on the thrift types introduced in D56578073 (and, through a lot of pain, get generated in the OSS build stack) which will then be used to ser/de bundles in the OSS build later in the stack! Reviewed By: ASchneidman Differential Revision: D56578071 fbshipit-source-id: 1a8d906d0f7a24da21fe7f225fe68644c6bc49d7 --- build/fbcode_builder/manifests/airstore | 1 + 1 file changed, 1 insertion(+) diff --git a/build/fbcode_builder/manifests/airstore b/build/fbcode_builder/manifests/airstore index 67ab64c3e971..21401c55ad2f 100644 --- a/build/fbcode_builder/manifests/airstore +++ b/build/fbcode_builder/manifests/airstore @@ -18,6 +18,7 @@ builder = nop libcurl fizz fmt +fbthrift folly googletest libsodium From 045ff5529f397551529caeafd94142f30adf4572 Mon Sep 17 00:00:00 2001 From: Chris Dinh Date: Mon, 29 Apr 2024 13:05:18 -0700 Subject: [PATCH 6903/7387] Separate prefetchFiles from globFiles Summary: # Context This Diff separates prefetchFiles from globFiles. The intention behind this change is to allow us to identify when globFiles is intentionally being called vs as part of a prefetcing operation. # This Diff - Adds new thrift endpoing prefetchFilesV2 - Switches over the usage of globFiles in prefetchCli to use prefetchFilesV2 - adds debugPrint flag to PrefetchParam. The intended use case is to allow the user to control when they want a a prefetch to print out the list of prefetched files. # Technical Details - prefecthFilesV2 is basically the same as the existing globFiles except it returns a PrefetchResult. This is an object containing an optional glob. The glob will be present if debugPrint is true Reviewed By: genevievehelsel Differential Revision: D55096200 fbshipit-source-id: e689ca2d2d818bfd3a33e49a1e734f059b9e0a13 --- eden/fs/service/eden.thrift | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index c3ada34079e2..dd8f9413d0e4 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -7,6 +7,7 @@ include "eden/fs/config/eden_config.thrift" include "fb303/thrift/fb303_core.thrift" +include "thrift/annotation/thrift.thrift" namespace cpp2 facebook.eden namespace java com.facebook.eden.thrift @@ -1297,6 +1298,13 @@ struct PrefetchParams { // When set, the globs list must be empty and the globbing pattern will be obtained // from an online service. 7: optional PredictiveFetch predictiveGlob; + // When true, returns list of prefetched files. + 8: bool returnPrefetchedFiles = false; +} + +/** Result for prefetchFiles(). */ +struct PrefetchResult { + 1: optional Glob prefetchedFiles; } /** Params for globFiles(). */ @@ -1916,6 +1924,8 @@ service EdenService extends fb303_core.BaseService { Glob globFiles(1: GlobParams params) throws (1: EdenError ex); /** + * DEPRECATED: use prefetchFilesV2 + * * Has the same behavior as globFiles, but should be called in the case of a prefetch. * This request could be deprioritized since it will be assumed that this call is used * for optimization and the result not relied on for operations. This command does not @@ -1925,6 +1935,17 @@ service EdenService extends fb303_core.BaseService { priority = 'BEST_EFFORT', ); + /** + * Has the same behavior as globFiles, but should be called in the case of a prefetch. + * This call is used when prefetching instead of globbing, to allow for different behaviors. + * This command returns a PrefetchResult, which contains the list of prefetched files. + * If returnPrefetchedFiles is true, this command will return the prefetched files. + */ + @thrift.Priority{level = thrift.RpcPriority.BEST_EFFORT} + PrefetchResult prefetchFilesV2(1: PrefetchParams params) throws ( + 1: EdenError ex, + ); + /** * Gets a list of a user's most accessed directories, performs * prefetching as specified by PredictiveGlobParams, and returns From 148a237a127240227575626fa85ab318309c9452 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Tue, 30 Apr 2024 10:26:32 -0700 Subject: [PATCH 6904/7387] regenerate workflows Summary: Regenerate github workflows to pick up new folly deps Reviewed By: zpao Differential Revision: D56698744 fbshipit-source-id: 7b0b72d47351bd9fd9afc9f97d2369f79934d584 --- .github/workflows/getdeps_linux.yml | 12 ++++++++++++ .github/workflows/getdeps_mac.yml | 4 ++++ .github/workflows/getdeps_windows.yml | 4 ++++ 3 files changed, 20 insertions(+) diff --git a/.github/workflows/getdeps_linux.yml b/.github/workflows/getdeps_linux.yml index bd73a6bcedb6..4ffea987d828 100644 --- a/.github/workflows/getdeps_linux.yml +++ b/.github/workflows/getdeps_linux.yml @@ -42,6 +42,8 @@ jobs: run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zstd - name: Fetch double-conversion run: python3 build/fbcode_builder/getdeps.py fetch --no-tests double-conversion + - name: Fetch libdwarf + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libdwarf - name: Fetch libevent run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libevent - name: Fetch lz4 @@ -64,6 +66,10 @@ jobs: run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libtool - name: Fetch libsodium run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libsodium + - name: Fetch libiberty + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libiberty + - name: Fetch libunwind + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libunwind - name: Fetch xz run: python3 build/fbcode_builder/getdeps.py fetch --no-tests xz - name: Fetch folly @@ -108,6 +114,8 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --no-tests zstd - name: Build double-conversion run: python3 build/fbcode_builder/getdeps.py build --no-tests double-conversion + - name: Build libdwarf + run: python3 build/fbcode_builder/getdeps.py build --no-tests libdwarf - name: Build libevent run: python3 build/fbcode_builder/getdeps.py build --no-tests libevent - name: Build lz4 @@ -130,6 +138,10 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --no-tests libtool - name: Build libsodium run: python3 build/fbcode_builder/getdeps.py build --no-tests libsodium + - name: Build libiberty + run: python3 build/fbcode_builder/getdeps.py build --no-tests libiberty + - name: Build libunwind + run: python3 build/fbcode_builder/getdeps.py build --no-tests libunwind - name: Build xz run: python3 build/fbcode_builder/getdeps.py build --no-tests xz - name: Build folly diff --git a/.github/workflows/getdeps_mac.yml b/.github/workflows/getdeps_mac.yml index b301972cd01a..257d5ad32c0f 100644 --- a/.github/workflows/getdeps_mac.yml +++ b/.github/workflows/getdeps_mac.yml @@ -42,6 +42,8 @@ jobs: run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zstd - name: Fetch double-conversion run: python3 build/fbcode_builder/getdeps.py fetch --no-tests double-conversion + - name: Fetch libdwarf + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libdwarf - name: Fetch lz4 run: python3 build/fbcode_builder/getdeps.py fetch --no-tests lz4 - name: Fetch openssl @@ -102,6 +104,8 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --no-tests zstd - name: Build double-conversion run: python3 build/fbcode_builder/getdeps.py build --no-tests double-conversion + - name: Build libdwarf + run: python3 build/fbcode_builder/getdeps.py build --no-tests libdwarf - name: Build lz4 run: python3 build/fbcode_builder/getdeps.py build --no-tests lz4 - name: Build openssl diff --git a/.github/workflows/getdeps_windows.yml b/.github/workflows/getdeps_windows.yml index f62e950f66d4..9f51779baaf3 100644 --- a/.github/workflows/getdeps_windows.yml +++ b/.github/workflows/getdeps_windows.yml @@ -51,6 +51,8 @@ jobs: run: python build/fbcode_builder/getdeps.py fetch --no-tests zstd - name: Fetch double-conversion run: python build/fbcode_builder/getdeps.py fetch --no-tests double-conversion + - name: Fetch libdwarf + run: python build/fbcode_builder/getdeps.py fetch --no-tests libdwarf - name: Fetch lz4 run: python build/fbcode_builder/getdeps.py fetch --no-tests lz4 - name: Fetch snappy @@ -105,6 +107,8 @@ jobs: run: python build/fbcode_builder/getdeps.py build --no-tests zstd - name: Build double-conversion run: python build/fbcode_builder/getdeps.py build --no-tests double-conversion + - name: Build libdwarf + run: python build/fbcode_builder/getdeps.py build --no-tests libdwarf - name: Build lz4 run: python build/fbcode_builder/getdeps.py build --no-tests lz4 - name: Build snappy From 0694737e0b0685a108f6f20c027863fe2cc95e03 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Tue, 30 Apr 2024 19:40:55 -0700 Subject: [PATCH 6905/7387] Don't crash watchman when detected Eden root is not connected (pt. 2) Summary: Previous attempt, D56043760, fixed a potential crash (when attempting to read `.../.eden/root`), but missed the earlier crash when reading (`.../.eden/socket`). It also missed that the thrown exception (`TerminalWatcherError`) does not have the same serialization support for other clients and would be caught and rethrown as a `std::system_error`. Let'f fix both of those issues by `throwing RootNotConnectedError`'s and catching/rethrowing in the `initWatcher` logic to propogate the error to the caller. Reviewed By: kmancini Differential Revision: D56780919 fbshipit-source-id: b6f47d858d57b98b2dbbf632424b7084757324f9 --- watchman/watcher/WatcherRegistry.cpp | 13 +++++++++++++ watchman/watcher/eden.cpp | 26 +++++++++++++++++++------- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/watchman/watcher/WatcherRegistry.cpp b/watchman/watcher/WatcherRegistry.cpp index 84490b683cb4..009fda687567 100644 --- a/watchman/watcher/WatcherRegistry.cpp +++ b/watchman/watcher/WatcherRegistry.cpp @@ -10,6 +10,7 @@ #include "watchman/watcher/WatcherRegistry.h" #include "watchman/CommandRegistry.h" +#include "watchman/Errors.h" #include "watchman/Logging.h" #include "watchman/QueryableView.h" #include "watchman/WatchmanConfig.h" @@ -131,6 +132,18 @@ std::shared_ptr WatcherRegistry::initWatcher( // Don't continue our attempt to use other registered watchers // in this case break; + } catch (const RootNotConnectedError& rre) { + // When Eden watcher is detected, but fails to resolve, we do + // not attempt to use other registered watchers. Rather, we + // fail gracefully by throwing RootNotConnectedError. + watchman::log( + watchman::DBG, + "failed to use watcher ", + watcher->getName(), + ": ", + rre.what(), + ".\n"); + throw; } catch (const std::exception& e) { watchman::log( watchman::ERR, diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index c80e06283ff0..5ef601771ab0 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -142,11 +142,23 @@ std::string resolveSocketPath(w_string_piece rootPath) { return *config->get_qualified_as("Config.socket"); #else - auto path = fmt::format("{}/.eden/socket", rootPath); - // It is important to resolve the link because the path in the eden mount - // may exceed the maximum permitted unix domain socket path length. - // This is actually how things our in our integration test environment. - return readSymbolicLink(path.c_str()).string(); + try { + auto path = fmt::format("{}/.eden/socket", rootPath); + // It is important to resolve the link because the path in the eden mount + // may exceed the maximum permitted unix domain socket path length. + // This is actually how things our in our integration test environment. + return readSymbolicLink(path.c_str()).string(); + } catch (const std::system_error& e) { + // When Eden fails during graceful takeover, the mount can exist, but it + // is disconnected. In this case, we can't use the eden watcher. Log this + // error and throw. + log(DBG, "Failed to read EdenFS root when mount exists: ", e.what()); + RootNotConnectedError::throwf( + "{} appears to be a disconnected EdenFS mount. " + "Try running `eden doctor` to bring it back online and " + "then retry your watch", + rootPath); + } #endif } @@ -1483,11 +1495,11 @@ std::shared_ptr detectEden( // is disconnected. In this case, we can't use the eden watcher. Log this // error and throw. log(DBG, "Failed to read EdenFS root when mount exists: ", e.what()); - throw TerminalWatcherError(fmt::format( + RootNotConnectedError::throwf( "{} appears to be a disconnected EdenFS mount. " "Try running `eden doctor` to bring it back online and " "then retry your watch", - root_path)); + root_path); } #endif From 6059bd2c89860c672260e371319967f892d69ab3 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Tue, 30 Apr 2024 19:49:56 -0700 Subject: [PATCH 6906/7387] Fix OSError: 14 issues for watchman tests in CI Summary: It appears that for darwin tests running in CI that a change to the environment has broken the darwin version of `get_canonical_filesystem_path`. Lets fix that by removing the override. Reviewed By: quark-zju, kmancini Differential Revision: D56660634 fbshipit-source-id: 52428b2b4e9972efe9b329ae667a2d8dcee4322b --- watchman/integration/lib/path_utils.py | 32 +++++++++----------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/watchman/integration/lib/path_utils.py b/watchman/integration/lib/path_utils.py index 4f64bf426f71..9cff6576929d 100644 --- a/watchman/integration/lib/path_utils.py +++ b/watchman/integration/lib/path_utils.py @@ -56,30 +56,20 @@ def get_canonical_filesystem_path(name): elif platform.system() == "Darwin": import ctypes.util - F_GETPATH = 50 libc = ctypes.CDLL(ctypes.util.find_library("c"), use_errno=True) - getpath_fcntl = libc.fcntl - getpath_fcntl.argtypes = [ctypes.c_int, ctypes.c_int, ctypes.c_char_p] - getpath_fcntl.restype = ctypes.c_int + realpath = libc.realpath + realpath.argtypes = [ctypes.c_char_p, ctypes.c_char_p] + realpath.restype = ctypes.c_char_p def get_canonical_filesystem_path(name): - fd = os.open(name, os.O_RDONLY, 0) - try: - numchars = 1024 # MAXPATHLEN - # The kernel caps this routine to MAXPATHLEN, so there is no - # point in over-allocating or trying again with a larger buffer - buf = ctypes.create_string_buffer(numchars) - ctypes.set_errno(0) - result = getpath_fcntl(fd, F_GETPATH, buf) - if result != 0: - raise OSError(ctypes.get_errno()) - # buf is a bytes buffer, so normalize it if necessary - ret = buf.value - if isinstance(name, str): - ret = os.fsdecode(ret) - return ret - finally: - os.close(fd) + numchars = 1024 # MAXPATHLEN + # The kernel caps this routine to MAXPATHLEN, so there is no + # point in over-allocating or trying again with a larger buffer + buffer = ctypes.create_string_buffer(numchars) + result = realpath(name.encode("utf-8"), buffer) + if result is None: + raise OSError(ctypes.get_errno()) + return result.decode("utf-8") else: From 0e427727e9b6e6e068f1276849cdc92065844422 Mon Sep 17 00:00:00 2001 From: Alvaro Leiva Geisse Date: Thu, 2 May 2024 13:49:18 -0700 Subject: [PATCH 6907/7387] change python3 to fbpython Summary: there is a bunch of scripts that uses python3 to run, this means that they are at the mercy of whoever controll their path, in linux, this can be system python3, but can also be platform python (and probably it is both), and in windows in particular it abuses c:\tools\fb-python\python3.exe. fbpython is the universal way to run python at the company that chooses the right platform python, but also provides monitoring and observability. this scripts generates jobs like https://www.internalfb.com/sandcastle/job/18014399781484898/ that will stop working once we remove c:\tools\fb-python\python3*.exe Reviewed By: fried Differential Revision: D56896564 fbshipit-source-id: d911fdaf6750635adb05b096f0522603baf47bcc --- build/fbcode_builder/getdeps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 3b15bd3429d9..04f06d44a11b 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env fbpython # Copyright (c) Meta Platforms, Inc. and affiliates. # # This source code is licensed under the MIT license found in the From 51558baf0f8e69775d84b44366412b388262f5e0 Mon Sep 17 00:00:00 2001 From: Kaveh Ahmadi Date: Thu, 2 May 2024 14:02:57 -0700 Subject: [PATCH 6908/7387] populate fetchedSource to trace hg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: ## Background `SaplingBackingStore` is now sending `request` to Sapling with `RemoteOnly` or `LocalOnly`. Therefore `SaplingBackingStore` knows the source of fetching each request. We need to save this info in `ObjectFetchContext` then we can send them to `HgImportTraceEvent::finish` and `traceBus_` can publish this info in `trace hg` command. ## This diff Now that context have the value of `FetchedSource`, we can populate it in the `HgImportTraceEvent::finish` event. It is obvious that `HgImportTraceEvent::start` and `HgImportTraceEvent::queue` events doesn't know the `FetchedSource` because it is not fetched yet. Also, this diff modified `trace_stream.cpp` to show the FetchedSource by emoji in `trace hg` command when it runs with `--verbose` argument ``` static const auto kLocalFetchedEmoji = reinterpret_cast(u8"\U0001F4BB"); // 💻 static const auto kRemoteFetchedEmoji = reinterpret_cast(u8"\U0001F310"); // 🌐 static const auto kUnknownFetchedEmoji = reinterpret_cast(u8"\U0001F937"); // 🤷 ``` Differential Revision: D56283112 fbshipit-source-id: 8b7d461ff283b6aba8d894f9ec809e6a974c2201 --- eden/fs/service/eden.thrift | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index dd8f9413d0e4..c11ae9981162 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1053,6 +1053,12 @@ enum HgImportCause { PREFETCH = 3, } +enum FetchedSource { + LOCAL = 0, + REMOTE = 1, + UNKNOWN = 2, +} + struct HgEvent { 1: TraceEventTimes times; @@ -1068,6 +1074,7 @@ struct HgEvent { 7: optional RequestInfo requestInfo; 8: HgImportPriority importPriority; 9: HgImportCause importCause; + 10: FetchedSource fetchedSource; } /** From b53c87087e5c54a65bee2bcae91efdc1e46fc064 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 2 May 2024 14:48:13 -0700 Subject: [PATCH 6909/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/ef757187037d2c37292aa4352e5ca5e135501370 https://github.com/facebook/fb303/commit/62ebb1c76f136120ce8d89583c48fa20f808d1f4 https://github.com/facebook/fbthrift/commit/6406023588451036d66af83f9b696a89cfa94104 https://github.com/facebook/folly/commit/508edb50105b1b06d5272c39dd14f8702e801cb9 https://github.com/facebook/mvfst/commit/8cbe2b9de32a7c17e6bcaed6e01c5e1839bf1afa https://github.com/facebook/proxygen/commit/fbf5f9adfb5c5933250017f5e4fd0ef36929f16a https://github.com/facebook/wangle/commit/e50eeaa8b3930c816cca7c44f5e99a001e8cb42b https://github.com/facebookexperimental/edencommon/commit/1ecfed91ca1ffb7917eae2cb9593a05a045862db https://github.com/facebookexperimental/rust-shed/commit/e570d6ad9368a46a70dadfcf7a63776cd43541c6 https://github.com/facebookexternal/plc-code/commit/b32a5c4f8d2e4d9b8bb385dadda41f136e0ee3ea https://github.com/facebookincubator/fizz/commit/b38a202d3263301243b4d84df51762c1e8c25884 Reviewed By: jurajh-fb fbshipit-source-id: 281bea7064a40e8b1b4ce81bb1c272f137b0559a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 02f1df9ec057..4f5cba5862dc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 741b04e40fc1c2bc470e1af973d7dccd948101e5 +Subproject commit 6406023588451036d66af83f9b696a89cfa94104 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index c684fd1d0619..77e36e59ccf3 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 83cad68ea9bc51835926658b8816c5bde7043eab +Subproject commit 508edb50105b1b06d5272c39dd14f8702e801cb9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 916a030c479f..2fc84988e6ae 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 97db82591fb524ac35dd1775b92b3d941662cf46 +Subproject commit e50eeaa8b3930c816cca7c44f5e99a001e8cb42b From dfe0733a6c8c93c02540ec03c99232a0814ed4c4 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Fri, 3 May 2024 09:30:36 -0700 Subject: [PATCH 6910/7387] fix windows build with --free-up-disk Summary: getdeps can generate a windows wrapper script that can be used to run build artifacts from build directory. In github actions for large projects we set a getdeps option delete the build dir as soon as we've successfully installed artefacts to save disk space. This option was enabled for windows in D56165825. Turns out that didn't work, this diff adds the missing conditional so that it should. Reviewed By: vitaut Differential Revision: D56930778 fbshipit-source-id: 0cb9ac94ef9b39f4e33af8fb91098dc0d833731b --- build/fbcode_builder/getdeps/builder.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 43542e04c61c..8de30f73e473 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -158,12 +158,11 @@ def build(self, install_dirs, reconfigure: bool) -> None: os.remove(self.build_dir) else: shutil.rmtree(self.build_dir) - - # On Windows, emit a wrapper script that can be used to run build artifacts - # directly from the build directory, without installing them. On Windows $PATH - # needs to be updated to include all of the directories containing the runtime - # library dependencies in order to run the binaries. - if self.build_opts.is_windows(): + elif self.build_opts.is_windows(): + # On Windows, emit a wrapper script that can be used to run build artifacts + # directly from the build directory, without installing them. On Windows $PATH + # needs to be updated to include all of the directories containing the runtime + # library dependencies in order to run the binaries. script_path = self.get_dev_run_script_path() dep_munger = create_dyn_dep_munger(self.build_opts, install_dirs) dep_dirs = self.get_dev_run_extra_path_dirs(install_dirs, dep_munger) From cdaf3d19e6640069320f6e94bb85c7897942db31 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 3 May 2024 09:32:18 -0700 Subject: [PATCH 6911/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/07ff0c002ebad32e7d77b94abd77132106c7eacd https://github.com/facebook/fb303/commit/4c51b34c595a7e10400aaf176485617385a4bed8 https://github.com/facebook/fbthrift/commit/6b8beae2d53324898193ea1767bafdc56324bda9 https://github.com/facebook/folly/commit/fb093bbba142a301debf85fec852c5117c79666e https://github.com/facebook/mvfst/commit/b6994f752d546a1ff66d887bb9aa31110161ff34 https://github.com/facebook/proxygen/commit/3e3f7b0658a9eda8b959aef9bffad91a246fb034 https://github.com/facebook/wangle/commit/ece2f40efd29aa34ab46e874f6f7b3a0e1cbaeb4 https://github.com/facebookexperimental/edencommon/commit/a401921af344cc3ce1461e9f9ca2ffc0a8355cbd https://github.com/facebookexperimental/rust-shed/commit/34c65f079e3c271829676d68fadcddbcd5c805bb https://github.com/facebookincubator/fizz/commit/3f47adf7d015097ad0479cbd8696ff0b5c1fc46a Reviewed By: jurajh-fb fbshipit-source-id: 31030e8a1d74820e97b90695931a471631be5138 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4f5cba5862dc..8f9e41d0b0b6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6406023588451036d66af83f9b696a89cfa94104 +Subproject commit 6b8beae2d53324898193ea1767bafdc56324bda9 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 77e36e59ccf3..0e3853c80d5b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 508edb50105b1b06d5272c39dd14f8702e801cb9 +Subproject commit fb093bbba142a301debf85fec852c5117c79666e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2fc84988e6ae..7ffb9350138e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e50eeaa8b3930c816cca7c44f5e99a001e8cb42b +Subproject commit ece2f40efd29aa34ab46e874f6f7b3a0e1cbaeb4 From bd00553bac83d6f45ed57e734e3ea8e8e0b1654c Mon Sep 17 00:00:00 2001 From: Kaveh Ahmadi Date: Fri, 3 May 2024 18:29:19 -0700 Subject: [PATCH 6912/7387] print blank for fetched source in start and queue events Summary: Now, the `SaplingBackingStore` know the source of each request. However, the sourced is available only for the finish event. The start and queue event doesn't know the source. In the last diff we used UNKNOW for these events. This diff changed the FetchedSource to a std::optional. Therefore for these events we don't need to populate it. On the other hand, eden.thrift has a NOT_AVAILABLE_YET option. It chooses this option when the std::option doesn't have value. The kFetchedSource map also update then if we have NOT_AVAILABLE_YET as the fetchedSource, it will give us a blank space character " " and the trace hg will print blank space char for start and queue events. Reviewed By: kmancini Differential Revision: D56942308 fbshipit-source-id: 732d5b4fd11cd2e9c5b8ff8e6dc1ec70bc262033 --- eden/fs/service/eden.thrift | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index c11ae9981162..5ce3fb565cf3 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1056,7 +1056,15 @@ enum HgImportCause { enum FetchedSource { LOCAL = 0, REMOTE = 1, + // The data is fetched. However, the fetch mode was AllowRemote + // and on the Eden side the source of the fetch is unknown. + // It could be local or remote UNKNOWN = 2, + // The data is not fetched yet. + // We don't know the source on some of the Sapling events. For example, + // on the start events: before we fetch the data we don't know where + // we will be able to find it + NOT_AVAILABLE_YET = 3, } struct HgEvent { From 46d2a3fafd4a5d85bb0d1bad937f1a333b6ec179 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 4 May 2024 09:34:15 -0700 Subject: [PATCH 6913/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/2c1bcde2d4fa8b25981a9e74e1b043e64ef200be https://github.com/facebook/fb303/commit/1c51d35021bd04ff59ee2eae8920da9e16094877 https://github.com/facebook/fbthrift/commit/83ad0611d7efb9a11bc21d7363a0e42426452b19 https://github.com/facebook/folly/commit/9f125c94e10fd01f5567cdbc317f8026de3a20b5 https://github.com/facebook/mvfst/commit/2517f47ae743e8cb7adb52beb77fd8b2851c4eab https://github.com/facebook/proxygen/commit/cb3a567fa1d815894dec9b84dc63bf48461ba0b8 https://github.com/facebook/wangle/commit/b399400876d658d686797b31254da0d83f0a74ef https://github.com/facebookexperimental/edencommon/commit/78dbdc21c741a838ef9032e17e832209737d95bb https://github.com/facebookexperimental/rust-shed/commit/55d4fd0441388047f5c6d08f5ba7c524c85e23eb https://github.com/facebookincubator/fizz/commit/eda275a0f338ead73153d0577be688a4753af086 Reviewed By: jurajh-fb fbshipit-source-id: 007dbf88fdd05dcb2dfa45b1a2df849162e0784e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8f9e41d0b0b6..3f002a8c618a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6b8beae2d53324898193ea1767bafdc56324bda9 +Subproject commit 83ad0611d7efb9a11bc21d7363a0e42426452b19 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0e3853c80d5b..56294f3842a0 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit fb093bbba142a301debf85fec852c5117c79666e +Subproject commit 9f125c94e10fd01f5567cdbc317f8026de3a20b5 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7ffb9350138e..ec4758438dd8 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ece2f40efd29aa34ab46e874f6f7b3a0e1cbaeb4 +Subproject commit b399400876d658d686797b31254da0d83f0a74ef From 09c9ab69504dd7c99ed06f37c2cfa61f8b568103 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 5 May 2024 09:33:25 -0700 Subject: [PATCH 6914/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ea32c6fc43d2c199dd67e6f28b44b5c4e8633119 https://github.com/facebook/fbthrift/commit/12982bde21e89ec9514e7c1d2dc82bd53b723720 https://github.com/facebook/folly/commit/00b4d3230d8b9392e2c9929b9fee12daacaf2359 https://github.com/facebook/mvfst/commit/df1b77cfce3666bf5b475b915ca1143bcf40c33a https://github.com/facebook/proxygen/commit/cb160be632db6d364cd491ad35a02c63209a0ff2 https://github.com/facebook/wangle/commit/a02ffa952202932fefa8e90409ed81e8406d43af https://github.com/facebookexperimental/edencommon/commit/f7d8d12c5985fc2b62d9aae8e08e74ac679b8656 https://github.com/facebookexperimental/rust-shed/commit/e02c93e6709017b60c86d0944691ae6f70a50978 https://github.com/facebookincubator/fizz/commit/906c4e890db1f189815c9bfc52cfa97b0e51efc5 Reviewed By: jurajh-fb fbshipit-source-id: 6d6fbf703080f53e727a8f988b1abe012da2dbe8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3f002a8c618a..b0a5d3724c30 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 83ad0611d7efb9a11bc21d7363a0e42426452b19 +Subproject commit 12982bde21e89ec9514e7c1d2dc82bd53b723720 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 56294f3842a0..0981723e689f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9f125c94e10fd01f5567cdbc317f8026de3a20b5 +Subproject commit 00b4d3230d8b9392e2c9929b9fee12daacaf2359 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ec4758438dd8..154c322a4132 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b399400876d658d686797b31254da0d83f0a74ef +Subproject commit a02ffa952202932fefa8e90409ed81e8406d43af From 585107be9729fd69f061910dae9b643bec80bff8 Mon Sep 17 00:00:00 2001 From: Richard Barnes Date: Sun, 5 May 2024 22:57:13 -0700 Subject: [PATCH 6915/7387] Change `result_of` to `invoke_result` in watchman/Result.h Summary: C++20 has [eliminated](https://en.cppreference.com/w/cpp/types/result_of) `result_of` in favour of `invoke_result`. It's mysterious that this code even still works, but, nevertheless, I'm fixing it. Differential Revision: D56987484 fbshipit-source-id: e1e641424271e1164eee19be5726ec6abe0c1ffd --- watchman/Result.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/watchman/Result.h b/watchman/Result.h index 86f89468660b..ce2ca540c0af 100644 --- a/watchman/Result.h +++ b/watchman/Result.h @@ -269,10 +269,10 @@ Result::type, Error> makeResult(T&& t) { // This is the non-void return type flavor. template typename std::enable_if< - !std::is_same::type, void>::value, - Result::type>>::type + !std::is_same::type, void>::value, + Result::type>>::type makeResultWith(Func&& func) { - using ResType = typename std::result_of::type; + using ResType = typename std::invoke_result::type; try { return Result(func()); @@ -286,7 +286,7 @@ makeResultWith(Func&& func) { // This is the void return type flavor; it produces Result template typename std::enable_if< - std::is_same::type, void>::value, + std::is_same::type, void>::value, Result>::type makeResultWith(Func&& func) { try { From a373c76d2f60f4f4fbeb7bd0b0b25153eedf086c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 6 May 2024 09:35:41 -0700 Subject: [PATCH 6916/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/26d44257796cba705f9f35675f73a50f5a45f556 https://github.com/facebook/fb303/commit/e22b7cb4d7e999a580732a462e05782be5d1fbf5 https://github.com/facebook/fbthrift/commit/d171298a02b038b277ede4cb2e5147de97ac3619 https://github.com/facebook/folly/commit/eb09127798a860a9da748af848b80cdc0e1fa1f8 https://github.com/facebook/mvfst/commit/2d675054fad780ca1beeddbfab24d14f96cf656a https://github.com/facebook/proxygen/commit/dd8552e9c72fe594d394863f9b53c70c34620e0f https://github.com/facebook/wangle/commit/a62bcf653ce562a36258398c97ecad523402a8fe https://github.com/facebookexperimental/edencommon/commit/885d00ca265919a231aae676f54756a37734c995 https://github.com/facebookexperimental/rust-shed/commit/9afd7bd96f64f63ab519de048f0b1b9511c532db https://github.com/facebookincubator/fizz/commit/c0b720448afd333750157d6c1d2795b5ade0f7c0 Reviewed By: jurajh-fb fbshipit-source-id: 95e706dbb6246f924535eff1bc53194ef69d5cdb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b0a5d3724c30..4eb8468f70ac 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 12982bde21e89ec9514e7c1d2dc82bd53b723720 +Subproject commit d171298a02b038b277ede4cb2e5147de97ac3619 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0981723e689f..baf64cc6adee 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 00b4d3230d8b9392e2c9929b9fee12daacaf2359 +Subproject commit eb09127798a860a9da748af848b80cdc0e1fa1f8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 154c322a4132..7a2bdfe5d9cd 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a02ffa952202932fefa8e90409ed81e8406d43af +Subproject commit a62bcf653ce562a36258398c97ecad523402a8fe From 25a409393103c238860acf5541ad2037eb0c43e6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 7 May 2024 09:32:45 -0700 Subject: [PATCH 6917/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/dcfc23e93f99deb646127e526cbac8b07430a102 https://github.com/facebook/fb303/commit/fe930611664ac80d1995447d4505d30646b8a83f https://github.com/facebook/fbthrift/commit/5ab60cc44e6bac32fda7e04cec90caa5715396a4 https://github.com/facebook/folly/commit/25426f4028e087e79680ab240818f074189048e5 https://github.com/facebook/mvfst/commit/2cef74dd984514eff4386a981c93a012f382cfef https://github.com/facebook/proxygen/commit/8e338869dc41dee6d197d5cf627482f0a9159bb8 https://github.com/facebook/wangle/commit/db77a735299949c13b4e1032f2e54d786d99da03 https://github.com/facebookexperimental/edencommon/commit/01eced1fe22c4c17d1e259d1fdaf0c141ef186e2 https://github.com/facebookexperimental/rust-shed/commit/ac2a111943e93f8be6920be69afca53fe8d262c1 https://github.com/facebookincubator/fizz/commit/4eefca5d7a796b8242abe9f00c8951cc15432b2a Reviewed By: jurajh-fb fbshipit-source-id: b50ac9bc052126ce38a3b9de0c4162b64a945af1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4eb8468f70ac..9b87419b49a5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d171298a02b038b277ede4cb2e5147de97ac3619 +Subproject commit 5ab60cc44e6bac32fda7e04cec90caa5715396a4 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index baf64cc6adee..944465d6d1dc 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit eb09127798a860a9da748af848b80cdc0e1fa1f8 +Subproject commit 25426f4028e087e79680ab240818f074189048e5 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7a2bdfe5d9cd..4f4bdca212c5 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a62bcf653ce562a36258398c97ecad523402a8fe +Subproject commit db77a735299949c13b4e1032f2e54d786d99da03 From d9a6e6546ce865f87b26cf7e55bf20c408fd6239 Mon Sep 17 00:00:00 2001 From: Yedidya Feldblum Date: Tue, 7 May 2024 09:51:01 -0700 Subject: [PATCH 6918/7387] bump repo ci to ubuntu-22.04 Summary: X-link: https://github.com/facebook/folly/pull/2189 X-link: https://github.com/facebookincubator/zstrong/pull/782 Now that Ubuntu 24.04 LTS [has been released](https://ubuntu.com/blog/canonical-releases-ubuntu-24-04-noble-numbat), it is a suitable time to bump the version of Ubuntu used in CI to Ubuntu 22.04 LTS, which is the prior LTS. Ubuntu 22.04 LTS ships with GCC 11.2, and is the first Ubuntu release to ship with a version of GCC that implements C++20 coroutines. Reviewed By: chadaustin Differential Revision: D57017204 fbshipit-source-id: ce5754e7dfc6cb066739bf164e725de8e21f8d24 --- .github/workflows/getdeps_linux.yml | 2 +- build/fbcode_builder/getdeps.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/getdeps_linux.yml b/.github/workflows/getdeps_linux.yml index 4ffea987d828..b4feb95c211e 100644 --- a/.github/workflows/getdeps_linux.yml +++ b/.github/workflows/getdeps_linux.yml @@ -15,7 +15,7 @@ permissions: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: Install Rust Stable diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 04f06d44a11b..a3338620a757 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -931,7 +931,7 @@ class GenerateGitHubActionsCmd(ProjectCmdBase): def run_project_cmd(self, args, loader, manifest): platforms = [ - HostType("linux", "ubuntu", "18"), + HostType("linux", "ubuntu", "22"), HostType("darwin", None, None), HostType("windows", None, None), ] @@ -1216,7 +1216,7 @@ def setup_project_cmd_parser(self, parser): help="Allow CI to fire on all branches - Handy for testing", ) parser.add_argument( - "--ubuntu-version", default="20.04", help="Version of Ubuntu to use" + "--ubuntu-version", default="22.04", help="Version of Ubuntu to use" ) parser.add_argument( "--cron", From 406ca4f23a831e81a27a1f6af1000f029580b41e Mon Sep 17 00:00:00 2001 From: Srikrishna Gopu Date: Tue, 7 May 2024 14:34:38 -0700 Subject: [PATCH 6919/7387] remove picking default boost for centos9 Summary: As titled, remove picking system boost for centos9 oss builds. We are seeing the following error (https://tracker.ceph.com/issues/54265) when building qsfp service with c++20 and on CentOS9. We need boost 1.77 or more to build with c++20. Discussion: https://fburl.com/workplace/4u3glapv Reviewed By: chadaustin Differential Revision: D55758008 fbshipit-source-id: dae0bb5a70de3de2988032412eaafbd1b6d4e53d --- build/fbcode_builder/manifests/boost | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build/fbcode_builder/manifests/boost b/build/fbcode_builder/manifests/boost index a7474e287681..ecf8c6f4fcb3 100644 --- a/build/fbcode_builder/manifests/boost +++ b/build/fbcode_builder/manifests/boost @@ -55,10 +55,6 @@ boost169-python3 boost169-serialization boost169-program-options -[rpms.not(all(distro=centos_stream,distro_vers=8))] -boost-devel -boost-static - [build] builder = boost job_weight_mib = 512 From 6e862c785eb96544c2f57ba3f41bc601b12c4220 Mon Sep 17 00:00:00 2001 From: Alvaro Leiva Geisse Date: Wed, 8 May 2024 15:10:30 -0700 Subject: [PATCH 6920/7387] reverse shebang Summary: this runs on github... but also not what i really care about Reviewed By: terrelln Differential Revision: D57125977 fbshipit-source-id: 39d7fd319a0ce45a36ba11c4301f5a27356b6c9f --- build/fbcode_builder/getdeps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index a3338620a757..890d0e74d8a4 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -1,4 +1,4 @@ -#!/usr/bin/env fbpython +#!/usr/bin/env python3 # Copyright (c) Meta Platforms, Inc. and affiliates. # # This source code is licensed under the MIT license found in the From 238c606032ac16b95a4a05e95daff965634c077b Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Thu, 9 May 2024 00:17:07 -0700 Subject: [PATCH 6921/7387] use declared getdeps system dependencies Summary: Use the declared getdeps system dependencies from ws_airstore build. As they come from the OS packages they are dynamically linked, which makes the python build happy. Reviewed By: zhaoduow Differential Revision: D57047488 fbshipit-source-id: 751fd2b71c5e81d987d9fe6d9502cd5f4613ac66 --- build/fbcode_builder/manifests/ws_airstore | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/manifests/ws_airstore b/build/fbcode_builder/manifests/ws_airstore index 3e5daa72a17d..b779d4be6289 100644 --- a/build/fbcode_builder/manifests/ws_airstore +++ b/build/fbcode_builder/manifests/ws_airstore @@ -13,14 +13,17 @@ builder = nop [dependencies] boost -libcurl +double-conversion fizz fmt folly googletest -libsodium +libcurl libevent -double-conversion +libffi +libsodium +openssl +sqlite3 wangle zstd zlib From 3af63d2a64e00c3995a6bd313ec2fe613e6997c7 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 9 May 2024 11:24:22 -0700 Subject: [PATCH 6922/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/0a80e47ddfb49cb0f50b40627549b069c7a87d69 https://github.com/facebook/fb303/commit/d358beda03aca6f931e431ad7ab198e0d033b25e https://github.com/facebook/fbthrift/commit/bb8d820b37ddb66bdf535bd89750ab41d0e898e8 https://github.com/facebook/folly/commit/f4552734cfb0a849a5bb1a7cae957a593e354296 https://github.com/facebook/mvfst/commit/7f2cb16408f5623c0e5847a6c92c48b40c5276b0 https://github.com/facebook/proxygen/commit/bac554d96220892c5d7c846971782be4c254e8d6 https://github.com/facebook/wangle/commit/116c30758169d7336e7da607d0b92bbd6e25df8a https://github.com/facebookexperimental/edencommon/commit/d4fc7b53c4513bbb4cf804d87c7db7e7326651ee https://github.com/facebookexperimental/rust-shed/commit/5ecded229fa9b7d58b96e0135707b9ae0b7d302e https://github.com/facebookincubator/fizz/commit/29ae95edabd52b537f246cd8fb460637ebff24f7 Reviewed By: jurajh-fb fbshipit-source-id: d2f33c3311fd3213ea81dfa354f9f3d319e2d8cd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9b87419b49a5..ea41cef141ff 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5ab60cc44e6bac32fda7e04cec90caa5715396a4 +Subproject commit bb8d820b37ddb66bdf535bd89750ab41d0e898e8 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 944465d6d1dc..cb94856ef908 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 25426f4028e087e79680ab240818f074189048e5 +Subproject commit f4552734cfb0a849a5bb1a7cae957a593e354296 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4f4bdca212c5..55666b3697c4 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit db77a735299949c13b4e1032f2e54d786d99da03 +Subproject commit 116c30758169d7336e7da607d0b92bbd6e25df8a From 75177dcf7566b630fbdf4dc7818fe48687722353 Mon Sep 17 00:00:00 2001 From: Carlos Fernandez Date: Thu, 9 May 2024 15:27:29 -0700 Subject: [PATCH 6923/7387] Rust: Update sysinfo crate Summary: X-link: https://github.com/pytorch/executorch/pull/3520 I need an update sysinfo for some Windows stuff, the previous version doesn't seem to work correctly (plus the documented API has changed a bit and the examples just don't build). Reviewed By: JakobDegen Differential Revision: D56913751 fbshipit-source-id: 30ba14269792ad46236929ba40071974dd1ce436 --- watchman/cli/Cargo.toml | 2 +- watchman/cli/src/rage/mod.rs | 20 ++++++------------- .../rust/watchman_client/src/named_pipe.rs | 13 ++++++++---- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index b4f37ad1c73e..f37f29811c51 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -16,7 +16,7 @@ jwalk = "0.6" serde = { version = "1.0.185", features = ["derive", "rc"] } serde_json = { version = "1.0.100", features = ["float_roundtrip", "unbounded_depth"] } structopt = "0.3.26" -sysinfo = "0.26.8" +sysinfo = "0.30.11" tabular = "0.2.0" tokio = { version = "1.37.0", features = ["full", "test-util", "tracing"] } watchman_client = { version = "0.8.0", path = "../rust/watchman_client" } diff --git a/watchman/cli/src/rage/mod.rs b/watchman/cli/src/rage/mod.rs index d3944208d157..b800c9ac58c9 100644 --- a/watchman/cli/src/rage/mod.rs +++ b/watchman/cli/src/rage/mod.rs @@ -18,7 +18,6 @@ use anyhow::Result; use duct::Expression; use structopt::StructOpt; use sysinfo::System; -use sysinfo::SystemExt; #[cfg(target_os = "linux")] use tabular::row; #[cfg(target_os = "linux")] @@ -75,18 +74,15 @@ fn getuid() -> nix::unistd::Uid { } struct WatchmanRage { - system: System, stream: Stream, } impl WatchmanRage { async fn new() -> Self { - let mut system = System::new(); - system.refresh_system(); - let hostname = system.host_name(); + let hostname = System::host_name(); let stream = Stream::new(hostname); - Self { system, stream } + Self { stream } } fn empty_line(&mut self) -> Result<()> { @@ -139,14 +135,10 @@ impl WatchmanRage { "Arch (Compile Time): {}", std::env::consts::ARCH )?; - write_or_unknown!(self.stream, "Hostname: {}", self.system.host_name())?; - write_or_unknown!(self.stream, "Release: {}", self.system.name())?; - write_or_unknown!(self.stream, "System Version: {}", self.system.os_version())?; - write_or_unknown!( - self.stream, - "Kernel Version: {}", - self.system.kernel_version() - )?; + write_or_unknown!(self.stream, "Hostname: {}", System::host_name())?; + write_or_unknown!(self.stream, "Release: {}", System::name())?; + write_or_unknown!(self.stream, "System Version: {}", System::os_version())?; + write_or_unknown!(self.stream, "Kernel Version: {}", System::kernel_version())?; #[cfg(unix)] writeln!(self.stream, "Running watchman-diag as UID: {}", getuid())?; diff --git a/watchman/rust/watchman_client/src/named_pipe.rs b/watchman/rust/watchman_client/src/named_pipe.rs index 98ca521edf1d..7e29d0dd232c 100644 --- a/watchman/rust/watchman_client/src/named_pipe.rs +++ b/watchman/rust/watchman_client/src/named_pipe.rs @@ -6,7 +6,7 @@ */ #![cfg(windows)] - +use core::ffi::c_void; use std::io::Error as IoError; use std::os::windows::ffi::OsStrExt; use std::path::PathBuf; @@ -59,9 +59,14 @@ impl NamedPipe { } let io = unsafe { - NamedPipeClient::from_raw_handle(handle).map_err(|err| Error::Connect { - endpoint: path, - source: Box::new(err), + // CreateFileW returns HANDLE which is typedef PVOID HANDLE which itself is typedef void *PVOID; + // See https://learn.microsoft.com/en-us/windows/win32/winprog/windows-data-types + // tokio expects this: pub type HANDLE = *mut c_void; + NamedPipeClient::from_raw_handle(handle as *mut c_void).map_err(|err| { + Error::Connect { + endpoint: path, + source: Box::new(err), + } })? }; Ok(Self { io }) From 39cc4ea6367533d7ff1517ee1aa3755ca6004ad3 Mon Sep 17 00:00:00 2001 From: Saul Gutierrez Date: Thu, 9 May 2024 15:58:58 -0700 Subject: [PATCH 6924/7387] upgrade blake3 to 1.5.1 (#786) Summary: Pull Request resolved: https://github.com/facebookincubator/zstrong/pull/786 Reviewed By: chadaustin Differential Revision: D57119103 fbshipit-source-id: b2a72c6408b4ba3c2db92f589fe0f936d6eed090 --- build/fbcode_builder/manifests/blake3 | 7 +- .../patches/blake3_CMakeLists_txt.patch | 97 ------------------- 2 files changed, 3 insertions(+), 101 deletions(-) delete mode 100644 build/fbcode_builder/patches/blake3_CMakeLists_txt.patch diff --git a/build/fbcode_builder/manifests/blake3 b/build/fbcode_builder/manifests/blake3 index 27a5509e7c4b..12ee6518fc2c 100644 --- a/build/fbcode_builder/manifests/blake3 +++ b/build/fbcode_builder/manifests/blake3 @@ -2,10 +2,9 @@ name = blake3 [download] -url = https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/1.3.3.tar.gz -sha256 = 27d2bc4ee5945ba75434859521042c949463ee7514ff17aaef328e23ef83fec0 +url = https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/1.5.1.tar.gz +sha256 = 822cd37f70152e5985433d2c50c8f6b2ec83aaf11aa31be9fe71486a91744f37 [build] builder = cmake -subdir = BLAKE3-1.3.3/c -patchfile = blake3_CMakeLists_txt.patch +subdir = BLAKE3-1.5.1/c diff --git a/build/fbcode_builder/patches/blake3_CMakeLists_txt.patch b/build/fbcode_builder/patches/blake3_CMakeLists_txt.patch deleted file mode 100644 index 9b1c828fafe6..000000000000 --- a/build/fbcode_builder/patches/blake3_CMakeLists_txt.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff --git a/BLAKE3Config.cmake.in b/BLAKE3Config.cmake.in -new file mode 100644 -index 0000000..5a8919d ---- /dev/null -+++ b/BLAKE3Config.cmake.in -@@ -0,0 +1,4 @@ -+@PACKAGE_INIT@ -+ -+set_and_check(BLAKE3_INCLUDE_DIR "@PACKAGE_INCLUDE_DIR@") -+include("${CMAKE_CURRENT_LIST_DIR}/BLAKE3Targets.cmake") -diff --git a/CMakeLists.txt b/CMakeLists.txt -new file mode 100644 -index 0000000..171554b ---- /dev/null -+++ b/CMakeLists.txt -@@ -0,0 +1,81 @@ -+cmake_minimum_required(VERSION 3.12) -+cmake_policy(VERSION ${CMAKE_VERSION}) -+ -+project(BLAKE3 -+ VERSION 1.3.3 -+ DESCRIPTION "BLAKE3 C implementation" -+ HOMEPAGE_URL "https://github.com/BLAKE3-team/BLAKE3" -+ LANGUAGES C) -+ -+include(GNUInstallDirs) -+ -+add_library(blake3) -+ -+set(INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH -+ "The subdirectory where header files should be installed") -+ -+set_target_properties(blake3 PROPERTIES -+ PUBLIC_HEADER "blake3.h" -+ SOVERSION ${PROJECT_VERSION_MAJOR} -+ VERSION ${PROJECT_VERSION}) -+ -+target_sources(blake3 PRIVATE -+ blake3.c -+ blake3_dispatch.c -+ blake3_portable.c) -+ -+if((CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64) OR (CMAKE_SYSTEM_PROCESSOR STREQUAL AMD64)) -+ enable_language(ASM) -+ if(MSVC) -+ enable_language(ASM_MASM) -+ set(SUFFIX "windows_msvc.asm") -+ elseif(WIN32) -+ enable_language(ASM) -+ set(SUFFIX "windows_gnu.S") -+ else() -+ enable_language(ASM) -+ set(SUFFIX "unix.S") -+ endif() -+ target_sources(blake3 PRIVATE -+ blake3_avx2_x86-64_${SUFFIX} -+ blake3_avx512_x86-64_${SUFFIX} -+ blake3_sse2_x86-64_${SUFFIX} -+ blake3_sse41_x86-64_${SUFFIX}) -+elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL i686) -+ target_compile_options(blake3 PRIVATE -+ -mavx2 -+ -mavx512f -mavx512vl -+ -msse2 -+ -msse4.1) -+ target_sources(blake3 PRIVATE -+ blake3_avx2.c -+ blake3_avx512.c -+ blake3_sse2.c -+ blake3_sse41.c) -+elseif((CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) OR -+ (ANDROID_ABI STREQUAL armeabi-v7a)) -+ target_compile_definitions(blake3 PRIVATE BLAKE3_USE_NEON) -+ target_compile_options(blake3 PRIVATE -mfpu=neon) -+ target_sources(blake3 PRIVATE blake3_neon.c) -+endif() -+ -+install(TARGETS blake3 -+ EXPORT blake3_targets -+ PUBLIC_HEADER) -+install(EXPORT blake3_targets -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" -+ FILE "${PROJECT_NAME}Targets.cmake" -+ NAMESPACE "${PROJECT_NAME}::") -+ -+include(CMakePackageConfigHelpers) -+write_basic_package_version_file( -+ "${PROJECT_NAME}ConfigVersion.cmake" -+ VERSION ${PROJECT_VERSION} -+ COMPATIBILITY AnyNewerVersion) -+configure_package_config_file( -+ ${PROJECT_NAME}Config.cmake.in -+ ${PROJECT_NAME}Config.cmake -+ INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" -+ PATH_VARS INCLUDE_DIR) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") From 380feff4df083b38531c59503b47162e45669ba3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 10 May 2024 09:33:27 -0700 Subject: [PATCH 6925/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/4afbbd61c63578347a84c4ed717b9c464b3dcf46 https://github.com/facebook/fb303/commit/2a15028e114108cce011f97d3f1577f62dd159ee https://github.com/facebook/fbthrift/commit/8121a07724241816c8df16c1dc59320289ba2d2a https://github.com/facebook/folly/commit/6281133b40f03fc677c02201c0c92620bf224039 https://github.com/facebook/mvfst/commit/8bfd2d1d66892386cc76da5b6a3e333e1e8575f9 https://github.com/facebook/proxygen/commit/9f878285f790eb70743cc74bbb660d1b4a942eaf https://github.com/facebook/wangle/commit/b414d9b43dd74a08cb9086239a0e14b4e649fa43 https://github.com/facebookexperimental/edencommon/commit/70c0d4685ef3af73b32a23867b75acef40151500 https://github.com/facebookexperimental/rust-shed/commit/55d900f571e49636f79b4b7025351d92df3d09be https://github.com/facebookincubator/fizz/commit/7a8925009b1e10df6e194997f5ab65cdf4aa2832 Reviewed By: jurajh-fb fbshipit-source-id: 72b6f428faea7a18bf922de004e0fa63184d6aea --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ea41cef141ff..4ba3b02efdfd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bb8d820b37ddb66bdf535bd89750ab41d0e898e8 +Subproject commit 8121a07724241816c8df16c1dc59320289ba2d2a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index cb94856ef908..6853cf8ba9b0 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f4552734cfb0a849a5bb1a7cae957a593e354296 +Subproject commit 6281133b40f03fc677c02201c0c92620bf224039 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 55666b3697c4..d828ada66446 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 116c30758169d7336e7da607d0b92bbd6e25df8a +Subproject commit b414d9b43dd74a08cb9086239a0e14b4e649fa43 From b7fe6b5913fdf1c99436327cf589ce34a3890a34 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 11 May 2024 09:31:55 -0700 Subject: [PATCH 6926/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/8cc50e384d92cb7569dff9e59700c99ac6a9afe7 https://github.com/facebook/fb303/commit/da7fcf135f4fa74fdca97a56980b46c9165e85eb https://github.com/facebook/fbthrift/commit/69b2a3954f6b52942f4c623299132b54bb7d2824 https://github.com/facebook/folly/commit/a53ef85eb2cd762b64faefd92547b47681ca7a1a https://github.com/facebook/mvfst/commit/123570e8ceeead67a3f0332d861fd6f254130576 https://github.com/facebook/proxygen/commit/4fbab35109e591740ee3ebaa6dea829f9162aae9 https://github.com/facebook/wangle/commit/c5c486aefc01f1212d4d113721baa31804fc3dc4 https://github.com/facebookexperimental/edencommon/commit/34d7dc60d5702831f61427a17d04ba41e9e4be66 https://github.com/facebookexperimental/rust-shed/commit/a8c87a0182ccc2e82066d5f4dddf15a31716ccbe https://github.com/facebookincubator/fizz/commit/333a37b7805c6875bccc269061e2da1dcff1d00a Reviewed By: jurajh-fb fbshipit-source-id: 53f15b1b62f1ffd2b6729b356d353812544d5268 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4ba3b02efdfd..daac5723625b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8121a07724241816c8df16c1dc59320289ba2d2a +Subproject commit 69b2a3954f6b52942f4c623299132b54bb7d2824 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6853cf8ba9b0..0fb965f13e5a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 6281133b40f03fc677c02201c0c92620bf224039 +Subproject commit a53ef85eb2cd762b64faefd92547b47681ca7a1a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d828ada66446..a58d8c8696b3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b414d9b43dd74a08cb9086239a0e14b4e649fa43 +Subproject commit c5c486aefc01f1212d4d113721baa31804fc3dc4 From b26c60430691022ef6171948048d41d9aece6647 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 12 May 2024 09:33:50 -0700 Subject: [PATCH 6927/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ade28bf30bf4ca7346a36aff90fdf8879341279d https://github.com/facebook/fbthrift/commit/28ccab277930d19cc80dac8509fa554308da4f99 https://github.com/facebook/folly/commit/3113fbf60c437d4c487f976091d2fbd862b3636b https://github.com/facebook/mvfst/commit/1bda81cea97266603f9d8114f47ee72debe85966 https://github.com/facebook/proxygen/commit/f12e3c12f5e87f5b4cdce04a0793be8f467bc2ec https://github.com/facebook/wangle/commit/991cd5dec9748279a209a5c05be01424e8d11ef3 https://github.com/facebookexperimental/edencommon/commit/9892e93f53f1495f4f15a3ad1f60d62b52b6b778 https://github.com/facebookexperimental/rust-shed/commit/9d9ef4d06c7873f51525d50719e97004b357904f https://github.com/facebookincubator/fizz/commit/3826ad56e1ea7bf546a74903e58874345cb61c0c Reviewed By: jurajh-fb fbshipit-source-id: 25545e629c164025dbe79dc35f39604c9f73f523 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index daac5723625b..f482eb561c36 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 69b2a3954f6b52942f4c623299132b54bb7d2824 +Subproject commit 28ccab277930d19cc80dac8509fa554308da4f99 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0fb965f13e5a..869f1e8815f1 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a53ef85eb2cd762b64faefd92547b47681ca7a1a +Subproject commit 3113fbf60c437d4c487f976091d2fbd862b3636b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a58d8c8696b3..8623c0ebdb12 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c5c486aefc01f1212d4d113721baa31804fc3dc4 +Subproject commit 991cd5dec9748279a209a5c05be01424e8d11ef3 From 73ff151036fbbf16d8f5c6dd11edd841d5e267ab Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 13 May 2024 09:32:49 -0700 Subject: [PATCH 6928/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/8d44fc41471c07f0d0d49c56e13a2fff3f3c6b79 https://github.com/facebook/fb303/commit/f055a4dd48b76fb0838267cfab9c5c2973f50da6 https://github.com/facebook/fbthrift/commit/37404b1e22bb164bebad33a0761e45dd0a447877 https://github.com/facebook/folly/commit/0d58c4ca3d03b25b691338f5a13472d786b99968 https://github.com/facebook/mvfst/commit/efe60bb35f0e6eb4829a672896fa505e6d4f40c2 https://github.com/facebook/proxygen/commit/b40ec1a8f688f3f650647949c5c1b47cd7c13944 https://github.com/facebook/wangle/commit/57b58457dbfba68050ceb4e93c264d34a88ca9c1 https://github.com/facebookexperimental/edencommon/commit/16893c2927b48f4f6ce8f2e5ee19d06bd770bc01 https://github.com/facebookexperimental/rust-shed/commit/ac1f51823f590e8d900425d19b3ac5831f2806b7 https://github.com/facebookincubator/fizz/commit/e4184cc2ba0eaefc67891c4c23136014a910030a Reviewed By: ajb85 fbshipit-source-id: a13ca5faf96c86c6cf1086aaa3091a5303779e98 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f482eb561c36..16cc2f2d4481 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 28ccab277930d19cc80dac8509fa554308da4f99 +Subproject commit 37404b1e22bb164bebad33a0761e45dd0a447877 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 869f1e8815f1..599d96690110 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 3113fbf60c437d4c487f976091d2fbd862b3636b +Subproject commit 0d58c4ca3d03b25b691338f5a13472d786b99968 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8623c0ebdb12..0296b9da3a2f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 991cd5dec9748279a209a5c05be01424e8d11ef3 +Subproject commit 57b58457dbfba68050ceb4e93c264d34a88ca9c1 From 53568f9382a9c08299bd0611b0c7a8fb8d695eda Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Mon, 13 May 2024 10:31:17 -0700 Subject: [PATCH 6929/7387] switch to built dependencies Summary: The openssl manifest needed an nop builder to allow build without --allow-system-packages , otherwise if gave`Exception: project openssl has no builder for ` Reviewed By: DevidXu Differential Revision: D57277879 fbshipit-source-id: ec87a2b9e072645e550e6b9edd09936b88698b83 --- build/fbcode_builder/manifests/openssl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/fbcode_builder/manifests/openssl b/build/fbcode_builder/manifests/openssl index b806b701ae72..0f1be2219970 100644 --- a/build/fbcode_builder/manifests/openssl +++ b/build/fbcode_builder/manifests/openssl @@ -17,7 +17,10 @@ openssl-libs url = https://www.openssl.org/source/openssl-1.1.1l.tar.gz sha256 = 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 -# We use the system openssl on linux +# We use the system openssl on these platforms even without --allow-system-packages +[build.any(os=linux, os=freebsd)] +builder = nop + [build.not(any(os=linux, os=freebsd))] builder = openssl subdir = openssl-1.1.1l From 6db4e190de8cfd327a4c3ad97e15a0b12793319f Mon Sep 17 00:00:00 2001 From: John Elliott Date: Mon, 13 May 2024 11:10:24 -0700 Subject: [PATCH 6930/7387] Don't crash watchman when detected Eden root is not connected (pt. 3) Summary: Previous attempt, D56780919, did not fix crash when reading (`.../.eden/socket`). Why? The exception was getting propagated correctly, caused `makeThriftChannel` to propagate that exception eventuanly causing watchman to terminate. Here we catch the `RootNotConnectedError` and return an empty string for the socket address. This results in `makeThriftChannel` failing eventually resulting in `subscriberThread` to exit - which appears to be OK. Reviewed By: MichaelCuevas Differential Revision: D57190983 fbshipit-source-id: 7be32db629e2d171b3edf1e04ea627d836f53451 --- watchman/Errors.h | 2 +- watchman/listener-user.cpp | 4 +++- watchman/watcher/WatcherRegistry.cpp | 6 +++--- watchman/watcher/eden.cpp | 18 +++++++++++------- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/watchman/Errors.h b/watchman/Errors.h index 403c56a4277a..072628fed1c2 100644 --- a/watchman/Errors.h +++ b/watchman/Errors.h @@ -168,7 +168,7 @@ class RootResolveError : public WatchmanError { /** * Represents an error when root is not conntected. */ -class RootNotConnectedError : public WatchmanError { +class RootNotConnectedError : public WatchmanError { public: static constexpr const char* prefix = "root not connected"; using WatchmanError::WatchmanError; diff --git a/watchman/listener-user.cpp b/watchman/listener-user.cpp index b319cc767971..8aff8355c688 100644 --- a/watchman/listener-user.cpp +++ b/watchman/listener-user.cpp @@ -97,7 +97,9 @@ resolveRootByName(Client* client, const char* rootName, bool create) { client->perf_sample->add_root_metadata(root->getRootMetadata()); } return root; - + } catch (const RootNotConnectedError&) { + // pass through RootNotConnectedError + throw; } catch (const std::exception& exc) { RootResolveError::throwf( "unable to resolve root {}: {}{}", diff --git a/watchman/watcher/WatcherRegistry.cpp b/watchman/watcher/WatcherRegistry.cpp index 009fda687567..2e47f8ebb709 100644 --- a/watchman/watcher/WatcherRegistry.cpp +++ b/watchman/watcher/WatcherRegistry.cpp @@ -132,16 +132,16 @@ std::shared_ptr WatcherRegistry::initWatcher( // Don't continue our attempt to use other registered watchers // in this case break; - } catch (const RootNotConnectedError& rre) { + } catch (const RootNotConnectedError& rnce) { // When Eden watcher is detected, but fails to resolve, we do // not attempt to use other registered watchers. Rather, we - // fail gracefully by throwing RootNotConnectedError. + // fail gracefully by throwing RootNotConnectedError. watchman::log( watchman::DBG, "failed to use watcher ", watcher->getName(), ": ", - rre.what(), + rnce.what(), ".\n"); throw; } catch (const std::exception& e) { diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index 5ef601771ab0..c21ca44acda3 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -151,13 +151,17 @@ std::string resolveSocketPath(w_string_piece rootPath) { } catch (const std::system_error& e) { // When Eden fails during graceful takeover, the mount can exist, but it // is disconnected. In this case, we can't use the eden watcher. Log this - // error and throw. - log(DBG, "Failed to read EdenFS root when mount exists: ", e.what()); - RootNotConnectedError::throwf( - "{} appears to be a disconnected EdenFS mount. " - "Try running `eden doctor` to bring it back online and " - "then retry your watch", - rootPath); + // error and return no address - this will result makeThriftChannel failing + // with an AsyncSocketException. + log(DBG, + fmt::format( + "Failed to read EdenFS root when mount exists: {}." + "{} appears to be a disconnected EdenFS mount. " + "Try running `eden doctor` to bring it back online and " + "then retry your watch.", + e.what(), + rootPath)); + return std::string(); } #endif } From 256e4ba5c7e498fcff1162f4b8eda308e3b88bb7 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Mon, 13 May 2024 11:10:24 -0700 Subject: [PATCH 6931/7387] Store telemetry config setting in singleton to improve throughput Summary: When testing some recent telemetry changes, certain tests began to timeout. Found some low-hanging speed ups where we re-comptue the `perf_sampling_thresh` nearly every event, but it never changes. Let's fix that. Reviewed By: MichaelCuevas Differential Revision: D57250802 fbshipit-source-id: 68a2401f364e8516dba93993b5250824d91494be --- watchman/PerfSample.cpp | 26 +++++++++++++++++--------- watchman/PerfSample.h | 2 ++ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/watchman/PerfSample.cpp b/watchman/PerfSample.cpp index ae2823ec72f3..92647b56d558 100644 --- a/watchman/PerfSample.cpp +++ b/watchman/PerfSample.cpp @@ -113,6 +113,22 @@ PerfSample::PerfSample(const char* description) : description(description) { #endif } +double PerfSample::get_perf_sampling_thresh() const { + static double perf_sampling_thresh{0}; + if (perf_sampling_thresh == 0) { + auto thresh = cfg_get_json("perf_sampling_thresh"); + if (thresh) { + if (thresh->isNumber()) { + perf_sampling_thresh = json_number_value(*thresh); + } else { + perf_sampling_thresh = + json_number_value(thresh->get_default(description, json_real(0.0))); + } + } + } + return perf_sampling_thresh; +} + bool PerfSample::finish() { gettimeofday(&time_end, nullptr); w_timeval_sub(time_end, time_begin, &duration); @@ -142,15 +158,7 @@ bool PerfSample::finish() { if (!will_log) { if (wall_time_elapsed_thresh == 0) { - auto thresh = cfg_get_json("perf_sampling_thresh"); - if (thresh) { - if (thresh->isNumber()) { - wall_time_elapsed_thresh = json_number_value(*thresh); - } else { - wall_time_elapsed_thresh = json_number_value( - thresh->get_default(description, json_real(0.0))); - } - } + wall_time_elapsed_thresh = get_perf_sampling_thresh(); } if (wall_time_elapsed_thresh > 0 && diff --git a/watchman/PerfSample.h b/watchman/PerfSample.h index 8a7a04210650..d0b423bf1e29 100644 --- a/watchman/PerfSample.h +++ b/watchman/PerfSample.h @@ -57,6 +57,8 @@ class PerfSample { // that this value double wall_time_elapsed_thresh{0}; + double get_perf_sampling_thresh() const; + #ifdef HAVE_SYS_RESOURCE_H // When available (posix), record these process-wide stats. // It can be difficult to attribute these directly to the From 27edd2cecf2962c772809116f3e215095cc3b619 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Mon, 13 May 2024 11:10:24 -0700 Subject: [PATCH 6932/7387] Limit number of structured events logged to backend; add per-event counter to track totals Summary: When we previosuly turned on srucutured logging the amount of data was much too high. We disabled it briefly, and anre now rolling out this change to limit the total data collected, but also track the number of "missed" events. Reviewed By: MichaelCuevas Differential Revision: D57223790 fbshipit-source-id: c94508acb98560cde013e96cacab1707b07f9d6e --- CMakeLists.txt | 1 + watchman/Client.cpp | 21 ++++++++--- watchman/SanityCheck.cpp | 14 +++++-- watchman/query/eval.cpp | 31 ++++++++++------ watchman/root/ageout.cpp | 42 ++++++++++++--------- watchman/root/iothread.cpp | 13 ++++--- watchman/root/sync.cpp | 66 +++++++++++++++++++-------------- watchman/telemetry/LogEvent.cpp | 31 ++++++++++++++++ watchman/telemetry/LogEvent.h | 17 +++++++++ watchman/watcher/fsevents.cpp | 1 + 10 files changed, 166 insertions(+), 71 deletions(-) create mode 100644 watchman/telemetry/LogEvent.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index b3fb7f92be0a..c44906df1fe3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -690,6 +690,7 @@ watchman/saved_state/SavedStateInterface.cpp watchman/scm/Git.cpp watchman/scm/Mercurial.cpp watchman/scm/SCM.cpp +watchman/telemetry/LogEvent.cpp watchman/telemetry/WatchmanStats.cpp watchman/telemetry/WatchmanStructuredLogger.cpp watchman/thirdparty/getopt/GetOpt.cpp diff --git a/watchman/Client.cpp b/watchman/Client.cpp index 73257f1032b9..a37d679d1be3 100644 --- a/watchman/Client.cpp +++ b/watchman/Client.cpp @@ -140,6 +140,7 @@ bool Client::dispatchCommand(const Command& command, CommandFlags mode) { DispatchCommand dispatchCommand; dispatchCommand.command = command.name(); dispatch_command = &dispatchCommand; + auto sample_name = "dispatch_command:" + std::string{def->name}; PerfSample sample(sample_name.c_str()); perf_sample = &sample; @@ -156,6 +157,7 @@ bool Client::dispatchCommand(const Command& command, CommandFlags mode) { // Let's change `func` to take a Command after Command knows what a root // path is. auto rendered = command.render(); + auto renderedString = rendered.toString(); try { enqueueResponse(def->handler(this, rendered)); @@ -165,11 +167,6 @@ bool Client::dispatchCommand(const Command& command, CommandFlags mode) { } catch (const ResponseWasHandledManually&) { } - dispatchCommand.duration = - std::chrono::duration{dispatchCommandStart.elapsed()}.count(); - dispatchCommand.args = rendered.toString(); - getLogger()->logEvent(dispatchCommand); - if (sample.finish()) { sample.add_meta("args", std::move(rendered)); sample.add_meta( @@ -177,6 +174,20 @@ bool Client::dispatchCommand(const Command& command, CommandFlags mode) { json_object({{"pid", json_integer(stm->getPeerProcessID())}})); sample.log(); } + + const auto& [samplingRate, eventCount] = + getLogEventCounters(LogEventType::DispatchCommandType); + // Log if override set, or if we have hit the sample rate + if (sample.will_log || eventCount == samplingRate) { + dispatchCommand.event_count = + eventCount != samplingRate ? 0 : eventCount; + dispatchCommand.duration = + std::chrono::duration{dispatchCommandStart.elapsed()} + .count(); + dispatchCommand.args = renderedString; + getLogger()->logEvent(dispatchCommand); + } + logf(DBG, "dispatch_command: {} (completed)\n", def->name); } diff --git a/watchman/SanityCheck.cpp b/watchman/SanityCheck.cpp index 87cc45f66589..44170c685379 100644 --- a/watchman/SanityCheck.cpp +++ b/watchman/SanityCheck.cpp @@ -170,9 +170,17 @@ void do_clock_check(watchman_stream* client) { sample.force_log(); } - getLogger()->logEvent(clockTest); - sample.finish(); - sample.log(); + if (sample.finish()) { + sample.log(); + } + + const auto& [samplingRate, eventCount] = + getLogEventCounters(LogEventType::ClockTestType); + // Log if override set, or if we have hit the sample rate + if (sample.will_log || eventCount == samplingRate) { + clockTest.event_count = eventCount != samplingRate ? 0 : eventCount; + getLogger()->logEvent(clockTest); + } } } catch (const std::exception& ex) { // Catch std::domain_error and std::runtime_error diff --git a/watchman/query/eval.cpp b/watchman/query/eval.cpp index 14b1fbb7ed65..cb0360e431a7 100644 --- a/watchman/query/eval.cpp +++ b/watchman/query/eval.cpp @@ -219,7 +219,7 @@ static void execute_common( // NOTE: sample and queryExecute are either both non-null or both null queryExecute->num_special_files = ctx->namesToLog.size(); - queryExecute->special_files = json_array(std::move(nameList)).toString(); + queryExecute->special_files = json_array(nameList).toString(); sample->add_meta( "num_special_files_in_result_set", @@ -231,16 +231,7 @@ static void execute_common( if (sample) { // NOTE: sample and queryExecute are either both non-null or both null - RootMetadata root_metadata = ctx->root->getRootMetadata(); - addRootMetadataToEvent(root_metadata, *queryExecute); - queryExecute->fresh_instance = res->isFreshInstance; - queryExecute->deduped = ctx->num_deduped; - queryExecute->results = ctx->resultsArray.size(); - queryExecute->walked = ctx->getNumWalked(); - if (ctx->query->query_spec) { - queryExecute->query = ctx->query->query_spec->toString(); - } - getLogger()->logEvent(*queryExecute); + auto root_metadata = ctx->root->getRootMetadata(); if (sample->finish()) { sample->add_root_metadata(root_metadata); @@ -256,6 +247,24 @@ static void execute_common( sample->add_meta("query_execute", std::move(meta)); sample->log(); } + + const auto& [samplingRate, eventCount] = + getLogEventCounters(LogEventType::QueryExecuteType); + // Log if override set, or if we have hit the sample rate + if (sample->will_log || eventCount == samplingRate) { + addRootMetadataToEvent(root_metadata, *queryExecute); + queryExecute->event_count = eventCount != samplingRate ? 0 : eventCount; + queryExecute->fresh_instance = res->isFreshInstance; + queryExecute->deduped = ctx->num_deduped; + queryExecute->results = ctx->resultsArray.size(); + queryExecute->walked = ctx->getNumWalked(); + + if (ctx->query->query_spec) { + queryExecute->query = ctx->query->query_spec->toString(); + } + + getLogger()->logEvent(*queryExecute); + } } res->resultsArray = ctx->renderResults(); diff --git a/watchman/root/ageout.cpp b/watchman/root/ageout.cpp index 33e36ae374c7..5aca48e58680 100644 --- a/watchman/root/ageout.cpp +++ b/watchman/root/ageout.cpp @@ -51,25 +51,7 @@ void Root::performAgeOut(std::chrono::seconds min_age) { } } } - auto root_metadata = getRootMetadata(); - auto ageOut = AgeOut{ - // MetadataEvent - { - // BaseEvent - { - root_metadata.root_path.string(), // root - std::string() // error - }, - root_metadata.recrawl_count, // recrawl - root_metadata.case_sensitive, // case_sensitive - root_metadata.watcher.string() // watcher - }, - walked, // walked - files, // files - dirs // dirs - }; - getLogger()->logEvent(ageOut); if (sample.finish()) { sample.add_meta( @@ -82,6 +64,30 @@ void Root::performAgeOut(std::chrono::seconds min_age) { sample.add_root_metadata(root_metadata); sample.log(); } + + const auto& [samplingRate, eventCount] = + getLogEventCounters(LogEventType::AgeOutType); + // Log if override set, or if we have hit the sample rate + if (sample.will_log || eventCount == samplingRate) { + auto ageOut = AgeOut{ + // MetadataEvent + { + // BaseEvent + { + root_metadata.root_path.string(), // root + std::string(), // error + eventCount != samplingRate ? 0 : eventCount // event_count + }, + root_metadata.recrawl_count, // recrawl + root_metadata.case_sensitive, // case_sensitive + root_metadata.watcher.string() // watcher + }, + walked, // walked + files, // files + dirs // dirs + }; + getLogger()->logEvent(ageOut); + } } /* vim:ts=2:sw=2:et: diff --git a/watchman/root/iothread.cpp b/watchman/root/iothread.cpp index 82536921a06b..75098cb34918 100644 --- a/watchman/root/iothread.cpp +++ b/watchman/root/iothread.cpp @@ -83,7 +83,12 @@ void InMemoryView::fullCrawl( root->cookies.abortAllCookies(); - RootMetadata root_metadata = root->getRootMetadata(); + auto root_metadata = root->getRootMetadata(); + sample.add_root_metadata(root_metadata); + sample.finish(); + sample.force_log(); + sample.log(); + auto fullCrawl = FullCrawl{ // MetadataEvent { @@ -91,6 +96,7 @@ void InMemoryView::fullCrawl( { root_metadata.root_path.string(), // root std::string() // error + // event_count = 1, default }, root_metadata.recrawl_count, // recrawl root_metadata.case_sensitive, // case_sensitive @@ -99,11 +105,6 @@ void InMemoryView::fullCrawl( }; getLogger()->logEvent(fullCrawl); - sample.add_root_metadata(root_metadata); - sample.finish(); - sample.force_log(); - sample.log(); - logf(ERR, "{}crawl complete\n", recrawlCount ? "re" : ""); } diff --git a/watchman/root/sync.cpp b/watchman/root/sync.cpp index 6507dcac6661..ed9505d8a4c9 100644 --- a/watchman/root/sync.cpp +++ b/watchman/root/sync.cpp @@ -23,24 +23,7 @@ CookieSync::SyncResult Root::syncToNow(std::chrono::milliseconds timeout) { auto root = shared_from_this(); try { auto result = view()->syncToNow(root, timeout); - auto root_metadata = getRootMetadata(); - auto syncToNow = SyncToNow{ - // MetadataEvent - { - // BaseEvent - { - root_metadata.root_path.string(), // root - std::string() // error - }, - root_metadata.recrawl_count, // recrawl - root_metadata.case_sensitive, // case_sensitive - root_metadata.watcher.string() // watcher - }, - true, // success - timeout.count() // timeoutms - }; - getLogger()->logEvent(syncToNow); if (sample.finish()) { sample.add_root_metadata(root_metadata); @@ -51,16 +34,53 @@ CookieSync::SyncResult Root::syncToNow(std::chrono::milliseconds timeout) { {"timeoutms", json_integer(timeout.count())}})); sample.log(); } + + const auto& [samplingRate, eventCount] = + getLogEventCounters(LogEventType::SyncToNowType); + // Log if override set, or if we have hit the sample rate + if (sample.will_log || eventCount == samplingRate) { + auto syncToNow = SyncToNow{ + // MetadataEvent + { + // BaseEvent + { + root_metadata.root_path.string(), // root + std::string(), // error + eventCount != samplingRate ? 0 : eventCount // event_count + }, + root_metadata.recrawl_count, // recrawl + root_metadata.case_sensitive, // case_sensitive + root_metadata.watcher.string() // watcher + }, + true, // success + timeout.count() // timeoutms + }; + getLogger()->logEvent(syncToNow); + } return result; } catch (const std::exception& exc) { auto root_metadata = getRootMetadata(); + sample.force_log(); + sample.finish(); + sample.add_root_metadata(root_metadata); + sample.add_meta( + "sync_to_now", + json_object( + {{"success", json_boolean(false)}, + {"reason", w_string_to_json(exc.what())}, + {"timeoutms", json_integer(timeout.count())}})); + sample.log(); + + const auto& [samplingRate, eventCount] = + getLogEventCounters(LogEventType::SyncToNowType); auto syncToNow = SyncToNow{ // MetadataEvent { // BaseEvent { root_metadata.root_path.string(), // root - exc.what() // error + exc.what(), // error + eventCount != samplingRate ? 0 : eventCount // event_count }, root_metadata.recrawl_count, // recrawl root_metadata.case_sensitive, // case_sensitive @@ -71,16 +91,6 @@ CookieSync::SyncResult Root::syncToNow(std::chrono::milliseconds timeout) { }; getLogger()->logEvent(syncToNow); - sample.force_log(); - sample.finish(); - sample.add_root_metadata(root_metadata); - sample.add_meta( - "sync_to_now", - json_object( - {{"success", json_boolean(false)}, - {"reason", w_string_to_json(exc.what())}, - {"timeoutms", json_integer(timeout.count())}})); - sample.log(); throw; } } diff --git a/watchman/telemetry/LogEvent.cpp b/watchman/telemetry/LogEvent.cpp new file mode 100644 index 000000000000..0b72cf3dd147 --- /dev/null +++ b/watchman/telemetry/LogEvent.cpp @@ -0,0 +1,31 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +#include + +#include "watchman/WatchmanConfig.h" +#include "watchman/telemetry/LogEvent.h" + +namespace watchman { + +std::pair getLogEventCounters(const LogEventType& type) { + static std::unordered_map eventCounters; + static int64_t samplingRate = cfg_get_int("scribe-sampling-rate", 100); + + // Find event counter or add if missing - init to 0; + auto it = eventCounters.find(type); + if (it == eventCounters.end()) { + it = eventCounters.emplace(type, 0).first; + } + + // Return sampling rate and event count + auto& eventCounter = it->second; + auto eventCount = ++eventCounter % samplingRate; + return std::make_pair(samplingRate, eventCount ? eventCount : samplingRate); +} + +} // namespace watchman diff --git a/watchman/telemetry/LogEvent.h b/watchman/telemetry/LogEvent.h index b817aaad6f8b..0a87fa753138 100644 --- a/watchman/telemetry/LogEvent.h +++ b/watchman/telemetry/LogEvent.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include #include #include @@ -18,9 +19,24 @@ namespace watchman { using DynamicEvent = facebook::eden::DynamicEvent; +enum LogEventType : uint8_t { + DispatchCommandType, + ClockTestType, + AgeOutType, + SyncToNowType, + SavedStateType, + QueryExecuteType, + FullCrawlType, + DroppedType +}; + +// Returns samplingRate and eventCount +std::pair getLogEventCounters(const LogEventType& type); + struct BaseEvent { std::string root; std::string error; + int64_t event_count = 1; void populate(DynamicEvent& event) const { if (!root.empty()) { @@ -29,6 +45,7 @@ struct BaseEvent { if (!error.empty()) { event.addString("error", error); } + event.addInt("event_count", event_count); } }; diff --git a/watchman/watcher/fsevents.cpp b/watchman/watcher/fsevents.cpp index 4d7b577384d4..e480901624aa 100644 --- a/watchman/watcher/fsevents.cpp +++ b/watchman/watcher/fsevents.cpp @@ -145,6 +145,7 @@ static void log_drop_event(const std::shared_ptr& root, bool isKernel) { { root_metadata.root_path.string(), // root std::string() // error + // event_count = 1, default }, root_metadata.recrawl_count, // recrawl root_metadata.case_sensitive, // case_sensitive From 2fcbdf490f3fa32b4a13e986fb043b48bb5b1f89 Mon Sep 17 00:00:00 2001 From: Nicholas Ormrod Date: Mon, 13 May 2024 13:26:48 -0700 Subject: [PATCH 6933/7387] Deshim bser in watchman Summary: The following rules were deshimmed: ``` //folly/experimental/bser:bser -> //folly/json/bser:bser ``` The following headers were deshimmed: ``` folly/experimental/bser/Bser.h -> folly/json/bser/Bser.h ``` This is a codemod. It was automatically generated and will be landed once it is approved and tests are passing in sandcastle. You have been added as a reviewer by Sentinel or Butterfly. Reviewed By: MichaelCuevas Differential Revision: D57280129 fbshipit-source-id: 63790675d55327f61d1bcd641e1453d9fa121c2c --- watchman/cppclient/WatchmanConnection.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/cppclient/WatchmanConnection.cpp b/watchman/cppclient/WatchmanConnection.cpp index 00c90d0d9861..7d060594e8f7 100644 --- a/watchman/cppclient/WatchmanConnection.cpp +++ b/watchman/cppclient/WatchmanConnection.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #ifdef _WIN32 #include // @manual From c3481d2a7691b8c3e3a6bf35be6664b74c6c2945 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Mon, 13 May 2024 14:53:17 -0700 Subject: [PATCH 6934/7387] Fix trivial log message typo Summary: In a recent diff, landed a chnage that would have concatenated two sentences with no space. Let's fix that. Reviewed By: MichaelCuevas Differential Revision: D57296602 fbshipit-source-id: f7cf88dfa85fd99170e440b36a0d808048fd923c --- watchman/watcher/eden.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index c21ca44acda3..8e90c27b34ab 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -155,7 +155,7 @@ std::string resolveSocketPath(w_string_piece rootPath) { // with an AsyncSocketException. log(DBG, fmt::format( - "Failed to read EdenFS root when mount exists: {}." + "Failed to read EdenFS root when mount exists: {} ." "{} appears to be a disconnected EdenFS mount. " "Try running `eden doctor` to bring it back online and " "then retry your watch.", From 7d19f4f4d2856b19471e155562fc8d7adefa3db8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 14 May 2024 09:33:11 -0700 Subject: [PATCH 6935/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/dcc43407e0018062b8ba4e69d26c028da4e43014 https://github.com/facebook/fb303/commit/2a8ffe3a4048f3b71e9c315036a8f46248f14ecd https://github.com/facebook/fbthrift/commit/3117fe09259309c8d04dc9e39ea1d5bdc0625460 https://github.com/facebook/folly/commit/99767aa88e8fd77823c870491d639723cf570b9d https://github.com/facebook/mvfst/commit/d3d25ecaad1b7f83cfb71b2403dadecd9c4142ac https://github.com/facebook/proxygen/commit/b5b54c64fe0174e9783af064b7f0e604653e5cdf https://github.com/facebook/wangle/commit/f5a06feda8309c30e83b8c90ff9e3c3f756a36d1 https://github.com/facebookexperimental/edencommon/commit/c5554eefc8589415c56057fd47eae67678841947 https://github.com/facebookexperimental/rust-shed/commit/5a39427e0989f9fd058bb9f49a8c886855b4676b https://github.com/facebookincubator/fizz/commit/e5bee2e59f7986a6a5be554a9750848dfedd55cf Reviewed By: ajb85 fbshipit-source-id: 335cacfd249d5dc0444dd4ce73f53a77f4e6ca2f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 16cc2f2d4481..dcce499b54de 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 37404b1e22bb164bebad33a0761e45dd0a447877 +Subproject commit 3117fe09259309c8d04dc9e39ea1d5bdc0625460 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 599d96690110..502d1a75a861 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0d58c4ca3d03b25b691338f5a13472d786b99968 +Subproject commit 99767aa88e8fd77823c870491d639723cf570b9d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0296b9da3a2f..c9873b1131ae 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 57b58457dbfba68050ceb4e93c264d34a88ca9c1 +Subproject commit f5a06feda8309c30e83b8c90ff9e3c3f756a36d1 From 6d8eadaae3541fa2683a56bf2202564071e45a88 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 15 May 2024 09:31:41 -0700 Subject: [PATCH 6936/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/a7518185c17baca7a7cea7ff6578aa6859ef703f https://github.com/facebook/fb303/commit/03f8a8d3b60eb7ef2e0eb5395398777f87c92a6c https://github.com/facebook/fbthrift/commit/087cb84a1430d02bc633f5de69466b9141ca09d0 https://github.com/facebook/folly/commit/8fa9517b3ae1a399024184539f5545f74986106f https://github.com/facebook/mvfst/commit/d73e56102780ef84b735dc196bb1adee8ab7ffd9 https://github.com/facebook/proxygen/commit/ce4dfee0e3466efc5a77d661d2befde8f997086c https://github.com/facebook/wangle/commit/67ad5d06fe8b4251fb78475211ee9ff818294bed https://github.com/facebookexperimental/edencommon/commit/bd83b9dc6facd8e5401a4f66d9708c1eb4355907 https://github.com/facebookexperimental/rust-shed/commit/9d0090c5959fba95b557a390c98522a1c5b9efa8 https://github.com/facebookincubator/fizz/commit/6515c394dcc483db71a762d347c3d7821685ac7e Reviewed By: ajb85 fbshipit-source-id: 2b82420d45555856c763ef71a1b7332b3eb4213b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index dcce499b54de..00117becaaf4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3117fe09259309c8d04dc9e39ea1d5bdc0625460 +Subproject commit 087cb84a1430d02bc633f5de69466b9141ca09d0 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 502d1a75a861..3f246f48e821 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 99767aa88e8fd77823c870491d639723cf570b9d +Subproject commit 8fa9517b3ae1a399024184539f5545f74986106f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c9873b1131ae..591f179b124b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f5a06feda8309c30e83b8c90ff9e3c3f756a36d1 +Subproject commit 67ad5d06fe8b4251fb78475211ee9ff818294bed From 96239c1d9138b5665539de67700f186a73fb9892 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 16 May 2024 09:32:50 -0700 Subject: [PATCH 6937/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/2753451d68b7ffcdbd5bcb8f6ff6719e705e303a https://github.com/facebook/fb303/commit/e54973885c3b543b41f2167a0cf0325363c36421 https://github.com/facebook/fbthrift/commit/8ebb3a56d93b3fb884cc1a87c5cb884c65a93e5b https://github.com/facebook/folly/commit/021cb16f2231355126f665b6bb2d65ad4487ae6d https://github.com/facebook/mvfst/commit/9d16a6ebea6a6b03ebeff9db4355c840bf19104d https://github.com/facebook/proxygen/commit/98d508843a6aadf42237d381f6d468d0de6b2920 https://github.com/facebook/wangle/commit/8935b00b4b09ed709d360de847a7c55dd133fa21 https://github.com/facebookexperimental/edencommon/commit/ec32ad7108b48c9541186a010bcdb86516a72e50 https://github.com/facebookexperimental/rust-shed/commit/e9517e776ecbe0065ed808f367846ccf3afafd8e https://github.com/facebookexternal/plc-code/commit/12e9c56e378f3ae1e2617887b7b92a1b4caeb2a8 https://github.com/facebookincubator/fizz/commit/3b3c3f043f811abcb50f7579ffdac1269f85e8e2 Reviewed By: ajb85 fbshipit-source-id: f5f8c926ed497e5dd24ca56b1564926dfb495d51 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 00117becaaf4..af90ca6638f4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 087cb84a1430d02bc633f5de69466b9141ca09d0 +Subproject commit 8ebb3a56d93b3fb884cc1a87c5cb884c65a93e5b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 3f246f48e821..218dd00ae10e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 8fa9517b3ae1a399024184539f5545f74986106f +Subproject commit 021cb16f2231355126f665b6bb2d65ad4487ae6d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 591f179b124b..cbee455e9696 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 67ad5d06fe8b4251fb78475211ee9ff818294bed +Subproject commit 8935b00b4b09ed709d360de847a7c55dd133fa21 From d9a706b064643fce42a23455040bc42d6b4f3c98 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 17 May 2024 09:32:06 -0700 Subject: [PATCH 6938/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/9ce200ebdaecf0a5906adaa8aa8cbf128c57c3a3 https://github.com/facebook/fb303/commit/22a65bd65ec4b7c4588073c51b41ae81d34e69c3 https://github.com/facebook/fbthrift/commit/0e618aa4c5cbca39c28d031fda2fcb2f16495fa7 https://github.com/facebook/folly/commit/e55924b002d78d834c85d84016f54f9a7a057346 https://github.com/facebook/mvfst/commit/cee162311b0fa2e52141a9d3e810a34edf7a73ff https://github.com/facebook/proxygen/commit/cc1f604a7bf73464b66950c8a5c4902a77b0e647 https://github.com/facebook/wangle/commit/cf7349f22b8327117a6ed37272333442daadf5fd https://github.com/facebookexperimental/edencommon/commit/ffc6ee750a9753c6cbe26d2d56e912913b38425c https://github.com/facebookexperimental/rust-shed/commit/312da5079f2aab5d62691093767338d7072bcea4 https://github.com/facebookincubator/fizz/commit/2f394662b22438cf41796daf6682a3ecf366e31c Reviewed By: ajb85 fbshipit-source-id: e57c59276ed29f93af2018c10efb262975a93aa8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index af90ca6638f4..791339b9c950 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8ebb3a56d93b3fb884cc1a87c5cb884c65a93e5b +Subproject commit 0e618aa4c5cbca39c28d031fda2fcb2f16495fa7 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 218dd00ae10e..f1fce18cba2a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 021cb16f2231355126f665b6bb2d65ad4487ae6d +Subproject commit e55924b002d78d834c85d84016f54f9a7a057346 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index cbee455e9696..8d4576c01579 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8935b00b4b09ed709d360de847a7c55dd133fa21 +Subproject commit cf7349f22b8327117a6ed37272333442daadf5fd From 4b2cb878631d48e776589ce57808d5461338b4be Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 18 May 2024 09:31:49 -0700 Subject: [PATCH 6939/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/0d55ff5aff56b9103126975239ec5715e83cbac6 https://github.com/facebook/fb303/commit/d3e284626dd4960df7ddafa0d4b39375acde9c9a https://github.com/facebook/fbthrift/commit/154eeba24016ff43eb11d7baf9becc60430e4cb1 https://github.com/facebook/folly/commit/73e22e0fdb9fe8ccd4198a14066fee11c6ad99db https://github.com/facebook/mvfst/commit/631a22295c96af6257649722fef2597967d40a92 https://github.com/facebook/proxygen/commit/1780156e3c4de13ca8bd9c0c94fa058349909229 https://github.com/facebook/wangle/commit/bd4966085badf79bc694dd569f5e845d966d5712 https://github.com/facebookexperimental/edencommon/commit/018f5c6e844937dddd28070e17385ac5c4b832ba https://github.com/facebookexperimental/rust-shed/commit/51349d4df9d18ea1b9ffde146de365d38a01bacc https://github.com/facebookincubator/fizz/commit/abdf44a1c0100d146d65005bd48c0f0c4b945389 Reviewed By: ajb85 fbshipit-source-id: c07712788321548d8042c8586e218347e829046c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 791339b9c950..597d998b790c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0e618aa4c5cbca39c28d031fda2fcb2f16495fa7 +Subproject commit 154eeba24016ff43eb11d7baf9becc60430e4cb1 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f1fce18cba2a..5cd259a6243f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e55924b002d78d834c85d84016f54f9a7a057346 +Subproject commit 73e22e0fdb9fe8ccd4198a14066fee11c6ad99db diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8d4576c01579..963505f10a88 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit cf7349f22b8327117a6ed37272333442daadf5fd +Subproject commit bd4966085badf79bc694dd569f5e845d966d5712 From 31800649abcb05bed7fe064c74d263775e06ac59 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 19 May 2024 09:31:34 -0700 Subject: [PATCH 6940/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/fae65cad8333db0ebc3d20fa24629e961bba5616 https://github.com/facebook/fb303/commit/6c0427f0456cee273f76fd181cfa1eaa531b6fd0 https://github.com/facebook/fbthrift/commit/c168b5eb6bbc0e0834cfd8f2c384935c8221edb3 https://github.com/facebook/folly/commit/75e0eae5e820246d97be46c7838b58241ae531ff https://github.com/facebook/mvfst/commit/f450070eb6d9e5b6933104785b477ad4f27f3038 https://github.com/facebook/proxygen/commit/d597e71a74ba09afa53be9918922cc63f85af0cf https://github.com/facebook/wangle/commit/87b7410a79d35a1da6dd8397cd28798d6ea3101d https://github.com/facebookexperimental/edencommon/commit/671ffedf06c9a9b3db08d3c2854cf70451bfe5df https://github.com/facebookexperimental/rust-shed/commit/fd25a7f8cd6e0c4f9a45e0be086397312a10f614 https://github.com/facebookincubator/fizz/commit/0a479539ed09832c6ba37981b0a5e5208df03ec3 Reviewed By: ajb85 fbshipit-source-id: e31045a5b37fc57124bb99a678b5466fedf36afc --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 597d998b790c..263995260d13 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 154eeba24016ff43eb11d7baf9becc60430e4cb1 +Subproject commit c168b5eb6bbc0e0834cfd8f2c384935c8221edb3 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 5cd259a6243f..d6cc05633648 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 73e22e0fdb9fe8ccd4198a14066fee11c6ad99db +Subproject commit 75e0eae5e820246d97be46c7838b58241ae531ff diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 963505f10a88..ee2a377406a4 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit bd4966085badf79bc694dd569f5e845d966d5712 +Subproject commit 87b7410a79d35a1da6dd8397cd28798d6ea3101d From 36fbc03fb21f550f0ce7906633600f8718a6ce2e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 20 May 2024 09:32:33 -0700 Subject: [PATCH 6941/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/d9fba1f232ba6528d9f107a01d7feb11dd50264e https://github.com/facebook/fb303/commit/db19cd07f8574235c4ce62698e4076bcf26b86a1 https://github.com/facebook/fbthrift/commit/8baf3aed99934494267647ee8f309f9d712d4325 https://github.com/facebook/folly/commit/89ac8453fc7825e566b46a7ebb9e0348b1c09338 https://github.com/facebook/mvfst/commit/77135caf4701edde9a63ee933934d57426373885 https://github.com/facebook/proxygen/commit/7db5a9e7a2b67e71cdca5d08086847ff4229d5ec https://github.com/facebook/wangle/commit/beeb9478a0321190791d9816f7ffe9a37d02d429 https://github.com/facebookexperimental/edencommon/commit/8730ad11106fc51ef044c66debebe6d0d0f57301 https://github.com/facebookexperimental/rust-shed/commit/79d628e3d4f9d670988ae498de5f120dea5482ea https://github.com/facebookincubator/fizz/commit/c5cb900f96355c9be0f41b77bcf7937a5909c9b3 Reviewed By: bigfootjon fbshipit-source-id: b148e77dbaed3dd246e7ad560455af9fbf2713d9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 263995260d13..246c35c81371 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c168b5eb6bbc0e0834cfd8f2c384935c8221edb3 +Subproject commit 8baf3aed99934494267647ee8f309f9d712d4325 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d6cc05633648..569b529dd924 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 75e0eae5e820246d97be46c7838b58241ae531ff +Subproject commit 89ac8453fc7825e566b46a7ebb9e0348b1c09338 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ee2a377406a4..18d96f415be6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 87b7410a79d35a1da6dd8397cd28798d6ea3101d +Subproject commit beeb9478a0321190791d9816f7ffe9a37d02d429 From 480068925063035dc7ae54b154b999574da3dadd Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 21 May 2024 09:32:00 -0700 Subject: [PATCH 6942/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/04880947eed618d1707b3935e4a5790c10a47cc6 https://github.com/facebook/fb303/commit/52ad3ba818bb123e83f2e169605bfa35632114d3 https://github.com/facebook/fbthrift/commit/71e9eb0d719f3cfb1859b6ff2ce33a5a0e32fe86 https://github.com/facebook/folly/commit/949ecec6e84eaa395c6a1fafc22fe8a8b59434dd https://github.com/facebook/mvfst/commit/ea2683359572e78571611761f105ea59812bf99b https://github.com/facebook/proxygen/commit/36a1f9b28c32be9b1ad5d9d16e09cf2c5dc2d061 https://github.com/facebook/wangle/commit/ea96fe0fa008c94dd347eb00b9d483ab67c170f0 https://github.com/facebookexperimental/edencommon/commit/f8fcaf9d1d96e801670991f058d2a8662b609538 https://github.com/facebookexperimental/rust-shed/commit/e2df19c6aa3eb7c1cb66b6b299979cbe3eb79c1d https://github.com/facebookincubator/fizz/commit/0b8009c8006b00d4a1e38ab2f364a28d1ef6d70e Reviewed By: bigfootjon fbshipit-source-id: f49e1ec630ed44440e5b73802e6b37c65c2e901f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 246c35c81371..0efe9a7727ee 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8baf3aed99934494267647ee8f309f9d712d4325 +Subproject commit 71e9eb0d719f3cfb1859b6ff2ce33a5a0e32fe86 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 569b529dd924..ee18d7b8a9ad 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 89ac8453fc7825e566b46a7ebb9e0348b1c09338 +Subproject commit 949ecec6e84eaa395c6a1fafc22fe8a8b59434dd diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 18d96f415be6..9b61b1bef3a6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit beeb9478a0321190791d9816f7ffe9a37d02d429 +Subproject commit ea96fe0fa008c94dd347eb00b9d483ab67c170f0 From c32127f92727df5093a9f560e1d83f4ea6241464 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 22 May 2024 09:32:22 -0700 Subject: [PATCH 6943/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/cab5ccb80c0681ff9560cabe76e756ea05d4c68d https://github.com/facebook/fb303/commit/305ab04da5ab1a77e63e9440c4743096207b75af https://github.com/facebook/fbthrift/commit/16252560e79afdefdb767d79eec099dc57463108 https://github.com/facebook/folly/commit/7b02fb1588239dc0c002faaf7a2520be7cd5a0bb https://github.com/facebook/mvfst/commit/3d41c001e0dd1caa77fef149f5e8dbe8edd49707 https://github.com/facebook/proxygen/commit/40ed24ac59f190900514a41f07539cc55e2406ab https://github.com/facebook/wangle/commit/ae5f19354a87cd4280e36b8e6446ca79a793def8 https://github.com/facebookexperimental/edencommon/commit/4762cea4d7ff27bf803e3c8ceba627042a148dec https://github.com/facebookexperimental/rust-shed/commit/34981bdac880b493abcd763f9b0455bd3d874872 https://github.com/facebookincubator/fizz/commit/3dc319486941a72b1c553a02da9ab5c145570f5d Reviewed By: bigfootjon fbshipit-source-id: 3de9540488178e172852d2ae337988a7b088e568 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0efe9a7727ee..41b6cfb77637 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 71e9eb0d719f3cfb1859b6ff2ce33a5a0e32fe86 +Subproject commit 16252560e79afdefdb767d79eec099dc57463108 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ee18d7b8a9ad..1774943feacb 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 949ecec6e84eaa395c6a1fafc22fe8a8b59434dd +Subproject commit 7b02fb1588239dc0c002faaf7a2520be7cd5a0bb diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9b61b1bef3a6..5a29d6cddb5b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ea96fe0fa008c94dd347eb00b9d483ab67c170f0 +Subproject commit ae5f19354a87cd4280e36b8e6446ca79a793def8 From 4dbbe632be09dbf441e8b3b2251234bcdebfaab0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 23 May 2024 09:32:29 -0700 Subject: [PATCH 6944/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/0bd1642ffbd94f520029ccdbd420758f2959f3a5 https://github.com/facebook/fb303/commit/aa2b58529069919f3787125485880cd8abfec2a3 https://github.com/facebook/fbthrift/commit/7c087b7ad59c01bf90238f6453c7d8831af886b9 https://github.com/facebook/folly/commit/df0d8d95ae7380b38ed40adadb85b2cb0e29599a https://github.com/facebook/mvfst/commit/24853da2fc387226e050ad13a499356050785fc8 https://github.com/facebook/proxygen/commit/2826f32ad0b036fd61c8c4aa2ab0a93269f79e06 https://github.com/facebook/wangle/commit/917d068f21cbd6d934b88578596cc4d561fe5917 https://github.com/facebookexperimental/edencommon/commit/d1b0145f06b0c1171eb15202974d45344a316a3b https://github.com/facebookexperimental/rust-shed/commit/bba4102c36912cedf50d9c9c7e20a327a3d04512 https://github.com/facebookincubator/fizz/commit/e4482e90de4d03a5100ce9163bd057daf16f64f3 Reviewed By: bigfootjon fbshipit-source-id: fc832196e1fd0c93ca35b73853e8c9d1e9721bc8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 41b6cfb77637..f167e8fc191f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 16252560e79afdefdb767d79eec099dc57463108 +Subproject commit 7c087b7ad59c01bf90238f6453c7d8831af886b9 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 1774943feacb..51cb64d5634e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7b02fb1588239dc0c002faaf7a2520be7cd5a0bb +Subproject commit df0d8d95ae7380b38ed40adadb85b2cb0e29599a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5a29d6cddb5b..b9e923ecd79e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ae5f19354a87cd4280e36b8e6446ca79a793def8 +Subproject commit 917d068f21cbd6d934b88578596cc4d561fe5917 From 40d58e38f7dfaf3ef041d4669b188218fee419c7 Mon Sep 17 00:00:00 2001 From: generatedunixname647790274085263 Date: Fri, 24 May 2024 05:30:52 -0700 Subject: [PATCH 6945/7387] Fix silently skipped async tests () Summary: When using `unittest.TestCase`, any coroutines that look like test cases won't be awaited properly, causing the test to pass immediately. This diff fixes these test cases by switching to `unittest.IsolatedAsyncioTestCase` which will start properly running these tests. I fully expect red signal on this diff, but will still land it, because a failing test is better than a silently skipped one. This diff was produced by: ``` sl go D57273213 cd fbcode arc lint --take FIXIT --paths-cmd 'hg files -I "**/*.py" | grep test' -a HG: manually revert unrelated fixit changes sl st | awk '{print $2}' | xargs pylot run fbcode//python/libcst/ codemod ensure_import_present.EnsureImportPresentCommand --module unittest --entity IsolatedAsyncioTestCase sl st | awk '{print $2}' | xargs pylot run fbcode//python/libcst/ codemod remove_unused_imports.RemoveUnusedImportsWithGlean HG: manually add back these unused imports unrelated to this change: P1370679492 HG: split the diff per oncall ./scripts/zsol/split.sh ``` Reviewed By: zsol Differential Revision: D57771371 fbshipit-source-id: f9120e9ec074a115b75773d23da3dcaf9b09b026 --- watchman/test/async/test_dead_socket.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/watchman/test/async/test_dead_socket.py b/watchman/test/async/test_dead_socket.py index ddeff27a1f0c..6a7d73dcbf02 100644 --- a/watchman/test/async/test_dead_socket.py +++ b/watchman/test/async/test_dead_socket.py @@ -8,6 +8,7 @@ import asyncio import os import unittest +from unittest import IsolatedAsyncioTestCase import pywatchman_aio import WatchmanInstance @@ -15,7 +16,7 @@ # Note this does not extend AsyncWatchmanTestCase as it wants to start its # own Watchman server instances per test. -class TestDeadSocket(unittest.TestCase): +class TestDeadSocket(IsolatedAsyncioTestCase): @unittest.skipIf(os.name == "nt", "not supported on windows") def test_query_dead_socket(self): async def test_core(wminst): From bd94bb2582f4c3b7580a081902fbdcf8019c2e8d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 24 May 2024 09:33:06 -0700 Subject: [PATCH 6946/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/39dbb88bf5a0a3243f4a4e55e555780206cb4125 https://github.com/facebook/fb303/commit/a828824cdbb84e354f90bcaa67b02ad1f2c25e9d https://github.com/facebook/fbthrift/commit/10a129cfa15ccdc6e9136a40945c1f12446bb1c0 https://github.com/facebook/folly/commit/3a8a307cd0ff054b8c8ef4dbbb9c86b31873fdb0 https://github.com/facebook/mvfst/commit/a6950e85dee2b06670ed0cf50b91798b7e2ce5b9 https://github.com/facebook/proxygen/commit/7865621bc018a57b7625f98e1cd40b0390a05059 https://github.com/facebook/wangle/commit/5981297b7be698d096f5eb85b3c1cc76e1dad55e https://github.com/facebookexperimental/edencommon/commit/13aeaf68ee75a4371813808a99d516c472bb56aa https://github.com/facebookexperimental/rust-shed/commit/a14d60d886e6f0915c3353b53db91e5bd334c5f8 https://github.com/facebookincubator/fizz/commit/430eade366669dc800387db32f994fb717c846b5 Reviewed By: bigfootjon fbshipit-source-id: f8d09968bb0d91f0704b568476670906da945a4b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f167e8fc191f..71bda025aacb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7c087b7ad59c01bf90238f6453c7d8831af886b9 +Subproject commit 10a129cfa15ccdc6e9136a40945c1f12446bb1c0 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 51cb64d5634e..aebe08cb6a0e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit df0d8d95ae7380b38ed40adadb85b2cb0e29599a +Subproject commit 3a8a307cd0ff054b8c8ef4dbbb9c86b31873fdb0 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b9e923ecd79e..55f29b3f1e22 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 917d068f21cbd6d934b88578596cc4d561fe5917 +Subproject commit 5981297b7be698d096f5eb85b3c1cc76e1dad55e From 7d7efc3c8c4d54f3f4646b3dfd19f6ac25a78db8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 25 May 2024 09:32:36 -0700 Subject: [PATCH 6947/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/0f14d88c8e36ef018c2d2c17e46cab250cd7c1ba https://github.com/facebook/fb303/commit/c1301b3ef8622f37e3e950da60ba509cb935a5d9 https://github.com/facebook/fbthrift/commit/96486e0316c28d5e90c16b4eebd8b890bdc52f59 https://github.com/facebook/folly/commit/945a193fcd15edaf83956bfad2f6a9a149fda6bb https://github.com/facebook/mvfst/commit/e839fd69fed6116865d477f8b0d8cfaf2ac39b5d https://github.com/facebook/proxygen/commit/d2702f976a07de0803d0e90127e814480de67dda https://github.com/facebook/wangle/commit/76ea509f967d3e90817855e521a58c02d454673d https://github.com/facebookexperimental/edencommon/commit/8da71a573c5ceb0d8c79bf976996b68fd31c0e1d https://github.com/facebookexperimental/rust-shed/commit/c849bc0d2c374e801f7532d99bb95a224d6f0f25 https://github.com/facebookincubator/fizz/commit/ad8f457fad9bb89b1f5543d7513c7ff37f7f76d0 Reviewed By: bigfootjon fbshipit-source-id: 6791e4485dd84c702c1755f98293b43198953ae9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 71bda025aacb..610a5f9cf3da 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 10a129cfa15ccdc6e9136a40945c1f12446bb1c0 +Subproject commit 96486e0316c28d5e90c16b4eebd8b890bdc52f59 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index aebe08cb6a0e..3511dce43bcd 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 3a8a307cd0ff054b8c8ef4dbbb9c86b31873fdb0 +Subproject commit 945a193fcd15edaf83956bfad2f6a9a149fda6bb diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 55f29b3f1e22..1321b7803607 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5981297b7be698d096f5eb85b3c1cc76e1dad55e +Subproject commit 76ea509f967d3e90817855e521a58c02d454673d From 2737c3acfb5b4fca5959c1d364f5132d32dbecad Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 26 May 2024 09:33:37 -0700 Subject: [PATCH 6948/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/97d61c73a399da946a38430fad765244f531a3e8 https://github.com/facebook/fbthrift/commit/3803919eed267652836ae7e59a8e4f16c230e711 https://github.com/facebook/folly/commit/f1f426d77cf354a80256d401a4928a08b1033f36 https://github.com/facebook/mvfst/commit/90ab1c1ccf166901eb60f1efce3af1480df9cf06 https://github.com/facebook/proxygen/commit/e7641fd6aa48b3658266a736387749bb22392d32 https://github.com/facebook/wangle/commit/d8ca83c809bbc890b93f11cb070f6ceb753aad70 https://github.com/facebookexperimental/edencommon/commit/f4bc597de9c4cf2fdcdb066a969b785529bb4f26 https://github.com/facebookexperimental/rust-shed/commit/b17c442dc0202c513bf33f312dcb5a6237f37cac https://github.com/facebookincubator/fizz/commit/e8f2b711f9293f8ba6d6f17a6ffe7cb1746a126a Reviewed By: bigfootjon fbshipit-source-id: e78d7bf9b738b2523ba107cc2e522da87be6760a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 610a5f9cf3da..850dfc1fdda9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 96486e0316c28d5e90c16b4eebd8b890bdc52f59 +Subproject commit 3803919eed267652836ae7e59a8e4f16c230e711 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 3511dce43bcd..5a4f6768d0fa 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 945a193fcd15edaf83956bfad2f6a9a149fda6bb +Subproject commit f1f426d77cf354a80256d401a4928a08b1033f36 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1321b7803607..43720cf9ffd3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 76ea509f967d3e90817855e521a58c02d454673d +Subproject commit d8ca83c809bbc890b93f11cb070f6ceb753aad70 From 52c5683b2e24e34d5ed93ed0087425669028f23f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 27 May 2024 09:31:39 -0700 Subject: [PATCH 6949/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/1eb290498ed50213d354e411f8d3192367d89526 https://github.com/facebook/fbthrift/commit/f408d11adf2b518358a7fa2cc86c3267354b33d0 https://github.com/facebook/mvfst/commit/98fde365c7670a67f31708e3ecf5e8f2210146b8 https://github.com/facebook/proxygen/commit/50cff2730d9ada9025918877fa015f66b8f409d6 https://github.com/facebook/wangle/commit/d98b70129390f67467abfb5ec81e501483a5666e https://github.com/facebookexperimental/edencommon/commit/62d4f1477e3aec5135aeea4bc2ac930bbd0f4bdb https://github.com/facebookexperimental/rust-shed/commit/fa3073bf1ca301534d7f97861d94d20349fa3969 https://github.com/facebookincubator/fizz/commit/8f6eb838ef20f7587b60867730642ca05f5ac3e1 Reviewed By: bigfootjon fbshipit-source-id: 28782820a89998c187382f28ae547c78beb93e62 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 850dfc1fdda9..3bbc91f63db3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3803919eed267652836ae7e59a8e4f16c230e711 +Subproject commit f408d11adf2b518358a7fa2cc86c3267354b33d0 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 43720cf9ffd3..228de6753a92 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d8ca83c809bbc890b93f11cb070f6ceb753aad70 +Subproject commit d98b70129390f67467abfb5ec81e501483a5666e From 560beaa736ec7fb9986451c320e51e7c15e1c3db Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 28 May 2024 09:33:48 -0700 Subject: [PATCH 6950/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/72e7b090d59eb315ff43c61019de5e60a127baf6 https://github.com/facebook/fb303/commit/3f8aea89937ceac777f5a5fb28fa1280ff3f277a https://github.com/facebook/fbthrift/commit/bc664cd54b990135947cf73b5728fce80de781b3 https://github.com/facebook/folly/commit/9bcbc8567e7358bd417465d98d2be1ad82666816 https://github.com/facebook/mvfst/commit/d00cd9cb2a845ae403f1bc7cfeee77b2e7ae49db https://github.com/facebook/proxygen/commit/4893905f4d63f752e6969e93578debfbe325ea7f https://github.com/facebook/wangle/commit/636e529b66622d5538c5a431200b59a98a638133 https://github.com/facebookexperimental/rust-shed/commit/56c05d734e7d5b080ca2f4c411809195de218b6b Reviewed By: namanahuja fbshipit-source-id: 4963ed6cc75fe80a8fe0eb422eb2f974f7405b9d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3bbc91f63db3..fa31285b81dc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f408d11adf2b518358a7fa2cc86c3267354b33d0 +Subproject commit bc664cd54b990135947cf73b5728fce80de781b3 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 5a4f6768d0fa..41c5e5814f2b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f1f426d77cf354a80256d401a4928a08b1033f36 +Subproject commit 9bcbc8567e7358bd417465d98d2be1ad82666816 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 228de6753a92..feb74f20f27f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d98b70129390f67467abfb5ec81e501483a5666e +Subproject commit 636e529b66622d5538c5a431200b59a98a638133 From a4d6aad6d424fc5467ddfea82b334a3b3e389281 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 29 May 2024 09:33:53 -0700 Subject: [PATCH 6951/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/3c0bc88928830c9cbc89bd64549b92b036ba0839 https://github.com/facebook/fb303/commit/fb88430a5a0ede52c7e1737a2689950963f66960 https://github.com/facebook/fbthrift/commit/1e3bf4cff9f1d8b682f8a2cf57deb91533c5e063 https://github.com/facebook/folly/commit/1d92f4017ecc80626628547f597f352a5bcf870e https://github.com/facebook/mvfst/commit/9a3a8a33cb859ceebcac5eb3ef3dca9ecf9d1c4b https://github.com/facebook/proxygen/commit/dc2522de3b536605b01a4dd16d3e1648e3823f79 https://github.com/facebook/wangle/commit/5748ee81890496ea716a3ce41e1122336d27dadb https://github.com/facebookexperimental/edencommon/commit/c1db1da557360d50b402ff2c66d6e1c54a9ebed1 https://github.com/facebookexperimental/rust-shed/commit/56ebaa636edd032be85ae7c2f530e78919c2290e https://github.com/facebookincubator/fizz/commit/8a72c44be10d22558b3bd16604d42c364ba1527a Reviewed By: namanahuja fbshipit-source-id: 9a9da5e78e4337564b1887ef1db0be1a8b63791b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index fa31285b81dc..eb39ae69ed9d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bc664cd54b990135947cf73b5728fce80de781b3 +Subproject commit 1e3bf4cff9f1d8b682f8a2cf57deb91533c5e063 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 41c5e5814f2b..aaa8362d260e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9bcbc8567e7358bd417465d98d2be1ad82666816 +Subproject commit 1d92f4017ecc80626628547f597f352a5bcf870e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index feb74f20f27f..e7b3144a97e3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 636e529b66622d5538c5a431200b59a98a638133 +Subproject commit 5748ee81890496ea716a3ce41e1122336d27dadb From aca1d5f98a7faedf16ab09340f4ac76ddf1b7847 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 30 May 2024 09:32:01 -0700 Subject: [PATCH 6952/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/d0f31fd547ac9edbe29b5dba3e3850aba5b102f1 https://github.com/facebook/fb303/commit/c2836e2e83e98efbdd406c925a2cb19d3d8fac0f https://github.com/facebook/fbthrift/commit/0a8f857e877f62ef818a39e91bf0e6f817d41e44 https://github.com/facebook/folly/commit/6a9e081bc58bf9a77376ce79c5fc7f642249afe8 https://github.com/facebook/mvfst/commit/e58cc1037337c95788c71097aa23b8a3d3192415 https://github.com/facebook/proxygen/commit/7e15e82fa0c43dabe7d11e0a37b68d2cda9e6372 https://github.com/facebook/wangle/commit/e824a8513b21ba0474fe6358b22d518bc588c7a7 https://github.com/facebookexperimental/edencommon/commit/c4658277baa7df97520c60aa505816e25a8c4556 https://github.com/facebookexperimental/rust-shed/commit/d02f571cd5d5bcf127dfd6331d766abb03e3da66 https://github.com/facebookincubator/fizz/commit/6a7321c406ee7bc8bc0e1d1cc42cb9f063318a0b Reviewed By: namanahuja fbshipit-source-id: a9262d09ded5e3f875e18ad45be1879e4841abca --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index eb39ae69ed9d..cec3f62ccf26 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1e3bf4cff9f1d8b682f8a2cf57deb91533c5e063 +Subproject commit 0a8f857e877f62ef818a39e91bf0e6f817d41e44 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index aaa8362d260e..ad25ea106255 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1d92f4017ecc80626628547f597f352a5bcf870e +Subproject commit 6a9e081bc58bf9a77376ce79c5fc7f642249afe8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e7b3144a97e3..e46441c34abe 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5748ee81890496ea716a3ce41e1122336d27dadb +Subproject commit e824a8513b21ba0474fe6358b22d518bc588c7a7 From 88a5e4279362a83ad5efc0d785422df8741062a3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 31 May 2024 09:32:18 -0700 Subject: [PATCH 6953/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/f14410f0bc45fd1c53eb56698fb5bcfac42758f7 https://github.com/facebook/fb303/commit/17976a6492a1b923a5cebb9b1d0003c24703ffd4 https://github.com/facebook/fbthrift/commit/b0901104ac78a24cbc2e017498035329327b76be https://github.com/facebook/folly/commit/4a96830b790513091f78aee6cc943a669713e855 https://github.com/facebook/mvfst/commit/433d82d61413e323a553ab4586727017577a4d23 https://github.com/facebook/proxygen/commit/9c5b517d6dcf8884c17e73e45458f2823734471e https://github.com/facebook/wangle/commit/8d32d1bf554777d9fde3eb2fb1019c2b51209a14 https://github.com/facebookexperimental/edencommon/commit/8e50a2ee6169c4d9ec39a0bb7c3c6f61b033994f https://github.com/facebookexperimental/rust-shed/commit/e1cd2048f28c7a04bbd7f597b07b8e16206ffbf8 https://github.com/facebookincubator/fizz/commit/824cbbe249ebb944edb97e348caea91a4d2ee750 Reviewed By: namanahuja fbshipit-source-id: 6a32b88b628eab7a8d8e75ec93ad270658c9f3eb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cec3f62ccf26..5aa6692d3756 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0a8f857e877f62ef818a39e91bf0e6f817d41e44 +Subproject commit b0901104ac78a24cbc2e017498035329327b76be diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ad25ea106255..620229d4ccdc 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 6a9e081bc58bf9a77376ce79c5fc7f642249afe8 +Subproject commit 4a96830b790513091f78aee6cc943a669713e855 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e46441c34abe..20b2946e7cf4 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e824a8513b21ba0474fe6358b22d518bc588c7a7 +Subproject commit 8d32d1bf554777d9fde3eb2fb1019c2b51209a14 From cac001ac1f6c7ed81f1b28ce0bbf0f152e79599b Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Sat, 1 Jun 2024 07:29:20 -0700 Subject: [PATCH 6954/7387] --shared-libs should be a common argument Summary: X-link: https://github.com/facebookincubator/zstrong/pull/848 Because it should work with `show-inst-dir`, otherwise we can't calculate the right project hash. Reviewed By: chadaustin Differential Revision: D58011867 fbshipit-source-id: d8960b4a993efbada8e27584e56976279fcd6b43 --- build/fbcode_builder/getdeps.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 890d0e74d8a4..014105f3bdf4 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -810,12 +810,6 @@ def setup_project_cmd_parser(self, parser): ), action="append", ) - parser.add_argument( - "--shared-libs", - help="Build shared libraries if possible", - action="store_true", - default=False, - ) parser.add_argument( "--free-up-disk", help="Remove unused tools and clean up intermediate files if possible to maximise space for the build", @@ -1326,6 +1320,12 @@ def add_common_arg(*args, **kwargs): action="store_false", dest="facebook_internal", ) + add_common_arg( + "--shared-libs", + help="Build shared libraries if possible", + action="store_true", + default=False, + ) add_common_arg( "--allow-system-packages", help="Allow satisfying third party deps from installed system packages", From 5aa6c5c49ec8ee0b13a66451ce8fa970dc89115e Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Sat, 1 Jun 2024 08:15:42 -0700 Subject: [PATCH 6955/7387] Add a flag only_install to omit the plain `make` step Summary: X-link: https://github.com/facebookincubator/zstrong/pull/849 Needed for installing ghc binaries, which have an autoconf-based distribution that only supports `make install`, not `make`. Reviewed By: chadaustin Differential Revision: D58011865 fbshipit-source-id: db7c3cc45701201466a6b2853c5f3515b178fa74 --- build/fbcode_builder/getdeps/builder.py | 4 +++- build/fbcode_builder/getdeps/manifest.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 8de30f73e473..2ff40aae1e9e 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -362,7 +362,9 @@ def _build(self, install_dirs, reconfigure) -> None: self._run_cmd(["autoreconf", "-ivf"], cwd=self.src_dir, env=env) configure_cmd = [configure_path, "--prefix=" + self.inst_dir] + self.args self._run_cmd(configure_cmd, env=env) - self._run_cmd([self._make_binary, "-j%s" % self.num_jobs], env=env) + only_install = self.manifest.get("build", "only_install", "false", ctx=self.ctx) + if not only_install: + self._run_cmd([self._make_binary, "-j%s" % self.num_jobs], env=env) self._run_cmd([self._make_binary, "install"], env=env) diff --git a/build/fbcode_builder/getdeps/manifest.py b/build/fbcode_builder/getdeps/manifest.py index eab64c95bb8d..16dac6b3948d 100644 --- a/build/fbcode_builder/getdeps/manifest.py +++ b/build/fbcode_builder/getdeps/manifest.py @@ -64,6 +64,7 @@ "subdir": OPTIONAL, "make_binary": OPTIONAL, "build_in_src_dir": OPTIONAL, + "only_install": OPTIONAL, "job_weight_mib": OPTIONAL, "patchfile": OPTIONAL, "patchfile_opts": OPTIONAL, From 080af956414cee60b0fb3e68439fa30150a43966 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Sat, 1 Jun 2024 08:15:42 -0700 Subject: [PATCH 6956/7387] Add ghc (#850) Summary: Pull Request resolved: https://github.com/facebookincubator/zstrong/pull/850 Reviewed By: markbt Differential Revision: D58011866 fbshipit-source-id: 3c6a8443f7fd9c512837d27162a2399c21eb243c --- build/fbcode_builder/manifests/ghc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 build/fbcode_builder/manifests/ghc diff --git a/build/fbcode_builder/manifests/ghc b/build/fbcode_builder/manifests/ghc new file mode 100644 index 000000000000..0e452195c21d --- /dev/null +++ b/build/fbcode_builder/manifests/ghc @@ -0,0 +1,15 @@ +[manifest] +name = ghc + +[download.os=linux] +url = https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-fedora27-linux.tar.xz +sha256 = b6ed67049a23054a8042e65c9976d5e196e5ee4e83b29b2ee35c8a22ab1e5b73 + +[build] +builder = autoconf +subdir = ghc-8.10.7 +build_in_src_dir = true +only_install = true + +[make.install_args] +install From 5282d0636f9039f8bbbe8c0dd18332e38ae5f353 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 1 Jun 2024 09:32:46 -0700 Subject: [PATCH 6957/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/6ed9232c372ee58f23f31a465ee64047ade74169 https://github.com/facebook/fb303/commit/9b5a5f3b91d3445419628f6958f8e5f9e84b6b46 https://github.com/facebook/fbthrift/commit/51bc3104dd54ae0bb80210e417d1eacc5e7a5989 https://github.com/facebook/folly/commit/93bb6d06fec49ae7a56be5f8eec66c356028fe7d https://github.com/facebook/mvfst/commit/554c94acdd404f6bf6f1c8ce05448db5ba5f9a96 https://github.com/facebook/proxygen/commit/343db73eabe6a4352c9734bfcaa91d9498f15222 https://github.com/facebook/wangle/commit/ce1e98cb46bcbcac47fb4b226d93bf8e53094e2f https://github.com/facebookexperimental/edencommon/commit/bdd6748988b0c2ee4fa32398983514865dad757d https://github.com/facebookexperimental/rust-shed/commit/31a8db9294e99bc424e5fde4dc4426ced37bd062 https://github.com/facebookincubator/fizz/commit/6e67555602f093698b3ee3261a3b02510cd28402 Reviewed By: namanahuja fbshipit-source-id: 338c6322939c9185ca4d330d500ce09c42d2f73f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5aa6692d3756..b48b49ddbc8f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b0901104ac78a24cbc2e017498035329327b76be +Subproject commit 51bc3104dd54ae0bb80210e417d1eacc5e7a5989 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 620229d4ccdc..2dac097f710e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 4a96830b790513091f78aee6cc943a669713e855 +Subproject commit 93bb6d06fec49ae7a56be5f8eec66c356028fe7d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 20b2946e7cf4..916694ba203c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8d32d1bf554777d9fde3eb2fb1019c2b51209a14 +Subproject commit ce1e98cb46bcbcac47fb4b226d93bf8e53094e2f From 9e0fed19c1c8152ea270ad46a6e19c17643ccd2c Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Sat, 1 Jun 2024 19:18:00 -0700 Subject: [PATCH 6958/7387] Add cabal (#851) Summary: Pull Request resolved: https://github.com/facebookincubator/zstrong/pull/851 Reviewed By: markbt Differential Revision: D58012216 fbshipit-source-id: 2143ba626421f7b6048e9e2ce3522aac614a8b72 --- build/fbcode_builder/manifests/cabal | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 build/fbcode_builder/manifests/cabal diff --git a/build/fbcode_builder/manifests/cabal b/build/fbcode_builder/manifests/cabal new file mode 100644 index 000000000000..1405b8bc8f06 --- /dev/null +++ b/build/fbcode_builder/manifests/cabal @@ -0,0 +1,12 @@ +[manifest] +name = cabal + +[download.os=linux] +url = https://downloads.haskell.org/~cabal/cabal-install-3.6.2.0/cabal-install-3.6.2.0-x86_64-linux-deb10.tar.xz +sha256 = 4759b56e9257e02f29fa374a6b25d6cb2f9d80c7e3a55d4f678a8e570925641c + +[build] +builder = nop + +[install.files] +cabal = bin/cabal From 6d7dc327ae0b6659724c13caaffe5f131e5a2cb5 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Sat, 1 Jun 2024 19:18:00 -0700 Subject: [PATCH 6959/7387] Fix --use-shipit Summary: X-link: https://github.com/facebookincubator/zstrong/pull/852 It was using the old PHP shipit script Reviewed By: chadaustin Differential Revision: D58013009 fbshipit-source-id: 97f0c31b897c04217ca5dd62fbe6cc2a55d280c8 --- build/fbcode_builder/getdeps/fetcher.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/getdeps/fetcher.py b/build/fbcode_builder/getdeps/fetcher.py index f02dd447bf75..c4775cf48923 100644 --- a/build/fbcode_builder/getdeps/fetcher.py +++ b/build/fbcode_builder/getdeps/fetcher.py @@ -588,7 +588,7 @@ def get_src_dir(self): class ShipitTransformerFetcher(Fetcher): - SHIPIT = "/var/www/scripts/opensource/shipit/run_shipit.php" + SHIPIT = "/var/www/scripts/opensource/codesync" def __init__(self, build_options, project_name) -> None: self.build_options = build_options @@ -614,12 +614,13 @@ def run_shipit(self) -> None: try: if os.path.exists(tmp_path): shutil.rmtree(tmp_path) + os.makedirs(os.path.dirname(tmp_path), exist_ok=True) # Run shipit run_cmd( [ - "php", ShipitTransformerFetcher.SHIPIT, + "shipit", "--project=" + self.project_name, "--create-new-repo", "--source-repo-dir=" + self.build_options.fbsource_dir, @@ -628,7 +629,6 @@ def run_shipit(self) -> None: "--skip-source-pull", "--skip-source-clean", "--skip-push", - "--skip-reset", "--destination-use-anonymous-https", "--create-new-repo-output-path=" + tmp_path, ] From cbaf758a6be4ddf7d4412f5cb50ddc8440da8686 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 2 Jun 2024 09:32:04 -0700 Subject: [PATCH 6960/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/4243b6f98f8d951097567cb4b1fb96d0214fb358 https://github.com/facebook/fbthrift/commit/93e7a65a6b3f0eb2df26e871e0f13419e66fc73d https://github.com/facebook/folly/commit/aea9be346324528157f506c943baea1d849c4c81 https://github.com/facebook/mvfst/commit/b71ab0ecd6067f88d6269bff2e8d9fb1084abc72 https://github.com/facebook/proxygen/commit/f57c1ad880f801483d59094f2924e83719891a7a https://github.com/facebook/wangle/commit/a24d55c4a9424a93de8fa77ca423d0ff18842071 https://github.com/facebookexperimental/edencommon/commit/901ff933f7d4ee787187b3cf49f25ef4d7ee0aef https://github.com/facebookexperimental/rust-shed/commit/00e7f6d2af4d3c3f50bb0c8bcd9af01b1faa772a https://github.com/facebookincubator/fizz/commit/0e1763e07c02c102572bbeab0900c9c34349bfe1 Reviewed By: namanahuja fbshipit-source-id: f999a9a36cdb74e9e4adc6f19d0a4550b9db0a7c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b48b49ddbc8f..9f807e66dd4e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 51bc3104dd54ae0bb80210e417d1eacc5e7a5989 +Subproject commit 93e7a65a6b3f0eb2df26e871e0f13419e66fc73d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 2dac097f710e..80b84985e006 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 93bb6d06fec49ae7a56be5f8eec66c356028fe7d +Subproject commit aea9be346324528157f506c943baea1d849c4c81 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 916694ba203c..06e552c8ee72 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ce1e98cb46bcbcac47fb4b226d93bf8e53094e2f +Subproject commit a24d55c4a9424a93de8fa77ca423d0ff18842071 From 28d21da5815e53a15ce76c1adefac646b679c8b9 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Sun, 2 Jun 2024 16:05:31 -0700 Subject: [PATCH 6961/7387] Add xxhash Summary: X-link: https://github.com/facebookincubator/zstrong/pull/854 This will only work with `--allow-system-packages`, but that's enough for the Glean use case. Reviewed By: pepeiborra Differential Revision: D58055451 fbshipit-source-id: 2b6323e4fe81095c80a02ad9dc49c1f374fed5d5 --- build/fbcode_builder/manifests/xxhash | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 build/fbcode_builder/manifests/xxhash diff --git a/build/fbcode_builder/manifests/xxhash b/build/fbcode_builder/manifests/xxhash new file mode 100644 index 000000000000..0af55726c12c --- /dev/null +++ b/build/fbcode_builder/manifests/xxhash @@ -0,0 +1,5 @@ +[manifest] +name = xxhash + +[rpms] +xxhash-devel From 41e2875b0fec46fa408bbde6c65996f9179e6fd2 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Sun, 2 Jun 2024 16:05:31 -0700 Subject: [PATCH 6962/7387] Add per-project use-shipit flag Summary: X-link: https://github.com/facebookincubator/zstrong/pull/853 For projects that can't use the simple shipit transformer (e.g. hsthrift) and projects where it would be a pain to duplicate the shipit config (e.g. Glean). Reviewed By: pepeiborra Differential Revision: D58055453 fbshipit-source-id: f693a320f42cfccd9808306b4ad8b1f31ce00f97 --- build/fbcode_builder/getdeps/manifest.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/fbcode_builder/getdeps/manifest.py b/build/fbcode_builder/getdeps/manifest.py index 16dac6b3948d..75a59faf80b4 100644 --- a/build/fbcode_builder/getdeps/manifest.py +++ b/build/fbcode_builder/getdeps/manifest.py @@ -45,6 +45,7 @@ "fbsource_path": OPTIONAL, "shipit_project": OPTIONAL, "shipit_fbcode_builder": OPTIONAL, + "use_shipit": OPTIONAL, }, }, "dependencies": {"optional_section": True, "allow_values": False}, @@ -396,8 +397,9 @@ def get_repo_url(self, ctx): return self.get("git", "repo_url", ctx=ctx) def create_fetcher(self, build_options, ctx): - use_real_shipit = ( - ShipitTransformerFetcher.available() and build_options.use_shipit + use_real_shipit = ShipitTransformerFetcher.available() and ( + build_options.use_shipit + or self.get("manifest", "use_shipit", defval="false", ctx=ctx) == "true" ) if ( not use_real_shipit From 13d4454123e6321408ba1610e4caa4f49863409f Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Mon, 3 Jun 2024 01:46:35 -0700 Subject: [PATCH 6963/7387] enable more brew system deps Summary: X-link: https://github.com/facebook/folly/pull/2219 Save a bit of time on each github build. Enable homebrew system deps for fmt, gflags, glog, googletest, snappy Reviewed By: chadaustin Differential Revision: D57967014 fbshipit-source-id: 286ba96fb384e1b5e8f4e97160af2b801e458aef --- build/fbcode_builder/manifests/fmt | 3 +++ build/fbcode_builder/manifests/gflags | 3 +++ build/fbcode_builder/manifests/glog | 3 +++ build/fbcode_builder/manifests/googletest | 3 +++ build/fbcode_builder/manifests/snappy | 3 +++ 5 files changed, 15 insertions(+) diff --git a/build/fbcode_builder/manifests/fmt b/build/fbcode_builder/manifests/fmt index eb79496e3d99..9bc0800e5c89 100644 --- a/build/fbcode_builder/manifests/fmt +++ b/build/fbcode_builder/manifests/fmt @@ -12,3 +12,6 @@ subdir = fmt-9.1.0 [cmake.defines] FMT_TEST = OFF FMT_DOC = OFF + +[homebrew] +fmt diff --git a/build/fbcode_builder/manifests/gflags b/build/fbcode_builder/manifests/gflags index a6af8ba2455d..7c26690aa905 100644 --- a/build/fbcode_builder/manifests/gflags +++ b/build/fbcode_builder/manifests/gflags @@ -15,5 +15,8 @@ BUILD_STATIC_LIBS = ON #BUILD_gflags_nothreads_LIB = OFF BUILD_gflags_LIB = ON +[homebrew] +gflags + [debs] libgflags-dev diff --git a/build/fbcode_builder/manifests/glog b/build/fbcode_builder/manifests/glog index 5c60527ed0d4..b72836d2c8a8 100644 --- a/build/fbcode_builder/manifests/glog +++ b/build/fbcode_builder/manifests/glog @@ -21,5 +21,8 @@ WITH_PKGCONFIG=ON HAVE_TR1_UNORDERED_MAP=OFF HAVE_TR1_UNORDERED_SET=OFF +[homebrew] +glog + [debs] libgoogle-glog-dev diff --git a/build/fbcode_builder/manifests/googletest b/build/fbcode_builder/manifests/googletest index 90b05c635fbc..ffbfc233c9e6 100644 --- a/build/fbcode_builder/manifests/googletest +++ b/build/fbcode_builder/manifests/googletest @@ -17,6 +17,9 @@ gtest_force_shared_crt=ON [cmake.defines.os=windows] BUILD_SHARED_LIBS=ON +[homebrew] +googletest + # packaged googletest is too old [debs.not(all(distro=ubuntu,any(distro_vers="18.04",distro_vers="20.04",distro_vers="22.04")))] libgtest-dev diff --git a/build/fbcode_builder/manifests/snappy b/build/fbcode_builder/manifests/snappy index c4517efa24d0..b184c2aa74c9 100644 --- a/build/fbcode_builder/manifests/snappy +++ b/build/fbcode_builder/manifests/snappy @@ -1,6 +1,9 @@ [manifest] name = snappy +[homebrew] +snappy + [debs] libsnappy-dev From 57f736ea77cee1fbae9707c99f4ad0cd86c00dd0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 3 Jun 2024 09:34:26 -0700 Subject: [PATCH 6964/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/2ddd6aba9a625ba66e5028cb3444c8d37abd834e https://github.com/facebook/fb303/commit/b3bb21a08a9ece59447adecd1e784fce780c2f66 https://github.com/facebook/fbthrift/commit/e38e4a90339d119850e97f5dedbe9ce57a89c652 https://github.com/facebook/folly/commit/d186b261aaeddfbd15fcf16bac78ae2f5d851204 https://github.com/facebook/mvfst/commit/98db1707c5088be6c02624ca2122eeade155d2f3 https://github.com/facebook/proxygen/commit/c8e6b399bce16094208ecd0c1549999f5ed3aafa https://github.com/facebook/wangle/commit/29ebd8a36f6400dd06f46a6d37934ec9bbb56d47 https://github.com/facebookexperimental/edencommon/commit/8a2b29de91bb6203bca44b09c200e441648fe0fe https://github.com/facebookexperimental/rust-shed/commit/b04edb61dca3e5a15eeb71ecf9f81df7fe49eca6 https://github.com/facebookincubator/fizz/commit/028654e0eba4202d53a3d93a0ba73c57dd3b9f1b Reviewed By: namanahuja fbshipit-source-id: 8863d87c4baa7b63631cad3c3deac7d5d8852060 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9f807e66dd4e..7da470a1acb1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 93e7a65a6b3f0eb2df26e871e0f13419e66fc73d +Subproject commit e38e4a90339d119850e97f5dedbe9ce57a89c652 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 80b84985e006..039aadd08a16 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit aea9be346324528157f506c943baea1d849c4c81 +Subproject commit d186b261aaeddfbd15fcf16bac78ae2f5d851204 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 06e552c8ee72..81fe63cccf72 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a24d55c4a9424a93de8fa77ca423d0ff18842071 +Subproject commit 29ebd8a36f6400dd06f46a6d37934ec9bbb56d47 From ba1eb7da655c199bb79d55f4f3c0273bde66ba48 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Mon, 3 Jun 2024 16:10:36 -0700 Subject: [PATCH 6965/7387] Use codesync from fbcode if /var/www is not available (#855) Summary: Pull Request resolved: https://github.com/facebookincubator/zstrong/pull/855 Reviewed By: chadaustin Differential Revision: D58055452 fbshipit-source-id: a58817e6e81db73462947f8dc286eaacb7e18c54 --- build/fbcode_builder/getdeps/fetcher.py | 28 ++++++++++++++++++++---- build/fbcode_builder/getdeps/manifest.py | 5 +++-- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/build/fbcode_builder/getdeps/fetcher.py b/build/fbcode_builder/getdeps/fetcher.py index c4775cf48923..b2f916fbb1df 100644 --- a/build/fbcode_builder/getdeps/fetcher.py +++ b/build/fbcode_builder/getdeps/fetcher.py @@ -588,12 +588,29 @@ def get_src_dir(self): class ShipitTransformerFetcher(Fetcher): - SHIPIT = "/var/www/scripts/opensource/codesync" + @classmethod + def _shipit_paths(cls, build_options): + www_path = ["/var/www/scripts/opensource/codesync"] + if build_options.fbsource_dir: + fbcode_path = [ + os.path.join( + build_options.fbsource_dir, + "fbcode/opensource/codesync/codesync-cli/codesync", + ) + ] + else: + fbcode_path = [] + return www_path + fbcode_path def __init__(self, build_options, project_name) -> None: self.build_options = build_options self.project_name = project_name self.repo_dir = os.path.join(build_options.scratch_dir, "shipit", project_name) + self.shipit = None + for path in ShipitTransformerFetcher._shipit_paths(build_options): + if os.path.exists(path): + self.shipit = path + break def update(self) -> ChangeStatus: if os.path.exists(self.repo_dir): @@ -606,8 +623,11 @@ def clean(self) -> None: shutil.rmtree(self.repo_dir) @classmethod - def available(cls): - return os.path.exists(cls.SHIPIT) + def available(cls, build_options): + return any( + os.path.exists(path) + for path in ShipitTransformerFetcher._shipit_paths(build_options) + ) def run_shipit(self) -> None: tmp_path = self.repo_dir + ".new" @@ -619,7 +639,7 @@ def run_shipit(self) -> None: # Run shipit run_cmd( [ - ShipitTransformerFetcher.SHIPIT, + self.shipit, "shipit", "--project=" + self.project_name, "--create-new-repo", diff --git a/build/fbcode_builder/getdeps/manifest.py b/build/fbcode_builder/getdeps/manifest.py index 75a59faf80b4..ad648937f241 100644 --- a/build/fbcode_builder/getdeps/manifest.py +++ b/build/fbcode_builder/getdeps/manifest.py @@ -397,7 +397,8 @@ def get_repo_url(self, ctx): return self.get("git", "repo_url", ctx=ctx) def create_fetcher(self, build_options, ctx): - use_real_shipit = ShipitTransformerFetcher.available() and ( + real_shipit_available = ShipitTransformerFetcher.available(build_options) + use_real_shipit = real_shipit_available and ( build_options.use_shipit or self.get("manifest", "use_shipit", defval="false", ctx=ctx) == "true" ) @@ -413,7 +414,7 @@ def create_fetcher(self, build_options, ctx): self.fbsource_path and build_options.fbsource_dir and self.shipit_project - and ShipitTransformerFetcher.available() + and real_shipit_available ): # We can use the code from fbsource return ShipitTransformerFetcher(build_options, self.shipit_project) From c3015d4e961b421584e681c76942a768f5555517 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Mon, 3 Jun 2024 16:10:36 -0700 Subject: [PATCH 6966/7387] Subprojects support Summary: X-link: https://github.com/facebookincubator/zstrong/pull/857 Where one project should be checked out in a subdirectory of another project. Like git submodules. This is how the Glean build currently works: hsthrift is a separate git repo, but Glean builds with hsthrift checked out in a subdirectory. Reviewed By: chadaustin Differential Revision: D58055066 fbshipit-source-id: 1a22abaa8c5261c40b752d685a03d01625215b12 --- build/fbcode_builder/getdeps/fetcher.py | 33 ++++++++++++++++++++++++ build/fbcode_builder/getdeps/load.py | 2 +- build/fbcode_builder/getdeps/manifest.py | 17 +++++++++++- 3 files changed, 50 insertions(+), 2 deletions(-) diff --git a/build/fbcode_builder/getdeps/fetcher.py b/build/fbcode_builder/getdeps/fetcher.py index b2f916fbb1df..30cff5b7d99b 100644 --- a/build/fbcode_builder/getdeps/fetcher.py +++ b/build/fbcode_builder/getdeps/fetcher.py @@ -587,6 +587,39 @@ def get_src_dir(self): return self.repo_dir +class SubFetcher(Fetcher): + """Fetcher for a project with subprojects""" + + def __init__(self, base, subs) -> None: + self.base = base + self.subs = subs + + def update(self) -> ChangeStatus: + base = self.base.update() + changed = base.build_changed() or base.sources_changed() + for fetcher, dir in self.subs: + stat = fetcher.update() + if stat.build_changed() or stat.sources_changed(): + changed = True + link = self.base.get_src_dir() + "/" + dir + if not os.path.exists(link): + os.symlink(fetcher.get_src_dir(), link) + return ChangeStatus(changed) + + def clean(self) -> None: + self.base.clean() + for fetcher, _ in self.subs: + fetcher.clean() + + def hash(self) -> None: + hash = self.base.hash() + for fetcher, _ in self.subs: + hash += fetcher.hash() + + def get_src_dir(self): + return self.base.get_src_dir() + + class ShipitTransformerFetcher(Fetcher): @classmethod def _shipit_paths(cls, build_options): diff --git a/build/fbcode_builder/getdeps/load.py b/build/fbcode_builder/getdeps/load.py index c737142d063e..7460ac55f459 100644 --- a/build/fbcode_builder/getdeps/load.py +++ b/build/fbcode_builder/getdeps/load.py @@ -251,7 +251,7 @@ def create_fetcher(self, manifest): return override ctx = self.ctx_gen.get_context(manifest.name) - return manifest.create_fetcher(self.build_opts, ctx) + return manifest.create_fetcher(self.build_opts, self, ctx) def get_project_hash(self, manifest): h = self._project_hashes.get(manifest.name) diff --git a/build/fbcode_builder/getdeps/manifest.py b/build/fbcode_builder/getdeps/manifest.py index ad648937f241..af63cde6c0c2 100644 --- a/build/fbcode_builder/getdeps/manifest.py +++ b/build/fbcode_builder/getdeps/manifest.py @@ -30,6 +30,7 @@ PreinstalledNopFetcher, ShipitTransformerFetcher, SimpleShipitTransformerFetcher, + SubFetcher, SystemPackageFetcher, ) from .py_wheel_builder import PythonWheelBuilder @@ -105,6 +106,7 @@ "shipit.pathmap": {"optional_section": True}, "shipit.strip": {"optional_section": True}, "install.files": {"optional_section": True}, + "subprojects": {"optional_section": True}, # fb-only "sandcastle": {"optional_section": True, "fields": {"run_tests": OPTIONAL}}, } @@ -396,7 +398,7 @@ def _is_satisfied_by_preinstalled_environment(self, ctx): def get_repo_url(self, ctx): return self.get("git", "repo_url", ctx=ctx) - def create_fetcher(self, build_options, ctx): + def _create_fetcher(self, build_options, ctx): real_shipit_available = ShipitTransformerFetcher.available(build_options) use_real_shipit = real_shipit_available and ( build_options.use_shipit @@ -456,6 +458,19 @@ def create_fetcher(self, build_options, ctx): "project %s has no fetcher configuration matching %s" % (self.name, ctx) ) + def create_fetcher(self, build_options, loader, ctx): + fetcher = self._create_fetcher(build_options, ctx) + subprojects = self.get_section_as_ordered_pairs("subprojects", ctx) + if subprojects: + subs = [] + for project, subdir in subprojects: + submanifest = loader.load_manifest(project) + subfetcher = submanifest.create_fetcher(build_options, loader, ctx) + subs.append((subfetcher, subdir)) + return SubFetcher(fetcher, subs) + else: + return fetcher + def get_builder_name(self, ctx): builder = self.get("build", "builder", ctx=ctx) if not builder: From 067252e00bb111fc199daf6aeb7e6572613a153b Mon Sep 17 00:00:00 2001 From: Cody Ohlsen Date: Mon, 3 Jun 2024 16:29:22 -0700 Subject: [PATCH 6967/7387] airstore: remove getdeps manifest, getdeps sandcastle integration Summary: X-link: https://github.com/facebook/fb303/pull/51 X-link: https://github.com/facebook/folly/pull/2220 X-link: https://github.com/facebook/proxygen/pull/501 X-link: https://github.com/facebook/wangle/pull/233 X-link: https://github.com/facebookexperimental/rust-shed/pull/54 X-link: https://github.com/facebookincubator/hsthrift/pull/132 X-link: https://github.com/facebookincubator/zstrong/pull/846 Reviewed By: jamestaylr Differential Revision: D57985865 fbshipit-source-id: cd99755a533ee297365b74204a0ed10180ce4b80 --- build/fbcode_builder/manifests/airstore | 38 ------------------------- 1 file changed, 38 deletions(-) delete mode 100644 build/fbcode_builder/manifests/airstore diff --git a/build/fbcode_builder/manifests/airstore b/build/fbcode_builder/manifests/airstore deleted file mode 100644 index 21401c55ad2f..000000000000 --- a/build/fbcode_builder/manifests/airstore +++ /dev/null @@ -1,38 +0,0 @@ -[manifest] -name = airstore -fbsource_path = fbcode/fair_infra/data/airstore/ -shipit_project = AIRStore -shipit_fbcode_builder = true - -[git] -repo_url = https://github.com/fairinternal/AIRStore.git - -[build.os=linux] -builder = cmake - -[build.not(os=linux)] -# We only support Linux -builder = nop - -[dependencies] -libcurl -fizz -fmt -fbthrift -folly -googletest -libsodium -libevent -double-conversion -proxygen -wangle -zstd -zlib -xz - -[shipit.pathmap] -fbcode/fair_infra/data/airstore = . -fbcode/deeplearning/projects/fairstore/cpp = deeplearning/projects/fairstore/cpp -fbcode/proxygen/lib/utils = proxygen/lib/utils - -[shipit.strip] From a08d0d930d60e15313f3df8099aff45b88f1e42b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 4 Jun 2024 09:31:24 -0700 Subject: [PATCH 6968/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/1f8c948247529d80f07a84b0ad67d10015c4c406 https://github.com/facebook/fb303/commit/d1543ca1aa63e80b46bba91115775963b6c914a4 https://github.com/facebook/fbthrift/commit/22a6be344d798f8f0f36d08a4f85debd44d08723 https://github.com/facebook/folly/commit/b9d11e6a47df09295ac597fb219b86344f52e597 https://github.com/facebook/mvfst/commit/80775ce6fd80018494ec0e24c031cc951d156862 https://github.com/facebook/proxygen/commit/2ae3f94418323afaf05ccef4548f825f95fc5699 https://github.com/facebook/wangle/commit/775e9a6b93d3189ceef428941399e0d12e35f53e https://github.com/facebookexperimental/edencommon/commit/776a7b9da5efab924d3b87e815d225a235fb20ce https://github.com/facebookexperimental/rust-shed/commit/80540cffdfe87e6628cebb8ade5d15e212ba1826 https://github.com/facebookincubator/fizz/commit/f01e961a1cf77e0c47a068756e1e33bb0b860780 Reviewed By: ajb85 fbshipit-source-id: be50166b91cdfc6ad5f8981cb8054da896f312d6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7da470a1acb1..df86e2720cff 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e38e4a90339d119850e97f5dedbe9ce57a89c652 +Subproject commit 22a6be344d798f8f0f36d08a4f85debd44d08723 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 039aadd08a16..2730b9771e1f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d186b261aaeddfbd15fcf16bac78ae2f5d851204 +Subproject commit b9d11e6a47df09295ac597fb219b86344f52e597 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 81fe63cccf72..f98458f86910 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 29ebd8a36f6400dd06f46a6d37934ec9bbb56d47 +Subproject commit 775e9a6b93d3189ceef428941399e0d12e35f53e From 4019f97b812c95f72a7c093c6815406340dc506b Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Tue, 4 Jun 2024 11:00:48 -0700 Subject: [PATCH 6969/7387] add Glean Summary: X-link: https://github.com/facebookincubator/zstrong/pull/856 Build Glean under the control of getdeps. This avoids all of our `install_deps.sh` and `build.sh` stuff. Having the build driven by getdeps means that getdeps handles all the `PKG_CONFIG_PATH` and `LD_LIBRARY_PATH` stuff for us. TODO * only builds, doesn't run tests yet * doesn't build any indexers - clang should be possible Reviewed By: pepeiborra Differential Revision: D57968314 fbshipit-source-id: 033bd0faad3b602f0fcd25e172531df7cab9c775 --- build/fbcode_builder/manifests/glean | 30 +++++++++++++++++++++++++ build/fbcode_builder/manifests/hsthrift | 5 +++++ 2 files changed, 35 insertions(+) create mode 100644 build/fbcode_builder/manifests/glean create mode 100644 build/fbcode_builder/manifests/hsthrift diff --git a/build/fbcode_builder/manifests/glean b/build/fbcode_builder/manifests/glean new file mode 100644 index 000000000000..f54e743650c0 --- /dev/null +++ b/build/fbcode_builder/manifests/glean @@ -0,0 +1,30 @@ +[manifest] +name = glean +fbsource_path = fbcode/glean +shipit_project = facebookincubator/Glean +use_shipit = true + +[subprojects] +hsthrift = hsthrift + +[dependencies] +cabal +ghc +gflags +glog +folly +rocksdb +xxhash + +[build] +builder = make + +[make.build_args] +update-all +EXTRA_GHC_OPTS=-j4 +RTS -A32m -n4m -RTS + +[make.install_args] +install + +[sandcastle] +run_tests = off diff --git a/build/fbcode_builder/manifests/hsthrift b/build/fbcode_builder/manifests/hsthrift new file mode 100644 index 000000000000..8def6794d50c --- /dev/null +++ b/build/fbcode_builder/manifests/hsthrift @@ -0,0 +1,5 @@ +[manifest] +name = hsthrift +fbsource_path = fbcode/common/hs +shipit_project = facebookincubator/hsthrift +use_shipit = true From 0e830d7bab12429c7ce22a7190fe47e45203a11c Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Tue, 4 Jun 2024 11:00:48 -0700 Subject: [PATCH 6970/7387] --extra-cmake-defines should be a global flag Summary: X-link: https://github.com/facebookincubator/zstrong/pull/858 Because it needs to be passed to other commands that use project hashes, such as "test". (in general there are probably a lot more of these, just fixing the ones I've ran into so far) Reviewed By: genevievehelsel Differential Revision: D58082245 fbshipit-source-id: 09fa6b5ce4cc4b3ae7ecfb34ac83681cecb36e3c --- build/fbcode_builder/getdeps.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 014105f3bdf4..523a405ae639 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -788,14 +788,6 @@ def setup_project_cmd_parser(self, parser): parser.add_argument( "--schedule-type", help="Indicates how the build was activated" ) - parser.add_argument( - "--extra-cmake-defines", - help=( - "Input json map that contains extra cmake defines to be used " - "when compiling the current project and all its deps. " - 'e.g: \'{"CMAKE_CXX_FLAGS": "--bla"}\'' - ), - ) parser.add_argument( "--cmake-target", help=("Target for cmake build."), @@ -1326,6 +1318,14 @@ def add_common_arg(*args, **kwargs): action="store_true", default=False, ) + add_common_arg( + "--extra-cmake-defines", + help=( + "Input json map that contains extra cmake defines to be used " + "when compiling the current project and all its deps. " + 'e.g: \'{"CMAKE_CXX_FLAGS": "--bla"}\'' + ), + ) add_common_arg( "--allow-system-packages", help="Allow satisfying third party deps from installed system packages", From 941fdc0cf42f434adb79a15ee47e501573c0f505 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Tue, 4 Jun 2024 13:57:07 -0700 Subject: [PATCH 6971/7387] Add debug command Summary: Starts a shell in the build dir, with the environment set up in the same way as for the build. Useful for experimenting and testing. Reviewed By: chadaustin Differential Revision: D58082246 fbshipit-source-id: 82b275401528d7616c2560d80b4c187de67f6032 --- build/fbcode_builder/getdeps.py | 88 +++++++++++++++---------- build/fbcode_builder/getdeps/builder.py | 10 +++ 2 files changed, 63 insertions(+), 35 deletions(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 523a405ae639..499b85225709 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -210,6 +210,31 @@ def setup_parser(self, parser): def setup_project_cmd_parser(self, parser): pass + # For commands that don't build but need the full list of install_dirs from + # dependencies (test, debug). + def get_install_dirs(self, loader, manifest): + install_dirs = [] + for m in loader.manifests_in_dependency_order(): + if m != manifest: + install_dirs.append(loader.get_project_install_dir(m)) + return install_dirs + + def create_builder(self, loader, manifest): + fetcher = loader.create_fetcher(manifest) + src_dir = fetcher.get_src_dir() + ctx = loader.ctx_gen.get_context(manifest.name) + build_dir = loader.get_project_build_dir(manifest) + inst_dir = loader.get_project_install_dir(manifest) + return manifest.create_builder( + loader.build_opts, src_dir, build_dir, inst_dir, ctx, loader + ) + + def check_built(self, loader, manifest): + built_marker = os.path.join( + loader.get_project_install_dir(manifest), ".built-by-getdeps" + ) + return os.path.exists(built_marker) + class CachedProject(object): """A helper that allows calling the cache logic for a project @@ -855,41 +880,20 @@ def setup_project_cmd_parser(self, parser): @cmd("test", "test a given project") class TestCmd(ProjectCmdBase): def run_project_cmd(self, args, loader, manifest): - projects = loader.manifests_in_dependency_order() - - # Accumulate the install directories so that the test steps - # can find their dep installation - install_dirs = [] - - for m in projects: - inst_dir = loader.get_project_install_dir(m) - - if m == manifest or args.test_dependencies: - built_marker = os.path.join(inst_dir, ".built-by-getdeps") - if not os.path.exists(built_marker): - print("project %s has not been built" % m.name) - # TODO: we could just go ahead and build it here, but I - # want to tackle that as part of adding build-for-test - # support. - return 1 - fetcher = loader.create_fetcher(m) - src_dir = fetcher.get_src_dir() - ctx = loader.ctx_gen.get_context(m.name) - build_dir = loader.get_project_build_dir(m) - builder = m.create_builder( - loader.build_opts, src_dir, build_dir, inst_dir, ctx, loader - ) - - builder.run_tests( - install_dirs, - schedule_type=args.schedule_type, - owner=args.test_owner, - test_filter=args.filter, - retry=args.retry, - no_testpilot=args.no_testpilot, - ) - - install_dirs.append(inst_dir) + if not self.check_built(loader, manifest): + print("project %s has not been built" % manifest.name) + return 1 + builder = self.create_builder(loader, manifest) + install_dirs = self.get_install_dirs(loader, manifest) + + builder.run_tests( + install_dirs, + schedule_type=args.schedule_type, + owner=args.test_owner, + test_filter=args.filter, + retry=args.retry, + no_testpilot=args.no_testpilot, + ) def setup_project_cmd_parser(self, parser): parser.add_argument( @@ -911,6 +915,20 @@ def setup_project_cmd_parser(self, parser): ) +@cmd( + "debug", + "start a shell in the given project's build dir with the correct environment for running the build", +) +class DebugCmd(ProjectCmdBase): + def run_project_cmd(self, args, loader, manifest): + if not self.check_built(loader, manifest): + print("project %s has not been built" % manifest.name) + return 1 + install_dirs = self.get_install_dirs(loader, manifest) + builder = self.create_builder(loader, manifest) + builder.debug(install_dirs, reconfigure=False) + + @cmd("generate-github-actions", "generate a GitHub actions configuration") class GenerateGitHubActionsCmd(ProjectCmdBase): RUN_ON_ALL = """ [push, pull_request]""" diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 2ff40aae1e9e..331dbc6526a1 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -142,6 +142,16 @@ def prepare(self, install_dirs, reconfigure: bool) -> None: self._apply_patchfile() self._prepare(install_dirs=install_dirs, reconfigure=reconfigure) + def debug(self, install_dirs, reconfigure: bool) -> None: + reconfigure = self._reconfigure(reconfigure) + self._apply_patchfile() + self._prepare(install_dirs=install_dirs, reconfigure=reconfigure) + env = self._compute_env(install_dirs) + print("Starting a shell in %s, ^D to exit..." % self.build_dir) + # TODO: print the command to run the build + shell = ["powershell.exe"] if sys.platform == "win32" else ["/bin/sh", "-i"] + self._run_cmd(shell, cwd=self.build_dir, env=env) + def build(self, install_dirs, reconfigure: bool) -> None: print("Building %s..." % self.manifest.name) reconfigure = self._reconfigure(reconfigure) From ae4b38f5a4ccab86f429b615efed00d50ee32d97 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 4 Jun 2024 16:02:22 -0700 Subject: [PATCH 6972/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/cd1a2d7df40dbce16d695361b27f9f016812f7f9 https://github.com/facebook/fb303/commit/033b341ea8b3fcaad928a2d6a261430112b6c8a9 https://github.com/facebook/fbthrift/commit/100252037d2ea15eff93a8f9f252a0e54e32656d https://github.com/facebook/folly/commit/0962f1e4e3ae32011f6f1bc9a1462190e54e3944 https://github.com/facebook/mvfst/commit/d96e6d834c531190fa13241fe033ecbfe0c9109e https://github.com/facebook/proxygen/commit/33643225bee35233df94e72941d7db9e9639df1f https://github.com/facebook/wangle/commit/8a42ca88a6696e11f72ef65edf988903abbc0e1d https://github.com/facebookexperimental/edencommon/commit/a8987ee3bc2a0cb118331232149b71e19b7d1119 https://github.com/facebookexperimental/rust-shed/commit/9d28e1d283510a95a754ed16db2d4f4c5ba04823 https://github.com/facebookincubator/fizz/commit/29b1ac1171786105c141a68d269a0c78ffef03c4 Reviewed By: ajb85 fbshipit-source-id: 06679a571b67d545d4f92ce5c7df4581adcc06d8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index df86e2720cff..242b9df70188 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 22a6be344d798f8f0f36d08a4f85debd44d08723 +Subproject commit 100252037d2ea15eff93a8f9f252a0e54e32656d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 2730b9771e1f..4d221df77634 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b9d11e6a47df09295ac597fb219b86344f52e597 +Subproject commit 0962f1e4e3ae32011f6f1bc9a1462190e54e3944 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f98458f86910..426087c520e2 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 775e9a6b93d3189ceef428941399e0d12e35f53e +Subproject commit 8a42ca88a6696e11f72ef65edf988903abbc0e1d From 3f4752132970c4758323b6c0a0db883cbddac41f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 5 Jun 2024 09:32:41 -0700 Subject: [PATCH 6973/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/bd99fc8cc87b4b886bbc45b3d4fc5afb80c6eba6 https://github.com/facebook/fb303/commit/2f8b8ee4b4c6a380f6937b55311933b76f5221c8 https://github.com/facebook/fbthrift/commit/dd93cdde2cef08a64bf246882cf7d9b04cbfde99 https://github.com/facebook/folly/commit/ade5b955024e55826667b75e060a5011b251812b https://github.com/facebook/mvfst/commit/d8bd7d2d5eb64f21ea74b5e2621dce750528bc43 https://github.com/facebook/proxygen/commit/b7bff42119d22b4c42c5fda395c876f26e21f816 https://github.com/facebook/wangle/commit/d1d486f6191580569e41b982057da3b729f98f70 https://github.com/facebookexperimental/edencommon/commit/1a579d8919a91c30d16fd8e03027aebd754f0007 https://github.com/facebookexperimental/rust-shed/commit/de415805d3401f83e16abcdcf1cea2fb82468cc8 https://github.com/facebookincubator/fizz/commit/e92adc2c1a01c8c98f6c287f06a7c6f2ffd43f61 Reviewed By: ajb85 fbshipit-source-id: 183de24aa85be1140f3c036207d6ebdd6b529e38 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 242b9df70188..2309fec427b4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 100252037d2ea15eff93a8f9f252a0e54e32656d +Subproject commit dd93cdde2cef08a64bf246882cf7d9b04cbfde99 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4d221df77634..27161b92768f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0962f1e4e3ae32011f6f1bc9a1462190e54e3944 +Subproject commit ade5b955024e55826667b75e060a5011b251812b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 426087c520e2..0eeb35267c39 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8a42ca88a6696e11f72ef65edf988903abbc0e1d +Subproject commit d1d486f6191580569e41b982057da3b729f98f70 From 6447f24fe0f1812484a21ba7517fae1d454a20ff Mon Sep 17 00:00:00 2001 From: Srikrishna Gopu Date: Wed, 5 Jun 2024 09:55:13 -0700 Subject: [PATCH 6974/7387] move fboss oss to use sai 1.14.0 Summary: As titled, move fboss oss to use sai 1.14.0 Reviewed By: simuthus-fb Differential Revision: D58173787 fbshipit-source-id: 6e3206b274bbc414a607ac27184fed59d5b405ef --- build/fbcode_builder/manifests/libsai | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/manifests/libsai b/build/fbcode_builder/manifests/libsai index 4f772d826e11..a28c43415e01 100644 --- a/build/fbcode_builder/manifests/libsai +++ b/build/fbcode_builder/manifests/libsai @@ -2,12 +2,12 @@ name = libsai [download] -url = https://github.com/opencomputeproject/SAI/archive/v1.13.0.tar.gz -sha256 = bb8c5d6cb0c7897422875d0da7b903708d1a15557ad07c6d6266dff83cb8c78d +url = https://github.com/opencomputeproject/SAI/archive/v1.14.0.tar.gz +sha256 = 4e3a1d010bda0c589db46e077725a2cd9624a5cc255c89d1caa79deb408d1fa7 [build] builder = nop -subdir = SAI-1.13.0 +subdir = SAI-1.14.0 [install.files] inc = include From 64742eae79488766b2a436f9483bba1fe121ffe5 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Wed, 5 Jun 2024 11:26:20 -0700 Subject: [PATCH 6975/7387] Small simplification (#869) Summary: Pull Request resolved: https://github.com/facebookincubator/zstrong/pull/869 Reviewed By: josefs Differential Revision: D58134738 fbshipit-source-id: 66dc4199b52d45c411b941b0feeba880b4e139e9 --- build/fbcode_builder/manifests/glean | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/fbcode_builder/manifests/glean b/build/fbcode_builder/manifests/glean index f54e743650c0..66fd5627ca87 100644 --- a/build/fbcode_builder/manifests/glean +++ b/build/fbcode_builder/manifests/glean @@ -20,7 +20,8 @@ xxhash builder = make [make.build_args] -update-all +cabal-update +all EXTRA_GHC_OPTS=-j4 +RTS -A32m -n4m -RTS [make.install_args] From 59049ebed292976026e00dd71c3d5c36c35547ef Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Wed, 5 Jun 2024 11:26:20 -0700 Subject: [PATCH 6976/7387] Add shipit.pathmap to get triggering Summary: X-link: https://github.com/facebookincubator/zstrong/pull/866 Build triggering works by using entries in shipit.pathmap, however for Glean we're using the native ShipIt so we didn't have these. Add a dummy shipit.pathmap section to enable triggering. Reviewed By: josefs Differential Revision: D58146311 fbshipit-source-id: 45ce5a707584d834a4de452029cc0699abb0df82 --- build/fbcode_builder/manifests/glean | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/fbcode_builder/manifests/glean b/build/fbcode_builder/manifests/glean index 66fd5627ca87..5f8a8f026b6f 100644 --- a/build/fbcode_builder/manifests/glean +++ b/build/fbcode_builder/manifests/glean @@ -4,6 +4,12 @@ fbsource_path = fbcode/glean shipit_project = facebookincubator/Glean use_shipit = true +[shipit.pathmap] +# These are only used by target determinator to trigger builds, the +# real path mappings are in the ShipIt config. +fbcode/glean = glean +fbcode/common/hs = hsthrift + [subprojects] hsthrift = hsthrift From 1c07e23a333da6d0b386d7dee034eef0596c548c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 5 Jun 2024 11:55:06 -0700 Subject: [PATCH 6977/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/3467f6869744bc78af857a88eb0336c3d41bc416 https://github.com/facebook/fb303/commit/d79d1f93c8562b107049f4b727a9df1fe8120186 https://github.com/facebook/fbthrift/commit/19a1b58593816dffc378937d671cc9ba8a581cd8 https://github.com/facebook/folly/commit/019c1ed10f2db908da99b851d068df9c0180f208 https://github.com/facebook/mvfst/commit/f06868bc99b034ba909abb8cd6912afa5fd460e4 https://github.com/facebook/proxygen/commit/3a33318f209800f31346f334dc703c555c90491b https://github.com/facebook/wangle/commit/1562b5f38510c5ce9719acbf2fe2215a8590bf36 https://github.com/facebookexperimental/edencommon/commit/950d4535a1d6c08eb9c081ed2526d5bf3ab9d30c https://github.com/facebookexperimental/rust-shed/commit/55143223c4e26ba569df9134dea541c0014eaacc https://github.com/facebookincubator/fizz/commit/1f240e9ccbe99b97744430a7ac87e27c329448d2 Reviewed By: ajb85 fbshipit-source-id: ce0bd7a2c6245773e0816167ce8130886584475b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2309fec427b4..e899be3cd30b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit dd93cdde2cef08a64bf246882cf7d9b04cbfde99 +Subproject commit 19a1b58593816dffc378937d671cc9ba8a581cd8 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 27161b92768f..d5d7259374b6 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ade5b955024e55826667b75e060a5011b251812b +Subproject commit 019c1ed10f2db908da99b851d068df9c0180f208 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0eeb35267c39..c03c4aef63a3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d1d486f6191580569e41b982057da3b729f98f70 +Subproject commit 1562b5f38510c5ce9719acbf2fe2215a8590bf36 From a9cc1c5961e2937c63b26741861bfeaadeb4979c Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Wed, 5 Jun 2024 12:08:01 -0700 Subject: [PATCH 6978/7387] Run tests in CI (#865) Summary: Pull Request resolved: https://github.com/facebookincubator/zstrong/pull/865 Reviewed By: josefs Differential Revision: D58134739 fbshipit-source-id: fe61bd381b85b4e4f34c84f12f9aca60bcd6214d --- build/fbcode_builder/manifests/glean | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/fbcode_builder/manifests/glean b/build/fbcode_builder/manifests/glean index 5f8a8f026b6f..f3ae4f876982 100644 --- a/build/fbcode_builder/manifests/glean +++ b/build/fbcode_builder/manifests/glean @@ -29,9 +29,12 @@ builder = make cabal-update all EXTRA_GHC_OPTS=-j4 +RTS -A32m -n4m -RTS +CABAL_CONFIG_FLAGS=-f-clang-tests -f-hack-tests -f-typescript-tests -f-python-tests -f-dotnet-tests -f-go-tests -f-rust-tests -f-java-lsif-tests -f-flow-tests [make.install_args] install -[sandcastle] -run_tests = off +[make.test_args] +test +EXTRA_GHC_OPTS=-j4 +RTS -A32m -n4m -RTS +CABAL_CONFIG_FLAGS=-f-clang-tests -f-hack-tests -f-typescript-tests -f-python-tests -f-dotnet-tests -f-go-tests -f-rust-tests -f-java-lsif-tests -f-flow-tests From f3b5b295d5bf4be3c503b553bcdeab80a1dc4727 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Thu, 6 Jun 2024 07:50:05 -0700 Subject: [PATCH 6979/7387] debug doesn't require build first Summary: X-link: https://github.com/facebookincubator/zstrong/pull/870 brainfart Reviewed By: chadaustin Differential Revision: D58200715 fbshipit-source-id: ccb02285e672e3e638e6eda92fc0610eb903cb69 --- build/fbcode_builder/getdeps.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 499b85225709..298bfeeace9e 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -921,9 +921,6 @@ def setup_project_cmd_parser(self, parser): ) class DebugCmd(ProjectCmdBase): def run_project_cmd(self, args, loader, manifest): - if not self.check_built(loader, manifest): - print("project %s has not been built" % manifest.name) - return 1 install_dirs = self.get_install_dirs(loader, manifest) builder = self.create_builder(loader, manifest) builder.debug(install_dirs, reconfigure=False) From 793a03ebe4b050285dd023244b3474a6d55858d5 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 6 Jun 2024 09:32:59 -0700 Subject: [PATCH 6980/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/3803afe4209fab712543a0779d7aeef168a11b0c https://github.com/facebook/fb303/commit/5a4c37962d38b9a8b8a66eb60e13dbe5ea4d2269 https://github.com/facebook/fbthrift/commit/0ac2d689243be496a6b283b75126a14a6503236e https://github.com/facebook/folly/commit/fcdc924205c66ff86a78e2b31e2f866288a141a6 https://github.com/facebook/mvfst/commit/32db35ff4f689c971f02b739e3eff1e9835a4aae https://github.com/facebook/proxygen/commit/42696ea895dc45191974a489cdec97ec5e8348ff https://github.com/facebook/wangle/commit/1cf03132c4346926ec92d3f2845b18d2cbfcb729 https://github.com/facebookexperimental/edencommon/commit/c039824a2d8b9f362b1e99f6d3e2544b33e9bb20 https://github.com/facebookexperimental/rust-shed/commit/ecc3a6c1fa20245896f303fb3819675ac616a764 https://github.com/facebookincubator/fizz/commit/67d18908b2316d3995f1c8fb8bc7c65acbdcdeb5 Reviewed By: ajb85 fbshipit-source-id: d73dc459aceef41b760ccdf9c09efdc879d022b0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e899be3cd30b..6e59d4004a89 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 19a1b58593816dffc378937d671cc9ba8a581cd8 +Subproject commit 0ac2d689243be496a6b283b75126a14a6503236e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d5d7259374b6..6856dd882eed 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 019c1ed10f2db908da99b851d068df9c0180f208 +Subproject commit fcdc924205c66ff86a78e2b31e2f866288a141a6 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c03c4aef63a3..2c19af4c74ca 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1562b5f38510c5ce9719acbf2fe2215a8590bf36 +Subproject commit 1cf03132c4346926ec92d3f2845b18d2cbfcb729 From e34d80fc6109ccf7ffb0df77e476ac2332c7c3be Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 7 Jun 2024 09:33:49 -0700 Subject: [PATCH 6981/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/3883631c5869605c73f3e4ecc20efabcde6e9cb4 https://github.com/facebook/fb303/commit/24b2b4d3896db696cb7a293d5318a75b4b1dca47 https://github.com/facebook/fbthrift/commit/165601b51a7bf686cfc9427d62ae86f03f476fb4 https://github.com/facebook/folly/commit/a7e3b7a242383e2217a1efd1fdf51ccc37f0d1a8 https://github.com/facebook/mvfst/commit/3ff5f31c262869a70a210fc46d4871e05dd79e1a https://github.com/facebook/proxygen/commit/ca9a56a5a1239a24fddd4ee8e2cbfe1dd01b7201 https://github.com/facebook/wangle/commit/076bdcb51d8789321ea0510124c5dcef8a676d21 https://github.com/facebookexperimental/edencommon/commit/e1586778cd0622d0ab51cd69416d5dc5a93a12b4 https://github.com/facebookexperimental/rust-shed/commit/f87aced8dfcb2fffb6702f279428f771f4098eea https://github.com/facebookincubator/fizz/commit/7a1b1cbfa21f9713368aa5204d13e65202919318 Reviewed By: ajb85 fbshipit-source-id: 82ed642f739a391ade0c74abff82fd9d9cebe85c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6e59d4004a89..dbd2f0b82675 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0ac2d689243be496a6b283b75126a14a6503236e +Subproject commit 165601b51a7bf686cfc9427d62ae86f03f476fb4 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6856dd882eed..2743f08234db 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit fcdc924205c66ff86a78e2b31e2f866288a141a6 +Subproject commit a7e3b7a242383e2217a1efd1fdf51ccc37f0d1a8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2c19af4c74ca..d7287706fa1a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1cf03132c4346926ec92d3f2845b18d2cbfcb729 +Subproject commit 076bdcb51d8789321ea0510124c5dcef8a676d21 From a4821172ddb3d626837b9d8e76958c9e56999a72 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Fri, 7 Jun 2024 11:19:29 -0700 Subject: [PATCH 6982/7387] Add GETDEPS_CABAL_FLAGS env var Summary: X-link: https://github.com/facebookincubator/zstrong/pull/871 The problem I need to solve is that projects without a pkg-config can't be found by Cabal. I need to pass extra flags to Cabal for it to find the includes and libraries for these projects. So here I'm creating a `GETDEPS_CABAL_FLAGS` env with all the necessary flags. It's a bit horrible. Really I want to do this only for the direct deps, but where the env is being setup we don't have access to the direct vs. non-direct deps currently, only the install_dirs. Reviewed By: josefs Differential Revision: D58200841 fbshipit-source-id: 03f8630610691485561438d69fe8e1182396cd04 --- build/fbcode_builder/getdeps/buildopts.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/build/fbcode_builder/getdeps/buildopts.py b/build/fbcode_builder/getdeps/buildopts.py index bf70265b2a48..6bda130e6589 100644 --- a/build/fbcode_builder/getdeps/buildopts.py +++ b/build/fbcode_builder/getdeps/buildopts.py @@ -340,14 +340,17 @@ def add_prefix_to_env( ) -> bool: # noqa: C901 bindir = os.path.join(d, "bin") found = False + has_pkgconfig = False pkgconfig = os.path.join(d, "lib", "pkgconfig") if os.path.exists(pkgconfig): found = True + has_pkgconfig = True add_path_entry(env, "PKG_CONFIG_PATH", pkgconfig, append=append) pkgconfig = os.path.join(d, "lib64", "pkgconfig") if os.path.exists(pkgconfig): found = True + has_pkgconfig = True add_path_entry(env, "PKG_CONFIG_PATH", pkgconfig, append=append) add_path_entry(env, "CMAKE_PREFIX_PATH", d, append=append) @@ -369,6 +372,15 @@ def add_prefix_to_env( add_flag(env, "CPPFLAGS", f"-I{ncursesincludedir}", append=append) elif "/bz2-" in d: add_flag(env, "CPPFLAGS", f"-I{includedir}", append=append) + # For non-pkgconfig projects Cabal has no way to find the includes or + # libraries, so we provide a set of extra Cabal flags in the env + if not has_pkgconfig: + add_flag( + env, + "GETDEPS_CABAL_FLAGS", + f"--extra-include-dirs={includedir}", + append=append, + ) # The thrift compiler's built-in includes are installed directly to the include dir includethriftdir = os.path.join(d, "include", "thrift") @@ -407,6 +419,13 @@ def add_prefix_to_env( add_flag(env, "LDFLAGS", f"-L{libdir}", append=append) if add_library_path: add_path_entry(env, "LIBRARY_PATH", libdir, append=append) + if not has_pkgconfig: + add_flag( + env, + "GETDEPS_CABAL_FLAGS", + f"--extra-lib-dirs={libdir}", + append=append, + ) # Allow resolving binaries (eg: cmake, ninja) and dlls # built by earlier steps From 81eb96e3f218c1aa311563154cb3244a1350c7f6 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Fri, 7 Jun 2024 11:19:29 -0700 Subject: [PATCH 6983/7387] Getdeps for hsthrift Summary: X-link: https://github.com/facebookincubator/hsthrift/pull/134 X-link: https://github.com/facebookincubator/zstrong/pull/873 Builds and tests hsthrift with the fbthrift dependency. Reviewed By: phlalx Differential Revision: D58242707 fbshipit-source-id: 3cebb06e6659615a0077859f64a58fef3b3c5067 --- build/fbcode_builder/manifests/hsthrift | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/build/fbcode_builder/manifests/hsthrift b/build/fbcode_builder/manifests/hsthrift index 8def6794d50c..f644b5f56fe0 100644 --- a/build/fbcode_builder/manifests/hsthrift +++ b/build/fbcode_builder/manifests/hsthrift @@ -3,3 +3,26 @@ name = hsthrift fbsource_path = fbcode/common/hs shipit_project = facebookincubator/hsthrift use_shipit = true + +[shipit.pathmap] +# These are only used by target determinator to trigger builds, the +# real path mappings are in the ShipIt config. +fbcode/common/hs = . + +[dependencies] +cabal +ghc +gflags +glog +folly +fbthrift + +[build] +builder = make + +[make.build_args] +cabal-update +all + +[make.install_args] +install From 010a01f0625312111dbb4e6499eb34c9ce451c3e Mon Sep 17 00:00:00 2001 From: Kaveh Ahmadi Date: Fri, 7 Jun 2024 12:25:50 -0700 Subject: [PATCH 6984/7387] Add new aliases for `eden trace sl` Summary: `eden trace hg` is a tool to trace all the Sapling trace object fetches. Let's change it to `eden trace sl` to keep up with the name changes from hg to sapling. This diff adds an alias for `hg` too, then we still can use the old name of `eden trace hg` It show up in the help too. Reviewed By: kmancini Differential Revision: D58165334 fbshipit-source-id: 750b2a4ec921ce133dbfc47921c2593210c3b985 --- eden/fs/service/eden.thrift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 5ce3fb565cf3..83057b0009ee 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -2357,8 +2357,8 @@ service EdenService extends fb303_core.BaseService { ); /** - * Gets a list of hg events stored in Eden's Hg ActivityBuffer. Used for - * retroactive debugging by the `eden trace hg --retroactive` command. + * Gets a list of Sapling events stored in Eden's Sapling ActivityBuffer. Used for + * retroactive debugging by the `eden trace sl --retroactive` command. */ GetRetroactiveHgEventsResult getRetroactiveHgEvents( 1: GetRetroactiveHgEventsParams params, From 6d52bc3aa7d1fdc636f9ef6dde30a699fe3caf4b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 8 Jun 2024 09:31:48 -0700 Subject: [PATCH 6985/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/e434f25ce9188b0c4de1918ed112fa958344acfe https://github.com/facebook/fb303/commit/591e85c25b53ed19b530400ceb4d9a4cc10bfba7 https://github.com/facebook/fbthrift/commit/c182426479d9cb21f3d9422e79af6afb882fd50d https://github.com/facebook/folly/commit/4db31bf3f1557698be440981e5fea8b3d5bb427f https://github.com/facebook/mvfst/commit/2052e4dca48130352bdf28552252e5d3ae545d2f https://github.com/facebook/proxygen/commit/e52c2eaf99f5aac4ab4813d3e23e780e2558aafd https://github.com/facebook/wangle/commit/8e9bf37a9745db1ee7e8661d413ce81d101b9cee https://github.com/facebookexperimental/edencommon/commit/4d85d9e219584a0bbec4fefb438e73ef89fd8ecb https://github.com/facebookexperimental/rust-shed/commit/1148793aa8f6800da1b5b971af9f34f0f12b5405 https://github.com/facebookincubator/fizz/commit/30638bdfea4fd0760dab69bc2807617dbd1cf68b Reviewed By: ajb85 fbshipit-source-id: ecdf46a48c148e165c7d5c96a54eda4bccc742c6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index dbd2f0b82675..c0fb3e6b1d30 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 165601b51a7bf686cfc9427d62ae86f03f476fb4 +Subproject commit c182426479d9cb21f3d9422e79af6afb882fd50d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 2743f08234db..4d7d2ddc3f08 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a7e3b7a242383e2217a1efd1fdf51ccc37f0d1a8 +Subproject commit 4db31bf3f1557698be440981e5fea8b3d5bb427f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d7287706fa1a..8ee344f5bd3a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 076bdcb51d8789321ea0510124c5dcef8a676d21 +Subproject commit 8e9bf37a9745db1ee7e8661d413ce81d101b9cee From 6161a80694f7f3a107cde60d068d253d06859474 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 9 Jun 2024 09:32:58 -0700 Subject: [PATCH 6986/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/7b2f5d05b3bfddbf88410fbc77704b6cc043e628 https://github.com/facebook/fbthrift/commit/5252ccb9ee0cff36589b841e069518897419170a https://github.com/facebook/folly/commit/7cd8d5248f6023dd8f9e7674816fbc41bfd498b6 https://github.com/facebook/mvfst/commit/387660374cdc43f55d4b77096424251bd8887d92 https://github.com/facebook/proxygen/commit/b9f2f81d6736a26192bcf8daebc581c9c5e5dff6 https://github.com/facebook/wangle/commit/ff9afbc7caa949c1c816ff4d1ea3fdf2123d39d8 https://github.com/facebookexperimental/edencommon/commit/a0ffd77bd58df9123bb7dba79b49e9b25ed2e260 https://github.com/facebookexperimental/rust-shed/commit/c45364124efb703563f6d07fe9e0bb094573c066 https://github.com/facebookincubator/fizz/commit/afba1d24418cf1af60776c52c9f1cc888f060bed Reviewed By: ajb85 fbshipit-source-id: 479a5abe6cb4d7bb91934589d2f405c7d1dc4ac5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c0fb3e6b1d30..95f0b3ee09cc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c182426479d9cb21f3d9422e79af6afb882fd50d +Subproject commit 5252ccb9ee0cff36589b841e069518897419170a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4d7d2ddc3f08..790a4bc5bb08 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 4db31bf3f1557698be440981e5fea8b3d5bb427f +Subproject commit 7cd8d5248f6023dd8f9e7674816fbc41bfd498b6 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8ee344f5bd3a..84e3d3830023 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8e9bf37a9745db1ee7e8661d413ce81d101b9cee +Subproject commit ff9afbc7caa949c1c816ff4d1ea3fdf2123d39d8 From 9ea938aa5171bb68f4eaf60ec4da510a3a48e4a9 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Mon, 10 Jun 2024 02:42:15 -0700 Subject: [PATCH 6987/7387] restore rpm system deps for fedora Summary: [getdeps] restore rpm system deps for fedora centOS (even stream) tends to be quite old and thus ends up having its rpm system deps turned off, e.g. boost in D55758008 and glog and gtest in D51813855. Unfortunate the rpm deps were removed entirely rather than limited by distro or distro_vers. Lets restore the rpm deps but specify distro=fedora to reduce the risk of people removing them entirely. Also: * fedora has up to date gtest & gmock, so use them * zlib-ng-compat added from fedora 38 with zlib removed from F40, so update zlib rpm names. F37 is EOL X-link: https://github.com/facebook/folly/pull/2231 Reviewed By: HarveyHunt Differential Revision: D58324546 Pulled By: ahornby fbshipit-source-id: a4d5e8620cf55701e19317a301db3846d60f8d4b --- build/fbcode_builder/manifests/boost | 4 ++++ build/fbcode_builder/manifests/fmt | 3 +++ build/fbcode_builder/manifests/gflags | 3 +++ build/fbcode_builder/manifests/glog | 4 ++++ build/fbcode_builder/manifests/googletest | 4 ++++ build/fbcode_builder/manifests/zlib | 6 +++++- 6 files changed, 23 insertions(+), 1 deletion(-) diff --git a/build/fbcode_builder/manifests/boost b/build/fbcode_builder/manifests/boost index ecf8c6f4fcb3..2900324a3500 100644 --- a/build/fbcode_builder/manifests/boost +++ b/build/fbcode_builder/manifests/boost @@ -55,6 +55,10 @@ boost169-python3 boost169-serialization boost169-program-options +[rpms.distro=fedora] +boost-devel +boost-static + [build] builder = boost job_weight_mib = 512 diff --git a/build/fbcode_builder/manifests/fmt b/build/fbcode_builder/manifests/fmt index 9bc0800e5c89..015e8c3bc3e1 100644 --- a/build/fbcode_builder/manifests/fmt +++ b/build/fbcode_builder/manifests/fmt @@ -15,3 +15,6 @@ FMT_DOC = OFF [homebrew] fmt + +[rpms.distro=fedora] +fmt-devel diff --git a/build/fbcode_builder/manifests/gflags b/build/fbcode_builder/manifests/gflags index 7c26690aa905..47c01c204943 100644 --- a/build/fbcode_builder/manifests/gflags +++ b/build/fbcode_builder/manifests/gflags @@ -20,3 +20,6 @@ gflags [debs] libgflags-dev + +[rpms.distro=fedora] +gflags-devel diff --git a/build/fbcode_builder/manifests/glog b/build/fbcode_builder/manifests/glog index b72836d2c8a8..b5d5fa814cc2 100644 --- a/build/fbcode_builder/manifests/glog +++ b/build/fbcode_builder/manifests/glog @@ -26,3 +26,7 @@ glog [debs] libgoogle-glog-dev + +[rpms.distro=fedora] +glog-devel + diff --git a/build/fbcode_builder/manifests/googletest b/build/fbcode_builder/manifests/googletest index ffbfc233c9e6..10117587450a 100644 --- a/build/fbcode_builder/manifests/googletest +++ b/build/fbcode_builder/manifests/googletest @@ -24,3 +24,7 @@ googletest [debs.not(all(distro=ubuntu,any(distro_vers="18.04",distro_vers="20.04",distro_vers="22.04")))] libgtest-dev libgmock-dev + +[rpms.distro=fedora] +gmock-devel +gtest-devel diff --git a/build/fbcode_builder/manifests/zlib b/build/fbcode_builder/manifests/zlib index dda100aa9e3c..8c52088dbfdd 100644 --- a/build/fbcode_builder/manifests/zlib +++ b/build/fbcode_builder/manifests/zlib @@ -7,10 +7,14 @@ zlib1g-dev [homebrew] zlib -[rpms] +[rpms.not(distro=fedora)] zlib-devel zlib-static +[rpms.distro=fedora] +zlib-ng-compat-devel +zlib-ng-compat-static + [download] url = https://zlib.net/zlib-1.3.1.tar.gz sha256 = 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23 From 699295ca51c537cd72c0b02577642d6ad171ef6b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 10 Jun 2024 09:33:58 -0700 Subject: [PATCH 6988/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/c0fc7aa0f5c458fd114040c1dcf74182571c2865 https://github.com/facebook/fb303/commit/7dd5a7b4ab36a46f277005c43c747405aff2c072 https://github.com/facebook/fbthrift/commit/0910f383fb22ad99026a713626bcae80d6ccb6ce https://github.com/facebook/folly/commit/53e656d79ab24514d3facc95d793f2f84a1a7515 https://github.com/facebook/mvfst/commit/f1bb0f678b6a709d173201b6fd9ac5176a955dfe https://github.com/facebook/proxygen/commit/8e46991fb11adfaa10a059cb4a49e943b4a35f26 https://github.com/facebook/wangle/commit/ebc8620591c4a7a6025a4acfe59b0fdcf82bbbf1 https://github.com/facebookexperimental/edencommon/commit/83a5b346a7bdd29b099653d7cbda38de48bcf4f4 https://github.com/facebookexperimental/rust-shed/commit/4c749beaadfdf66d90797e78da74e4fbf7c42e8d https://github.com/facebookincubator/fizz/commit/e2d23c0173efe679f81d34c19be008ef42d31ef4 Reviewed By: bigfootjon fbshipit-source-id: e5e82aea458996f58cefa089ac0427c78a0f2972 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 95f0b3ee09cc..448cbec13dc6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5252ccb9ee0cff36589b841e069518897419170a +Subproject commit 0910f383fb22ad99026a713626bcae80d6ccb6ce diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 790a4bc5bb08..872b89d3f2ff 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7cd8d5248f6023dd8f9e7674816fbc41bfd498b6 +Subproject commit 53e656d79ab24514d3facc95d793f2f84a1a7515 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 84e3d3830023..2ae25e3dbce8 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ff9afbc7caa949c1c816ff4d1ea3fdf2123d39d8 +Subproject commit ebc8620591c4a7a6025a4acfe59b0fdcf82bbbf1 From 6a9cd4657722cc8169fab75c307db98249f0cffb Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Mon, 10 Jun 2024 09:52:06 -0700 Subject: [PATCH 6989/7387] enable tests for hsthrift (#876) Summary: Pull Request resolved: https://github.com/facebookincubator/zstrong/pull/876 Differential Revision: D58357542 fbshipit-source-id: 9bf979f46a804894a989110fb84ddcbbcf045a74 --- build/fbcode_builder/manifests/hsthrift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/fbcode_builder/manifests/hsthrift b/build/fbcode_builder/manifests/hsthrift index f644b5f56fe0..7dd42ca1c5ed 100644 --- a/build/fbcode_builder/manifests/hsthrift +++ b/build/fbcode_builder/manifests/hsthrift @@ -26,3 +26,6 @@ all [make.install_args] install + +[make.test_args] +test From bb48c334f2481d7aeb7cc3aa049cbfeaf6546684 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 11 Jun 2024 09:34:22 -0700 Subject: [PATCH 6990/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/0b921907258e0b67e3911020b5c51fcab65b4d9d https://github.com/facebook/fb303/commit/9e60ac48ae5dbe4a43e3aef382181a5df95dc52a https://github.com/facebook/fbthrift/commit/0ca43f98fd892f7151e3046b94b56099f0470ba6 https://github.com/facebook/folly/commit/5329008dd75679e7c50b8c271af75bdc80eb8bdd https://github.com/facebook/mvfst/commit/7864be592e2b094323241b376cf7d9065dc14562 https://github.com/facebook/proxygen/commit/f4cde99baa6e27104f5c4d02805e0d195875dcb1 https://github.com/facebook/wangle/commit/e1387989810ff74e016bfa4d404ed3682ba782a0 https://github.com/facebookexperimental/edencommon/commit/85b46f0986e5005b51338ff4eaf7a580c6ab6471 https://github.com/facebookexperimental/rust-shed/commit/d15a194e01214b542ed13259bf708427a5fb2872 https://github.com/facebookincubator/fizz/commit/38d136ab3b6a4909dca6ecaa64d301a17cb40f57 Reviewed By: bigfootjon fbshipit-source-id: 91ee93ad20bbe1607af048fe791af6818e728147 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 448cbec13dc6..73c4e5740b33 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0910f383fb22ad99026a713626bcae80d6ccb6ce +Subproject commit 0ca43f98fd892f7151e3046b94b56099f0470ba6 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 872b89d3f2ff..1a9b9e085e1d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 53e656d79ab24514d3facc95d793f2f84a1a7515 +Subproject commit 5329008dd75679e7c50b8c271af75bdc80eb8bdd diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2ae25e3dbce8..f21948e02846 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ebc8620591c4a7a6025a4acfe59b0fdcf82bbbf1 +Subproject commit e1387989810ff74e016bfa4d404ed3682ba782a0 From 781e7fd775245462d85d23ea57768208df397848 Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Tue, 11 Jun 2024 19:36:39 -0700 Subject: [PATCH 6991/7387] Update libsodium download URL Summary: Old libsodium downloads moved to a different URL breaking the build, e.g. https://github.com/facebook/fbthrift/actions/runs/9464211012/job/26071044729: ``` Download with https://download.libsodium.org/libsodium/releases/old/libsodium-1.0.17-msvc.zip -> Z:\downloads\libsodium-libsodium-1.0.17-msvc.zip ... TransientFailure: Failed to download https://download.libsodium.org/libsodium/releases/old/libsodium-1.0.17-msvc.zip to Z:\downloads\libsodium-libsodium-1.0.17-msvc.zip: HTTP Error 404: Not Found ``` Fix it. Reviewed By: bigfootjon Differential Revision: D58435760 fbshipit-source-id: cfbb7efba646c5255c9eb62722b0190c272cc340 --- build/fbcode_builder/manifests/libsodium | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/manifests/libsodium b/build/fbcode_builder/manifests/libsodium index 0c9941c3fee7..e4c7dbdc6943 100644 --- a/build/fbcode_builder/manifests/libsodium +++ b/build/fbcode_builder/manifests/libsodium @@ -20,7 +20,7 @@ builder = autoconf subdir = libsodium-1.0.17 [download.os=windows] -url = https://download.libsodium.org/libsodium/releases/old/libsodium-1.0.17-msvc.zip +url = https://download.libsodium.org/libsodium/releases/old/unsupported/libsodium-1.0.17-msvc.zip sha256 = f0f32ad8ebd76eee99bb039f843f583f2babca5288a8c26a7261db9694c11467 [build.os=windows] From 514f0a6a61ce12313620d8412536bc0a30a3b859 Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Tue, 11 Jun 2024 19:43:53 -0700 Subject: [PATCH 6992/7387] prevent hangs on watch failures Summary: The EdenFS integration tests keep timing out in our mac build. The tests are hanging calling `hg add` in the backing repo when adding files and setting up the tests. `hg` is hanging on talking to watchman: P1393021057 watchman reports that it is dispatching a command from hg: P1393036963. Meaning that it recieved a request, is processing it and has not replied yet. On the hosts I can repro `watchman watch anonedenrepo` hangs. And if I send the same watch request over the socket: ``` watchman -j <<-EOT > ["watch", "anonedenrepo"] > EOT // ... no response from watchman ``` in the watchman logs (sample: https://www.internalfb.com/intern/everpaste/?handle=GIMpSRrOyG6G7zkEAK3ysLjKJhE8bsIXAAAz) there are logs like: ``` 2024-06-03T17:41:31,675: [fsevents /private/tmp/eden_test.7fn1v43h/repos/main] fse_thread failed: FSEventStreamStart ``` so fsevents fails for ~some reason~ and this seems to cause watchman to fail, but instead of returning an error to the user, watchman never responds. **So why doesn't watchman respond?** I discovered that we have things called syncs, these get fufilled on outer loops of the iothread. the purpose is to wait to return from watchman watch until the initial crawl is complete and watchman is ready to answer queries. However, if we never run a loop of the iothread, then we never set the syncs. i.e. if we fail before completing a turn of the iothread, watchman watch will hang forever. Failures setting up the watch shutdown the iothread, so basically it's a race between the iothread and the failure. If the failure wins watchman hangs, if the iothread wins watchman return an error to the client. We can fix this by completing any syncs with errors and automatically returning errors for any future syncs when shuting down. **What exactly might be the ~some reason~ for fsevents failing?** I don't think we can know for sure. There are not very many tools for debugging fsevents. I do have a theory tho. I think there is a global list of fsevents watches. And I think that has a fixed size. somewhere around 500 or something. If we try to add a 501th watch to that list, then it fails. Watches are not removed from this list when we stop the watch, it is garbage collected at some later point. So if you create more than 500 watchman watches with in quick succession (even if you never have 500 simultaneously) you start to see errors. I belive this because locally I was able to repro the same issue, by creating and removing watches in a loop with: ``` for i in {1..500}; do; mkdir "test$i"; for j in {1..10}; do; mkdir "test$i/test$j"; mkdir "test$i/test$j/.git"; watchman watch "test$i/test$j"; done; for j in {1..10}; do; watchman watch-del "test$i/test$j";done; rm -rf "test$i"; done ``` it gets stuck or errors out at i = 51, j = 9. If re-run the script immediately, it errors out early, which suggests that the "default" watchman process is "polluted". If spawn a new watchman server with different socket path, then it does not error out early, which suggests that the 500 limit is per process, not system globally. **Why did this start happening recently?** Not sure. The timeline does not line up with the macOS upgrade on CI. I don't see anything that changed much in watchman. Perhaps we just added enough tests that we went over some threshold. Reviewed By: quark-zju Differential Revision: D58319081 fbshipit-source-id: 028bee97fc6c95119df99c0b243bc91a9fcf143d --- watchman/InMemoryView.cpp | 10 +++++++++- watchman/PendingCollection.cpp | 8 ++++++++ watchman/PendingCollection.h | 3 +++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/watchman/InMemoryView.cpp b/watchman/InMemoryView.cpp index bea32ac7e829..c7074dcd262c 100644 --- a/watchman/InMemoryView.cpp +++ b/watchman/InMemoryView.cpp @@ -965,7 +965,15 @@ void InMemoryView::stopThreads() { logf(DBG, "signalThreads! {} {}\n", fmt::ptr(this), rootPath_); stopThreads_.store(true, std::memory_order_release); watcher_->stopThreads(); - pendingFromWatcher_.lock()->ping(); + { + auto pending = pendingFromWatcher_.lock(); + // we need this to make sure that watch does not hang + for (auto& sync : pending->stealSyncs()) { + sync.setException(std::runtime_error("Watch shutting down because")); + } + pending->startRefusingSyncs(); + pending->ping(); + } } void InMemoryView::wakeThreads() { diff --git a/watchman/PendingCollection.cpp b/watchman/PendingCollection.cpp index c92eb8063e16..af67c876412c 100644 --- a/watchman/PendingCollection.cpp +++ b/watchman/PendingCollection.cpp @@ -92,7 +92,15 @@ void PendingChanges::add( return add(dir->getFullPathToChild(name), now, flags); } +void PendingChanges::startRefusingSyncs() { + refuseSyncs_ = true; +} + void PendingChanges::addSync(folly::Promise promise) { + if (refuseSyncs_) { + promise.setException(std::runtime_error("Watch is shutting down")); + return; + } syncs_.push_back(std::move(promise)); } diff --git a/watchman/PendingCollection.h b/watchman/PendingCollection.h index 2dd43af8f3d4..2e8556530f50 100644 --- a/watchman/PendingCollection.h +++ b/watchman/PendingCollection.h @@ -172,10 +172,13 @@ class PendingChanges { */ uint32_t getPendingItemCount() const; + void startRefusingSyncs(); + protected: art_tree, w_string> tree_; std::shared_ptr pending_; std::vector> syncs_; + bool refuseSyncs_{false}; // true if we should refuse to add any more syncs private: void maybePruneObsoletedChildren(w_string path, PendingFlags flags); From 793299ea5f8c3bee6300f02673449981d822b2a3 Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Tue, 11 Jun 2024 19:43:53 -0700 Subject: [PATCH 6993/7387] specify reasons for cancling the root Summary: In the last diff I fixed a race condition in Watchman that can result in clients never receiving a response when setting up the repo watch fails. However, we didn't have much context to pass to the user. so the error message is pretty meh. Let's thread through the context about why a watch failed so that we can show the user something helpful for reporting and debugging. Reviewed By: chadaustin, quark-zju Differential Revision: D58391259 fbshipit-source-id: e8c1b2f3879e1b1ad5f3dc91cec40b7f590e9605 --- watchman/InMemoryView.cpp | 22 ++++++++++++++-------- watchman/InMemoryView.h | 2 +- watchman/PendingCollection.cpp | 6 ++++-- watchman/PendingCollection.h | 3 ++- watchman/QueryableView.h | 2 +- watchman/cmds/subscribe.cpp | 3 ++- watchman/cmds/watch.cpp | 2 +- watchman/root/Root.h | 6 +++--- watchman/root/iothread.cpp | 2 +- watchman/root/notifythread.cpp | 6 ++++-- watchman/root/resolve.cpp | 3 ++- watchman/root/threading.cpp | 14 +++++++------- watchman/root/warnerr.cpp | 2 +- watchman/root/watchlist.cpp | 6 +++--- watchman/state.cpp | 3 ++- watchman/watcher/eden.cpp | 4 ++-- watchman/watcher/fsevents.cpp | 2 +- watchman/watcher/portfs.cpp | 4 ++-- watchman/watcher/win32.cpp | 14 +++++++++----- 19 files changed, 62 insertions(+), 44 deletions(-) diff --git a/watchman/InMemoryView.cpp b/watchman/InMemoryView.cpp index c7074dcd262c..6b6b58411e27 100644 --- a/watchman/InMemoryView.cpp +++ b/watchman/InMemoryView.cpp @@ -937,7 +937,7 @@ void InMemoryView::startThreads(const std::shared_ptr& root) { self->notifyThread(root); } catch (const std::exception& e) { log(ERR, "Exception: ", e.what(), " cancel root\n"); - root->cancel(); + root->cancel(fmt::format("notifyThread failed: {}", e.what())); } log(DBG, "out of loop\n"); }); @@ -954,24 +954,30 @@ void InMemoryView::startThreads(const std::shared_ptr& root) { self->ioThread(root); } catch (const std::exception& e) { log(ERR, "Exception: ", e.what(), " cancel root\n"); - root->cancel(); + root->cancel(fmt::format("ioThread failed: {}", e.what())); } log(DBG, "out of loop\n"); }); ioThreadInstance.detach(); } -void InMemoryView::stopThreads() { - logf(DBG, "signalThreads! {} {}\n", fmt::ptr(this), rootPath_); +void InMemoryView::stopThreads(std::string_view reason) { + logf( + DBG, + "signalThreads! {} {} because ... {}\n", + fmt::ptr(this), + rootPath_, + reason); stopThreads_.store(true, std::memory_order_release); watcher_->stopThreads(); { auto pending = pendingFromWatcher_.lock(); // we need this to make sure that watch does not hang for (auto& sync : pending->stealSyncs()) { - sync.setException(std::runtime_error("Watch shutting down because")); + sync.setException(std::runtime_error( + fmt::format("Watch shutting down because ... {}", reason))); } - pending->startRefusingSyncs(); + pending->startRefusingSyncs(reason); pending->ping(); } } @@ -1064,7 +1070,7 @@ CookieSync::SyncResult InMemoryView::syncToNowCookies( // We may have already observed the removal via the notifythread, // but in some cases (eg: btrfs subvolume deletion) no notification // is received. - root->cancel(); + root->cancel("root directory was removed or is inaccessible"); throw std::runtime_error("root dir was removed or is inaccessible"); } else { // The cookie dir was a VCS subdir and it got deleted. Let's @@ -1077,7 +1083,7 @@ CookieSync::SyncResult InMemoryView::syncToNowCookies( // directories, and syncToNow will only throw if no cookies were // created, ie: if all the nested watched directories are no longer // present and the root directory has been removed. - root->cancel(); + root->cancel("root dir was removed or is inaccessible"); throw std::runtime_error("root dir was removed or is inaccessible"); } } diff --git a/watchman/InMemoryView.h b/watchman/InMemoryView.h index 57a43c91a9f9..576c11a45bbe 100644 --- a/watchman/InMemoryView.h +++ b/watchman/InMemoryView.h @@ -207,7 +207,7 @@ class InMemoryView final : public QueryableView { folly::SemiFuture waitUntilReadyToQuery() override; void startThreads(const std::shared_ptr& root) override; - void stopThreads() override; + void stopThreads(std::string_view reason) override; void wakeThreads() override; void clientModeCrawl(const std::shared_ptr& root); diff --git a/watchman/PendingCollection.cpp b/watchman/PendingCollection.cpp index af67c876412c..2dfe1f2cd26b 100644 --- a/watchman/PendingCollection.cpp +++ b/watchman/PendingCollection.cpp @@ -92,13 +92,15 @@ void PendingChanges::add( return add(dir->getFullPathToChild(name), now, flags); } -void PendingChanges::startRefusingSyncs() { +void PendingChanges::startRefusingSyncs(std::string_view reason) { refuseSyncs_ = true; + refuseSyncsReason_ = reason; } void PendingChanges::addSync(folly::Promise promise) { if (refuseSyncs_) { - promise.setException(std::runtime_error("Watch is shutting down")); + promise.setException(std::runtime_error(fmt::format( + "Watch is shutting down because ... {}", refuseSyncsReason_))); return; } syncs_.push_back(std::move(promise)); diff --git a/watchman/PendingCollection.h b/watchman/PendingCollection.h index 2e8556530f50..91c346a6ead4 100644 --- a/watchman/PendingCollection.h +++ b/watchman/PendingCollection.h @@ -172,13 +172,14 @@ class PendingChanges { */ uint32_t getPendingItemCount() const; - void startRefusingSyncs(); + void startRefusingSyncs(std::string_view reason); protected: art_tree, w_string> tree_; std::shared_ptr pending_; std::vector> syncs_; bool refuseSyncs_{false}; // true if we should refuse to add any more syncs + std::string refuseSyncsReason_{}; private: void maybePruneObsoletedChildren(w_string path, PendingFlags flags); diff --git a/watchman/QueryableView.h b/watchman/QueryableView.h index 6fdbd7451ab8..b83dbf23a796 100644 --- a/watchman/QueryableView.h +++ b/watchman/QueryableView.h @@ -89,7 +89,7 @@ class QueryableView : public std::enable_shared_from_this { /** * Request that helper threads shutdown (but does not join them). */ - virtual void stopThreads() {} + virtual void stopThreads(std::string_view /*reason*/) {} /** * Request that helper threads wake up and re-evaluate their state. */ diff --git a/watchman/cmds/subscribe.cpp b/watchman/cmds/subscribe.cpp index 8d51de7429b6..63f32ad44cff 100644 --- a/watchman/cmds/subscribe.cpp +++ b/watchman/cmds/subscribe.cpp @@ -129,7 +129,8 @@ void ClientSubscription::processSubscription() { " got: ", exc.what(), ". Cancel watch\n"); - root->cancel(); + root->cancel( + fmt::format("Error processing subscriptions: {}", exc.what())); } else { throw; } diff --git a/watchman/cmds/watch.cpp b/watchman/cmds/watch.cpp index 75bf759f9aa7..7aa15a89d9dc 100644 --- a/watchman/cmds/watch.cpp +++ b/watchman/cmds/watch.cpp @@ -110,7 +110,7 @@ static UntypedResponse cmd_watch_delete(Client* client, const json_ref& args) { UntypedResponse resp; resp.set( - {{"watch-del", json_boolean(root->stopWatch())}, + {{"watch-del", json_boolean(root->stopWatch("watch-del"))}, {"root", w_string_to_json(root->root_path)}}); return resp; } diff --git a/watchman/root/Root.h b/watchman/root/Root.h index e5f9bb6f5b49..5a8bd41eec36 100644 --- a/watchman/root/Root.h +++ b/watchman/root/Root.h @@ -333,13 +333,13 @@ class Root : public RootConfig, public std::enable_shared_from_this { // Requests cancellation of the root. // Returns true if this request caused the root cancellation, false // if it was already in the process of being cancelled. - bool cancel(); + bool cancel(std::string_view reason); // Returns true if the caller should stop the watch. bool considerReap(); bool removeFromWatched(); - void stopThreads(); - bool stopWatch(); + void stopThreads(std::string_view reason); + bool stopWatch(std::string_view reason); json_ref triggerListToJson() const; static std::vector getStatusForAllRoots(); diff --git a/watchman/root/iothread.cpp b/watchman/root/iothread.cpp index 75098cb34918..10b08277e57e 100644 --- a/watchman/root/iothread.cpp +++ b/watchman/root/iothread.cpp @@ -124,7 +124,7 @@ InMemoryView::Continue InMemoryView::doSettleThings( root.unilateralResponses->enqueue(json_object({{"settled", json_true()}})); if (root.considerReap()) { - root.stopWatch(); + root.stopWatch("Watch was idle for too long"); return Continue::Stop; } diff --git a/watchman/root/notifythread.cpp b/watchman/root/notifythread.cpp index 382d4f54e428..44be1e69e118 100644 --- a/watchman/root/notifythread.cpp +++ b/watchman/root/notifythread.cpp @@ -26,7 +26,9 @@ void InMemoryView::notifyThread(const std::shared_ptr& root) { "failed to start root {}, cancelling watch: {}\n", root->root_path, root->failure_reason ? *root->failure_reason : w_string{}); - root->cancel(); + root->cancel(fmt::format( + "Failed to start watcher: {}", + root->failure_reason ? root->failure_reason->view() : "")); return; } @@ -44,7 +46,7 @@ void InMemoryView::notifyThread(const std::shared_ptr& root) { auto resultFlags = watcher_->consumeNotify(root, fromWatcher); if (resultFlags.cancelSelf) { - root->cancel(); + root->cancel("Watcher noticed root has been removed."); break; } if (fromWatcher.getPendingItemCount() >= WATCHMAN_BATCH_LIMIT) { diff --git a/watchman/root/resolve.cpp b/watchman/root/resolve.cpp index 4b414574c048..15e8bdb0b048 100644 --- a/watchman/root/resolve.cpp +++ b/watchman/root/resolve.cpp @@ -283,7 +283,8 @@ std::shared_ptr w_root_resolve(const char* filename, bool auto_watch) { root->view()->startThreads(root); } catch (const std::exception& e) { log(ERR, "w_root_resolve, while calling startThreads: ", e.what()); - root->cancel(); + root->cancel( + fmt::format("Error starting threads for root: {}", e.what())); throw; } w_state_save(); diff --git a/watchman/root/threading.cpp b/watchman/root/threading.cpp index 05886c770078..f0c02979d5aa 100755 --- a/watchman/root/threading.cpp +++ b/watchman/root/threading.cpp @@ -44,12 +44,12 @@ void Root::scheduleRecrawl(const char* why) { view()->wakeThreads(); } -void Root::stopThreads() { - view()->stopThreads(); +void Root::stopThreads(std::string_view reason) { + view()->stopThreads(reason); } // Cancels a watch. -bool Root::cancel() { +bool Root::cancel(std::string_view reason) { if (inner.cancelled.exchange(true, std::memory_order_acq_rel)) { // Already cancelled. Return false. return false; @@ -62,7 +62,7 @@ bool Root::cancel() { unilateralResponses->enqueue(json_object( {{"root", w_string_to_json(root_path)}, {"canceled", json_true()}})); - stopThreads(); + stopThreads(reason); removeFromWatched(); { @@ -75,14 +75,14 @@ bool Root::cancel() { return true; } -bool Root::stopWatch() { +bool Root::stopWatch(std::string_view reason) { bool stopped = removeFromWatched(); if (stopped) { - cancel(); + cancel(reason); saveGlobalStateHook_(); } - stopThreads(); + stopThreads(reason); return stopped; } diff --git a/watchman/root/warnerr.cpp b/watchman/root/warnerr.cpp index 6784de105a0b..5905cb070b46 100644 --- a/watchman/root/warnerr.cpp +++ b/watchman/root/warnerr.cpp @@ -50,7 +50,7 @@ void handle_open_errno( if (!root.failure_reason) { root.failure_reason = warn; } - root.cancel(); + root.cancel("root inaccessible"); return; } diff --git a/watchman/root/watchlist.cpp b/watchman/root/watchlist.cpp index 33340c0f5f86..8d516abedaae 100644 --- a/watchman/root/watchlist.cpp +++ b/watchman/root/watchlist.cpp @@ -87,7 +87,7 @@ json_ref w_root_stop_watch_all() { root = it->second; } - root->cancel(); + root->cancel("watch-del-all"); if (!saveGlobalStateHook) { saveGlobalStateHook = root->getSaveGlobalStateHook(); } else { @@ -289,8 +289,8 @@ void w_root_free_watched_roots() { // ... and cancel them outside of the lock for (auto& root : roots) { - if (!root->cancel()) { - root->stopThreads(); + if (!root->cancel("main thread exiting")) { + root->stopThreads("main thread exiting"); } } diff --git a/watchman/state.cpp b/watchman/state.cpp index 1d4dbaa59b32..0db607d62341 100644 --- a/watchman/state.cpp +++ b/watchman/state.cpp @@ -249,7 +249,8 @@ bool w_root_load_state(const json_ref& state) { ") failed: ", e.what(), "\n"); - root->cancel(); + root->cancel( + fmt::format("Error starting threads for root: {}", e.what())); } } } diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index 8e90c27b34ab..94ef01a5cd2a 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -1010,7 +1010,7 @@ class EdenView final : public QueryableView { thr.detach(); } - void stopThreads() override { + void stopThreads(std::string_view /*reason*/) override { subscriberEventBase_.terminateLoopSoon(); } @@ -1085,7 +1085,7 @@ class EdenView final : public QueryableView { SCOPE_EXIT { // ensure that the root gets torn down, // otherwise we'd leave it in a broken state. - root->cancel(); + root->cancel("eden subscriber thread exiting"); }; w_set_thread_name("edensub ", root->root_path.view()); diff --git a/watchman/watcher/fsevents.cpp b/watchman/watcher/fsevents.cpp index e480901624aa..5caffab04ddd 100644 --- a/watchman/watcher/fsevents.cpp +++ b/watchman/watcher/fsevents.cpp @@ -597,7 +597,7 @@ bool FSEventsWatcher::start(const std::shared_ptr& root) { } catch (const std::exception& e) { watchman::log(watchman::ERR, "uncaught exception: ", e.what()); if (!self->subdir) { - root->cancel(); + root->cancel(fmt::format("FSEventsThread failed: {}", e.what())); } } diff --git a/watchman/watcher/portfs.cpp b/watchman/watcher/portfs.cpp index 2a31b08c232e..addb6a8a091e 100644 --- a/watchman/watcher/portfs.cpp +++ b/watchman/watcher/portfs.cpp @@ -150,7 +150,7 @@ bool PortFSWatcher::start(const std::shared_ptr& root) { struct stat st; if (stat(root->root_path.c_str(), &st)) { watchman::log(watchman::ERR, "stat failed in PortFS root delete watch"); - root->cancel(); + root->cancel("root inaccessible"); return false; } @@ -192,7 +192,7 @@ std::unique_ptr PortFSWatcher::startWatchDir( w_string fullPath{path}; if (fstat(osdir->getFd(), &st) == -1) { if (fullPath == root->root_path) { - root->cancel(); + root->cancel("root inaccessible"); } else { // whaaa? root->scheduleRecrawl("fstat failed"); diff --git a/watchman/watcher/win32.cpp b/watchman/watcher/win32.cpp index e586b7aa6ee6..06763bbb9770 100644 --- a/watchman/watcher/win32.cpp +++ b/watchman/watcher/win32.cpp @@ -157,7 +157,8 @@ void WinWatcher::readChangesThread(const std::shared_ptr& root) { ERR, "ReadDirectoryChangesW: failed, cancel watch. {}\n", win32_strerror(err)); - root->cancel(); + root->cancel( + fmt::format("ReadDirectoryChangesW failed: {}", win32_strerror(err))); return; } // Signal that we are done with init. We MUST do this AFTER our first @@ -188,7 +189,8 @@ void WinWatcher::readChangesThread(const std::shared_ptr& root) { ERR, "ReadDirectoryChangesW: failed, cancel watch. {}\n", win32_strerror(err)); - root->cancel(); + root->cancel(fmt::format( + "ReadDirectoryChangesW failed: {}", win32_strerror(err))); break; } else { initiate_read = false; @@ -243,7 +245,9 @@ void WinWatcher::readChangesThread(const std::shared_ptr& root) { PendingFlags{W_PENDING_IS_DESYNCED | W_PENDING_RECURSIVE}); } else { logf(ERR, "Cancelling watch for {}\n", root->root_path); - root->cancel(); + root->cancel(fmt::format( + "unexpected error from GetOverlappedResult: {}", + win32_strerror(err))); break; } } else { @@ -343,7 +347,7 @@ bool WinWatcher::start(const std::shared_ptr& root) { self->readChangesThread(root); } catch (const std::exception& e) { watchman::log(watchman::ERR, "uncaught exception: ", e.what()); - root->cancel(); + root->cancel(fmt::format("readChangesThread errored: {}", e.what())); } // Ensure that we signal the condition variable before we @@ -362,7 +366,7 @@ bool WinWatcher::start(const std::shared_ptr& root) { std::cv_status::timeout) { watchman::log( watchman::ERR, "timedout waiting for readChangesThread to start\n"); - root->cancel(); + root->cancel("timedout waiting for readChangesThread to start"); return false; } From 7ac85af16a1d625dccf4e94619f889d6fa902fc1 Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Tue, 11 Jun 2024 19:43:53 -0700 Subject: [PATCH 6994/7387] test hang on startup Summary: The EdenFS integration tests keep timing out in our mac build. The tests are hanging calling hg add in the backing repo when adding files and setting up the tests. hg is hanging on talking to watchman. fsevents fails for ~some reason~ and this seems to cause watchman to fail, but instead of returning an error to the user, watchman never responds. Here is a test that mocks this behavior and asserts we get the new behavior that we want after D58319081, fail instead of hang. Note: I need to make the iothread loose a race, the only tool I think I currently have in watchman to do that is to add a sleep. It's super hacky, if we feel it's too hacky then we can decide not to land this. Reviewed By: quark-zju Differential Revision: D58388193 fbshipit-source-id: 346fa368708f91eebbed75f67b216235a963ace6 --- watchman/root/iothread.cpp | 8 ++- watchman/test/FailsToStartViewTest.cpp | 67 ++++++++++++++++++++++++++ watchman/test/lib/FakeWatcher.cpp | 10 +++- watchman/test/lib/FakeWatcher.h | 5 +- 4 files changed, 86 insertions(+), 4 deletions(-) create mode 100644 watchman/test/FailsToStartViewTest.cpp diff --git a/watchman/root/iothread.cpp b/watchman/root/iothread.cpp index 10b08277e57e..baca5e3db63c 100644 --- a/watchman/root/iothread.cpp +++ b/watchman/root/iothread.cpp @@ -181,7 +181,13 @@ std::chrono::milliseconds getBiggestTimeout(const Root& root) { void InMemoryView::ioThread(const std::shared_ptr& root) { IoThreadState state{getBiggestTimeout(*root)}; state.currentTimeout = root->trigger_settle; - + // Injects a temporary blocks, only in test code. This is to + // force the iothread to loose a race with the notify thread. + // TODO: Support something like EdenFS FaultInjector so that we can do + // something less hacky. + if (config_.getBool("inject_block_in_io_thread_start", false)) { + sleep(10); + } while (Continue::Continue == stepIoThread(root, state, pendingFromWatcher_)) { } } diff --git a/watchman/test/FailsToStartViewTest.cpp b/watchman/test/FailsToStartViewTest.cpp new file mode 100644 index 000000000000..33f4b00129f0 --- /dev/null +++ b/watchman/test/FailsToStartViewTest.cpp @@ -0,0 +1,67 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +#include +#include +#include +#include "watchman/InMemoryView.h" +#include "watchman/fs/FSDetect.h" +#include "watchman/query/GlobTree.h" +#include "watchman/query/Query.h" +#include "watchman/root/Root.h" +#include "watchman/test/lib/FakeFileSystem.h" +#include "watchman/test/lib/FakeWatcher.h" +#include "watchman/watcher/Watcher.h" +#include "watchman/watchman_file.h" + +namespace { + +using namespace watchman; +using namespace std::literals::chrono_literals; +using namespace ::testing; + +Configuration getConfiguration() { + json_ref json = json_object(); + json_object_set(json, "enable_parallel_crawl", json_boolean(true)); + json_object_set(json, "inject_block_in_io_thread_start", json_boolean(true)); + return Configuration{std::move(json)}; +} + +class FailsToStartViewTest : public Test { + public: + using Continue = InMemoryView::Continue; + + const w_string root_path{FAKEFS_ROOT "root"}; + + FakeFileSystem fs; + Configuration config = getConfiguration(); + std::shared_ptr watcher = + std::make_shared(fs, true); + + std::shared_ptr view = + std::make_shared(fs, root_path, config, watcher); + PendingCollection& pending = view->unsafeAccessPendingFromWatcher(); + + FailsToStartViewTest() { + pending.lock()->ping(); + } +}; + +TEST_F(FailsToStartViewTest, can_start) { + fs.defineContents({ + FAKEFS_ROOT "root", + }); + + auto root = std::make_shared( + fs, root_path, "fs_type", w_string_to_json("{}"), config, view, [] {}); + + root->view()->startThreads(root); + ASSERT_THROW( + root->view()->waitUntilReadyToQuery().get(5000ms), std::runtime_error); +} + +} // namespace diff --git a/watchman/test/lib/FakeWatcher.cpp b/watchman/test/lib/FakeWatcher.cpp index 43d5fe91b27c..99f030248698 100644 --- a/watchman/test/lib/FakeWatcher.cpp +++ b/watchman/test/lib/FakeWatcher.cpp @@ -10,8 +10,14 @@ namespace watchman { -FakeWatcher::FakeWatcher(FileSystem& fileSystem) - : Watcher{"FakeWatcher", 0}, fileSystem_{fileSystem} {} +FakeWatcher::FakeWatcher(FileSystem& fileSystem, bool failsToStart) + : Watcher{"FakeWatcher", 0}, + fileSystem_{fileSystem}, + failsToStart_(failsToStart) {} + +bool FakeWatcher::start(const std::shared_ptr& /*root*/) { + return !failsToStart_; +} std::unique_ptr FakeWatcher::startWatchDir( const std::shared_ptr& root, diff --git a/watchman/test/lib/FakeWatcher.h b/watchman/test/lib/FakeWatcher.h index 7b3061f6a418..0a5b0481569b 100644 --- a/watchman/test/lib/FakeWatcher.h +++ b/watchman/test/lib/FakeWatcher.h @@ -15,7 +15,9 @@ class FileSystem; class FakeWatcher : public Watcher { public: - explicit FakeWatcher(FileSystem& fileSystem); + explicit FakeWatcher(FileSystem& fileSystem, bool failsToStart = false); + + bool start(const std::shared_ptr& root) override; std::unique_ptr startWatchDir( const std::shared_ptr& root, @@ -28,6 +30,7 @@ class FakeWatcher : public Watcher { private: FileSystem& fileSystem_; + bool failsToStart_; }; } // namespace watchman From 28e984038c1dcc1d4203162449ff6b8c7f1d6124 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 12 Jun 2024 09:31:10 -0700 Subject: [PATCH 6995/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/390d5d94cfc856e7b72e842b0e0b330598a7b328 https://github.com/facebook/fb303/commit/1b410a6099592b6accb1d2bdc5c0c183e4e1f85a https://github.com/facebook/fbthrift/commit/b07562ce9a683acd032c0e51d246ec89276d2f39 https://github.com/facebook/folly/commit/c640d6cd31b9ce6077a1aa6ebde7304d8ecc6fe9 https://github.com/facebook/mvfst/commit/39cfb960185b666f9e20383c319d6cdcdcb828ca https://github.com/facebook/proxygen/commit/a36073679c938aade198e92d108d4e7519dbcb38 https://github.com/facebook/wangle/commit/2207d0a0764070472ac9e01eff6503edf6db659d https://github.com/facebookexperimental/edencommon/commit/f0aed68fbcce052f380d61c3acd6f81d800d1dbd https://github.com/facebookexperimental/rust-shed/commit/c096de640c100cbeadf903dad8c7ce5adbff23b2 https://github.com/facebookincubator/fizz/commit/ee600b8dcdfb3b21a62be5257261448b9fd3aedd Reviewed By: bigfootjon fbshipit-source-id: 159dc38c954716477edf8a0c0592e1d58dae8298 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 73c4e5740b33..67d5a8daa23a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0ca43f98fd892f7151e3046b94b56099f0470ba6 +Subproject commit b07562ce9a683acd032c0e51d246ec89276d2f39 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 1a9b9e085e1d..1eaff804c2b2 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 5329008dd75679e7c50b8c271af75bdc80eb8bdd +Subproject commit c640d6cd31b9ce6077a1aa6ebde7304d8ecc6fe9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f21948e02846..c171b7095f4d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e1387989810ff74e016bfa4d404ed3682ba782a0 +Subproject commit 2207d0a0764070472ac9e01eff6503edf6db659d From b736bb585ce58ad059d2048fa531ee5cedf93ea5 Mon Sep 17 00:00:00 2001 From: Xiaowei Lu Date: Wed, 12 Jun 2024 16:10:25 -0700 Subject: [PATCH 6996/7387] debugGetScmTree -> debugGetTree Summary: Implemented a new API debugGetTree to replace the original debugGetScmTree which has limited options available. The new api supports fetching the cache info of a tree from multiple layers, just like the other two edenfs debug commands: `blob` and `blobmeta`. Reviewed By: kmancini Differential Revision: D58057223 fbshipit-source-id: cdf158ad24fd83cc0c6f4100d40322c541bc948e --- eden/fs/service/eden.thrift | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 83057b0009ee..b2d032fc4255 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -872,6 +872,30 @@ struct DebugGetBlobMetadataResponse { 1: list metadatas; } +struct DebugGetScmTreeRequest { + 1: MountId mountId; + # id of the blob we would like to fetch SCM tree for + 2: ThriftObjectId id; + # where we should fetch the blob SCM tree from + 3: DataFetchOriginSet origins; # DataFetchOrigin +} + +union ScmTreeOrError { + 1: list treeEntries; + 2: EdenError error; +} + +struct ScmTreeWithOrigin { + # the SCM tree data + 1: ScmTreeOrError scmTreeData; + # where the SCM tree was fetched from + 2: DataFetchOrigin origin; +} + +struct DebugGetScmTreeResponse { + 1: list trees; +} + struct ActivityRecorderResult { // 0 if the operation has failed. For example, // fail to start recording due to file permission issue @@ -2082,6 +2106,9 @@ service EdenService extends fb303_core.BaseService { //////// Debugging APIs //////// /** + * DEPRECATED: Use debugGetTree(). + * TODO: remove this API after 07/01/2024 + * * Get the contents of a source control Tree. * * This can be used to confirm if eden's LocalStore contains information @@ -2098,6 +2125,10 @@ service EdenService extends fb303_core.BaseService { 3: bool localStoreOnly, ) throws (1: EdenError ex); + DebugGetScmTreeResponse debugGetTree( + 1: DebugGetScmTreeRequest request, + ) throws (1: EdenError ex); + /** * Get the contents of a source control Blob. * From 54aa8f912530dec998ae13f391dfaa84f0143157 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 13 Jun 2024 09:35:25 -0700 Subject: [PATCH 6997/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/bd59ba011b7642edaa2e9ea246d380d8896c9cd1 https://github.com/facebook/fb303/commit/bac428a2d9d9eb638112da719286c2f70cb535c5 https://github.com/facebook/fbthrift/commit/800b7f375b63753646e3a3f0a1272a21742fc95d https://github.com/facebook/folly/commit/e95901bee7848858a080c9013594207091b3e1f8 https://github.com/facebook/mvfst/commit/80206da8eb44bf5432c92bbef1f26a9d9e044ec0 https://github.com/facebook/proxygen/commit/98f5876f86577cae94e60a666b257191e983238e https://github.com/facebook/wangle/commit/e4f199e46dd3fad0ba5b9dfa91ec1b631a21502f https://github.com/facebookexperimental/edencommon/commit/58c89b5b45ebd493d11f824aaf9d95e08b1693bd https://github.com/facebookexperimental/rust-shed/commit/913d5227d8b9e55156d57b332dee320985b52651 https://github.com/facebookincubator/fizz/commit/ce3e812612c896d4bd9d38c5a007bf0c894abbbd Reviewed By: bigfootjon fbshipit-source-id: 8a9272b006753eae84128d004793d6cac25f728c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 67d5a8daa23a..8310c69712c9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b07562ce9a683acd032c0e51d246ec89276d2f39 +Subproject commit 800b7f375b63753646e3a3f0a1272a21742fc95d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 1eaff804c2b2..e72121c351d0 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c640d6cd31b9ce6077a1aa6ebde7304d8ecc6fe9 +Subproject commit e95901bee7848858a080c9013594207091b3e1f8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c171b7095f4d..7034cb3c9b8e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2207d0a0764070472ac9e01eff6503edf6db659d +Subproject commit e4f199e46dd3fad0ba5b9dfa91ec1b631a21502f From 9c72f2bdad13295fc62baf8a1e587bc20e961c87 Mon Sep 17 00:00:00 2001 From: Nicholas Ormrod Date: Thu, 13 Jun 2024 09:49:35 -0700 Subject: [PATCH 6998/7387] Deshim LockFreeRingBuffer in watchman Summary: The following rules were deshimmed: ``` //folly/experimental:lock_free_ring_buffer -> //folly/concurrency/container:lock_free_ring_buffer ``` The following headers were deshimmed: ``` folly/experimental/LockFreeRingBuffer.h -> folly/concurrency/container/LockFreeRingBuffer.h ``` This is a codemod. It was automatically generated and will be landed once it is approved and tests are passing in sandcastle. You have been added as a reviewer by Sentinel or Butterfly. p:delfrbw.watchman Reviewed By: jdelliot Differential Revision: D58495932 fbshipit-source-id: 375cb21cc663b87c5bcfad4aef8e385596bc554c --- watchman/RingBuffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/RingBuffer.h b/watchman/RingBuffer.h index 59613390c5e3..1b9b506219fa 100644 --- a/watchman/RingBuffer.h +++ b/watchman/RingBuffer.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace watchman { From 2238d2ddc7b95c9cbc77f3b6faf570f9b8ef5229 Mon Sep 17 00:00:00 2001 From: Xiaowei Lu Date: Thu, 13 Jun 2024 22:37:32 -0700 Subject: [PATCH 6999/7387] expose the number of blocked faults Summary: Added a public method for FaultInjector so we can inspect the currently blocked checks. This allows us to test better when we need to make sure a certain check is currently blocking before we can do other operations. Reviewed By: kmancini Differential Revision: D58213922 fbshipit-source-id: 797289c8b22f7f57d722506f36cb542a466ea8fa --- eden/fs/service/eden.thrift | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index b2d032fc4255..e2ba93e510f9 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1661,6 +1661,14 @@ struct ChangeOwnershipRequest { struct ChangeOwnershipResponse {} +struct GetBlockedFaultsRequest { + 1: string keyclass; +} + +struct GetBlockedFaultsResponse { + 1: list keyValues; +} + service EdenService extends fb303_core.BaseService { list listMounts() throws (1: EdenError ex); void mount(1: MountArgument info) throws (1: EdenError ex); @@ -2427,6 +2435,10 @@ service EdenService extends fb303_core.BaseService { */ i64 unblockFault(1: UnblockFaultArg info) throws (1: EdenError ex); + GetBlockedFaultsResponse getBlockedFaults( + 1: GetBlockedFaultsRequest request, + ) throws (1: EdenError ex); + /** * Directly load a BackingStore object identified by id at the given path. * From 6e6c63f07c36b5332d64a81cef059647debde2fb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 14 Jun 2024 09:31:22 -0700 Subject: [PATCH 7000/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/18f922f8663299cc4068a95ef3e506a66bca3954 https://github.com/facebook/fb303/commit/557051947b9cbb80400a2e4590fee64f8d950988 https://github.com/facebook/fbthrift/commit/b5381e53bb947e67cb4d3159a8becdb3e25c6aea https://github.com/facebook/folly/commit/a806b71a49f7d5c383c161b8fe78b0460b1ccaf4 https://github.com/facebook/mvfst/commit/2dfa2adc8d242831b408eed866819c977c737a29 https://github.com/facebook/proxygen/commit/ec8ea4645ce04054fc44fc298c218e65503d2815 https://github.com/facebook/wangle/commit/f2308cb7cfaea394e40469f7b9e57cf228031bac https://github.com/facebookexperimental/edencommon/commit/1cc8fd6fef718c20963bc0b55160e1651276a7eb https://github.com/facebookexperimental/rust-shed/commit/78a6e26e9607f56a369d0a83c77189439fd1d7f5 https://github.com/facebookincubator/fizz/commit/72f3757591390a42ae18c76433ae8d70f2c353ed Reviewed By: bigfootjon fbshipit-source-id: e01364b5f371a0093d051536d61af12342811f34 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8310c69712c9..339cb80ce4b5 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 800b7f375b63753646e3a3f0a1272a21742fc95d +Subproject commit b5381e53bb947e67cb4d3159a8becdb3e25c6aea diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e72121c351d0..ae2b673d0d41 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e95901bee7848858a080c9013594207091b3e1f8 +Subproject commit a806b71a49f7d5c383c161b8fe78b0460b1ccaf4 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7034cb3c9b8e..79e53fb23b24 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e4f199e46dd3fad0ba5b9dfa91ec1b631a21502f +Subproject commit f2308cb7cfaea394e40469f7b9e57cf228031bac From 0758f7f16d4c0f5496440e0289bd85ea3ba894e4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 15 Jun 2024 09:31:19 -0700 Subject: [PATCH 7001/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/409c3807de9c7fa488f2496a7a2cdfcbb3816891 https://github.com/facebook/fb303/commit/eff55d0e242b52098e6e2036bdc17d3b0132c078 https://github.com/facebook/fbthrift/commit/77ba99c414af7185e0005d6f78549b2b60f90b00 https://github.com/facebook/folly/commit/688bdbdd6e31493eb79745d77e5b7f1a8ad3dfcb https://github.com/facebook/mvfst/commit/17b8763bd00fa18deac462cdd291e847a3ac12f8 https://github.com/facebook/proxygen/commit/835703872ee302e46763e13c33ce8dcdc30fb0a3 https://github.com/facebook/wangle/commit/63cb4528901d4b2128bb1d620f1c71ed04564a17 https://github.com/facebookexperimental/edencommon/commit/946e7ce19a3f68b77f5490df865520430831730f https://github.com/facebookexperimental/rust-shed/commit/d0d482e63072c1b373fa9127e2b7d3e6fc105c27 https://github.com/facebookincubator/fizz/commit/b88d9dcc16da2caa4fddcf28737b6a41777cded9 Reviewed By: bigfootjon fbshipit-source-id: 491d93963dac4990197d99f273276bfb3196696f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 339cb80ce4b5..d114f6316280 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b5381e53bb947e67cb4d3159a8becdb3e25c6aea +Subproject commit 77ba99c414af7185e0005d6f78549b2b60f90b00 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ae2b673d0d41..af2759638b5d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a806b71a49f7d5c383c161b8fe78b0460b1ccaf4 +Subproject commit 688bdbdd6e31493eb79745d77e5b7f1a8ad3dfcb diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 79e53fb23b24..ae0924ee8f74 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f2308cb7cfaea394e40469f7b9e57cf228031bac +Subproject commit 63cb4528901d4b2128bb1d620f1c71ed04564a17 From 03e977d713bfc7c97b184a78fc132b61c30eaf03 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 16 Jun 2024 09:31:32 -0700 Subject: [PATCH 7002/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/4f48b5a337cf60fd59feabfc46052a9e4bdc219f https://github.com/facebook/fb303/commit/3b8ca1794a6d387ac84026fe4885b9f7350b61f1 https://github.com/facebook/fbthrift/commit/6ec2024fb98174f218d20df9054f345307f6ec20 https://github.com/facebook/folly/commit/7e04ec74decce5cf59127c455056296c131d4c07 https://github.com/facebook/mvfst/commit/21e05ab699d2ff374b2fd179a9fa403cbec3d5ea https://github.com/facebook/proxygen/commit/e59aa6487fb4ee791bd39fe5fc9f0b5d4b5cb1e7 https://github.com/facebook/wangle/commit/754ecd758316e2731bf68850807f137badb077da https://github.com/facebookexperimental/edencommon/commit/b1adca0fd87ac5920bc62d083f03118944139333 https://github.com/facebookexperimental/rust-shed/commit/4f83cc152b60ac2cb439539fd6aee1915de0114d https://github.com/facebookincubator/fizz/commit/98d56fdd9e27f6f4ea9e7b485770f7fdcffcb60e Reviewed By: bigfootjon fbshipit-source-id: 6be82441902714f7a2553d9e7cb996244ff3b68f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d114f6316280..ca96044fa9a7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 77ba99c414af7185e0005d6f78549b2b60f90b00 +Subproject commit 6ec2024fb98174f218d20df9054f345307f6ec20 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index af2759638b5d..7a8c5f322186 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 688bdbdd6e31493eb79745d77e5b7f1a8ad3dfcb +Subproject commit 7e04ec74decce5cf59127c455056296c131d4c07 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ae0924ee8f74..2ce1c52f9b29 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 63cb4528901d4b2128bb1d620f1c71ed04564a17 +Subproject commit 754ecd758316e2731bf68850807f137badb077da From f6ee0299b7c6dc15ce694d2ead92fae9bce96a22 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 17 Jun 2024 09:33:50 -0700 Subject: [PATCH 7003/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/5ec78ddca16aa7b2efee1295a5f3f85fc87b9e61 https://github.com/facebook/fb303/commit/2917f00038867c8a166f5a2474ea06cfa12ef2fd https://github.com/facebook/fbthrift/commit/f77b502cf78834665391962255578a4accb759a0 https://github.com/facebook/folly/commit/f89a101bbaeca30447af2bf859197689087c67db https://github.com/facebook/mvfst/commit/02aa8348e3ce0edc13a09f5bf16d78f6232115a3 https://github.com/facebook/proxygen/commit/a837e3955fb0c6c6290552329163653586a0eed1 https://github.com/facebook/wangle/commit/4f129c31bcb7d945e54a041bd1a96e5d4a411752 https://github.com/facebookexperimental/edencommon/commit/d5f1e991c4dbe886256babb386a9204d3ea119fd https://github.com/facebookexperimental/rust-shed/commit/ec34ff1de9c55a087ad80ec4d107c5e986d50e31 https://github.com/facebookincubator/fizz/commit/9b3de9f48bed5e171006bbd1061346e199c88a32 Reviewed By: namanahuja fbshipit-source-id: c5cd6a0e4024a31115fd33254a65ceb651af6263 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ca96044fa9a7..1b4c71be28f0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6ec2024fb98174f218d20df9054f345307f6ec20 +Subproject commit f77b502cf78834665391962255578a4accb759a0 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7a8c5f322186..4f7a5f353747 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7e04ec74decce5cf59127c455056296c131d4c07 +Subproject commit f89a101bbaeca30447af2bf859197689087c67db diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2ce1c52f9b29..3fc7365b6f2f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 754ecd758316e2731bf68850807f137badb077da +Subproject commit 4f129c31bcb7d945e54a041bd1a96e5d4a411752 From 861531ff9c6318324c64f2bf5a1dae266280e106 Mon Sep 17 00:00:00 2001 From: Jun Wu Date: Mon, 17 Jun 2024 13:18:26 -0700 Subject: [PATCH 7004/7387] fix Rust clippy issues Summary: It seems clippy issues became fatal with `#[deny(warnings)]` internally. Fix them so pull requests that treat `#[deny(warnings)]` as rustc warnings, not rustc+clippy warnings can have green signals. If this continues to be an issue, we might want to disable `#[deny(warnings)]`. Reviewed By: genevievehelsel Differential Revision: D58690344 fbshipit-source-id: 14c2885f53e7d68161bb904a3febd047dcb37956 --- watchman/rust/serde_bser/src/bytestring.rs | 2 +- watchman/rust/serde_bser/src/de/bunser.rs | 2 +- watchman/rust/serde_bser/src/de/mod.rs | 12 ++--- watchman/rust/watchman_client/src/expr.rs | 36 ++++++------- watchman/rust/watchman_client/src/lib.rs | 13 ++--- watchman/rust/watchman_client/src/pdu.rs | 59 +++++++++++----------- 6 files changed, 60 insertions(+), 64 deletions(-) diff --git a/watchman/rust/serde_bser/src/bytestring.rs b/watchman/rust/serde_bser/src/bytestring.rs index 4b0fb9c6601d..3567f1267073 100644 --- a/watchman/rust/serde_bser/src/bytestring.rs +++ b/watchman/rust/serde_bser/src/bytestring.rs @@ -189,7 +189,7 @@ impl TryInto for PathBuf { type Error = &'static str; fn try_into(self) -> Result { - Ok(self.into_os_string().try_into()?) + self.into_os_string().try_into() } } diff --git a/watchman/rust/serde_bser/src/de/bunser.rs b/watchman/rust/serde_bser/src/de/bunser.rs index 3f1690154b8b..d42fb634663a 100644 --- a/watchman/rust/serde_bser/src/de/bunser.rs +++ b/watchman/rust/serde_bser/src/de/bunser.rs @@ -151,7 +151,7 @@ where BSER_INT8 => self.next_i8()? as i64, BSER_INT16 => self.next_i16()? as i64, BSER_INT32 => self.next_i32()? as i64, - BSER_INT64 => self.next_i64()? as i64, + BSER_INT64 => self.next_i64()?, ch => { return Err(Error::DeInvalidStartByte { kind: "integer".into(), diff --git a/watchman/rust/serde_bser/src/de/mod.rs b/watchman/rust/serde_bser/src/de/mod.rs index f51b240d1962..cb68b1f7082d 100644 --- a/watchman/rust/serde_bser/src/de/mod.rs +++ b/watchman/rust/serde_bser/src/de/mod.rs @@ -180,7 +180,7 @@ where match self .bunser .read_bytes(len)? - .map_result(|x| str::from_utf8(x)) + .map_result(str::from_utf8) .map_err(Error::de_reader_error)? { Reference::Borrowed(s) => visitor.visit_borrowed_str(s), @@ -277,12 +277,10 @@ where } visitor.visit_enum(variant::VariantAccess::new(self, &guard)) } - ch => { - return Err(Error::DeInvalidStartByte { - kind: format!("enum '{}'", name), - byte: ch, - }); - } + ch => Err(Error::DeInvalidStartByte { + kind: format!("enum '{}'", name), + byte: ch, + }), } } diff --git a/watchman/rust/watchman_client/src/expr.rs b/watchman/rust/watchman_client/src/expr.rs index 241f17553faa..4ba6300ebebe 100644 --- a/watchman/rust/watchman_client/src/expr.rs +++ b/watchman/rust/watchman_client/src/expr.rs @@ -85,32 +85,32 @@ pub enum Expr { FileType(FileType), } -impl Into for Expr { - fn into(self) -> Value { - match self { - Self::True => "true".into(), - Self::False => "false".into(), - Self::Not(expr) => Value::Array(vec!["not".into(), (*expr).into()]), - Self::All(expr) => { +impl From for Value { + fn from(val: Expr) -> Self { + match val { + Expr::True => "true".into(), + Expr::False => "false".into(), + Expr::Not(expr) => Value::Array(vec!["not".into(), (*expr).into()]), + Expr::All(expr) => { let mut expr: Vec = expr.into_iter().map(Into::into).collect(); expr.insert(0, "allof".into()); Value::Array(expr) } - Self::Any(expr) => { + Expr::Any(expr) => { let mut expr: Vec = expr.into_iter().map(Into::into).collect(); expr.insert(0, "anyof".into()); Value::Array(expr) } - Self::DirName(term) => { + Expr::DirName(term) => { let mut expr: Vec = vec!["dirname".into(), term.path.try_into().unwrap()]; if let Some(depth) = term.depth { expr.push(depth.into_term("depth")); } expr.into() } - Self::Empty => "empty".into(), - Self::Exists => "exists".into(), - Self::Match(term) => vec![ + Expr::Empty => "empty".into(), + Expr::Exists => "exists".into(), + Expr::Match(term) => vec![ "match".into(), term.glob.into(), if term.wholename { @@ -125,7 +125,7 @@ impl Into for Expr { }), ] .into(), - Self::Name(term) => vec![ + Expr::Name(term) => vec![ "name".into(), Value::Array( term.paths @@ -141,7 +141,7 @@ impl Into for Expr { .into(), ] .into(), - Self::Pcre(term) => vec![ + Expr::Pcre(term) => vec![ "pcre".into(), term.pattern.into(), if term.wholename { @@ -152,7 +152,7 @@ impl Into for Expr { .into(), ] .into(), - Self::Since(term) => match term { + Expr::Since(term) => match term { SinceTerm::ObservedClock(c) => { vec!["since".into(), c.into(), "oclock".into()].into() } @@ -166,13 +166,13 @@ impl Into for Expr { vec!["since".into(), c.to_string().into(), "ctime".into()].into() } }, - Self::Size(term) => term.into_term("size"), - Self::Suffix(term) => vec![ + Expr::Size(term) => term.into_term("size"), + Expr::Suffix(term) => vec![ "suffix".into(), Value::Array(term.into_iter().map(|p| p.try_into().unwrap()).collect()), ] .into(), - Self::FileType(term) => vec!["type".into(), term.to_string().into()].into(), + Expr::FileType(term) => vec!["type".into(), term.to_string().into()].into(), } } } diff --git a/watchman/rust/watchman_client/src/lib.rs b/watchman/rust/watchman_client/src/lib.rs index a53e60a48cbe..7cdc1828a37c 100644 --- a/watchman/rust/watchman_client/src/lib.rs +++ b/watchman/rust/watchman_client/src/lib.rs @@ -220,11 +220,10 @@ impl Connector { let watchman_path = self .watchman_cli_path .as_ref() - .map(|p| p.as_ref()) - .unwrap_or_else(|| Path::new("watchman")); + .map_or_else(|| Path::new("watchman"), |p| p.as_ref()); let mut cmd = Command::new(watchman_path); - cmd.args(&["--output-encoding", "bser-v2", "get-sockname"]); + cmd.args(["--output-encoding", "bser-v2", "get-sockname"]); #[cfg(windows)] cmd.creation_flags(winapi::um::winbase::CREATE_NO_WINDOW); @@ -630,7 +629,7 @@ fn bunser(buf: &[u8]) -> Result where T: serde::de::DeserializeOwned, { - let response: T = serde_bser::from_slice(&buf).map_err(|source| Error::Deserialize { + let response: T = serde_bser::from_slice(buf).map_err(|source| Error::Deserialize { source: source.into(), data: buf.to_vec(), })?; @@ -1191,7 +1190,7 @@ mod tests { let reader = StreamReader::new(stream::iter(chunks)); - let decoded = FramedRead::new(reader, BserSplitter) + FramedRead::new(reader, BserSplitter) .map_err(TaskError::from) .and_then(|bytes| async move { // We unwrap this since a) this is a test and b) serde_bser's errors aren't @@ -1201,9 +1200,7 @@ mod tests { }) .try_collect() .await - .unwrap(); - - decoded + .unwrap() } let msgs = vec![ diff --git a/watchman/rust/watchman_client/src/pdu.rs b/watchman/rust/watchman_client/src/pdu.rs index f4a2a4df2c4e..3fe3db4af3b1 100644 --- a/watchman/rust/watchman_client/src/pdu.rs +++ b/watchman/rust/watchman_client/src/pdu.rs @@ -8,6 +8,7 @@ //! This module defines the request and response PDU types used by the //! watchman protocol. +use std::fmt; use std::path::PathBuf; use serde::Deserialize; @@ -144,9 +145,9 @@ impl From for SettleDurationMs { } } -impl Into for SettleDurationMs { - fn into(self) -> i64 { - self.0.as_millis() as i64 +impl From for i64 { + fn from(val: SettleDurationMs) -> Self { + val.0.as_millis() as i64 } } @@ -203,9 +204,9 @@ impl From for SyncTimeout { } } -impl Into for SyncTimeout { - fn into(self) -> i64 { - match self { +impl From for i64 { + fn from(val: SyncTimeout) -> Self { + match val { // This is only really here because the `ClockRequestParams` PDU // treats a missing sync_timeout as `DisableCookie`, whereas // the `QueryRequestCommon` PDU treats it as `Default`. @@ -215,9 +216,9 @@ impl Into for SyncTimeout { // default behavior, we use the current default sync timeout here. // We're honestly not likely to change this, so this should be fine. // The server uses 1 minute; the value here is expressed in milliseconds. - Self::Default => 60_000, - Self::DisableCookie => 0, - Self::Duration(d) => d.as_millis() as i64, + SyncTimeout::Default => 60_000, + SyncTimeout::DisableCookie => 0, + SyncTimeout::Duration(d) => d.as_millis() as i64, } } } @@ -657,11 +658,11 @@ impl ClockSpec { } } -impl Into for ClockSpec { - fn into(self) -> Value { - match self { - Self::StringClock(st) => Value::Utf8String(st), - Self::UnixTimestamp(ts) => Value::Integer(ts), +impl From for Value { + fn from(val: ClockSpec) -> Self { + match val { + ClockSpec::StringClock(st) => Value::Utf8String(st), + ClockSpec::UnixTimestamp(ts) => Value::Integer(ts), } } } @@ -755,9 +756,9 @@ pub enum FileType { Unknown, } -impl std::string::ToString for FileType { - fn to_string(&self) -> String { - (*self).into() +impl fmt::Display for FileType { + fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { + f.write_str(&String::from(*self)) } } @@ -778,18 +779,18 @@ impl From for FileType { } } -impl Into for FileType { - fn into(self) -> String { - match self { - Self::BlockSpecial => "b", - Self::CharSpecial => "c", - Self::Directory => "d", - Self::Regular => "f", - Self::Fifo => "p", - Self::Symlink => "l", - Self::Socket => "s", - Self::SolarisDoor => "D", - Self::Unknown => "?", +impl From for String { + fn from(val: FileType) -> Self { + match val { + FileType::BlockSpecial => "b", + FileType::CharSpecial => "c", + FileType::Directory => "d", + FileType::Regular => "f", + FileType::Fifo => "p", + FileType::Symlink => "l", + FileType::Socket => "s", + FileType::SolarisDoor => "D", + FileType::Unknown => "?", } .to_string() } From 63b2384a0da6c336e7ec242e72900406de67d8a9 Mon Sep 17 00:00:00 2001 From: Matt Kulukundis Date: Mon, 17 Jun 2024 14:40:44 -0700 Subject: [PATCH 7005/7387] chore: upgrade from structopt to clap (#1224) Summary: structopt is in maintence mode and explicitly refers to clap as the successor. Modernize examples a bit and switch names to match the clap examples. Pull Request resolved: https://github.com/facebook/watchman/pull/1224 Reviewed By: chadaustin Differential Revision: D58486829 Pulled By: genevievehelsel fbshipit-source-id: 9c1c1ed7a0da7badd62fa098b6f2d3a90061d0aa --- watchman/rust/watchman_client/Cargo.toml | 6 +++--- .../rust/watchman_client/examples/glob.rs | 12 ++++++------ .../rust/watchman_client/examples/since.rs | 19 +++++++++---------- .../rust/watchman_client/examples/state.rs | 12 ++++++------ .../watchman_client/examples/subscribe.rs | 12 ++++++------ 5 files changed, 30 insertions(+), 31 deletions(-) diff --git a/watchman/rust/watchman_client/Cargo.toml b/watchman/rust/watchman_client/Cargo.toml index 2c883c207b72..498a7aba8a00 100644 --- a/watchman/rust/watchman_client/Cargo.toml +++ b/watchman/rust/watchman_client/Cargo.toml @@ -20,8 +20,8 @@ thiserror = "1.0" tokio = { version = "1.7.1", features = ["full", "test-util"] } tokio-util = { version = "0.6", features = ["full"] } -[dev-dependencies] -structopt = "0.3" - [target.'cfg(windows)'.dependencies] winapi = { version = "0.3", features = ["handleapi", "winuser"] } + +[dev-dependencies] +clap = { version = "4.5.7", features = ["derive"] } diff --git a/watchman/rust/watchman_client/examples/glob.rs b/watchman/rust/watchman_client/examples/glob.rs index 4004a693f799..e4e923b74042 100644 --- a/watchman/rust/watchman_client/examples/glob.rs +++ b/watchman/rust/watchman_client/examples/glob.rs @@ -7,14 +7,14 @@ use std::path::PathBuf; +use clap::Parser; use serde::Deserialize; -use structopt::StructOpt; use watchman_client::prelude::*; -#[derive(Debug, StructOpt)] -#[structopt(about = "Perform a glob query for a path, using watchman")] -struct Opt { - #[structopt(default_value = ".")] +/// Perform a glob query for a path, using watchman +#[derive(Debug, Parser)] +struct Cli { + #[arg(default_value = ".")] path: PathBuf, } @@ -29,7 +29,7 @@ async fn main() -> Result<(), Box> { } async fn run() -> Result<(), Box> { - let opt = Opt::from_args(); + let opt = Cli::parse(); let client = Connector::new().connect().await?; let resolved = client .resolve_root(CanonicalPath::canonicalize(opt.path)?) diff --git a/watchman/rust/watchman_client/examples/since.rs b/watchman/rust/watchman_client/examples/since.rs index 0e93e674f414..067ce0def638 100644 --- a/watchman/rust/watchman_client/examples/since.rs +++ b/watchman/rust/watchman_client/examples/since.rs @@ -10,22 +10,21 @@ use std::path::PathBuf; -use structopt::StructOpt; +use clap::Parser; use watchman_client::prelude::*; -#[derive(Debug, StructOpt)] -#[structopt(about = "Query files changed since a timestamp")] -struct Opt { - #[structopt()] - /// Specifies the clock. Use `watchman clock ` to retrieve the current clock of a watched - /// directory +/// Query files changed since a timestamp +#[derive(Debug, Parser)] +struct Cli { + /// Specifies the clock. Use `watchman clock ` to retrieve the current + /// clock of a watched directory clock: String, - #[structopt(short, long)] + #[arg(short, long)] /// [not recommended] Uses Unix timestamp as clock unix_timestamp: bool, - #[structopt(short, long, default_value = ".")] + #[arg(short, long, default_value = ".")] /// Specifies the path to watched directory path: PathBuf, } @@ -41,7 +40,7 @@ async fn main() -> Result<(), Box> { } async fn run() -> Result<(), Box> { - let opt = Opt::from_args(); + let opt = Cli::parse(); let client = Connector::new().connect().await?; let resolved = client .resolve_root(CanonicalPath::canonicalize(opt.path)?) diff --git a/watchman/rust/watchman_client/examples/state.rs b/watchman/rust/watchman_client/examples/state.rs index b77fda556983..eeef6fa27da9 100644 --- a/watchman/rust/watchman_client/examples/state.rs +++ b/watchman/rust/watchman_client/examples/state.rs @@ -7,13 +7,13 @@ use std::path::PathBuf; -use structopt::StructOpt; +use clap::Parser; use watchman_client::prelude::*; -#[derive(Debug, StructOpt)] -#[structopt(about = "Exercise the state-enter and state-leave commands")] -struct Opt { - #[structopt(default_value = ".")] +/// Exercise the state-enter and state-leave commands +#[derive(Debug, Parser)] +struct Cli { + #[arg(default_value = ".")] path: PathBuf, } @@ -28,7 +28,7 @@ async fn main() -> Result<(), Box> { } async fn run() -> Result<(), Box> { - let opt = Opt::from_args(); + let opt = Cli::parse(); let client = Connector::new().connect().await?; let resolved = client .resolve_root(CanonicalPath::canonicalize(opt.path)?) diff --git a/watchman/rust/watchman_client/examples/subscribe.rs b/watchman/rust/watchman_client/examples/subscribe.rs index 302d6cde5752..750a33ba9d25 100644 --- a/watchman/rust/watchman_client/examples/subscribe.rs +++ b/watchman/rust/watchman_client/examples/subscribe.rs @@ -9,13 +9,13 @@ //! file changes as they are reported use std::path::PathBuf; -use structopt::StructOpt; +use clap::Parser; use watchman_client::prelude::*; -#[derive(Debug, StructOpt)] -#[structopt(about = "Subscribe to watchman and stream file changes for a path")] -struct Opt { - #[structopt(default_value = ".")] +/// Subscribe to watchman and stream file changes for a path +#[derive(Debug, Parser)] +struct Cli { + #[arg(default_value = ".")] path: PathBuf, } @@ -29,7 +29,7 @@ async fn main() { } async fn run() -> Result<(), Box> { - let opt = Opt::from_args(); + let opt = Cli::parse(); let client = Connector::new().connect().await?; let resolved = client .resolve_root(CanonicalPath::canonicalize(opt.path)?) From b4f8c8d3a7f0e4cf73cd7efd38791aa19c62b3be Mon Sep 17 00:00:00 2001 From: Matt Kulukundis Date: Mon, 17 Jun 2024 17:38:35 -0700 Subject: [PATCH 7006/7387] feat: add rust client apis for trigger, trigger-list, trigger-del (#1221) Summary: Pull Request resolved: https://github.com/facebook/watchman/pull/1221 Reviewed By: genevievehelsel Differential Revision: D58467377 Pulled By: quark-zju fbshipit-source-id: 31224a1518e7af66f323b807eacac9a9a4bdb426 --- .gitignore | 2 - watchman/rust/.gitignore | 2 + .../rust/watchman_client/examples/trigger.rs | 101 +++++++++++++++ watchman/rust/watchman_client/src/lib.rs | 36 ++++++ watchman/rust/watchman_client/src/pdu.rs | 116 ++++++++++++++++++ 5 files changed, 255 insertions(+), 2 deletions(-) create mode 100644 watchman/rust/.gitignore create mode 100644 watchman/rust/watchman_client/examples/trigger.rs diff --git a/.gitignore b/.gitignore index be9c14f04a38..95a62d36f406 100644 --- a/.gitignore +++ b/.gitignore @@ -81,8 +81,6 @@ libtool ltmain.sh cppclient/watchmanclient.pc /website/.jekyll-metadata -/rust/**/Cargo.lock -/rust/**/target/ /CMakeCache.txt /CMakeFiles /*.cmake diff --git a/watchman/rust/.gitignore b/watchman/rust/.gitignore new file mode 100644 index 000000000000..35709a7c97d3 --- /dev/null +++ b/watchman/rust/.gitignore @@ -0,0 +1,2 @@ +*/Cargo.lock +*/target/ diff --git a/watchman/rust/watchman_client/examples/trigger.rs b/watchman/rust/watchman_client/examples/trigger.rs new file mode 100644 index 000000000000..d15ca4f55ff7 --- /dev/null +++ b/watchman/rust/watchman_client/examples/trigger.rs @@ -0,0 +1,101 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +//! This example shows how to setup and remove a persistent trigger. + +use std::path::Path; +use std::path::PathBuf; + +use clap::Parser; +use watchman_client::prelude::*; + +/// Interact with watchman triggers. +#[derive(Debug, Parser)] +enum Cli { + /// Registers a watcher trigger that will stream the list of files modified. + Register { + /// Specifies the path to watched directory + path: PathBuf, + + /// Specifies the name of the trigger to register. + name: String, + + /// Specifies the output file, must be prefixed with `>` or `>>`. + output_file: String, + }, + /// Removes a watcher trigger. + Del { + /// Specifies the path to watched directory + path: PathBuf, + + /// Specifies the name of the trigger to remove. + name: String, + }, + /// Lists all watcher triggers for a path. + List { + /// Specifies the path to watched directory + path: PathBuf, + }, +} +impl Cli { + fn path(&self) -> &Path { + match self { + Self::Register { path, .. } => path, + Self::Del { path, .. } => path, + Self::List { path, .. } => path, + } + } +} + +#[tokio::main(flavor = "current_thread")] +async fn main() -> Result<(), Box> { + if let Err(err) = run().await { + // Print a prettier error than the default + eprintln!("{}", err); + std::process::exit(1); + } + Ok(()) +} + +async fn run() -> Result<(), Box> { + let command = Cli::parse(); + let client = Connector::new().connect().await?; + + let resolved = client + .resolve_root(CanonicalPath::canonicalize(command.path())?) + .await?; + + match command { + Cli::Del { name, .. } => { + let result = client.remove_trigger(&resolved, &name).await?; + println!("{:?}", result); + } + Cli::List { .. } => { + let result = client.list_triggers(&resolved).await?; + println!("{:?}", result); + } + Cli::Register { + name, output_file, .. + } => { + let result = client + .register_trigger( + &resolved, + TriggerRequest { + name, + stdout: Some(output_file), + stdin: Some(TriggerStdinConfig::NamePerLine), + command: vec!["cat".to_string()], + ..Default::default() + }, + ) + .await?; + println!("{:?}", result); + } + } + + Ok(()) +} diff --git a/watchman/rust/watchman_client/src/lib.rs b/watchman/rust/watchman_client/src/lib.rs index 7cdc1828a37c..4b4f0b04f98e 100644 --- a/watchman/rust/watchman_client/src/lib.rs +++ b/watchman/rust/watchman_client/src/lib.rs @@ -1156,6 +1156,42 @@ impl Client { .await?; Ok(response.config) } + + /// Registers a trigger. + pub async fn register_trigger( + &self, + root: &ResolvedRoot, + request: TriggerRequest, + ) -> Result { + let response: TriggerResponse = self + .generic_request(TriggerCommand("trigger", root.root.clone(), request)) + .await?; + Ok(response) + } + + /// Removes a registered trigger. + pub async fn remove_trigger( + &self, + root: &ResolvedRoot, + name: &str, + ) -> Result { + let response: TriggerDelResponse = self + .generic_request(TriggerDelCommand( + "trigger-del", + root.root.clone(), + name.into(), + )) + .await?; + Ok(response) + } + + /// Lists registered triggers. + pub async fn list_triggers(&self, root: &ResolvedRoot) -> Result { + let response: TriggerListResponse = self + .generic_request(TriggerListCommand("trigger-list", root.root.clone())) + .await?; + Ok(response) + } } #[cfg(test)] diff --git a/watchman/rust/watchman_client/src/pdu.rs b/watchman/rust/watchman_client/src/pdu.rs index 3fe3db4af3b1..3a1ae97f89e2 100644 --- a/watchman/rust/watchman_client/src/pdu.rs +++ b/watchman/rust/watchman_client/src/pdu.rs @@ -13,6 +13,7 @@ use std::path::PathBuf; use serde::Deserialize; use serde::Serialize; +use serde::Serializer; use serde_bser::value::Value; use crate::expr::Expr; @@ -560,6 +561,121 @@ pub struct SubscribeResponse { pub saved_state_info: Option, } +/// The `trigger` command request. +/// +/// The fields are explained in detail here: +/// +#[derive(Deserialize, Serialize, Default, Clone, Debug)] +pub struct TriggerRequest { + /// Defines the name of the trigger. + pub name: String, + + /// Specifies the command to invoke. + pub command: Vec, + + /// It true, matching files (up to system limits) will be added to the + /// command's execution args. + #[serde(default, skip_serializing_if = "is_false")] + pub append_files: bool, + + /// Specifies the expression used to filter candidate matches. + #[serde(skip_serializing_if = "Option::is_none", skip_deserializing)] + pub expression: Option, + + /// Configure the way `stdin` is configured for the executed trigger. + #[serde( + default, + skip_serializing_if = "Option::is_none", + serialize_with = "TriggerStdinConfig::serialize", + skip_deserializing + )] + pub stdin: Option, + + /// Specifies a file to write the output stream to. Prefix with `>` to + /// overwrite and `>>` to append. + #[serde(skip_serializing_if = "Option::is_none")] + pub stdout: Option, + + /// Specifies a file to write the error stream to. Prefix with `>` to + /// overwrite and `>>` to append. + #[serde(skip_serializing_if = "Option::is_none")] + pub stderr: Option, + + /// Specifies a limit on the number of files reported on stdin when stdin is + /// set to hold the set of matched files. + #[serde(skip_serializing_if = "Option::is_none")] + pub max_files_stdin: Option, + + /// Specifies the working directory that will be set prior to spawning the + /// process. The default is to set the working directory to the watched + /// root. The value of this property is a string that will be interpreted + /// relative to the watched root. + #[serde(skip_serializing_if = "Option::is_none")] + pub chdir: Option, + + /// Since 3.4. Evaluates triggers with respect to a path within a watched root. + /// + /// See + #[serde(skip_serializing_if = "Option::is_none")] + pub relative_root: Option, +} + +#[derive(Clone, Debug)] +pub enum TriggerStdinConfig { + DevNull, + FieldNames(Vec), + NamePerLine, +} + +impl Default for TriggerStdinConfig { + fn default() -> Self { + Self::DevNull + } +} + +impl TriggerStdinConfig { + fn serialize(this: &Option, serializer: S) -> Result + where + S: Serializer, + { + match this { + Some(Self::DevNull) => serializer.serialize_str("/dev/null"), + Some(Self::FieldNames(names)) => serializer.collect_seq(names.iter()), + Some(Self::NamePerLine) => serializer.serialize_str("NAME_PER_LINE"), + None => serializer.serialize_none(), + } + } +} + +#[derive(Serialize, Clone, Debug)] +pub struct TriggerCommand(pub &'static str, pub PathBuf, pub TriggerRequest); + +#[derive(Deserialize, Debug)] +pub struct TriggerResponse { + pub version: String, + pub disposition: String, + pub triggerid: String, +} + +#[derive(Serialize, Clone, Debug)] +pub struct TriggerDelCommand(pub &'static str, pub PathBuf, pub String); + +#[derive(Deserialize, Debug)] +pub struct TriggerDelResponse { + pub version: String, + pub deleted: bool, + pub trigger: String, +} + +#[derive(Serialize, Clone, Debug)] +pub struct TriggerListCommand(pub &'static str, pub PathBuf); + +#[derive(Deserialize, Debug)] +pub struct TriggerListResponse { + pub version: String, + pub triggers: Vec, +} + #[derive(Serialize, Debug)] pub struct Unsubscribe(pub &'static str, pub PathBuf, pub String); From 4970f27732348f73120c70dbb0dad0eaacd01d34 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 18 Jun 2024 09:33:27 -0700 Subject: [PATCH 7007/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/b4660ca183fb1c2e1f7472b1beba34607090b644 https://github.com/facebook/fb303/commit/8762432f0030d2213c7d1b87933dfc83c6f8cbab https://github.com/facebook/fbthrift/commit/884633e4c8ead82661a6901b3596ce9178a36e31 https://github.com/facebook/folly/commit/5ef585f2ca32328b8b5104af9c8ca6d1b7457bc1 https://github.com/facebook/mvfst/commit/495b8e9b643d1d8e50dcbe7cca6342a391b07e74 https://github.com/facebook/proxygen/commit/87ac7f6c1d71630f7e3a1c9b199e0249c977b17f https://github.com/facebook/wangle/commit/8983636055fd0004789c816bdb3d98a171ee2d1a https://github.com/facebookexperimental/edencommon/commit/211cb4c1fe6b43282606a09b1fc3af942d73aa6d https://github.com/facebookexperimental/rust-shed/commit/9bac004c5d160eccab5a5ee7ebc8f27d4f8caa3f https://github.com/facebookincubator/fizz/commit/b3c7ed61ffba30547cf826ed1a4320ca02d931b5 Reviewed By: namanahuja fbshipit-source-id: 6cb296aed7d4a3b06f6cc48ebddf32609be170a1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1b4c71be28f0..e61b3e9c4355 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f77b502cf78834665391962255578a4accb759a0 +Subproject commit 884633e4c8ead82661a6901b3596ce9178a36e31 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4f7a5f353747..640b37867b7b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f89a101bbaeca30447af2bf859197689087c67db +Subproject commit 5ef585f2ca32328b8b5104af9c8ca6d1b7457bc1 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3fc7365b6f2f..5c91ae737771 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 4f129c31bcb7d945e54a041bd1a96e5d4a411752 +Subproject commit 8983636055fd0004789c816bdb3d98a171ee2d1a From 0024699a8e18ae7332b086cc0dc2e1d8d36b0742 Mon Sep 17 00:00:00 2001 From: Koichi Shiraishi Date: Tue, 18 Jun 2024 11:11:12 -0700 Subject: [PATCH 7008/7387] Fix GHA `package` job's `needs` section name to docker-ubuntu (#1223) Summary: SSIA Pull Request resolved: https://github.com/facebook/watchman/pull/1223 Reviewed By: fanzeyi Differential Revision: D58435908 fbshipit-source-id: 9ea8ebfdcc07817cb74faa6abcde2b8b48468d32 --- .github/workflows/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 050d9e32a362..535a9135420c 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -29,7 +29,7 @@ jobs: tags: ${{ format('ghcr.io/{0}/watchman-build-env:latest', github.repository) }} clone-and-build-and-package-ubuntu: - needs: docker + needs: docker-ubuntu runs-on: ubuntu-latest container: image: ${{ format('ghcr.io/{0}/watchman-build-env:latest', github.repository) }} From 5430065a7928c73f0f1891a708d1954efb3ff762 Mon Sep 17 00:00:00 2001 From: Jun Wu Date: Tue, 18 Jun 2024 13:31:07 -0700 Subject: [PATCH 7009/7387] rust: bump Cargo.toml version Summary: Bump version before `cargo publish`. Reviewed By: MichaelCuevas Differential Revision: D58750632 fbshipit-source-id: e847d677b8254baa7b6aaa118e55487c3879e53d --- watchman/rust/watchman_client/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/rust/watchman_client/Cargo.toml b/watchman/rust/watchman_client/Cargo.toml index 498a7aba8a00..db9d0bb7c86d 100644 --- a/watchman/rust/watchman_client/Cargo.toml +++ b/watchman/rust/watchman_client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "watchman_client" -version = "0.8.0" +version = "0.9.0" authors = ["Wez Furlong"] edition = "2021" description = "a client for the Watchman file watching service" From 58a8b4e39385d5e8ef8dfd12c1f5237177340e10 Mon Sep 17 00:00:00 2001 From: Jun Wu Date: Tue, 18 Jun 2024 15:23:48 -0700 Subject: [PATCH 7010/7387] rust: fix compile on Windows Summary: Fix various errors when building on Windows: error[E0432]: unresolved import `winapi::um::fileapi` --> src\named_pipe.rs:21:17 | 21 | use winapi::um::fileapi::CreateFileW; | ^^^^^^^ could not find `fileapi` in `um` | error[E0432]: unresolved import `winapi::um::winbase` --> src\named_pipe.rs:23:17 | 23 | use winapi::um::winbase::FILE_FLAG_OVERLAPPED; | ^^^^^^^ could not find `winbase` in `um` | error: field `unilateral` is never read --> src\lib.rs:589:17 | 588 | pub struct Unilateral { | ---------- field in this struct 589 | pub unilateral: bool, | ^^^^^^^^^^ | = note: `Unilateral` has a derived impl for the trait `Debug`, but this is intentionally ignored during dead code analysis Reviewed By: MichaelCuevas Differential Revision: D58751973 fbshipit-source-id: b5575466bf6ad0b36fd383ebc4c3099ed3182b1f --- watchman/rust/watchman_client/Cargo.toml | 2 +- watchman/rust/watchman_client/src/lib.rs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/watchman/rust/watchman_client/Cargo.toml b/watchman/rust/watchman_client/Cargo.toml index db9d0bb7c86d..5acddc865824 100644 --- a/watchman/rust/watchman_client/Cargo.toml +++ b/watchman/rust/watchman_client/Cargo.toml @@ -21,7 +21,7 @@ tokio = { version = "1.7.1", features = ["full", "test-util"] } tokio-util = { version = "0.6", features = ["full"] } [target.'cfg(windows)'.dependencies] -winapi = { version = "0.3", features = ["handleapi", "winuser"] } +winapi = { version = "0.3", features = ["fileapi", "handleapi", "winbase", "winuser"] } [dev-dependencies] clap = { version = "4.5.7", features = ["derive"] } diff --git a/watchman/rust/watchman_client/src/lib.rs b/watchman/rust/watchman_client/src/lib.rs index 4b4f0b04f98e..1d102fe0b2bd 100644 --- a/watchman/rust/watchman_client/src/lib.rs +++ b/watchman/rust/watchman_client/src/lib.rs @@ -586,6 +586,7 @@ impl ClientTask { use serde::Deserialize; #[derive(Deserialize, Debug)] pub struct Unilateral { + #[allow(unused)] pub unilateral: bool, pub subscription: String, #[serde(default)] From 4ca1230f1cce298f16cb47d65dc7a49ae935a2e8 Mon Sep 17 00:00:00 2001 From: Jun Wu Date: Tue, 18 Jun 2024 15:23:48 -0700 Subject: [PATCH 7011/7387] serde_bser: bump version Summary: Bump version before `cargo publish`. D43141282 is a breaking change. So I bumped 0.3 to 0.4. Reviewed By: MichaelCuevas Differential Revision: D58752248 fbshipit-source-id: b508151208608d195e1ad98c5322108031b00ae9 --- watchman/rust/serde_bser/Cargo.toml | 2 +- watchman/rust/watchman_client/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/watchman/rust/serde_bser/Cargo.toml b/watchman/rust/serde_bser/Cargo.toml index 3e86ed1232dc..398f5fad89f3 100644 --- a/watchman/rust/serde_bser/Cargo.toml +++ b/watchman/rust/serde_bser/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde_bser" -version = "0.3.1" +version = "0.4.0" authors = ["Rain ", "Wez Furlong"] edition = "2021" description = "Implements the Watchman BSER encoding for serde. https://facebook.github.io/watchman/docs/bser.html" diff --git a/watchman/rust/watchman_client/Cargo.toml b/watchman/rust/watchman_client/Cargo.toml index 5acddc865824..6549b635d59a 100644 --- a/watchman/rust/watchman_client/Cargo.toml +++ b/watchman/rust/watchman_client/Cargo.toml @@ -15,7 +15,7 @@ bytes = { version = "1.0", features = ["serde"] } futures = { version = "0.3.13", features = ["async-await", "compat"] } maplit = "1.0" serde = { version = "1.0.126", features = ["derive", "rc"] } -serde_bser = { version = "0.3", path = "../serde_bser" } +serde_bser = { version = "0.4", path = "../serde_bser" } thiserror = "1.0" tokio = { version = "1.7.1", features = ["full", "test-util"] } tokio-util = { version = "0.6", features = ["full"] } From c3536143cab534cdd9696eb3e2d03c4ac1e2f883 Mon Sep 17 00:00:00 2001 From: Jun Wu Date: Tue, 18 Jun 2024 15:23:48 -0700 Subject: [PATCH 7012/7387] rust: relax deny(warnings) to internal-only Summary: `deny(warnings)` makes the code fragile with subtle compiler differences (upgrade, or internal vs external configuration). For example, the external rustc complains: C:\src\watchman\watchman\rust\watchman_client>cargo check Checking watchman_client v0.9.0 (C:\open\watchman\watchman\rust\watchman_client) error: field `unilateral` is never read --> src\lib.rs:589:17 | 588 | pub struct Unilateral { | ---------- field in this struct 589 | pub unilateral: bool, | ^^^^^^^^^^ | = note: `Unilateral` has a derived impl for the trait `Debug`, but this is intentionally ignored during dead code analysis while the internal one doesn't: watchman/rust/watchman_client % arc rust-check --flagfile fbcode//mode/win :watchman_client .. BXL SUCCEEDED It seems a bad idea to publish an internally-green code that fails to compile externally, or has to upgrade the code every time a compiler upgrade detects some new issues. Let's just limit `deny(warnings)` to internal only when building with buck. See also https://www.reddit.com/r/rust/comments/f5xpib/psa_denywarnings_is_actively_harmful/ Reviewed By: MichaelCuevas Differential Revision: D58753075 fbshipit-source-id: bd09c09b4195c884172afab2200e3b2857af67d3 --- watchman/rust/serde_bser/src/lib.rs | 3 ++- watchman/rust/watchman_client/src/lib.rs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/watchman/rust/serde_bser/src/lib.rs b/watchman/rust/serde_bser/src/lib.rs index cf2fe51b2202..b169c977cf05 100644 --- a/watchman/rust/serde_bser/src/lib.rs +++ b/watchman/rust/serde_bser/src/lib.rs @@ -1,4 +1,3 @@ -#![deny(warnings, rust_2018_idioms)] /* * Copyright (c) Meta Platforms, Inc. and affiliates. * @@ -6,6 +5,8 @@ * LICENSE file in the root directory of this source tree. */ +#![cfg_attr(fbcode_build, deny(warnings, rust_2018_idioms))] + pub mod bytestring; pub mod de; mod errors; diff --git a/watchman/rust/watchman_client/src/lib.rs b/watchman/rust/watchman_client/src/lib.rs index 1d102fe0b2bd..df902313c6a5 100644 --- a/watchman/rust/watchman_client/src/lib.rs +++ b/watchman/rust/watchman_client/src/lib.rs @@ -33,7 +33,7 @@ //! Ok(()) //! } //! ``` -#![deny(warnings)] +#![cfg_attr(fbcode_build, deny(warnings))] pub mod expr; pub mod fields; From 7e2e17b4313208bfd495c6a3f4b7c8494f41768f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 19 Jun 2024 09:36:14 -0700 Subject: [PATCH 7013/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/d2ad2209a3b3dc6abb602725c5740c526be6f20e https://github.com/facebook/fb303/commit/eaa23e7209c21f5a3a7fcd3456c13861f9612cf7 https://github.com/facebook/fbthrift/commit/97d4efa57ca4d89ec42d044bcfe935db476b59ab https://github.com/facebook/folly/commit/113a478ca657faf260907227bdcc7b0a6dd333cf https://github.com/facebook/mvfst/commit/8e9d4382e61a1ea28b95754d9f8b0c518d6c5ddf https://github.com/facebook/proxygen/commit/d51a5706f890af67510c83b1273510cacdb2b651 https://github.com/facebook/wangle/commit/918d2995cbd130f95966341993856fb646533e6a https://github.com/facebookexperimental/edencommon/commit/be41bd0aa051b55c0b2b5775b88c7d926868fd72 https://github.com/facebookexperimental/rust-shed/commit/7f054d118896fd0b1dfde9be0029974682e90239 https://github.com/facebookincubator/fizz/commit/8847c5c7cc66b8f5396f3bcbbe02cfc0ff5bf463 Reviewed By: namanahuja fbshipit-source-id: 6de35f16a3321b4f65e32fa1287d43ae6e2866bc --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e61b3e9c4355..ccb905b32f8a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 884633e4c8ead82661a6901b3596ce9178a36e31 +Subproject commit 97d4efa57ca4d89ec42d044bcfe935db476b59ab diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 640b37867b7b..bd26468a8c3b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 5ef585f2ca32328b8b5104af9c8ca6d1b7457bc1 +Subproject commit 113a478ca657faf260907227bdcc7b0a6dd333cf diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5c91ae737771..86496c2ae873 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8983636055fd0004789c816bdb3d98a171ee2d1a +Subproject commit 918d2995cbd130f95966341993856fb646533e6a From 230a8d21903bca3f39aa0be2cec9bf9a49906e3d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 20 Jun 2024 09:36:03 -0700 Subject: [PATCH 7014/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/041c8b9b4c2ed9e49e50e68f75fdd570b3b22126 https://github.com/facebook/fb303/commit/9b688345b3bd170f580690978f5cb62a4ae59e68 https://github.com/facebook/fbthrift/commit/8efc4a3ac72357e1a9b14287fa0fccf4237d1356 https://github.com/facebook/folly/commit/2c1c617e9e757eec17df0cb60990372e51ce5396 https://github.com/facebook/mvfst/commit/2e4074d117d51ad6e451941f5a2fbd09e77c599e https://github.com/facebook/proxygen/commit/1fed3b121aa6c5b311f724707254c153045dc99f https://github.com/facebook/wangle/commit/b19780b691fc25f3ebca833f305f839819a48278 https://github.com/facebookexperimental/edencommon/commit/0bb26544325a950e5002b9f01654baf7c9b27294 https://github.com/facebookexperimental/rust-shed/commit/afa347a0cc9960b955f63590a1c68445a39fef76 https://github.com/facebookincubator/fizz/commit/e2ee688a979561380165bf2041ffab91f5dda9e0 Reviewed By: namanahuja fbshipit-source-id: 9f8158ce161dcc186a306c8a5fc838a83aa83769 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ccb905b32f8a..9db892d0c21d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 97d4efa57ca4d89ec42d044bcfe935db476b59ab +Subproject commit 8efc4a3ac72357e1a9b14287fa0fccf4237d1356 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index bd26468a8c3b..09bb50379004 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 113a478ca657faf260907227bdcc7b0a6dd333cf +Subproject commit 2c1c617e9e757eec17df0cb60990372e51ce5396 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 86496c2ae873..50adbd309135 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 918d2995cbd130f95966341993856fb646533e6a +Subproject commit b19780b691fc25f3ebca833f305f839819a48278 From 1358ebf1c641e79654e8b61df751e455f48ec590 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 21 Jun 2024 09:32:29 -0700 Subject: [PATCH 7015/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/e2a9da42106cc9fcfe0921d10dc96255c281c603 https://github.com/facebook/fb303/commit/05c1196fe9bac1c4b201503dcbd749ad8d4a840c https://github.com/facebook/fbthrift/commit/57ac13afc2e861cb9ca2ea43a2d95dbaea65ea49 https://github.com/facebook/folly/commit/d0bdf42824c0ecbd929da01d8579a4193f02c4b3 https://github.com/facebook/mvfst/commit/1aa0ed37274242bdede8482b7f208eaab47b4f43 https://github.com/facebook/proxygen/commit/8c1430a3dc711e415dcef06a4585c1222c49bc75 https://github.com/facebook/wangle/commit/9b163d81a20dd2e678670fba764eaa8c3a79aa9e https://github.com/facebookexperimental/edencommon/commit/91602ea76de9035f970808633c7857eb116a56ba https://github.com/facebookexperimental/rust-shed/commit/93d42e690318ac6ba6374a72a2d640e327fdba1e https://github.com/facebookincubator/fizz/commit/43169fcdf8c225aa4f480ba808a237ee9a96b79e Reviewed By: namanahuja fbshipit-source-id: 5e5f05853963dc9fb1710ac49883fa48b215ee40 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9db892d0c21d..ea2c2ef0a025 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8efc4a3ac72357e1a9b14287fa0fccf4237d1356 +Subproject commit 57ac13afc2e861cb9ca2ea43a2d95dbaea65ea49 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 09bb50379004..a4fb5a84130e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 2c1c617e9e757eec17df0cb60990372e51ce5396 +Subproject commit d0bdf42824c0ecbd929da01d8579a4193f02c4b3 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 50adbd309135..3698fd437357 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b19780b691fc25f3ebca833f305f839819a48278 +Subproject commit 9b163d81a20dd2e678670fba764eaa8c3a79aa9e From f2f26603a8fc02a74b79b79049dff81bac713c18 Mon Sep 17 00:00:00 2001 From: Yedidya Feldblum Date: Fri, 21 Jun 2024 18:45:06 -0700 Subject: [PATCH 7016/7387] upgrade libsodium to v1.0.20 (#894) Summary: Pull Request resolved: https://github.com/facebookincubator/zstrong/pull/894 Differential Revision: D58857611 fbshipit-source-id: 976133f7d962449c9f1361ef9dbc3a57a7a7dd8a --- build/fbcode_builder/manifests/libsodium | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build/fbcode_builder/manifests/libsodium b/build/fbcode_builder/manifests/libsodium index e4c7dbdc6943..9ffd9bf4df1c 100644 --- a/build/fbcode_builder/manifests/libsodium +++ b/build/fbcode_builder/manifests/libsodium @@ -12,25 +12,25 @@ libsodium-devel libsodium-static [download.not(os=windows)] -url = https://github.com/jedisct1/libsodium/releases/download/1.0.17/libsodium-1.0.17.tar.gz -sha256 = 0cc3dae33e642cc187b5ceb467e0ad0e1b51dcba577de1190e9ffa17766ac2b1 +url = https://github.com/jedisct1/libsodium/releases/download/1.0.20-RELEASE/libsodium-1.0.20.tar.gz +sha256 = ebb65ef6ca439333c2bb41a0c1990587288da07f6c7fd07cb3a18cc18d30ce19 [build.not(os=windows)] builder = autoconf -subdir = libsodium-1.0.17 +subdir = libsodium-1.0.20 [download.os=windows] -url = https://download.libsodium.org/libsodium/releases/old/unsupported/libsodium-1.0.17-msvc.zip -sha256 = f0f32ad8ebd76eee99bb039f843f583f2babca5288a8c26a7261db9694c11467 +url = https://github.com/jedisct1/libsodium/releases/download/1.0.20-RELEASE/libsodium-1.0.20-msvc.zip +sha256 = 2ff97f9e3f5b341bdc808e698057bea1ae454f99e29ff6f9b62e14d0eb1b1baa [build.os=windows] builder = nop [install.files.os=windows] -x64/Release/v141/dynamic/libsodium.dll = bin/libsodium.dll -x64/Release/v141/dynamic/libsodium.lib = lib/libsodium.lib -x64/Release/v141/dynamic/libsodium.exp = lib/libsodium.exp -x64/Release/v141/dynamic/libsodium.pdb = lib/libsodium.pdb -include = include +libsodium/x64/Release/v143/dynamic/libsodium.dll = bin/libsodium.dll +libsodium/x64/Release/v143/dynamic/libsodium.lib = lib/libsodium.lib +libsodium/x64/Release/v143/dynamic/libsodium.exp = lib/libsodium.exp +libsodium/x64/Release/v143/dynamic/libsodium.pdb = lib/libsodium.pdb +libsodium/include = include [autoconf.args] From aec500c7ae45a6856b6d8e6ee363748d112f8a50 Mon Sep 17 00:00:00 2001 From: Saurav Prakash Date: Fri, 21 Jun 2024 21:18:10 -0700 Subject: [PATCH 7017/7387] trace hg outstanding (1/4): Add new API in EdenFs's thrift service interface Summary: # Background: EdenFs has tracing capabilities for various events such as fs, hg, inode, and thrift to make its inner workings visible and debuggable. However, the current tracing tools do not have a complete matrix of live, outstanding, and historical modes. # Solution: This diff introduces a new API to fill the outstanding hg cell of the matrix. This endpoint will allow collecting all the current in-progress hg events, such as network requests, etc. With this addition, EdenFS will have a more comprehensive set of tracing tools to help developers better understand and debug its behavior. # Implementation: 1. **Add a new API `debugOutstandingHgEvents` to EdenFs's thrift interface** 2. Introduce a buffer of hg events in Sapling backing store and populate it by subscribing to hg trace bus. 3. Implement thrift API `debugOutstandingHgEvents` using the buffered outstanding events in Sapling backing store as response 4. Use `debugOutstandingHgEvents` thrift API to show outstanding events in the `eden trace` CLI. # Tracking: [Scuba](https://fburl.com/scuba/edenfs_cli_usage/k9exc5hc) Differential Revision: D58750160 fbshipit-source-id: 55f25785ca103a562316b96056b1ad224b136fbf --- eden/fs/service/eden.thrift | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index e2ba93e510f9..5b2e67e3cf9b 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -2224,6 +2224,11 @@ service EdenService extends fb303_core.BaseService { */ list debugOutstandingThriftRequests(); + /** + * Get the list of outstanding file download events from source control servers + */ + list debugOutstandingHgEvents(1: PathString mountPoint); + /** * Start recording performance metrics such as files read * From 63f009ccacbd8756308c068b1bb7f601f2a932f4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 22 Jun 2024 09:31:50 -0700 Subject: [PATCH 7018/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/5564c183826cb1c96d03bcce2a980636afbeff01 https://github.com/facebook/fb303/commit/9303adc4b8e8655dbbb3b24032f756d076809e92 https://github.com/facebook/fbthrift/commit/a87e9695b6239b3298cd1fba20f73449e0a785eb https://github.com/facebook/folly/commit/a8702dbc34fb9da1a32492b06c116e6c8e6cf701 https://github.com/facebook/mvfst/commit/505a632b64b9320c70ae21b3c1d55c361c51fd4d https://github.com/facebook/proxygen/commit/6405fff065901ab65b6c82b4de83675d18df6b87 https://github.com/facebook/wangle/commit/afda5a4c571111cdff0e9d8b61ea9c0abf6a6cb9 https://github.com/facebookexperimental/edencommon/commit/bca6f20284cbff73a1f37dc1788d0b722ea259d3 https://github.com/facebookexperimental/rust-shed/commit/8b1f22f366858a4441f7c308267207380248520b https://github.com/facebookincubator/fizz/commit/9a922229eb10a0dddf5b8750f19058bbd0473106 Reviewed By: namanahuja fbshipit-source-id: afc4a3720aabceb0123661a1c9f446907c3188c5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ea2c2ef0a025..18d5ee338cba 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 57ac13afc2e861cb9ca2ea43a2d95dbaea65ea49 +Subproject commit a87e9695b6239b3298cd1fba20f73449e0a785eb diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a4fb5a84130e..afd8f02d3cd0 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d0bdf42824c0ecbd929da01d8579a4193f02c4b3 +Subproject commit a8702dbc34fb9da1a32492b06c116e6c8e6cf701 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3698fd437357..107fa91c0169 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9b163d81a20dd2e678670fba764eaa8c3a79aa9e +Subproject commit afda5a4c571111cdff0e9d8b61ea9c0abf6a6cb9 From bccec7d3714ce4c84d4564300988f203ba917f5e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 23 Jun 2024 09:32:11 -0700 Subject: [PATCH 7019/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/142028ba2d5bcd3bebd976c08b2abfb94400f5ce https://github.com/facebook/fbthrift/commit/0cbd38b095cad165c9e4e6a89d186de73c081e1c https://github.com/facebook/folly/commit/216baa676dcb17b1a7ef448944d9fd4484c3bb62 https://github.com/facebook/mvfst/commit/35ef778c9519549ffc3bf6f43fe052ee57dacc59 https://github.com/facebook/proxygen/commit/42cec12b524673b72ef18f79a2a8106f26251f2d https://github.com/facebook/wangle/commit/15005d2b1e8e331f928f9fd3bbb7c7f77a1443d8 https://github.com/facebookexperimental/edencommon/commit/a02a03c0aceb5f156d417d7c155f748320a66a8b https://github.com/facebookexperimental/rust-shed/commit/cacb9b6cb6c29621d2fa358c9370eb1d82d22f48 https://github.com/facebookincubator/fizz/commit/5f49a9f4fed1090127d05bff086010914fdb8e51 Reviewed By: namanahuja fbshipit-source-id: 22897fe0d323c22ea334a5590b2fcc1a89a8d23c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 18d5ee338cba..33514a56c69e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a87e9695b6239b3298cd1fba20f73449e0a785eb +Subproject commit 0cbd38b095cad165c9e4e6a89d186de73c081e1c diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index afd8f02d3cd0..d13d25e40b8f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a8702dbc34fb9da1a32492b06c116e6c8e6cf701 +Subproject commit 216baa676dcb17b1a7ef448944d9fd4484c3bb62 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 107fa91c0169..3a99221ccea3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit afda5a4c571111cdff0e9d8b61ea9c0abf6a6cb9 +Subproject commit 15005d2b1e8e331f928f9fd3bbb7c7f77a1443d8 From 49bdb834918ab748da818d0680bf38a49396b4b0 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Mon, 24 Jun 2024 09:02:56 -0700 Subject: [PATCH 7020/7387] Build glass too (#895) Summary: Pull Request resolved: https://github.com/facebookincubator/zstrong/pull/895 Differential Revision: D58944664 fbshipit-source-id: 47c15cc6b6531c9d37520a3714f2e46e5c4411a8 --- build/fbcode_builder/manifests/glean | 1 + 1 file changed, 1 insertion(+) diff --git a/build/fbcode_builder/manifests/glean b/build/fbcode_builder/manifests/glean index f3ae4f876982..5dc3a8724ee3 100644 --- a/build/fbcode_builder/manifests/glean +++ b/build/fbcode_builder/manifests/glean @@ -28,6 +28,7 @@ builder = make [make.build_args] cabal-update all +glass EXTRA_GHC_OPTS=-j4 +RTS -A32m -n4m -RTS CABAL_CONFIG_FLAGS=-f-clang-tests -f-hack-tests -f-typescript-tests -f-python-tests -f-dotnet-tests -f-go-tests -f-rust-tests -f-java-lsif-tests -f-flow-tests From 8da7df5212eb96385f3df3f15846a03911223d64 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 24 Jun 2024 09:31:46 -0700 Subject: [PATCH 7021/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/0461ee908f0591cdcc94f7a4545c925fa6682d68 https://github.com/facebook/fb303/commit/6785d71afcd2ef111283988ee0ab26facf44e4d8 https://github.com/facebook/fbthrift/commit/6d0580250b8a543ebf84491bc7c21dbd2e1bc6ac https://github.com/facebook/folly/commit/5edf839b6533b21f02ce77cf0390e7b18d86397c https://github.com/facebook/mvfst/commit/24bed21a47324567df5316334e5405bf4fbdaf19 https://github.com/facebook/proxygen/commit/abe350dabf0877a623175fc029ef1b8ee2577dbf https://github.com/facebook/wangle/commit/93ed32595a5de413e08776f820ccfaa0d12aa3b9 https://github.com/facebookexperimental/edencommon/commit/d83effc10638a50998fadcd2d90ebac850484979 https://github.com/facebookexperimental/rust-shed/commit/c329cecad55d7402d1b9cd9fe63ad2f3ab46d90d https://github.com/facebookincubator/fizz/commit/4d96a2ae6af70ef7a3f69a89635c269b055b3af3 Reviewed By: namanahuja fbshipit-source-id: 76f7dc1f495ddbe6c499e4f0011f0ac98c871708 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 33514a56c69e..52e978b63e0c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0cbd38b095cad165c9e4e6a89d186de73c081e1c +Subproject commit 6d0580250b8a543ebf84491bc7c21dbd2e1bc6ac diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d13d25e40b8f..a909d78542f8 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 216baa676dcb17b1a7ef448944d9fd4484c3bb62 +Subproject commit 5edf839b6533b21f02ce77cf0390e7b18d86397c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3a99221ccea3..c5cb16d6441e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 15005d2b1e8e331f928f9fd3bbb7c7f77a1443d8 +Subproject commit 93ed32595a5de413e08776f820ccfaa0d12aa3b9 From b28a4146a614156a8d59eef4bf965ddb1120388a Mon Sep 17 00:00:00 2001 From: Srikrishna Gopu Date: Mon, 24 Jun 2024 15:15:03 -0700 Subject: [PATCH 7022/7387] Fix for equality comparable operator== infinite loop issue Summary: This is a patch that we are carrying in boost internally - D37196783 This is an open issue with C++20 - https://fburl.com/wtm7yhrm and the suggestion is to add explicit member candidates. More details in D37196783 Reviewed By: peygar, zechengh09 Differential Revision: D58957227 fbshipit-source-id: d48e218c26199180d192f3a174e54f900770aae3 --- build/fbcode_builder/manifests/boost | 1 + .../patches/boost_comparator_operator_fix.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 build/fbcode_builder/patches/boost_comparator_operator_fix.patch diff --git a/build/fbcode_builder/manifests/boost b/build/fbcode_builder/manifests/boost index 2900324a3500..969f615bddd5 100644 --- a/build/fbcode_builder/manifests/boost +++ b/build/fbcode_builder/manifests/boost @@ -62,6 +62,7 @@ boost-static [build] builder = boost job_weight_mib = 512 +patchfile = boost_comparator_operator_fix.patch [b2.args] --with-atomic diff --git a/build/fbcode_builder/patches/boost_comparator_operator_fix.patch b/build/fbcode_builder/patches/boost_comparator_operator_fix.patch new file mode 100644 index 000000000000..3771f2fff340 --- /dev/null +++ b/build/fbcode_builder/patches/boost_comparator_operator_fix.patch @@ -0,0 +1,11 @@ +diff --git a/boost/serialization/strong_typedef.hpp b/boost/serialization/strong_typedef.hpp +--- a/boost/serialization/strong_typedef.hpp ++++ b/boost/serialization/strong_typedef.hpp +@@ -44,6 +44,7 @@ + operator const T&() const {return t;} \ + operator T&() {return t;} \ + bool operator==(const D& rhs) const {return t == rhs.t;} \ ++ bool operator==(const T& lhs) const {return t == lhs;} \ + bool operator<(const D& rhs) const {return t < rhs.t;} \ + }; + From a3145d7869dcdf2368597f963ff132285bf23127 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 25 Jun 2024 09:31:43 -0700 Subject: [PATCH 7023/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/a81f35d3f9ba3ca9d142645cda3bc56b799d7209 https://github.com/facebook/fb303/commit/9a6dee395a6b75141075dc27fb293440ad8646f9 https://github.com/facebook/fbthrift/commit/f3401c474bb1f55c2b50c4654a2b4903fbeb9095 https://github.com/facebook/folly/commit/28e2d64381249ce144a3918ec45c8756cb347c1c https://github.com/facebook/mvfst/commit/492dadacedb01a4f4e0e63ccb8984e7f987b6b18 https://github.com/facebook/proxygen/commit/ce544aa68a2642c6949acc7d4c1efb94213aebb4 https://github.com/facebook/wangle/commit/a40061f13ccbe44aeb624da358f35c6ce738d314 https://github.com/facebookexperimental/edencommon/commit/e1af7f1525b73e5f7cf0c73b1ea580ad154b3302 https://github.com/facebookexperimental/rust-shed/commit/8aaa743aa120ed9a5c7cd776bafccf337de84654 https://github.com/facebookincubator/fizz/commit/a4a5858675ee3b0a65e65269729fb196f9fb9884 Reviewed By: ajb85 fbshipit-source-id: 2881bd18e71cf28b90d9554282167ffb04ea7ff6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 52e978b63e0c..b880bef58d1f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6d0580250b8a543ebf84491bc7c21dbd2e1bc6ac +Subproject commit f3401c474bb1f55c2b50c4654a2b4903fbeb9095 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a909d78542f8..d9a850ea7a1d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 5edf839b6533b21f02ce77cf0390e7b18d86397c +Subproject commit 28e2d64381249ce144a3918ec45c8756cb347c1c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c5cb16d6441e..bf1132ef4066 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 93ed32595a5de413e08776f820ccfaa0d12aa3b9 +Subproject commit a40061f13ccbe44aeb624da358f35c6ce738d314 From 48ffac6591b09a8ffc06cdbea063c4dd7f833f2c Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Tue, 25 Jun 2024 16:00:27 -0700 Subject: [PATCH 7024/7387] document thread safety of PendingChanges Summary: There was some conern on D58319081 about the thread safety around interacting with PendingChanges. PendingChanges is a non thread safe class that should only be used accross threads when wrapped in a PendingCollection object which adds a lock around PendingChanges. While landing D58319081 I did a review of all the usages of PendingChanges and confirmed that we only directlt use PendingChanges for local objects that are not shared accross threads, and use PendingCollection for the objects that are shared accross threads. Documenting these assumotions/assertions, so next time folks don't have to go digging to confirm changes are safe/how to use pendingChanges. Reviewed By: chadaustin Differential Revision: D58874824 fbshipit-source-id: 0483732b3ca920c9b48538ec352592ba37e87146 --- watchman/PendingCollection.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/watchman/PendingCollection.h b/watchman/PendingCollection.h index 91c346a6ead4..9e9d0cca8219 100644 --- a/watchman/PendingCollection.h +++ b/watchman/PendingCollection.h @@ -111,6 +111,12 @@ struct watchman_pending_fs : watchman::PendingChange { /** * Holds a linked list of watchman_pending_fs instances and a trie that * efficiently prunes redundant changes. + * + * PendingChanges is only intended to be accessed by one thread at a time. + * If you would like to use a single pending changes object accross + * threads, you should use PendingCollection which puts a lock around + * accesses to the unerlying PendingChanges object. If you only intend to + * use the object on one thread, then you can use PendingChanges directly. */ class PendingChanges { public: From 20e62b5e2fe7b31f31ed5cb588162ce7d4df4c5a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 26 Jun 2024 09:33:29 -0700 Subject: [PATCH 7025/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/5ee06a32eb1819f38edbe6f3b9171aaba20861e4 https://github.com/facebook/fb303/commit/0fcd7276bf6b23729cb0c0fad1f437f100408078 https://github.com/facebook/fbthrift/commit/9a9c96c26ce5530a3f8d0c0bc53c0864875cdd46 https://github.com/facebook/folly/commit/826ea2b8b1cb211b360691583dde492bffca80d0 https://github.com/facebook/mvfst/commit/a19937d34a1b754795b7c1348fc168dc7a1367ad https://github.com/facebook/proxygen/commit/4dd4277c0839b35b1475101f457832f9a24f277f https://github.com/facebook/wangle/commit/a3fe0c603b25861d6a358c50880c8467ec2eeaf2 https://github.com/facebookexperimental/edencommon/commit/bdbfdc628736d38326cd12662de77e7aa422c4d1 https://github.com/facebookexperimental/rust-shed/commit/01100fb37c04711ea6ee26735edaf2dfa7470355 https://github.com/facebookincubator/fizz/commit/971239bc0c0458500ce4e82fb89a88e25725ab5b Reviewed By: ajb85 fbshipit-source-id: a2992c356a73473840f89d7c0b18a77f832833d4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b880bef58d1f..061a07446fec 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f3401c474bb1f55c2b50c4654a2b4903fbeb9095 +Subproject commit 9a9c96c26ce5530a3f8d0c0bc53c0864875cdd46 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d9a850ea7a1d..43278b4fe841 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 28e2d64381249ce144a3918ec45c8756cb347c1c +Subproject commit 826ea2b8b1cb211b360691583dde492bffca80d0 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index bf1132ef4066..8e3dc31c2800 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a40061f13ccbe44aeb624da358f35c6ce738d314 +Subproject commit a3fe0c603b25861d6a358c50880c8467ec2eeaf2 From d9c3a580ed7b8460fed5960f05e283056398f31a Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Wed, 26 Jun 2024 17:02:17 -0700 Subject: [PATCH 7026/7387] Refactoring Summary: X-link: https://github.com/facebookincubator/zstrong/pull/897 Builder refactoring: instead of providing `install_dirs` to `build()`, `test()` etc., provide `loader` and `dep_manifests` when creating the builder. This is a cleaner API because we were computing `install_dirs` in multiple places before. Furthermore this lets us do things that need to see the manifests of the dependencies, not just the list of `install_dirs`, such as treating direct dependencies differently from indirect dependencies (see D58244928). Reviewed By: chadaustin Differential Revision: D58200528 fbshipit-source-id: e52d35e84161b83ab49ab43099c3e3b9bb03f36e --- build/fbcode_builder/getdeps.py | 44 ++-- build/fbcode_builder/getdeps/builder.py | 229 +++++++++++++----- build/fbcode_builder/getdeps/cargo.py | 34 +-- build/fbcode_builder/getdeps/load.py | 8 + build/fbcode_builder/getdeps/manifest.py | 103 +++++++- .../getdeps/py_wheel_builder.py | 11 +- 6 files changed, 307 insertions(+), 122 deletions(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 298bfeeace9e..94b137fe76fa 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -210,15 +210,6 @@ def setup_parser(self, parser): def setup_project_cmd_parser(self, parser): pass - # For commands that don't build but need the full list of install_dirs from - # dependencies (test, debug). - def get_install_dirs(self, loader, manifest): - install_dirs = [] - for m in loader.manifests_in_dependency_order(): - if m != manifest: - install_dirs.append(loader.get_project_install_dir(m)) - return install_dirs - def create_builder(self, loader, manifest): fetcher = loader.create_fetcher(manifest) src_dir = fetcher.get_src_dir() @@ -226,7 +217,13 @@ def create_builder(self, loader, manifest): build_dir = loader.get_project_build_dir(manifest) inst_dir = loader.get_project_install_dir(manifest) return manifest.create_builder( - loader.build_opts, src_dir, build_dir, inst_dir, ctx, loader + loader.build_opts, + src_dir, + build_dir, + inst_dir, + ctx, + loader, + loader.dependencies_of(manifest), ) def check_built(self, loader, manifest): @@ -579,11 +576,11 @@ def run_project_cmd(self, args, loader, manifest): cache = cache_module.create_cache() if args.use_build_cache else None - # Accumulate the install directories so that the build steps - # can find their dep installation - install_dirs = [] + dep_manifests = [] for m in projects: + dep_manifests.append(m) + fetcher = loader.create_fetcher(m) if args.build_skip_lfs_download and hasattr(fetcher, "skip_lfs_download"): @@ -650,9 +647,10 @@ def run_project_cmd(self, args, loader, manifest): build_dir, inst_dir, loader, + dep_manifests, ) for preparer in prepare_builders: - preparer.prepare(install_dirs, reconfigure=reconfigure) + preparer.prepare(reconfigure=reconfigure) builder = m.create_builder( loader.build_opts, @@ -661,12 +659,13 @@ def run_project_cmd(self, args, loader, manifest): inst_dir, ctx, loader, + dep_manifests, final_install_prefix=loader.get_project_install_prefix(m), extra_cmake_defines=extra_cmake_defines, cmake_target=args.cmake_target if m == manifest else "install", extra_b2_args=extra_b2_args, ) - builder.build(install_dirs, reconfigure=reconfigure) + builder.build(reconfigure=reconfigure) # If we are building the project (not dependency) and a specific # cmake_target (not 'install') has been requested, then we don't @@ -690,11 +689,6 @@ def run_project_cmd(self, args, loader, manifest): elif args.verbose: print("found good %s" % built_marker) - # Paths are resolved from front. We prepend rather than append as - # the last project in topo order is the project itself, which - # should be first in the path, then its deps and so on. - install_dirs.insert(0, inst_dir) - def compute_dep_change_status(self, m, built_marker, loader): reconfigure = False sources_changed = False @@ -883,11 +877,7 @@ def run_project_cmd(self, args, loader, manifest): if not self.check_built(loader, manifest): print("project %s has not been built" % manifest.name) return 1 - builder = self.create_builder(loader, manifest) - install_dirs = self.get_install_dirs(loader, manifest) - - builder.run_tests( - install_dirs, + self.create_builder(loader, manifest).run_tests( schedule_type=args.schedule_type, owner=args.test_owner, test_filter=args.filter, @@ -921,9 +911,7 @@ def setup_project_cmd_parser(self, parser): ) class DebugCmd(ProjectCmdBase): def run_project_cmd(self, args, loader, manifest): - install_dirs = self.get_install_dirs(loader, manifest) - builder = self.create_builder(loader, manifest) - builder.debug(install_dirs, reconfigure=False) + self.create_builder(loader, manifest).debug(reconfigure=False) @cmd("generate-github-actions", "generate a GitHub actions configuration") diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 331dbc6526a1..794ec4ce7d93 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -29,6 +29,8 @@ class BuilderBase(object): def __init__( self, + loader, + dep_manifests, # manifests of dependencies build_opts: "BuildOptions", ctx, manifest, @@ -55,6 +57,9 @@ def __init__( self.build_opts = build_opts self.manifest = manifest self.final_install_prefix = final_install_prefix + self.loader = loader + self.dep_manifests = dep_manifests + self.install_dirs = [loader.get_project_install_dir(m) for m in dep_manifests] def _get_cmd_prefix(self): if self.build_opts.is_windows(): @@ -136,28 +141,28 @@ def _apply_patchfile(self) -> None: os.chdir(old_wd) patched_sentinel_file.touch() - def prepare(self, install_dirs, reconfigure: bool) -> None: + def prepare(self, reconfigure: bool) -> None: print("Preparing %s..." % self.manifest.name) reconfigure = self._reconfigure(reconfigure) self._apply_patchfile() - self._prepare(install_dirs=install_dirs, reconfigure=reconfigure) + self._prepare(reconfigure=reconfigure) - def debug(self, install_dirs, reconfigure: bool) -> None: + def debug(self, reconfigure: bool) -> None: reconfigure = self._reconfigure(reconfigure) self._apply_patchfile() - self._prepare(install_dirs=install_dirs, reconfigure=reconfigure) - env = self._compute_env(install_dirs) + self._prepare(reconfigure=reconfigure) + env = self._compute_env() print("Starting a shell in %s, ^D to exit..." % self.build_dir) # TODO: print the command to run the build shell = ["powershell.exe"] if sys.platform == "win32" else ["/bin/sh", "-i"] self._run_cmd(shell, cwd=self.build_dir, env=env) - def build(self, install_dirs, reconfigure: bool) -> None: + def build(self, reconfigure: bool) -> None: print("Building %s..." % self.manifest.name) reconfigure = self._reconfigure(reconfigure) self._apply_patchfile() - self._prepare(install_dirs=install_dirs, reconfigure=reconfigure) - self._build(install_dirs=install_dirs, reconfigure=reconfigure) + self._prepare(reconfigure=reconfigure) + self._build(reconfigure=reconfigure) if self.build_opts.free_up_disk: # don't clean --src-dir=. case as user may want to build again or run tests on the build @@ -174,8 +179,8 @@ def build(self, install_dirs, reconfigure: bool) -> None: # needs to be updated to include all of the directories containing the runtime # library dependencies in order to run the binaries. script_path = self.get_dev_run_script_path() - dep_munger = create_dyn_dep_munger(self.build_opts, install_dirs) - dep_dirs = self.get_dev_run_extra_path_dirs(install_dirs, dep_munger) + dep_munger = create_dyn_dep_munger(self.build_opts, self.install_dirs) + dep_dirs = self.get_dev_run_extra_path_dirs(dep_munger) # pyre-fixme[16]: Optional type has no attribute `emit_dev_run_script`. dep_munger.emit_dev_run_script(script_path, dep_dirs) @@ -200,49 +205,47 @@ def num_jobs(self) -> int: ) ) - def run_tests( - self, install_dirs, schedule_type, owner, test_filter, retry, no_testpilot - ) -> None: + def run_tests(self, schedule_type, owner, test_filter, retry, no_testpilot) -> None: """Execute any tests that we know how to run. If they fail, raise an exception.""" pass - def _prepare(self, install_dirs, reconfigure) -> None: + def _prepare(self, reconfigure) -> None: """Prepare the build. Useful when need to generate config, but builder is not the primary build system. e.g. cargo when called from cmake""" pass - def _build(self, install_dirs, reconfigure) -> None: + def _build(self, reconfigure) -> None: """Perform the build. - install_dirs contains the list of installation directories for - the dependencies of this project. reconfigure will be set to true if the fetcher determined that the sources have changed in such a way that the build system needs to regenerate its rules.""" pass - def _compute_env(self, install_dirs): + def _compute_env(self): # CMAKE_PREFIX_PATH is only respected when passed through the # environment, so we construct an appropriate path to pass down return self.build_opts.compute_env_for_install_dirs( - install_dirs, env=self.env, manifest=self.manifest + self.install_dirs, env=self.env, manifest=self.manifest ) def get_dev_run_script_path(self): assert self.build_opts.is_windows() return os.path.join(self.build_dir, "run.ps1") - def get_dev_run_extra_path_dirs(self, install_dirs, dep_munger=None): + def get_dev_run_extra_path_dirs(self, dep_munger=None): assert self.build_opts.is_windows() if dep_munger is None: - dep_munger = create_dyn_dep_munger(self.build_opts, install_dirs) + dep_munger = create_dyn_dep_munger(self.build_opts, self.install_dirs) return dep_munger.compute_dependency_paths(self.build_dir) class MakeBuilder(BuilderBase): def __init__( self, + loader, + dep_manifests, build_opts, ctx, manifest, @@ -254,7 +257,14 @@ def __init__( test_args, ) -> None: super(MakeBuilder, self).__init__( - build_opts, ctx, manifest, src_dir, build_dir, inst_dir + loader, + dep_manifests, + build_opts, + ctx, + manifest, + src_dir, + build_dir, + inst_dir, ) self.build_args = build_args or [] self.install_args = install_args or [] @@ -267,9 +277,9 @@ def _make_binary(self): def _get_prefix(self): return ["PREFIX=" + self.inst_dir, "prefix=" + self.inst_dir] - def _build(self, install_dirs, reconfigure) -> None: + def _build(self, reconfigure) -> None: - env = self._compute_env(install_dirs) + env = self._compute_env() # Need to ensure that PREFIX is set prior to install because # libbpf uses it when generating its pkg-config file. @@ -292,20 +302,18 @@ def _build(self, install_dirs, reconfigure) -> None: for file in glob.glob(srcpattern): shutil.copy(file, libdir) - def run_tests( - self, install_dirs, schedule_type, owner, test_filter, retry, no_testpilot - ) -> None: + def run_tests(self, schedule_type, owner, test_filter, retry, no_testpilot) -> None: if not self.test_args: return - env = self._compute_env(install_dirs) + env = self._compute_env() cmd = [self._make_binary] + self.test_args + self._get_prefix() self._run_cmd(cmd, env=env) class CMakeBootStrapBuilder(MakeBuilder): - def _build(self, install_dirs, reconfigure) -> None: + def _build(self, reconfigure) -> None: self._run_cmd( [ "./bootstrap", @@ -313,12 +321,14 @@ def _build(self, install_dirs, reconfigure) -> None: f"--parallel={self.num_jobs}", ] ) - super(CMakeBootStrapBuilder, self)._build(install_dirs, reconfigure) + super(CMakeBootStrapBuilder, self)._build(reconfigure) class AutoconfBuilder(BuilderBase): def __init__( self, + loader, + dep_manifests, build_opts, ctx, manifest, @@ -329,7 +339,14 @@ def __init__( conf_env_args, ) -> None: super(AutoconfBuilder, self).__init__( - build_opts, ctx, manifest, src_dir, build_dir, inst_dir + loader, + dep_manifests, + build_opts, + ctx, + manifest, + src_dir, + build_dir, + inst_dir, ) self.args = args or [] self.conf_env_args = conf_env_args or {} @@ -338,11 +355,11 @@ def __init__( def _make_binary(self): return self.manifest.get("build", "make_binary", "make", ctx=self.ctx) - def _build(self, install_dirs, reconfigure) -> None: + def _build(self, reconfigure) -> None: configure_path = os.path.join(self.src_dir, "configure") autogen_path = os.path.join(self.src_dir, "autogen.sh") - env = self._compute_env(install_dirs) + env = self._compute_env() # Some configure scripts need additional env values passed derived from cmds for k, cmd_args in self.conf_env_args.items(): @@ -383,12 +400,29 @@ class Iproute2Builder(BuilderBase): # Thus, explicitly copy sources from src_dir to build_dir, build, # and then install to inst_dir using DESTDIR # lastly, also copy include from build_dir to inst_dir - def __init__(self, build_opts, ctx, manifest, src_dir, build_dir, inst_dir) -> None: + def __init__( + self, + loader, + dep_manifests, + build_opts, + ctx, + manifest, + src_dir, + build_dir, + inst_dir, + ) -> None: super(Iproute2Builder, self).__init__( - build_opts, ctx, manifest, src_dir, build_dir, inst_dir + loader, + dep_manifests, + build_opts, + ctx, + manifest, + src_dir, + build_dir, + inst_dir, ) - def _build(self, install_dirs, reconfigure) -> None: + def _build(self, reconfigure) -> None: configure_path = os.path.join(self.src_dir, "configure") env = self.env.copy() self._run_cmd([configure_path], env=env) @@ -521,6 +555,8 @@ def main(): def __init__( self, + loader, + dep_manifests, build_opts, ctx, manifest, @@ -528,12 +564,13 @@ def __init__( build_dir, inst_dir, defines, - loader=None, final_install_prefix=None, extra_cmake_defines=None, cmake_target="install", ) -> None: super(CMakeBuilder, self).__init__( + loader, + dep_manifests, build_opts, ctx, manifest, @@ -694,10 +731,10 @@ def _compute_cmake_define_args(self, env): return define_args - def _build(self, install_dirs, reconfigure: bool) -> None: + def _build(self, reconfigure: bool) -> None: reconfigure = reconfigure or self._needs_reconfigure() - env = self._compute_env(install_dirs) + env = self._compute_env() if not self.build_opts.is_windows() and self.final_install_prefix: env["DESTDIR"] = self.inst_dir @@ -740,9 +777,9 @@ def _build(self, install_dirs, reconfigure: bool) -> None: ) def run_tests( - self, install_dirs, schedule_type, owner, test_filter, retry: int, no_testpilot + self, schedule_type, owner, test_filter, retry: int, no_testpilot ) -> None: - env = self._compute_env(install_dirs) + env = self._compute_env() ctest = path_search(env, "ctest") cmake = path_search(env, "cmake") @@ -756,7 +793,7 @@ def require_command(path: Optional[str], name: str) -> str: # since CMake will emit RPATH properly in the binary so they can find these # dependencies. if self.build_opts.is_windows(): - path_entries = self.get_dev_run_extra_path_dirs(install_dirs) + path_entries = self.get_dev_run_extra_path_dirs() path = env.get("PATH") if path: path_entries.insert(0, path) @@ -853,7 +890,6 @@ def list_tests(): env.set("http_proxy", "") env.set("https_proxy", "") runs = [] - from sys import platform with start_run(env["FBSOURCE_HASH"]) as run_id: testpilot_args = [ @@ -957,12 +993,29 @@ def list_tests(): class NinjaBootstrap(BuilderBase): - def __init__(self, build_opts, ctx, manifest, build_dir, src_dir, inst_dir) -> None: + def __init__( + self, + loader, + dep_manifests, + build_opts, + ctx, + manifest, + build_dir, + src_dir, + inst_dir, + ) -> None: super(NinjaBootstrap, self).__init__( - build_opts, ctx, manifest, src_dir, build_dir, inst_dir + loader, + dep_manifests, + build_opts, + ctx, + manifest, + src_dir, + build_dir, + inst_dir, ) - def _build(self, install_dirs, reconfigure) -> None: + def _build(self, reconfigure) -> None: self._run_cmd([sys.executable, "configure.py", "--bootstrap"], cwd=self.src_dir) src_ninja = os.path.join(self.src_dir, "ninja") dest_ninja = os.path.join(self.inst_dir, "bin/ninja") @@ -974,20 +1027,37 @@ def _build(self, install_dirs, reconfigure) -> None: class OpenSSLBuilder(BuilderBase): - def __init__(self, build_opts, ctx, manifest, build_dir, src_dir, inst_dir) -> None: + def __init__( + self, + loader, + dep_manifests, + build_opts, + ctx, + manifest, + build_dir, + src_dir, + inst_dir, + ) -> None: super(OpenSSLBuilder, self).__init__( - build_opts, ctx, manifest, src_dir, build_dir, inst_dir + loader, + dep_manifests, + build_opts, + ctx, + manifest, + src_dir, + build_dir, + inst_dir, ) - def _build(self, install_dirs, reconfigure) -> None: + def _build(self, reconfigure) -> None: configure = os.path.join(self.src_dir, "Configure") # prefer to resolve the perl that we installed from # our manifest on windows, but fall back to the system # path on eg: darwin env = self.env.copy() - for d in install_dirs: - bindir = os.path.join(d, "bin") + for m in self.dep_manifests: + bindir = os.path.join(self.loader.get_project_install_dir(m), "bin") add_path_entry(env, "PATH", bindir, append=False) perl = typing.cast(str, path_search(env, "perl", "perl")) @@ -1037,7 +1107,16 @@ def _build(self, install_dirs, reconfigure) -> None: class Boost(BuilderBase): def __init__( - self, build_opts, ctx, manifest, src_dir, build_dir, inst_dir, b2_args + self, + loader, + dep_manifests, + build_opts, + ctx, + manifest, + src_dir, + build_dir, + inst_dir, + b2_args, ) -> None: children = os.listdir(src_dir) assert len(children) == 1, "expected a single directory entry: %r" % (children,) @@ -1045,12 +1124,19 @@ def __init__( assert boost_src.startswith("boost") src_dir = os.path.join(src_dir, children[0]) super(Boost, self).__init__( - build_opts, ctx, manifest, src_dir, build_dir, inst_dir + loader, + dep_manifests, + build_opts, + ctx, + manifest, + src_dir, + build_dir, + inst_dir, ) self.b2_args = b2_args - def _build(self, install_dirs, reconfigure) -> None: - env = self._compute_env(install_dirs) + def _build(self, reconfigure) -> None: + env = self._compute_env() linkage = ["static"] if self.build_opts.is_windows() or self.build_opts.shared_libs: linkage.append("shared") @@ -1105,12 +1191,14 @@ def _build(self, install_dirs, reconfigure) -> None: class NopBuilder(BuilderBase): - def __init__(self, build_opts, ctx, manifest, src_dir, inst_dir) -> None: + def __init__( + self, loader, dep_manifests, build_opts, ctx, manifest, src_dir, inst_dir + ) -> None: super(NopBuilder, self).__init__( - build_opts, ctx, manifest, src_dir, None, inst_dir + loader, dep_manifests, build_opts, ctx, manifest, src_dir, None, inst_dir ) - def build(self, install_dirs, reconfigure: bool) -> None: + def build(self, reconfigure: bool) -> None: print("Installing %s -> %s" % (self.src_dir, self.inst_dir)) parent = os.path.dirname(self.inst_dir) if not os.path.exists(parent): @@ -1147,12 +1235,29 @@ def build(self, install_dirs, reconfigure: bool) -> None: class SqliteBuilder(BuilderBase): - def __init__(self, build_opts, ctx, manifest, src_dir, build_dir, inst_dir) -> None: + def __init__( + self, + loader, + dep_manifests, + build_opts, + ctx, + manifest, + src_dir, + build_dir, + inst_dir, + ) -> None: super(SqliteBuilder, self).__init__( - build_opts, ctx, manifest, src_dir, build_dir, inst_dir + loader, + dep_manifests, + build_opts, + ctx, + manifest, + src_dir, + build_dir, + inst_dir, ) - def _build(self, install_dirs, reconfigure) -> None: + def _build(self, reconfigure) -> None: for f in ["sqlite3.c", "sqlite3.h", "sqlite3ext.h"]: src = os.path.join(self.src_dir, f) dest = os.path.join(self.build_dir, f) @@ -1191,7 +1296,7 @@ def _build(self, install_dirs, reconfigure) -> None: define_args = ["-D%s=%s" % (k, v) for (k, v) in defines.items()] define_args += ["-G", "Ninja"] - env = self._compute_env(install_dirs) + env = self._compute_env() # Resolve the cmake that we installed cmake = path_search(env, "cmake") diff --git a/build/fbcode_builder/getdeps/cargo.py b/build/fbcode_builder/getdeps/cargo.py index 779fa8333d5e..dde73ba8a8c0 100644 --- a/build/fbcode_builder/getdeps/cargo.py +++ b/build/fbcode_builder/getdeps/cargo.py @@ -20,6 +20,8 @@ class CargoBuilder(BuilderBase): def __init__( self, + loader, + dep_manifests, # manifests of dependencies build_opts: "BuildOptions", ctx, manifest, @@ -29,11 +31,17 @@ def __init__( build_doc, workspace_dir, manifests_to_build, - loader, cargo_config_file, ) -> None: super(CargoBuilder, self).__init__( - build_opts, ctx, manifest, src_dir, build_dir, inst_dir + loader, + dep_manifests, + build_opts, + ctx, + manifest, + src_dir, + build_dir, + inst_dir, ) self.build_doc = build_doc self.ws_dir = workspace_dir @@ -43,7 +51,7 @@ def __init__( def run_cargo(self, install_dirs, operation, args=None) -> None: args = args or [] - env = self._compute_env(install_dirs) + env = self._compute_env() # Enable using nightly features with stable compiler env["RUSTC_BOOTSTRAP"] = "1" env["LIBZ_SYS_STATIC"] = "1" @@ -138,7 +146,7 @@ def _create_cargo_config(self): return dep_to_git - def _prepare(self, install_dirs, reconfigure) -> None: + def _prepare(self, reconfigure) -> None: build_source_dir = self.build_source_dir() self.recreate_dir(self.src_dir, build_source_dir) @@ -147,7 +155,7 @@ def _prepare(self, install_dirs, reconfigure) -> None: if self.ws_dir is not None: self._patchup_workspace(dep_to_git) - def _build(self, install_dirs, reconfigure) -> None: + def _build(self, reconfigure) -> None: # _prepare has been run already. Actually do the build build_source_dir = self.build_source_dir() @@ -162,14 +170,14 @@ def _build(self, install_dirs, reconfigure) -> None: if self.manifests_to_build is None: self.run_cargo( - install_dirs, + self.install_dirs, "build", build_args, ) else: for manifest in self.manifests_to_build: self.run_cargo( - install_dirs, + self.install_dirs, "build", build_args + [ @@ -180,24 +188,22 @@ def _build(self, install_dirs, reconfigure) -> None: self.recreate_dir(build_source_dir, os.path.join(self.inst_dir, "source")) - def run_tests( - self, install_dirs, schedule_type, owner, test_filter, retry, no_testpilot - ) -> None: + def run_tests(self, schedule_type, owner, test_filter, retry, no_testpilot) -> None: if test_filter: args = ["--", test_filter] else: args = [] if self.manifests_to_build is None: - self.run_cargo(install_dirs, "test", args) + self.run_cargo(self.install_dirs, "test", args) if self.build_doc: - self.run_cargo(install_dirs, "doc", ["--no-deps"]) + self.run_cargo(self.install_dirs, "doc", ["--no-deps"]) else: for manifest in self.manifests_to_build: margs = ["--manifest-path", self.manifest_dir(manifest)] - self.run_cargo(install_dirs, "test", args + margs) + self.run_cargo(self.install_dirs, "test", args + margs) if self.build_doc: - self.run_cargo(install_dirs, "doc", ["--no-deps"] + margs) + self.run_cargo(self.install_dirs, "doc", ["--no-deps"] + margs) def _patchup_workspace(self, dep_to_git) -> None: """ diff --git a/build/fbcode_builder/getdeps/load.py b/build/fbcode_builder/getdeps/load.py index 7460ac55f459..85a79a973539 100644 --- a/build/fbcode_builder/getdeps/load.py +++ b/build/fbcode_builder/getdeps/load.py @@ -159,6 +159,14 @@ def load_all_manifests(self): return self.manifests_by_name + def dependencies_of(self, manifest): + """Returns the dependencies of the given project, not including the project itself, in topological order.""" + return [ + dep + for dep in self.manifests_in_dependency_order(manifest) + if dep != manifest + ] + def manifests_in_dependency_order(self, manifest=None): """Compute all dependencies of the specified project. Returns a list of the dependencies plus the project itself, in topologically sorted order. diff --git a/build/fbcode_builder/getdeps/manifest.py b/build/fbcode_builder/getdeps/manifest.py index af63cde6c0c2..11fc4e1ebf2f 100644 --- a/build/fbcode_builder/getdeps/manifest.py +++ b/build/fbcode_builder/getdeps/manifest.py @@ -485,6 +485,7 @@ def create_builder( # noqa:C901 inst_dir, ctx, loader, + dep_manifests, final_install_prefix=None, extra_cmake_defines=None, cmake_target=None, @@ -508,6 +509,8 @@ def create_builder( # noqa:C901 test_args = self.get_section_as_args("make.test_args", ctx) if builder == "cmakebootstrap": return CMakeBootStrapBuilder( + loader, + dep_manifests, build_options, ctx, self, @@ -520,6 +523,8 @@ def create_builder( # noqa:C901 ) else: return MakeBuilder( + loader, + dep_manifests, build_options, ctx, self, @@ -538,6 +543,8 @@ def create_builder( # noqa:C901 if ldflags_cmd: conf_env_args["LDFLAGS"] = ldflags_cmd return AutoconfBuilder( + loader, + dep_manifests, build_options, ctx, self, @@ -552,11 +559,23 @@ def create_builder( # noqa:C901 args = self.get_section_as_args("b2.args", ctx) if extra_b2_args is not None: args += extra_b2_args - return Boost(build_options, ctx, self, src_dir, build_dir, inst_dir, args) + return Boost( + loader, + dep_manifests, + build_options, + ctx, + self, + src_dir, + build_dir, + inst_dir, + args, + ) if builder == "cmake": defines = self.get_section_as_dict("cmake.defines", ctx) return CMakeBuilder( + loader, + dep_manifests, build_options, ctx, self, @@ -564,7 +583,6 @@ def create_builder( # noqa:C901 build_dir, inst_dir, defines, - loader, final_install_prefix, extra_cmake_defines, cmake_target, @@ -572,39 +590,91 @@ def create_builder( # noqa:C901 if builder == "python-wheel": return PythonWheelBuilder( - build_options, ctx, self, src_dir, build_dir, inst_dir + loader, + dep_manifests, + build_options, + ctx, + self, + src_dir, + build_dir, + inst_dir, ) if builder == "sqlite": - return SqliteBuilder(build_options, ctx, self, src_dir, build_dir, inst_dir) + return SqliteBuilder( + loader, + dep_manifests, + build_options, + ctx, + self, + src_dir, + build_dir, + inst_dir, + ) if builder == "ninja_bootstrap": return NinjaBootstrap( - build_options, ctx, self, build_dir, src_dir, inst_dir + loader, + dep_manifests, + build_options, + ctx, + self, + build_dir, + src_dir, + inst_dir, ) if builder == "nop": - return NopBuilder(build_options, ctx, self, src_dir, inst_dir) + return NopBuilder( + loader, dep_manifests, build_options, ctx, self, src_dir, inst_dir + ) if builder == "openssl": return OpenSSLBuilder( - build_options, ctx, self, build_dir, src_dir, inst_dir + loader, + dep_manifests, + build_options, + ctx, + self, + build_dir, + src_dir, + inst_dir, ) if builder == "iproute2": return Iproute2Builder( - build_options, ctx, self, src_dir, build_dir, inst_dir + loader, + dep_manifests, + build_options, + ctx, + self, + src_dir, + build_dir, + inst_dir, ) if builder == "cargo": return self.create_cargo_builder( - build_options, ctx, src_dir, build_dir, inst_dir, loader + loader, + dep_manifests, + build_options, + ctx, + src_dir, + build_dir, + inst_dir, ) raise KeyError("project %s has no known builder" % (self.name)) def create_prepare_builders( - self, build_options, ctx, src_dir, build_dir, inst_dir, loader + self, + build_options, + ctx, + src_dir, + build_dir, + inst_dir, + loader, + dep_manifests, ): """Create builders that have a prepare step run, e.g. to write config files""" prepare_builders = [] @@ -612,19 +682,27 @@ def create_prepare_builders( cargo = self.get_section_as_dict("cargo", ctx) if not builder == "cargo" and cargo: cargo_builder = self.create_cargo_builder( - build_options, ctx, src_dir, build_dir, inst_dir, loader + loader, + dep_manifests, + build_options, + ctx, + src_dir, + build_dir, + inst_dir, ) prepare_builders.append(cargo_builder) return prepare_builders def create_cargo_builder( - self, build_options, ctx, src_dir, build_dir, inst_dir, loader + self, loader, dep_manifests, build_options, ctx, src_dir, build_dir, inst_dir ): build_doc = self.get("cargo", "build_doc", False, ctx) workspace_dir = self.get("cargo", "workspace_dir", None, ctx) manifests_to_build = self.get("cargo", "manifests_to_build", None, ctx) cargo_config_file = self.get("cargo", "cargo_config_file", None, ctx) return CargoBuilder( + loader, + dep_manifests, build_options, ctx, self, @@ -634,7 +712,6 @@ def create_cargo_builder( build_doc, workspace_dir, manifests_to_build, - loader, cargo_config_file, ) diff --git a/build/fbcode_builder/getdeps/py_wheel_builder.py b/build/fbcode_builder/getdeps/py_wheel_builder.py index 92bf7a382115..335d74afd1d3 100644 --- a/build/fbcode_builder/getdeps/py_wheel_builder.py +++ b/build/fbcode_builder/getdeps/py_wheel_builder.py @@ -104,7 +104,7 @@ class PythonWheelBuilder(BuilderBase): dist_info_dir: str template_format_dict: Dict[str, str] - def _build(self, install_dirs: List[str], reconfigure: bool) -> None: + def _build(self, reconfigure: bool) -> None: # When we are invoked, self.src_dir contains the unpacked wheel contents. # # Since a wheel file is just a zip file, the Fetcher code recognizes it as such @@ -171,10 +171,12 @@ def _build(self, install_dirs: List[str], reconfigure: bool) -> None: self._write_cmake_config_template() # Run the build - self._run_cmake_build(install_dirs, reconfigure) + self._run_cmake_build(reconfigure) - def _run_cmake_build(self, install_dirs: List[str], reconfigure: bool) -> None: + def _run_cmake_build(self, reconfigure: bool) -> None: cmake_builder = CMakeBuilder( + loader=self.loader, + dep_manifests=self.dep_manifests, build_opts=self.build_opts, ctx=self.ctx, manifest=self.manifest, @@ -183,11 +185,10 @@ def _run_cmake_build(self, install_dirs: List[str], reconfigure: bool) -> None: src_dir=self.build_dir, build_dir=self.build_dir, inst_dir=self.inst_dir, - loader=None, defines={}, final_install_prefix=None, ) - cmake_builder.build(install_dirs=install_dirs, reconfigure=reconfigure) + cmake_builder.build(reconfigure=reconfigure) def _write_cmakelists(self, path_mapping: Dict[str, str], dependencies) -> None: cmake_path = os.path.join(self.build_dir, "CMakeLists.txt") From 714d3134edea42756e1739b37fb135596877873d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 27 Jun 2024 09:32:09 -0700 Subject: [PATCH 7027/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/cea6522359d39043c0d4dd1ab11ae97eac825f22 https://github.com/facebook/fb303/commit/b8cc82196a5fd9ea51ef6e4b381e83b174fed8f9 https://github.com/facebook/fbthrift/commit/362bc1f9d44f935f0b863dafb57251f344b19961 https://github.com/facebook/folly/commit/e7639a6e07382a098722dc05ec565a29eb12c391 https://github.com/facebook/mvfst/commit/8ec652c13dbec2d22a579c29f552c3ab408ca033 https://github.com/facebook/proxygen/commit/6790282a52cc41d59a9b43ab3c8b0c73462f65f1 https://github.com/facebook/wangle/commit/5a13a13ad5b1828ad3b01906663acd27cb3c1e62 https://github.com/facebookexperimental/edencommon/commit/0e908b0f72944698323172a2288cf4426c748a63 https://github.com/facebookexperimental/rust-shed/commit/3ff85d057ecffdce8573daf9eab3e25deac4b670 https://github.com/facebookincubator/fizz/commit/b3ff700074782c66c8cad83daeba9e9dbab8d0d8 Reviewed By: ajb85 fbshipit-source-id: 459fb95364355e91fdbb15a11b76c5cc614d0f8d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 061a07446fec..cdb1f6d28d4b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9a9c96c26ce5530a3f8d0c0bc53c0864875cdd46 +Subproject commit 362bc1f9d44f935f0b863dafb57251f344b19961 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 43278b4fe841..d915cdd71f54 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 826ea2b8b1cb211b360691583dde492bffca80d0 +Subproject commit e7639a6e07382a098722dc05ec565a29eb12c391 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8e3dc31c2800..83b9e189a1a4 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a3fe0c603b25861d6a358c50880c8467ec2eeaf2 +Subproject commit 5a13a13ad5b1828ad3b01906663acd27cb3c1e62 From 948920ddde363c54336725fbd9f8c2ea6f9dbaf6 Mon Sep 17 00:00:00 2001 From: Facebook Community Bot Date: Thu, 27 Jun 2024 14:03:43 -0700 Subject: [PATCH 7028/7387] Re-sync with internal repository (#1230) The internal and external repositories are out of sync. This Pull Request attempts to brings them back in sync by patching the GitHub repository. Please carefully review this patch. You must disable ShipIt for your project in order to merge this pull request. DO NOT IMPORT this pull request. Instead, merge it directly on GitHub using the MERGE BUTTON. Re-enable ShipIt after merging. --- watchman/CFM_RULES | 47 ---------------------------------------------- 1 file changed, 47 deletions(-) delete mode 100644 watchman/CFM_RULES diff --git a/watchman/CFM_RULES b/watchman/CFM_RULES deleted file mode 100644 index a7c2f360b406..000000000000 --- a/watchman/CFM_RULES +++ /dev/null @@ -1,47 +0,0 @@ -WIKI_ROOT = "WatchmanOSS" - -# Generated by hand by running: -# -# ``` -# ~/fbsource/fbcode/watchman$ find oss/website/ -name \*.md | sed -e 's#\(.*\)# "\1",#' -# ``` -# -# And pasting the results in here. This is not great, but T126120311 should -# fix this. -ALL_SRCS = [ - "oss/website/README.md", - "oss/website/_docs/expr.allof.md", - "oss/website/_docs/expr.anyof.md", - "oss/website/_docs/expr.dirname.md", - "oss/website/_docs/expr.empty.md", - "oss/website/_docs/expr.exists.md", - "oss/website/_docs/expr.false.md", - "oss/website/_docs/expr.match.md", - "oss/website/_docs/expr.name.md", - "oss/website/_docs/expr.not.md", - "oss/website/_docs/expr.pcre.md", - "oss/website/_docs/expr.since.md", - "oss/website/_docs/expr.size.md", - "oss/website/_docs/expr.suffix.md", - "oss/website/_docs/expr.true.md", - "oss/website/_docs/expr.type.md", - "oss/website/_docs/file-query.md", - "oss/website/_docs/scm-query.md", - "oss/website/_docs/simple-query.md", - "oss/website/_docs/watchman-make.md", - "oss/website/_docs/watchman-replicate-subscription.md", - "oss/website/_docs/watchman-wait.md", -] - -def create_rule(src): - root = WIKI_ROOT - if src.startswith("oss/website/_docs/"): - root += "/docs" - - publish( - wiki_root_path = root, - srcs = [src], - oncall = "codehub_markdown", - ) - -[create_rule(src) for src in ALL_SRCS] From bebfe36d75354a959bd29552ceebfdd5a4b3ba5b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 28 Jun 2024 09:32:07 -0700 Subject: [PATCH 7029/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/1bff4baca15fdb8635a6d871ff81704e2d3c2ad5 https://github.com/facebook/fb303/commit/61038c9c62358a47acb233506de6428f102f97fd https://github.com/facebook/fbthrift/commit/eec7fd23ea1294ca9561b77a057c83b057fec273 https://github.com/facebook/folly/commit/a9183e19f0fd19747f91756098f2ee7fbd86afb8 https://github.com/facebook/mvfst/commit/be0f07160aa528e2afea4abd24134fe6622013f3 https://github.com/facebook/proxygen/commit/ead9e82955704035d000f3c271c7367140c12bcb https://github.com/facebook/wangle/commit/73d7b3c54bda4faedcaf0a41ec4f64c88936da43 https://github.com/facebookexperimental/edencommon/commit/310d4a4bbd2d174d3ad85c0634bfc8700036d5a5 https://github.com/facebookexperimental/rust-shed/commit/6da2d1a222fd603c65e2bc69b50c461919091481 https://github.com/facebookincubator/fizz/commit/24f97ce19553adc32cc060e1f90c2827730be71c Reviewed By: ajb85 fbshipit-source-id: da25ab9fe448783eb48a4d600eb1bb55aaf45512 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cdb1f6d28d4b..a90be9eff4ed 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 362bc1f9d44f935f0b863dafb57251f344b19961 +Subproject commit eec7fd23ea1294ca9561b77a057c83b057fec273 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d915cdd71f54..a1ee1ac6e926 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e7639a6e07382a098722dc05ec565a29eb12c391 +Subproject commit a9183e19f0fd19747f91756098f2ee7fbd86afb8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 83b9e189a1a4..260f258582a4 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5a13a13ad5b1828ad3b01906663acd27cb3c1e62 +Subproject commit 73d7b3c54bda4faedcaf0a41ec4f64c88936da43 From 5d4a489c3d815ca47ba470b064914bb5fa6f9b79 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 29 Jun 2024 09:31:45 -0700 Subject: [PATCH 7030/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/8c35797bf495d093e1417cb42bca7707bc7d55cc https://github.com/facebook/fb303/commit/37875bc1c1086589c631dacb66dbca1a469c66d4 https://github.com/facebook/fbthrift/commit/2e647ffa29361c9b715e753315027aa992758ad4 https://github.com/facebook/folly/commit/8885811b8595497815defe6b05b254ca835f2eed https://github.com/facebook/mvfst/commit/625b7e252ae3af0e05644bc62c076ece7dec1e63 https://github.com/facebook/proxygen/commit/e8a58f86a40eb10c37849553c1f30d61ce59807e https://github.com/facebook/wangle/commit/464623462c71a9bb4157152f1693dfe68c8f62a1 https://github.com/facebookexperimental/edencommon/commit/8b649384c2bb91af7593e9dccd3a0497c8e64abc https://github.com/facebookexperimental/rust-shed/commit/26b2e1b7db938aa6a096f7c7273db702e69d6fa5 https://github.com/facebookincubator/fizz/commit/b0fb53c6da9b3c4ecd19a310537b6199e5145463 Reviewed By: ajb85 fbshipit-source-id: c898ce5ee2496d32c0a8e098bf7c38dd05ed633b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a90be9eff4ed..30a374ece7e6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit eec7fd23ea1294ca9561b77a057c83b057fec273 +Subproject commit 2e647ffa29361c9b715e753315027aa992758ad4 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a1ee1ac6e926..c8a36753963d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a9183e19f0fd19747f91756098f2ee7fbd86afb8 +Subproject commit 8885811b8595497815defe6b05b254ca835f2eed diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 260f258582a4..17462e6a5c56 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 73d7b3c54bda4faedcaf0a41ec4f64c88936da43 +Subproject commit 464623462c71a9bb4157152f1693dfe68c8f62a1 From 64c45037278c10a2dca5ccca61d11e7c1f6b54bd Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 30 Jun 2024 09:31:35 -0700 Subject: [PATCH 7031/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/bac49366654b3f0242f5ce206002f79ad4a697c8 https://github.com/facebook/fbthrift/commit/adb128e8feb67354aa4bd626261ae262408c70a8 https://github.com/facebook/mvfst/commit/ccbde59fcdacb07bcef2ef427859038961203811 https://github.com/facebook/proxygen/commit/5c3f0a416969228e3e3da4e4b761f314ed9b6212 https://github.com/facebook/wangle/commit/db3ce5493765c874d41b7259de37d9b8b567b450 https://github.com/facebookexperimental/edencommon/commit/df158dc782a857e2bffa79288f61caf86a534b0d https://github.com/facebookexperimental/rust-shed/commit/fceb292c131d0a709697253053146244d3d15e3f https://github.com/facebookincubator/fizz/commit/af4d86f55cc8b30aeef9f6b6fe143c080e20662e Reviewed By: ajb85 fbshipit-source-id: ec4921895ef858ef0b389192b27116e0d1171cbb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 30a374ece7e6..51d24385a365 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2e647ffa29361c9b715e753315027aa992758ad4 +Subproject commit adb128e8feb67354aa4bd626261ae262408c70a8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 17462e6a5c56..1a4dd3dc9174 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 464623462c71a9bb4157152f1693dfe68c8f62a1 +Subproject commit db3ce5493765c874d41b7259de37d9b8b567b450 From db42807941010bece3885eadb6b126fec0e25ca2 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 1 Jul 2024 09:32:10 -0700 Subject: [PATCH 7032/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/6ce0810c97579c5a87705d15dca164ff0a8e8db6 https://github.com/facebook/fbthrift/commit/93ad476d80892906791f6ba299c33b193c120e3e https://github.com/facebook/folly/commit/0ba07a2ec34668e98b9789e6c67a85704bfecd01 https://github.com/facebook/mvfst/commit/d956687ef17614f8d6eaf16827b42136f6f1530d https://github.com/facebook/proxygen/commit/00314a7180dcec4829f7a2a504fd605370e5cb4a https://github.com/facebook/wangle/commit/dadb85166a92f6326514d822cc548d1788f74a7a https://github.com/facebookexperimental/rust-shed/commit/1ad3bf0b8b98e10aaafd1f4b3230b815e8f5b657 Reviewed By: ajb85 fbshipit-source-id: f5c26b79da9b768813bf2b09949ce2fcf958c1a6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 51d24385a365..343bc5200659 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit adb128e8feb67354aa4bd626261ae262408c70a8 +Subproject commit 93ad476d80892906791f6ba299c33b193c120e3e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index c8a36753963d..98bd84d72e3f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 8885811b8595497815defe6b05b254ca835f2eed +Subproject commit 0ba07a2ec34668e98b9789e6c67a85704bfecd01 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1a4dd3dc9174..f2c04a82d6c8 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit db3ce5493765c874d41b7259de37d9b8b567b450 +Subproject commit dadb85166a92f6326514d822cc548d1788f74a7a From aee833d955ae1418eb592778c80231b9f5734f1b Mon Sep 17 00:00:00 2001 From: "Genevieve (Genna) Helsel" Date: Mon, 1 Jul 2024 14:32:34 -0700 Subject: [PATCH 7033/7387] bump watchman_client to 0.9.0 Summary: See https://github.com/facebook/watchman/pull/1229 Reviewed By: zertosh Differential Revision: D59235792 fbshipit-source-id: 41289541201f94d046e042202693cb986df5b8dc --- watchman/cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index f37f29811c51..9c9da13df648 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -19,7 +19,7 @@ structopt = "0.3.26" sysinfo = "0.30.11" tabular = "0.2.0" tokio = { version = "1.37.0", features = ["full", "test-util", "tracing"] } -watchman_client = { version = "0.8.0", path = "../rust/watchman_client" } +watchman_client = { version = "0.9.0", path = "../rust/watchman_client" } [target.'cfg(target_os = "linux")'.dependencies] nix = "0.25" From 1313198c6f460d4dfb13a9df8e74e1cfc1e92914 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Tue, 2 Jul 2024 08:22:15 -0700 Subject: [PATCH 7034/7387] Fix Socket Permissions test timeouts Summary: Watchman TestSockPerms have been borderline failing on Sandcastle - meaning that had been failing up to 3 times, but passing on retry. Last week they started failing 5 times most runs causing our release buidls to fail. This diff extends the timeout from 20s to 60s (the default for other tests). Hopefully this will resolve the issue. Reviewed By: genevievehelsel Differential Revision: D59256323 fbshipit-source-id: 0d932b82dce9d150908672270931374d7ffaef47 --- watchman/integration/test_sock_perms.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/watchman/integration/test_sock_perms.py b/watchman/integration/test_sock_perms.py index 42b078bd8e20..ca5daa2443e9 100644 --- a/watchman/integration/test_sock_perms.py +++ b/watchman/integration/test_sock_perms.py @@ -28,11 +28,11 @@ @unittest.skipIf( os.name == "nt" or sys.platform == "darwin" or os.geteuid() == 0, - "win or root or bad ldap", + "win, mac or root", ) class TestSockPerms(unittest.TestCase): def _new_instance(self, config): - start_timeout = 20 + start_timeout = 60 return WatchmanInstance.InstanceWithStateDir( config=config, start_timeout=start_timeout ) @@ -55,7 +55,7 @@ def _get_non_member_group(self): return group self.skipTest("no usable groups found") - def waitFor(self, cond, timeout: float = 20): + def waitFor(self, cond, timeout: float = 60): deadline = time.time() + timeout res = None while time.time() < deadline: From 2e4d95435f2bc9a4def4c68c5515dfbf1e3da3fe Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 2 Jul 2024 09:31:25 -0700 Subject: [PATCH 7035/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/bffb3d66eac39ff88862b25a4264b4e0c23291e5 https://github.com/facebook/fb303/commit/47dc410d359b96b7dc041bf8fe910a38766ba5de https://github.com/facebook/fbthrift/commit/1c81d6736fe27b5c167e7f8fcac6b8ac52bd79ba https://github.com/facebook/folly/commit/d2cb8f6d5447c87c8450c230fbc424061fddb3f4 https://github.com/facebook/mvfst/commit/d7fb36eab0b3adc8d20a104f889059576d3581c1 https://github.com/facebook/proxygen/commit/7cf735ad6532d608466b66d6bba2e55530447814 https://github.com/facebook/wangle/commit/da1c4947ef1db92fc732dea065a00f556c1d7e4b https://github.com/facebookexperimental/edencommon/commit/e8da71f9cece415c7f5f6048b3dca21aa85977a3 https://github.com/facebookexperimental/rust-shed/commit/e3b5831ad84c07418c84688cbcc8ed4cfe171f34 https://github.com/facebookincubator/fizz/commit/e66d4c0453e8e3554a1ec4f75d8d489d64e531cd Reviewed By: bigfootjon fbshipit-source-id: db112fb68da3478567f4a78f8ed82abdf215de6d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 343bc5200659..500fba254748 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 93ad476d80892906791f6ba299c33b193c120e3e +Subproject commit 1c81d6736fe27b5c167e7f8fcac6b8ac52bd79ba diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 98bd84d72e3f..7bcf9ce24a67 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0ba07a2ec34668e98b9789e6c67a85704bfecd01 +Subproject commit d2cb8f6d5447c87c8450c230fbc424061fddb3f4 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f2c04a82d6c8..527c4baf5a9e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit dadb85166a92f6326514d822cc548d1788f74a7a +Subproject commit da1c4947ef1db92fc732dea065a00f556c1d7e4b From b6b5fe6f0c625a062121538c9171608bc7f8c659 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Tue, 2 Jul 2024 09:32:47 -0700 Subject: [PATCH 7036/7387] Only add direct deps to GETDEPS_CABAL_FLAGS Summary: X-link: https://github.com/facebookincubator/zstrong/pull/899 You shouldn't be able to depend on a library unless it is in your direct dependencies, also this shortens the massive GETDEPS_CABAL_FLAGS to something more sensible. Reviewed By: chadaustin Differential Revision: D58244928 fbshipit-source-id: 3e93f26ef197252cd723a65c1752dad53b5327b6 --- build/fbcode_builder/getdeps/builder.py | 14 ++++++++++--- build/fbcode_builder/getdeps/buildopts.py | 25 +++++++++++++++++------ build/fbcode_builder/getdeps/dyndeps.py | 22 ++++++++++---------- build/fbcode_builder/manifests/hsthrift | 3 +++ 4 files changed, 44 insertions(+), 20 deletions(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 794ec4ce7d93..5a5ea2303b57 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -179,7 +179,9 @@ def build(self, reconfigure: bool) -> None: # needs to be updated to include all of the directories containing the runtime # library dependencies in order to run the binaries. script_path = self.get_dev_run_script_path() - dep_munger = create_dyn_dep_munger(self.build_opts, self.install_dirs) + dep_munger = create_dyn_dep_munger( + self.build_opts, self._compute_env(), self.install_dirs + ) dep_dirs = self.get_dev_run_extra_path_dirs(dep_munger) # pyre-fixme[16]: Optional type has no attribute `emit_dev_run_script`. dep_munger.emit_dev_run_script(script_path, dep_dirs) @@ -227,7 +229,11 @@ def _compute_env(self): # CMAKE_PREFIX_PATH is only respected when passed through the # environment, so we construct an appropriate path to pass down return self.build_opts.compute_env_for_install_dirs( - self.install_dirs, env=self.env, manifest=self.manifest + self.loader, + self.dep_manifests, + self.ctx, + env=self.env, + manifest=self.manifest, ) def get_dev_run_script_path(self): @@ -237,7 +243,9 @@ def get_dev_run_script_path(self): def get_dev_run_extra_path_dirs(self, dep_munger=None): assert self.build_opts.is_windows() if dep_munger is None: - dep_munger = create_dyn_dep_munger(self.build_opts, self.install_dirs) + dep_munger = create_dyn_dep_munger( + self.build_opts, self._compute_env(), self.install_dirs + ) return dep_munger.compute_dependency_paths(self.build_dir) diff --git a/build/fbcode_builder/getdeps/buildopts.py b/build/fbcode_builder/getdeps/buildopts.py index 6bda130e6589..b315c175b8ab 100644 --- a/build/fbcode_builder/getdeps/buildopts.py +++ b/build/fbcode_builder/getdeps/buildopts.py @@ -221,7 +221,7 @@ def get_context_generator(self, host_tuple=None): ) def compute_env_for_install_dirs( - self, install_dirs, env=None, manifest=None + self, loader, dep_manifests, ctx, env=None, manifest=None ): # noqa: C901 if env is not None: env = env.copy() @@ -300,8 +300,16 @@ def compute_env_for_install_dirs( env["FBSOURCE_DATE"] = hash_data.date # reverse as we are prepending to the PATHs - for d in reversed(install_dirs): - self.add_prefix_to_env(d, env, append=False) + for m in reversed(dep_manifests): + is_direct_dep = ( + manifest is not None and m.name in manifest.get_dependencies(ctx) + ) + self.add_prefix_to_env( + loader.get_project_install_dir(m), + env, + append=False, + is_direct_dep=is_direct_dep, + ) # Linux is always system openssl system_openssl = self.is_linux() @@ -336,7 +344,12 @@ def add_homebrew_package_to_env(self, package, env) -> bool: return False def add_prefix_to_env( - self, d, env, append: bool = True, add_library_path: bool = False + self, + d, + env, + append: bool = True, + add_library_path: bool = False, + is_direct_dep: bool = False, ) -> bool: # noqa: C901 bindir = os.path.join(d, "bin") found = False @@ -374,7 +387,7 @@ def add_prefix_to_env( add_flag(env, "CPPFLAGS", f"-I{includedir}", append=append) # For non-pkgconfig projects Cabal has no way to find the includes or # libraries, so we provide a set of extra Cabal flags in the env - if not has_pkgconfig: + if not has_pkgconfig and is_direct_dep: add_flag( env, "GETDEPS_CABAL_FLAGS", @@ -419,7 +432,7 @@ def add_prefix_to_env( add_flag(env, "LDFLAGS", f"-L{libdir}", append=append) if add_library_path: add_path_entry(env, "LIBRARY_PATH", libdir, append=append) - if not has_pkgconfig: + if not has_pkgconfig and is_direct_dep: add_flag( env, "GETDEPS_CABAL_FLAGS", diff --git a/build/fbcode_builder/getdeps/dyndeps.py b/build/fbcode_builder/getdeps/dyndeps.py index 0dd9a4557eca..25e15cd36609 100644 --- a/build/fbcode_builder/getdeps/dyndeps.py +++ b/build/fbcode_builder/getdeps/dyndeps.py @@ -26,9 +26,9 @@ def copyfile(src, dest) -> None: class DepBase(object): - def __init__(self, buildopts, install_dirs, strip) -> None: + def __init__(self, buildopts, env, install_dirs, strip) -> None: self.buildopts = buildopts - self.env = buildopts.compute_env_for_install_dirs(install_dirs) + self.env = env self.install_dirs = install_dirs self.strip = strip @@ -168,8 +168,8 @@ def check_call_verbose(self, args: List[str]) -> None: class WinDeps(DepBase): - def __init__(self, buildopts, install_dirs, strip) -> None: - super(WinDeps, self).__init__(buildopts, install_dirs, strip) + def __init__(self, buildopts, env, install_dirs, strip) -> None: + super(WinDeps, self).__init__(buildopts, env, install_dirs, strip) self.dumpbin = self.find_dumpbin() def find_dumpbin(self) -> str: @@ -334,8 +334,8 @@ def _get_dev_run_script_contents(self, path_dirs) -> str: class ElfDeps(DepBase): - def __init__(self, buildopts, install_dirs, strip) -> None: - super(ElfDeps, self).__init__(buildopts, install_dirs, strip) + def __init__(self, buildopts, env, install_dirs, strip) -> None: + super(ElfDeps, self).__init__(buildopts, env, install_dirs, strip) # We need patchelf to rewrite deps, so ensure that it is built... args = [sys.executable, sys.argv[0]] @@ -448,14 +448,14 @@ def rewrite_dep(self, objfile, depname, old_dep, new_dep, final_lib_dir) -> None def create_dyn_dep_munger( - buildopts, install_dirs, strip: bool = False + buildopts, env, install_dirs, strip: bool = False ) -> Optional[DepBase]: if buildopts.is_linux(): - return ElfDeps(buildopts, install_dirs, strip) + return ElfDeps(buildopts, env, install_dirs, strip) if buildopts.is_darwin(): - return MachDeps(buildopts, install_dirs, strip) + return MachDeps(buildopts, env, install_dirs, strip) if buildopts.is_windows(): - return WinDeps(buildopts, install_dirs, strip) + return WinDeps(buildopts, env, install_dirs, strip) if buildopts.is_freebsd(): - return ElfDeps(buildopts, install_dirs, strip) + return ElfDeps(buildopts, env, install_dirs, strip) return None diff --git a/build/fbcode_builder/manifests/hsthrift b/build/fbcode_builder/manifests/hsthrift index 7dd42ca1c5ed..8a958820c43a 100644 --- a/build/fbcode_builder/manifests/hsthrift +++ b/build/fbcode_builder/manifests/hsthrift @@ -16,6 +16,9 @@ gflags glog folly fbthrift +wangle +fizz +boost [build] builder = make From 25d31d4c87b4f4dd4c148fc1818d4724f053106b Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Wed, 3 Jul 2024 08:57:21 -0700 Subject: [PATCH 7037/7387] CI: enable clang tests (#898) Summary: Pull Request resolved: https://github.com/facebookincubator/zstrong/pull/898 Reviewed By: malanka Differential Revision: D59065671 fbshipit-source-id: 2a09ae13e1d4c62a7b9a907cca0e911672435ad1 --- build/fbcode_builder/getdeps.py | 8 +++++++- build/fbcode_builder/manifests/clang | 5 +++++ build/fbcode_builder/manifests/glean | 8 ++++++-- build/fbcode_builder/manifests/llvm | 5 +++++ 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 build/fbcode_builder/manifests/clang create mode 100644 build/fbcode_builder/manifests/llvm diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 94b137fe76fa..ed328dae5b0d 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -844,14 +844,20 @@ def run_project_cmd(self, args, loader, manifest): # Accumulate the install directories so that the build steps # can find their dep installation install_dirs = [] + dep_manifests = [] for m in projects: inst_dir = loader.get_project_install_dir_respecting_install_prefix(m) install_dirs.append(inst_dir) + dep_manifests.append(m) if m == manifest: + ctx = loader.ctx_gen.get_context(m.name) + env = loader.build_opts.compute_env_for_install_dirs( + loader, dep_manifests, ctx + ) dep_munger = create_dyn_dep_munger( - loader.build_opts, install_dirs, args.strip + loader.build_opts, env, install_dirs, args.strip ) if dep_munger is None: print(f"dynamic dependency fixups not supported on {sys.platform}") diff --git a/build/fbcode_builder/manifests/clang b/build/fbcode_builder/manifests/clang new file mode 100644 index 000000000000..a2133e018303 --- /dev/null +++ b/build/fbcode_builder/manifests/clang @@ -0,0 +1,5 @@ +[manifest] +name = clang + +[rpms] +clang15-devel diff --git a/build/fbcode_builder/manifests/glean b/build/fbcode_builder/manifests/glean index 5dc3a8724ee3..7cb422c9b979 100644 --- a/build/fbcode_builder/manifests/glean +++ b/build/fbcode_builder/manifests/glean @@ -21,6 +21,9 @@ glog folly rocksdb xxhash +llvm +clang +re2 [build] builder = make @@ -29,8 +32,9 @@ builder = make cabal-update all glass +glean-clang EXTRA_GHC_OPTS=-j4 +RTS -A32m -n4m -RTS -CABAL_CONFIG_FLAGS=-f-clang-tests -f-hack-tests -f-typescript-tests -f-python-tests -f-dotnet-tests -f-go-tests -f-rust-tests -f-java-lsif-tests -f-flow-tests +CABAL_CONFIG_FLAGS=-f-hack-tests -f-typescript-tests -f-python-tests -f-dotnet-tests -f-go-tests -f-rust-tests -f-java-lsif-tests -f-flow-tests [make.install_args] install @@ -38,4 +42,4 @@ install [make.test_args] test EXTRA_GHC_OPTS=-j4 +RTS -A32m -n4m -RTS -CABAL_CONFIG_FLAGS=-f-clang-tests -f-hack-tests -f-typescript-tests -f-python-tests -f-dotnet-tests -f-go-tests -f-rust-tests -f-java-lsif-tests -f-flow-tests +CABAL_CONFIG_FLAGS=-f-hack-tests -f-typescript-tests -f-python-tests -f-dotnet-tests -f-go-tests -f-rust-tests -f-java-lsif-tests -f-flow-tests diff --git a/build/fbcode_builder/manifests/llvm b/build/fbcode_builder/manifests/llvm new file mode 100644 index 000000000000..7b069221efc0 --- /dev/null +++ b/build/fbcode_builder/manifests/llvm @@ -0,0 +1,5 @@ +[manifest] +name = llvm + +[rpms] +llvm15-devel From aeebcd5eff8253f86e1791e4434240a7e40b15fb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 3 Jul 2024 09:31:12 -0700 Subject: [PATCH 7038/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/906dfb14632346e34200d685b898a541790df4d9 https://github.com/facebook/fb303/commit/2e0a124b66a15f131263072052ad6970f3cfafe5 https://github.com/facebook/fbthrift/commit/dcf0b6ccdba3773387f892764ddc2c8f6477fe50 https://github.com/facebook/folly/commit/d31f1b0fdc4d74fb1ed7fae94f7c6f88e0943a34 https://github.com/facebook/mvfst/commit/5e79559d947160dc105066f9b9c068079c46ad95 https://github.com/facebook/proxygen/commit/3dfff8fb84f3ea492520206665a9222e55151b8c https://github.com/facebook/wangle/commit/66a71669eeaab1ea3118eab046090805eccfbc61 https://github.com/facebookexperimental/edencommon/commit/4fcb9b138da9d8629ae5fef66308b362b52116b4 https://github.com/facebookexperimental/rust-shed/commit/6ee0656e0a17136dfc7d9fe37fdb7c457205c6bf https://github.com/facebookincubator/fizz/commit/a244c8044eb1dd69f07036667f119afac1dc5435 Reviewed By: bigfootjon fbshipit-source-id: 29dbbe4e446c739c6b400cec7b0c94a9f1dd104f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 500fba254748..3aedf463522c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1c81d6736fe27b5c167e7f8fcac6b8ac52bd79ba +Subproject commit dcf0b6ccdba3773387f892764ddc2c8f6477fe50 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7bcf9ce24a67..5af0bb6c8ee6 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d2cb8f6d5447c87c8450c230fbc424061fddb3f4 +Subproject commit d31f1b0fdc4d74fb1ed7fae94f7c6f88e0943a34 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 527c4baf5a9e..fb29a278c469 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit da1c4947ef1db92fc732dea065a00f556c1d7e4b +Subproject commit 66a71669eeaab1ea3118eab046090805eccfbc61 From 2c069f04b063dbf2c84b2ecd1560d5c4e399e76b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 4 Jul 2024 09:31:23 -0700 Subject: [PATCH 7039/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/66b37666c3a6edca4610fb3e625a8ac06fb3a06d https://github.com/facebook/fb303/commit/22ea90095229494ac7ff578c47919c244ff623fb https://github.com/facebook/fbthrift/commit/c6c5564e281668105d0a2dbd99616b8aac615487 https://github.com/facebook/folly/commit/19e4d49f84134c2e41f5cdf4597a338b68928028 https://github.com/facebook/mvfst/commit/709d45797653cfbc3f7c14cf3bf5b8d12a759119 https://github.com/facebook/proxygen/commit/3e4086117d4ad93bfd7ad2bfc1f0b2f148cec0f6 https://github.com/facebook/wangle/commit/c309dd35bd7f00f712ca04abd07ade4a76216120 https://github.com/facebookexperimental/edencommon/commit/fe5fe5a2b3567b8eef2d63ddd9053fc7800657ca https://github.com/facebookexperimental/rust-shed/commit/76d39cb91a3abbf3eb8f569ab12ec350bc9a5489 https://github.com/facebookincubator/fizz/commit/b6d0e1a01ecaa365de8f6afa52bfe58f6a2c957c Reviewed By: bigfootjon fbshipit-source-id: e96c71adb89c7938c85265ac85873e1f16cc1f6d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3aedf463522c..970299486631 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit dcf0b6ccdba3773387f892764ddc2c8f6477fe50 +Subproject commit c6c5564e281668105d0a2dbd99616b8aac615487 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 5af0bb6c8ee6..90f18806747b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d31f1b0fdc4d74fb1ed7fae94f7c6f88e0943a34 +Subproject commit 19e4d49f84134c2e41f5cdf4597a338b68928028 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index fb29a278c469..61bfb9889eeb 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 66a71669eeaab1ea3118eab046090805eccfbc61 +Subproject commit c309dd35bd7f00f712ca04abd07ade4a76216120 From 5f995979d5a5f42f2151247d06a1ac83969e5d1d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 5 Jul 2024 09:30:53 -0700 Subject: [PATCH 7040/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/bf692aba2368300367a13cecbd2ab0fbb03dafb9 https://github.com/facebook/fb303/commit/bfdd525c05c0a094af9a0310c2a4ba12bc2f437c https://github.com/facebook/fbthrift/commit/18d61d4cf0a319cb819506f0e9582ddf28623e5d https://github.com/facebook/mvfst/commit/028d42fb749021ca018916f2cda60a1a561e867e https://github.com/facebook/proxygen/commit/dc18a7291ed704711d76d7e78572d3629fe042fe https://github.com/facebook/wangle/commit/96dd6ae5387f14d8c607b9d34a58a9ec23d010f9 https://github.com/facebookexperimental/edencommon/commit/e57e301e08020bf2e5a19070faaac0e328834928 https://github.com/facebookexperimental/rust-shed/commit/57251a5230618767de1ad526c846462a8bcaff28 https://github.com/facebookincubator/fizz/commit/21fc5b0e0d5179ea04c3ff6ed52dc022a609213b Reviewed By: bigfootjon fbshipit-source-id: 274745e8b795d313cf1356339f319c384a0cf72b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 970299486631..a4580e849743 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c6c5564e281668105d0a2dbd99616b8aac615487 +Subproject commit 18d61d4cf0a319cb819506f0e9582ddf28623e5d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 61bfb9889eeb..6b747142b80f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c309dd35bd7f00f712ca04abd07ade4a76216120 +Subproject commit 96dd6ae5387f14d8c607b9d34a58a9ec23d010f9 From 53fdaa9e261b9426c92f67605cd6ac54f4850a82 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 6 Jul 2024 09:31:30 -0700 Subject: [PATCH 7041/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/6a2be125d299d63ff2441268f197027d7fecd7fc https://github.com/facebook/fbthrift/commit/4ebffcd7978938b8895b41cd95354717d60f12b9 https://github.com/facebook/folly/commit/ac93e22a679079331f6244e54f91f42a5928eefb https://github.com/facebook/mvfst/commit/5f232b66a834bc31755254131dce119a260c8c1c https://github.com/facebook/proxygen/commit/71b98da1432a2acd468253e136da6ac83ec68832 https://github.com/facebook/wangle/commit/d2fc2b1ef3475cb44332bb2b6c200de497c48c41 https://github.com/facebookexperimental/rust-shed/commit/e99d9b97a1e71b2367d0c7df5f1ea3b4c8aec708 Reviewed By: bigfootjon fbshipit-source-id: d1235c144b1e12ae2379d5ba063c4661c0ba9d05 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a4580e849743..baa7883690e6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 18d61d4cf0a319cb819506f0e9582ddf28623e5d +Subproject commit 4ebffcd7978938b8895b41cd95354717d60f12b9 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 90f18806747b..6ba955115a74 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 19e4d49f84134c2e41f5cdf4597a338b68928028 +Subproject commit ac93e22a679079331f6244e54f91f42a5928eefb diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6b747142b80f..6ca8214747fd 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 96dd6ae5387f14d8c607b9d34a58a9ec23d010f9 +Subproject commit d2fc2b1ef3475cb44332bb2b6c200de497c48c41 From 0b68c379f98b2ded2e6266df8057d22cad8c9c35 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 7 Jul 2024 09:31:09 -0700 Subject: [PATCH 7042/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/6e3694affe7855883e72bed37e88fc92727056b9 https://github.com/facebook/fbthrift/commit/74bfe847fe27d26e0990bd32813bdbd2fe08d060 https://github.com/facebook/folly/commit/b0d11fa422d9715fbd2936932a0ad61e10efcaf3 https://github.com/facebook/mvfst/commit/f0c62db82eb8c104c4ee024285c7bb1c407c4419 https://github.com/facebook/proxygen/commit/fe1e6b508721b58e2e55e9fff170b316f408ca49 https://github.com/facebook/wangle/commit/f98dd9c92fd7fd95a41ef774b7cd6d132ab82bfc https://github.com/facebookexperimental/edencommon/commit/fb7acc6b2d6093c8dcbdcc5551a6f66ae998678c https://github.com/facebookexperimental/rust-shed/commit/2530ae063ea7df727b31bd78dfaeb069ccdcab13 https://github.com/facebookincubator/fizz/commit/01af4acf3ab8cbee63df499620b1f23221aafe36 Reviewed By: bigfootjon fbshipit-source-id: 0283a6b29da32341af9f784c500a0e7f8f803f4e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index baa7883690e6..5168347f2907 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4ebffcd7978938b8895b41cd95354717d60f12b9 +Subproject commit 74bfe847fe27d26e0990bd32813bdbd2fe08d060 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6ba955115a74..c890e0beccbd 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ac93e22a679079331f6244e54f91f42a5928eefb +Subproject commit b0d11fa422d9715fbd2936932a0ad61e10efcaf3 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6ca8214747fd..064c8b7ea63f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d2fc2b1ef3475cb44332bb2b6c200de497c48c41 +Subproject commit f98dd9c92fd7fd95a41ef774b7cd6d132ab82bfc From 7ad330de38ddf2d18964b7521518d0e44637e5bb Mon Sep 17 00:00:00 2001 From: Chris Dinh Date: Mon, 8 Jul 2024 07:52:17 -0700 Subject: [PATCH 7043/7387] Add support for eden flag listOnlyFiles Summary: This diff lets watchman deduce whether or not to use the listOnlyFiles flag when using eden. The system works as follows - ["type", "d"] means listOnlyFiles is false - all other type fields means it is true - ["not"] inverts the subexpression - Any value in an ["allof"] being true results in the whole expression being true - Each value in an ["anyof"] must be true for the expression to be true - All other expressions result in false Reviewed By: kmancini Differential Revision: D58469180 fbshipit-source-id: e775441ca7f38e1ec4de0c048714cb7361fc912b --- watchman/query/QueryExpr.h | 9 ++ watchman/query/base.cpp | 75 ++++++++++ watchman/query/dirname.cpp | 4 + watchman/query/empty.cpp | 8 ++ watchman/query/intcompare.cpp | 4 + watchman/query/match.cpp | 4 + watchman/query/name.cpp | 4 + watchman/query/pcre.cpp | 4 + watchman/query/since.cpp | 4 + watchman/query/suffix.cpp | 4 + watchman/query/type.cpp | 11 ++ watchman/test/ReturnOnlyFilesTest.cpp | 194 ++++++++++++++++++++++++++ watchman/watcher/eden.cpp | 13 +- 13 files changed, 336 insertions(+), 2 deletions(-) create mode 100644 watchman/test/ReturnOnlyFilesTest.cpp diff --git a/watchman/query/QueryExpr.h b/watchman/query/QueryExpr.h index c21b4bcf69b6..19a8553dc152 100644 --- a/watchman/query/QueryExpr.h +++ b/watchman/query/QueryExpr.h @@ -77,6 +77,15 @@ class QueryExpr { */ virtual std::optional> computeGlobUpperBound( CaseSensitivity) const = 0; + + enum ReturnOnlyFiles { No, Yes, Unrelated }; + + /** + * Returns whether this expression only returns files. + * Used to determine if Eden can use the faster server-based + * method to handle this query. + */ + virtual ReturnOnlyFiles listOnlyFiles() const = 0; }; } // namespace watchman diff --git a/watchman/query/base.cpp b/watchman/query/base.cpp index b684dd7a5d20..635ee9e2d6d7 100644 --- a/watchman/query/base.cpp +++ b/watchman/query/base.cpp @@ -50,6 +50,20 @@ class NotExpr : public QueryExpr { // the inner expression is. return std::nullopt; } + + /** + * Inverts the result of the subexpression. + * Expressions that are unrelated stay unrelated. + */ + ReturnOnlyFiles listOnlyFiles() const override { + auto subExprValue = expr->listOnlyFiles(); + if (subExprValue == ReturnOnlyFiles::Yes) { + return ReturnOnlyFiles::No; + } else if (subExprValue == ReturnOnlyFiles::No) { + return ReturnOnlyFiles::Yes; + } + return ReturnOnlyFiles::Unrelated; + } }; W_TERM_PARSER(not, NotExpr::parse); @@ -69,6 +83,10 @@ class TrueExpr : public QueryExpr { // We will match every path --> unbounded. return std::nullopt; } + + ReturnOnlyFiles listOnlyFiles() const override { + return ReturnOnlyFiles::Unrelated; + } }; W_TERM_PARSER(true, TrueExpr::parse); @@ -88,6 +106,10 @@ class FalseExpr : public QueryExpr { // We will not match any path --> bounded by an empty list of globs. return std::vector{}; } + + ReturnOnlyFiles listOnlyFiles() const override { + return ReturnOnlyFiles::Unrelated; + } }; W_TERM_PARSER(false, FalseExpr::parse); @@ -237,6 +259,59 @@ class ListExpr : public QueryExpr { return std::vector( unionOfUpperBounds.begin(), unionOfUpperBounds.end()); } + /** + * Combines the results of the subexpressions. + * For allof, the result needs to satisfy each subexpression. + * - If any subexpression requests non-file data, the whole expression must + * also contain non-file data. Therefore we return No if any subexpression + * requests non-file data. + * - If any subexpression requests only file data, the whole expression must + * also contain only file data. Therefore we return Yes if one subexpression + * requests only file data. and there is no subexpression requesting + * non-file data. + * - We return No if there are both Yes and No subexpressions because + * we want expressions that exclude groups of types like + * ["not", ["allof", ["type", "l"], ["type", "d"]]] + * to return Yes if we are excluding directories. + * For anyof, the result can satisfy any subexpression. + * - If any subexpression requests non-file data, the whole expression could + * also contain non-file data. Therefore we return No if any subexpression + * requests non-file data. + * - The only way for the whole expression to contain only file data is if + * each subexpression contains only file data. Therefore we return Yes only + * if each subexpression is Yes. + */ + ReturnOnlyFiles listOnlyFiles() const override { + ReturnOnlyFiles result = ReturnOnlyFiles::Unrelated; + if (allof) { + for (auto& subExpr : exprs) { + auto value = subExpr->listOnlyFiles(); + if (value == ReturnOnlyFiles::Yes) { + result = ReturnOnlyFiles::Yes; + } else if (value == ReturnOnlyFiles::No) { + return ReturnOnlyFiles::No; + } + } + } else { + bool allYes = exprs.empty() + ? false + : exprs[0]->listOnlyFiles() == ReturnOnlyFiles::Yes; + for (auto& subExpr : exprs) { + auto value = subExpr->listOnlyFiles(); + if (value == ReturnOnlyFiles::Yes) { + // Keep checking the remaining subexprs + } else if (value == ReturnOnlyFiles::No) { + return ReturnOnlyFiles::No; + } else { + allYes = false; + } + } + if (allYes) { + return ReturnOnlyFiles::Yes; + } + } + return result; + } }; W_TERM_PARSER(anyof, ListExpr::parseAnyOf); diff --git a/watchman/query/dirname.cpp b/watchman/query/dirname.cpp index 4dbcca84cdcc..5c92a1e61830 100644 --- a/watchman/query/dirname.cpp +++ b/watchman/query/dirname.cpp @@ -174,6 +174,10 @@ class DirNameExpr : public QueryExpr { return std::vector{outputPattern.string() + "/**"}; } + + ReturnOnlyFiles listOnlyFiles() const override { + return ReturnOnlyFiles::Unrelated; + } }; W_TERM_PARSER(dirname, DirNameExpr::parseDirName); diff --git a/watchman/query/empty.cpp b/watchman/query/empty.cpp index 2df136483077..cc5c3833b873 100644 --- a/watchman/query/empty.cpp +++ b/watchman/query/empty.cpp @@ -30,6 +30,10 @@ class ExistsExpr : public QueryExpr { // `exists` doesn't constrain the path. return std::nullopt; } + + ReturnOnlyFiles listOnlyFiles() const override { + return ReturnOnlyFiles::Unrelated; + } }; W_TERM_PARSER(exists, ExistsExpr::parse); @@ -71,6 +75,10 @@ class EmptyExpr : public QueryExpr { // `empty` doesn't constrain the path. return std::nullopt; } + + ReturnOnlyFiles listOnlyFiles() const override { + return ReturnOnlyFiles::Unrelated; + } }; W_TERM_PARSER(empty, EmptyExpr::parse); diff --git a/watchman/query/intcompare.cpp b/watchman/query/intcompare.cpp index d4083d9d2694..c89da8f78657 100644 --- a/watchman/query/intcompare.cpp +++ b/watchman/query/intcompare.cpp @@ -128,6 +128,10 @@ class SizeExpr : public QueryExpr { // `size` doesn't constrain the path. return std::nullopt; } + + ReturnOnlyFiles listOnlyFiles() const override { + return ReturnOnlyFiles::Unrelated; + } }; W_TERM_PARSER(size, SizeExpr::parse); diff --git a/watchman/query/match.cpp b/watchman/query/match.cpp index 8c25e092f743..c3c0297cfec9 100644 --- a/watchman/query/match.cpp +++ b/watchman/query/match.cpp @@ -208,6 +208,10 @@ class WildMatchExpr : public QueryExpr { return std::vector{ trimGlobAfterDoubleStar(outputPattern).string()}; } + + ReturnOnlyFiles listOnlyFiles() const override { + return ReturnOnlyFiles::Unrelated; + } }; W_TERM_PARSER(match, WildMatchExpr::parseMatch); W_TERM_PARSER(imatch, WildMatchExpr::parseIMatch); diff --git a/watchman/query/name.cpp b/watchman/query/name.cpp index a6de9c1001d7..d1d3802f0f4f 100644 --- a/watchman/query/name.cpp +++ b/watchman/query/name.cpp @@ -182,6 +182,10 @@ class NameExpr : public QueryExpr { return std::vector( globUpperBound.begin(), globUpperBound.end()); } + + ReturnOnlyFiles listOnlyFiles() const override { + return ReturnOnlyFiles::Unrelated; + } }; W_TERM_PARSER(name, NameExpr::parseName); diff --git a/watchman/query/pcre.cpp b/watchman/query/pcre.cpp index 6138a2c5d079..5f22e7ca0cd7 100644 --- a/watchman/query/pcre.cpp +++ b/watchman/query/pcre.cpp @@ -153,6 +153,10 @@ class PcreExpr : public QueryExpr { return std::nullopt; } + + ReturnOnlyFiles listOnlyFiles() const override { + return ReturnOnlyFiles::Unrelated; + } }; W_TERM_PARSER(pcre, PcreExpr::parsePcre); W_TERM_PARSER(ipcre, PcreExpr::parseIPcre); diff --git a/watchman/query/since.cpp b/watchman/query/since.cpp index b95a2a72a1c1..e290a10ffa7b 100644 --- a/watchman/query/since.cpp +++ b/watchman/query/since.cpp @@ -166,6 +166,10 @@ class SinceExpr : public QueryExpr { // `since` doesn't constrain the path. return std::nullopt; } + + ReturnOnlyFiles listOnlyFiles() const override { + return ReturnOnlyFiles::Unrelated; + } }; W_TERM_PARSER(since, SinceExpr::parse); diff --git a/watchman/query/suffix.cpp b/watchman/query/suffix.cpp index 676e0ebee387..f33230b75fb9 100644 --- a/watchman/query/suffix.cpp +++ b/watchman/query/suffix.cpp @@ -96,6 +96,10 @@ class SuffixExpr : public QueryExpr { // it as unbounded. return std::nullopt; } + + ReturnOnlyFiles listOnlyFiles() const override { + return ReturnOnlyFiles::Unrelated; + } }; W_TERM_PARSER(suffix, SuffixExpr::parse); W_CAP_REG("suffix-set") diff --git a/watchman/query/type.cpp b/watchman/query/type.cpp index 6c6716987414..d1b1b68addd8 100644 --- a/watchman/query/type.cpp +++ b/watchman/query/type.cpp @@ -108,6 +108,17 @@ class TypeExpr : public QueryExpr { // `type` doesn't constrain the path. return std::nullopt; } + + /** + * Determines if this expression will return only files. + * An expression returns files if is not type 'd', for directories. + */ + ReturnOnlyFiles listOnlyFiles() const override { + if (arg == 'd') { + return ReturnOnlyFiles::No; + } + return ReturnOnlyFiles::Yes; + } }; W_TERM_PARSER(type, TypeExpr::parse); diff --git a/watchman/test/ReturnOnlyFilesTest.cpp b/watchman/test/ReturnOnlyFilesTest.cpp new file mode 100644 index 000000000000..1ecaa104d7c6 --- /dev/null +++ b/watchman/test/ReturnOnlyFilesTest.cpp @@ -0,0 +1,194 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +#include +#include +#include +#include "watchman/query/GlobTree.h" +#include "watchman/query/Query.h" +#include "watchman/query/QueryExpr.h" +#include "watchman/query/TermRegistry.h" +#include "watchman/thirdparty/jansson/jansson.h" + +using namespace watchman; +using namespace testing; + +namespace { +std::optional expr_return_only_files( + std::string expression_json) { + json_error_t err{}; + auto expression = json_loads(expression_json.c_str(), JSON_DECODE_ANY, &err); + if (!expression.has_value()) { + ADD_FAILURE() << "JSON parse error in fixture: " << err.text << " at " + << err.source << ":" << err.line << ":" << err.column; + return std::nullopt; + } + Query query; + // Disable automatic parsing of "match" as "imatch", "name" as "iname", etc. + auto expr = watchman::parseQueryExpr(&query, *expression); + return expr->listOnlyFiles(); +} + +} // namespace + +TEST(ReturnOnlyFilesTest, false) { + EXPECT_THAT( + expr_return_only_files(R"( ["false"] )"), + Optional(QueryExpr::ReturnOnlyFiles::Unrelated)); +} + +TEST(ReturnOnlyFilesTest, true) { + EXPECT_THAT( + expr_return_only_files(R"( ["true"] )"), + Optional(QueryExpr::ReturnOnlyFiles::Unrelated)); +} + +TEST(ReturnOnlyFilesTest, type_d) { + EXPECT_THAT( + expr_return_only_files(R"( ["type", "d"] )"), + Optional(QueryExpr::ReturnOnlyFiles::No)); +} + +TEST(ReturnOnlyFilesTest, type_f) { + EXPECT_THAT( + expr_return_only_files(R"( ["type", "f"] )"), + Optional(QueryExpr::ReturnOnlyFiles::Yes)); +} + +TEST(ReturnOnlyFilesTest, type_l) { + EXPECT_THAT( + expr_return_only_files(R"( ["type", "l"] )"), + Optional(QueryExpr::ReturnOnlyFiles::Yes)); +} + +TEST(ReturnOnlyFilesTest, dirname) { + EXPECT_THAT( + expr_return_only_files(R"( ["dirname", "l"] )"), + Optional(QueryExpr::ReturnOnlyFiles::Unrelated)); +} + +TEST(ReturnOnlyFilesTest, idirname) { + EXPECT_THAT( + expr_return_only_files(R"( ["idirname", "l"] )"), + Optional(QueryExpr::ReturnOnlyFiles::Unrelated)); +} + +TEST(ReturnOnlyFilesTest, empty) { + EXPECT_THAT( + expr_return_only_files(R"( ["empty"] )"), + Optional(QueryExpr::ReturnOnlyFiles::Unrelated)); +} + +TEST(ReturnOnlyFilesTest, exists) { + EXPECT_THAT( + expr_return_only_files(R"( ["exists"] )"), + Optional(QueryExpr::ReturnOnlyFiles::Unrelated)); +} + +TEST(ReturnOnlyFilesTest, match) { + EXPECT_THAT( + expr_return_only_files(R"( ["match", "l"] )"), + Optional(QueryExpr::ReturnOnlyFiles::Unrelated)); +} + +TEST(ReturnOnlyFilesTest, imatch) { + EXPECT_THAT( + expr_return_only_files(R"( ["imatch", "l"] )"), + Optional(QueryExpr::ReturnOnlyFiles::Unrelated)); +} + +TEST(ReturnOnlyFilesTest, name) { + EXPECT_THAT( + expr_return_only_files(R"( ["name", "l"] )"), + Optional(QueryExpr::ReturnOnlyFiles::Unrelated)); +} + +TEST(ReturnOnlyFilesTest, iname) { + EXPECT_THAT( + expr_return_only_files(R"( ["iname", "l"] )"), + Optional(QueryExpr::ReturnOnlyFiles::Unrelated)); +} + +TEST(ReturnOnlyFilesTest, pcre) { + EXPECT_THAT( + expr_return_only_files(R"( ["pcre", "l"] )"), + Optional(QueryExpr::ReturnOnlyFiles::Unrelated)); +} + +TEST(ReturnOnlyFilesTest, ipcre) { + EXPECT_THAT( + expr_return_only_files(R"( ["ipcre", "l"] )"), + Optional(QueryExpr::ReturnOnlyFiles::Unrelated)); +} + +TEST(ReturnOnlyFilesTest, since) { + EXPECT_THAT( + expr_return_only_files(R"( ["since", "c:0:0"] )"), + Optional(QueryExpr::ReturnOnlyFiles::Unrelated)); +} + +TEST(ReturnOnlyFilesTest, size) { + EXPECT_THAT( + expr_return_only_files(R"( ["size", "eq", 0] )"), + Optional(QueryExpr::ReturnOnlyFiles::Unrelated)); +} + +TEST(ReturnOnlyFilesTest, suffix) { + EXPECT_THAT( + expr_return_only_files(R"( ["suffix", "txt"] )"), + Optional(QueryExpr::ReturnOnlyFiles::Unrelated)); +} + +TEST(ReturnOnlyFilesTest, allof_yes) { + EXPECT_THAT( + expr_return_only_files(R"( ["allof", ["type", "f"], ["exists"]] )"), + Optional(QueryExpr::ReturnOnlyFiles::Yes)); +} + +TEST(ReturnOnlyFilesTest, allof_no) { + EXPECT_THAT( + expr_return_only_files(R"( ["allof", ["type", "d"], ["exists"]] )"), + Optional(QueryExpr::ReturnOnlyFiles::No)); +} + +TEST(ReturnOnlyFilesTest, allof_unrelated) { + EXPECT_THAT( + expr_return_only_files(R"( ["allof", ["false"], ["exists"]] )"), + Optional(QueryExpr::ReturnOnlyFiles::Unrelated)); +} + +TEST(ReturnOnlyFilesTest, allof_yesno) { + EXPECT_THAT( + expr_return_only_files(R"( ["allof", ["type", "d"], ["type", "f"]] )"), + Optional(QueryExpr::ReturnOnlyFiles::No)); +} + +TEST(ReturnOnlyFilesTest, not_allof_yesno) { + EXPECT_THAT( + expr_return_only_files(R"( ["not", + ["allof", ["type", "d"], ["type", "f"]]] )"), + Optional(QueryExpr::ReturnOnlyFiles::Yes)); +} + +TEST(ReturnOnlyFilesTest, anyof_no) { + EXPECT_THAT( + expr_return_only_files(R"( ["allof", ["type", "d"], ["exists"]] )"), + Optional(QueryExpr::ReturnOnlyFiles::No)); +} + +TEST(ReturnOnlyFilesTest, anyof_yes) { + EXPECT_THAT( + expr_return_only_files(R"( ["anyof", ["type", "f"], ["type", "l"]] )"), + Optional(QueryExpr::ReturnOnlyFiles::Yes)); +} + +TEST(ReturnOnlyFilesTest, anyof_unrelated) { + EXPECT_THAT( + expr_return_only_files(R"( ["not", + ["anyof", ["exists"], ["true"]]] )"), + Optional(QueryExpr::ReturnOnlyFiles::Unrelated)); +} diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index 94ef01a5cd2a..231f0f61d15e 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -652,7 +652,8 @@ std::vector globNameAndDType( const std::string& mountPoint, const std::vector& globPatterns, bool includeDotfiles, - bool splitGlobPattern = false) { + bool splitGlobPattern = false, + bool listOnlyFiles = false) { // TODO(xavierd): Once the config: "eden_split_glob_pattern" is rolled out // everywhere, remove this code. if (splitGlobPattern && globPatterns.size() > 1) { @@ -667,6 +668,7 @@ std::vector globNameAndDType( params.globs() = std::vector{globPattern}; params.includeDotfiles() = includeDotfiles; params.wantDtype() = true; + params.listOnlyFiles() = listOnlyFiles; params.sync() = getSyncBehavior(); globFutures.emplace_back( @@ -685,6 +687,7 @@ std::vector globNameAndDType( params.globs() = globPatterns; params.includeDotfiles() = includeDotfiles; params.wantDtype() = true; + params.listOnlyFiles() = listOnlyFiles; params.sync() = getSyncBehavior(); Glob glob; @@ -865,12 +868,18 @@ class EdenView final : public QueryableView { bool includeDir = true) const { auto client = getEdenClient(thriftChannel_); + bool listOnlyFiles = false; + if (ctx->query->expr) { + listOnlyFiles = + ctx->query->expr->listOnlyFiles() == QueryExpr::ReturnOnlyFiles::Yes; + } auto fileInfo = globNameAndDType( client.get(), mountPoint_, globStrings, includeDotfiles, - splitGlobPattern_); + splitGlobPattern_, + listOnlyFiles); // Filter out any ignored files filterOutPaths(fileInfo, ctx); From c552ccc0096a95c468339ed44ec8db2eec4f8419 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 8 Jul 2024 09:31:31 -0700 Subject: [PATCH 7044/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/af8995406e3ddf8c3021eb0ede48336181c9b74b https://github.com/facebook/fb303/commit/81b738fb7ea2bc41b796245a710f9135372e7d20 https://github.com/facebook/fbthrift/commit/26cb8dccc97ccc6dfe409d4220e9f233634c074d https://github.com/facebook/folly/commit/d5799387d0e4ee7c6f5ded5fe35536ed4637a319 https://github.com/facebook/mvfst/commit/fbf57cc858e09a31ee0fd0d14eade2dfd99f74db https://github.com/facebook/proxygen/commit/cefdb8c484225e1415c5be63a6321ccd2fc8038d https://github.com/facebook/wangle/commit/1b0096a8fcda5632a38a0204b7e7a9cde402ba51 https://github.com/facebookexperimental/edencommon/commit/c425822356208abd4b1aef4bee264073f86dba21 https://github.com/facebookexperimental/rust-shed/commit/c2c9926a19c933a746522f7d1257824df3a5f781 https://github.com/facebookincubator/fizz/commit/ef4bdb3969d25618d20a03cdfd962c6071ab22e3 Reviewed By: bigfootjon fbshipit-source-id: 8eaa9d4307cb5e8bca6e4ddfb18ec53b3e3e0c79 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5168347f2907..94b7cb40989c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 74bfe847fe27d26e0990bd32813bdbd2fe08d060 +Subproject commit 26cb8dccc97ccc6dfe409d4220e9f233634c074d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index c890e0beccbd..94099163c8ab 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b0d11fa422d9715fbd2936932a0ad61e10efcaf3 +Subproject commit d5799387d0e4ee7c6f5ded5fe35536ed4637a319 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 064c8b7ea63f..9013da8a8ac0 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f98dd9c92fd7fd95a41ef774b7cd6d132ab82bfc +Subproject commit 1b0096a8fcda5632a38a0204b7e7a9cde402ba51 From 9c0cc2b95a74ace610a390bd58b78c1f259e0e99 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 9 Jul 2024 09:35:11 -0700 Subject: [PATCH 7045/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/72f20f0ff3c4481c96d22438f29c3ad90e3f719c https://github.com/facebook/fb303/commit/89c76cfb253c6437aece77bc96a065a812a97efe https://github.com/facebook/fbthrift/commit/b9f0eb3ebdeb5d5247ad05e0e7c7ffd5d91bfbcf https://github.com/facebook/folly/commit/06a8ff62ec232be25d5ca5bdc066f973f3b16937 https://github.com/facebook/mvfst/commit/22a4c4669a13e5b5ff51ea3803405b5dea05c4d9 https://github.com/facebook/proxygen/commit/528cd7e3de58404b7c07305ba580f2ca1688be9f https://github.com/facebook/wangle/commit/1e64194168b57e13c829ffbf58ab20436da029d2 https://github.com/facebookexperimental/edencommon/commit/e45fb0d937a30f3a22124b1fec79e2db36ef305c https://github.com/facebookexperimental/rust-shed/commit/96dab9abc220d36172e111d5825b96df9118b634 https://github.com/facebookincubator/fizz/commit/1f18a4136d9a2279b3a3fc7f5af2f3e7b134b264 Reviewed By: bigfootjon fbshipit-source-id: 3e8c03c28649e633225d1d55d76b15dab346875a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 94b7cb40989c..a0fc1449af61 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 26cb8dccc97ccc6dfe409d4220e9f233634c074d +Subproject commit b9f0eb3ebdeb5d5247ad05e0e7c7ffd5d91bfbcf diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 94099163c8ab..e060f700c60e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d5799387d0e4ee7c6f5ded5fe35536ed4637a319 +Subproject commit 06a8ff62ec232be25d5ca5bdc066f973f3b16937 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9013da8a8ac0..ddf8412c4ab1 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1b0096a8fcda5632a38a0204b7e7a9cde402ba51 +Subproject commit 1e64194168b57e13c829ffbf58ab20436da029d2 From 5c9ab3c5504a7ec92a7d6c6e73947d5269dc0e79 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 10 Jul 2024 09:31:02 -0700 Subject: [PATCH 7046/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/336f0ccceb88472322e2e7932f624c88d9e8054d https://github.com/facebook/fb303/commit/1f4bca64ad2a7561850b362b10499a0b25d7bb02 https://github.com/facebook/fbthrift/commit/ad41819f3d3c7253fc11c88e33a74c416f8b4a2c https://github.com/facebook/folly/commit/ea3b5497256e0687e162535df82c84c48eecdbc2 https://github.com/facebook/mvfst/commit/987475eb44e897628d6ad1dbb15d78403442695c https://github.com/facebook/proxygen/commit/f6e64e70ce3eef30a879a8d55790b9e60e877b32 https://github.com/facebook/wangle/commit/c539eb4c0cdf2c3c7719edceaad9cab2b55fca10 https://github.com/facebookexperimental/edencommon/commit/583adca055810e1dc7888c0bf084b3fcae99d5e2 https://github.com/facebookexperimental/rust-shed/commit/01e881bfd7b3e9940c8f0c17840496fe97c5f08a https://github.com/facebookincubator/fizz/commit/61177224258b20476b1259a418d57d02e9cec52d Reviewed By: namanahuja fbshipit-source-id: 2db7fdac4c9c1fd93cb4be9d84cba88264fb031f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a0fc1449af61..0dd348c000d3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b9f0eb3ebdeb5d5247ad05e0e7c7ffd5d91bfbcf +Subproject commit ad41819f3d3c7253fc11c88e33a74c416f8b4a2c diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e060f700c60e..b94e32deec8e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 06a8ff62ec232be25d5ca5bdc066f973f3b16937 +Subproject commit ea3b5497256e0687e162535df82c84c48eecdbc2 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ddf8412c4ab1..c7400c0331d5 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1e64194168b57e13c829ffbf58ab20436da029d2 +Subproject commit c539eb4c0cdf2c3c7719edceaad9cab2b55fca10 From 7931eb664912324422d81c4468b4862405e6056c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 11 Jul 2024 09:30:59 -0700 Subject: [PATCH 7047/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/3b3b97f02276b4fe02f0b23ffd195c1e787f4d31 https://github.com/facebook/fb303/commit/ed6096a62ff229f698c24f22b97129731189c0c5 https://github.com/facebook/fbthrift/commit/292bdd066cd442778d2b1c457a729930c118b17a https://github.com/facebook/folly/commit/c30d49dcdc877b38d99b253b8c66ad1853085e09 https://github.com/facebook/mvfst/commit/27f5bc8b5a5a97918882a899c67f0c9a0eb929b0 https://github.com/facebook/proxygen/commit/a321ca188345e7433017b7f015d380c8737bca84 https://github.com/facebook/wangle/commit/700fb3c2b29dc3f57bda8c534f3448b70fd8d3df https://github.com/facebookexperimental/edencommon/commit/e7b45c6e94dc5cac58a05cfcf098ce744f75c2a6 https://github.com/facebookexperimental/rust-shed/commit/abcfd3f963be28411398ffaac823677e0b197445 https://github.com/facebookexternal/plc-code/commit/9c0ce8112799110a51dce97aa56741e297ec90c6 https://github.com/facebookincubator/fizz/commit/18472ddbec51cdbf8148b31c726abeef9b9810ae Reviewed By: namanahuja fbshipit-source-id: 9d521109607b713c3432017b3d7ca0d113f9d881 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0dd348c000d3..9e02b77011b0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ad41819f3d3c7253fc11c88e33a74c416f8b4a2c +Subproject commit 292bdd066cd442778d2b1c457a729930c118b17a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b94e32deec8e..778558538e80 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ea3b5497256e0687e162535df82c84c48eecdbc2 +Subproject commit c30d49dcdc877b38d99b253b8c66ad1853085e09 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c7400c0331d5..a366f61ca4e3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c539eb4c0cdf2c3c7719edceaad9cab2b55fca10 +Subproject commit 700fb3c2b29dc3f57bda8c534f3448b70fd8d3df From 21d3217ed950dea14b9b93f5234e96214a99a7ca Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 12 Jul 2024 09:31:03 -0700 Subject: [PATCH 7048/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/45a853f80e5e107dab1ab837b73b1ed13a08becd https://github.com/facebook/fb303/commit/6513b6d6e70844777e3ffbf2147723db292283ef https://github.com/facebook/fbthrift/commit/39f26e95b173758782f123c3d3bfd4c089f4aaa1 https://github.com/facebook/folly/commit/1c8bc50e88804e2a7361a57cd9b551dd10f6c5fd https://github.com/facebook/mvfst/commit/d71b7b6f2a331af47d83f03185a5dd162d52209a https://github.com/facebook/proxygen/commit/0d47e06f0cea64f9e0298ad9d912cfbf0b67cdcc https://github.com/facebook/wangle/commit/2b051c34d5d40afd7857e3e5b679afa8ac749ca9 https://github.com/facebookexperimental/edencommon/commit/8ea04415eb673fbb60fd7dfff2520391c3bf916c https://github.com/facebookexperimental/rust-shed/commit/d31afda2ca54886540ce3f1b92d19a75f818a868 https://github.com/facebookincubator/fizz/commit/bff6b9ec4a827eca903b195de88eb2f7b4114e32 Reviewed By: namanahuja fbshipit-source-id: 237c65730b6bbf66e78fba8cd7c476de87523c98 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9e02b77011b0..406bca97f16e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 292bdd066cd442778d2b1c457a729930c118b17a +Subproject commit 39f26e95b173758782f123c3d3bfd4c089f4aaa1 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 778558538e80..c7400dcaf842 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c30d49dcdc877b38d99b253b8c66ad1853085e09 +Subproject commit 1c8bc50e88804e2a7361a57cd9b551dd10f6c5fd diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a366f61ca4e3..9d82af53b2a1 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 700fb3c2b29dc3f57bda8c534f3448b70fd8d3df +Subproject commit 2b051c34d5d40afd7857e3e5b679afa8ac749ca9 From 2b05a1602f7a45bcc7d0761f07e63348f349de13 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 13 Jul 2024 09:31:32 -0700 Subject: [PATCH 7049/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/7f94227f2d86fbf24abd7cea8608fec40441a278 https://github.com/facebook/fbthrift/commit/482931812dc7fc3d80e67be4df38d20087ea4caa https://github.com/facebook/folly/commit/2d9c0a3c720238ae2ef1337348b6a72778024961 https://github.com/facebook/mvfst/commit/0251187ba97e09ac92faa70fa96a80e38ebd614e https://github.com/facebook/proxygen/commit/20120ab5a6f07461412d8cce1a14a57a50893639 https://github.com/facebook/wangle/commit/b99e9676fafec43b2e8fa48b0d46d42a9074a433 https://github.com/facebookexperimental/edencommon/commit/3ca7a7bff98070149ba8f7bceeb4d6210e65c1b0 https://github.com/facebookexperimental/rust-shed/commit/bd63184b8431988f471107724df99d320f507375 https://github.com/facebookincubator/fizz/commit/c445e527e3d914828e76e90c02aabca189a8da78 Reviewed By: namanahuja fbshipit-source-id: 601e428f693976ca55a4525090da718bbc19f4f5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 406bca97f16e..90a5f5e55712 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 39f26e95b173758782f123c3d3bfd4c089f4aaa1 +Subproject commit 482931812dc7fc3d80e67be4df38d20087ea4caa diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index c7400dcaf842..8a638f46b317 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1c8bc50e88804e2a7361a57cd9b551dd10f6c5fd +Subproject commit 2d9c0a3c720238ae2ef1337348b6a72778024961 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9d82af53b2a1..afcbecc51c75 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2b051c34d5d40afd7857e3e5b679afa8ac749ca9 +Subproject commit b99e9676fafec43b2e8fa48b0d46d42a9074a433 From eeffc148cfb7731d4aad439b063f870b7e6b94bd Mon Sep 17 00:00:00 2001 From: lamasters Date: Sat, 13 Jul 2024 13:50:32 -0700 Subject: [PATCH 7050/7387] Add Linux Mint to `getdeps` Debian package manager options (#1234) Summary: X-link: https://github.com/facebookincubator/zstrong/pull/909 Linux Mint is based on Ubuntu and installs correctly with the same options. This adds it to the supported versions so that running `sudo ./install-system-packages.sh` succeeds. Pull Request resolved: https://github.com/facebook/watchman/pull/1234 Reviewed By: chadaustin Differential Revision: D59666084 Pulled By: genevievehelsel fbshipit-source-id: cfdee239be6358d4c8e2f1154391159a40ef91f4 --- build/fbcode_builder/getdeps/platform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/getdeps/platform.py b/build/fbcode_builder/getdeps/platform.py index f258f3994182..9285e83209e8 100644 --- a/build/fbcode_builder/getdeps/platform.py +++ b/build/fbcode_builder/getdeps/platform.py @@ -272,7 +272,7 @@ def get_package_manager(self): return "homebrew" if self.distro in ("fedora", "centos", "centos_stream", "rocky"): return "rpm" - if self.distro.startswith(("debian", "ubuntu", "pop!_os")): + if self.distro.startswith(("debian", "ubuntu", "pop!_os", "mint")): return "deb" return None From d359204be5c863aa5cbfb9628f471b374517252d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 14 Jul 2024 09:30:56 -0700 Subject: [PATCH 7051/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/b7978a1cf8a6f055e36b7353b6e37b4ea15547cb https://github.com/facebook/fbthrift/commit/f79f662eaa7ce720ba7ee1367edbe2166dedb176 https://github.com/facebook/folly/commit/b59f99e724af79721190cf8d06be62b10c72f8e9 https://github.com/facebook/mvfst/commit/a410a7b4de106feedc9ec70a30465035cb7ad307 https://github.com/facebook/proxygen/commit/8307ef7cd763ecffdfa05309319d86f598509439 https://github.com/facebook/wangle/commit/190da710fd59361f2b4f67818ec6751fbd713441 https://github.com/facebookexperimental/edencommon/commit/48e98e89c9f9e9cb4263a5daf9fe618f157dcfff https://github.com/facebookexperimental/rust-shed/commit/4193b4d7d0274a6420d5394ba99bc907186b008e https://github.com/facebookincubator/fizz/commit/15f9440c67ecdd0393045ab0c746033d0ac7c2ab Reviewed By: namanahuja fbshipit-source-id: 2ef5b1c6ddf72c3103ae952cea8cfdbcabd16160 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 90a5f5e55712..3dc828a5c217 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 482931812dc7fc3d80e67be4df38d20087ea4caa +Subproject commit f79f662eaa7ce720ba7ee1367edbe2166dedb176 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8a638f46b317..29a9efeb417c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 2d9c0a3c720238ae2ef1337348b6a72778024961 +Subproject commit b59f99e724af79721190cf8d06be62b10c72f8e9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index afcbecc51c75..996b454c15d6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b99e9676fafec43b2e8fa48b0d46d42a9074a433 +Subproject commit 190da710fd59361f2b4f67818ec6751fbd713441 From e6a9296ee3b72a5918b479e77f7f9666d7476b51 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 15 Jul 2024 09:32:35 -0700 Subject: [PATCH 7052/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/8e794fdb44a145144978c77280923188b19523ba https://github.com/facebook/fb303/commit/52c41a82a02ebdda3055249a9619395d914cff00 https://github.com/facebook/fbthrift/commit/7e7f3e67c13675623168894a167fe99cf13d21e9 https://github.com/facebook/folly/commit/661331d60533c2ef8e82d9650cb9f78306e12e0e https://github.com/facebook/mvfst/commit/59b5ad0299ed74967b730da52d4cd6b684b5d034 https://github.com/facebook/proxygen/commit/85d570d2964be9ac17435ea14988b7ffd54a10d4 https://github.com/facebook/wangle/commit/c92baef4808ade00c9e24bbd188a8a476d38d4ce https://github.com/facebookexperimental/edencommon/commit/90e7e278814dc29d2fe010eeba2cbded81971970 https://github.com/facebookexperimental/rust-shed/commit/543d6d295119795f04e332d92585607cbcf4ba12 https://github.com/facebookincubator/fizz/commit/dc7f6314a83636ab0e6a3f8fd0dc43378002ac52 Reviewed By: ajb85 fbshipit-source-id: 06b1cf61c501ed1fa5bb1f218ce749707e133072 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3dc828a5c217..547df184dd27 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f79f662eaa7ce720ba7ee1367edbe2166dedb176 +Subproject commit 7e7f3e67c13675623168894a167fe99cf13d21e9 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 29a9efeb417c..dfff74ef8fe6 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b59f99e724af79721190cf8d06be62b10c72f8e9 +Subproject commit 661331d60533c2ef8e82d9650cb9f78306e12e0e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 996b454c15d6..b4067c847541 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 190da710fd59361f2b4f67818ec6751fbd713441 +Subproject commit c92baef4808ade00c9e24bbd188a8a476d38d4ce From 4265f11407a668f9f3b0dce43d22d1f2e8741a84 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Mon, 15 Jul 2024 11:34:12 -0700 Subject: [PATCH 7053/7387] Added in some missing fields (columns) to watchman_events tables Summary: When migrating watchman's scuba events elapsed time was missed for all events as well a few others. Doh! Let's fix that. While adding these new fields, the hierarchy (Event->MetadataEvent->BaseEvent) became a bit unwieldy. Switched to a aggregation pattern which didn't casue as much friction. Reviewed By: kavehahmadi60 Differential Revision: D59737481 fbshipit-source-id: 538b4a06d1028fd49eb9cf67674728f699286909 --- watchman/Client.cpp | 11 ++--- watchman/PerfSample.h | 8 ++-- watchman/SanityCheck.cpp | 7 ++-- watchman/query/eval.cpp | 3 +- watchman/root/ageout.cpp | 26 +++++------- watchman/root/iothread.cpp | 19 +++------ watchman/root/sync.cpp | 49 ++++++++-------------- watchman/telemetry/LogEvent.h | 76 ++++++++++++++++++++++------------- watchman/watcher/fsevents.cpp | 21 +++------- 9 files changed, 99 insertions(+), 121 deletions(-) diff --git a/watchman/Client.cpp b/watchman/Client.cpp index a37d679d1be3..9820ddf1f570 100644 --- a/watchman/Client.cpp +++ b/watchman/Client.cpp @@ -80,7 +80,7 @@ void Client::sendErrorResponse(std::string_view formatted) { resp.set("error", typed_string_to_json(formatted)); if (dispatch_command) { - dispatch_command->error = formatted; + dispatch_command->meta.base.error = formatted; } if (perf_sample) { @@ -136,7 +136,6 @@ bool Client::dispatchCommand(const Command& command, CommandFlags mode) { // Scope for the perf sample { logf(DBG, "dispatch_command: {}\n", def->name); - folly::stop_watch<> dispatchCommandStart; DispatchCommand dispatchCommand; dispatchCommand.command = command.name(); dispatch_command = &dispatchCommand; @@ -163,7 +162,7 @@ bool Client::dispatchCommand(const Command& command, CommandFlags mode) { enqueueResponse(def->handler(this, rendered)); } catch (const ErrorResponse& e) { sendErrorResponse(e.what()); - dispatchCommand.error = e.what(); + dispatchCommand.meta.base.error = e.what(); } catch (const ResponseWasHandledManually&) { } @@ -179,12 +178,10 @@ bool Client::dispatchCommand(const Command& command, CommandFlags mode) { getLogEventCounters(LogEventType::DispatchCommandType); // Log if override set, or if we have hit the sample rate if (sample.will_log || eventCount == samplingRate) { - dispatchCommand.event_count = + dispatchCommand.meta.base.event_count = eventCount != samplingRate ? 0 : eventCount; - dispatchCommand.duration = - std::chrono::duration{dispatchCommandStart.elapsed()} - .count(); dispatchCommand.args = renderedString; + dispatchCommand.client_pid = stm->getPeerProcessID(); getLogger()->logEvent(dispatchCommand); } diff --git a/watchman/PerfSample.h b/watchman/PerfSample.h index d0b423bf1e29..59d389786e86 100644 --- a/watchman/PerfSample.h +++ b/watchman/PerfSample.h @@ -29,10 +29,10 @@ struct RootMetadata { template void addRootMetadataToEvent(const RootMetadata& root_metadata, T& event) { - event.root = root_metadata.root_path.string(); - event.recrawl = root_metadata.recrawl_count; - event.case_sensitive = root_metadata.case_sensitive; - event.watcher = root_metadata.watcher.string(); + event.meta.base.root = root_metadata.root_path.string(); + event.meta.recrawl = root_metadata.recrawl_count; + event.meta.case_sensitive = root_metadata.case_sensitive; + event.meta.watcher = root_metadata.watcher.string(); } class PerfSample { diff --git a/watchman/SanityCheck.cpp b/watchman/SanityCheck.cpp index 44170c685379..9c81cd577f20 100644 --- a/watchman/SanityCheck.cpp +++ b/watchman/SanityCheck.cpp @@ -158,14 +158,14 @@ void do_clock_check(watchman_stream* client) { auto roots = get_watch_list(client); for (auto& r : roots.array()) { ClockTest clockTest; - clockTest.root = r.toString(); + clockTest.base.root = r.toString(); PerfSample sample("clock-test"); sample.add_meta("root", json_object({{"path", r}})); try { check_clock_command(client, r); } catch (const std::exception& ex) { log(watchman::ERR, "Failed do_clock_check : ", ex.what(), "\n"); - clockTest.error = ex.what(); + clockTest.base.error = ex.what(); sample.add_meta("error", w_string_to_json(ex.what())); sample.force_log(); } @@ -178,7 +178,8 @@ void do_clock_check(watchman_stream* client) { getLogEventCounters(LogEventType::ClockTestType); // Log if override set, or if we have hit the sample rate if (sample.will_log || eventCount == samplingRate) { - clockTest.event_count = eventCount != samplingRate ? 0 : eventCount; + clockTest.base.event_count = + eventCount != samplingRate ? 0 : eventCount; getLogger()->logEvent(clockTest); } } diff --git a/watchman/query/eval.cpp b/watchman/query/eval.cpp index cb0360e431a7..1bf4d5310cd0 100644 --- a/watchman/query/eval.cpp +++ b/watchman/query/eval.cpp @@ -253,7 +253,8 @@ static void execute_common( // Log if override set, or if we have hit the sample rate if (sample->will_log || eventCount == samplingRate) { addRootMetadataToEvent(root_metadata, *queryExecute); - queryExecute->event_count = eventCount != samplingRate ? 0 : eventCount; + queryExecute->meta.base.event_count = + eventCount != samplingRate ? 0 : eventCount; queryExecute->fresh_instance = res->isFreshInstance; queryExecute->deduped = ctx->num_deduped; queryExecute->results = ctx->resultsArray.size(); diff --git a/watchman/root/ageout.cpp b/watchman/root/ageout.cpp index 5aca48e58680..1023e8667db1 100644 --- a/watchman/root/ageout.cpp +++ b/watchman/root/ageout.cpp @@ -69,23 +69,15 @@ void Root::performAgeOut(std::chrono::seconds min_age) { getLogEventCounters(LogEventType::AgeOutType); // Log if override set, or if we have hit the sample rate if (sample.will_log || eventCount == samplingRate) { - auto ageOut = AgeOut{ - // MetadataEvent - { - // BaseEvent - { - root_metadata.root_path.string(), // root - std::string(), // error - eventCount != samplingRate ? 0 : eventCount // event_count - }, - root_metadata.recrawl_count, // recrawl - root_metadata.case_sensitive, // case_sensitive - root_metadata.watcher.string() // watcher - }, - walked, // walked - files, // files - dirs // dirs - }; + AgeOut ageOut; + ageOut.meta.base.root = root_metadata.root_path.string(); + ageOut.meta.base.event_count = eventCount != samplingRate ? 0 : eventCount; + ageOut.meta.recrawl = root_metadata.recrawl_count; + ageOut.meta.case_sensitive = root_metadata.case_sensitive; + ageOut.meta.watcher = root_metadata.watcher.string(); + ageOut.walked = walked; + ageOut.files = files; + ageOut.dirs = dirs; getLogger()->logEvent(ageOut); } } diff --git a/watchman/root/iothread.cpp b/watchman/root/iothread.cpp index baca5e3db63c..9b660420aa18 100644 --- a/watchman/root/iothread.cpp +++ b/watchman/root/iothread.cpp @@ -89,20 +89,11 @@ void InMemoryView::fullCrawl( sample.force_log(); sample.log(); - auto fullCrawl = FullCrawl{ - // MetadataEvent - { - // BaseEvent - { - root_metadata.root_path.string(), // root - std::string() // error - // event_count = 1, default - }, - root_metadata.recrawl_count, // recrawl - root_metadata.case_sensitive, // case_sensitive - root_metadata.watcher.string() // watcher - }, - }; + FullCrawl fullCrawl; + fullCrawl.meta.base.root = root_metadata.root_path.string(); + fullCrawl.meta.recrawl = root_metadata.recrawl_count; + fullCrawl.meta.case_sensitive = root_metadata.case_sensitive; + fullCrawl.meta.watcher = root_metadata.watcher.string(); getLogger()->logEvent(fullCrawl); logf(ERR, "{}crawl complete\n", recrawlCount ? "re" : ""); diff --git a/watchman/root/sync.cpp b/watchman/root/sync.cpp index ed9505d8a4c9..da525049d0b8 100644 --- a/watchman/root/sync.cpp +++ b/watchman/root/sync.cpp @@ -20,6 +20,7 @@ folly::SemiFuture Root::waitForSettle( CookieSync::SyncResult Root::syncToNow(std::chrono::milliseconds timeout) { PerfSample sample("sync_to_now"); + SyncToNow syncToNow; auto root = shared_from_this(); try { auto result = view()->syncToNow(root, timeout); @@ -39,22 +40,13 @@ CookieSync::SyncResult Root::syncToNow(std::chrono::milliseconds timeout) { getLogEventCounters(LogEventType::SyncToNowType); // Log if override set, or if we have hit the sample rate if (sample.will_log || eventCount == samplingRate) { - auto syncToNow = SyncToNow{ - // MetadataEvent - { - // BaseEvent - { - root_metadata.root_path.string(), // root - std::string(), // error - eventCount != samplingRate ? 0 : eventCount // event_count - }, - root_metadata.recrawl_count, // recrawl - root_metadata.case_sensitive, // case_sensitive - root_metadata.watcher.string() // watcher - }, - true, // success - timeout.count() // timeoutms - }; + syncToNow.meta.base.root = root_metadata.root_path.string(); + syncToNow.meta.base.event_count = + eventCount != samplingRate ? 0 : eventCount; + syncToNow.meta.recrawl = root_metadata.recrawl_count; + syncToNow.meta.case_sensitive = root_metadata.case_sensitive; + syncToNow.meta.watcher = root_metadata.watcher.string(); + syncToNow.timeoutms = timeout.count(); getLogger()->logEvent(syncToNow); } return result; @@ -73,22 +65,15 @@ CookieSync::SyncResult Root::syncToNow(std::chrono::milliseconds timeout) { const auto& [samplingRate, eventCount] = getLogEventCounters(LogEventType::SyncToNowType); - auto syncToNow = SyncToNow{ - // MetadataEvent - { - // BaseEvent - { - root_metadata.root_path.string(), // root - exc.what(), // error - eventCount != samplingRate ? 0 : eventCount // event_count - }, - root_metadata.recrawl_count, // recrawl - root_metadata.case_sensitive, // case_sensitive - root_metadata.watcher.string() // watcher - }, - false, // success - timeout.count() // timeoutms - }; + syncToNow.meta.base.root = root_metadata.root_path.string(); + syncToNow.meta.base.error = exc.what(); + syncToNow.meta.base.event_count = + eventCount != samplingRate ? 0 : eventCount; + syncToNow.meta.recrawl = root_metadata.recrawl_count; + syncToNow.meta.case_sensitive = root_metadata.case_sensitive; + syncToNow.meta.watcher = root_metadata.watcher.string(); + syncToNow.success = false; + syncToNow.timeoutms = timeout.count(); getLogger()->logEvent(syncToNow); throw; diff --git a/watchman/telemetry/LogEvent.h b/watchman/telemetry/LogEvent.h index 0a87fa753138..ed26291cca44 100644 --- a/watchman/telemetry/LogEvent.h +++ b/watchman/telemetry/LogEvent.h @@ -8,7 +8,10 @@ #pragma once #include +#include + #include +#include #include #include #include @@ -33,12 +36,23 @@ enum LogEventType : uint8_t { // Returns samplingRate and eventCount std::pair getLogEventCounters(const LogEventType& type); -struct BaseEvent { +struct BaseEventData { + // TODO: add system and user time for Unix systems + std::chrono::time_point start_time = + std::chrono::system_clock::now(); std::string root; std::string error; int64_t event_count = 1; void populate(DynamicEvent& event) const { + std::chrono::duration elapsed_time = + start_time - std::chrono::system_clock::now(); + event.addInt( + "start_time", std::chrono::system_clock::to_time_t(start_time)); + event.addInt( + "elapsed_time", + std::chrono::duration_cast(elapsed_time) + .count()); if (!root.empty()) { event.addString("root", root); } @@ -49,14 +63,14 @@ struct BaseEvent { } }; -struct MetadataEvent : public BaseEvent { +struct MetadataEventData { + BaseEventData base; int64_t recrawl = 0; bool case_sensitive = false; std::string watcher; void populate(DynamicEvent& event) const { - BaseEvent::populate(event); - + base.populate(event); event.addInt("recrawl", recrawl); event.addBool("case_sensitive", case_sensitive); if (!watcher.empty()) { @@ -65,18 +79,16 @@ struct MetadataEvent : public BaseEvent { } }; -struct DispatchCommand : public MetadataEvent { +struct DispatchCommand { static constexpr const char* type = "dispatch_command"; - double duration = 0.0; + MetadataEventData meta; std::string command; std::string args; pid_t client_pid = 0; void populate(DynamicEvent& event) const { - MetadataEvent::populate(event); - - event.addDouble("duration", duration); + meta.populate(event); event.addString("command", command); if (!args.empty()) { event.addString("args", args); @@ -87,50 +99,53 @@ struct DispatchCommand : public MetadataEvent { } }; -struct ClockTest : public BaseEvent { +struct ClockTest { static constexpr const char* type = "clock_test"; + BaseEventData base; + void populate(DynamicEvent& event) const { - BaseEvent::populate(event); + base.populate(event); } }; -struct AgeOut : public MetadataEvent { +struct AgeOut { static constexpr const char* type = "age_out"; + MetadataEventData meta; int64_t walked = 0; int64_t files = 0; int64_t dirs = 0; void populate(DynamicEvent& event) const { - MetadataEvent::populate(event); - + meta.populate(event); event.addInt("walked", walked); event.addInt("files", files); event.addInt("dirs", dirs); } }; -struct SyncToNow : public MetadataEvent { +struct SyncToNow { static constexpr const char* type = "sync_to_now"; - bool success = false; + MetadataEventData meta; + bool success = true; int64_t timeoutms = 0; void populate(DynamicEvent& event) const { - MetadataEvent::populate(event); - + meta.populate(event); event.addBool("success", success); event.addInt("timeoutms", timeoutms); } }; -struct SavedState : public MetadataEvent { +struct SavedState { enum Target { Manifold = 1, Xdb = 2 }; enum Action { GetProperties = 1, Connect = 2, Query = 3 }; static constexpr const char* type = "saved_state"; + MetadataEventData meta; Target target = Manifold; Action action = GetProperties; std::string project; @@ -141,8 +156,7 @@ struct SavedState : public MetadataEvent { bool success = false; void populate(DynamicEvent& event) const { - MetadataEvent::populate(event); - + meta.populate(event); event.addInt("target", target); event.addInt("action", action); event.addString("project", project); @@ -160,9 +174,10 @@ struct SavedState : public MetadataEvent { } }; -struct QueryExecute : public MetadataEvent { +struct QueryExecute { static constexpr const char* type = "query_execute"; + MetadataEventData meta; std::string request_id; int64_t num_special_files = 0; std::string special_files; @@ -173,8 +188,7 @@ struct QueryExecute : public MetadataEvent { std::string query; void populate(DynamicEvent& event) const { - MetadataEvent::populate(event); - + meta.populate(event); if (!request_id.empty()) { event.addString("request_id", request_id); } @@ -192,18 +206,24 @@ struct QueryExecute : public MetadataEvent { } }; -struct FullCrawl : public MetadataEvent { +struct FullCrawl { static constexpr const char* type = "full_crawl"; + + MetadataEventData meta; + + void populate(DynamicEvent& event) const { + meta.populate(event); + } }; -struct Dropped : public MetadataEvent { +struct Dropped { static constexpr const char* type = "dropped"; + MetadataEventData meta; bool isKernel = false; void populate(DynamicEvent& event) const { - MetadataEvent::populate(event); - + meta.populate(event); event.addBool("isKernel", isKernel); } }; diff --git a/watchman/watcher/fsevents.cpp b/watchman/watcher/fsevents.cpp index 5caffab04ddd..970b729ea0fa 100644 --- a/watchman/watcher/fsevents.cpp +++ b/watchman/watcher/fsevents.cpp @@ -138,21 +138,12 @@ std::shared_ptr watcherFromRoot( /** Generate a perf event for the drop */ static void log_drop_event(const std::shared_ptr& root, bool isKernel) { auto root_metadata = root->getRootMetadata(); - auto dropped = Dropped{ - // MetdataEvent - { - // BaseEvent - { - root_metadata.root_path.string(), // root - std::string() // error - // event_count = 1, default - }, - root_metadata.recrawl_count, // recrawl - root_metadata.case_sensitive, // case_sensitive - root_metadata.watcher.string() // watcher - }, - isKernel // isKernel - }; + Dropped dropped; + dropped.meta.base.root = root_metadata.root_path.string(); + dropped.meta.recrawl = root_metadata.recrawl_count; + dropped.meta.case_sensitive = root_metadata.case_sensitive; + dropped.meta.watcher = root_metadata.watcher.string(); + dropped.isKernel = isKernel; getLogger()->logEvent(dropped); PerfSample sample(isKernel ? "KernelDropped" : "UserDropped"); From ac998123a655c16d4d68468818024b2363c31ddc Mon Sep 17 00:00:00 2001 From: beryll1um Date: Mon, 15 Jul 2024 13:50:07 -0700 Subject: [PATCH 7054/7387] Support of Arch Linux in `getdeps.py` Summary: X-link: https://github.com/facebookincubator/zstrong/pull/907 I don't sure that I make all in accordance with the your contribution pipeline, so please correct me If there is needed. So, I've made some changes to support the `pacman` package manager in your `getdeps.py` script. In `manifests` I'm also duplicated some packages from `debs` and `rpms` sections and create a new `pps` sections with according packages for `pacman`. Issue: https://github.com/facebook/folly/issues/1701 X-link: https://github.com/facebook/folly/pull/1702 Reviewed By: yfeldblum Differential Revision: D33514769 Pulled By: Orvid fbshipit-source-id: a081c3a5bcb7f7cdde3a4a91c0d15517c0a171b3 --- build/fbcode_builder/getdeps.py | 7 +++++-- build/fbcode_builder/getdeps/manifest.py | 3 +++ build/fbcode_builder/getdeps/platform.py | 2 ++ build/fbcode_builder/manifests/autoconf | 3 +++ build/fbcode_builder/manifests/automake | 3 +++ build/fbcode_builder/manifests/boost | 3 +++ build/fbcode_builder/manifests/cmake | 3 +++ build/fbcode_builder/manifests/double-conversion | 3 +++ build/fbcode_builder/manifests/libcurl | 3 +++ build/fbcode_builder/manifests/libelf | 3 +++ build/fbcode_builder/manifests/libevent | 3 +++ build/fbcode_builder/manifests/libffi | 3 +++ build/fbcode_builder/manifests/libgit2 | 3 +++ build/fbcode_builder/manifests/libmnl | 3 +++ build/fbcode_builder/manifests/libnl | 3 +++ build/fbcode_builder/manifests/libsodium | 3 +++ build/fbcode_builder/manifests/libtool | 3 +++ build/fbcode_builder/manifests/libusb | 3 +++ build/fbcode_builder/manifests/lz4 | 3 +++ build/fbcode_builder/manifests/nghttp2 | 3 +++ build/fbcode_builder/manifests/ninja | 3 +++ build/fbcode_builder/manifests/openssl | 3 +++ build/fbcode_builder/manifests/patchelf | 3 +++ build/fbcode_builder/manifests/python | 3 +++ build/fbcode_builder/manifests/re2 | 3 +++ build/fbcode_builder/manifests/snappy | 3 +++ build/fbcode_builder/manifests/sqlite3 | 3 +++ build/fbcode_builder/manifests/zlib | 3 +++ build/fbcode_builder/manifests/zstd | 3 +++ 29 files changed, 88 insertions(+), 2 deletions(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index ed328dae5b0d..dfb028a94cee 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -370,7 +370,7 @@ def setup_project_cmd_parser(self, parser): parser.add_argument( "--os-type", help="Filter to just this OS type to run", - choices=["linux", "darwin", "windows"], + choices=["linux", "darwin", "windows", "pacman-package"], action="store", dest="ostype", default=None, @@ -440,7 +440,10 @@ def run_project_cmd(self, args, loader, manifest): packages = sorted(set(all_packages["homebrew"])) if packages: cmd_args = ["brew", "install"] + packages - + elif manager == "pacman-package": + packages = sorted(list(set(all_packages["pacman-package"]))) + if packages: + cmd_args = ["pacman", "-S"] + packages else: host_tuple = loader.build_opts.host_type.as_tuple_string() print( diff --git a/build/fbcode_builder/getdeps/manifest.py b/build/fbcode_builder/getdeps/manifest.py index 11fc4e1ebf2f..ae06f4b26858 100644 --- a/build/fbcode_builder/getdeps/manifest.py +++ b/build/fbcode_builder/getdeps/manifest.py @@ -96,6 +96,7 @@ "rpms": {"optional_section": True}, "debs": {"optional_section": True}, "homebrew": {"optional_section": True}, + "pps": {"optional_section": True}, "preinstalled.env": {"optional_section": True}, "bootstrap.args": {"optional_section": True}, "b2.args": {"optional_section": True}, @@ -132,6 +133,7 @@ "shipit.strip", "homebrew", "github.actions", + "pps", ] @@ -379,6 +381,7 @@ def get_required_system_packages(self, ctx): "rpm": self.get_section_as_args("rpms", ctx), "deb": self.get_section_as_args("debs", ctx), "homebrew": self.get_section_as_args("homebrew", ctx), + "pacman-package": self.get_section_as_args("pps", ctx), } def _is_satisfied_by_preinstalled_environment(self, ctx): diff --git a/build/fbcode_builder/getdeps/platform.py b/build/fbcode_builder/getdeps/platform.py index 9285e83209e8..1e021d99235a 100644 --- a/build/fbcode_builder/getdeps/platform.py +++ b/build/fbcode_builder/getdeps/platform.py @@ -274,6 +274,8 @@ def get_package_manager(self): return "rpm" if self.distro.startswith(("debian", "ubuntu", "pop!_os", "mint")): return "deb" + if self.distro == "arch": + return "pacman-package" return None @staticmethod diff --git a/build/fbcode_builder/manifests/autoconf b/build/fbcode_builder/manifests/autoconf index 8c8b883974c9..60cff9c5059c 100644 --- a/build/fbcode_builder/manifests/autoconf +++ b/build/fbcode_builder/manifests/autoconf @@ -10,6 +10,9 @@ autoconf [rpms] autoconf +[pps] +autoconf + [download] url = http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz sha256 = 954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969 diff --git a/build/fbcode_builder/manifests/automake b/build/fbcode_builder/manifests/automake index 37ffb95d21e8..b098ac2df532 100644 --- a/build/fbcode_builder/manifests/automake +++ b/build/fbcode_builder/manifests/automake @@ -10,6 +10,9 @@ automake [rpms] automake +[pps] +automake + [download] url = http://ftp.gnu.org/gnu/automake/automake-1.16.1.tar.gz sha256 = 608a97523f97db32f1f5d5615c98ca69326ced2054c9f82e65bade7fc4c9dea8 diff --git a/build/fbcode_builder/manifests/boost b/build/fbcode_builder/manifests/boost index 969f615bddd5..923e52314fff 100644 --- a/build/fbcode_builder/manifests/boost +++ b/build/fbcode_builder/manifests/boost @@ -22,6 +22,9 @@ boost # Boost cmake detection on homebrew adds this as requirement: https://github.com/Homebrew/homebrew-core/issues/67427#issuecomment-754187345 icu4c +[pps] +boost + [rpms.all(distro=centos_stream,distro_vers=8)] boost169 boost169-math diff --git a/build/fbcode_builder/manifests/cmake b/build/fbcode_builder/manifests/cmake index 71548f119cba..06d1c9b0ac7e 100644 --- a/build/fbcode_builder/manifests/cmake +++ b/build/fbcode_builder/manifests/cmake @@ -11,6 +11,9 @@ cmake [rpms] cmake +[pps] +cmake + [dependencies] ninja diff --git a/build/fbcode_builder/manifests/double-conversion b/build/fbcode_builder/manifests/double-conversion index 2d7265e8d39c..720d9a2ec3ec 100644 --- a/build/fbcode_builder/manifests/double-conversion +++ b/build/fbcode_builder/manifests/double-conversion @@ -15,6 +15,9 @@ libdouble-conversion-dev double-conversion double-conversion-devel +[pps] +double-conversion + [build] builder = cmake subdir = double-conversion-3.1.4 diff --git a/build/fbcode_builder/manifests/libcurl b/build/fbcode_builder/manifests/libcurl index 466b4497c35d..8c94e4679d98 100644 --- a/build/fbcode_builder/manifests/libcurl +++ b/build/fbcode_builder/manifests/libcurl @@ -8,6 +8,9 @@ libcurl [debs] libcurl4-openssl-dev +[pps] +libcurl-gnutls + [download] url = https://curl.haxx.se/download/curl-7.65.1.tar.gz sha256 = 821aeb78421375f70e55381c9ad2474bf279fc454b791b7e95fc83562951c690 diff --git a/build/fbcode_builder/manifests/libelf b/build/fbcode_builder/manifests/libelf index a46aab8796ea..194d340fcc8e 100644 --- a/build/fbcode_builder/manifests/libelf +++ b/build/fbcode_builder/manifests/libelf @@ -7,6 +7,9 @@ elfutils-libelf-devel-static [debs] libelf-dev +[pps] +libelf + [download] url = https://ftp.osuosl.org/pub/blfs/conglomeration/libelf/libelf-0.8.13.tar.gz sha256 = 591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d diff --git a/build/fbcode_builder/manifests/libevent b/build/fbcode_builder/manifests/libevent index 1c073333fc82..91a2af90c513 100644 --- a/build/fbcode_builder/manifests/libevent +++ b/build/fbcode_builder/manifests/libevent @@ -10,6 +10,9 @@ libevent [rpms] libevent-devel +[pps] +libevent + # Note that the CMakeLists.txt file is present only in # git repo and not in the release tarball, so take care # to use the github generated source tarball rather than diff --git a/build/fbcode_builder/manifests/libffi b/build/fbcode_builder/manifests/libffi index 0511287c2892..b520358fdfd7 100644 --- a/build/fbcode_builder/manifests/libffi +++ b/build/fbcode_builder/manifests/libffi @@ -11,6 +11,9 @@ libffi libffi-devel libffi +[pps] +libffi + [download] url = https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz sha256 = 540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620 diff --git a/build/fbcode_builder/manifests/libgit2 b/build/fbcode_builder/manifests/libgit2 index 33e6b506f98f..42bbfca92bf5 100644 --- a/build/fbcode_builder/manifests/libgit2 +++ b/build/fbcode_builder/manifests/libgit2 @@ -7,6 +7,9 @@ libgit2 [rpms] libgit2-devel +[pps] +libgit2 + # Ubuntu 18.04 libgit2 has clash with libcurl4-openssl-dev as it depends on # libcurl4-gnutls-dev. Should be ok from 20.04 again # There is a description at https://github.com/r-hub/sysreqsdb/issues/77 diff --git a/build/fbcode_builder/manifests/libmnl b/build/fbcode_builder/manifests/libmnl index 1f8d609c1392..2b39d6cb3a7c 100644 --- a/build/fbcode_builder/manifests/libmnl +++ b/build/fbcode_builder/manifests/libmnl @@ -12,6 +12,9 @@ libmnl-static [debs] libmnl-dev +[pps] +libmnl + [download] url = http://www.netfilter.org/pub/libmnl/libmnl-1.0.4.tar.bz2 sha256 = 171f89699f286a5854b72b91d06e8f8e3683064c5901fb09d954a9ab6f551f81 diff --git a/build/fbcode_builder/manifests/libnl b/build/fbcode_builder/manifests/libnl index 560885c2e331..f71e10a5895b 100644 --- a/build/fbcode_builder/manifests/libnl +++ b/build/fbcode_builder/manifests/libnl @@ -9,6 +9,9 @@ libnl3 libnl-3-dev libnl-route-3-dev +[pps] +libnl + [download] url = https://www.infradead.org/~tgr/libnl/files/libnl-3.2.25.tar.gz sha256 = 8beb7590674957b931de6b7f81c530b85dc7c1ad8fbda015398bc1e8d1ce8ec5 diff --git a/build/fbcode_builder/manifests/libsodium b/build/fbcode_builder/manifests/libsodium index 9ffd9bf4df1c..2cdeb8c78474 100644 --- a/build/fbcode_builder/manifests/libsodium +++ b/build/fbcode_builder/manifests/libsodium @@ -11,6 +11,9 @@ libsodium libsodium-devel libsodium-static +[pps] +libsodium + [download.not(os=windows)] url = https://github.com/jedisct1/libsodium/releases/download/1.0.20-RELEASE/libsodium-1.0.20.tar.gz sha256 = ebb65ef6ca439333c2bb41a0c1990587288da07f6c7fd07cb3a18cc18d30ce19 diff --git a/build/fbcode_builder/manifests/libtool b/build/fbcode_builder/manifests/libtool index 887a23cdfba7..72eb2175a981 100644 --- a/build/fbcode_builder/manifests/libtool +++ b/build/fbcode_builder/manifests/libtool @@ -10,6 +10,9 @@ libtool [debs] libtool +[pps] +libtool + [download] url = http://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.gz sha256 = e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3 diff --git a/build/fbcode_builder/manifests/libusb b/build/fbcode_builder/manifests/libusb index 9b97c3a59762..ccbec80536b8 100644 --- a/build/fbcode_builder/manifests/libusb +++ b/build/fbcode_builder/manifests/libusb @@ -11,6 +11,9 @@ libusb libusb-devel libusb +[pps] +libusb + [download] url = https://github.com/libusb/libusb/releases/download/v1.0.22/libusb-1.0.22.tar.bz2 sha256 = 75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157 diff --git a/build/fbcode_builder/manifests/lz4 b/build/fbcode_builder/manifests/lz4 index 084d6a4aecd8..68a2c3061447 100644 --- a/build/fbcode_builder/manifests/lz4 +++ b/build/fbcode_builder/manifests/lz4 @@ -13,6 +13,9 @@ lz4-static [debs] liblz4-dev +[pps] +lz4 + [download] url = https://github.com/lz4/lz4/archive/v1.8.3.tar.gz sha256 = 33af5936ac06536805f9745e0b6d61da606a1f8b4cc5c04dd3cbaca3b9b4fc43 diff --git a/build/fbcode_builder/manifests/nghttp2 b/build/fbcode_builder/manifests/nghttp2 index 5ebdce0a42fe..f2b3f6b31c36 100644 --- a/build/fbcode_builder/manifests/nghttp2 +++ b/build/fbcode_builder/manifests/nghttp2 @@ -8,6 +8,9 @@ libnghttp2 [debs] libnghttp2-dev +[pps] +libnghttp2 + [download] url = https://github.com/nghttp2/nghttp2/releases/download/v1.47.0/nghttp2-1.47.0.tar.gz sha256 = 62f50f0e9fc479e48b34e1526df8dd2e94136de4c426b7680048181606832b7c diff --git a/build/fbcode_builder/manifests/ninja b/build/fbcode_builder/manifests/ninja index 713c59d69f98..e50827986352 100644 --- a/build/fbcode_builder/manifests/ninja +++ b/build/fbcode_builder/manifests/ninja @@ -10,6 +10,9 @@ ninja [rpms] ninja-build +[pps] +ninja + [download.os=windows] url = https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip sha256 = bbde850d247d2737c5764c927d1071cbb1f1957dcabda4a130fa8547c12c695f diff --git a/build/fbcode_builder/manifests/openssl b/build/fbcode_builder/manifests/openssl index 0f1be2219970..beef31c9e2e0 100644 --- a/build/fbcode_builder/manifests/openssl +++ b/build/fbcode_builder/manifests/openssl @@ -13,6 +13,9 @@ openssl openssl-devel openssl-libs +[pps] +openssl + [download] url = https://www.openssl.org/source/openssl-1.1.1l.tar.gz sha256 = 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 diff --git a/build/fbcode_builder/manifests/patchelf b/build/fbcode_builder/manifests/patchelf index f9d050424a29..7025dc66a310 100644 --- a/build/fbcode_builder/manifests/patchelf +++ b/build/fbcode_builder/manifests/patchelf @@ -7,6 +7,9 @@ patchelf [debs] patchelf +[pps] +patchelf + [download] url = https://github.com/NixOS/patchelf/archive/0.10.tar.gz sha256 = b3cb6bdedcef5607ce34a350cf0b182eb979f8f7bc31eae55a93a70a3f020d13 diff --git a/build/fbcode_builder/manifests/python b/build/fbcode_builder/manifests/python index c2e98e5711c4..00fed973ca95 100644 --- a/build/fbcode_builder/manifests/python +++ b/build/fbcode_builder/manifests/python @@ -15,6 +15,9 @@ python3.8-dev [debs.not(all(distro=ubuntu,distro_vers="18.04"))] python3-all-dev +[pps] +python3 + [download] url = https://www.python.org/ftp/python/3.8.13/Python-3.8.13.tgz sha256 = 903b92d76354366b1d9c4434d0c81643345cef87c1600adfa36095d7b00eede4 diff --git a/build/fbcode_builder/manifests/re2 b/build/fbcode_builder/manifests/re2 index 060f342c1ee1..1fe1eccbdd98 100644 --- a/build/fbcode_builder/manifests/re2 +++ b/build/fbcode_builder/manifests/re2 @@ -11,6 +11,9 @@ libre2-dev re2 re2-devel +[pps] +re2 + [download] url = https://github.com/google/re2/archive/2020-11-01.tar.gz sha256 = 8903cc66c9d34c72e2bc91722288ebc7e3ec37787ecfef44d204b2d6281954d7 diff --git a/build/fbcode_builder/manifests/snappy b/build/fbcode_builder/manifests/snappy index b184c2aa74c9..c458a0ae857d 100644 --- a/build/fbcode_builder/manifests/snappy +++ b/build/fbcode_builder/manifests/snappy @@ -10,6 +10,9 @@ libsnappy-dev [rpms] snappy-devel +[pps] +snappy + [download] url = https://github.com/google/snappy/archive/1.1.7.tar.gz sha256 = 3dfa02e873ff51a11ee02b9ca391807f0c8ea0529a4924afa645fbf97163f9d4 diff --git a/build/fbcode_builder/manifests/sqlite3 b/build/fbcode_builder/manifests/sqlite3 index c87d4cf932c1..1966f0fab10c 100644 --- a/build/fbcode_builder/manifests/sqlite3 +++ b/build/fbcode_builder/manifests/sqlite3 @@ -11,6 +11,9 @@ sqlite sqlite-devel sqlite-libs +[pps] +sqlite3 + [download] url = https://sqlite.org/2019/sqlite-amalgamation-3280000.zip sha256 = d02fc4e95cfef672b45052e221617a050b7f2e20103661cda88387349a9b1327 diff --git a/build/fbcode_builder/manifests/zlib b/build/fbcode_builder/manifests/zlib index 8c52088dbfdd..bb32e63eb194 100644 --- a/build/fbcode_builder/manifests/zlib +++ b/build/fbcode_builder/manifests/zlib @@ -15,6 +15,9 @@ zlib-static zlib-ng-compat-devel zlib-ng-compat-static +[pps] +zlib + [download] url = https://zlib.net/zlib-1.3.1.tar.gz sha256 = 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23 diff --git a/build/fbcode_builder/manifests/zstd b/build/fbcode_builder/manifests/zstd index 18484f4b1ed1..aac189fb88fb 100644 --- a/build/fbcode_builder/manifests/zstd +++ b/build/fbcode_builder/manifests/zstd @@ -12,6 +12,9 @@ libzstd-dev libzstd-devel libzstd +[pps] +zstd + [download] url = https://github.com/facebook/zstd/releases/download/v1.5.5/zstd-1.5.5.tar.gz sha256 = 9c4396cc829cfae319a6e2615202e82aad41372073482fce286fac78646d3ee4 From 7dacfa879aff779768ce6470b805771b8efc8031 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Tue, 16 Jul 2024 06:20:01 -0700 Subject: [PATCH 7055/7387] allow repeat runs of cargo build Summary: The cargo config was being unconditionally added, resutling in "duplicate key `crates-io` in table `source`" error check if snippet is present before writing Reviewed By: mzr Differential Revision: D59803494 fbshipit-source-id: 701773d604c91fd6724069b0451b212cf0018251 --- build/fbcode_builder/getdeps/cargo.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/build/fbcode_builder/getdeps/cargo.py b/build/fbcode_builder/getdeps/cargo.py index dde73ba8a8c0..cae8bf54cac1 100644 --- a/build/fbcode_builder/getdeps/cargo.py +++ b/build/fbcode_builder/getdeps/cargo.py @@ -126,6 +126,19 @@ def _create_cargo_config(self): if override not in cargo_content: new_content += override + if self.build_opts.fbsource_dir: + # Point to vendored crates.io if possible + try: + from .facebook.rust import vendored_crates + + new_content = vendored_crates( + self.build_opts.fbsource_dir, new_content + ) + except ImportError: + # This FB internal module isn't shippped to github, + # so just rely on cargo downloading crates on it's own + pass + if new_content != cargo_content: with open(cargo_config_file, "w") as f: print( @@ -133,17 +146,6 @@ def _create_cargo_config(self): ) f.write(new_content) - if self.build_opts.fbsource_dir: - # Point to vendored crates.io if possible - try: - from .facebook.rust import vendored_crates - - vendored_crates(self.build_opts.fbsource_dir, cargo_config_file) - except ImportError: - # This FB internal module isn't shippped to github, - # so just rely on cargo downloading crates on it's own - pass - return dep_to_git def _prepare(self, reconfigure) -> None: From 5175c51540d981963b2fa1be0492aaf501d3463d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 16 Jul 2024 09:33:12 -0700 Subject: [PATCH 7056/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/686bae53c31b929ce142bc9c2e0e3d7b23261db8 https://github.com/facebook/fb303/commit/460497899257d4866dc18c7699d77cafcaf9bcc2 https://github.com/facebook/fbthrift/commit/4a355733891136014c1650693851180339722382 https://github.com/facebook/folly/commit/689e5e9fdd92e0ce70f46eddbff519be5ef9b0be https://github.com/facebook/mvfst/commit/c75bd71c22140295158f65b611256cf89c0ca3e9 https://github.com/facebook/proxygen/commit/0d0039cc5df697650dbf0e69f712bb2143e7b537 https://github.com/facebook/wangle/commit/33f68736179195ff5575fc09f444221636435a59 https://github.com/facebookexperimental/edencommon/commit/a8ab209befe5eb69f3011437f4b11d054f6e48df https://github.com/facebookexperimental/rust-shed/commit/3b8e3a24e2e3f81af3e66463230562b0fe2c4658 https://github.com/facebookincubator/fizz/commit/ac2c846d7cd4aaff9a8b260fe0fdf388c2c4b87f Reviewed By: ajb85 fbshipit-source-id: 64d05580dca7d4de8faec35fd80bdfffbdf5f9a6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 547df184dd27..852c31466244 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7e7f3e67c13675623168894a167fe99cf13d21e9 +Subproject commit 4a355733891136014c1650693851180339722382 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index dfff74ef8fe6..c6fae4cb0066 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 661331d60533c2ef8e82d9650cb9f78306e12e0e +Subproject commit 689e5e9fdd92e0ce70f46eddbff519be5ef9b0be diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b4067c847541..eeb39d143390 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c92baef4808ade00c9e24bbd188a8a476d38d4ce +Subproject commit 33f68736179195ff5575fc09f444221636435a59 From ac79b79d08a88289fb4d73eb33e45994553218d8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 17 Jul 2024 09:35:49 -0700 Subject: [PATCH 7057/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/90a0d4a27eec0367ae64ed2c3bace290596fd96d https://github.com/facebook/fb303/commit/e0ee99b3c2344bc140c501bd82695c74f203b022 https://github.com/facebook/fbthrift/commit/e64dca891a52ec60327a3c421e7f6f28cfc87964 https://github.com/facebook/folly/commit/9e4a6622373fe6a78763c126012514670f6673b0 https://github.com/facebook/mvfst/commit/c358b4b10fc7d6b172ff1789e7dad3831e64b1af https://github.com/facebook/proxygen/commit/8a593c9eccd6982c451ba95870da5d527d5d9d41 https://github.com/facebook/wangle/commit/79d9f61316f71344327efcf23ee7456de86cbeb1 https://github.com/facebookexperimental/edencommon/commit/1cb59d3896a8971ca669fd46a9f9bf2fa58fe7e5 https://github.com/facebookexperimental/rust-shed/commit/6baa020ae4b4d9c3945dd515994f010fcb451597 https://github.com/facebookincubator/fizz/commit/a18875eb28f7a44f5310ebfe1d8fbe7a8b00dbba Reviewed By: ajb85 fbshipit-source-id: cc623553608d20d5546232f11e54f46217886a80 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 852c31466244..184ecb325039 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4a355733891136014c1650693851180339722382 +Subproject commit e64dca891a52ec60327a3c421e7f6f28cfc87964 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index c6fae4cb0066..ddd12d131c96 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 689e5e9fdd92e0ce70f46eddbff519be5ef9b0be +Subproject commit 9e4a6622373fe6a78763c126012514670f6673b0 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index eeb39d143390..8cdd9618288b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 33f68736179195ff5575fc09f444221636435a59 +Subproject commit 79d9f61316f71344327efcf23ee7456de86cbeb1 From a3ad75477e0adfba3feea773b170e88744b5931a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 18 Jul 2024 09:35:01 -0700 Subject: [PATCH 7058/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/f7ac3d2457f382c930c4fd81458e17c96dbb3579 https://github.com/facebook/fb303/commit/b6510b0c562d3ec21e2ed5f2462d27b8e747b20a https://github.com/facebook/fbthrift/commit/cf807027f3b6b9a76936ad9aef8a2fcf376c21d7 https://github.com/facebook/folly/commit/f223c715ad640973448bfa9496b28531b22936e1 https://github.com/facebook/mvfst/commit/2abf45f84dfd60ea5c18b3d1a65c4a3709af885d https://github.com/facebook/proxygen/commit/89fb0b32881f71944abbf6de78ce1cf48eafa582 https://github.com/facebook/wangle/commit/323acd2eea6ee6a9f81f0275924beb89db31c5f7 https://github.com/facebookexperimental/edencommon/commit/e10e99a2f9883b69027b31019677c6d2d83d82fe https://github.com/facebookexperimental/rust-shed/commit/4bcc010e087c7e01b086026ae5793c382fa34aa1 https://github.com/facebookincubator/fizz/commit/92433cd631fa0b338b7b5d8cb6325e1fccbb423b Reviewed By: ajb85 fbshipit-source-id: 0285798fdaee1c4d215a142f39dad5ff8f3d37d4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 184ecb325039..fa6ece5d3192 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e64dca891a52ec60327a3c421e7f6f28cfc87964 +Subproject commit cf807027f3b6b9a76936ad9aef8a2fcf376c21d7 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ddd12d131c96..4d2e269c3226 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9e4a6622373fe6a78763c126012514670f6673b0 +Subproject commit f223c715ad640973448bfa9496b28531b22936e1 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8cdd9618288b..341be1514f68 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 79d9f61316f71344327efcf23ee7456de86cbeb1 +Subproject commit 323acd2eea6ee6a9f81f0275924beb89db31c5f7 From ba098857842e42117b6cf8a703a3654d01c53d41 Mon Sep 17 00:00:00 2001 From: Michael Cuevas Date: Thu, 18 Jul 2024 14:36:12 -0700 Subject: [PATCH 7059/7387] add TreeMetadata to ObjectFetchContext Summary: # Context The new AugmentedManifest format used by Sapling and Mononoke will support looking up Trees/Blobs from CAS via (Blake3,size) pairs. We already provide a way for users to get (Blake3,size) pairs for blobs, but there is currently no easy way to get this information for trees. We want to add support to getAttributesFromFilesV2 for looking up the (Blake3,size) pairs for trees as well. To do this, we'll need to add a method for querying TreeMetadata (including size and Blake3 hashes) via the SaplingBackingStore. This initial implementation of TreeMetadata will only include the following features: 1) Ability to query TreeMetadata from the SaplingBackingStore via a getTreeMetadata endpoint 2) The ability to request TreeMetadata from the getAttributesFromFilesV2 thrift endpoint In the future, we will extend the implementation to support: 1) Automatically fetching TreeMetadata during BackingStore::getTree requests 2) Caching TreeMetadata in Eden's in-memory caches # This diff This diffs adds TreeMetadata type to ObjectFetchContext so that it can be used in the next diff Reviewed By: jdelliot Differential Revision: D58492652 fbshipit-source-id: 166d38aab1e54fdbca52041899e008ae3317f745 --- eden/fs/service/eden.thrift | 1 + 1 file changed, 1 insertion(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 5b2e67e3cf9b..64d33ed047ca 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1062,6 +1062,7 @@ enum HgResourceType { BLOB = 1, TREE = 2, BLOBMETA = 3, + TREEMETA = 4, } enum HgImportPriority { From 2daab13145df01bfdbe25d0e88cb71ed2a26df72 Mon Sep 17 00:00:00 2001 From: Michael Cuevas Date: Thu, 18 Jul 2024 14:36:12 -0700 Subject: [PATCH 7060/7387] Thrift: add param for scoping getAttributesFromFilesV2 Summary: # Context The new AugmentedManifest format used by Sapling and Mononoke will support looking up Trees/Blobs from CAS via (Blake3,size) pairs. We already provide a way for users to get (Blake3,size) pairs for blobs, but there is currently no easy way to get this information for trees. We want to add support to getAttributesFromFilesV2 for looking up the (Blake3,size) pairs for trees as well. To do this, we'll need to add a method for querying TreeMetadata (including size and Blake3 hashes) via the SaplingBackingStore. This initial implementation of TreeMetadata will only include the following features: 1) Ability to query TreeMetadata from the SaplingBackingStore via a getTreeMetadata endpoint 2) The ability to request TreeMetadata from the getAttributesFromFilesV2 thrift endpoint In the future, we will extend the implementation to support: 1) Automatically fetching TreeMetadata during BackingStore::getTree requests 2) Caching TreeMetadata in Eden's in-memory caches # This diff Adds a parameter to getAttributesForFilesV2 that will allow clients to request attributes for files, trees, or both. The default behavior will be to request attributes for both files and trees. However, some clients may wish to only get attributes (i.e. blake3s) for directories. In that case, we can restrict the request to only consider directories and not blobs. Differential Revision: D58552254 fbshipit-source-id: f0b79f23b64ff9f1f147dab8ae5650b222ae09b8 --- eden/fs/service/eden.thrift | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 64d33ed047ca..39ba2be329a5 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -337,6 +337,16 @@ enum FileAttributes { typedef unsigned64 RequestedAttributes +/** + * Indicates whether getAttributesForFiles requests should include results for + * files, trees, or both. + */ +enum AttributesRequestScope { + TREES = 0, + FILES = 1, + TREES_AND_FILES = 2, +} + /** * Subset of attributes for a single file returned by getAttributesFromFiles() */ @@ -456,13 +466,16 @@ struct SyncBehavior { } /** - * Parameters for the getAttributesFromFiles() function + * Parameters for the getAttributesFromFiles() function. By default, results + * for both files and trees will be returned. Clients can request for only one + * of trees or files by passing in an AttributesRequestScope. */ struct GetAttributesFromFilesParams { 1: PathString mountPoint; 2: list paths; 3: RequestedAttributes requestedAttributes; 4: SyncBehavior sync; + 5: optional AttributesRequestScope scope; } /** @@ -1907,9 +1920,10 @@ service EdenService extends fb303_core.BaseService { * * Unlike the getAttributesFromFiles endpoint, this does not assume that all * the inputs are regular files. This endpoint will attempt to return - * attributes for any type of file (directory included). Note that some - * attributes are not currently supported, like sha1 and size for directories - * and symlinks. At some point EdenFS may be able to support such attributes. + * attributes for any type of file (directory included) unless instructed + * otherwise. Note that some attributes are not currently supported, like + * sha1 and size for directories and symlinks. At some point EdenFS may be + * able to support such attributes. * * Note: may return stale data if synchronizeWorkingCopy isn't called, and if * the SyncBehavior specifies a 0 timeout. See the documentation for both of @@ -1920,7 +1934,8 @@ service EdenService extends fb303_core.BaseService { ) throws (1: EdenError ex); /** - * DEPRECATED - prefer getAttributesFromFilesV2. + * DEPRECATED - prefer getAttributesFromFilesV2. Some parameters are not + * supported by this endpoint (namely the request scope param). * * Returns the requested file attributes for the provided list of files. * From d70741d419e89b60f12f51e0e937a00e9202a24b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 19 Jul 2024 09:31:09 -0700 Subject: [PATCH 7061/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/18434331e04b3fbfaef92092b9f8151177897ffb https://github.com/facebook/fb303/commit/5e405e9a30bec51f1886ec5518d3a84458230404 https://github.com/facebook/fbthrift/commit/f072cf7242b501e58ae4add2cd5d17e74fa1de7f https://github.com/facebook/folly/commit/785c4331e20e00b00d02da91b654a42acefb0752 https://github.com/facebook/mvfst/commit/2543ffb9c2e0cc5382ee653d164081ef932364cb https://github.com/facebook/proxygen/commit/ea1c2876b2af5c55bce45dc01966be6f671cb0c8 https://github.com/facebook/wangle/commit/6a060f33e4846622acd0582a3e7f73169b723176 https://github.com/facebookexperimental/edencommon/commit/03fd0e00129bb6dd6df2d22d8f5fc74c5c104b26 https://github.com/facebookexperimental/rust-shed/commit/278214a104bee47cbc5dcea21f7fc6921467fc70 https://github.com/facebookincubator/fizz/commit/fc1a49cc03d1d3b9f77154d62e1527c985a844fe Reviewed By: ajb85 fbshipit-source-id: 3e4455fc277c7c02abdc9b9aebc6f2ef43c7a7f9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index fa6ece5d3192..606f23a08700 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cf807027f3b6b9a76936ad9aef8a2fcf376c21d7 +Subproject commit f072cf7242b501e58ae4add2cd5d17e74fa1de7f diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4d2e269c3226..7b6a38bf4e7e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f223c715ad640973448bfa9496b28531b22936e1 +Subproject commit 785c4331e20e00b00d02da91b654a42acefb0752 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 341be1514f68..29dd5a13f779 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 323acd2eea6ee6a9f81f0275924beb89db31c5f7 +Subproject commit 6a060f33e4846622acd0582a3e7f73169b723176 From 312e7a33ae84bcc5fbb7c1e7cde9721cf2b14ef4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 20 Jul 2024 09:32:14 -0700 Subject: [PATCH 7062/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/8aa9b6bd089df77540b77f89eac34e47593b6928 https://github.com/facebook/fb303/commit/48db402eba6fb8e9bab33058dfcfdc8fd2f9b6ee https://github.com/facebook/fbthrift/commit/a1c7a83e03ecffa5daf470d74d59e5bbcd542690 https://github.com/facebook/folly/commit/7b493b4b278fbe955a2772170148c4a39fed8403 https://github.com/facebook/mvfst/commit/6068b251d28db464fab27889d528715b4af97e48 https://github.com/facebook/proxygen/commit/ad214d7a1fef362fa978f2a57a32103bd194f144 https://github.com/facebook/wangle/commit/ca89635eb18f73c664d1fa26e5db9ceb85a88589 https://github.com/facebookexperimental/edencommon/commit/525b210c4f79f062bd5b0cfec95e7d82f4e51173 https://github.com/facebookexperimental/rust-shed/commit/6a4015e16ab55b0ab8e7e7a7a18a8ccd71176b09 https://github.com/facebookincubator/fizz/commit/3cdb00c1c3d1661a633c2bde2ca73acc66adef86 Reviewed By: ajb85 fbshipit-source-id: 2cba2590fad743cb1732717e6e3bad8f8e73d1fe --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 606f23a08700..39cff4870a24 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f072cf7242b501e58ae4add2cd5d17e74fa1de7f +Subproject commit a1c7a83e03ecffa5daf470d74d59e5bbcd542690 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7b6a38bf4e7e..20ce423dbecf 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 785c4331e20e00b00d02da91b654a42acefb0752 +Subproject commit 7b493b4b278fbe955a2772170148c4a39fed8403 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 29dd5a13f779..6332cbd27da5 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6a060f33e4846622acd0582a3e7f73169b723176 +Subproject commit ca89635eb18f73c664d1fa26e5db9ceb85a88589 From 0078821893ed1a2c27b07849fef13d923a47a7c9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 21 Jul 2024 09:31:58 -0700 Subject: [PATCH 7063/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/542508ad8321e595448c683cec88b2f9b89203c1 https://github.com/facebook/fbthrift/commit/d4be887d567625fe92ebfabcfa1943e25a683913 https://github.com/facebook/folly/commit/03273703302c301564606cdbb68c11c77ac0eede https://github.com/facebook/mvfst/commit/1b3211bcec5a3769cfe59e60bd86ab28271c15e3 https://github.com/facebook/proxygen/commit/1e122281689a8c309b3f1f9f06fe5c600e900c3f https://github.com/facebook/wangle/commit/6a75a7d3048790780364d3246d75e97ae24cee5e https://github.com/facebookexperimental/edencommon/commit/f5c0e43bcb511d9c4a89dd41d91e106331a3d01e https://github.com/facebookexperimental/rust-shed/commit/5a082c75d090530c71650bf976ab2ec082326e4b https://github.com/facebookincubator/fizz/commit/127cbb62a5ca5a657d03459f6c83edfc79cc06ef Reviewed By: ajb85 fbshipit-source-id: efd0d5b7048f52de792bd5c31b9543563d18171a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 39cff4870a24..071ef447390e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a1c7a83e03ecffa5daf470d74d59e5bbcd542690 +Subproject commit d4be887d567625fe92ebfabcfa1943e25a683913 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 20ce423dbecf..cd992e14a1ff 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7b493b4b278fbe955a2772170148c4a39fed8403 +Subproject commit 03273703302c301564606cdbb68c11c77ac0eede diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6332cbd27da5..311a6f84b931 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ca89635eb18f73c664d1fa26e5db9ceb85a88589 +Subproject commit 6a75a7d3048790780364d3246d75e97ae24cee5e From 070755be512882c62764c83011599ad73d1dd0fb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 22 Jul 2024 09:31:16 -0700 Subject: [PATCH 7064/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/cfa69503128f8fa728513e62a0d36ffb88c56649 https://github.com/facebook/fb303/commit/2bba3c8b95de9f170f528fa12b8ade23e5197cea https://github.com/facebook/fbthrift/commit/1e426a5aa43e7a14f4d2df6f4749fdba7a3dab7c https://github.com/facebook/mvfst/commit/6880331a5a06a5e787ccf3c7bcae5d9873a69126 https://github.com/facebook/proxygen/commit/06e078b811a8400d8d143285d6731b323c309a6a https://github.com/facebook/wangle/commit/3f8d52424c58b2640dcc3b1ba6dadf6524d2e482 https://github.com/facebookexperimental/edencommon/commit/e5a7d7ab5dc12b396fda1e893c7c268d643ef128 https://github.com/facebookexperimental/rust-shed/commit/7f3a46251893ab117220c1ca52885b876aca87cb https://github.com/facebookincubator/fizz/commit/bff5ff78d90e956da113e939729e96388cebc77b Reviewed By: ajb85 fbshipit-source-id: 3f06e0353bfd15fa0c3e33aad92bf8a8a9193c43 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 071ef447390e..82b8f1737dfe 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d4be887d567625fe92ebfabcfa1943e25a683913 +Subproject commit 1e426a5aa43e7a14f4d2df6f4749fdba7a3dab7c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 311a6f84b931..39975e7db802 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6a75a7d3048790780364d3246d75e97ae24cee5e +Subproject commit 3f8d52424c58b2640dcc3b1ba6dadf6524d2e482 From 57f9de6e915840fcd48f7fce80fd2ad6de729cb1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 23 Jul 2024 09:31:49 -0700 Subject: [PATCH 7065/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/feacb537ecde77379fb1986d4223563953b9652d https://github.com/facebook/fb303/commit/066b214410a4d10326af7b08c9a43c3846020353 https://github.com/facebook/fbthrift/commit/8422529605b7572d2f49026364914d3a127cb969 https://github.com/facebook/folly/commit/6116f5294ac7a51d3565c65557a9aa16b4d5a7cb https://github.com/facebook/mvfst/commit/1d2c2325a007ad28a870a7f3bb62e8aefc18ac35 https://github.com/facebook/proxygen/commit/8976a3178a5b4cc959595ad58ad80846f00c466d https://github.com/facebook/wangle/commit/ddf2f30ebcfdb399f3bbef0e82abb7ec870681b1 https://github.com/facebookexperimental/rust-shed/commit/15ab0cfeaffb86243582c31e58ddd5fb4eec4b61 https://github.com/facebookincubator/fizz/commit/7b0653f242f60f286379d37f89f111cfd2e8c874 Reviewed By: bigfootjon fbshipit-source-id: d4a2f2d6c0b04b34d28611447e1cc6d36e9b0463 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 82b8f1737dfe..565df64d29f4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1e426a5aa43e7a14f4d2df6f4749fdba7a3dab7c +Subproject commit 8422529605b7572d2f49026364914d3a127cb969 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index cd992e14a1ff..d3e279b85f7b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 03273703302c301564606cdbb68c11c77ac0eede +Subproject commit 6116f5294ac7a51d3565c65557a9aa16b4d5a7cb diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 39975e7db802..87a0919817c2 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3f8d52424c58b2640dcc3b1ba6dadf6524d2e482 +Subproject commit ddf2f30ebcfdb399f3bbef0e82abb7ec870681b1 From 2bc7890ae2402a85ac5857be8a38d663f03067b0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 24 Jul 2024 09:32:36 -0700 Subject: [PATCH 7066/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/5d2d658bd612fe5fd973bdbc53e6c56c4b0a9bf8 https://github.com/facebook/fb303/commit/7a73576dc3932f33c9b143d8ef08d06e7ee4f20f https://github.com/facebook/fbthrift/commit/29ec5666c267a8e6a66caa8e296b03aff124e676 https://github.com/facebook/folly/commit/37d8c32ee11f30526a80c19cde8d079745692b0c https://github.com/facebook/mvfst/commit/8850180ef327f0f4f7acc34c8e67372d7a803694 https://github.com/facebook/proxygen/commit/e1437b1302f96a76ef2d30c61d4b50b450d4d60b https://github.com/facebook/wangle/commit/5239f2bed90e04a3b89fd73420028efe9d8c8f2d https://github.com/facebookexperimental/edencommon/commit/87fae8b4a1f19f702880464996a7a5bed2780df7 https://github.com/facebookexperimental/rust-shed/commit/e4473af16eba09a8073a6375fa58c99f2c9b50f7 https://github.com/facebookincubator/fizz/commit/fba36ce3e9c7403844d2be69f1ee161a83d628b2 Reviewed By: bigfootjon fbshipit-source-id: 707c4f404eb2feb331a4051d7e0667ef8e061ac8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 565df64d29f4..83fe95259dbe 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8422529605b7572d2f49026364914d3a127cb969 +Subproject commit 29ec5666c267a8e6a66caa8e296b03aff124e676 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d3e279b85f7b..8ccdde3d0f16 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 6116f5294ac7a51d3565c65557a9aa16b4d5a7cb +Subproject commit 37d8c32ee11f30526a80c19cde8d079745692b0c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 87a0919817c2..e966f6b33db6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ddf2f30ebcfdb399f3bbef0e82abb7ec870681b1 +Subproject commit 5239f2bed90e04a3b89fd73420028efe9d8c8f2d From 34ff646a60157659c68bbbac337232870ca1fc1c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 25 Jul 2024 09:36:17 -0700 Subject: [PATCH 7067/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/b7ff90ad402629aada870304951465e65a66ac2c https://github.com/facebook/fb303/commit/a3eed1eb2a68bb33f03247af67b4365d9b0d6283 https://github.com/facebook/fbthrift/commit/0dfd2f994eb01c6de4a40142c4cc922a7a97ddc8 https://github.com/facebook/folly/commit/9af4c059879ab4830fb3c41a1850bfd4c20cf57e https://github.com/facebook/mvfst/commit/12b2745b14bd1298494600c512006867a09bc761 https://github.com/facebook/proxygen/commit/eb3f0bed479b8b063ec92884649699f9176874dc https://github.com/facebook/wangle/commit/7b6027f1b837a3824131ecd386272120d6221d34 https://github.com/facebookexperimental/edencommon/commit/49ad59e42b96608f3543bdd40577b6b4aa6b725a https://github.com/facebookexperimental/rust-shed/commit/8402f86c79be074dff90cbd1e0e0def42db30114 https://github.com/facebookincubator/fizz/commit/7becf4fd5c1bf0922b75fafcdb60bea464530287 Reviewed By: bigfootjon fbshipit-source-id: c1937ec901d9e03ef50d834fd371bab982e17b6a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 83fe95259dbe..96df8f5cdffe 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 29ec5666c267a8e6a66caa8e296b03aff124e676 +Subproject commit 0dfd2f994eb01c6de4a40142c4cc922a7a97ddc8 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8ccdde3d0f16..cad0301a7756 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 37d8c32ee11f30526a80c19cde8d079745692b0c +Subproject commit 9af4c059879ab4830fb3c41a1850bfd4c20cf57e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e966f6b33db6..78aa72aa753b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5239f2bed90e04a3b89fd73420028efe9d8c8f2d +Subproject commit 7b6027f1b837a3824131ecd386272120d6221d34 From b53ca70cc37496cfd5924eacf2cef8a271ee6ae9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 26 Jul 2024 09:37:09 -0700 Subject: [PATCH 7068/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/7d7db67593b47adfc95f12ee4aea8d1f4e1f474c https://github.com/facebook/fb303/commit/c398526e13b6fb44f8d4b887411cb0b0fadb0a23 https://github.com/facebook/fbthrift/commit/04a0e26fa00788db5bcaa1584b38d7bbe616941a https://github.com/facebook/folly/commit/12b11d0ab99e1edd3ffc253b55ed91736a5cfd43 https://github.com/facebook/mvfst/commit/f3a6c0d9685e6d89450ee43d5ca50bcd8dab2067 https://github.com/facebook/proxygen/commit/3dc654147d895d8fd4b592eb87dddb50cc3f7959 https://github.com/facebook/wangle/commit/45e384dc3b62b5b9dbf528141ba529907652d390 https://github.com/facebookexperimental/edencommon/commit/28f8180631c4ea006ee9fa2e72497440120a5c06 https://github.com/facebookexperimental/rust-shed/commit/6a180d2ae34e92c2e172433e46d1ff8cd2eddbb2 https://github.com/facebookincubator/fizz/commit/8a7436571140b4facc727ed4a13d7025b7bb5fd9 Reviewed By: bigfootjon fbshipit-source-id: d3c5cab890b7d6935ced0b512402a4cd0291cd58 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 96df8f5cdffe..bc6de4f12671 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0dfd2f994eb01c6de4a40142c4cc922a7a97ddc8 +Subproject commit 04a0e26fa00788db5bcaa1584b38d7bbe616941a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index cad0301a7756..bd20ebc5dae0 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9af4c059879ab4830fb3c41a1850bfd4c20cf57e +Subproject commit 12b11d0ab99e1edd3ffc253b55ed91736a5cfd43 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 78aa72aa753b..9bdb8eb1be3f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7b6027f1b837a3824131ecd386272120d6221d34 +Subproject commit 45e384dc3b62b5b9dbf528141ba529907652d390 From 30f4a9552f96b90a873fbae9c2179f5fbaa71223 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 27 Jul 2024 09:31:04 -0700 Subject: [PATCH 7069/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/4b43f6901879aea4cf1721ee18713329585553f6 https://github.com/facebook/fb303/commit/0fdcfa63be9071ba9ba34c59b484417f2bb7564b https://github.com/facebook/fbthrift/commit/f5a5f5ab0de99eeeece67521eb816032c199cc3f https://github.com/facebook/folly/commit/cab625c1a3e927399b78205e6d6d100a6a52f6c8 https://github.com/facebook/mvfst/commit/9ebf6056c0c1cdaa88dbf50ed5ea40209fe63a5b https://github.com/facebook/proxygen/commit/11226721bb433c31d548d7da6bcf459c66254b30 https://github.com/facebook/wangle/commit/aafe19984739ebc2cd94afc958cedecf41755d05 https://github.com/facebookexperimental/edencommon/commit/62e560f4831427d3170c61f25e409ae1eba1fe49 https://github.com/facebookexperimental/rust-shed/commit/4f55da19d54ca6e235474f95902e308610724559 https://github.com/facebookincubator/fizz/commit/7eec16fd0bd1095b766726afa9720ecd82a6951f Reviewed By: bigfootjon fbshipit-source-id: 840bc2c7033029171f6dc8fdb41d43a728a331ce --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index bc6de4f12671..ae25d468df8e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 04a0e26fa00788db5bcaa1584b38d7bbe616941a +Subproject commit f5a5f5ab0de99eeeece67521eb816032c199cc3f diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index bd20ebc5dae0..97caffb3bb07 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 12b11d0ab99e1edd3ffc253b55ed91736a5cfd43 +Subproject commit cab625c1a3e927399b78205e6d6d100a6a52f6c8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9bdb8eb1be3f..372b1a156f71 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 45e384dc3b62b5b9dbf528141ba529907652d390 +Subproject commit aafe19984739ebc2cd94afc958cedecf41755d05 From 8074629b5cf5e8f2ed59f6b0c1aab947a3a8323f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 28 Jul 2024 09:31:21 -0700 Subject: [PATCH 7070/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/863fb7a649717d4f6e634d0d303bfb44a7fd08d6 https://github.com/facebook/fbthrift/commit/16e30652652354cb6084f96a2434ed426531609d https://github.com/facebook/folly/commit/7c4f66ae927b4fdb93feb8febe1160c88022b84b https://github.com/facebook/mvfst/commit/971e8986534bcd9d9c1860d392cb0e2fa8f7717c https://github.com/facebook/proxygen/commit/32677312fe932f9cb1cecbd07aa79950a86f8b03 https://github.com/facebook/wangle/commit/e753d62183660d72dc3385234b703aed84438b72 https://github.com/facebookexperimental/edencommon/commit/b0dc91f33f92ab3f59f46cd9fdf967a3bf5fcf70 https://github.com/facebookexperimental/rust-shed/commit/caf55b636f62037f0ae6b9e1317241cafdb93dd0 https://github.com/facebookincubator/fizz/commit/9c937c3bc669610ebe49a66f5479d34d00d62ae8 Reviewed By: bigfootjon fbshipit-source-id: 6050536394be1cfac57adb5dcfb5d42637992c73 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ae25d468df8e..7bf2ef719e07 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f5a5f5ab0de99eeeece67521eb816032c199cc3f +Subproject commit 16e30652652354cb6084f96a2434ed426531609d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 97caffb3bb07..cdf57e8c48ad 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit cab625c1a3e927399b78205e6d6d100a6a52f6c8 +Subproject commit 7c4f66ae927b4fdb93feb8febe1160c88022b84b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 372b1a156f71..b7495eceb6c6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit aafe19984739ebc2cd94afc958cedecf41755d05 +Subproject commit e753d62183660d72dc3385234b703aed84438b72 From fc1f4308b8222c12e7d393cf47e36ae1b26f071b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 29 Jul 2024 09:32:11 -0700 Subject: [PATCH 7071/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/705bd5b850ea22a8c89ecacdd4f29fe5fab5c1ce https://github.com/facebook/fb303/commit/40770c0298996e6e5a7f4363984a21b49b9453cb https://github.com/facebook/fbthrift/commit/7fa4ed4b7401a2b9051036370fff531931fffddc https://github.com/facebook/folly/commit/99a4f5aa3791b3c65e26802861e1e786b84da276 https://github.com/facebook/mvfst/commit/27628ab8ef03e632dfd7eb8e78f148fa56e73367 https://github.com/facebook/proxygen/commit/f470ea5cec0dd6a485b6f5346efca318e7b32def https://github.com/facebook/wangle/commit/532e0229a4b10a55e399d548412a0480a547b62b https://github.com/facebookexperimental/edencommon/commit/4637edb0a90b65d7884dc987fe3ba45982bb49b2 https://github.com/facebookexperimental/rust-shed/commit/e081bdf8a2e8a7a3786d8cfc2717bf5c17d69338 https://github.com/facebookincubator/fizz/commit/34527a174c2146fc5c2dbdaf371cea3cd7e6bf80 Reviewed By: namanahuja fbshipit-source-id: 08bf81fc5d662a50f7f56f6e7c771f17a6d8112a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7bf2ef719e07..4a48ec1302e0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 16e30652652354cb6084f96a2434ed426531609d +Subproject commit 7fa4ed4b7401a2b9051036370fff531931fffddc diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index cdf57e8c48ad..415d3e1a3cc4 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7c4f66ae927b4fdb93feb8febe1160c88022b84b +Subproject commit 99a4f5aa3791b3c65e26802861e1e786b84da276 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b7495eceb6c6..60ebb8b5aba0 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e753d62183660d72dc3385234b703aed84438b72 +Subproject commit 532e0229a4b10a55e399d548412a0480a547b62b From 116c20facd7ef086984e67bf47f16043f33a1f29 Mon Sep 17 00:00:00 2001 From: Nicholas Ormrod Date: Mon, 29 Jul 2024 16:21:03 -0700 Subject: [PATCH 7072/7387] Deshim test_util in fbcode/watchman Summary: The following rules were deshimmed: ``` //folly/experimental:test_util -> //folly/testing:test_util ``` The following headers were deshimmed: ``` folly/experimental/TestUtil.h -> folly/testing/TestUtil.h ``` This is a codemod. It was automatically generated and will be landed once it is approved and tests are passing in sandcastle. You have been added as a reviewer by Sentinel or Butterfly. Autodiff project: detu Autodiff partition: fbcode.watchman Autodiff bookmark: ad.detu.fbcode.watchman Reviewed By: genevievehelsel Differential Revision: D60409966 fbshipit-source-id: acd751b93e1e29ef157636d37a21e624c038b61a --- watchman/integration/cppclient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/integration/cppclient.cpp b/watchman/integration/cppclient.cpp index b48bbf5a1e33..bda3093e26f7 100644 --- a/watchman/integration/cppclient.cpp +++ b/watchman/integration/cppclient.cpp @@ -13,11 +13,11 @@ #include #include -#include #include #include #include #include +#include #include using namespace folly; From 8ad9b320592d301377117489623eeb957a4308c8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 30 Jul 2024 09:31:23 -0700 Subject: [PATCH 7073/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/e47b6348eb2bb263b769833848d82acf4778f59b https://github.com/facebook/fb303/commit/bb650a134859fb8cee4e2dea9180d15805feac7f https://github.com/facebook/fbthrift/commit/a827a05d6eac92347435488d85ff6e317399d1d5 https://github.com/facebook/folly/commit/06701d6a00118abf1518e9103bf4c9d439643e35 https://github.com/facebook/mvfst/commit/37f7403176cc117f4c88e5cd2cbdf23d37ab1982 https://github.com/facebook/proxygen/commit/3f7586f73a61e57a77ef449008063d2f52f91027 https://github.com/facebook/wangle/commit/303cbe98857b8353d0a14b2a2aebf8636234efdb https://github.com/facebookexperimental/edencommon/commit/7c3bbc1f23943e62893d9241f91bbe0d05678b39 https://github.com/facebookexperimental/rust-shed/commit/e4c55dd702f7a4778d907fbc32ffdf4d16052df9 https://github.com/facebookincubator/fizz/commit/1183a88c5c63a7e097da8f20b9d09565044c2d8f Reviewed By: namanahuja fbshipit-source-id: 9d2542f0b096a08a28135124957e9f3e716319d6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4a48ec1302e0..18e673864126 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7fa4ed4b7401a2b9051036370fff531931fffddc +Subproject commit a827a05d6eac92347435488d85ff6e317399d1d5 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 415d3e1a3cc4..a4a790c4010b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 99a4f5aa3791b3c65e26802861e1e786b84da276 +Subproject commit 06701d6a00118abf1518e9103bf4c9d439643e35 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 60ebb8b5aba0..cce8ec048100 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 532e0229a4b10a55e399d548412a0480a547b62b +Subproject commit 303cbe98857b8353d0a14b2a2aebf8636234efdb From 86f8671188ec748482f2effd61bc22887850e2e0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 31 Jul 2024 09:32:35 -0700 Subject: [PATCH 7074/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/8e04503745880fa617d01cf3d6a6ae5373ebbd97 https://github.com/facebook/fb303/commit/adcc5f2f5fe2502171cf350aecd6c4c9631c246d https://github.com/facebook/fbthrift/commit/e7da821816e3798dc992a3cd6d7d191a8ea88738 https://github.com/facebook/folly/commit/1ba9802e852784e58142f964673fe1af8ff7c74e https://github.com/facebook/mvfst/commit/8e9619f1410473814e1cc1e2a734f0d53753a106 https://github.com/facebook/proxygen/commit/d6481e6fc36dea6a96852889f6c1cf38346a4a0e https://github.com/facebook/wangle/commit/35164889d4094ae5fe7579c94145e9ae6713f26a https://github.com/facebookexperimental/edencommon/commit/0f4d59a9b12ed359d7535a4964bf0911c173cf7e https://github.com/facebookexperimental/rust-shed/commit/90e3b2fc4758ff78bc9a37b3e2262f902ee346c2 https://github.com/facebookincubator/fizz/commit/2ea82786c751d7e80eb0b7c9b80f8bc9ead94c87 Reviewed By: namanahuja fbshipit-source-id: afce1172e9282f81e3e466b3d6ca7c8ffb6e3e39 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 18e673864126..d48a1e9827fb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a827a05d6eac92347435488d85ff6e317399d1d5 +Subproject commit e7da821816e3798dc992a3cd6d7d191a8ea88738 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a4a790c4010b..d11ee1d2e0d3 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 06701d6a00118abf1518e9103bf4c9d439643e35 +Subproject commit 1ba9802e852784e58142f964673fe1af8ff7c74e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index cce8ec048100..913b7387f3f4 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 303cbe98857b8353d0a14b2a2aebf8636234efdb +Subproject commit 35164889d4094ae5fe7579c94145e9ae6713f26a From b20f7b60e1efa7820b40c12a2d3ad718196e8d92 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 1 Aug 2024 09:31:51 -0700 Subject: [PATCH 7075/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/320f634984d9dc40dc51d5a427be7ea5dc307fcb https://github.com/facebook/fb303/commit/b8dedd8b6a91fac4afd5f8416c9f078d883f9e4b https://github.com/facebook/fbthrift/commit/d2d55edacf92514d8c961722251d02a4c621b365 https://github.com/facebook/folly/commit/be091f7bae6892498b54c048597eddf3d81f878a https://github.com/facebook/mvfst/commit/e1675e2641fbea553466864cc84e625b933229c7 https://github.com/facebook/proxygen/commit/f92145445f48386737ef51b9d4c97136831a5783 https://github.com/facebook/wangle/commit/7a587ca9528bdb9d1f74bb6e89ef097d3399559c https://github.com/facebookexperimental/edencommon/commit/fbfa107d54301382862ee29616296315aec9ad11 https://github.com/facebookexperimental/rust-shed/commit/8807b7c5169b5ee2e9e5523256f561f13e205bc8 https://github.com/facebookincubator/fizz/commit/decf5c2030b0e59502f765f1cedd34aa98945b20 Reviewed By: namanahuja fbshipit-source-id: 243c986308dc8ebe411e13109a9e42377baa1cb1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d48a1e9827fb..0ada0d850556 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e7da821816e3798dc992a3cd6d7d191a8ea88738 +Subproject commit d2d55edacf92514d8c961722251d02a4c621b365 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d11ee1d2e0d3..88b0ed06456f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1ba9802e852784e58142f964673fe1af8ff7c74e +Subproject commit be091f7bae6892498b54c048597eddf3d81f878a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 913b7387f3f4..3a7578f5a97a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 35164889d4094ae5fe7579c94145e9ae6713f26a +Subproject commit 7a587ca9528bdb9d1f74bb6e89ef097d3399559c From 33a11102b52159e80a7c59b027f09e2078b0241c Mon Sep 17 00:00:00 2001 From: Yedidya Feldblum Date: Thu, 1 Aug 2024 10:22:32 -0700 Subject: [PATCH 7076/7387] bump fmt dep to fmt-11.0.2 (#349) Summary: Pull Request resolved: https://github.com/facebook/mvfst/pull/349 Reviewed By: vitaut Differential Revision: D60154344 fbshipit-source-id: dfadbf0a7e01867875c00b244857a560bc3497ad --- build/fbcode_builder/manifests/fmt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/manifests/fmt b/build/fbcode_builder/manifests/fmt index 015e8c3bc3e1..e7faa7a56c81 100644 --- a/build/fbcode_builder/manifests/fmt +++ b/build/fbcode_builder/manifests/fmt @@ -2,12 +2,12 @@ name = fmt [download] -url = https://github.com/fmtlib/fmt/archive/refs/tags/9.1.0.tar.gz -sha256 = 5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2 +url = https://github.com/fmtlib/fmt/archive/refs/tags/11.0.2.tar.gz +sha256 = 6cb1e6d37bdcb756dbbe59be438790db409cdb4868c66e888d5df9f13f7c027f [build] builder = cmake -subdir = fmt-9.1.0 +subdir = fmt-11.0.2 [cmake.defines] FMT_TEST = OFF From 001b938c908db22032c7f592a6f85ec845063427 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Thu, 1 Aug 2024 17:15:17 -0700 Subject: [PATCH 7077/7387] Math is hard... fix elapsed_time is negative bug Summary: Sigh. start-time - now = -elapsed-time now - start-time = elapsed-time Reviewed By: genevievehelsel Differential Revision: D60617861 fbshipit-source-id: f7fa8a33c570c5d353e324c63108f9ab1e845953 --- watchman/telemetry/LogEvent.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/telemetry/LogEvent.h b/watchman/telemetry/LogEvent.h index ed26291cca44..e6c9c6e7013c 100644 --- a/watchman/telemetry/LogEvent.h +++ b/watchman/telemetry/LogEvent.h @@ -46,7 +46,7 @@ struct BaseEventData { void populate(DynamicEvent& event) const { std::chrono::duration elapsed_time = - start_time - std::chrono::system_clock::now(); + std::chrono::system_clock::now() - start_time; event.addInt( "start_time", std::chrono::system_clock::to_time_t(start_time)); event.addInt( From 5dcde3fc438722d09e783f4761b7c72b55d3de7d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 2 Aug 2024 09:34:09 -0700 Subject: [PATCH 7078/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/341c8cb837fefd6ac6e4ac6e98e4e38c38ac23a1 https://github.com/facebook/fb303/commit/7277bde5bb3c4ebeb576ab7ba46f663af6995acd https://github.com/facebook/fbthrift/commit/e5cf899ab49c911e494577bfac26ff8f3b74872e https://github.com/facebook/folly/commit/558f312c6bd37b6df26f1b498faad0e196dd355d https://github.com/facebook/mvfst/commit/ac078069ce1f2775b1898482d259ddd69ca30a0f https://github.com/facebook/proxygen/commit/8bf4d4af81767d71135091c40a5662f5ca6b9243 https://github.com/facebook/wangle/commit/60e3d48fb8d7f9f31ba918ad3074ebd8f1b842c5 https://github.com/facebookexperimental/edencommon/commit/870132aeb9442adc522f2a3c2ef7a99a1d0bcde1 https://github.com/facebookexperimental/rust-shed/commit/16f3b2b2de09669b617b1a4e29bccaec2afebb98 https://github.com/facebookincubator/fizz/commit/cf4bea0488876ef642f4a8eda6013a961ba250df Reviewed By: namanahuja fbshipit-source-id: 138b1e4636e9a2644b7b42cb641e90fc74ea61d7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0ada0d850556..c54f0b3dcd66 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d2d55edacf92514d8c961722251d02a4c621b365 +Subproject commit e5cf899ab49c911e494577bfac26ff8f3b74872e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 88b0ed06456f..6319c7e1e239 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit be091f7bae6892498b54c048597eddf3d81f878a +Subproject commit 558f312c6bd37b6df26f1b498faad0e196dd355d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3a7578f5a97a..8a576665d84e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7a587ca9528bdb9d1f74bb6e89ef097d3399559c +Subproject commit 60e3d48fb8d7f9f31ba918ad3074ebd8f1b842c5 From ae4ab13479ac3c2a78b2fa8eae3aac0365a0c8dd Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 3 Aug 2024 09:32:10 -0700 Subject: [PATCH 7079/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/e27ef6c3905bc8f72d498b5a8b5cbf023d59c4b4 https://github.com/facebook/fb303/commit/05ad68fd75deed079ec0799f9aa339624f28b54f https://github.com/facebook/fbthrift/commit/c7af65e9c10f8f67c994c81f804bbf3e7f729554 https://github.com/facebook/folly/commit/6c6d925f1d02a5c550ca2f7788bbb5d02f84b1c6 https://github.com/facebook/mvfst/commit/83d7125d2591f4019984486f581b6451b464d528 https://github.com/facebook/proxygen/commit/5ba71cbb870760780d3da6a062db05db8d4fd55a https://github.com/facebook/wangle/commit/4285dabe430f53c5b746114b34996c55fa4847da https://github.com/facebookexperimental/edencommon/commit/9452263a31fe793b12aa1c3a0199df32dcc12e88 https://github.com/facebookexperimental/rust-shed/commit/d6259c0407f76e76ef9cf7cf2af6e19960ba50d2 https://github.com/facebookincubator/fizz/commit/7114a7c0326a6ed1ca45d76d667d8510630f7aa5 Reviewed By: namanahuja fbshipit-source-id: 1189f55771952e426fc4308549397feb6a5f3b69 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c54f0b3dcd66..47ae24c98bfd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e5cf899ab49c911e494577bfac26ff8f3b74872e +Subproject commit c7af65e9c10f8f67c994c81f804bbf3e7f729554 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6319c7e1e239..c88cb920bff1 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 558f312c6bd37b6df26f1b498faad0e196dd355d +Subproject commit 6c6d925f1d02a5c550ca2f7788bbb5d02f84b1c6 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8a576665d84e..4fe25a34b923 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 60e3d48fb8d7f9f31ba918ad3074ebd8f1b842c5 +Subproject commit 4285dabe430f53c5b746114b34996c55fa4847da From 51e87634415358f3a14544fc4cd20fb246e158e3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 4 Aug 2024 09:32:24 -0700 Subject: [PATCH 7080/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/f8f86bd5d7f8013e6bf201b925aaae8e2205b3dc https://github.com/facebook/fbthrift/commit/ca04e10a0b67d302126cd19dab1842af3b277f4a https://github.com/facebook/folly/commit/8cde06b2eeffbba8e674761123ae66d03c39e2ab https://github.com/facebook/mvfst/commit/e96a294a4004e0368921ca6f7f9462f532bfa82e https://github.com/facebook/proxygen/commit/47375a7128339bdd667ab2023a016b78eaac80fa https://github.com/facebook/wangle/commit/7f70124e26d3d5f791d24fc2ae6db744dccbaee4 https://github.com/facebookexperimental/edencommon/commit/fc92080ae52ac08d6a9334fc1a7f2902ac199246 https://github.com/facebookexperimental/rust-shed/commit/f48721bf75f36c3648999e7cda09770dd101bc77 https://github.com/facebookincubator/fizz/commit/ed6c55822341f3ad7fa24c1d1a39c9eacb8153c8 Reviewed By: namanahuja fbshipit-source-id: 9ef7c2d8a6d5d3b1e777ad7ffe8118dfcee75ab0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 47ae24c98bfd..5736877c03af 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c7af65e9c10f8f67c994c81f804bbf3e7f729554 +Subproject commit ca04e10a0b67d302126cd19dab1842af3b277f4a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index c88cb920bff1..5eeba139bb6c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 6c6d925f1d02a5c550ca2f7788bbb5d02f84b1c6 +Subproject commit 8cde06b2eeffbba8e674761123ae66d03c39e2ab diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4fe25a34b923..4b7b69cbee9f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 4285dabe430f53c5b746114b34996c55fa4847da +Subproject commit 7f70124e26d3d5f791d24fc2ae6db744dccbaee4 From b64dc4794bda843b971c303d6a0ce848b98f74f0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 5 Aug 2024 09:32:12 -0700 Subject: [PATCH 7081/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ab3f9bab98f68a24d914cca3a40486c88376665c https://github.com/facebook/fbthrift/commit/5accdd2f101a8fd7165fd1e5c24e4f1071c22f79 https://github.com/facebook/folly/commit/dc875e505b94733bdc07d10990e54f4af5d3110e https://github.com/facebook/mvfst/commit/9acd06074deb7a9a67db2ba93dc78ba8099b6bcc https://github.com/facebook/proxygen/commit/9c1ef796b3757d9c2febea5d514c8198f6a7d3d4 https://github.com/facebook/wangle/commit/6d788d27462aaa176bdaef182c55994632472191 https://github.com/facebookexperimental/edencommon/commit/fa4bd04a3785c60dd5513d57253cc509193dd012 https://github.com/facebookexperimental/rust-shed/commit/0b3287a265cda9e4b123bd39bd78f07883822c4a https://github.com/facebookincubator/fizz/commit/7258640561a2087a728a1315b9b93058b881d43c Reviewed By: bigfootjon fbshipit-source-id: 332ddb2d3254a60e1a9bbedc549bf84848a2df1d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5736877c03af..a2c37d256040 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ca04e10a0b67d302126cd19dab1842af3b277f4a +Subproject commit 5accdd2f101a8fd7165fd1e5c24e4f1071c22f79 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 5eeba139bb6c..21452c7363a9 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 8cde06b2eeffbba8e674761123ae66d03c39e2ab +Subproject commit dc875e505b94733bdc07d10990e54f4af5d3110e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4b7b69cbee9f..7b955bb40dad 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7f70124e26d3d5f791d24fc2ae6db744dccbaee4 +Subproject commit 6d788d27462aaa176bdaef182c55994632472191 From e2c94e75d9c212fdb54a582d88c09777e51dffdd Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Tue, 6 Aug 2024 16:10:02 -0700 Subject: [PATCH 7082/7387] Extend `gtest_discover_tests` timeout (#1237) Summary: Parallel builds can fail intermittently with the default timeout for `gtest_discover_tests`.[^1] At Homebrew, we've been using this change for a while with no problems[^2], so I hope it would be helpful to upstream it. [^1]: See https://cmake.org/cmake/help/latest/module/GoogleTest.html#command:gtest_discover_tests [^2]: Since https://github.com/Homebrew/homebrew-core/commit/3e9b81fe294535117437ec4c9f1b32b3634419bf Pull Request resolved: https://github.com/facebook/watchman/pull/1237 Reviewed By: genevievehelsel Differential Revision: D60670851 fbshipit-source-id: 74f542ca1c880e1d8aada10fad23e4bb6c3e142e --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c44906df1fe3..a8ea43029e07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -754,7 +754,7 @@ function(t_test NAME) ) target_compile_definitions(${NAME}.t PUBLIC WATCHMAN_TEST_SRC_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}\") - gtest_discover_tests(${NAME}.t) + gtest_discover_tests(${NAME}.t DISCOVERY_TIMEOUT 60) list(APPEND tests ${NAME}.t) endfunction() From 28d73f982a57159a1a60ad156720e1b0a8c73acd Mon Sep 17 00:00:00 2001 From: Piotr Kubaj Date: Tue, 6 Aug 2024 16:18:27 -0700 Subject: [PATCH 7083/7387] Fix build on big-endian architectures (#1238) Summary: Per https://docs.rs/bytes/1.6.1/bytes/buf/trait.BufMut.html#method.put_i16, there are no *_be functions, the ones for big-endian do not have any suffix. Pull Request resolved: https://github.com/facebook/watchman/pull/1238 Reviewed By: chadaustin Differential Revision: D60860963 Pulled By: kavehahmadi60 fbshipit-source-id: dff4fdc0aabb1b02a9ed96e601880c4941cf607d --- watchman/rust/serde_bser/src/ser/mod.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/watchman/rust/serde_bser/src/ser/mod.rs b/watchman/rust/serde_bser/src/ser/mod.rs index ceb85de618a1..58a805ba3e01 100644 --- a/watchman/rust/serde_bser/src/ser/mod.rs +++ b/watchman/rust/serde_bser/src/ser/mod.rs @@ -133,7 +133,7 @@ where #[cfg(target_endian = "little")] self.scratch.put_i16_le(v); #[cfg(target_endian = "big")] - self.scratch.put_i16_be(v); + self.scratch.put_i16(v); } #[inline] @@ -143,7 +143,7 @@ where #[cfg(target_endian = "little")] self.scratch.put_i32_le(v); #[cfg(target_endian = "big")] - self.scratch.put_i32_be(v); + self.scratch.put_i32(v); } #[inline] @@ -153,7 +153,7 @@ where #[cfg(target_endian = "little")] self.scratch.put_i64_le(v); #[cfg(target_endian = "big")] - self.scratch.put_i64_be(v); + self.scratch.put_i64(v); } } @@ -255,7 +255,7 @@ where #[cfg(target_endian = "little")] self.scratch.put_f64_le(v); #[cfg(target_endian = "big")] - self.scratch.put_f64_be(v); + self.scratch.put_f64(v); Ok(()) } From 064bde65b53921dbfaaeb1bf625c216d283b6cae Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 6 Aug 2024 16:34:37 -0700 Subject: [PATCH 7084/7387] clippy Summary: Fix lints. Reviewed By: genevievehelsel Differential Revision: D60861909 fbshipit-source-id: 49d8dc82a059657c434bf439a48f6b02db29a686 --- watchman/cli/src/rage/mod.rs | 1 - watchman/rust/serde_bser/src/ser/mod.rs | 6 +++--- watchman/rust/serde_bser/src/ser/test.rs | 2 +- watchman/rust/serde_bser/src/value.rs | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/watchman/cli/src/rage/mod.rs b/watchman/cli/src/rage/mod.rs index b800c9ac58c9..023dbcb72a9d 100644 --- a/watchman/cli/src/rage/mod.rs +++ b/watchman/cli/src/rage/mod.rs @@ -176,7 +176,6 @@ impl WatchmanRage { fn print_watchman_env(&mut self) -> Result<()> { let vars = std::env::vars() - .into_iter() .filter(|(k, _)| k.starts_with("WATCHMAN_")) .collect::>(); diff --git a/watchman/rust/serde_bser/src/ser/mod.rs b/watchman/rust/serde_bser/src/ser/mod.rs index 58a805ba3e01..bf1a32fb0e4c 100644 --- a/watchman/rust/serde_bser/src/ser/mod.rs +++ b/watchman/rust/serde_bser/src/ser/mod.rs @@ -56,8 +56,8 @@ pub struct Serializer { /// This works for all $val types except for `u64`. macro_rules! maybe_put_int { ($self:ident, $val:expr, $to:ident, $put:ident) => { - let min = $to::min_value() as i64; - let max = $to::max_value() as i64; + let min = $to::MIN as i64; + let max = $to::MAX as i64; let val = $val as i64; if val >= min && val <= max { return $self.$put($val as $to); @@ -236,7 +236,7 @@ where fn serialize_u64(self, v: u64) -> Result<()> { // maybe_put_int! doesn't work for u64 because it converts to i64 // internally. - if v > (i64::max_value() as u64) { + if v > (i64::MAX as u64) { Err(Error::SerU64TooBig { v }) } else { self.serialize_i64(v as i64) diff --git a/watchman/rust/serde_bser/src/ser/test.rs b/watchman/rust/serde_bser/src/ser/test.rs index 75c16fdb6a81..5b6b2c461d7b 100644 --- a/watchman/rust/serde_bser/src/ser/test.rs +++ b/watchman/rust/serde_bser/src/ser/test.rs @@ -45,7 +45,7 @@ fn test_basic_serialize() { test_enum: TestEnum::TestUnit, test_enum_list: vec![ TestEnum::TestNewtype(&b"BSER test"[..]), - TestEnum::TestTuple(42, i64::max_value() as u64), + TestEnum::TestTuple(42, i64::MAX as u64), TestEnum::TestStruct { abc: (), def: '\u{1f4a9}', diff --git a/watchman/rust/serde_bser/src/value.rs b/watchman/rust/serde_bser/src/value.rs index 40ea8f027e50..3e6e9b1f785b 100644 --- a/watchman/rust/serde_bser/src/value.rs +++ b/watchman/rust/serde_bser/src/value.rs @@ -83,7 +83,7 @@ impl TryInto for usize { type Error = &'static str; fn try_into(self) -> Result { - if self > i64::max_value() as usize { + if self > i64::MAX as usize { Err("value is too large to represent as i64") } else { Ok(Value::Integer(self as i64)) @@ -121,7 +121,7 @@ impl<'de> Deserialize<'de> for Value { fn visit_u64(self, v: u64) -> Result { // maybe_put_int! doesn't work for u64 because it converts to i64 // internally. - if v > (i64::max_value() as u64) { + if v > (i64::MAX as u64) { Err(serde::de::Error::custom(format!( "value {} is too large to represent as a BSER integer", v From 8d2259846da3c0824fdfca7b1788edb41c81e4b2 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 6 Aug 2024 21:37:48 -0700 Subject: [PATCH 7085/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/455d76d76e6f5dc17c584331f5a1ea380b83e0a7 https://github.com/facebook/fb303/commit/e0c2b7867889b5d20048b0abd2cea9ba9a7bd54b https://github.com/facebook/fbthrift/commit/d1d1b41ce044dc1249bb0fb2a60b79f874096912 https://github.com/facebook/folly/commit/1f3f1ce764f84df884a2096c77c1f4f874e670dc https://github.com/facebook/mvfst/commit/6652c389755c70174873fb6279e420cdb1183f47 https://github.com/facebook/proxygen/commit/f288d8b36d4434d6922a017acfe816c4842b9f56 https://github.com/facebook/wangle/commit/958cdc341850137fb87f667d99fb8b8e45cc125d https://github.com/facebookexperimental/edencommon/commit/c3089a56e96e44634aef2729c619c4a4aaa9a096 https://github.com/facebookexperimental/rust-shed/commit/9d41d25ffb1311f027226976cfb8aed4f013a40c https://github.com/facebookincubator/fizz/commit/251c3e76fcfb86d1bc3a046b016e4535bef06e26 Reviewed By: bigfootjon fbshipit-source-id: 4375bd2d3e44e1f34b9cd3054b924ee2cdca428a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a2c37d256040..334bf502d31b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5accdd2f101a8fd7165fd1e5c24e4f1071c22f79 +Subproject commit d1d1b41ce044dc1249bb0fb2a60b79f874096912 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 21452c7363a9..7d64a43d61f5 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit dc875e505b94733bdc07d10990e54f4af5d3110e +Subproject commit 1f3f1ce764f84df884a2096c77c1f4f874e670dc diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7b955bb40dad..521410bd30c8 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6d788d27462aaa176bdaef182c55994632472191 +Subproject commit 958cdc341850137fb87f667d99fb8b8e45cc125d From ec5934068de7e013cb9be8c2a5c47e0ab59aebc4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 7 Aug 2024 09:31:26 -0700 Subject: [PATCH 7086/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/4f6b9c91b5209601be1470c2c255a6d5b951fcd7 https://github.com/facebook/fb303/commit/bd9cebec78fe7caae632e1f8a1213c17c7522a03 https://github.com/facebook/fbthrift/commit/bcf7c6331a8239751e1e80ba3609a62c0f51fcfe https://github.com/facebook/mvfst/commit/75cfad403332445492f732fc1c4eaf9ed6e61d5f https://github.com/facebook/proxygen/commit/25a75aebbe078f1ef3739ecfa661cc446e545633 https://github.com/facebook/wangle/commit/65295f86d11433e279ed04d899c9e4f5bf93c4d7 https://github.com/facebookexperimental/edencommon/commit/6f01114fca2a3a6a7ec5df7b425e4bb6c70f0595 https://github.com/facebookexperimental/rust-shed/commit/2fb9a933a8431e286cd55b53b3c62fc1af2a5544 https://github.com/facebookincubator/fizz/commit/58ec52953465cce6435ef3a081256b195da49de8 fbshipit-source-id: 79162bfbf0eec5c3e114c51bfaf33604cad0dd98 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 334bf502d31b..b5814a818144 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d1d1b41ce044dc1249bb0fb2a60b79f874096912 +Subproject commit bcf7c6331a8239751e1e80ba3609a62c0f51fcfe diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 521410bd30c8..87b143b0b13d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 958cdc341850137fb87f667d99fb8b8e45cc125d +Subproject commit 65295f86d11433e279ed04d899c9e4f5bf93c4d7 From a1a724db2944d3138c744fd0abb8e0651958350d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 8 Aug 2024 09:31:32 -0700 Subject: [PATCH 7087/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/42db6f0bc0a9f8ab0a5a5aaeecceae2ed67bfbdc https://github.com/facebook/fb303/commit/5d2fc377f65b1bd156c98fbb0ea13dedfd192bdf https://github.com/facebook/fbthrift/commit/db1d2327fe1c71b28f4b31eb261afac7dd1ca275 https://github.com/facebook/folly/commit/ae584b841dda5c54739e240cd85ce3cb6a61849e https://github.com/facebook/mvfst/commit/b51ee879958f4b593cae76a84dd0e26d4234f75b https://github.com/facebook/proxygen/commit/6b918de7f8e8316a042b8aca567a3d5a0d121cdb https://github.com/facebook/wangle/commit/59568815fc3828b75b3bbf1c30d80497009eec5a https://github.com/facebookexperimental/rust-shed/commit/4d33fa82e653a5213b52e8374381f5f8db49ef02 https://github.com/facebookincubator/fizz/commit/dc059ebf1b2b05ed63f6db797d2d2769ae6a954c Reviewed By: bigfootjon fbshipit-source-id: a5da89e0ddb30e0e9a8d1e92bd818376a1a304a0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b5814a818144..0453251076d9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bcf7c6331a8239751e1e80ba3609a62c0f51fcfe +Subproject commit db1d2327fe1c71b28f4b31eb261afac7dd1ca275 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7d64a43d61f5..ce3ad3c139e5 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1f3f1ce764f84df884a2096c77c1f4f874e670dc +Subproject commit ae584b841dda5c54739e240cd85ce3cb6a61849e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 87b143b0b13d..c2bf2571457e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 65295f86d11433e279ed04d899c9e4f5bf93c4d7 +Subproject commit 59568815fc3828b75b3bbf1c30d80497009eec5a From 65aefce9365feb4f4a669ebad4581e894dea1e52 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Thu, 8 Aug 2024 11:26:34 -0700 Subject: [PATCH 7088/7387] Define expected cfgs for Cargo builds Summary: Context: see https://blog.rust-lang.org/2024/07/25/Rust-1.80.0.html#checked-cfg-names-and-values Example occurrences: ```lang=text,counterexample error: unexpected `cfg` condition name: `buck2_build` --> app/buck2_protoc_dev/src/lib.rs:16:11 | 16 | #[cfg(not(buck2_build))] | ^^^^^^^^^^^ | = help: expected names are: `clippy`, `debug_assertions`, `doc`, `docsrs`, `doctest`, `feature`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `rustfmt`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, and `windows` = help: consider using a Cargo feature instead = help: or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint: [lints.rust] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(buck2_build)'] } = help: or consider adding `println!("cargo::rustc-check-cfg=cfg(buck2_build)");` to the top of the `build.rs` = note: see for more information about checking conditional configuration = note: requested on the command line with `-D unexpected-cfgs` error: unexpected `cfg` condition name: `buck2_build` --> app/buck2_protoc_dev/src/lib.rs:24:11 | 24 | #[cfg(not(buck2_build))] | ^^^^^^^^^^^ | = help: consider using a Cargo feature instead = help: or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint: [lints.rust] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(buck2_build)'] } = help: or consider adding `println!("cargo::rustc-check-cfg=cfg(buck2_build)");` to the top of the `build.rs` = note: see for more information about checking conditional configuration ``` Reviewed By: shayne-fletcher Differential Revision: D60933080 fbshipit-source-id: 8e198df0147b0141ed1c54cb04130757a3a0d771 --- watchman/rust/serde_bser/Cargo.toml | 3 +++ watchman/rust/watchman_client/Cargo.toml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/watchman/rust/serde_bser/Cargo.toml b/watchman/rust/serde_bser/Cargo.toml index 398f5fad89f3..a1bcb982e14c 100644 --- a/watchman/rust/serde_bser/Cargo.toml +++ b/watchman/rust/serde_bser/Cargo.toml @@ -22,3 +22,6 @@ maplit = "1.0" [features] debug_bytes = [] default = [] + +[lints.rust] +unexpected_cfgs = { level = "warn", check-cfg = ["cfg(fbcode_build)"] } diff --git a/watchman/rust/watchman_client/Cargo.toml b/watchman/rust/watchman_client/Cargo.toml index 6549b635d59a..0278749c8f3e 100644 --- a/watchman/rust/watchman_client/Cargo.toml +++ b/watchman/rust/watchman_client/Cargo.toml @@ -25,3 +25,6 @@ winapi = { version = "0.3", features = ["fileapi", "handleapi", "winbase", "winu [dev-dependencies] clap = { version = "4.5.7", features = ["derive"] } + +[lints.rust] +unexpected_cfgs = { level = "warn", check-cfg = ["cfg(fbcode_build)"] } From 3a0f17e2f3e96ad0590fd2e3eb6ad74a84b208b1 Mon Sep 17 00:00:00 2001 From: generatedunixname89002005307016 Date: Fri, 9 Aug 2024 02:14:03 -0700 Subject: [PATCH 7089/7387] upgrade pyre version in `fbcode/watchman` - batch 1 Differential Revision: D60993882 fbshipit-source-id: d23d82951945f8573fbc6fd83727671c5d70f689 --- watchman/integration/lib/WatchmanTestCase.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/watchman/integration/lib/WatchmanTestCase.py b/watchman/integration/lib/WatchmanTestCase.py index c0a5de7d405f..7e7ee84c0397 100644 --- a/watchman/integration/lib/WatchmanTestCase.py +++ b/watchman/integration/lib/WatchmanTestCase.py @@ -83,11 +83,14 @@ def mktemp(self, prefix: str = "") -> str: return name -# pyre-ignore[13]: `WatchmanTestCase` has no attribute `transport`. class WatchmanTestCase(TempDirPerTestMixin, unittest.TestCase): + # pyre-fixme[13]: Attribute `transport` is never initialized. transport: str + # pyre-fixme[13]: Attribute `encoding` is never initialized. encoding: str + # pyre-fixme[13]: Attribute `parallelCrawl` is never initialized. parallelCrawl: bool + # pyre-fixme[13]: Attribute `splitWatcher` is never initialized. splitWatcher: bool def __init__(self, methodName: str = "run") -> None: From ae6485726453d9ed5c7d3771d83a89ddd0518ff4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 9 Aug 2024 09:30:40 -0700 Subject: [PATCH 7090/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/9532d5b85a05d7e1bf3d3e2c5f5b7178e1cf5303 https://github.com/facebook/fb303/commit/280b17b301faa4ca5e7e9bba6f14df4593d57a94 https://github.com/facebook/fbthrift/commit/d7b808ce55e6d52cd4bf06b919d26ad8a8bea44a https://github.com/facebook/folly/commit/5c229c6af28138fc35a5c38b17b2b4f6702fe6b4 https://github.com/facebook/mvfst/commit/35313733e543b8b8fe62bd2cfb2493ca8ebcf156 https://github.com/facebook/proxygen/commit/3f31f4985b67d49610626f183b76212dca975e28 https://github.com/facebook/wangle/commit/e761fe3dac8a45252729a7a1291c4530520f17fd https://github.com/facebookexperimental/edencommon/commit/e052d5f00bfc6d9eb371fe234ab78998b0b4b799 https://github.com/facebookexperimental/rust-shed/commit/c5a81a98131ff87d7a6c48dfd0c21192d65af0af https://github.com/facebookincubator/fizz/commit/00b82cbe8c1a403839c11e055d85e12a12f415d4 Reviewed By: bigfootjon fbshipit-source-id: dc0709e806174ada1c6e29d009539233c6b1680f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0453251076d9..9f71b5de2f54 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit db1d2327fe1c71b28f4b31eb261afac7dd1ca275 +Subproject commit d7b808ce55e6d52cd4bf06b919d26ad8a8bea44a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ce3ad3c139e5..3c0d52ccdeed 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ae584b841dda5c54739e240cd85ce3cb6a61849e +Subproject commit 5c229c6af28138fc35a5c38b17b2b4f6702fe6b4 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c2bf2571457e..2c6068f3f72f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 59568815fc3828b75b3bbf1c30d80497009eec5a +Subproject commit e761fe3dac8a45252729a7a1291c4530520f17fd From 4db736826e7bb6dab4fba47b2712079533900ba6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 10 Aug 2024 09:31:49 -0700 Subject: [PATCH 7091/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/bf830ede594304dcf0cc1de6fe832aa7e03d8d14 https://github.com/facebook/fb303/commit/6b54d77123343daaf228e46fb8433a7d42d4a49a https://github.com/facebook/fbthrift/commit/7c5ed63df36afd39284a9b7d2a2808ae98ce8be9 https://github.com/facebook/folly/commit/b3d25a4375d3c439b1b807fcadb2e9cf5cda73f9 https://github.com/facebook/mvfst/commit/a84708be4bd658ab918319913277e5b3a6ecfce7 https://github.com/facebook/proxygen/commit/300923041d1cc850fb54e63a5e4abb9f36770713 https://github.com/facebook/wangle/commit/8ee49211e569e5cf24a828af5d6f99f738fbeee9 https://github.com/facebookexperimental/edencommon/commit/5444270ee4b1aafd20474f731bbdf535abea2abb https://github.com/facebookexperimental/rust-shed/commit/a6f99ffdc8bc5984724a27d5276076d518350f7f https://github.com/facebookincubator/fizz/commit/3a6b21c743802348dd690994a5248a0a83145c2c Reviewed By: bigfootjon fbshipit-source-id: 9f15a892cfd99714e6ac5a73080b45964a2d980e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9f71b5de2f54..0bddc1fd47ef 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d7b808ce55e6d52cd4bf06b919d26ad8a8bea44a +Subproject commit 7c5ed63df36afd39284a9b7d2a2808ae98ce8be9 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 3c0d52ccdeed..6521dd23a0a1 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 5c229c6af28138fc35a5c38b17b2b4f6702fe6b4 +Subproject commit b3d25a4375d3c439b1b807fcadb2e9cf5cda73f9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2c6068f3f72f..240fc1bd53bd 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e761fe3dac8a45252729a7a1291c4530520f17fd +Subproject commit 8ee49211e569e5cf24a828af5d6f99f738fbeee9 From 5c265fd60f4b91ff1a9465ae316cb68965204a8e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 11 Aug 2024 09:31:07 -0700 Subject: [PATCH 7092/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/d7aad0a3af85a6b44c17691e830d109755168e5c https://github.com/facebook/fbthrift/commit/d00edb4f283cbc92d2d702e9778d6a51b23e88fa https://github.com/facebook/mvfst/commit/33e8aa952bd7601b1854f97889e94daa4257455e https://github.com/facebook/proxygen/commit/3668ceee0e7de290fe2710ec4a6a67cdc590e09a https://github.com/facebook/wangle/commit/95463431d9ece07949d47c5820a8fd439b273d1f https://github.com/facebookexperimental/edencommon/commit/987a97489fcbf6dbe595197383de6efe5309ee97 https://github.com/facebookexperimental/rust-shed/commit/634b260764176e69495765f01f4ab1fdee1e4af0 https://github.com/facebookincubator/fizz/commit/6cdbc72bd2be242d3d10a3e758bc7ad263d7aa25 Reviewed By: bigfootjon fbshipit-source-id: 1dcc385b0c7d1174b69e70a45489325ce7e8b95e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0bddc1fd47ef..5df3a0c1e832 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7c5ed63df36afd39284a9b7d2a2808ae98ce8be9 +Subproject commit d00edb4f283cbc92d2d702e9778d6a51b23e88fa diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 240fc1bd53bd..d43e6fb91718 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8ee49211e569e5cf24a828af5d6f99f738fbeee9 +Subproject commit 95463431d9ece07949d47c5820a8fd439b273d1f From 5d3b7b4929780b7b3b721aa31751496132a1a976 Mon Sep 17 00:00:00 2001 From: Saul Gutierrez Date: Mon, 12 Aug 2024 06:00:18 -0700 Subject: [PATCH 7093/7387] progress: add a thrift Entry point for reporting progress Summary: surprise_tool Reviewed By: kmancini Differential Revision: D60385450 fbshipit-source-id: e935609cebf7969a84ad88d625283b1c5933752b --- eden/fs/service/eden.thrift | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 39ba2be329a5..1f7106339d1c 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1683,6 +1683,21 @@ struct GetBlockedFaultsResponse { 1: list keyValues; } +struct CheckoutProgressInfo { + 1: i64 updatedInodes; +} + +struct CheckoutNotInProgress {} + +struct CheckoutProgressInfoRequest { + 1: PathString mountPoint; +} + +union CheckoutProgressInfoResponse { + 1: CheckoutProgressInfo checkoutProgressInfo; + 2: CheckoutNotInProgress noProgress; +} + service EdenService extends fb303_core.BaseService { list listMounts() throws (1: EdenError ex); void mount(1: MountArgument info) throws (1: EdenError ex); @@ -1719,6 +1734,16 @@ service EdenService extends fb303_core.BaseService { 4: CheckOutRevisionParams params, ) throws (1: EdenError ex); + /** + * Given an Eden mount point returns progress for the checkOutRevision end + * point. When a checkout is not in progress it returns CheckoutNotInProgress + * + * It errors out when no valid mountPoint is provided. + */ + CheckoutProgressInfoResponse getCheckoutProgressInfo( + 1: CheckoutProgressInfoRequest params, + ) throws (1: EdenError ex); + /** * Reset the working directory's parent commits, without changing the working * directory contents. From cc5fdbb68ef4b109dd265f6382e5310f397cf58c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 12 Aug 2024 09:32:52 -0700 Subject: [PATCH 7094/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/12cb6228e1eb74fee80a347ea3e223a8a5db7b9e https://github.com/facebook/fb303/commit/65e52b01c62e091d792bfc24d8495cbb2551ecd9 https://github.com/facebook/fbthrift/commit/bf6f866e2f4ce7adb35b99c6c126720cd9e2b095 https://github.com/facebook/folly/commit/c5aa5c46291a27f69acc920894d43605ceb43eba https://github.com/facebook/mvfst/commit/56b8e5d775dcd181b58a2114a06018fd3f1e6b75 https://github.com/facebook/proxygen/commit/9987143bf2c8ba51a8ad9215b1a8437ac724964c https://github.com/facebook/wangle/commit/fbbf2567a8d402e4373b4ce56b73caee5ac66128 https://github.com/facebookexperimental/rust-shed/commit/d16d7262429a1a52a35cbdde3cd4d55b949df706 https://github.com/facebookincubator/fizz/commit/f7c5fe7224d7a55a7ccc055d1c9996bb74a27e35 Reviewed By: bigfootjon fbshipit-source-id: 27a78131f323d2e7ca60a4b2b700c8c3eb8a552f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5df3a0c1e832..e822f227fe8f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d00edb4f283cbc92d2d702e9778d6a51b23e88fa +Subproject commit bf6f866e2f4ce7adb35b99c6c126720cd9e2b095 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6521dd23a0a1..6d8f7bd7fc4f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b3d25a4375d3c439b1b807fcadb2e9cf5cda73f9 +Subproject commit c5aa5c46291a27f69acc920894d43605ceb43eba diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d43e6fb91718..37de798bbb96 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 95463431d9ece07949d47c5820a8fd439b273d1f +Subproject commit fbbf2567a8d402e4373b4ce56b73caee5ac66128 From 8eb9eaf4f1de7e923515d6c6e761d7b41f5eae03 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 13 Aug 2024 09:32:36 -0700 Subject: [PATCH 7095/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/ca3eee1198fec59f79572a57d5f133af5ae69934 https://github.com/facebook/fb303/commit/5dc6f2d755af77084523101d8bb48c59a967103b https://github.com/facebook/fbthrift/commit/45ccdae1b19bfaabe82b8615c9c93cc1ee3e8b0e https://github.com/facebook/folly/commit/4bab8ad887268d5ebaae5defccf83e8e106031f6 https://github.com/facebook/mvfst/commit/2f7b7ff6d6108f5e837865955d2562af6913958e https://github.com/facebook/proxygen/commit/da4a0f5d0cf02a4eab896566db588d6e1dac13a8 https://github.com/facebook/wangle/commit/e22047b13afa9b068b894e1d43296fd75b9ac920 https://github.com/facebookexperimental/edencommon/commit/00cd262982d32d970f56d3423a337ae882a1880a https://github.com/facebookexperimental/rust-shed/commit/3d6bc1e0ae3edd5406051b701c331834ab94c80d https://github.com/facebookincubator/fizz/commit/d4cd807d8e1ac3e21bd0b2c4c3e7fc6a265fc065 Reviewed By: zpao fbshipit-source-id: 8df80ba83dc828058423642b46210388f307acee --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e822f227fe8f..311152e30803 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bf6f866e2f4ce7adb35b99c6c126720cd9e2b095 +Subproject commit 45ccdae1b19bfaabe82b8615c9c93cc1ee3e8b0e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 6d8f7bd7fc4f..cf559ca151c7 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c5aa5c46291a27f69acc920894d43605ceb43eba +Subproject commit 4bab8ad887268d5ebaae5defccf83e8e106031f6 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 37de798bbb96..36699fb89768 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit fbbf2567a8d402e4373b4ce56b73caee5ac66128 +Subproject commit e22047b13afa9b068b894e1d43296fd75b9ac920 From a04338dc51edcc765c9aaae6e8b9f9d0d95a53e8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 14 Aug 2024 09:32:59 -0700 Subject: [PATCH 7096/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/b3ba9deea786b38cc61fe53eca9ff37a0dd858c4 https://github.com/facebook/fb303/commit/88f9a1f83ed9e625c4bd50f5821bffd30619fae3 https://github.com/facebook/fbthrift/commit/8296c416d7fa2f4c1aa2de19713b7f8c6fcbe552 https://github.com/facebook/folly/commit/475b862fdb1aeeb78e13d8b27aec37ead95267ae https://github.com/facebook/mvfst/commit/50d641deb7a3ff8cfcd7426c7479ca5afbd2bca3 https://github.com/facebook/proxygen/commit/a5251dc991aed8ce0e13d29332719340ef180e52 https://github.com/facebook/wangle/commit/b24486b184c08420bdd483ea868d1922470d312e https://github.com/facebookexperimental/edencommon/commit/1101bf44ca211b19b3fe80f4cfdc73c66f7588bf https://github.com/facebookexperimental/rust-shed/commit/814b4ea1d9e42811753d3ed69f48b60fa5b71c95 https://github.com/facebookincubator/fizz/commit/6e2a75d5445ecac489cafde57972f8784caa82f1 Reviewed By: zpao fbshipit-source-id: ad0a059fb49f4c41bb47eff7b9c2e007ba2e8042 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 311152e30803..199f1aca11d9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 45ccdae1b19bfaabe82b8615c9c93cc1ee3e8b0e +Subproject commit 8296c416d7fa2f4c1aa2de19713b7f8c6fcbe552 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index cf559ca151c7..fdbd51a8f526 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 4bab8ad887268d5ebaae5defccf83e8e106031f6 +Subproject commit 475b862fdb1aeeb78e13d8b27aec37ead95267ae diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 36699fb89768..df512d3c2f9f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e22047b13afa9b068b894e1d43296fd75b9ac920 +Subproject commit b24486b184c08420bdd483ea868d1922470d312e From d5af7c157e3547c23a2398f995b06bb4b049558b Mon Sep 17 00:00:00 2001 From: Scott Smith Date: Wed, 14 Aug 2024 16:27:37 -0700 Subject: [PATCH 7097/7387] libgpiod Summary: X-link: https://github.com/facebookincubator/zstrong/pull/949 libgpiod is used by GpioLine.cpp but has never been needed in OSS before, adding this library to the CMake manifests to enable that. Reviewed By: paulcruz74 Differential Revision: D60934748 fbshipit-source-id: 8c705b3ffd3eb611ef96a3df95bbb7d70dd7f86d --- build/fbcode_builder/manifests/libgpiod | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 build/fbcode_builder/manifests/libgpiod diff --git a/build/fbcode_builder/manifests/libgpiod b/build/fbcode_builder/manifests/libgpiod new file mode 100644 index 000000000000..24f7dd675309 --- /dev/null +++ b/build/fbcode_builder/manifests/libgpiod @@ -0,0 +1,10 @@ +[manifest] +name = libgpiod + +[download] +url = https://cdn.kernel.org/pub/software/libs/libgpiod/libgpiod-1.6.tar.xz +sha256 = 62908023d59e8cbb9137ddd14deec50ced862d8f9b8749f288d3dbe7967151ef + +[build] +builder = autoconf +subdir = libgpiod-1.6 From 18b835477de994d925a1da5195d5b919c8ee1194 Mon Sep 17 00:00:00 2001 From: Scott Smith Date: Wed, 14 Aug 2024 16:27:37 -0700 Subject: [PATCH 7098/7387] GPIO Presence Detection Summary: X-link: https://github.com/facebookincubator/zstrong/pull/950 Adds the ability to use GPIO lines for presence detection. Utilizes the GpioLine library from fboss lib. Reviewed By: kimdo8736 Differential Revision: D60946559 fbshipit-source-id: ce52d96e8cdcb1aa3e0bb385f1ef502185aaa33f --- build/fbcode_builder/manifests/fboss | 1 + 1 file changed, 1 insertion(+) diff --git a/build/fbcode_builder/manifests/fboss b/build/fbcode_builder/manifests/fboss index 8bcd1cb110c9..ce9b36109e22 100644 --- a/build/fbcode_builder/manifests/fboss +++ b/build/fbcode_builder/manifests/fboss @@ -38,6 +38,7 @@ libyaml CLI11 exprtk nlohmann-json +libgpiod [shipit.pathmap] fbcode/fboss/github = . From d0529e8b9e74b7485f0a5d06402e20268a31d0ad Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 15 Aug 2024 09:31:18 -0700 Subject: [PATCH 7099/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/2e3216ee0f5dc6b78c7532ea006d97b66492cb44 https://github.com/facebook/fb303/commit/b9f37643b2fe004a7751bc96053188c1901cdc5d https://github.com/facebook/fbthrift/commit/5aedc9a0d40714718c313824cbcca0ec09b7fa3f https://github.com/facebook/folly/commit/47d9798523334115a58a9f82a8f27751f7695f43 https://github.com/facebook/mvfst/commit/bc386475e5c375c3cf4f6379b314ae6fa2571623 https://github.com/facebook/proxygen/commit/520c30b19cb3c4036937e0d71a8b436ac73016c7 https://github.com/facebook/wangle/commit/def136cbec03f2f52a59cdfda330cc9dff3a58dd https://github.com/facebookexperimental/edencommon/commit/518260dd218618b117dc5c4826b97e8fd2c6056d https://github.com/facebookexperimental/rust-shed/commit/1046243359f74dfb12925640a7d34e803d59054c https://github.com/facebookincubator/fizz/commit/861a4533ecbfaa994b01ad34d176f7440d610303 Reviewed By: zpao fbshipit-source-id: fb8e4d7bc05450ac11d87c491b71519e6d926f1c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 199f1aca11d9..5266da2b787b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8296c416d7fa2f4c1aa2de19713b7f8c6fcbe552 +Subproject commit 5aedc9a0d40714718c313824cbcca0ec09b7fa3f diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index fdbd51a8f526..7e07c1c80a14 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 475b862fdb1aeeb78e13d8b27aec37ead95267ae +Subproject commit 47d9798523334115a58a9f82a8f27751f7695f43 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index df512d3c2f9f..27d4bd35e764 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b24486b184c08420bdd483ea868d1922470d312e +Subproject commit def136cbec03f2f52a59cdfda330cc9dff3a58dd From 9e59b10504b50bb3007dfd6122fa8e7d250c8baf Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 16 Aug 2024 09:31:20 -0700 Subject: [PATCH 7100/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/1b94ead30d2f6ec83ec00b001deff3a1f2a2efef https://github.com/facebook/fb303/commit/fd570a18eedc782214db60c59cbc3a3347f2cfac https://github.com/facebook/fbthrift/commit/65946a2a753ac8b53063d61e759a88f7b65a481a https://github.com/facebook/folly/commit/10dfe0db3ba6949573e5e6dccc7f5bb2793d43ad https://github.com/facebook/mvfst/commit/3277f2389d68eb7d189e74d9078bfdd794dc6f7c https://github.com/facebook/proxygen/commit/0080618294fb886cedf305b53488bcc0c643c6a3 https://github.com/facebook/wangle/commit/e2fc511b6d5ba46d956a2ed060e91d84b6fbfb8e https://github.com/facebookexperimental/edencommon/commit/7e960b9b7de7111df3173af1dce17e8528a5ff9e https://github.com/facebookexperimental/rust-shed/commit/e21667600ff4df9b19f9494e3b46e05eaf4fb9a5 https://github.com/facebookincubator/fizz/commit/15056ef752a9b8dc3043641ab5f1d8e09b87953e Reviewed By: zpao fbshipit-source-id: 9d33e9a745397756791c4afdd85647c88a05bc9d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5266da2b787b..42f93be4b546 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5aedc9a0d40714718c313824cbcca0ec09b7fa3f +Subproject commit 65946a2a753ac8b53063d61e759a88f7b65a481a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7e07c1c80a14..f570810039d5 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 47d9798523334115a58a9f82a8f27751f7695f43 +Subproject commit 10dfe0db3ba6949573e5e6dccc7f5bb2793d43ad diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 27d4bd35e764..0ac3f23ccc5c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit def136cbec03f2f52a59cdfda330cc9dff3a58dd +Subproject commit e2fc511b6d5ba46d956a2ed060e91d84b6fbfb8e From 4ab86834e51989abd6311a1aab732efbbb456f65 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 17 Aug 2024 09:30:30 -0700 Subject: [PATCH 7101/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/1a4bffce6b5afc602e5bf70ea3b22690e6b2c803 https://github.com/facebook/fb303/commit/f3b9d842b52fc67e2283a653fdb9a5400a814b43 https://github.com/facebook/fbthrift/commit/952a4a91c9c980ea612c9e5ce05ac11e5738f76f https://github.com/facebook/folly/commit/a2aae6d3fbff68a416b1c9e6b1f3a9906e899ca1 https://github.com/facebook/mvfst/commit/355c664b27e10643b074d86632c36aa8eecd383a https://github.com/facebook/proxygen/commit/bc3da9850211102ecaaed5c6e355d3c4a2eac49e https://github.com/facebook/wangle/commit/ca9975b7095ccbf05439f8d97750dea9d4285330 https://github.com/facebookexperimental/edencommon/commit/954e260656460182801e6a2b5b20ccfd6092537a https://github.com/facebookexperimental/rust-shed/commit/328035fa4ebb88713216de4e1503c7cc11f9357b https://github.com/facebookincubator/fizz/commit/30dd5ba3a9431d6fed0cb3bc81aa032ffbf59f5c Reviewed By: zpao fbshipit-source-id: 46b1af7ab1b825d89a56f8fd43a41d058ead8514 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 42f93be4b546..42f875170887 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 65946a2a753ac8b53063d61e759a88f7b65a481a +Subproject commit 952a4a91c9c980ea612c9e5ce05ac11e5738f76f diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f570810039d5..9d0cf3eabc80 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 10dfe0db3ba6949573e5e6dccc7f5bb2793d43ad +Subproject commit a2aae6d3fbff68a416b1c9e6b1f3a9906e899ca1 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0ac3f23ccc5c..fbb351b233e5 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e2fc511b6d5ba46d956a2ed060e91d84b6fbfb8e +Subproject commit ca9975b7095ccbf05439f8d97750dea9d4285330 From e1c9d1da1ec6bb3ba3011b5f3631f933ebaffc82 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 18 Aug 2024 09:32:01 -0700 Subject: [PATCH 7102/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/91884fdd8856a5d0307dade315e7c90bd4ef5ed2 https://github.com/facebook/fbthrift/commit/ed28cf369ed720eba7ac6e8eca0679a67a123828 https://github.com/facebook/folly/commit/31a4de6e9b8d81314b5a21e09154c867171810f6 https://github.com/facebook/mvfst/commit/22ed07350dd1fd1279e676fdb5a1d59b463bdc97 https://github.com/facebook/proxygen/commit/eeb1384618a4ed53f8d5b5542371c4f28b6e5fd7 https://github.com/facebook/wangle/commit/9d2cb81e27dd883877983c812b28ad73a8c5974e https://github.com/facebookexperimental/edencommon/commit/6ce07c4af157f245cd72a9901f60268e9f355f0e https://github.com/facebookexperimental/rust-shed/commit/83d7326755b78dadd56a7017affd5c767f8187b7 https://github.com/facebookincubator/fizz/commit/942c031854ae37875c6918d0036c15013f3ede60 Reviewed By: zpao fbshipit-source-id: 6a5daa7c4434e6a7bc5b6bd41e21140ead3d747d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 42f875170887..f67cb0d7db40 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 952a4a91c9c980ea612c9e5ce05ac11e5738f76f +Subproject commit ed28cf369ed720eba7ac6e8eca0679a67a123828 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9d0cf3eabc80..468e0b558128 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a2aae6d3fbff68a416b1c9e6b1f3a9906e899ca1 +Subproject commit 31a4de6e9b8d81314b5a21e09154c867171810f6 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index fbb351b233e5..5db73b2f1e41 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ca9975b7095ccbf05439f8d97750dea9d4285330 +Subproject commit 9d2cb81e27dd883877983c812b28ad73a8c5974e From fe4f290fa4bf16f1f6f0b0a254aedd819f63838f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 19 Aug 2024 09:32:10 -0700 Subject: [PATCH 7103/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/78df6788ccb7e3f19524a3bc3ec7cc00a1b40c1f https://github.com/facebook/fb303/commit/b3f7596abea38e28f59a152922f93576377a37e2 https://github.com/facebook/fbthrift/commit/a591631fe1e77459e71fab018f0c1b326a2f4c26 https://github.com/facebook/mvfst/commit/84363ea282a6938930c842e34d23c138327ad0c9 https://github.com/facebook/proxygen/commit/91e0a672b2fde5bcd4588af17c4170b849b338c4 https://github.com/facebook/wangle/commit/26b29a8b7baa14e63b1145138a5741806a14b948 https://github.com/facebookexperimental/edencommon/commit/1adedfbad29504556462129eb9d4eaad74b6e18f https://github.com/facebookexperimental/rust-shed/commit/35eb2e94fab4ff70e5d21418a89baa489b428e6f https://github.com/facebookincubator/fizz/commit/dc5a257cd3e5291aa1c569b850033210d1e1677e Reviewed By: zpao fbshipit-source-id: 9b9a2f0552fdaa8ab25f02b77ea43e8ef3db1201 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f67cb0d7db40..aa6e6c48586f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ed28cf369ed720eba7ac6e8eca0679a67a123828 +Subproject commit a591631fe1e77459e71fab018f0c1b326a2f4c26 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5db73b2f1e41..fa3263494bfb 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9d2cb81e27dd883877983c812b28ad73a8c5974e +Subproject commit 26b29a8b7baa14e63b1145138a5741806a14b948 From 5f95105b3be316df9b77e4672885f9150d3a9c86 Mon Sep 17 00:00:00 2001 From: Simon Krueger Date: Mon, 19 Aug 2024 10:20:54 -0700 Subject: [PATCH 7104/7387] Add string to double parsing benchmarks Summary: This benchmarks various functions that convert decimal values in string representation to IEEE-754 double representation. These benchmarks `std::strtof`, `std::strtof` with a copy (needed for non-c-strings), `std::strtofl` with the C locale (for locale-indepent processing), `std::from_chars`, libdouble-conversion, and libfast_float. The functions are benchmarked on different inputs. There is input that is hardcoded values in decimal and exponentional notation. There is randomly generated values in the double space range. There is also inputs for single and double digit ints. As well as percentages. Note that `std::from_chars`, which on platform010/libstdc++ v11 uses `strtof` + `uselocale` [0]. libstdc++ v12 uses fast float[2]. 0: https://github.com/gcc-mirror/gcc/commit/932fbc868ad429167a3d4d5625aa9d6dc0b4506b 1: https://github.com/gcc-mirror/gcc/commit/490e23032baaece71f2ec09fa1805064b150fbc2#diff-d3c32d9c9c566f7f3888d150c6448428ea194170146a1a166917ba45b1252187 Reviewed By: yfeldblum, Orvid Differential Revision: D61356955 fbshipit-source-id: 6ec21b602b08505d946551dda49a35402bee7dae --- build/fbcode_builder/manifests/fast_float | 20 ++++++++++++++++++++ build/fbcode_builder/manifests/folly | 1 + 2 files changed, 21 insertions(+) create mode 100644 build/fbcode_builder/manifests/fast_float diff --git a/build/fbcode_builder/manifests/fast_float b/build/fbcode_builder/manifests/fast_float new file mode 100644 index 000000000000..f91401de3f4a --- /dev/null +++ b/build/fbcode_builder/manifests/fast_float @@ -0,0 +1,20 @@ +[manifest] +name = fast_float + +[download] +url = https://github.com/fastfloat/fast_float/archive/refs/tags/v2.0.0.tar.gz +sha256 = 5d528ec20811577c5f2b2873528c085c500fdcd2b2c0901450509a71de5f1fa4 + +[build] +builder = cmake +subdir = fast_float-2.0.0 + +[cmake.defines] +FASTFLOAT_TEST = OFF +FASTFLOAT_SANITIZE = OFF + +[debs] +libfast-float-dev + +[rpms.distro=fedora] +fast_float-devel diff --git a/build/fbcode_builder/manifests/folly b/build/fbcode_builder/manifests/folly index 5fc5297f942a..e8bc7d4828c1 100644 --- a/build/fbcode_builder/manifests/folly +++ b/build/fbcode_builder/manifests/folly @@ -20,6 +20,7 @@ libdwarf libevent libsodium double-conversion +fast_float fmt lz4 snappy From 585d307b576353d72bc03bf3f158f425601428ed Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 20 Aug 2024 09:31:35 -0700 Subject: [PATCH 7105/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/b5adb8aaa923da02cca09b4feba903e251edc914 https://github.com/facebook/fb303/commit/5d0f494734df3b5d400de84d3b6502a35d0142eb https://github.com/facebook/fbthrift/commit/8d5f0d19fac802b46b34477fdf10f5a64f0a0541 https://github.com/facebook/folly/commit/9ff5005d2102c75a2bb92fbef4a2b0d884f7da5b https://github.com/facebook/mvfst/commit/8fb4204d71c91ae3c9a383379e9fa27912294f53 https://github.com/facebook/proxygen/commit/ec135fe15a969411df5cb44afcd2bab173fc4d26 https://github.com/facebook/wangle/commit/670a6da4ccc05af666972e69e94b2e358e74fad2 https://github.com/facebookexperimental/edencommon/commit/a5b190fe3e4f913ab4be27ae761050fab062ef56 https://github.com/facebookexperimental/rust-shed/commit/5be001d4a8d9b31d2b763d5f14f08895c5bb89d5 https://github.com/facebookincubator/fizz/commit/2c5b748d912d90a9ce133cd56faf4904384d3274 Reviewed By: bigfootjon fbshipit-source-id: 332e25085d24e153b34c183d54a7f73824d8f205 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index aa6e6c48586f..7eb38f45299c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a591631fe1e77459e71fab018f0c1b326a2f4c26 +Subproject commit 8d5f0d19fac802b46b34477fdf10f5a64f0a0541 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 468e0b558128..42ca38ba0b42 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 31a4de6e9b8d81314b5a21e09154c867171810f6 +Subproject commit 9ff5005d2102c75a2bb92fbef4a2b0d884f7da5b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index fa3263494bfb..976bbd3380f9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 26b29a8b7baa14e63b1145138a5741806a14b948 +Subproject commit 670a6da4ccc05af666972e69e94b2e358e74fad2 From ad4da524d78b956f953c3426a49d28fbd3162134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Szab=C3=B3?= Date: Tue, 20 Aug 2024 13:43:12 -0700 Subject: [PATCH 7106/7387] Add fbcode_builder manifests for mcrouter and ragel Summary: X-link: https://github.com/facebookincubator/zstrong/pull/944 https://github.com/facebook/mcrouter currently uses a legacy autotools-based build system, which forces third parties to rely on a collection of scripts hosted in the repository to build it with all required dependencies. This is brittle and has lead to many issue reports about build problems. In https://github.com/facebook/mcrouter/pull/449, I've prepared a working CMake-based build system for mcrouter that could replace the legacy autotools setup. This patch adds the necessary manifests for mcrouter and its ragel dependency so that fbcode_builder itself will be setup for the repo without having to do it in the PR. X-link: https://github.com/facebook/folly/pull/2268 Reviewed By: yfeldblum Differential Revision: D60537337 Pulled By: Orvid fbshipit-source-id: ed73693d4af93acc3b8e996a7c61d0090075949f --- build/fbcode_builder/manifests/mcrouter | 23 +++++++++++++++++++++++ build/fbcode_builder/manifests/ragel | 19 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 build/fbcode_builder/manifests/mcrouter create mode 100644 build/fbcode_builder/manifests/ragel diff --git a/build/fbcode_builder/manifests/mcrouter b/build/fbcode_builder/manifests/mcrouter new file mode 100644 index 000000000000..849e8f75d102 --- /dev/null +++ b/build/fbcode_builder/manifests/mcrouter @@ -0,0 +1,23 @@ +[manifest] +name = mcrouter + +[git] +repo_url = https://github.com/facebook/mcrouter.git + +[dependencies] +folly +wangle +fizz +fbthrift +mvfst +ragel + +[build] +builder = cmake +subdir = . + +[cmake.defines.test=on] +BUILD_TESTS=ON + +[cmake.defines.test=off] +BUILD_TESTS=OFF diff --git a/build/fbcode_builder/manifests/ragel b/build/fbcode_builder/manifests/ragel new file mode 100644 index 000000000000..336a39b20ffd --- /dev/null +++ b/build/fbcode_builder/manifests/ragel @@ -0,0 +1,19 @@ +[manifest] +name = ragel + +[debs] +ragel + +[homebrew] +ragel + +[rpms] +ragel + +[download] +url = https://www.colm.net/files/ragel/ragel-6.10.tar.gz +sha256 = 5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f + +[build] +builder = autoconf +subdir = ragel-6.10 From 30e9d076a1c23250e9a49fac5134186a55386f00 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 21 Aug 2024 09:38:55 -0700 Subject: [PATCH 7107/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/e021801f08db20ef9c4cf00cb248b38503656f07 https://github.com/facebook/fb303/commit/056848f6199950391aedfeb9731ad960cc40f04f https://github.com/facebook/fbthrift/commit/3b011c44813dd0f865dc803fcf965fd5670aa720 https://github.com/facebook/folly/commit/ec50ab1a7d2b1038c0981564aaf724a43b8bf3b4 https://github.com/facebook/mvfst/commit/e5d4ad6c869f5cbfb7d1da413e555599bae21950 https://github.com/facebook/proxygen/commit/ce362e9a73f47c5098aa8021956af34ce7ec12ce https://github.com/facebook/wangle/commit/64f416d4bb8e87ccd030a11d66750502a55d88b3 https://github.com/facebookexperimental/edencommon/commit/b2bc0acf7cf5670ef55d11148b1e061b5badabb1 https://github.com/facebookexperimental/rust-shed/commit/af731c0e42fa2f802636c66b6aaebaa6ab6dd14e https://github.com/facebookincubator/fizz/commit/578f23639607e3682e7bc09606c66824a182c441 Reviewed By: bigfootjon fbshipit-source-id: 2a27dca6f3e30555ad8687c5609f9070b370ff6f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7eb38f45299c..8770a173354b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8d5f0d19fac802b46b34477fdf10f5a64f0a0541 +Subproject commit 3b011c44813dd0f865dc803fcf965fd5670aa720 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 42ca38ba0b42..80c923804816 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9ff5005d2102c75a2bb92fbef4a2b0d884f7da5b +Subproject commit ec50ab1a7d2b1038c0981564aaf724a43b8bf3b4 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 976bbd3380f9..87643d847859 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 670a6da4ccc05af666972e69e94b2e358e74fad2 +Subproject commit 64f416d4bb8e87ccd030a11d66750502a55d88b3 From 76e08643180cf0b5508e4f918c590170ebfed239 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 22 Aug 2024 09:32:05 -0700 Subject: [PATCH 7108/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/e597754ae1d5624cf3068cf17f1605d60608f313 https://github.com/facebook/fb303/commit/1e29581af2b39cd245789cef2dadb13334e9101a https://github.com/facebook/fbthrift/commit/70bcc50feafe6b0889c655d73a7d7821605a471a https://github.com/facebook/folly/commit/98267c70b0dcad3c5b5145972d0a28f6f4644771 https://github.com/facebook/mvfst/commit/52c950293f84a33a2d4bd570a3cc87ba1e3824b7 https://github.com/facebook/proxygen/commit/d662d03687cb627c8f8fc83c4d09febcced841f3 https://github.com/facebook/wangle/commit/92d2767437a791eba614c2020184b92031c8afa7 https://github.com/facebookexperimental/edencommon/commit/f01150cc028f2d6e41298b6df94cb4f3603bcdd8 https://github.com/facebookexperimental/rust-shed/commit/70f142b51120b6a7d34d51ebf5cf527502fd5d56 https://github.com/facebookincubator/fizz/commit/bb1267891379c159f07d298fe0762bae54633280 Reviewed By: bigfootjon fbshipit-source-id: b8b101296c0a06cb2790f3d5ce836e2b04437818 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8770a173354b..52a99cccff8e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3b011c44813dd0f865dc803fcf965fd5670aa720 +Subproject commit 70bcc50feafe6b0889c655d73a7d7821605a471a diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 80c923804816..ce648a8d190e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ec50ab1a7d2b1038c0981564aaf724a43b8bf3b4 +Subproject commit 98267c70b0dcad3c5b5145972d0a28f6f4644771 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 87643d847859..df8cba84bb42 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 64f416d4bb8e87ccd030a11d66750502a55d88b3 +Subproject commit 92d2767437a791eba614c2020184b92031c8afa7 From 75046aaab2474955cd4135bff343849bf0dcff57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Szab=C3=B3?= Date: Thu, 22 Aug 2024 12:00:09 -0700 Subject: [PATCH 7109/7387] Build fast_float from source on Ubuntu < 24.04 Summary: libfast-float-dev only exists on Ubuntu 24.04 and newer, causing build failures on older releases. X-link: https://github.com/facebook/folly/pull/2283 Reviewed By: yfeldblum Differential Revision: D61622213 Pulled By: Orvid fbshipit-source-id: ea683431874d711f8e693b2dd6607cb36f5d8adf --- build/fbcode_builder/manifests/fast_float | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/manifests/fast_float b/build/fbcode_builder/manifests/fast_float index f91401de3f4a..0d18995b7aa4 100644 --- a/build/fbcode_builder/manifests/fast_float +++ b/build/fbcode_builder/manifests/fast_float @@ -13,7 +13,7 @@ subdir = fast_float-2.0.0 FASTFLOAT_TEST = OFF FASTFLOAT_SANITIZE = OFF -[debs] +[debs.not(all(distro=ubuntu,any(distro_vers="18.04",distro_vers="20.04",distro_vers="22.04")))] libfast-float-dev [rpms.distro=fedora] From d4bf5dca0461f891753cebf8c7bf552cf27ebdf9 Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Thu, 22 Aug 2024 13:40:58 -0700 Subject: [PATCH 7110/7387] Return by value instead of reference in ProcessInfoCache Summary: In the next diff we no longer have a valid reference to return. Gonna change this to return by value. The reason is that we are no longer gonna be able to return the value directly from a stored future. We need to have a seperate future that we can block on for each wait call. This means creating a new future for each call. And then returning the value from the newly created future. This means the future we return the value from might get destroyed after the call to this method. Thus the value will outlive the future it's from. There are maybe some things we could do to prevent having to return by value instead of reference. But all the ideas I come up with are quite complicated. This call expects to be "slow" anyways since it blocks waiting for the pid info to be ready. So one extra copy on this path is not bad. There are a few callers of this. We can remve a copy from these and replace them with moves now that the returned value is owned. Callers: - [no update needed] https://www.internalfb.com/code/fbsource/[cc7496c5eba48918a08d7ac091ae154e75f9470e]/fbcode/eden/common/utils/test/ProcessInfoCacheTest.cpp?lines=123%2C131-132%2C135%2C138%2C171%2C201 - [updated] https://www.internalfb.com/code/fbsource/[cc7496c5eba48918a08d7ac091ae154e75f9470e]/fbcode/eden/fs/service/EdenServer.cpp?lines=2517 - [updated] https://www.internalfb.com/code/fbsource/[cc7496c5eba48918a08d7ac091ae154e75f9470e]/fbcode/watchman/Client.cpp?lines=285 - [no update needed] https://www.internalfb.com/code/fbsource/[cc7496c5eba48918a08d7ac091ae154e75f9470e]/fbcode/watchman/main.cpp?lines=117 Reviewed By: MichaelCuevas Differential Revision: D61478484 fbshipit-source-id: fa3f82efb328b37ec7e19355ea835881b74948c2 --- watchman/Client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/Client.cpp b/watchman/Client.cpp index 9820ddf1f570..5c988b305900 100644 --- a/watchman/Client.cpp +++ b/watchman/Client.cpp @@ -282,7 +282,7 @@ ClientDebugStatus UserClient::getDebugStatus() const { rv.peer.emplace(); rv.peer->pid = peerPid_; // May briefly, once, block on the ProcessInfoCache thread. - rv.peer->name = peerInfo_.get().name; + rv.peer->name = std::move(peerInfo_.get().name); } rv.since = std::chrono::system_clock::to_time_t(since_); return rv; From 463d38ce3ab9f1913402360d1b44daad1fe00f11 Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Thu, 22 Aug 2024 13:40:58 -0700 Subject: [PATCH 7111/7387] move client from daemon specific client to generic client Summary: I wanna log the client for all requests so we can get a better understanding of Watchman clients. So I am gonna want the pid for all clients not just daemon clients. Moving the pid into the generic client class (from the daemon client class where it is now) so I can use the pid in all cases. Reviewed By: MichaelCuevas Differential Revision: D61480179 fbshipit-source-id: b9f44209063bae373bf1e1f54b7354dd2f0c791c --- watchman/Client.cpp | 23 ++++++++--------------- watchman/Client.h | 5 +++-- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/watchman/Client.cpp b/watchman/Client.cpp index 5c988b305900..53b5980a5faa 100644 --- a/watchman/Client.cpp +++ b/watchman/Client.cpp @@ -52,7 +52,9 @@ Client::Client(std::unique_ptr stm) #else w_event_make_sockets() #endif - ) { + ), + peerPid_{this->stm->getPeerProcessID()}, + peerInfo_{lookupProcessInfo(peerPid_)} { logf(DBG, "accepted client:stm={}\n", fmt::ptr(this->stm.get())); } @@ -169,8 +171,7 @@ bool Client::dispatchCommand(const Command& command, CommandFlags mode) { if (sample.finish()) { sample.add_meta("args", std::move(rendered)); sample.add_meta( - "client", - json_object({{"pid", json_integer(stm->getPeerProcessID())}})); + "client", json_object({{"pid", json_integer(peerPid_)}})); sample.log(); } @@ -181,7 +182,7 @@ bool Client::dispatchCommand(const Command& command, CommandFlags mode) { dispatchCommand.meta.base.event_count = eventCount != samplingRate ? 0 : eventCount; dispatchCommand.args = renderedString; - dispatchCommand.client_pid = stm->getPeerProcessID(); + dispatchCommand.client_pid = peerPid_; getLogger()->logEvent(dispatchCommand); } @@ -238,10 +239,7 @@ void UserClient::create(std::unique_ptr stm) { } UserClient::UserClient(PrivateBadge, std::unique_ptr stm) - : Client{std::move(stm)}, - since_{std::chrono::system_clock::now()}, - peerPid_{this->stm->getPeerProcessID()}, - peerInfo_{lookupProcessInfo(peerPid_)} { + : Client{std::move(stm)}, since_{std::chrono::system_clock::now()} { clients.wlock()->insert(this); } @@ -321,12 +319,7 @@ void UserClient::clientThread() noexcept { stm->setNonBlock(true); w_set_thread_name( - "client=", - unique_id, - ":stm=", - uintptr_t(stm.get()), - ":pid=", - stm->getPeerProcessID()); + "client=", unique_id, ":stm=", uintptr_t(stm.get()), ":pid=", peerPid_); client_is_owner = stm->peerIsOwner(); @@ -504,7 +497,7 @@ void UserClient::clientThread() noexcept { ":stm=", uintptr_t(stm.get()), ":pid=", - stm->getPeerProcessID()); + peerPid_); } } // namespace watchman diff --git a/watchman/Client.h b/watchman/Client.h index 8a4005bcad83..b217aa18be00 100644 --- a/watchman/Client.h +++ b/watchman/Client.h @@ -68,6 +68,9 @@ class Client : public std::enable_shared_from_this { std::shared_ptr errorSub; protected: + const pid_t peerPid_; + const facebook::eden::ProcessInfoHandle peerInfo_; + void sendErrorResponse(std::string_view formatted); template @@ -239,8 +242,6 @@ class UserClient final : public Client { void clientThread() noexcept; const std::chrono::system_clock::time_point since_; - const pid_t peerPid_; - const facebook::eden::ProcessInfoHandle peerInfo_; ClientStatus status_; }; From da53a36877bfa0005aa3f9b3da783e430cc47216 Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Thu, 22 Aug 2024 13:40:58 -0700 Subject: [PATCH 7112/7387] log client name Summary: As we consider potential future options for Watchman, it's helpful to know who the watchman clients are. And how many requests they are sending us. Adds the command name of the client process so we can keep track of who is calling us. Planning to decrease retention on this column to 1 week, so we don't run out of capacity. Reviewed By: MichaelCuevas Differential Revision: D61480221 fbshipit-source-id: 4b4aa3e44de5b0dbbfe49e753113ab3a92a7e465 --- watchman/Client.cpp | 5 +++++ watchman/telemetry/LogEvent.h | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/watchman/Client.cpp b/watchman/Client.cpp index 53b5980a5faa..4e938991e5fd 100644 --- a/watchman/Client.cpp +++ b/watchman/Client.cpp @@ -183,6 +183,11 @@ bool Client::dispatchCommand(const Command& command, CommandFlags mode) { eventCount != samplingRate ? 0 : eventCount; dispatchCommand.args = renderedString; dispatchCommand.client_pid = peerPid_; + auto processName = peerInfo_.get().name; + std::replace(processName.begin(), processName.end(), '\0', ' '); + auto cleanName = folly::rtrimWhitespace(processName); + dispatchCommand.client_name = cleanName; + getLogger()->logEvent(dispatchCommand); } diff --git a/watchman/telemetry/LogEvent.h b/watchman/telemetry/LogEvent.h index e6c9c6e7013c..51a5fc0092ac 100644 --- a/watchman/telemetry/LogEvent.h +++ b/watchman/telemetry/LogEvent.h @@ -86,6 +86,7 @@ struct DispatchCommand { std::string command; std::string args; pid_t client_pid = 0; + std::string client_name; void populate(DynamicEvent& event) const { meta.populate(event); @@ -96,6 +97,9 @@ struct DispatchCommand { if (client_pid != 0) { event.addInt("client_pid", client_pid); } + if (!client_name.empty()) { + event.addString("client", client_name); + } } }; From 5032aefb70be4c317c575a66456da64ca9e0d1de Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 23 Aug 2024 09:32:50 -0700 Subject: [PATCH 7113/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/4fd779f26793661d070d04a2969396c71ccdff65 https://github.com/facebook/fb303/commit/013ca78b784c7cf5bb03da98fe67c4961e6e688e https://github.com/facebook/fbthrift/commit/1b635114ab549843427353380731e46a2c652658 https://github.com/facebook/folly/commit/dccbd059c84c2a744fbba79b4993e8ce5bf0d4ce https://github.com/facebook/mvfst/commit/d07f3ba9b7ecbfafd4929327a37c53870b6d8f2e https://github.com/facebook/proxygen/commit/b7236d66077bd0175a4eb5cb19f6a9f681549ef1 https://github.com/facebook/wangle/commit/9ffabe45b5c7dd89bf03a6e527c4601675b2f471 https://github.com/facebookexperimental/edencommon/commit/b165bb6f013791c8959689adb6100efe191beb81 https://github.com/facebookexperimental/rust-shed/commit/5628e1becb03d6cda697d2dbba33b7f59dd308f1 https://github.com/facebookincubator/fizz/commit/412da7a4a7f82c31c16c84573daf2e4841f2474e Reviewed By: bigfootjon fbshipit-source-id: e53f596b91389827701dac713374736bc685d323 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 52a99cccff8e..c1695503cba7 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 70bcc50feafe6b0889c655d73a7d7821605a471a +Subproject commit 1b635114ab549843427353380731e46a2c652658 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ce648a8d190e..e808f9de3be4 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 98267c70b0dcad3c5b5145972d0a28f6f4644771 +Subproject commit dccbd059c84c2a744fbba79b4993e8ce5bf0d4ce diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index df8cba84bb42..1c6194437b30 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 92d2767437a791eba614c2020184b92031c8afa7 +Subproject commit 9ffabe45b5c7dd89bf03a6e527c4601675b2f471 From 1ac967d27f600cde42c0652b9842719a0220acc4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 24 Aug 2024 09:30:42 -0700 Subject: [PATCH 7114/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/b797592e543c4d025ce07c6096c32de5da19c5c5 https://github.com/facebook/fb303/commit/475d41946232c9090eff05f92d5ebaba37911e91 https://github.com/facebook/fbthrift/commit/c82427f1772b69b902a18e2613901a51e00384d9 https://github.com/facebook/folly/commit/8bbaec8d9cfa75c7fdd62a05d3589184d1e889b7 https://github.com/facebook/mvfst/commit/458b5c13ab5f775da5432954311c0970cc45c582 https://github.com/facebook/proxygen/commit/c00aaa4b4e09b42d196427216f07fe891c2a3405 https://github.com/facebook/wangle/commit/61c45e3a0669b3c7b851bb348ba1f80bf4fe4961 https://github.com/facebookexperimental/edencommon/commit/78d8e3fa05e3320ecd2e387097748a59afd7bdb4 https://github.com/facebookexperimental/rust-shed/commit/3a0abd663512f3f167ee2c029bc46b2674ef79a4 https://github.com/facebookincubator/fizz/commit/b515b645bbae93e2d87d60a4e24cfef5f933b186 Reviewed By: bigfootjon fbshipit-source-id: b84f9a77c2cf7eb3c4af35d5da21f56189e06265 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c1695503cba7..2958c237f12c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1b635114ab549843427353380731e46a2c652658 +Subproject commit c82427f1772b69b902a18e2613901a51e00384d9 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e808f9de3be4..4e602c996cf5 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit dccbd059c84c2a744fbba79b4993e8ce5bf0d4ce +Subproject commit 8bbaec8d9cfa75c7fdd62a05d3589184d1e889b7 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1c6194437b30..dc71484d2577 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9ffabe45b5c7dd89bf03a6e527c4601675b2f471 +Subproject commit 61c45e3a0669b3c7b851bb348ba1f80bf4fe4961 From 3bd9663bbd2a9b28208a2f3d1753a1fe8641bed4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 25 Aug 2024 09:32:23 -0700 Subject: [PATCH 7115/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/6bd044dc6212638541e534220c786df7a50a6433 https://github.com/facebook/fbthrift/commit/88ec5c7487423c9ea968b69028b3cfd64994e34b https://github.com/facebook/folly/commit/0ee5ecbfffde04c06f011afb08d7c4bf377a6283 https://github.com/facebook/mvfst/commit/a93f27c5fb3ef5feddfff9efb3ee8ce6e7b735ed https://github.com/facebook/proxygen/commit/3862ef58852b40e841ecf931db30cd6bbc19cc3b https://github.com/facebook/wangle/commit/706aa48b6c2e4d965cf7b3e8d63f262b3e7a7bbc https://github.com/facebookexperimental/edencommon/commit/81d9eb16ac7ecc73d86e92d5315c67c655527b85 https://github.com/facebookexperimental/rust-shed/commit/6dfa306ef768ace7a911dcd26eaa84d079d723b7 https://github.com/facebookincubator/fizz/commit/f22ef2dfa6dc078cd05e687c1bb1a97e95dc09cd Reviewed By: bigfootjon fbshipit-source-id: 228e8a7de69a96c7b41b9d570b672bee40e73cfc --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2958c237f12c..b8fcead86723 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c82427f1772b69b902a18e2613901a51e00384d9 +Subproject commit 88ec5c7487423c9ea968b69028b3cfd64994e34b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4e602c996cf5..65ca4ad22a87 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 8bbaec8d9cfa75c7fdd62a05d3589184d1e889b7 +Subproject commit 0ee5ecbfffde04c06f011afb08d7c4bf377a6283 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index dc71484d2577..7f6a244fbcd7 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 61c45e3a0669b3c7b851bb348ba1f80bf4fe4961 +Subproject commit 706aa48b6c2e4d965cf7b3e8d63f262b3e7a7bbc From e2b95c9b21ae8a1048f4c8bdc8fe8f1c1d74b9d7 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 26 Aug 2024 09:31:21 -0700 Subject: [PATCH 7116/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/64135f5ebf690d869b8cd70656e4c181486088c6 https://github.com/facebook/fb303/commit/4a1d8dbc63ce8735c8e769c79d0c36bd2b58ce7a https://github.com/facebook/fbthrift/commit/3424a17406199d78bd63ad8e994d6cd76fbeb080 https://github.com/facebook/folly/commit/67c3f7dc7cdd3943bb4a2dd75b4c0598d5b967d6 https://github.com/facebook/mvfst/commit/867308e4c1d09ae8e08016719d87f6545f8d76a1 https://github.com/facebook/proxygen/commit/4551cf60dde3233a737088524eb0f133a48fa9f0 https://github.com/facebook/wangle/commit/de284ac3fd546b2810e581491112cc4fa1f7d4ca https://github.com/facebookexperimental/edencommon/commit/c741e96e5e908e4724a0815fd0007e3cf6bfd175 https://github.com/facebookexperimental/rust-shed/commit/6028e2636ccb2a7a54cb93663824d6472b4ad898 https://github.com/facebookincubator/fizz/commit/66dcf40a1a3eb91bbd1947445062224085352c9d Reviewed By: bigfootjon fbshipit-source-id: f08aea923a4640378d314f6b0314581613c098ee --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b8fcead86723..48cc86a11ed9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 88ec5c7487423c9ea968b69028b3cfd64994e34b +Subproject commit 3424a17406199d78bd63ad8e994d6cd76fbeb080 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 65ca4ad22a87..7c02bb31a301 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0ee5ecbfffde04c06f011afb08d7c4bf377a6283 +Subproject commit 67c3f7dc7cdd3943bb4a2dd75b4c0598d5b967d6 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7f6a244fbcd7..ad8d7f2e4050 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 706aa48b6c2e4d965cf7b3e8d63f262b3e7a7bbc +Subproject commit de284ac3fd546b2810e581491112cc4fa1f7d4ca From a87b7f8ca9dcb7220c3f2dd00dd5e8928e57ec24 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 27 Aug 2024 09:30:58 -0700 Subject: [PATCH 7117/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/b6cea5025aedbe5d2d959b480a5e7d97fb029458 https://github.com/facebook/fb303/commit/10d7e25277abfd0dc191a86b3db3c6074b107581 https://github.com/facebook/fbthrift/commit/70cfe2dc166c3e6222dd4323f3f5f8bcae6c6e77 https://github.com/facebook/folly/commit/5eb3a763b2ee6025c8f5c210b74e0b25fec197d5 https://github.com/facebook/mvfst/commit/5f74df10b64d69a2ac79f53545498b96d6299a27 https://github.com/facebook/proxygen/commit/0aede0001f0669cbdef51dfb499dfaf76b497078 https://github.com/facebook/wangle/commit/fbd1601f760229c804466c81426ef0f9dfa6bae1 https://github.com/facebookexperimental/edencommon/commit/28dca0f74c4b82b05aa5c57a587a10ed56d2a133 https://github.com/facebookexperimental/rust-shed/commit/de20508c909480f805c19574ebbc384ee07cc80b https://github.com/facebookincubator/fizz/commit/a1c51fcf48ecaca1c3e624146e7eae982be694c9 Reviewed By: ajb85 fbshipit-source-id: 702bb98fd2ca61c8e60aa551768f1807fdcff42b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 48cc86a11ed9..995ae348f0eb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3424a17406199d78bd63ad8e994d6cd76fbeb080 +Subproject commit 70cfe2dc166c3e6222dd4323f3f5f8bcae6c6e77 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7c02bb31a301..0e9a55b41ef6 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 67c3f7dc7cdd3943bb4a2dd75b4c0598d5b967d6 +Subproject commit 5eb3a763b2ee6025c8f5c210b74e0b25fec197d5 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ad8d7f2e4050..025e208444be 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit de284ac3fd546b2810e581491112cc4fa1f7d4ca +Subproject commit fbd1601f760229c804466c81426ef0f9dfa6bae1 From a9b5cdea8a1561f490f766bdcad26ed7f52849e8 Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Tue, 27 Aug 2024 10:48:22 -0700 Subject: [PATCH 7118/7387] move client info into base for all samples Summary: I added client logging to the Watchman `dispatch_command` event. Watchman has a few different types of scuba events: - query_execute - sync_to_now - full_crawl - clock_test - saved_state - dropped - age_out Some of these events are associated with a specific client request, so I would like to include client information there as well. There are a few that are not related to a specific client event: - full_crawl - clock_test - dropped - age_out So I only intend to add client information to - query_execute - sync_to_now - saved_state Going to move these client attributes to the more generically used MetadataEventData instead of being on the event types for each event to avoid copy paste. Reviewed By: genevievehelsel Differential Revision: D61684457 fbshipit-source-id: bf4765780cfd09c7ff5a0a3f0ef56dcc10f58dfd --- watchman/Client.cpp | 9 ++++----- watchman/telemetry/LogEvent.h | 17 +++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/watchman/Client.cpp b/watchman/Client.cpp index 4e938991e5fd..1ac18c3e17d2 100644 --- a/watchman/Client.cpp +++ b/watchman/Client.cpp @@ -182,11 +182,10 @@ bool Client::dispatchCommand(const Command& command, CommandFlags mode) { dispatchCommand.meta.base.event_count = eventCount != samplingRate ? 0 : eventCount; dispatchCommand.args = renderedString; - dispatchCommand.client_pid = peerPid_; - auto processName = peerInfo_.get().name; - std::replace(processName.begin(), processName.end(), '\0', ' '); - auto cleanName = folly::rtrimWhitespace(processName); - dispatchCommand.client_name = cleanName; + dispatchCommand.meta.client_pid = peerPid_; + dispatchCommand.meta.client_name = + facebook::eden::ProcessInfoCache::cleanProcessCommandline( + peerInfo_.get().name); getLogger()->logEvent(dispatchCommand); } diff --git a/watchman/telemetry/LogEvent.h b/watchman/telemetry/LogEvent.h index 51a5fc0092ac..9428d8e54100 100644 --- a/watchman/telemetry/LogEvent.h +++ b/watchman/telemetry/LogEvent.h @@ -68,6 +68,8 @@ struct MetadataEventData { int64_t recrawl = 0; bool case_sensitive = false; std::string watcher; + pid_t client_pid = 0; + std::string client_name; void populate(DynamicEvent& event) const { base.populate(event); @@ -76,6 +78,13 @@ struct MetadataEventData { if (!watcher.empty()) { event.addString("watcher", watcher); } + + if (client_pid != 0) { + event.addInt("client_pid", client_pid); + } + if (!client_name.empty()) { + event.addString("client", client_name); + } } }; @@ -85,8 +94,6 @@ struct DispatchCommand { MetadataEventData meta; std::string command; std::string args; - pid_t client_pid = 0; - std::string client_name; void populate(DynamicEvent& event) const { meta.populate(event); @@ -94,12 +101,6 @@ struct DispatchCommand { if (!args.empty()) { event.addString("args", args); } - if (client_pid != 0) { - event.addInt("client_pid", client_pid); - } - if (!client_name.empty()) { - event.addString("client", client_name); - } } }; From ab384bd48f7a23430478d0d8015d71ee2993dfa4 Mon Sep 17 00:00:00 2001 From: Keito Uchiyama Date: Tue, 27 Aug 2024 17:35:14 -0700 Subject: [PATCH 7119/7387] Bump anyhow to 1.0.86 Reviewed By: fanzeyi, dtolnay Differential Revision: D61876827 fbshipit-source-id: 54223a5741114f76152c981ef2bce472970aa8a9 --- watchman/cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index 9c9da13df648..91e3a8b9e6db 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT" [dependencies] ahash = "0.8" -anyhow = "1.0.75" +anyhow = "1.0.86" duct = "0.13.6" jwalk = "0.6" serde = { version = "1.0.185", features = ["derive", "rc"] } From 9dc3194a4b3a8ff5c8da5fc14c70fddcd1f509af Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Wed, 28 Aug 2024 07:20:42 -0700 Subject: [PATCH 7120/7387] fix a copy in client logging Summary: forgot a move in D61684457 when I did the refactor to add tests so this is an unnessecary copy. Reviewed By: genevievehelsel Differential Revision: D61881277 fbshipit-source-id: dc191a1f0425ed199ad28a2b08ea23609130a57c --- watchman/Client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/Client.cpp b/watchman/Client.cpp index 1ac18c3e17d2..bb6bbbe7a64c 100644 --- a/watchman/Client.cpp +++ b/watchman/Client.cpp @@ -185,7 +185,7 @@ bool Client::dispatchCommand(const Command& command, CommandFlags mode) { dispatchCommand.meta.client_pid = peerPid_; dispatchCommand.meta.client_name = facebook::eden::ProcessInfoCache::cleanProcessCommandline( - peerInfo_.get().name); + std::move(peerInfo_.get().name)); getLogger()->logEvent(dispatchCommand); } From 65769073638a92f3ba95a060050050f73701780d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 28 Aug 2024 09:30:49 -0700 Subject: [PATCH 7121/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/fa3ccd6799184a740d3e7b060c6e56ddb1d4c1b4 https://github.com/facebook/fb303/commit/ab158c137a662349fb4398295d60de5da28f8f19 https://github.com/facebook/fbthrift/commit/9a227723b42e2beddaffa7aed9ba1ecd1e9d47e8 https://github.com/facebook/folly/commit/ce5edfb9b08ead9e78cb46879e7b9499861f7cd2 https://github.com/facebook/mvfst/commit/777bdabe21dae90ccb52408531b92460dca1eb59 https://github.com/facebook/proxygen/commit/86fe7a017ddb86ad9f478b7ae1694a890e30ba7c https://github.com/facebook/wangle/commit/d732d18cd2045aeab7586e4a850be6b82422ec4f https://github.com/facebookexperimental/edencommon/commit/c2afc74675fe07542ecb01c314771777b9bd4a3c https://github.com/facebookexperimental/rust-shed/commit/c13fb9e1f7fadd4fb8c9e9ce4f52aa572d92c964 https://github.com/facebookincubator/fizz/commit/8e08034b5382d6f55cded2c979f578bfb37620c5 Reviewed By: ajb85 fbshipit-source-id: e337ce0af62b0a830e561585dc839e699d7dac0f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 995ae348f0eb..a295b82f8600 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 70cfe2dc166c3e6222dd4323f3f5f8bcae6c6e77 +Subproject commit 9a227723b42e2beddaffa7aed9ba1ecd1e9d47e8 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0e9a55b41ef6..48c6fa73ac33 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 5eb3a763b2ee6025c8f5c210b74e0b25fec197d5 +Subproject commit ce5edfb9b08ead9e78cb46879e7b9499861f7cd2 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 025e208444be..d7ae9fb8418c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit fbd1601f760229c804466c81426ef0f9dfa6bae1 +Subproject commit d732d18cd2045aeab7586e4a850be6b82422ec4f From 8a0da88194aa3dfcfe72ba1a4513abd5e1680144 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 29 Aug 2024 09:31:24 -0700 Subject: [PATCH 7122/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/cd07b637539d59be35aba3b97aa7eb8621f4ab6d https://github.com/facebook/fb303/commit/c0c3fe097459c5eec94ea08c3275e09c28601715 https://github.com/facebook/fbthrift/commit/970cc94592c873c17411f031adc6fe1310d6f347 https://github.com/facebook/folly/commit/a2be2eb83cc6ded703e5dff062013bbd151971bb https://github.com/facebook/mvfst/commit/b09f2436686763b1ea79fbc34ba8804c8e7d3b12 https://github.com/facebook/proxygen/commit/3b09888cc91063fcb198068672a50551800b706b https://github.com/facebook/wangle/commit/45535c555008d1a157d144734d027fac5d54d7fa https://github.com/facebookexperimental/edencommon/commit/1e714e7f9ea4e1e88e92f53d971f60b18318d8e3 https://github.com/facebookexperimental/rust-shed/commit/0e5b0125bfee82974ee19f124ca2a2634d20a232 https://github.com/facebookincubator/fizz/commit/9a7bd7f052be91760003f29413f876c0ea5a93a7 Reviewed By: zpao fbshipit-source-id: d45f1c656cb38b81be235177b8824008a15810aa --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a295b82f8600..eaba84525b89 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9a227723b42e2beddaffa7aed9ba1ecd1e9d47e8 +Subproject commit 970cc94592c873c17411f031adc6fe1310d6f347 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 48c6fa73ac33..541c996612f8 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ce5edfb9b08ead9e78cb46879e7b9499861f7cd2 +Subproject commit a2be2eb83cc6ded703e5dff062013bbd151971bb diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d7ae9fb8418c..703dbbfb5824 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d732d18cd2045aeab7586e4a850be6b82422ec4f +Subproject commit 45535c555008d1a157d144734d027fac5d54d7fa From 3507273ed494d975c0827b9f409d0c0d2e2d1263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Szab=C3=B3?= Date: Thu, 29 Aug 2024 18:07:25 -0700 Subject: [PATCH 7123/7387] Fix actions/upload-artifact deprecation Summary: X-link: https://github.com/facebookincubator/zstrong/pull/970 actions/upload-artifact < v4 is deprecated and will not be supported after November 30, 2024.[1] Migrate to v4 instead -- the API used by fbcode_builder is not changed by this version bump. [1] https://github.blog/changelog/2024-04-16-deprecation-notice-v3-of-the-artifact-actions/ X-link: https://github.com/facebook/folly/pull/2284 Reviewed By: yfeldblum Differential Revision: D61730024 Pulled By: Orvid fbshipit-source-id: 37eb13c6257a233ae170aa44aadeeb35a01568b1 --- build/fbcode_builder/getdeps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index dfb028a94cee..ae12922f0ce3 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -1180,7 +1180,7 @@ def write_job_for_platform(self, platform, args): # noqa: C901 f"--final-install-prefix /usr/local\n" ) - out.write(" - uses: actions/upload-artifact@v2\n") + out.write(" - uses: actions/upload-artifact@v4\n") out.write(" with:\n") out.write(" name: %s\n" % manifest.name) out.write(" path: _artifacts\n") From 52b24b82024489beac4d8293080858effe205ef2 Mon Sep 17 00:00:00 2001 From: Yedidya Feldblum Date: Thu, 29 Aug 2024 21:30:34 -0700 Subject: [PATCH 7124/7387] update oss-builds dep on fast_float to v6.1.4 (#974) Summary: Pull Request resolved: https://github.com/facebookincubator/zstrong/pull/974 Reviewed By: michel-slm Differential Revision: D61985034 fbshipit-source-id: ca610a6a25bbe16a64f66c87e22b296ca838cad4 --- build/fbcode_builder/manifests/fast_float | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/manifests/fast_float b/build/fbcode_builder/manifests/fast_float index 0d18995b7aa4..c5e8e054431e 100644 --- a/build/fbcode_builder/manifests/fast_float +++ b/build/fbcode_builder/manifests/fast_float @@ -2,12 +2,12 @@ name = fast_float [download] -url = https://github.com/fastfloat/fast_float/archive/refs/tags/v2.0.0.tar.gz -sha256 = 5d528ec20811577c5f2b2873528c085c500fdcd2b2c0901450509a71de5f1fa4 +url = https://github.com/fastfloat/fast_float/archive/refs/tags/v6.1.4.tar.gz +sha256 = 12cb6d250824160ca16bcb9d51f0ca7693d0d10cb444f34f1093bc02acfce704 [build] builder = cmake -subdir = fast_float-2.0.0 +subdir = fast_float-6.1.4 [cmake.defines] FASTFLOAT_TEST = OFF From 877e95830ba9c6bba4ec91f7a9fcb0d8ab215340 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 30 Aug 2024 09:32:02 -0700 Subject: [PATCH 7125/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/dd4551a39f36fa66e65caeb9cd47b162d7711f5c https://github.com/facebook/fb303/commit/3fd0fd523c433bb7833db4c8888b14200dac4c76 https://github.com/facebook/fbthrift/commit/34ee27734b1ad20b013de550163339ad90e91ea0 https://github.com/facebook/folly/commit/06b6275fff0c9dc8bc8a0117006467ebc6abfeff https://github.com/facebook/mvfst/commit/7847eb1bf635aa57b33d59a59169d1ebd7537508 https://github.com/facebook/proxygen/commit/c9e8cbf0bcde9203825973ab6b8935f0e96299c8 https://github.com/facebook/wangle/commit/3338d97a1e3645fa8f91a9df9276245628e08520 https://github.com/facebookexperimental/edencommon/commit/dc57b45ee3427c9ff74e88b0d5b99703dce110ed https://github.com/facebookexperimental/rust-shed/commit/4d7e13bd7c865b89848a6f06f9b7a09fec8dc9b7 https://github.com/facebookincubator/fizz/commit/13f12a98497cf944b7f6d4890b8138174d7830e2 Reviewed By: zpao fbshipit-source-id: fb314bdb9f936d5eabe076d50822c85667046176 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index eaba84525b89..e7e48d7959c6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 970cc94592c873c17411f031adc6fe1310d6f347 +Subproject commit 34ee27734b1ad20b013de550163339ad90e91ea0 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 541c996612f8..0cf518581667 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a2be2eb83cc6ded703e5dff062013bbd151971bb +Subproject commit 06b6275fff0c9dc8bc8a0117006467ebc6abfeff diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 703dbbfb5824..702664a94f61 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 45535c555008d1a157d144734d027fac5d54d7fa +Subproject commit 3338d97a1e3645fa8f91a9df9276245628e08520 From 90830eedebda2625a5926f8230c0f0775ec32e2f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 31 Aug 2024 09:30:46 -0700 Subject: [PATCH 7126/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/aeb0397e72febf711cc3615dca85409ef36deb9a https://github.com/facebook/fb303/commit/ea47ad8f13c9886a1732a63e07dec70e14ef9f24 https://github.com/facebook/fbthrift/commit/29f4061de82c0872221d29eecfaabca631a3b1cf https://github.com/facebook/folly/commit/9fdb1a57bd7a063c0981351a5389ff1b66c49b2a https://github.com/facebook/mvfst/commit/3e0a0d8cf02e96da7dd17db5801dc4c7be0bcc3a https://github.com/facebook/proxygen/commit/bfb2409db9b8192ef2dedda5f5bff9a14dd02e79 https://github.com/facebook/wangle/commit/f06b002845231195851cac605972b2eb1e49a8d4 https://github.com/facebookexperimental/edencommon/commit/5f704e74eb127412e485477f9c483d5bfb6a6cf7 https://github.com/facebookexperimental/rust-shed/commit/aaa7c10fe9a6e9b608173e7329aa04357f836e84 https://github.com/facebookincubator/fizz/commit/baaa4d462ed9b3484308e49f7f679d9c9e1e92e2 Reviewed By: zpao fbshipit-source-id: f3f3ba772185f5bb7b4afc7d342d6c5d217e88f2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e7e48d7959c6..ff0d4d222209 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 34ee27734b1ad20b013de550163339ad90e91ea0 +Subproject commit 29f4061de82c0872221d29eecfaabca631a3b1cf diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0cf518581667..0980a5736566 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 06b6275fff0c9dc8bc8a0117006467ebc6abfeff +Subproject commit 9fdb1a57bd7a063c0981351a5389ff1b66c49b2a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 702664a94f61..538a60467456 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3338d97a1e3645fa8f91a9df9276245628e08520 +Subproject commit f06b002845231195851cac605972b2eb1e49a8d4 From 2c76a6543344e73d4fa7c8be25a61d85aca21252 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 1 Sep 2024 09:32:46 -0700 Subject: [PATCH 7127/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/97003286dbcbde09e5d665662df91b9349623d7f https://github.com/facebook/fb303/commit/b5ff9386f6cce0aae316eb4aabc377eb165e67b1 https://github.com/facebook/fbthrift/commit/1000892c7e94d1049b144fe3d6c7ac8b5364d945 https://github.com/facebook/folly/commit/02e0109fe64be0e7e73fc8021bc6e069b20b0233 https://github.com/facebook/mvfst/commit/a82dafccc7ad318aefcf04d2a0b0b7e25a354464 https://github.com/facebook/proxygen/commit/69df3245cce93ebe3c576cf93a481dcdc2b57d2e https://github.com/facebook/wangle/commit/582cd59648f96f52db3ebe58db793c3975818840 https://github.com/facebookexperimental/edencommon/commit/201b2d8d31de01b441b472c0032a79cb56694deb https://github.com/facebookexperimental/rust-shed/commit/13e95e24221563665dc8ab762d62c8535c09f574 https://github.com/facebookincubator/fizz/commit/4c498f6f954b706ab7588380f8193ad987b6d98e Reviewed By: zpao fbshipit-source-id: 9a426f5621f35f4ff226c5beb17f6423b9471a9f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ff0d4d222209..034b2e342b33 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 29f4061de82c0872221d29eecfaabca631a3b1cf +Subproject commit 1000892c7e94d1049b144fe3d6c7ac8b5364d945 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0980a5736566..3802abf1d025 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9fdb1a57bd7a063c0981351a5389ff1b66c49b2a +Subproject commit 02e0109fe64be0e7e73fc8021bc6e069b20b0233 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 538a60467456..71740a05d8d3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f06b002845231195851cac605972b2eb1e49a8d4 +Subproject commit 582cd59648f96f52db3ebe58db793c3975818840 From 30a55bed4f3448aebc69aca80a04d1f57cb00778 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 2 Sep 2024 09:31:56 -0700 Subject: [PATCH 7128/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/10ead507e71ca417ac6e77a8c35238ba0e5b12aa https://github.com/facebook/fb303/commit/9ee9db23010bb302a181c06fa8f31b7c5aa64cb7 https://github.com/facebook/fbthrift/commit/d5465a408d5f4e5a1b3f67e38d34d9dabdc6e5a9 https://github.com/facebook/mvfst/commit/eda260cc8646b8e0cffbc0fae5c0353ffac18cc3 https://github.com/facebook/proxygen/commit/ad2f67237d1e9bf0370ae3c6306a22c3786dc355 https://github.com/facebook/wangle/commit/2ecf536cd4a2c786a6860fa0399a83cc844401d2 https://github.com/facebookexperimental/edencommon/commit/b8d3c398624139c68454afd8d41d480e945c9ceb https://github.com/facebookexperimental/rust-shed/commit/961695a79b8bee12e3ecbd891dd3b5ddfc128458 https://github.com/facebookincubator/fizz/commit/04e5d48ae96de8f6987ff2b358ecbade40e6d009 Reviewed By: zpao fbshipit-source-id: 1d52d2fc7290277f84be79db6654be97dfee2eeb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 034b2e342b33..93e7fe9dee5f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1000892c7e94d1049b144fe3d6c7ac8b5364d945 +Subproject commit d5465a408d5f4e5a1b3f67e38d34d9dabdc6e5a9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 71740a05d8d3..b2662def7b9e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 582cd59648f96f52db3ebe58db793c3975818840 +Subproject commit 2ecf536cd4a2c786a6860fa0399a83cc844401d2 From 0e6522e8d778fcb7c6b1cd2b9ad6e54f51c32c79 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 3 Sep 2024 09:33:54 -0700 Subject: [PATCH 7129/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/01e2eb9f11e59e31569e3b11c4b9a54d717560dd https://github.com/facebook/fb303/commit/d7e8351365504e48b7730a1dc7e2af1fcc88c98c https://github.com/facebook/fbthrift/commit/f553d3a4d66783f434f6df1d4250e1d8c25ec7a1 https://github.com/facebook/folly/commit/f13c956b01d9fabc8c31722dbc24c8bbd34d035b https://github.com/facebook/mvfst/commit/7d699bbc1f186df7eb8b922feafd3cc5d0b8d641 https://github.com/facebook/proxygen/commit/12db28ef28a85c1f5ae230a8adf1aa0f46c99ad4 https://github.com/facebook/wangle/commit/88e1b2edb555263938fb6ef8c27dd8b7ea472c50 https://github.com/facebookexperimental/rust-shed/commit/2a181b29ae47cae225d26428ae7e20439da8d400 https://github.com/facebookincubator/fizz/commit/459530b4a61f71d0069607f2f69609d55ec8c331 Reviewed By: ajb85 fbshipit-source-id: 2b330ee667b3ca9392ac3c66cde99aa441827054 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 93e7fe9dee5f..0b73e146f960 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d5465a408d5f4e5a1b3f67e38d34d9dabdc6e5a9 +Subproject commit f553d3a4d66783f434f6df1d4250e1d8c25ec7a1 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 3802abf1d025..70ac159b9c10 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 02e0109fe64be0e7e73fc8021bc6e069b20b0233 +Subproject commit f13c956b01d9fabc8c31722dbc24c8bbd34d035b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b2662def7b9e..a691aded3a15 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2ecf536cd4a2c786a6860fa0399a83cc844401d2 +Subproject commit 88e1b2edb555263938fb6ef8c27dd8b7ea472c50 From a048dc8c7de23991d497136173a6685418f7e409 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 4 Sep 2024 09:33:06 -0700 Subject: [PATCH 7130/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/6eba73d9872a755e151ae1477500a19ee225a30a https://github.com/facebook/fb303/commit/46c0206a95c19da080460ab019727717330c0413 https://github.com/facebook/fbthrift/commit/279b8e8d3804e394c4627269d9745243880ecb6d https://github.com/facebook/folly/commit/9480501e2c2650735bfd08fb98dd63f342b5c27c https://github.com/facebook/mvfst/commit/7ba268c1c904805e32f0d810fff35c59e375608c https://github.com/facebook/proxygen/commit/930aa153bfc82e78988e7176d91a687b4b9afdec https://github.com/facebook/wangle/commit/f934b3d5004d6a7f78e17552b24c017ce2cdf426 https://github.com/facebookexperimental/edencommon/commit/2ccec577dc2d968693c91561733d7ed892d6f25e https://github.com/facebookexperimental/rust-shed/commit/d3608e5838945b4702ebbd6a84e9bfdfa8847a7b https://github.com/facebookincubator/fizz/commit/50070aa762326131dac24d6f8590fb57c964add1 Reviewed By: ajb85 fbshipit-source-id: cd232bcea198f2adefdbd9a016df47befd8b9d60 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0b73e146f960..758a6066590a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f553d3a4d66783f434f6df1d4250e1d8c25ec7a1 +Subproject commit 279b8e8d3804e394c4627269d9745243880ecb6d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 70ac159b9c10..8f2a557d290c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f13c956b01d9fabc8c31722dbc24c8bbd34d035b +Subproject commit 9480501e2c2650735bfd08fb98dd63f342b5c27c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a691aded3a15..fbafcc7afa60 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 88e1b2edb555263938fb6ef8c27dd8b7ea472c50 +Subproject commit f934b3d5004d6a7f78e17552b24c017ce2cdf426 From 08585e458f9322fae6711844359df493f2b0a398 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 5 Sep 2024 09:31:56 -0700 Subject: [PATCH 7131/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/a701de8ff69596e45203c75860f593cb16dedbb8 https://github.com/facebook/fb303/commit/495d843337a520d8ce089bba980d094e2794db6f https://github.com/facebook/fbthrift/commit/0cb4447fca20691ee0c6fed8c75badb94c6cb0fc https://github.com/facebook/folly/commit/19254c4dd4e47c94364ebf78b12bcf69fdf28f16 https://github.com/facebook/mvfst/commit/65d29e22b20db65acb26f5c2b1c60b86d5519d63 https://github.com/facebook/proxygen/commit/bc722012285ee978d7706965c69174c14fcb1821 https://github.com/facebook/wangle/commit/fbc1ef163736bd5cf47e68472e17b1ca8b8b4ee1 https://github.com/facebookexperimental/edencommon/commit/6ee50b1b5aa163d06355693b65199da1103ebbfe https://github.com/facebookexperimental/rust-shed/commit/819245803ca79b935fae2c80d7058a8391a2fbd1 https://github.com/facebookincubator/fizz/commit/9c60caec3bb99282affdebab2dfc0b4a89ea049f Reviewed By: ajb85 fbshipit-source-id: 5a97a8ff8d090451576ceb466361b08fa3108ee2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 758a6066590a..ddee273bdde9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 279b8e8d3804e394c4627269d9745243880ecb6d +Subproject commit 0cb4447fca20691ee0c6fed8c75badb94c6cb0fc diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8f2a557d290c..fec2142f50bf 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9480501e2c2650735bfd08fb98dd63f342b5c27c +Subproject commit 19254c4dd4e47c94364ebf78b12bcf69fdf28f16 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index fbafcc7afa60..dff6d97aa3f1 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f934b3d5004d6a7f78e17552b24c017ce2cdf426 +Subproject commit fbc1ef163736bd5cf47e68472e17b1ca8b8b4ee1 From 81a090f95139888e9011c30e893e39681d1ff4bd Mon Sep 17 00:00:00 2001 From: Kaveh Ahmadi Date: Thu, 5 Sep 2024 11:00:52 -0700 Subject: [PATCH 7132/7387] add CONTRIBUTING.md file to facebook/watchman open source project Summary: watchman open source project does not have a CONTRIBUTING file. This diff add the missing file to meet Open Source requirements. Reviewed By: kmancini Differential Revision: D62221596 fbshipit-source-id: d8e2d82aab74522e16032651d002a68980a57401 --- CONTRIBUTING.md | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000000..2a13ab094b79 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,38 @@ +# Contributing to watchman +We want to make contributing to this project as easy and transparent as +possible. + +## Our Development Process +Watchman is currently developed in Meta's internal repositories and then exported out to GitHub by a Meta team member; however, we invite you to submit pull requests as described below. + +## Pull Requests +We actively welcome your pull requests. + +1. Fork the repo and create your branch from `main`. +2. If you've added code that should be tested, add tests. +3. If you've changed APIs, update the documentation. +4. Ensure the test suite passes. +5. Make sure your code lints. +6. If you haven't already, complete the Contributor License Agreement ("CLA"). + +## Contributor License Agreement ("CLA") +In order to accept your pull request, we need you to submit a CLA. You only need +to do this once to work on any of Meta's open source projects. + +Complete your CLA here: + +## Issues +We use GitHub issues to track public bugs. Please ensure your description is +clear and has sufficient instructions to be able to reproduce the issue. + +Meta has a [bounty program](https://www.facebook.com/whitehat/) for the safe +disclosure of security bugs. In those cases, please go through the process +outlined on that page and do not file a public issue. + +## Coding Style +* 2 spaces for indentation rather than tabs +* 80 character line length + +## License +By contributing to watchman, you agree that your contributions will be licensed +under the LICENSE file in the root directory of this source tree (MIT License). From 182b779c88ca2b64de1f5ddeb55a597df7d90253 Mon Sep 17 00:00:00 2001 From: Ori Peleg Date: Thu, 5 Sep 2024 15:09:00 -0700 Subject: [PATCH 7133/7387] website: change mentions of mpm to olivia (#1243) Summary: Inspired by this Mercurial change: https://phab.mercurial-scm.org/D10266 Pull Request resolved: https://github.com/facebook/watchman/pull/1243 Reviewed By: genevievehelsel Differential Revision: D62177586 fbshipit-source-id: 215ccd4e2083395f69169b66d9bbe9eb57c53175 --- website/docs/casefolding.md | 2 +- website/docs/cookies.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/casefolding.md b/website/docs/casefolding.md index e5f35ed5d40d..cc1bb7d1b860 100644 --- a/website/docs/casefolding.md +++ b/website/docs/casefolding.md @@ -65,4 +65,4 @@ system in the rare case that a file changes case. ## Credits -The levels of correctness were proposed by Matt Mackall . +The levels of correctness were proposed by Olivia Mackall . diff --git a/website/docs/cookies.md b/website/docs/cookies.md index 13f3a06b99cc..979b65b08fe7 100644 --- a/website/docs/cookies.md +++ b/website/docs/cookies.md @@ -106,4 +106,4 @@ quiescence before the watcher is considered caught up. ## Credits -The idea was originally proposed by Matt Mackall . +The idea was originally proposed by Olivia Mackall . From 5935d71d3353000403bf9b61ffa603d226f480ab Mon Sep 17 00:00:00 2001 From: Chris Dinh Date: Thu, 5 Sep 2024 17:55:40 -0700 Subject: [PATCH 7134/7387] Add privhelper pid to PrivHelperInfo Summary: # Context In D62051804, we add a feature that will remount hanging mounts upon eden reboot. We would like to have an integration test for this feature. One of the steps to create a hanging mount is to kill the privhelper. To do this we need the pid of the privhelper process. # This Diff Adds a getPid function to privhelper. Hook this up to the existing thrift endpoint checkPrivHelper. # Technical Details There are several ways a privhelper process is created. This method works if the privhelper is created when attemping to connect to the privhelper. It does not work if the privhelper already exists and is connected to via socket. This will be added in the next diff. Reviewed By: MichaelCuevas Differential Revision: D62050113 fbshipit-source-id: 8a0b8d97be0cb5decfc9c4da30ea83fe994ded83 --- eden/fs/service/eden.thrift | 1 + 1 file changed, 1 insertion(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 1f7106339d1c..2d97d27f8255 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -169,6 +169,7 @@ struct DaemonInfo { */ struct PrivHelperInfo { 1: bool connected; + 2: pid_t pid; } /** From ab43e9fa1472f7d447455dc5fbd9bf5a6059ff71 Mon Sep 17 00:00:00 2001 From: Kaveh Ahmadi Date: Thu, 5 Sep 2024 17:57:43 -0700 Subject: [PATCH 7135/7387] add getting started section to CONTRIBUTING.md file Summary: It is better to link this more info in the CONTRIBUTING.md file Reviewed By: genevievehelsel Differential Revision: D62276041 fbshipit-source-id: edf0ea79b2c81bfc3ab41bb84370a4885e723875 --- CONTRIBUTING.md | 3 +++ README.markdown | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2a13ab094b79..d7e64e113698 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,6 +15,9 @@ We actively welcome your pull requests. 5. Make sure your code lints. 6. If you haven't already, complete the Contributor License Agreement ("CLA"). +## Getting Started +For more information on how to get started please see [contributing guide](https://facebook.github.io/watchman/docs/contributing). + ## Contributor License Agreement ("CLA") In order to accept your pull request, we need you to submit a CLA. You only need to do this once to work on any of Meta's open source projects. diff --git a/README.markdown b/README.markdown index 257b21aba448..f37d8a3f425e 100644 --- a/README.markdown +++ b/README.markdown @@ -38,4 +38,4 @@ Please submit a [GitHub issue](https://github.com/facebook/watchman/issues/) to ## Contributing -Please see the [contributing guide](https://facebook.github.io/watchman/docs/contributing). +Please see the [contributing document](CONTRIBUTING.md). From 121f8986a67ee56ae212b993a933967c033770f2 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 6 Sep 2024 09:32:01 -0700 Subject: [PATCH 7136/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/14d4bb16ec545aea53db5961aaa62a1b2940aa47 https://github.com/facebook/fb303/commit/eaa80e976454fb435ff323661a2fc603ac55081d https://github.com/facebook/fbthrift/commit/cdd4a2b2bd6eee61797c66ba064432d6013944fe https://github.com/facebook/folly/commit/bf46c8a21ffa288d756cea2ad455b5f012c3231f https://github.com/facebook/mvfst/commit/7f00a211df18f343cb68c33e039a964da9e5438b https://github.com/facebook/proxygen/commit/cec141423d1ea98a15175d11412839f8cad82a1c https://github.com/facebook/wangle/commit/9dabbbc42b8a59e1e16afa46ad2b0c4ff88ed35d https://github.com/facebookexperimental/edencommon/commit/304a676edf9d5169794c65a9276e335a401fb328 https://github.com/facebookexperimental/rust-shed/commit/4db19a93ead940770c825d41324ad4d1ad59ba67 https://github.com/facebookincubator/fizz/commit/0b913939802a3289960bdcc6bc262cbe41209165 Reviewed By: ajb85 fbshipit-source-id: 8e598507acffae4e1d6ecd9974f2fc8227f69181 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ddee273bdde9..edf847d65957 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0cb4447fca20691ee0c6fed8c75badb94c6cb0fc +Subproject commit cdd4a2b2bd6eee61797c66ba064432d6013944fe diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index fec2142f50bf..54cb071bfa36 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 19254c4dd4e47c94364ebf78b12bcf69fdf28f16 +Subproject commit bf46c8a21ffa288d756cea2ad455b5f012c3231f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index dff6d97aa3f1..9e54234aff5d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit fbc1ef163736bd5cf47e68472e17b1ca8b8b4ee1 +Subproject commit 9dabbbc42b8a59e1e16afa46ad2b0c4ff88ed35d From 3f8899d765f19a2efbf487ce3047ae5f58bbe742 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 7 Sep 2024 09:30:31 -0700 Subject: [PATCH 7137/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/f6787adc83ee73ee909906b7659200f3ddca0c77 https://github.com/facebook/fbthrift/commit/8a3ea758f41b4591f44c9649d2b51b150d4fa275 https://github.com/facebook/folly/commit/2fb0ca3c553c803a8c9bf6b7b4bc98f1b0a79d4e https://github.com/facebook/mvfst/commit/13156b96ec512fd9cd56c280253794b8ebdf46a3 https://github.com/facebook/proxygen/commit/21064c0477e198906cec2fcebec5686183be2eba https://github.com/facebook/wangle/commit/1260d25d552801133f2eb2ced2df09c7f7ae1f66 https://github.com/facebookexperimental/edencommon/commit/363052d7bb66a466124f3141e092e97985063e3b https://github.com/facebookexperimental/rust-shed/commit/3d9fbd6d3d3b8a6790662ad402969b88ddf45595 https://github.com/facebookincubator/fizz/commit/bcecb0db99632bd71912f8cebfa49924a83cd695 Reviewed By: ajb85 fbshipit-source-id: 243e8ae8ea0fe89814228668e3b162302098614b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index edf847d65957..be36f761a3a8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cdd4a2b2bd6eee61797c66ba064432d6013944fe +Subproject commit 8a3ea758f41b4591f44c9649d2b51b150d4fa275 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 54cb071bfa36..cb4c50d2e1ff 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit bf46c8a21ffa288d756cea2ad455b5f012c3231f +Subproject commit 2fb0ca3c553c803a8c9bf6b7b4bc98f1b0a79d4e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9e54234aff5d..2aa49b25ce23 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9dabbbc42b8a59e1e16afa46ad2b0c4ff88ed35d +Subproject commit 1260d25d552801133f2eb2ced2df09c7f7ae1f66 From 1b843c57d605a168d71530a4e2f2b4d81d388ec2 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 8 Sep 2024 09:30:22 -0700 Subject: [PATCH 7138/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/86a5916f3adb9e55ab906bd28abc606467b37924 https://github.com/facebook/fbthrift/commit/9ccdb9673696d158806ff87be8594a05be6180df https://github.com/facebook/mvfst/commit/d929a1cd48241c08be0fc25be4da14fee931ee37 https://github.com/facebook/proxygen/commit/e583e4f7e4e45a5c7ebfbded62433aadede21f73 https://github.com/facebook/wangle/commit/aace5ca19743008d0efcabc750ad440b20c4f43e https://github.com/facebookexperimental/edencommon/commit/bc39a9333d29b6d2886d13618d5c34f3d4f80337 https://github.com/facebookexperimental/rust-shed/commit/95b3bc205aa666d1b45f6b65087122628ecc9fdd https://github.com/facebookincubator/fizz/commit/f8746348b2ed0d0864f4b5386eb7e86324fbe41e Reviewed By: ajb85 fbshipit-source-id: 40ec712f7543b5212975c4c81e5b3bf6a02e51cd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index be36f761a3a8..848b5913cecb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8a3ea758f41b4591f44c9649d2b51b150d4fa275 +Subproject commit 9ccdb9673696d158806ff87be8594a05be6180df diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2aa49b25ce23..25e7c056a2d5 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1260d25d552801133f2eb2ced2df09c7f7ae1f66 +Subproject commit aace5ca19743008d0efcabc750ad440b20c4f43e From 9c9d9ba96ab1bb5256ee7217f994e262a389ed9e Mon Sep 17 00:00:00 2001 From: Catherine Gasnier Date: Mon, 9 Sep 2024 05:58:34 -0700 Subject: [PATCH 7139/7387] watchman: when `project-metadata` isn't provided, don't add it to the XDB query Summary: When `project-metadata` isn't provided in the watchman query, instead of adding `AND project_metadata = ""` to the XDB query, just don't add anything. We then need to bubble up the project_metadata from the found saved state to where we construct the manifold path for the saved state. Context: we need this for hack to be able to still get a saved state even when our config has changed. Reviewed By: kmancini Differential Revision: D61018325 fbshipit-source-id: b01b162adeed5a73fd10c2737c9da1115f0b333e --- watchman/telemetry/LogEvent.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/watchman/telemetry/LogEvent.h b/watchman/telemetry/LogEvent.h index 9428d8e54100..7ffaba528623 100644 --- a/watchman/telemetry/LogEvent.h +++ b/watchman/telemetry/LogEvent.h @@ -156,7 +156,7 @@ struct SavedState { std::string project; std::string path; int64_t commit_date = 0; - std::string metadata; + std::optional projectMetadata; std::string properties; bool success = false; @@ -169,8 +169,8 @@ struct SavedState { event.addString("path", path); } event.addInt("commit_date", commit_date); - if (!metadata.empty()) { - event.addString("metadata", metadata); + if (projectMetadata.has_value()) { + event.addString("metadata", projectMetadata.value()); } if (!properties.empty()) { event.addString("properties", properties); From f070e048d8640fd50c20bd8143848eadd804c26f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 9 Sep 2024 09:32:08 -0700 Subject: [PATCH 7140/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/e5227023f002cd2c2d3f3ede03a36c496b145672 https://github.com/facebook/fb303/commit/682d826cd2416497f3da75e3b7fdd30ab545ad9c https://github.com/facebook/fbthrift/commit/2af7c9b50f0473be232f57ec43a3af0b5fab8a68 https://github.com/facebook/mvfst/commit/eba2ba9efcf7dd49e0a86145a8ec5fdf8e1b0379 https://github.com/facebook/proxygen/commit/ed7fc292df3d21501d9f7792721313ea39a0dd76 https://github.com/facebook/wangle/commit/97997d1dbfd2154631d04f0fe3759d2e15638576 https://github.com/facebookexperimental/rust-shed/commit/31de5124018f2d3e48e32e6a60ed12813a9715b4 Reviewed By: ajb85 fbshipit-source-id: cd36e31c8446bcab7cb18d50a23645351d1ca98d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 848b5913cecb..5aef49a72f27 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9ccdb9673696d158806ff87be8594a05be6180df +Subproject commit 2af7c9b50f0473be232f57ec43a3af0b5fab8a68 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 25e7c056a2d5..8fdc1657a215 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit aace5ca19743008d0efcabc750ad440b20c4f43e +Subproject commit 97997d1dbfd2154631d04f0fe3759d2e15638576 From 1c7a5d7f5031207041fefa91d1b1cb7f97d046f7 Mon Sep 17 00:00:00 2001 From: Michael Cuevas Date: Mon, 9 Sep 2024 11:40:18 -0700 Subject: [PATCH 7141/7387] add DigestSize to list of possible file attributes Summary: # Context: We are currently overloading the pre-existing attributes `FILE_SIZE` and `BLAKE3` to mean different things depending on whether directory or file attributes are being fetched from the readdir/getAttributesFromFilesV2 endpoint. In the file case, file_size means the size of the file on disk. In the directory case, it means the size of the directory digest that's stored in RE's Content Addressed Store (CAS). In the file case, blake3 means the blake3 hash of that single file. In the directory case, blake3 means the blake3 hash of the directory digest that's stored in RE CAS. It's no longer fine to overload the blake3 hash case since existing users of the blake3 attribute do NOT expect the number of results to increase. Therefore, we will have to introduce a separate attribute for requesting hashes of directories that won't interfere with the current usage of blake3 attribute requests. # Solution We should introduce a new attribute for query RE CAS digest size information for directories. This will allow us to avoid overloading the existing size/blake3 attributes and instead allow users to specifically query for CAS digest size/hash if they want it. This attribute will be queriable for both directories and files. However, for files it will behave the exact same way as requesting the existing file_size/blake3 attribute. # This diff This diff introduces the digest size attribute. The actual implementation of this attribute is done in a later diff (to reduce the number of changes per diff). Reviewed By: liubov-dmitrieva Differential Revision: D60051556 fbshipit-source-id: 0364060242a8c4cbda14e51a0610f7dfaeb2e7bb --- eden/fs/service/eden.thrift | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 2d97d27f8255..6db5a9291822 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -309,6 +309,8 @@ enum FileAttributes { SHA1_HASH = 1, /** * Returns the size of a file. Returns an error for symlinks and directories. + * See DIGEST_SIZE if you would like to request the size of a file/directory + * that's stored in a Content Addressed Store (i.e. RE CAS). */ FILE_SIZE = 2, /** @@ -329,10 +331,21 @@ enum FileAttributes { OBJECT_ID = 8, /** - * Returns the BLAKE3 hash of a file. Returns an error for symlinks and directories, - * and non-regular files. + * Returns the BLAKE3 hash of a file or directory. Returns an error for + * symlinks and non-regular files. Note: for directories, the blake3 hash is + * the digest hash of the directory's augmented manifest. */ BLAKE3_HASH = 16, + + /** + * Returns the digest size of a given file or directory. This can be used + * together with BLAKE3_HASH to determine the key that should be used to + * fetch a given file/directory from Content Addressed Stores (i.e. RE CAS). + * For directories, the size of the augmented manifest that represents the + * the directory is returned. For files, this field is the same as FILE_SIZE. + * Returns an error for any non-directory/non-file types (symlink, exe, etc). + */ + DIGEST_SIZE = 32, /* NEXT_ATTR = 2^x */ } (cpp2.enum_type = 'uint64_t') @@ -402,6 +415,16 @@ union ObjectIdOrError { 2: EdenError error; } +union DigestSizeOrError { + // Similar to ObjectIdOrError, it's possible for `digest size` to be unset + // even if there is no error. + // + // Notably, no digest size will be returned if any child file or directory + // has been modified. + 1: i64 digestSize; + 2: EdenError error; +} + /** * Subset of attributes for a single file returned by getAttributesFromFiles() * @@ -415,6 +438,7 @@ struct FileAttributeDataV2 { 3: optional SourceControlTypeOrError sourceControlType; 4: optional ObjectIdOrError objectId; 5: optional Blake3OrError blake3; + 6: optional DigestSizeOrError digestSize; } /** From 9ad00db8917ef83dd75430508a79ca042e2aacb3 Mon Sep 17 00:00:00 2001 From: Michael Cuevas Date: Mon, 9 Sep 2024 11:40:18 -0700 Subject: [PATCH 7142/7387] add DigestHash to list of possible file attributes Summary: # Context: We are currently overloading the pre-existing attributes `FILE_SIZE` and `BLAKE3` to mean different things depending on whether directory or file attributes are being fetched from the readdir/getAttributesFromFilesV2 endpoint. In the file case, file_size means the size of the file on disk. In the directory case, it means the size of the directory digest that's stored in RE's Content Addressed Store (CAS). In the file case, blake3 means the blake3 hash of that single file. In the directory case, blake3 means the blake3 hash of the directory digest that's stored in RE CAS. It's no longer fine to overload the blake3 hash case since existing users of the blake3 attribute do NOT expect the number of results to increase. Therefore, we will have to introduce a separate attribute for requesting hashes of directories that won't interfere with the current usage of blake3 attribute requests. # Solution We should introduce a new attribute for query RE CAS digest size information for directories. This will allow us to avoid overloading the existing size/blake3 attributes and instead allow users to specifically query for CAS digest size/hash if they want it. This attribute will be queriable for both directories and files. However, for files it will behave the exact same way as requesting the existing file_size/blake3 attribute. # This diff This diff introduces the digest hash attribute. The actual implementation of this attribute is done in a later diff (to reduce the number of changes per diff). Reviewed By: jdelliot Differential Revision: D61688934 fbshipit-source-id: ea71e0b720f70739da19bd04eacca33e7b511901 --- eden/fs/service/eden.thrift | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 6db5a9291822..e1ffe85580b6 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -331,21 +331,30 @@ enum FileAttributes { OBJECT_ID = 8, /** - * Returns the BLAKE3 hash of a file or directory. Returns an error for - * symlinks and non-regular files. Note: for directories, the blake3 hash is - * the digest hash of the directory's augmented manifest. + * Returns the BLAKE3 hash of a file. Returns an error for + * symlinks, directories, and non-regular files. Note: the digest_hash can be + * requested for directories as an alternative to blake3_hash. */ BLAKE3_HASH = 16, /** * Returns the digest size of a given file or directory. This can be used - * together with BLAKE3_HASH to determine the key that should be used to + * together with DIGEST_HASH to determine the key that should be used to * fetch a given file/directory from Content Addressed Stores (i.e. RE CAS). * For directories, the size of the augmented manifest that represents the * the directory is returned. For files, this field is the same as FILE_SIZE. * Returns an error for any non-directory/non-file types (symlink, exe, etc). */ DIGEST_SIZE = 32, + + /** + * Returns the digest hash of a given file or directory. This can be used + * together with DIGEST_SIZE to determine the key that should be used to + * fetch a given file/directory from Content Addressed Stores (i.e. RE CAS). + * For files, this hash is just the blake3 hash of the given file. For + * directories, this hash is blake3 hash of all the directory's descendents. + */ + DIGEST_HASH = 64, /* NEXT_ATTR = 2^x */ } (cpp2.enum_type = 'uint64_t') @@ -425,6 +434,16 @@ union DigestSizeOrError { 2: EdenError error; } +union DigestHashOrError { + // Similar to ObjectIdOrError, it's possible for `digest hash` to be unset + // even if there is no error. + // + // Notably, no digest hash will be returned if any child file or directory + // has been modified. + 1: BinaryHash digestHash; + 2: EdenError error; +} + /** * Subset of attributes for a single file returned by getAttributesFromFiles() * @@ -439,6 +458,7 @@ struct FileAttributeDataV2 { 4: optional ObjectIdOrError objectId; 5: optional Blake3OrError blake3; 6: optional DigestSizeOrError digestSize; + 7: optional DigestHashOrError digestHash; } /** From b01cac0da2bb355b7b30508bb1d99db5876b66cb Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 10 Sep 2024 09:31:19 -0700 Subject: [PATCH 7143/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/2d80bb3bb705c5669a09268b7a7c82a1fa1ae2c0 https://github.com/facebook/fb303/commit/7b536f27f42472187c55007cace5c30d5e5c17d5 https://github.com/facebook/fbthrift/commit/7893604868c06e47f0ca4b3bbce69e725b9c7d4e https://github.com/facebook/folly/commit/110fd8f1e8a6ec3561a53a555d38fb4ecddb07ab https://github.com/facebook/mvfst/commit/4bc64398132df09e8e2ef58712e9e954b6e80fae https://github.com/facebook/proxygen/commit/3488cfddaa1bf74288c39f99b1ed33d5f7ec566e https://github.com/facebookexperimental/rust-shed/commit/c509b256bb81627d9577c2e1286815df55fda722 https://github.com/facebookincubator/fizz/commit/405edb25e500e8b83038faf5bed0f61b9f57365b Reviewed By: bigfootjon fbshipit-source-id: d2dc110f493dd7408ef1d168e707b94be602ea5e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5aef49a72f27..4bb6870edd66 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2af7c9b50f0473be232f57ec43a3af0b5fab8a68 +Subproject commit 7893604868c06e47f0ca4b3bbce69e725b9c7d4e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index cb4c50d2e1ff..026f40fd85ba 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 2fb0ca3c553c803a8c9bf6b7b4bc98f1b0a79d4e +Subproject commit 110fd8f1e8a6ec3561a53a555d38fb4ecddb07ab From e76c6c372fa6e23e562cea4fbbfe776d7dabb07d Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Wed, 11 Sep 2024 06:12:27 -0700 Subject: [PATCH 7144/7387] introduce ClientContext Summary: Were gonna thread the pid and process info through to some more places. It's better to do this as a struct so in the future we can add more context items to this struct rather than having to update paramteters in all the layers. Reviewed By: genevievehelsel Differential Revision: D62278208 fbshipit-source-id: b7bdef0cd9d7d056c70f90bb150b7922109c0168 --- watchman/ClientContext.h | 22 ++++++++++++++++++++++ watchman/cmds/find.cpp | 8 +++++++- watchman/cmds/query.cpp | 8 +++++++- watchman/cmds/since.cpp | 8 +++++++- watchman/cmds/subscribe.cpp | 8 +++++++- watchman/query/Query.h | 3 ++- watchman/root/watchlist.cpp | 2 +- 7 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 watchman/ClientContext.h diff --git a/watchman/ClientContext.h b/watchman/ClientContext.h new file mode 100644 index 000000000000..3297c62a7dc2 --- /dev/null +++ b/watchman/ClientContext.h @@ -0,0 +1,22 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +#pragma once + +#include "eden/common/utils/ProcessInfoCache.h" + +namespace watchman { +/** + * A struct containing information about the client that is triggering some + * action in watchman. Currently used for telemetry. + */ +struct ClientContext { + pid_t clientPid; + std::optional clientInfo; +}; + +} // namespace watchman diff --git a/watchman/cmds/find.cpp b/watchman/cmds/find.cpp index 080b381de834..19c04f64bea1 100644 --- a/watchman/cmds/find.cpp +++ b/watchman/cmds/find.cpp @@ -6,6 +6,8 @@ */ #include "watchman/Client.h" +#include "watchman/ClientContext.h" +#include "watchman/ProcessUtil.h" #include "watchman/query/Query.h" #include "watchman/query/eval.h" #include "watchman/query/parse.h" @@ -27,7 +29,11 @@ static UntypedResponse cmd_find(Client* client, const json_ref& args) { if (client->client_mode) { query->sync_timeout = std::chrono::milliseconds(0); } - query->clientPid = client->stm ? client->stm->getPeerProcessID() : 0; + auto clientPid = client->stm ? client->stm->getPeerProcessID() : 0; + query->clientInfo.clientPid = clientPid; + query->clientInfo.clientInfo = clientPid + ? std::make_optional(lookupProcessInfo(clientPid)) + : std::nullopt; auto res = w_query_execute(query.get(), root, nullptr, getInterface); UntypedResponse response; diff --git a/watchman/cmds/query.cpp b/watchman/cmds/query.cpp index 0a4020b40127..4330e410b7be 100644 --- a/watchman/cmds/query.cpp +++ b/watchman/cmds/query.cpp @@ -7,6 +7,8 @@ #include "watchman/query/Query.h" #include "watchman/Client.h" +#include "watchman/ClientContext.h" +#include "watchman/ProcessUtil.h" #include "watchman/query/eval.h" #include "watchman/query/parse.h" #include "watchman/saved_state/SavedStateFactory.h" @@ -24,7 +26,11 @@ static UntypedResponse cmd_query(Client* client, const json_ref& args) { const auto& query_spec = args.at(2); auto query = parseQuery(root, query_spec); - query->clientPid = client->stm ? client->stm->getPeerProcessID() : 0; + auto clientPid = client->stm ? client->stm->getPeerProcessID() : 0; + query->clientInfo.clientPid = clientPid; + query->clientInfo.clientInfo = clientPid + ? std::make_optional(lookupProcessInfo(clientPid)) + : std::nullopt; if (client->client_mode) { query->sync_timeout = std::chrono::milliseconds(0); diff --git a/watchman/cmds/since.cpp b/watchman/cmds/since.cpp index d9089c6c77f7..a3a7115402ff 100644 --- a/watchman/cmds/since.cpp +++ b/watchman/cmds/since.cpp @@ -6,6 +6,8 @@ */ #include "watchman/Client.h" +#include "watchman/ClientContext.h" +#include "watchman/ProcessUtil.h" #include "watchman/query/Query.h" #include "watchman/query/eval.h" #include "watchman/query/parse.h" @@ -33,7 +35,11 @@ static UntypedResponse cmd_since(Client* client, const json_ref& args) { } auto query = parseQueryLegacy(root, args, 3, nullptr, clockspec, nullptr); - query->clientPid = client->stm ? client->stm->getPeerProcessID() : 0; + auto clientPid = client->stm ? client->stm->getPeerProcessID() : 0; + query->clientInfo.clientPid = clientPid; + query->clientInfo.clientInfo = clientPid + ? std::make_optional(lookupProcessInfo(clientPid)) + : std::nullopt; auto res = w_query_execute(query.get(), root, nullptr, getInterface); UntypedResponse response; diff --git a/watchman/cmds/subscribe.cpp b/watchman/cmds/subscribe.cpp index 63f32ad44cff..8416a25ddbc4 100644 --- a/watchman/cmds/subscribe.cpp +++ b/watchman/cmds/subscribe.cpp @@ -7,9 +7,11 @@ #include #include "watchman/Client.h" +#include "watchman/ClientContext.h" #include "watchman/Errors.h" #include "watchman/Logging.h" #include "watchman/MapUtil.h" +#include "watchman/ProcessUtil.h" #include "watchman/QueryableView.h" #include "watchman/query/Query.h" #include "watchman/query/eval.h" @@ -491,7 +493,11 @@ static UntypedResponse cmd_subscribe(Client* clientbase, const json_ref& args) { json_ref query_spec = args.at(3); auto query = parseQuery(root, query_spec); - query->clientPid = client->stm ? client->stm->getPeerProcessID() : 0; + auto clientPid = client->stm ? client->stm->getPeerProcessID() : 0; + query->clientInfo.clientPid = clientPid; + query->clientInfo.clientInfo = clientPid + ? std::make_optional(lookupProcessInfo(clientPid)) + : std::nullopt; query->subscriptionName = json_to_w_string(jname); auto defer_list = query_spec.get_optional("defer"); diff --git a/watchman/query/Query.h b/watchman/query/Query.h index 3e5f3ed7f598..7be10fe4c266 100644 --- a/watchman/query/Query.h +++ b/watchman/query/Query.h @@ -8,6 +8,7 @@ #pragma once #include +#include "watchman/ClientContext.h" #include "watchman/Clock.h" #include "watchman/fs/FileSystem.h" #include "watchman/thirdparty/jansson/jansson.h" @@ -96,7 +97,7 @@ struct Query { std::optional request_id; std::optional subscriptionName; - pid_t clientPid{0}; + ClientContext clientInfo{0, std::nullopt}; bool alwaysIncludeDirectories{false}; diff --git a/watchman/root/watchlist.cpp b/watchman/root/watchlist.cpp index 8d516abedaae..ec36b16c64bb 100644 --- a/watchman/root/watchlist.cpp +++ b/watchman/root/watchlist.cpp @@ -219,7 +219,7 @@ RootDebugStatus Root::getStatus() const { info.view_lock_wait_duration_milliseconds = ctx->viewLockWaitDuration.load().count(); info.state = queryState; - info.client_pid = ctx->query->clientPid; + info.client_pid = ctx->query->clientInfo.clientPid; info.request_id = ctx->query->request_id; info.query = ctx->query->query_spec; if (ctx->query->subscriptionName) { From 64b9c596332fa71b7db8f0f17377feb382bf715a Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Wed, 11 Sep 2024 06:12:27 -0700 Subject: [PATCH 7145/7387] log client in query execute Summary: As we consider potential future options for Watchman, it's helpful to know who the watchman clients are. And how many requests they are sending us. This is the log event for handing a client query. This has a bit more information about the query than the generic command dispatch log, so let's include the client information here as well. Differential Revision: D61723746 fbshipit-source-id: 9b21b2888f24dbce31c4500e6c18ee3781b7d7a7 --- watchman/query/eval.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/watchman/query/eval.cpp b/watchman/query/eval.cpp index 1bf4d5310cd0..ad23e36b1739 100644 --- a/watchman/query/eval.cpp +++ b/watchman/query/eval.cpp @@ -10,6 +10,8 @@ #include #include +#include "eden/common/utils/ProcessInfoCache.h" +#include "watchman/ClientContext.h" #include "watchman/CommandRegistry.h" #include "watchman/Errors.h" #include "watchman/PerfSample.h" @@ -163,7 +165,8 @@ static void execute_common( QueryExecute* queryExecute, PerfSample* sample, QueryResult* res, - QueryGenerator generator) { + QueryGenerator generator, + const ClientContext& clientInfo) { ctx->stopWatch.reset(); if (ctx->query->dedup_results) { @@ -263,6 +266,11 @@ static void execute_common( if (ctx->query->query_spec) { queryExecute->query = ctx->query->query_spec->toString(); } + queryExecute->meta.client_pid = clientInfo.clientPid; + queryExecute->meta.client_name = clientInfo.clientInfo.has_value() + ? facebook::eden::ProcessInfoCache::cleanProcessCommandline( + std::move(clientInfo.clientInfo.value().get().name)) + : ""; getLogger()->logEvent(*queryExecute); } @@ -480,11 +488,12 @@ QueryResult w_query_execute( QueryResult r; c.clockAtStartOfQuery = ctx.clockAtStartOfQuery; c.since = ctx.since; - execute_common(&c, nullptr, nullptr, &r, generator); + execute_common(&c, nullptr, nullptr, &r, generator, query->clientInfo); } } - execute_common(&ctx, &queryExecute, &sample, &res, generator); + execute_common( + &ctx, &queryExecute, &sample, &res, generator, query->clientInfo); return res; } From f801693cc97e8b6e901dff85e1f0c2f770cb7796 Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Wed, 11 Sep 2024 06:12:27 -0700 Subject: [PATCH 7146/7387] log client in sync to now Summary: As we consider potential future options for Watchman, it's helpful to know who the watchman clients are. And how many requests they are sending us. This is the log event for waiting to catchup with the live state of the filesystem. Clients can explicitly request this, or this can be a part of a clients larger query. Clients often have a lot of trouble with this erroring. so this is valuable information to have on a client basis. Reviewed By: genevievehelsel Differential Revision: D61723913 fbshipit-source-id: ab77264199c08ae4b673a328e0529f14e30a8927 --- watchman/Client.cpp | 5 +++++ watchman/Client.h | 3 +++ watchman/cmds/subscribe.cpp | 3 ++- watchman/cmds/watch.cpp | 4 +++- watchman/query/eval.cpp | 2 +- watchman/root/Root.h | 5 ++++- watchman/root/sync.cpp | 11 ++++++++++- 7 files changed, 28 insertions(+), 5 deletions(-) diff --git a/watchman/Client.cpp b/watchman/Client.cpp index bb6bbbe7a64c..2ba72f028089 100644 --- a/watchman/Client.cpp +++ b/watchman/Client.cpp @@ -11,6 +11,7 @@ #include #include "eden/common/utils/ProcessInfoCache.h" +#include "watchman/ClientContext.h" #include "watchman/Command.h" #include "watchman/Errors.h" #include "watchman/Logging.h" @@ -200,6 +201,10 @@ bool Client::dispatchCommand(const Command& command, CommandFlags mode) { } } +ClientContext Client::getClientInfo() const { + return ClientContext{peerPid_, peerInfo_}; +} + std::string ClientStatus::getName() const { switch (state_.load(std::memory_order_acquire)) { case THREAD_STARTING: diff --git a/watchman/Client.h b/watchman/Client.h index b217aa18be00..6bf7acb1a56e 100644 --- a/watchman/Client.h +++ b/watchman/Client.h @@ -29,6 +29,7 @@ class Command; class Root; struct Query; struct QueryResult; +struct ClientContext; class Client : public std::enable_shared_from_this { public: @@ -41,6 +42,8 @@ class Client : public std::enable_shared_from_this { void enqueueResponse(json_ref resp); void enqueueResponse(UntypedResponse resp); + ClientContext getClientInfo() const; + const uint64_t unique_id; std::unique_ptr stm; std::unique_ptr ping; diff --git a/watchman/cmds/subscribe.cpp b/watchman/cmds/subscribe.cpp index 8416a25ddbc4..112d65fd23b7 100644 --- a/watchman/cmds/subscribe.cpp +++ b/watchman/cmds/subscribe.cpp @@ -383,7 +383,8 @@ static UntypedResponse cmd_flush_subscriptions( } } - root->syncToNow(std::chrono::milliseconds(sync_timeout)); + root->syncToNow( + std::chrono::milliseconds(sync_timeout), client->getClientInfo()); UntypedResponse resp; std::vector synced; diff --git a/watchman/cmds/watch.cpp b/watchman/cmds/watch.cpp index 7aa15a89d9dc..b1853efb2458 100644 --- a/watchman/cmds/watch.cpp +++ b/watchman/cmds/watch.cpp @@ -6,6 +6,7 @@ */ #include "watchman/Client.h" +#include "watchman/ClientContext.h" #include "watchman/Command.h" #include "watchman/CommandRegistry.h" #include "watchman/Errors.h" @@ -84,7 +85,8 @@ static UntypedResponse cmd_clock(Client* client, const json_ref& args) { auto root = resolveRoot(client, args); if (sync_timeout) { - root->syncToNow(std::chrono::milliseconds(sync_timeout)); + root->syncToNow( + std::chrono::milliseconds(sync_timeout), client->getClientInfo()); } UntypedResponse resp; diff --git a/watchman/query/eval.cpp b/watchman/query/eval.cpp index ad23e36b1739..477cdd2017d9 100644 --- a/watchman/query/eval.cpp +++ b/watchman/query/eval.cpp @@ -445,7 +445,7 @@ QueryResult w_query_execute( ctx.state = QueryContextState::WaitingForCookieSync; ctx.stopWatch.reset(); try { - auto result = root->syncToNow(query->sync_timeout); + auto result = root->syncToNow(query->sync_timeout, query->clientInfo); res.debugInfo.cookieFileNames = std::move(result.cookieFileNames); } catch (const std::exception& exc) { QueryExecError::throwf("synchronization failed: {}", exc.what()); diff --git a/watchman/root/Root.h b/watchman/root/Root.h index 5a8bd41eec36..775231c758ab 100644 --- a/watchman/root/Root.h +++ b/watchman/root/Root.h @@ -33,6 +33,7 @@ struct TriggerCommand; class QueryableView; struct QueryContext; struct RootMetadata; +struct ClientContext; enum ClientStateDisposition { PendingEnter, @@ -326,7 +327,9 @@ class Root : public RootConfig, public std::enable_shared_from_this { void performAgeOut(std::chrono::seconds min_age); folly::SemiFuture waitForSettle( std::chrono::milliseconds settle_period); - CookieSync::SyncResult syncToNow(std::chrono::milliseconds timeout); + CookieSync::SyncResult syncToNow( + std::chrono::milliseconds timeout, + const ClientContext& client_info); void scheduleRecrawl(const char* why); void recrawlTriggered(const char* why); diff --git a/watchman/root/sync.cpp b/watchman/root/sync.cpp index da525049d0b8..053eb2c5d369 100644 --- a/watchman/root/sync.cpp +++ b/watchman/root/sync.cpp @@ -5,6 +5,8 @@ * LICENSE file in the root directory of this source tree. */ +#include "eden/common/utils/ProcessInfoCache.h" +#include "watchman/ClientContext.h" #include "watchman/PerfSample.h" #include "watchman/QueryableView.h" #include "watchman/root/Root.h" @@ -18,7 +20,9 @@ folly::SemiFuture Root::waitForSettle( return view()->waitForSettle(settle_period); } -CookieSync::SyncResult Root::syncToNow(std::chrono::milliseconds timeout) { +CookieSync::SyncResult Root::syncToNow( + std::chrono::milliseconds timeout, + const ClientContext& client_info) { PerfSample sample("sync_to_now"); SyncToNow syncToNow; auto root = shared_from_this(); @@ -40,6 +44,11 @@ CookieSync::SyncResult Root::syncToNow(std::chrono::milliseconds timeout) { getLogEventCounters(LogEventType::SyncToNowType); // Log if override set, or if we have hit the sample rate if (sample.will_log || eventCount == samplingRate) { + syncToNow.meta.client_pid = client_info.clientPid; + syncToNow.meta.client_name = client_info.clientInfo.has_value() + ? facebook::eden::ProcessInfoCache::cleanProcessCommandline( + std::move(client_info.clientInfo.value().get().name)) + : ""; syncToNow.meta.base.root = root_metadata.root_path.string(); syncToNow.meta.base.event_count = eventCount != samplingRate ? 0 : eventCount; From b7510e8f4e184dbbbab02f8853c6b1f095f9733b Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Wed, 11 Sep 2024 06:12:27 -0700 Subject: [PATCH 7147/7387] log client in saved state Summary: As we consider potential future options for Watchman, it's helpful to know who the watchman clients are. And how many requests they are sending us. These events get logged when we make a request to manifold or xdb to lookup a saved state for a client query. it would be helpful to know who is using saved states and how often for the migration. Note there is one other saved state log when we init: https://www.internalfb.com/code/fbsource/[2d856db4f0f4ad26c851b9e44cd3452b314d45a8]/fbcode/watchman/facebook/saved_state/DevInfraSavedStateXDBClient.cpp?lines=31 but we should have enough info with logging the client we actually look for the saved state. Reviewed By: genevievehelsel Differential Revision: D61724164 fbshipit-source-id: 22eb2c2d7ac0344266ff27b08323e58e10bfbbf1 --- watchman/query/eval.cpp | 3 ++- watchman/saved_state/SavedStateFactory.cpp | 8 ++++++-- watchman/saved_state/SavedStateFactory.h | 4 +++- watchman/saved_state/SavedStateInterface.h | 4 +++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/watchman/query/eval.cpp b/watchman/query/eval.cpp index 477cdd2017d9..93e24cd6ceb2 100644 --- a/watchman/query/eval.cpp +++ b/watchman/query/eval.cpp @@ -342,7 +342,8 @@ QueryResult w_query_execute( root->config, [root](RootMetadata& root_metadata) { root->collectRootMetadata(root_metadata); - }); + }, + query->clientInfo); auto savedStateResult = savedStateInterface->getMostRecentSavedState( resultClock.scmMergeBase ? resultClock.scmMergeBase->piece() : w_string_piece{}); diff --git a/watchman/saved_state/SavedStateFactory.cpp b/watchman/saved_state/SavedStateFactory.cpp index 0e60dd0e43cf..f43e36624934 100644 --- a/watchman/saved_state/SavedStateFactory.cpp +++ b/watchman/saved_state/SavedStateFactory.cpp @@ -6,6 +6,7 @@ */ #include "watchman/saved_state/SavedStateFactory.h" +#include "watchman/ClientContext.h" #include "watchman/Errors.h" #include "watchman/root/Root.h" #include "watchman/saved_state/LocalSavedStateInterface.h" @@ -21,16 +22,19 @@ std::unique_ptr getInterface( const json_ref& savedStateConfig, const SCM* scm, Configuration config, - std::function collectRootMetadata) { + std::function collectRootMetadata, + ClientContext clientInfo) { unused_parameter(config); unused_parameter(collectRootMetadata); + unused_parameter(clientInfo); #if HAVE_MANIFOLD if (storageType == "manifold") { return std::make_unique( savedStateConfig, scm, std::move(config), - std::move(collectRootMetadata)); + std::move(collectRootMetadata), + std::move(clientInfo)); } #endif if (storageType == "local") { diff --git a/watchman/saved_state/SavedStateFactory.h b/watchman/saved_state/SavedStateFactory.h index 1ccab5d719a4..9355911c5558 100644 --- a/watchman/saved_state/SavedStateFactory.h +++ b/watchman/saved_state/SavedStateFactory.h @@ -16,6 +16,7 @@ namespace watchman { struct RootMetadata; class SCM; class SavedStateInterface; +struct ClientContext; /** * Returns an appropriate SavedStateInterface implementation for the @@ -29,6 +30,7 @@ std::unique_ptr getInterface( const json_ref& savedStateConfig, const SCM* scm, Configuration config, - std::function collectRootMetadata); + std::function collectRootMetadata, + ClientContext clientInfo); } // namespace watchman diff --git a/watchman/saved_state/SavedStateInterface.h b/watchman/saved_state/SavedStateInterface.h index 0b45605aa67c..e5fe0ff735be 100644 --- a/watchman/saved_state/SavedStateInterface.h +++ b/watchman/saved_state/SavedStateInterface.h @@ -15,13 +15,15 @@ class Configuration; struct RootMetadata; class SavedStateInterface; class SCM; +struct ClientContext; using SavedStateFactory = std::unique_ptr (*)( w_string_piece storageType, const json_ref& savedStateConfig, const SCM* scm, Configuration config, - std::function collectRootMetadata); + std::function collectRootMetadata, + ClientContext clientInfo); // An interface that returns information about saved states associated with // specific source control commits. Clients using scm-aware queries can From 332614f1f176d21ee23f564526da5515c81b62b1 Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Wed, 11 Sep 2024 06:12:27 -0700 Subject: [PATCH 7148/7387] time and log eden operations Summary: As we consider potential future options for Watchman, we know that there is some overhead in adding an extra shim layer on top of eden. It would be helpful to get some ideas to contextualize how expensive the Watchman shim over Eden is today. This measures the cost of the calls watchman makes into eden and logs when in the query execute scuba event. Reviewed By: jdelliot Differential Revision: D61733227 fbshipit-source-id: 7622cd1cab6a3fd007f30f940b6cce51c6903031 --- watchman/query/QueryContext.cpp | 7 +++++++ watchman/query/QueryContext.h | 3 +++ watchman/query/eval.cpp | 6 ++++++ watchman/telemetry/LogEvent.h | 14 ++++++++++++++ watchman/watcher/eden.cpp | 9 +++++++++ 5 files changed, 39 insertions(+) diff --git a/watchman/query/QueryContext.cpp b/watchman/query/QueryContext.cpp index 0037f0e066b2..39eb5f45aa8e 100644 --- a/watchman/query/QueryContext.cpp +++ b/watchman/query/QueryContext.cpp @@ -7,6 +7,8 @@ #include "watchman/query/QueryContext.h" +#include "folly/stop_watch.h" + #include "watchman/query/Query.h" #include "watchman/query/eval.h" #include "watchman/query/parse.h" @@ -129,7 +131,9 @@ void QueryContext::fetchEvalBatchNow() { if (evalBatch_.empty()) { return; } + folly::stop_watch timer; evalBatch_.front()->batchFetchProperties(evalBatch_); + edenFilePropertiesDurationUs.fetch_add(timer.elapsed().count()); auto toProcess = std::move(evalBatch_); @@ -171,7 +175,10 @@ bool QueryContext::fetchRenderBatchNow() { if (renderBatch_.empty()) { return true; } + + folly::stop_watch timer; renderBatch_.front()->batchFetchProperties(renderBatch_); + edenFilePropertiesDurationUs.fetch_add(timer.elapsed().count()); auto toProcess = std::move(renderBatch_); diff --git a/watchman/query/QueryContext.h b/watchman/query/QueryContext.h index bcfcc32bf2a5..74379e9894f4 100644 --- a/watchman/query/QueryContext.h +++ b/watchman/query/QueryContext.h @@ -43,6 +43,9 @@ struct QueryContext : QueryContextBase { std::chrono::milliseconds(0)}; std::atomic renderDuration{ std::chrono::milliseconds(0)}; + std::atomic edenGlobFilesDurationUs{0}; + std::atomic edenChangedFilesDurationUs{0}; + std::atomic edenFilePropertiesDurationUs{0}; void generationStarted() { viewLockWaitDuration = stopWatch.lap(); diff --git a/watchman/query/eval.cpp b/watchman/query/eval.cpp index 93e24cd6ceb2..f94880153cf9 100644 --- a/watchman/query/eval.cpp +++ b/watchman/query/eval.cpp @@ -262,6 +262,12 @@ static void execute_common( queryExecute->deduped = ctx->num_deduped; queryExecute->results = ctx->resultsArray.size(); queryExecute->walked = ctx->getNumWalked(); + queryExecute->eden_glob_files_duration_us = + ctx->edenGlobFilesDurationUs.load(std::memory_order_relaxed); + queryExecute->eden_changed_files_duration_us = + ctx->edenChangedFilesDurationUs.load(std::memory_order_relaxed); + queryExecute->eden_file_properties_duration_us = + ctx->edenFilePropertiesDurationUs.load(std::memory_order_relaxed); if (ctx->query->query_spec) { queryExecute->query = ctx->query->query_spec->toString(); diff --git a/watchman/telemetry/LogEvent.h b/watchman/telemetry/LogEvent.h index 7ffaba528623..5e68e9660ffb 100644 --- a/watchman/telemetry/LogEvent.h +++ b/watchman/telemetry/LogEvent.h @@ -191,6 +191,9 @@ struct QueryExecute { int64_t results = 0; int64_t walked = 0; std::string query; + int64_t eden_glob_files_duration_us = 0; + int64_t eden_changed_files_duration_us = 0; + int64_t eden_file_properties_duration_us = 0; void populate(DynamicEvent& event) const { meta.populate(event); @@ -208,6 +211,17 @@ struct QueryExecute { if (!query.empty()) { event.addString("query", query); } + if (eden_glob_files_duration_us != 0) { + event.addInt("eden_glob_files_duration_us", eden_glob_files_duration_us); + } + if (eden_changed_files_duration_us != 0) { + event.addInt( + "eden_changed_files_duration_us", eden_changed_files_duration_us); + } + if (eden_file_properties_duration_us != 0) { + event.addInt( + "eden_file_properties_duration_us", eden_file_properties_duration_us); + } } }; diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index 231f0f61d15e..6db32ec9153b 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include #include @@ -873,6 +874,7 @@ class EdenView final : public QueryableView { listOnlyFiles = ctx->query->expr->listOnlyFiles() == QueryExpr::ReturnOnlyFiles::Yes; } + folly::stop_watch timer; auto fileInfo = globNameAndDType( client.get(), mountPoint_, @@ -880,6 +882,8 @@ class EdenView final : public QueryableView { includeDotfiles, splitGlobPattern_, listOnlyFiles); + ctx->edenGlobFilesDurationUs.store( + timer.elapsed().count(), std::memory_order_relaxed); // Filter out any ignored files filterOutPaths(fileInfo, ctx); @@ -1347,6 +1351,11 @@ class EdenView final : public QueryableView { // return a list of all possible matching files. return makeFreshInstance(ctx); } + folly::stop_watch timer; + SCOPE_EXIT { + ctx->edenChangedFilesDurationUs.store( + timer.elapsed().count(), std::memory_order_relaxed); + }; try { return getAllChangesSinceStreaming(ctx); From 4c105c3d9a32c951b28c2323b8a294a47801f412 Mon Sep 17 00:00:00 2001 From: Katie Mancini Date: Wed, 11 Sep 2024 06:45:55 -0700 Subject: [PATCH 7149/7387] replace maybe_unused Summary: Genna spotted a couple of these in D61724164. `unused_parameter` is a custom Watchman macro for unused parameters. Now there is maybe_unused and that is more standard so let's swap these out. Reviewed By: jdelliot Differential Revision: D62314836 fbshipit-source-id: ff10c155b4277716a0ef1893a149dbddc68765f9 --- watchman/fs/FSDetect.cpp | 7 ++----- watchman/saved_state/SavedStateFactory.cpp | 9 +++------ watchman/watchman_system.h | 3 --- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/watchman/fs/FSDetect.cpp b/watchman/fs/FSDetect.cpp index 1cc355f3c9dc..df1be9535126 100644 --- a/watchman/fs/FSDetect.cpp +++ b/watchman/fs/FSDetect.cpp @@ -31,15 +31,13 @@ using namespace watchman; namespace watchman { -CaseSensitivity getCaseSensitivityForPath(const char* path) { +CaseSensitivity getCaseSensitivityForPath([[maybe_unused]] const char* path) { #ifdef __APPLE__ return pathconf(path, _PC_CASE_SENSITIVE) ? CaseSensitivity::CaseSensitive : CaseSensitivity::CaseInSensitive; #elif defined(_WIN32) - unused_parameter(path); return CaseSensitivity::CaseInSensitive; #else - unused_parameter(path); return CaseSensitivity::CaseSensitive; #endif } @@ -122,7 +120,7 @@ w_string w_fstype_detect_macos_nfs(w_string fstype, w_string edenfs_indicator) { // need to have a fully comprehensive mapping of the underlying filesystem // type codes to names, just the known problematic types -w_string w_fstype(const char* path) { +w_string w_fstype([[maybe_unused]] const char* path) { #ifdef __linux__ // If possible, we prefer to read the filesystem type names from // `/proc/self/mounts` @@ -213,7 +211,6 @@ w_string w_fstype(const char* path) { } return w_string("unknown", W_STRING_UNICODE); #else - unused_parameter(path); return w_string("unknown", W_STRING_UNICODE); #endif } diff --git a/watchman/saved_state/SavedStateFactory.cpp b/watchman/saved_state/SavedStateFactory.cpp index f43e36624934..c271a022a93c 100644 --- a/watchman/saved_state/SavedStateFactory.cpp +++ b/watchman/saved_state/SavedStateFactory.cpp @@ -21,12 +21,9 @@ std::unique_ptr getInterface( w_string_piece storageType, const json_ref& savedStateConfig, const SCM* scm, - Configuration config, - std::function collectRootMetadata, - ClientContext clientInfo) { - unused_parameter(config); - unused_parameter(collectRootMetadata); - unused_parameter(clientInfo); + [[maybe_unused]] Configuration config, + [[maybe_unused]] std::function collectRootMetadata, + [[maybe_unused]] ClientContext clientInfo) { #if HAVE_MANIFOLD if (storageType == "manifold") { return std::make_unique( diff --git a/watchman/watchman_system.h b/watchman/watchman_system.h index 4a8ee3a7538b..346625eff86f 100644 --- a/watchman/watchman_system.h +++ b/watchman/watchman_system.h @@ -204,9 +204,6 @@ char* realpath(const char* filename, char* target); #define ignore_result(x) x #endif -// self-documenting hint to the compiler that we didn't use it -#define unused_parameter(x) (void)x - #ifdef __cplusplus extern "C" { #endif From f96cce8c28cdb380c930921b801c16c23984def8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 11 Sep 2024 09:30:17 -0700 Subject: [PATCH 7150/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/5c830913ee097c318dfee2d86d0c8345c95ba8d7 https://github.com/facebook/fb303/commit/83cd95f5adc34913b2a274be0f9a6339abd3fa3b https://github.com/facebook/fbthrift/commit/205e7350dd372847ed7a73250b2fbc866b93016b https://github.com/facebook/folly/commit/ac187ce0056ba209e7837d6daca339e5b2b35d42 https://github.com/facebook/mvfst/commit/396306fbdfba4918506bbf8808ff3e118206fe14 https://github.com/facebook/proxygen/commit/34f6c39d486c3b49aadb1dad53341a8b3f37f66c https://github.com/facebook/wangle/commit/d4e2e87f40e9328a0bd90cb2b3e53f79cd5d191e https://github.com/facebookexperimental/edencommon/commit/94111f612afc277ba457f4ac153d4770983057d9 https://github.com/facebookexperimental/rust-shed/commit/f8bd77d244a04eebdfbf0f00b9cd0268bc16c957 https://github.com/facebookincubator/fizz/commit/7971a06b2b81d3a0fc0cadc7e9115e01d0e4ac4b Reviewed By: bigfootjon fbshipit-source-id: 91dd7753b2812fd1366fa936906f5fce3ea6767e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4bb6870edd66..f17aea32a0f1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7893604868c06e47f0ca4b3bbce69e725b9c7d4e +Subproject commit 205e7350dd372847ed7a73250b2fbc866b93016b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 026f40fd85ba..3d70c52e0513 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 110fd8f1e8a6ec3561a53a555d38fb4ecddb07ab +Subproject commit ac187ce0056ba209e7837d6daca339e5b2b35d42 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8fdc1657a215..e5cac5da4fc8 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 97997d1dbfd2154631d04f0fe3759d2e15638576 +Subproject commit d4e2e87f40e9328a0bd90cb2b3e53f79cd5d191e From 4e438178b7870c7e9ab1bae6a3cbf7b0e985fa7d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 12 Sep 2024 09:31:41 -0700 Subject: [PATCH 7151/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/73ac84715d492ca2d7d4a18e4ebdae01fbdec2f3 https://github.com/facebook/fb303/commit/c8122ec34d3de0b3597a37ead6b90775eaaca1de https://github.com/facebook/fbthrift/commit/86c1b3d3944f240b087eface686259cfad9cc112 https://github.com/facebook/folly/commit/0efca4e6ab4bed984eb202b22db357b2e9115c77 https://github.com/facebook/mvfst/commit/f20379bfa768425677b275ce359ad76562ef451f https://github.com/facebook/proxygen/commit/0b9775978fd51ef30761ebb2d21b81e75465300c https://github.com/facebook/wangle/commit/c0e691dd81949be59e3e75f2f726044c0367db12 https://github.com/facebookexperimental/edencommon/commit/b1ae45af52008bd1a29cacb75f8deafe384d4e07 https://github.com/facebookexperimental/rust-shed/commit/e1665345ca6696348fa0aae00ec6e9bb1080c424 https://github.com/facebookincubator/fizz/commit/7144faf9fb667011277ef61ef5895c6656ea0f53 Reviewed By: bigfootjon fbshipit-source-id: 08bd830b03a60966adc856d6a3113fd57be2b9d3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f17aea32a0f1..d00ed5047e13 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 205e7350dd372847ed7a73250b2fbc866b93016b +Subproject commit 86c1b3d3944f240b087eface686259cfad9cc112 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 3d70c52e0513..006ff2bba733 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ac187ce0056ba209e7837d6daca339e5b2b35d42 +Subproject commit 0efca4e6ab4bed984eb202b22db357b2e9115c77 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index e5cac5da4fc8..23e66fd865bf 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d4e2e87f40e9328a0bd90cb2b3e53f79cd5d191e +Subproject commit c0e691dd81949be59e3e75f2f726044c0367db12 From f94dc6c3529ed267dc07e6bcad6167bab4221518 Mon Sep 17 00:00:00 2001 From: Saul Gutierrez Date: Thu, 12 Sep 2024 19:45:30 -0700 Subject: [PATCH 7152/7387] progress: return total of inodes as part of progress info Summary: Instead of adding a new thrift entry point to return the total of inodes in memory as a metric for the progress total. We have to constantly return the total as the number of inodes in memory / total of descendants of the root because this number can constantly change. Reviewed By: genevievehelsel Differential Revision: D62333019 fbshipit-source-id: 6a8bba9af3b8a8dd125d18dcf900b61f1665df8b --- eden/fs/service/eden.thrift | 1 + 1 file changed, 1 insertion(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index e1ffe85580b6..403dd98b4403 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1730,6 +1730,7 @@ struct GetBlockedFaultsResponse { struct CheckoutProgressInfo { 1: i64 updatedInodes; + 2: i64 totalInodes; } struct CheckoutNotInProgress {} From d7f2a29771be92227f2e0b07bce886961cb5c631 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 13 Sep 2024 09:32:41 -0700 Subject: [PATCH 7153/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/e885c62723c73e79ca5d384994bd0b8bbd39b8c4 https://github.com/facebook/fb303/commit/b2a8f67dea6336c34e2594dbab0ce321375da342 https://github.com/facebook/fbthrift/commit/d13f89b1ff5f091b5b003cf1a9c4d64ffe357b92 https://github.com/facebook/folly/commit/3f21ed6dd97f36ca6653b16d5b086b8b8a7efebc https://github.com/facebook/mvfst/commit/efdffec2fd1d443d8590bb600ee868391a921218 https://github.com/facebook/proxygen/commit/ac9ede6ed3ab1dff1f771ea7cf1118f8f830a470 https://github.com/facebook/wangle/commit/28c78a1ffb2f705c6541f551a90525250154d772 https://github.com/facebookexperimental/edencommon/commit/b6d6eb877ea4f89022af8163a28e400f46c07d11 https://github.com/facebookexperimental/rust-shed/commit/778ae605ef932afbdf371b143567647cac544f89 https://github.com/facebookincubator/fizz/commit/8a89459d12464166764fa3e84123505337affd62 Reviewed By: ckwalsh fbshipit-source-id: d40170021e54fab4a38f731ec601845462f3f431 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d00ed5047e13..1c2329c5b404 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 86c1b3d3944f240b087eface686259cfad9cc112 +Subproject commit d13f89b1ff5f091b5b003cf1a9c4d64ffe357b92 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 006ff2bba733..0a285856f663 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0efca4e6ab4bed984eb202b22db357b2e9115c77 +Subproject commit 3f21ed6dd97f36ca6653b16d5b086b8b8a7efebc diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 23e66fd865bf..0632a1bd38d2 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c0e691dd81949be59e3e75f2f726044c0367db12 +Subproject commit 28c78a1ffb2f705c6541f551a90525250154d772 From 7af39fbdd7928d471a9b85f109c3504cbb434520 Mon Sep 17 00:00:00 2001 From: Chris Dinh Date: Fri, 13 Sep 2024 13:25:41 -0700 Subject: [PATCH 7154/7387] Move is_eden_fs_mount to common/utils Summary: Moves is_eden_fs_mount out of watchman into eden/common/utils This function checks if an entry in the mount table is an edenfs mount by seeing if it starts with `edenfs:` The intention is to have a single source of determining what entries are eden mounts to prevent duplicated code TARGETS changes by autodeps Reviewed By: genevievehelsel Differential Revision: D62528347 fbshipit-source-id: b1edf7e811334de815c5255e5d3dc9536d177fb8 --- watchman/fs/FSDetect.cpp | 6 ++++-- watchman/fs/FSDetect.h | 4 ---- watchman/watcher/eden.cpp | 3 ++- watchman/watcher/inotify.cpp | 3 ++- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/watchman/fs/FSDetect.cpp b/watchman/fs/FSDetect.cpp index df1be9535126..daec91dd4963 100644 --- a/watchman/fs/FSDetect.cpp +++ b/watchman/fs/FSDetect.cpp @@ -8,6 +8,7 @@ #include "watchman/fs/FSDetect.h" #include #include +#include "eden/common/utils/FSDetect.h" #include "watchman/fs/FileDescriptor.h" #include "watchman/watchman_system.h" @@ -84,7 +85,7 @@ std::optional find_fstype_in_linux_proc_mounts( // device name. In general, we don't want watchman to be used // over nfs, so in all cases except eden we still use "nfs" // as the type. - if (is_edenfs_fs_type(device)) { + if (facebook::eden::is_edenfs_fs_type(device)) { bestVfsType = device; } else { bestVfsType = vfstype; @@ -108,7 +109,8 @@ std::optional find_fstype_in_linux_proc_mounts( } w_string w_fstype_detect_macos_nfs(w_string fstype, w_string edenfs_indicator) { - if (fstype == "nfs" && is_edenfs_fs_type(edenfs_indicator)) { + if (fstype == "nfs" && + facebook::eden::is_edenfs_fs_type(edenfs_indicator.string())) { return edenfs_indicator; } return fstype; diff --git a/watchman/fs/FSDetect.h b/watchman/fs/FSDetect.h index 80415e9c01e6..d7f2759c63a9 100644 --- a/watchman/fs/FSDetect.h +++ b/watchman/fs/FSDetect.h @@ -25,7 +25,3 @@ w_string w_fstype(const char* path); std::optional find_fstype_in_linux_proc_mounts( std::string_view path, std::string_view procMountsData); - -inline bool is_edenfs_fs_type(w_string_piece fs_type) { - return fs_type == "edenfs" || fs_type.startsWith("edenfs:"); -} diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index 6db32ec9153b..1352ec161fe9 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -23,6 +23,7 @@ #include #include #include +#include "eden/common/utils/FSDetect.h" #include "eden/fs/service/gen-cpp2/StreamingEdenService.h" #include "watchman/ChildProcess.h" #include "watchman/Errors.h" @@ -1478,7 +1479,7 @@ std::shared_ptr detectEden( } #else - if (!is_edenfs_fs_type(fstype) && fstype != "fuse" && + if (!facebook::eden::is_edenfs_fs_type(fstype.string()) && fstype != "fuse" && fstype != "osxfuse_eden" && fstype != "macfuse_eden" && fstype != "edenfs_eden" && fstype != "fuse.edenfs") { // Not an active EdenFS mount. Perhaps it isn't mounted yet? diff --git a/watchman/watcher/inotify.cpp b/watchman/watcher/inotify.cpp index 4eb2d87b4f58..bfcfe514add3 100644 --- a/watchman/watcher/inotify.cpp +++ b/watchman/watcher/inotify.cpp @@ -8,6 +8,7 @@ #include #include #include +#include "eden/common/utils/FSDetect.h" #include "watchman/Constants.h" #include "watchman/Errors.h" #include "watchman/FlagMap.h" @@ -513,7 +514,7 @@ std::shared_ptr detectInotify( const w_string& root_path, const w_string& fstype, const Configuration& config) { - if (is_edenfs_fs_type(fstype)) { + if (facebook::eden::is_edenfs_fs_type(fstype.string())) { // inotify is effectively O(repo) and we know that that access // pattern is undesirable when running on top of EdenFS throw std::runtime_error("cannot watch EdenFS file systems with inotify"); From 76dbdd4c88acf20f096f88d12ca720a1d5ff31a9 Mon Sep 17 00:00:00 2001 From: Jolene Tan Date: Fri, 13 Sep 2024 13:42:01 -0700 Subject: [PATCH 7155/7387] Add liboqs to getdeps Summary: X-link: https://github.com/facebookincubator/zstrong/pull/990 * Add liboqs to getdeps * Add liboqs as dependency in fizz Differential Revision: D62399390 fbshipit-source-id: aca81633b6f35146d29a09a7ff899bddae32e14a --- build/fbcode_builder/manifests/fizz | 1 + build/fbcode_builder/manifests/liboqs | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 build/fbcode_builder/manifests/liboqs diff --git a/build/fbcode_builder/manifests/fizz b/build/fbcode_builder/manifests/fizz index 15e14ec608b3..3709ff9d6c0d 100644 --- a/build/fbcode_builder/manifests/fizz +++ b/build/fbcode_builder/manifests/fizz @@ -25,6 +25,7 @@ BUILD_TESTS = OFF [dependencies] folly +liboqs libsodium zlib zstd diff --git a/build/fbcode_builder/manifests/liboqs b/build/fbcode_builder/manifests/liboqs new file mode 100644 index 000000000000..e1aaeea1c383 --- /dev/null +++ b/build/fbcode_builder/manifests/liboqs @@ -0,0 +1,13 @@ +[manifest] +name = liboqs + +[download] +url = https://github.com/open-quantum-safe/liboqs/archive/refs/tags/0.10.1.tar.gz +sha256 = 00ca8aba65cd8c8eac00ddf978f4cac9dd23bb039f357448b60b7e3eed8f02da + +[build] +builder = cmake +subdir = liboqs-0.10.1 + +[dependencies] +openssl From 7584bd1d258725714cabbb2b693ae1d664a4d4ac Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 14 Sep 2024 09:30:21 -0700 Subject: [PATCH 7156/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/ea5ec2459035aa8f7e63c6b8cb513a999c32b62f https://github.com/facebook/fb303/commit/b3d3a95c686741ad538bd31eb22313d08adb1f86 https://github.com/facebook/fbthrift/commit/87b41dc6fc2dced282708ca2f65f0096d2987414 https://github.com/facebook/folly/commit/58f15742af8c4aa087f66d46e91ca4c3407de220 https://github.com/facebook/mvfst/commit/470ad153df07846819547b093f5960dfe79983d7 https://github.com/facebook/proxygen/commit/0a369ef413c7433066785b9fa065dfb53ae396c6 https://github.com/facebook/wangle/commit/2d616dcaf54b804dc011e3a6dd4ec587671dbdcf https://github.com/facebookexperimental/edencommon/commit/00bb0b4ba7a7ceb7d747f729ea2b4996517c9cb9 https://github.com/facebookexperimental/rust-shed/commit/7c4de16aca61c2f43388badcb8587c5815133037 https://github.com/facebookincubator/fizz/commit/84850595ddb9f21dbd6dcbf55e5782e71216d1f6 Reviewed By: bigfootjon fbshipit-source-id: 641002fc44282be159e1d042b19762490545aefa --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1c2329c5b404..6ecef14c4a16 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d13f89b1ff5f091b5b003cf1a9c4d64ffe357b92 +Subproject commit 87b41dc6fc2dced282708ca2f65f0096d2987414 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0a285856f663..8e7bc8c4c129 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 3f21ed6dd97f36ca6653b16d5b086b8b8a7efebc +Subproject commit 58f15742af8c4aa087f66d46e91ca4c3407de220 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0632a1bd38d2..2acc822e1416 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 28c78a1ffb2f705c6541f551a90525250154d772 +Subproject commit 2d616dcaf54b804dc011e3a6dd4ec587671dbdcf From cb0b42bae13a4276ec01d6bf1457cab883137b17 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Sat, 14 Sep 2024 15:42:11 -0700 Subject: [PATCH 7157/7387] regenerate github actions to update actions/upload-artifact version Summary: X-link: https://github.com/facebook/sapling/pull/946 Fix github jobs [failing with errors](https://github.com/facebook/mvfst/actions/runs/10855890595/job/30129430199) like `Error: This request has been automatically failed because it uses a deprecated version of `actions/upload-artifact: v2`. Learn more: https://github.blog/changelog/2024-02-13-deprecation-notice-v1-and-v2-of-the-artifact-actions/` Regenerated actions with: `./opensource/fbcode_builder/getdeps/facebook/update-all-github-actions.sh` This also shows some changes from D62399390 as actions weren't fully regenerated on that diff. Reviewed By: JakobDegen Differential Revision: D62685074 fbshipit-source-id: b6735022e7f58274b3f78f289b72ae7b2c8d9d7b --- .github/workflows/getdeps_linux.yml | 14 +++++++++++++- .github/workflows/getdeps_mac.yml | 10 +++++++++- .github/workflows/getdeps_windows.yml | 10 +++++++++- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/.github/workflows/getdeps_linux.yml b/.github/workflows/getdeps_linux.yml index b4feb95c211e..5c42165de275 100644 --- a/.github/workflows/getdeps_linux.yml +++ b/.github/workflows/getdeps_linux.yml @@ -42,6 +42,8 @@ jobs: run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zstd - name: Fetch double-conversion run: python3 build/fbcode_builder/getdeps.py fetch --no-tests double-conversion + - name: Fetch fast_float + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fast_float - name: Fetch libdwarf run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libdwarf - name: Fetch libevent @@ -58,6 +60,10 @@ jobs: run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zlib - name: Fetch bz2 run: python3 build/fbcode_builder/getdeps.py fetch --no-tests bz2 + - name: Fetch openssl + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests openssl + - name: Fetch liboqs + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests liboqs - name: Fetch autoconf run: python3 build/fbcode_builder/getdeps.py fetch --no-tests autoconf - name: Fetch automake @@ -114,6 +120,8 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --no-tests zstd - name: Build double-conversion run: python3 build/fbcode_builder/getdeps.py build --no-tests double-conversion + - name: Build fast_float + run: python3 build/fbcode_builder/getdeps.py build --no-tests fast_float - name: Build libdwarf run: python3 build/fbcode_builder/getdeps.py build --no-tests libdwarf - name: Build libevent @@ -130,6 +138,10 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --no-tests zlib - name: Build bz2 run: python3 build/fbcode_builder/getdeps.py build --no-tests bz2 + - name: Build openssl + run: python3 build/fbcode_builder/getdeps.py build --no-tests openssl + - name: Build liboqs + run: python3 build/fbcode_builder/getdeps.py build --no-tests liboqs - name: Build autoconf run: python3 build/fbcode_builder/getdeps.py build --no-tests autoconf - name: Build automake @@ -168,7 +180,7 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --src-dir=. watchman --project-install-prefix watchman:/usr/local - name: Copy artifacts run: python3 build/fbcode_builder/getdeps.py fixup-dyn-deps --strip --src-dir=. watchman _artifacts/linux --project-install-prefix watchman:/usr/local --final-install-prefix /usr/local - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: watchman path: _artifacts diff --git a/.github/workflows/getdeps_mac.yml b/.github/workflows/getdeps_mac.yml index 257d5ad32c0f..2efafe96ea58 100644 --- a/.github/workflows/getdeps_mac.yml +++ b/.github/workflows/getdeps_mac.yml @@ -42,6 +42,8 @@ jobs: run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zstd - name: Fetch double-conversion run: python3 build/fbcode_builder/getdeps.py fetch --no-tests double-conversion + - name: Fetch fast_float + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fast_float - name: Fetch libdwarf run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libdwarf - name: Fetch lz4 @@ -56,6 +58,8 @@ jobs: run: python3 build/fbcode_builder/getdeps.py fetch --no-tests python-setuptools - name: Fetch libevent run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libevent + - name: Fetch liboqs + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests liboqs - name: Fetch zlib run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zlib - name: Fetch autoconf @@ -104,6 +108,8 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --no-tests zstd - name: Build double-conversion run: python3 build/fbcode_builder/getdeps.py build --no-tests double-conversion + - name: Build fast_float + run: python3 build/fbcode_builder/getdeps.py build --no-tests fast_float - name: Build libdwarf run: python3 build/fbcode_builder/getdeps.py build --no-tests libdwarf - name: Build lz4 @@ -118,6 +124,8 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --no-tests python-setuptools - name: Build libevent run: python3 build/fbcode_builder/getdeps.py build --no-tests libevent + - name: Build liboqs + run: python3 build/fbcode_builder/getdeps.py build --no-tests liboqs - name: Build zlib run: python3 build/fbcode_builder/getdeps.py build --no-tests zlib - name: Build autoconf @@ -148,7 +156,7 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --src-dir=. watchman --project-install-prefix watchman:/usr/local - name: Copy artifacts run: python3 build/fbcode_builder/getdeps.py fixup-dyn-deps --src-dir=. watchman _artifacts/mac --project-install-prefix watchman:/usr/local --final-install-prefix /usr/local - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: watchman path: _artifacts diff --git a/.github/workflows/getdeps_windows.yml b/.github/workflows/getdeps_windows.yml index 9f51779baaf3..795be8b72729 100644 --- a/.github/workflows/getdeps_windows.yml +++ b/.github/workflows/getdeps_windows.yml @@ -51,6 +51,8 @@ jobs: run: python build/fbcode_builder/getdeps.py fetch --no-tests zstd - name: Fetch double-conversion run: python build/fbcode_builder/getdeps.py fetch --no-tests double-conversion + - name: Fetch fast_float + run: python build/fbcode_builder/getdeps.py fetch --no-tests fast_float - name: Fetch libdwarf run: python build/fbcode_builder/getdeps.py fetch --no-tests libdwarf - name: Fetch lz4 @@ -71,6 +73,8 @@ jobs: run: python build/fbcode_builder/getdeps.py fetch --no-tests libevent - name: Fetch folly run: python build/fbcode_builder/getdeps.py fetch --no-tests folly + - name: Fetch liboqs + run: python build/fbcode_builder/getdeps.py fetch --no-tests liboqs - name: Fetch fizz run: python build/fbcode_builder/getdeps.py fetch --no-tests fizz - name: Fetch mvfst @@ -107,6 +111,8 @@ jobs: run: python build/fbcode_builder/getdeps.py build --no-tests zstd - name: Build double-conversion run: python build/fbcode_builder/getdeps.py build --no-tests double-conversion + - name: Build fast_float + run: python build/fbcode_builder/getdeps.py build --no-tests fast_float - name: Build libdwarf run: python build/fbcode_builder/getdeps.py build --no-tests libdwarf - name: Build lz4 @@ -127,6 +133,8 @@ jobs: run: python build/fbcode_builder/getdeps.py build --no-tests libevent - name: Build folly run: python build/fbcode_builder/getdeps.py build --no-tests folly + - name: Build liboqs + run: python build/fbcode_builder/getdeps.py build --no-tests liboqs - name: Build fizz run: python build/fbcode_builder/getdeps.py build --no-tests fizz - name: Build mvfst @@ -143,7 +151,7 @@ jobs: run: python build/fbcode_builder/getdeps.py build --src-dir=. watchman - name: Copy artifacts run: python build/fbcode_builder/getdeps.py fixup-dyn-deps --src-dir=. watchman _artifacts/windows --final-install-prefix /usr/local - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: watchman path: _artifacts From 97be47dc4aaeedd93e631d48df11c891cd6332b9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 15 Sep 2024 09:31:01 -0700 Subject: [PATCH 7158/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/9445fd5d2ee32cdf39d3d94c2116af52a9c8c586 https://github.com/facebook/fbthrift/commit/498349f983f3d4ba8b514129e61afc6c8f479746 https://github.com/facebook/folly/commit/8a5e31a1ce42d05133b9b2951f2bb0345cea93cc https://github.com/facebook/mvfst/commit/427d8ec34a5ad81f7c03785e6cca84af60902c77 https://github.com/facebook/proxygen/commit/9a4ccabfe095764f23efd6d2ea342694c733e6ba https://github.com/facebook/wangle/commit/6ae7e1997b758a4877b70b447655c5c260155912 https://github.com/facebookexperimental/edencommon/commit/fcc5375fdde34a86811734beaaff1e66cf9a8ff8 https://github.com/facebookexperimental/rust-shed/commit/92c06f22729f8d10054c66c202b1f6f5a66b40e6 https://github.com/facebookincubator/fizz/commit/e7642d8a878941d38ba9db1b04527db0d24294fe Reviewed By: bigfootjon fbshipit-source-id: 96260fc2293aaae68c871b6ab980a7f6d3518bec --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6ecef14c4a16..ba45224d11e8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 87b41dc6fc2dced282708ca2f65f0096d2987414 +Subproject commit 498349f983f3d4ba8b514129e61afc6c8f479746 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8e7bc8c4c129..736971dc9edf 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 58f15742af8c4aa087f66d46e91ca4c3407de220 +Subproject commit 8a5e31a1ce42d05133b9b2951f2bb0345cea93cc diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2acc822e1416..b347b5b485b3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2d616dcaf54b804dc011e3a6dd4ec587671dbdcf +Subproject commit 6ae7e1997b758a4877b70b447655c5c260155912 From d69f0f97588bec46a93465404663910c24a367fe Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 16 Sep 2024 09:32:05 -0700 Subject: [PATCH 7159/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/17ab7afe7270b57ca9f810e896b7bbcfd700375f https://github.com/facebook/fb303/commit/dd6f8d09407455260cf0713db2e116cfa19acab4 https://github.com/facebook/fbthrift/commit/e3d27fc1f7ddbfdd6fa9a9722b20fe75f53209bc https://github.com/facebook/folly/commit/f7189afafc220bf1fea3aa118158cf0b7ad6b9ed https://github.com/facebook/mvfst/commit/843c8bd50a11fd551ac973ca2ae84cb130ed2807 https://github.com/facebook/proxygen/commit/376776a7a966552ce1849f4624ce40668932e263 https://github.com/facebook/wangle/commit/3e96366fb9a4366b0b191718d9cc1af992442b72 https://github.com/facebookexperimental/edencommon/commit/09f3e3543b29a35d2287f96aef641c2f2ea07d82 https://github.com/facebookexperimental/rust-shed/commit/6c16de2e50f8f38a65e3dbc4ca41772471c0f803 https://github.com/facebookincubator/fizz/commit/15356f47e089a115d859a000bd5f7c33581c6505 Reviewed By: bigfootjon fbshipit-source-id: b04cc4e1faf9a3b81bea41816036b3913117629b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ba45224d11e8..cb4d6e6b6cb6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 498349f983f3d4ba8b514129e61afc6c8f479746 +Subproject commit e3d27fc1f7ddbfdd6fa9a9722b20fe75f53209bc diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 736971dc9edf..f6f0c37ed808 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 8a5e31a1ce42d05133b9b2951f2bb0345cea93cc +Subproject commit f7189afafc220bf1fea3aa118158cf0b7ad6b9ed diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b347b5b485b3..97aab93396d9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6ae7e1997b758a4877b70b447655c5c260155912 +Subproject commit 3e96366fb9a4366b0b191718d9cc1af992442b72 From 875864ab853c56622cf5ab442fac0dc171ed788e Mon Sep 17 00:00:00 2001 From: Paul Cruz Date: Mon, 16 Sep 2024 12:15:39 -0700 Subject: [PATCH 7160/7387] Move to use libcurl-minimal Summary: X-link: https://github.com/facebookincubator/zstrong/pull/992 OSS Builds currently fail due to libcurl conflicting with libcurl-minimal. As far as I can tell, there are no blockers for moving FBOSS to use libcurl-minimal instead of libcurl. Reviewed By: srikrishnagopu Differential Revision: D62759136 Privacy Context Container: L1125642 fbshipit-source-id: 79aa7fcc6f651cc074198f94e688b34b629a997f --- build/fbcode_builder/manifests/libcurl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/manifests/libcurl b/build/fbcode_builder/manifests/libcurl index 8c94e4679d98..cc2ac3992733 100644 --- a/build/fbcode_builder/manifests/libcurl +++ b/build/fbcode_builder/manifests/libcurl @@ -3,7 +3,7 @@ name = libcurl [rpms] libcurl-devel -libcurl +libcurl-minimal [debs] libcurl4-openssl-dev From 65ae9ab3544fa26dfdbec789c9ab30a87c22d0df Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 17 Sep 2024 09:33:56 -0700 Subject: [PATCH 7161/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/bd961d004d92f38cbf78a67dd203e8a7c4b1197e https://github.com/facebook/fb303/commit/456b5f6aead5a7b962dd03cac8e6a57e83157b01 https://github.com/facebook/fbthrift/commit/f6a4c13e9f0b7f533bfbe3b406195b709495d677 https://github.com/facebook/folly/commit/5bf165e94f530215b27b87a755dc4d27e5e2ce12 https://github.com/facebook/mvfst/commit/07f2980f437dfa7cf268830ff44e91e35188612c https://github.com/facebook/proxygen/commit/fd113a242bf0579756b00d8f7e0e86b6cd88b016 https://github.com/facebook/wangle/commit/9c04131911b53b3c336a13ca63eacd0548636f32 https://github.com/facebookexperimental/edencommon/commit/b4603c3b674fac78d1820e4a3c65a7cdfd8ab17a https://github.com/facebookexperimental/rust-shed/commit/008e5e5be7910ec8621b676a7ca907dea490b729 https://github.com/facebookincubator/fizz/commit/7215f1d7215ef80b298a0ac58cb421790a22c817 Reviewed By: zpao fbshipit-source-id: e9545fbb87632f26fa75474451684c107acf2c5b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cb4d6e6b6cb6..347db4637d5e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e3d27fc1f7ddbfdd6fa9a9722b20fe75f53209bc +Subproject commit f6a4c13e9f0b7f533bfbe3b406195b709495d677 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f6f0c37ed808..0f71562de2a4 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f7189afafc220bf1fea3aa118158cf0b7ad6b9ed +Subproject commit 5bf165e94f530215b27b87a755dc4d27e5e2ce12 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 97aab93396d9..baf9194e5a96 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3e96366fb9a4366b0b191718d9cc1af992442b72 +Subproject commit 9c04131911b53b3c336a13ca63eacd0548636f32 From 0690fb33d326ee91e24926bb67e426ef4085671a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 18 Sep 2024 09:33:26 -0700 Subject: [PATCH 7162/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/a558b35607ec8aeb0b2d3392b0b2f1af7ef56631 https://github.com/facebook/fb303/commit/2ebed6d76e00df2364d945c47d39ff540e66a9e5 https://github.com/facebook/fbthrift/commit/b56c904d5ea16c18bc5b1a85f293c08fdd7d1c04 https://github.com/facebook/folly/commit/ccf87eb78c1a2f6f1a67c47e035909f19e97b836 https://github.com/facebook/mvfst/commit/7cf71f28bd5d8077b58f69a08f39deb42bd94e7f https://github.com/facebook/proxygen/commit/fcaf06ef153fa155d12a46d530d2c7b4f882abc2 https://github.com/facebook/wangle/commit/ba89943f55099e480b74ac47655a058f7bb99a7c https://github.com/facebookexperimental/edencommon/commit/f161f05d32d0942711e338aef945da51baab00d5 https://github.com/facebookexperimental/rust-shed/commit/d7195a87a32a77ba0000920cb8bf9799651a7aad https://github.com/facebookincubator/fizz/commit/1da7888487a744136e2c84182ff989ec0be1c608 Reviewed By: zpao fbshipit-source-id: 4bbb88ef20dfb3bcc3d466dc41c36659686d76e4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 347db4637d5e..c950faaaf168 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f6a4c13e9f0b7f533bfbe3b406195b709495d677 +Subproject commit b56c904d5ea16c18bc5b1a85f293c08fdd7d1c04 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0f71562de2a4..9e3d0469e0cc 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 5bf165e94f530215b27b87a755dc4d27e5e2ce12 +Subproject commit ccf87eb78c1a2f6f1a67c47e035909f19e97b836 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index baf9194e5a96..d22b771f136b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9c04131911b53b3c336a13ca63eacd0548636f32 +Subproject commit ba89943f55099e480b74ac47655a058f7bb99a7c From e83697295a0a90b28cb14b467c3a360b7b4af85d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 19 Sep 2024 09:34:12 -0700 Subject: [PATCH 7163/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/ea3e99bf5f8503b9ada5cb345b9f987b662d5c02 https://github.com/facebook/fb303/commit/01b236f29b6a018cd9cd907c94a72878430aa276 https://github.com/facebook/fbthrift/commit/641ff99b07051c0f1153c18174c853f8c8e380c4 https://github.com/facebook/folly/commit/7f69f881f693217889e5765fc07cbcebe8f8918a https://github.com/facebook/mvfst/commit/fcaa7648c9b43d87dea4d6edfdd57b39c0ea0d79 https://github.com/facebook/proxygen/commit/6389a6c005e984f067eba765573ccfafcb9b2bba https://github.com/facebook/wangle/commit/0b3b9880d3c0c77bbb5a61b305dfc47230e04f67 https://github.com/facebookexperimental/edencommon/commit/02f0b1ceac1c42f34f2753fd1b7dfcaeae42800c https://github.com/facebookexperimental/rust-shed/commit/bd0e45a40ee7f1804d72aba6658cf9d411546b40 https://github.com/facebookincubator/fizz/commit/c0e12052ff73b291e4249552d7c16b5c266831a0 Reviewed By: zpao fbshipit-source-id: 187901b060c1c8314dc58f74761e76eac874c2c3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c950faaaf168..62be82d27c5a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b56c904d5ea16c18bc5b1a85f293c08fdd7d1c04 +Subproject commit 641ff99b07051c0f1153c18174c853f8c8e380c4 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9e3d0469e0cc..9771f315fb58 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ccf87eb78c1a2f6f1a67c47e035909f19e97b836 +Subproject commit 7f69f881f693217889e5765fc07cbcebe8f8918a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d22b771f136b..6f26e0346f8e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ba89943f55099e480b74ac47655a058f7bb99a7c +Subproject commit 0b3b9880d3c0c77bbb5a61b305dfc47230e04f67 From 54e9c6fb1a015c3e6ec1dbf0d5c453b03cf31617 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 20 Sep 2024 09:31:19 -0700 Subject: [PATCH 7164/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/1a2ea24cd28763ed3f1f196ade1318a222a03b9b https://github.com/facebook/fb303/commit/98c63a67b10a4ef814865f4314b803a6eb7ce7f4 https://github.com/facebook/fbthrift/commit/c59cf9555077b152e260a3ce1d89a0bb9df94f36 https://github.com/facebook/folly/commit/ac00343753a8afd7f0d3eeb595725f60f025bcff https://github.com/facebook/mvfst/commit/758f593f94cf6127ddd8616cd055f2e13475a1de https://github.com/facebook/proxygen/commit/815bdf381042b9f716c1fd0de96c902c439a77e2 https://github.com/facebook/wangle/commit/ecf53bead4103807e2cb7c17afff6911dd888b1d https://github.com/facebookexperimental/edencommon/commit/d57d7410c468f27cc8b9d621e7f6305026b57f94 https://github.com/facebookexperimental/rust-shed/commit/1ecea9231088de5ab83c336865e122ad9abcffdd https://github.com/facebookincubator/fizz/commit/746af6e4f5f9cd55bc5b79fd8f2565f1e3bc8cae Reviewed By: zpao fbshipit-source-id: 2b865f110fa56daf7d1a2d4df1e806b9f7762c3a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 62be82d27c5a..25e6d4d0dbf9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 641ff99b07051c0f1153c18174c853f8c8e380c4 +Subproject commit c59cf9555077b152e260a3ce1d89a0bb9df94f36 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9771f315fb58..479bb9f24e2e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7f69f881f693217889e5765fc07cbcebe8f8918a +Subproject commit ac00343753a8afd7f0d3eeb595725f60f025bcff diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6f26e0346f8e..06644f734699 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0b3b9880d3c0c77bbb5a61b305dfc47230e04f67 +Subproject commit ecf53bead4103807e2cb7c17afff6911dd888b1d From 0b3f8549ea0805d61b5502614512ccdeb2c3504a Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Fri, 20 Sep 2024 10:39:23 -0700 Subject: [PATCH 7165/7387] fix project_install_prefix for generate-github-actions Summary: X-link: https://github.com/facebook/sapling/pull/952 fix getdeps generate-github-actions by adding missing process_project_dir_arguments. Without this couldn't specify any project_install_prefix other that the default /usr/local mononoke installs directly to getdeps inst dir so needs a project_install_prefix of / for the artifact discovery to work regenerated the gh actions with `python3 fbcode/opensource/fbcode_builder/getdeps.py generate-github-actions mononoke --os-type=linux --allow-system-packages --output-dir fbcode/eden/oss/.github/workflows --job-file-prefix mononoke_ --job-name-prefix "Mononoke " --free-up-disk --project-install-prefix mononoke:/` Resolves https://github.com/facebook/sapling/issues/922 Reviewed By: bigfootjon Differential Revision: D63031271 fbshipit-source-id: 768a4fbd7617c6061eca66b4d916ac25a4b66be9 --- build/fbcode_builder/getdeps.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index ae12922f0ce3..c8b03802495b 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -960,6 +960,7 @@ def write_job_for_platform(self, platform, args): # noqa: C901 build_opts = setup_build_options(args, platform) ctx_gen = build_opts.get_context_generator() loader = ManifestLoader(build_opts, ctx_gen) + self.process_project_dir_arguments(args, loader) manifest = loader.load_manifest(args.project) manifest_ctx = loader.ctx_gen.get_context(manifest.name) run_on = self.get_run_on(args) @@ -1147,8 +1148,10 @@ def write_job_for_platform(self, platform, args): # noqa: C901 project_prefix = "" if not build_opts.is_windows(): - project_prefix = ( - " --project-install-prefix %s:/usr/local" % manifest.name + prefix = loader.get_project_install_prefix(manifest) or "/usr/local" + project_prefix = " --project-install-prefix %s:%s" % ( + manifest.name, + prefix, ) # If we have dep from same repo, we already built it and don't want to rebuild it again From a5c8fb45db382f939ed3affac8550beca92a95cc Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Fri, 20 Sep 2024 15:35:26 -0700 Subject: [PATCH 7166/7387] restore sapling getdeps so eden/mononoke can depend on it Summary: X-link: https://github.com/facebookincubator/zstrong/pull/994 Bring a manifest for sapling back so we can test eden fs and mononoke. Their tests need the hg binary and thus a sapling manifest to depend upon How: * started with backout of 73302ef03f2d10e45a36aaa2354b4f722cd71e07 and badf6d159dada727acfb5394bd17de223b336975 X-link: https://github.com/facebook/sapling/pull/950 Reviewed By: quark-zju Differential Revision: D62978511 Pulled By: ahornby fbshipit-source-id: b614e3f10d254283a4904e9e1a6e97870a56b612 --- build/fbcode_builder/manifests/sapling | 68 ++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 build/fbcode_builder/manifests/sapling diff --git a/build/fbcode_builder/manifests/sapling b/build/fbcode_builder/manifests/sapling new file mode 100644 index 000000000000..a146b1ac8ac2 --- /dev/null +++ b/build/fbcode_builder/manifests/sapling @@ -0,0 +1,68 @@ +[manifest] +name = sapling +fbsource_path = fbcode/eden +shipit_project = eden +shipit_fbcode_builder = true + +[git] +repo_url = https://github.com/facebook/sapling.git + +[build.not(os=windows)] +builder = make +subdir = eden/scm + +[build.os=windows] +# For now the biggest blocker is missing "make" on windows, but there are bound +# to be more +builder = nop + +[make.build_args] +getdepsbuild + +[make.install_args] +install-getdeps + +[make.test_args] +test-getdeps + +[shipit.pathmap] +fbcode/configerator/structs/scm/hg = configerator/structs/scm/hg +fbcode/configerator/structs/scm/hg/public_autocargo = configerator/structs/scm/hg +fbcode/eden/oss = . +fbcode/eden = eden +fbcode/eden/fs/public_autocargo = eden/fs +fbcode/eden/mononoke/public_autocargo = eden/mononoke +fbcode/eden/scm/public_autocargo = eden/scm +fbcode/tools/lfs = tools/lfs + +[shipit.strip] +^fbcode/configerator/structs/scm/hg(?!/public_autocargo).*/Cargo\.toml$ +^fbcode/eden/addons/.*$ +^fbcode/eden/fs/eden-config\.h$ +^fbcode/eden/fs/py/eden/config\.py$ +^fbcode/eden/hg-server/.*$ +^fbcode/eden/fs(?!/public_autocargo).*/Cargo\.toml$ +^fbcode/eden/mononoke(?!/public_autocargo).*/Cargo\.toml$ +^fbcode/eden/scm(?!/public_autocargo|/edenscmnative/bindings).*/Cargo\.toml$ +^fbcode/eden/scm/build/.*$ +^fbcode/eden/website/.*$ +^fbcode/eden/.*/\.cargo/.*$ +^.*/facebook/.*$ +^.*/fb/.*$ +/Cargo\.lock$ +\.pyc$ + +[dependencies] +fb303 +fbthrift +rust-shed + +[dependencies.not(os=windows)] +python + +# We use the system openssl on linux +[dependencies.not(os=linux)] +openssl + +[dependencies.fbsource=on] +rust From a34bb742a07401fc54dec868368f69dae06fba76 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Fri, 20 Sep 2024 15:35:26 -0700 Subject: [PATCH 7167/7387] restore mononoke getdeps integration tests Summary: X-link: https://github.com/facebookincubator/zstrong/pull/995 Bring back mononoke getdeps integration tests. This is a refesh of the previously working export-D34186407 branch from 2022 Main changes since: * depend on restored sapling manifest from previous commit * bring back selected manifests needed by mononoke that were deleted in D51869247. I added the sqlite binary packages from this to the sqlite3 manifest rather than bring back the sqllite3-bin manifest * add manifests for new tools used: ripgrep, git-lfs, and zstd cli (we already had the zstd libs) * fix a few test expecations that where too closely tied to git cli or TLS version etc (ubuntu 22.04 is on older version) * getdeps MakefileBuilder.run_tests() improvements * fix error status reporting, was not failing if tests failed * pass of --num-jobs to tests to stop it OOMing my machine * pass of --filter to tests so can iterate on one test more easily Can to iterate local execution for one test with: ``` python3 ./build/fbcode_builder/getdeps.py test --num-jobs 4 --allow-system-packages --no-facebook-internal --src-dir=. mononoke_integration --retry 0 --filter server/test-gettreepack.t ``` X-link: https://github.com/facebook/sapling/pull/951 Reviewed By: quark-zju Differential Revision: D62978526 Pulled By: ahornby fbshipit-source-id: 0070a67d798bb23ee9e78e1a5149ba5364d548c9 --- build/fbcode_builder/getdeps.py | 6 ++- build/fbcode_builder/getdeps/builder.py | 17 +++++- build/fbcode_builder/manifests/git-lfs | 15 ++++++ build/fbcode_builder/manifests/jq | 25 +++++++++ .../manifests/mononoke_integration | 53 +++++++++++++++++++ build/fbcode_builder/manifests/nmap | 30 +++++++++++ build/fbcode_builder/manifests/python-click | 9 ++++ build/fbcode_builder/manifests/ripgrep | 15 ++++++ build/fbcode_builder/manifests/sqlite3 | 2 + build/fbcode_builder/manifests/tree | 37 +++++++++++++ build/fbcode_builder/manifests/zstd | 1 + 11 files changed, 207 insertions(+), 3 deletions(-) create mode 100644 build/fbcode_builder/manifests/git-lfs create mode 100644 build/fbcode_builder/manifests/jq create mode 100644 build/fbcode_builder/manifests/mononoke_integration create mode 100644 build/fbcode_builder/manifests/nmap create mode 100644 build/fbcode_builder/manifests/python-click create mode 100644 build/fbcode_builder/manifests/ripgrep create mode 100644 build/fbcode_builder/manifests/tree diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index c8b03802495b..037a695d2614 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -1193,9 +1193,13 @@ def write_job_for_platform(self, platform, args): # noqa: C901 and manifest.get("github.actions", "run_tests", ctx=manifest_ctx) != "off" ): + num_jobs_arg = "" + if args.num_jobs: + num_jobs_arg = f"--num-jobs {args.num_jobs} " + out.write(" - name: Test %s\n" % manifest.name) out.write( - f" run: {getdepscmd}{allow_sys_arg} test --src-dir=. {manifest.name} {project_prefix}\n" + f" run: {getdepscmd}{allow_sys_arg} test {num_jobs_arg}--src-dir=. {manifest.name} {project_prefix}\n" ) if build_opts.free_up_disk and not build_opts.is_windows(): out.write(" - name: Show disk space at end\n") diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 5a5ea2303b57..6ad9f2859a98 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -315,9 +315,22 @@ def run_tests(self, schedule_type, owner, test_filter, retry, no_testpilot) -> N return env = self._compute_env() + if test_filter: + env["GETDEPS_TEST_FILTER"] = test_filter + else: + env["GETDEPS_TEST_FILTER"] = "" - cmd = [self._make_binary] + self.test_args + self._get_prefix() - self._run_cmd(cmd, env=env) + if retry: + env["GETDEPS_TEST_RETRY"] = retry + else: + env["GETDEPS_TEST_RETRY"] = 0 + + cmd = ( + [self._make_binary, "-j%s" % self.num_jobs] + + self.test_args + + self._get_prefix() + ) + self._run_cmd(cmd, allow_fail=False, env=env) class CMakeBootStrapBuilder(MakeBuilder): diff --git a/build/fbcode_builder/manifests/git-lfs b/build/fbcode_builder/manifests/git-lfs new file mode 100644 index 000000000000..19b24e247080 --- /dev/null +++ b/build/fbcode_builder/manifests/git-lfs @@ -0,0 +1,15 @@ +[manifest] +name = git-lfs + +[rpms] +git-lfs + +[debs] +git-lfs + +[homebrew] +git-lfs + +# only used from system packages currently +[build] +builder = nop diff --git a/build/fbcode_builder/manifests/jq b/build/fbcode_builder/manifests/jq new file mode 100644 index 000000000000..354854b2ce87 --- /dev/null +++ b/build/fbcode_builder/manifests/jq @@ -0,0 +1,25 @@ +[manifest] +name = jq + +[rpms.distro=fedora] +jq + +[homebrew] +jq + +[download.not(os=windows)] +# we use jq-1.7+ to get fix for number truncation https://github.com/jqlang/jq/pull/1752 +url = https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-1.7.1.tar.gz +sha256 = 478c9ca129fd2e3443fe27314b455e211e0d8c60bc8ff7df703873deeee580c2 + +[build.not(os=windows)] +builder = autoconf +subdir = jq-1.7.1 + +[build.os=windows] +builder = nop + +[autoconf.args] +# This argument turns off some developers tool and it is recommended in jq's +# README +--disable-maintainer-mode diff --git a/build/fbcode_builder/manifests/mononoke_integration b/build/fbcode_builder/manifests/mononoke_integration new file mode 100644 index 000000000000..e1f171403522 --- /dev/null +++ b/build/fbcode_builder/manifests/mononoke_integration @@ -0,0 +1,53 @@ +[manifest] +name = mononoke_integration +fbsource_path = fbcode/eden +shipit_project = eden +shipit_fbcode_builder = true + +[git] +repo_url = https://github.com/facebook/sapling.git + +[build.not(os=windows)] +builder = make +subdir = eden/mononoke/tests/integration + +[build.os=windows] +# building Mononoke on windows is not supported +builder = nop + +[make.build_args] +build-getdeps + +[make.install_args] +install-getdeps + +[make.test_args] +test-getdeps + +[shipit.pathmap] +fbcode/eden/mononoke/tests/integration = eden/mononoke/tests/integration + +[shipit.strip] +^.*/facebook/.*$ +^.*/fb/.*$ + +[dependencies] +git-lfs +jq +mononoke +nmap +python +python-click +ripgrep +sapling +tree +zstd + +[dependencies.os=linux] +sqlite3 + +[dependencies.os=darwin] +gnu-bash +gnu-coreutils +gnu-grep +gnu-sed diff --git a/build/fbcode_builder/manifests/nmap b/build/fbcode_builder/manifests/nmap new file mode 100644 index 000000000000..3e935177b359 --- /dev/null +++ b/build/fbcode_builder/manifests/nmap @@ -0,0 +1,30 @@ +[manifest] +name = nmap + +[rpms] +nmap +nmap-ncat + +[debs] +nmap + +# 18.04 combines ncat into the nmap package, newer need the separate one +[debs.not(all(distro=ubuntu,distro_vers="18.04"))] +ncat + +[download.not(os=windows)] +url = https://api.github.com/repos/nmap/nmap/tarball/ef8213a36c2e89233c806753a57b5cd473605408 +sha256 = eda39e5a8ef4964fac7db16abf91cc11ff568eac0fa2d680b0bfa33b0ed71f4a + +[build.not(os=windows)] +builder = autoconf +subdir = nmap-nmap-ef8213a +build_in_src_dir = true + +[build.os=windows] +builder = nop + +[autoconf.args] +# Without this option the build was filing to find some third party libraries +# that we don't need +enable_rdma=no diff --git a/build/fbcode_builder/manifests/python-click b/build/fbcode_builder/manifests/python-click new file mode 100644 index 000000000000..ea9a9d2d3dc3 --- /dev/null +++ b/build/fbcode_builder/manifests/python-click @@ -0,0 +1,9 @@ +[manifest] +name = python-click + +[download] +url = https://files.pythonhosted.org/packages/d2/3d/fa76db83bf75c4f8d338c2fd15c8d33fdd7ad23a9b5e57eb6c5de26b430e/click-7.1.2-py2.py3-none-any.whl +sha256 = dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc + +[build] +builder = python-wheel diff --git a/build/fbcode_builder/manifests/ripgrep b/build/fbcode_builder/manifests/ripgrep new file mode 100644 index 000000000000..140a4e8aff36 --- /dev/null +++ b/build/fbcode_builder/manifests/ripgrep @@ -0,0 +1,15 @@ +[manifest] +name = ripgrep + +[rpms] +ripgrep + +[debs] +ripgrep + +[homebrew] +ripgrep + +# only used from system packages currently +[build] +builder = nop diff --git a/build/fbcode_builder/manifests/sqlite3 b/build/fbcode_builder/manifests/sqlite3 index 1966f0fab10c..5a983f8aa2e6 100644 --- a/build/fbcode_builder/manifests/sqlite3 +++ b/build/fbcode_builder/manifests/sqlite3 @@ -3,6 +3,7 @@ name = sqlite3 [debs] libsqlite3-dev +sqlite3 [homebrew] sqlite @@ -10,6 +11,7 @@ sqlite [rpms] sqlite-devel sqlite-libs +sqlite [pps] sqlite3 diff --git a/build/fbcode_builder/manifests/tree b/build/fbcode_builder/manifests/tree new file mode 100644 index 000000000000..ccd0180a74c0 --- /dev/null +++ b/build/fbcode_builder/manifests/tree @@ -0,0 +1,37 @@ +[manifest] +name = tree + +[debs] +tree + +[homebrew] +tree + +[rpms] +tree + +[download.os=linux] +url = https://salsa.debian.org/debian/tree-packaging/-/archive/debian/1.8.0-1/tree-packaging-debian-1.8.0-1.tar.gz +sha256 = a841eee1d52bfd64a48f54caab9937b9bd92935055c48885c4ab1ae4dab7fae5 + +[download.os=darwin] +# The official package of tree source requires users of non-Linux platform to +# comment/uncomment certain lines in the Makefile to build for their platform. +# Besauce getdeps.py doesn't have that functionality we just use this custom +# fork of tree which has proper lines uncommented for a OSX build +url = https://github.com/lukaspiatkowski/tree-command/archive/debian/1.8.0-1-macos.tar.gz +sha256 = 9cbe889553d95cf5a2791dd0743795d46a3c092c5bba691769c0e5c52e11229e + +[build.os=linux] +builder = make +subdir = tree-packaging-debian-1.8.0-1 + +[build.os=darwin] +builder = make +subdir = tree-command-debian-1.8.0-1-macos + +[build.os=windows] +builder = nop + +[make.install_args] +install diff --git a/build/fbcode_builder/manifests/zstd b/build/fbcode_builder/manifests/zstd index aac189fb88fb..1bd0875388f3 100644 --- a/build/fbcode_builder/manifests/zstd +++ b/build/fbcode_builder/manifests/zstd @@ -7,6 +7,7 @@ zstd # 18.04 zstd is too old [debs.not(all(distro=ubuntu,distro_vers="18.04"))] libzstd-dev +zstd [rpms] libzstd-devel From ebd2b682259efc01b22d42ed4318872909f95b0d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 21 Sep 2024 09:30:57 -0700 Subject: [PATCH 7168/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/feffe52a8eec00843452a59d041310d9166ad113 https://github.com/facebook/fb303/commit/1b3c0277ad266fdd176334783b947c9396fbfa80 https://github.com/facebook/fbthrift/commit/e65d4161b72f7bacb989c7eb0189330a1eb583af https://github.com/facebook/folly/commit/2b6830f86e8e116b2ac8ebba85a709b86cf86196 https://github.com/facebook/mvfst/commit/e2379638e548a401831ae55c91ae60077ca53a8b https://github.com/facebook/proxygen/commit/159872f25267d62215310f302e4e690055157b4c https://github.com/facebook/wangle/commit/764a5bef93773e887cbbfbe8cdcf77cc48a8a13a https://github.com/facebookexperimental/edencommon/commit/9153dec8e5048104c27e29cfaf9b9f6249bc9d33 https://github.com/facebookexperimental/rust-shed/commit/0bf890dc5375df4962ae791b2ecfbf50d649182d https://github.com/facebookincubator/fizz/commit/9ebd639f824f31ca19cf8f63d27a0156f63835db Reviewed By: zpao fbshipit-source-id: 472bc933d1017d04fd2022a72ed5dcd59ccba376 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 25e6d4d0dbf9..183d4dafb4f8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c59cf9555077b152e260a3ce1d89a0bb9df94f36 +Subproject commit e65d4161b72f7bacb989c7eb0189330a1eb583af diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 479bb9f24e2e..2964ccbd7ac5 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ac00343753a8afd7f0d3eeb595725f60f025bcff +Subproject commit 2b6830f86e8e116b2ac8ebba85a709b86cf86196 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 06644f734699..b544c984fcb5 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ecf53bead4103807e2cb7c17afff6911dd888b1d +Subproject commit 764a5bef93773e887cbbfbe8cdcf77cc48a8a13a From 882b979aebbf54aae79252d4ee6aadc74b881834 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 22 Sep 2024 09:31:47 -0700 Subject: [PATCH 7169/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/1401dccf36e1453971c2e196bd5fefb2fd2f0d51 https://github.com/facebook/fb303/commit/1dd0f5ddda057c079127587920836b746eff7195 https://github.com/facebook/fbthrift/commit/4a0ec0807a8afb58e0480766aa1a46a7fcbe989a https://github.com/facebook/mvfst/commit/3e98eaaa7b3023cd1a294ddc5c0907d1f007b8a5 https://github.com/facebook/proxygen/commit/9569a8c349c42e97dd6b8ec1b5d00400ab935900 https://github.com/facebook/wangle/commit/af6a94a81268da6d31a9af46e74c53516f035977 https://github.com/facebookexperimental/edencommon/commit/17b35e4f4fc722b9dd6baee9a3869e451a18b45b https://github.com/facebookexperimental/rust-shed/commit/ab50db28eefd5417278fb3526bc2a36d662a4c7c https://github.com/facebookincubator/fizz/commit/2c120f5c769a35b9abc975e81f14dd899edb3948 Reviewed By: zpao fbshipit-source-id: d351621e68af2f5dd3068fd5868f6781430f6aae --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 183d4dafb4f8..adafa3a27174 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e65d4161b72f7bacb989c7eb0189330a1eb583af +Subproject commit 4a0ec0807a8afb58e0480766aa1a46a7fcbe989a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b544c984fcb5..eb12d6e8c5a7 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 764a5bef93773e887cbbfbe8cdcf77cc48a8a13a +Subproject commit af6a94a81268da6d31a9af46e74c53516f035977 From 11e194fea7155ba5a42bf3e3485b25c5581fa2fe Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 23 Sep 2024 09:32:28 -0700 Subject: [PATCH 7170/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/ac6f2d1e12172d6e3516940c142df062d6bddbd6 https://github.com/facebook/fb303/commit/cd092047fcc54b03359c8a61409361f385237e10 https://github.com/facebook/fbthrift/commit/048d59c311269939ff8ddf57a10a4f40c382a1b9 https://github.com/facebook/folly/commit/dc28381834ab1c9cae55f6d3bf3a122335220ab0 https://github.com/facebook/mvfst/commit/65f742ae30923edf1d47d29be3a3ee6178f35451 https://github.com/facebook/proxygen/commit/1c51d1615eb5bbf106155536f37e9f6e986b6691 https://github.com/facebook/wangle/commit/859ca482dabb7806656ecc57562583925b313c9f https://github.com/facebookexperimental/rust-shed/commit/12645a2f09f7107de29bf0414898d22d90187d5e Reviewed By: ajb85 fbshipit-source-id: e7f42c537531507c292dd852397c251e6bd0f6ff --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index adafa3a27174..dc6aa6a10f9f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4a0ec0807a8afb58e0480766aa1a46a7fcbe989a +Subproject commit 048d59c311269939ff8ddf57a10a4f40c382a1b9 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 2964ccbd7ac5..aa4c5ae99dbd 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 2b6830f86e8e116b2ac8ebba85a709b86cf86196 +Subproject commit dc28381834ab1c9cae55f6d3bf3a122335220ab0 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index eb12d6e8c5a7..5a90469a0fe1 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit af6a94a81268da6d31a9af46e74c53516f035977 +Subproject commit 859ca482dabb7806656ecc57562583925b313c9f From b212e6baae1cc68209ff91de37fdfa9fb33ef51d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 24 Sep 2024 09:31:16 -0700 Subject: [PATCH 7171/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/d841c16c997aabd357096d0ac67058490bf9d658 https://github.com/facebook/fb303/commit/cc9644f60daed88ba48b6574c50daebceafe3d07 https://github.com/facebook/fbthrift/commit/c342b980c9acdf232d04cc0f17dd4419db6fc94e https://github.com/facebook/folly/commit/9c9430777ac2041a3d9faa9d87862f1e35e42d19 https://github.com/facebook/mvfst/commit/d93e8a0fd2cb03e4f8cfac965c4c3694e058d640 https://github.com/facebook/proxygen/commit/47e9469379d4cf31b495db1b2d01735a31b8537b https://github.com/facebook/wangle/commit/49273eba9388f21460917d6188ba36144d5a689c https://github.com/facebookexperimental/edencommon/commit/f7bb1a8f6631215d87665a71bc3545c05d0260a2 https://github.com/facebookexperimental/rust-shed/commit/1b569198d3afb1a782a28ff7fac54cfe40c74816 https://github.com/facebookincubator/fizz/commit/94040c278695fdaea7a4d2c6f34c06138c01f8cf Reviewed By: ajb85 fbshipit-source-id: 95458322494e0fbc3de3e38c509840439be00b2b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index dc6aa6a10f9f..9d6208ba427f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 048d59c311269939ff8ddf57a10a4f40c382a1b9 +Subproject commit c342b980c9acdf232d04cc0f17dd4419db6fc94e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index aa4c5ae99dbd..ae3a4735f526 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit dc28381834ab1c9cae55f6d3bf3a122335220ab0 +Subproject commit 9c9430777ac2041a3d9faa9d87862f1e35e42d19 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5a90469a0fe1..b72247cd8386 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 859ca482dabb7806656ecc57562583925b313c9f +Subproject commit 49273eba9388f21460917d6188ba36144d5a689c From 818d09a7838c6387e309b41c15b1fae5c29d0bba Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 25 Sep 2024 09:31:15 -0700 Subject: [PATCH 7172/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/766c3b721bc65baf42df0848a3a0b78aec625f7b https://github.com/facebook/fb303/commit/101a18a515213becc9a4ea7b066c1247f408246b https://github.com/facebook/fbthrift/commit/23aefd7e362ae432378df8a44fc7d7b0354eb77e https://github.com/facebook/folly/commit/536f70bc870ed7fe617900f78deac6194c552255 https://github.com/facebook/mvfst/commit/969a325a4217e94d2d17a20c7bfd46a8dfe426c6 https://github.com/facebook/proxygen/commit/17e3fc052800e62860de6fcda45e43a4927b462e https://github.com/facebook/wangle/commit/e6b370028561dd32f54dd38907c55eef05529675 https://github.com/facebookexperimental/edencommon/commit/de3dbc73a1b7b3eeaf63f648f7347f75d587f5b1 https://github.com/facebookexperimental/rust-shed/commit/037e667e695f390be258db96af01df9a3d0013c1 https://github.com/facebookincubator/fizz/commit/9a61414973e1933432d4d3ea077c5611d33de35c Reviewed By: ajb85 fbshipit-source-id: 09a5bf24ce5a625907dfd511718974388511d7a9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9d6208ba427f..20226655a7c4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c342b980c9acdf232d04cc0f17dd4419db6fc94e +Subproject commit 23aefd7e362ae432378df8a44fc7d7b0354eb77e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ae3a4735f526..fbae8d90150d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9c9430777ac2041a3d9faa9d87862f1e35e42d19 +Subproject commit 536f70bc870ed7fe617900f78deac6194c552255 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b72247cd8386..7a4eaf867aa4 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 49273eba9388f21460917d6188ba36144d5a689c +Subproject commit e6b370028561dd32f54dd38907c55eef05529675 From 7e55bb8615a4f92b11e02aafe23c77b684e0c698 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 26 Sep 2024 09:30:54 -0700 Subject: [PATCH 7173/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/48bacb3ccac7a9582c49fbea41b1ed2d638ba4ab https://github.com/facebook/fb303/commit/48bf2dd8c4bcc255b98827e576be45ae98d6b658 https://github.com/facebook/fbthrift/commit/794072cd6e425664ea15fa1f28b5f4c7da0fe97b https://github.com/facebook/folly/commit/c33e68c1676ae4082ae8eea3bb9b3d23dbf6398f https://github.com/facebook/mvfst/commit/a268c9336d291400fcd5a091f2e117d649535a91 https://github.com/facebook/proxygen/commit/642241f5bc4f1fafbf56d1003a97ee9f07faaae0 https://github.com/facebook/wangle/commit/217add600927756f3a167e68f51062b8392089ed https://github.com/facebookexperimental/edencommon/commit/55b5a75c7f449c6b8f4b9262335b21951b356c64 https://github.com/facebookexperimental/rust-shed/commit/c22f773e5375d59a3de0cd48dc67f8fc449314ae https://github.com/facebookincubator/fizz/commit/d72546955359d1702ef498d0e07bd0f4658a7757 Reviewed By: ajb85 fbshipit-source-id: e7be6cf33e5ed1b50dec46340102adf4ec5231e9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 20226655a7c4..d06edcee973b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 23aefd7e362ae432378df8a44fc7d7b0354eb77e +Subproject commit 794072cd6e425664ea15fa1f28b5f4c7da0fe97b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index fbae8d90150d..d67af099496f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 536f70bc870ed7fe617900f78deac6194c552255 +Subproject commit c33e68c1676ae4082ae8eea3bb9b3d23dbf6398f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7a4eaf867aa4..d8509b3f9fba 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e6b370028561dd32f54dd38907c55eef05529675 +Subproject commit 217add600927756f3a167e68f51062b8392089ed From 814d1ee5041b2a8801229d642b5b05ceb83845cc Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 27 Sep 2024 09:32:25 -0700 Subject: [PATCH 7174/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/c27699bdb4c0a50ce2c7fab9a055f8b31d4e7ac2 https://github.com/facebook/fb303/commit/029cea5bef4817918008b35df499fdaba86e83ee https://github.com/facebook/fbthrift/commit/574f16089326c1ba3b0c8357506bd7ddce33c842 https://github.com/facebook/folly/commit/b87bb9b92edf659f63d7d773d3e958159f49df89 https://github.com/facebook/mvfst/commit/48f66699d7d0020f8b297b55f5c181179642a415 https://github.com/facebook/proxygen/commit/c21584624193a857be2ebd0e3a110ac4121ae078 https://github.com/facebook/wangle/commit/78747ac22220608df65ae337c1ad05827fc55165 https://github.com/facebookexperimental/edencommon/commit/2d468145e0df56883a01ecd96d172dcfd56b5d71 https://github.com/facebookexperimental/rust-shed/commit/d9e7e174ef7bc7384bde2446ffa94f690b4f026a https://github.com/facebookincubator/fizz/commit/c4ee5419041d6b2267e004c109364381e60d3758 Reviewed By: ajb85 fbshipit-source-id: 8f8df9b1c3642a5b6cb87d8bf31d39f50bffaf62 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d06edcee973b..60c970876a0d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 794072cd6e425664ea15fa1f28b5f4c7da0fe97b +Subproject commit 574f16089326c1ba3b0c8357506bd7ddce33c842 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d67af099496f..de8344c1d3a4 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c33e68c1676ae4082ae8eea3bb9b3d23dbf6398f +Subproject commit b87bb9b92edf659f63d7d773d3e958159f49df89 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d8509b3f9fba..cb815106b350 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 217add600927756f3a167e68f51062b8392089ed +Subproject commit 78747ac22220608df65ae337c1ad05827fc55165 From 81a5ceedb69233a999d52d2ff5cacd1ca2ee3f49 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 28 Sep 2024 09:31:52 -0700 Subject: [PATCH 7175/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/1f7b2de93b0a6b51d852bd3750101832732a4485 https://github.com/facebook/fb303/commit/5ff7b80d4f17b23b58926942d3e6155a0f452f05 https://github.com/facebook/fbthrift/commit/180b6f18db0982f4caf90bc16640ac7b1b85d8a0 https://github.com/facebook/folly/commit/5919fbf60818770d7f48cce45b713d5b9976bf0e https://github.com/facebook/mvfst/commit/3f21e7130c7760afb75bea92eb1bbb8f75b9628d https://github.com/facebook/proxygen/commit/1b20a4858ad97269e28a8b3916febc73691f85b2 https://github.com/facebook/wangle/commit/b40784264746ddc5ce6114092f4424742690c027 https://github.com/facebookexperimental/edencommon/commit/86502f809372634971aa256957d541e07203c729 https://github.com/facebookexperimental/rust-shed/commit/755c0aadd12bc9ddbbc854b02578a75e70c58d7c https://github.com/facebookincubator/fizz/commit/b18b82571b6079a11abdb96e783f35f7d9fc8298 Reviewed By: zpao fbshipit-source-id: 358572a10d4feae64af572c93599e7fa678c049b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 60c970876a0d..15ea1580adb1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 574f16089326c1ba3b0c8357506bd7ddce33c842 +Subproject commit 180b6f18db0982f4caf90bc16640ac7b1b85d8a0 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index de8344c1d3a4..785354662ce2 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b87bb9b92edf659f63d7d773d3e958159f49df89 +Subproject commit 5919fbf60818770d7f48cce45b713d5b9976bf0e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index cb815106b350..2c7c1d12d9eb 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 78747ac22220608df65ae337c1ad05827fc55165 +Subproject commit b40784264746ddc5ce6114092f4424742690c027 From 1fb98e1d440942c93e1d621875c3b05eaa22a51a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 29 Sep 2024 09:31:55 -0700 Subject: [PATCH 7176/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ba7be027bf0fee2081475139cd508d6aedb740a8 https://github.com/facebook/fbthrift/commit/647ed9db2a9ec3fd4662ea3b1721f9a075e63910 https://github.com/facebook/mvfst/commit/55f3aef5b95d65668967f7f25a6e5e4819b0387d https://github.com/facebook/proxygen/commit/8d61e8ba535365c443b1ded1868254f204becdfd https://github.com/facebook/wangle/commit/42763fbde6996e08532d4b3e00952f5f93c485b1 https://github.com/facebookexperimental/edencommon/commit/06ea8ac0935e16a7ba7d1ed37c2ebe029922fd4c https://github.com/facebookexperimental/rust-shed/commit/c835af209cbaddf330f219c39e5a2ea74a0230eb https://github.com/facebookincubator/fizz/commit/b76106309d317291118b1a42c1fa0d184399c9a2 Reviewed By: zpao fbshipit-source-id: b52cd10c6facc2d3afe4e0a279a13f60559758ac --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 15ea1580adb1..4c4ccaf60d20 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 180b6f18db0982f4caf90bc16640ac7b1b85d8a0 +Subproject commit 647ed9db2a9ec3fd4662ea3b1721f9a075e63910 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2c7c1d12d9eb..0a718f83c442 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b40784264746ddc5ce6114092f4424742690c027 +Subproject commit 42763fbde6996e08532d4b3e00952f5f93c485b1 From 1e0ba88cfb29dd7b235d0a2181616cc9aafef539 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 30 Sep 2024 09:32:55 -0700 Subject: [PATCH 7177/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/31cbdd8d650739935265092eedf329d2b5d9a502 https://github.com/facebook/fb303/commit/c3fac541461f2ae859531b72fe4e89f67bc1393d https://github.com/facebook/fbthrift/commit/279da57c72515497beb72cb6866a840e9b73233b https://github.com/facebook/folly/commit/4ab180a3572d183f1515a5f0a9f2c4ad5bbe150a https://github.com/facebook/mvfst/commit/635b14d312e0727de88d06e13fd9d0297a3f25ba https://github.com/facebook/proxygen/commit/c8390ff34a055eb75154e640844705b645f20673 https://github.com/facebook/wangle/commit/d6c2042617c9a355b4adf5af49d7719040318c48 https://github.com/facebookexperimental/rust-shed/commit/21432c52a067cb69d4808fe6129a665d1c496c0e Reviewed By: zpao fbshipit-source-id: 25c2a76ae874088f7f250c40ef344d033ca2935f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4c4ccaf60d20..f2c572d4ebbe 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 647ed9db2a9ec3fd4662ea3b1721f9a075e63910 +Subproject commit 279da57c72515497beb72cb6866a840e9b73233b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 785354662ce2..53c69f31d2ab 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 5919fbf60818770d7f48cce45b713d5b9976bf0e +Subproject commit 4ab180a3572d183f1515a5f0a9f2c4ad5bbe150a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0a718f83c442..605a7f220eb6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 42763fbde6996e08532d4b3e00952f5f93c485b1 +Subproject commit d6c2042617c9a355b4adf5af49d7719040318c48 From 08219a74e1b344dd57087c2f65d3a6cc7ca4b41b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 1 Oct 2024 09:31:49 -0700 Subject: [PATCH 7178/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/8c867b16a494f55fa8035a1f02ef055f67acea11 https://github.com/facebook/fb303/commit/c44efc9224692ec5c4316464ce83276cd3bccf6d https://github.com/facebook/fbthrift/commit/eb4f93e75ae9db0d0a08bfb149d5461d5c83414e https://github.com/facebook/folly/commit/c6691751d28465ef2972ff99de2d6f9550f6bc03 https://github.com/facebook/mvfst/commit/818757c454d7e9f9b765ac7a4cf1ee7b9b77080b https://github.com/facebook/proxygen/commit/0b51d9383e2eae103bb238767e0053fe31014738 https://github.com/facebook/wangle/commit/14e9c12dcb583cdcba7b6725db9986427442da17 https://github.com/facebookexperimental/edencommon/commit/0c9a996b9638a24a00e389fea6407741d91263cc https://github.com/facebookexperimental/rust-shed/commit/0e76a10db518e1af3d466645b7a208f1a44241c7 https://github.com/facebookincubator/fizz/commit/6517498bd2dbd0feddd52ba307aa1618e1954ebb Reviewed By: bigfootjon fbshipit-source-id: f261b27b1b26799d4232672cd005897fdc9feb9a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f2c572d4ebbe..1a3999f9dfd6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 279da57c72515497beb72cb6866a840e9b73233b +Subproject commit eb4f93e75ae9db0d0a08bfb149d5461d5c83414e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 53c69f31d2ab..e74f54499453 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 4ab180a3572d183f1515a5f0a9f2c4ad5bbe150a +Subproject commit c6691751d28465ef2972ff99de2d6f9550f6bc03 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 605a7f220eb6..440c4a345c88 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d6c2042617c9a355b4adf5af49d7719040318c48 +Subproject commit 14e9c12dcb583cdcba7b6725db9986427442da17 From ef15ada7900584022b1ed51925b5662c631dd694 Mon Sep 17 00:00:00 2001 From: Michael Cuevas Date: Tue, 1 Oct 2024 22:02:49 -0700 Subject: [PATCH 7179/7387] add getDigestHash endpoint Summary: # Context The new AugmentedManifest format used by Sapling and Mononoke will support looking up Trees/Blobs from CAS via (Blake3,size) pairs. We already provide a way for users to get (Blake3,size) pairs for blobs, but there is currently no easy way to get this information for trees. We want to add support to getAttributesFromFilesV2 for looking up the (Blake3,size) pairs for trees as well. To do this, we'll need to add a method for querying TreeMetadata (including digest size and digest hashes) via the SaplingBackingStore. This initial implementation of TreeMetadata will only include the following features: 1) Ability to query TreeMetadata from the SaplingBackingStore via a getTreeMetadata endpoint 2) The ability to request TreeMetadata from the getAttributesFromFilesV2 thrift endpoint In the future, we will extend the implementation to support: 1) Automatically fetching TreeMetadata during BackingStore::getTree requests 2) Caching TreeMetadata in Eden's in-memory caches # This diff Adds a new thrift endpoint for requesting just the digestHash for a set of files/dirs Reviewed By: muirdm Differential Revision: D63133711 fbshipit-source-id: 7127f2c512cc315d51e0cbd4d6787fe323480065 --- eden/fs/service/eden.thrift | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 403dd98b4403..4c8925773dba 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -257,6 +257,11 @@ union Blake3Result { 2: EdenError error; } +union DigestHashResult { + 1: BinaryHash digestHash; + 2: EdenError error; +} + /** * Effectively a `struct timespec` */ @@ -1876,6 +1881,25 @@ service EdenService extends fb303_core.BaseService { 3: SyncBehavior sync, ) throws (1: EdenError ex); + /** + * For each path, returns an EdenError instead of the DIGEST_HASH if any of the + * following occur: + * - directory is materialized (directory or child is/was modified since the + * last checkout operation). + * - path identifies a non-existent file. + * - path identifies something that is not an ordinary file or directory (e.g., + * symlink or socket). + * + * Note: may return stale data if synchronizeWorkingCopy isn't called, and if + * the SyncBehavior specify a 0 timeout. see the documentation for both of + * these for more details. + */ + list getDigestHash( + 1: PathString mountPoint, + 2: list paths, + 3: SyncBehavior sync, + ) throws (1: EdenError ex); + /** * On systems that support bind mounts, establish a bind mount within the * repo such that `mountPoint / repoPath` is redirected to `targetPath`. From d71c2334a17bdfe42003aad41afdd20293c4498a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 2 Oct 2024 09:30:55 -0700 Subject: [PATCH 7180/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/992b22e4c7bf83526d420963b09e8e4d95d3dc95 https://github.com/facebook/fb303/commit/168712b5596c86e842f5081ee2b93fbc39005996 https://github.com/facebook/fbthrift/commit/c5a49793fa91714a82fd00a80ff9e956c7c61946 https://github.com/facebook/folly/commit/19095b71e7065fce8e014d29c350b2276636cefc https://github.com/facebook/mvfst/commit/f3b6c1b5b3fa297843bd5a8dbfa8668ad99945c4 https://github.com/facebook/proxygen/commit/a98ca60519c223508d22b858330a2edea584808c https://github.com/facebook/wangle/commit/ee8c9b762361800013fd894f68136ab60ad0c0c2 https://github.com/facebookexperimental/edencommon/commit/6e527ea1dd34cac59df1a0488869eeb35c42439a https://github.com/facebookexperimental/rust-shed/commit/b56255c8eb32d739dcb67706d76e89df9950ee23 https://github.com/facebookincubator/fizz/commit/0257ccf87b1be5ea330ae5ab85cb8d78ef5cd988 Reviewed By: bigfootjon fbshipit-source-id: 510323aa023398378bcff75e854aee768cb70e94 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1a3999f9dfd6..cab9e1baad5f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit eb4f93e75ae9db0d0a08bfb149d5461d5c83414e +Subproject commit c5a49793fa91714a82fd00a80ff9e956c7c61946 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e74f54499453..095c5de79008 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c6691751d28465ef2972ff99de2d6f9550f6bc03 +Subproject commit 19095b71e7065fce8e014d29c350b2276636cefc diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 440c4a345c88..348467db3f86 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 14e9c12dcb583cdcba7b6725db9986427442da17 +Subproject commit ee8c9b762361800013fd894f68136ab60ad0c0c2 From 304f5ef52f6f6f7c6333ee9f15bc79090e416f3d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 3 Oct 2024 09:32:16 -0700 Subject: [PATCH 7181/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/7b4678c529dbf4bee5a388bc4cbd84cf84e872aa https://github.com/facebook/fb303/commit/c2f47b18ee4bd5e80f1ccb4add0e6c7711d70540 https://github.com/facebook/fbthrift/commit/1adf9d37b7d0ecd4b43c0ac64ae0bc577ff880d0 https://github.com/facebook/folly/commit/46291715158e1961f87ac2942741f615cf9892a8 https://github.com/facebook/mvfst/commit/2369ecb69b41311120b0bbedc0d7843cffbe299c https://github.com/facebook/proxygen/commit/0b0e8f44003b3c564ce408048d86a43473fd0b94 https://github.com/facebook/wangle/commit/f04a1a3bfa02b551797e9f9d438483d7854848e7 https://github.com/facebookexperimental/edencommon/commit/8cd1985645dfc5edd48f45464a0e38af8f886dbd https://github.com/facebookexperimental/rust-shed/commit/1588eedae9a57b7b32c43968c6e07aa97f20e41d https://github.com/facebookincubator/fizz/commit/350c15f20b1434b8aec74c1a1c047ea31a85f664 Reviewed By: bigfootjon fbshipit-source-id: 8fd56d09daccd1cd1929f469ffffc5076c0e28f4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cab9e1baad5f..5c986e936eb9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c5a49793fa91714a82fd00a80ff9e956c7c61946 +Subproject commit 1adf9d37b7d0ecd4b43c0ac64ae0bc577ff880d0 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 095c5de79008..a8551a68678b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 19095b71e7065fce8e014d29c350b2276636cefc +Subproject commit 46291715158e1961f87ac2942741f615cf9892a8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 348467db3f86..04c354233e1d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ee8c9b762361800013fd894f68136ab60ad0c0c2 +Subproject commit f04a1a3bfa02b551797e9f9d438483d7854848e7 From 54d1c6d9b29d9a1ee94df93d4b8027c7c4d0b29c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 4 Oct 2024 09:39:06 -0700 Subject: [PATCH 7182/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/ef94481d153107dd75fa65e3d2144dbe1e97d311 https://github.com/facebook/fb303/commit/a75a0709f068edad9ffa8de20bad86e686ed81be https://github.com/facebook/fbthrift/commit/f2b0a18c1c993a5b50e430885ac5e7d226802ba4 https://github.com/facebook/folly/commit/e08c228878aaff37aa6abc348154bd5a3e1e82fb https://github.com/facebook/mvfst/commit/04ff04061bc27d1335fc0f30f71ae7d7d9c34aab https://github.com/facebook/proxygen/commit/5cf3b5b912c0ca8550ef4c026add0aa398048d8e https://github.com/facebook/wangle/commit/1a2345900f4ce8763c955dcf51fe7f25dde68f6e https://github.com/facebookexperimental/edencommon/commit/50dfb1196fc413617308a60755537e69352cfd17 https://github.com/facebookexperimental/rust-shed/commit/6454376f9ee34592e05990db2033abfe6d065a65 https://github.com/facebookincubator/fizz/commit/33c07821e15114165d969c877c15d452828d27ff Reviewed By: bigfootjon fbshipit-source-id: e797edcd2bff2b95e9a23ba6e7a08d0b16d9ab9a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5c986e936eb9..e07038f30c9a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1adf9d37b7d0ecd4b43c0ac64ae0bc577ff880d0 +Subproject commit f2b0a18c1c993a5b50e430885ac5e7d226802ba4 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a8551a68678b..ff724b4a0bec 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 46291715158e1961f87ac2942741f615cf9892a8 +Subproject commit e08c228878aaff37aa6abc348154bd5a3e1e82fb diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 04c354233e1d..111071afeb4f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f04a1a3bfa02b551797e9f9d438483d7854848e7 +Subproject commit 1a2345900f4ce8763c955dcf51fe7f25dde68f6e From c6d8be97580b625736aa59abf0a79dfb790a67a2 Mon Sep 17 00:00:00 2001 From: Michael Cuevas Date: Fri, 4 Oct 2024 13:00:11 -0700 Subject: [PATCH 7183/7387] fix ambiguous function call Summary: # This diff Qualifies format_to calls with `fmt::` so that the function call is no longer ambiguous # Context C++ 20 added std::format_to, which causes bare format_to calls to be ambiguous. We can easily fix the issue by qualifying the calls with `fmt::` as done in this diff. Reviewed By: narissiam Differential Revision: D63902777 fbshipit-source-id: ce4c9504f51c8822688829092ef709e7c9ee219b --- watchman/watchman_string.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/watchman/watchman_string.h b/watchman/watchman_string.h index 12a91e602fad..0a653f39eed5 100644 --- a/watchman/watchman_string.h +++ b/watchman/watchman_string.h @@ -559,7 +559,7 @@ struct formatter { template auto format(const w_string& s, FormatContext& ctx) const { - return format_to(ctx.out(), "{}", s.view()); + return fmt::format_to(ctx.out(), "{}", s.view()); } }; @@ -572,7 +572,7 @@ struct formatter { template auto format(const w_string_piece& s, FormatContext& ctx) const { - return format_to(ctx.out(), "{}", s.view()); + return fmt::format_to(ctx.out(), "{}", s.view()); } }; } // namespace fmt From 106f970a75d1b8c7aab29f511db210b8235a53c7 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 5 Oct 2024 09:32:26 -0700 Subject: [PATCH 7184/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/025434edb8997f95e137e5892972e130f12c4624 https://github.com/facebook/fb303/commit/b8c69bcb61fd665b2d9371cb1eb10edd558d9b1c https://github.com/facebook/fbthrift/commit/3165a438b2a8fef32621a4a7cf859435fe54f5bd https://github.com/facebook/folly/commit/bd94b9710f25d57bc766fc289ee33cc8e9496717 https://github.com/facebook/mvfst/commit/0b2743fdae9b746659815afdf00611fe7999282e https://github.com/facebook/proxygen/commit/ab45d0d48ae1358c514319f6aab94af87180d544 https://github.com/facebook/wangle/commit/7d6f71360574d6850d62834fd6ef3f6d7bf182ef https://github.com/facebookexperimental/edencommon/commit/172539a71a6a1d8fb1a3f3eed6e24fbe7942cdfa https://github.com/facebookexperimental/rust-shed/commit/28dda54c02d1f541a1bd8273ecd739e693dfc1ae https://github.com/facebookincubator/fizz/commit/7757528af1be5c72f8fd4c9f44f75857ace6e10d Reviewed By: bigfootjon fbshipit-source-id: ba05dcbfabfc16966771128ac3cf8f087ad06842 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e07038f30c9a..71e9e29a5722 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f2b0a18c1c993a5b50e430885ac5e7d226802ba4 +Subproject commit 3165a438b2a8fef32621a4a7cf859435fe54f5bd diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ff724b4a0bec..12ac8f62ea5f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e08c228878aaff37aa6abc348154bd5a3e1e82fb +Subproject commit bd94b9710f25d57bc766fc289ee33cc8e9496717 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 111071afeb4f..4a72d44ec52a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1a2345900f4ce8763c955dcf51fe7f25dde68f6e +Subproject commit 7d6f71360574d6850d62834fd6ef3f6d7bf182ef From 81177a3dfc838a6c627feb7a0b9e850cad6dbd27 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 6 Oct 2024 09:32:08 -0700 Subject: [PATCH 7185/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/59b705d5dd76d3f8dd795b4c257b2769e6f59bd4 https://github.com/facebook/fbthrift/commit/5a51fd828451f5ab6040d3e6e3596367d1104d32 https://github.com/facebook/folly/commit/4bcdc749f85e44a99c50ac9cd7249fcc3fd9431c https://github.com/facebook/mvfst/commit/26b42ea19405f4c2bf6f795fcaa966a91ff33364 https://github.com/facebook/proxygen/commit/38fca3d8d070bfd56859b81d5f83e223202fd14d https://github.com/facebook/wangle/commit/d2327eafd14609303cc9ead2017b65f1d1135b2e https://github.com/facebookexperimental/edencommon/commit/8872c1e42351c3f2bb085877e93a1adaf45a8385 https://github.com/facebookexperimental/rust-shed/commit/f3ce9b745f948c2f672ad9df8b5d69522645e28c https://github.com/facebookincubator/fizz/commit/16aaf214e42774839885cf26ef2f06eb250c2fe6 Reviewed By: bigfootjon fbshipit-source-id: 3e14627ceb67c9e071a9068d8572b310e98cc515 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 71e9e29a5722..22147ffdb42b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3165a438b2a8fef32621a4a7cf859435fe54f5bd +Subproject commit 5a51fd828451f5ab6040d3e6e3596367d1104d32 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 12ac8f62ea5f..b9f2cd9c5d5f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit bd94b9710f25d57bc766fc289ee33cc8e9496717 +Subproject commit 4bcdc749f85e44a99c50ac9cd7249fcc3fd9431c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4a72d44ec52a..019031e842d3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7d6f71360574d6850d62834fd6ef3f6d7bf182ef +Subproject commit d2327eafd14609303cc9ead2017b65f1d1135b2e From 90be79ac76344f75cf4846cfc7c7b1248788e858 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Mon, 7 Oct 2024 02:11:36 -0700 Subject: [PATCH 7186/7387] remove six usage Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1002 now that python2 is long gone, lets remove dependency on six most of the changes are in the thrift fuzzer/randomizer used in thrift tests, replacing six with what six did in the py3 case. Reviewed By: ahilger Differential Revision: D63709297 fbshipit-source-id: 2ff46ead9e2035c5e43081ddec8ae1e3d1499895 --- .github/workflows/getdeps_linux.yml | 4 ---- .github/workflows/getdeps_mac.yml | 4 ---- .github/workflows/getdeps_windows.yml | 4 ---- build/fbcode_builder/manifests/fbthrift | 1 - 4 files changed, 13 deletions(-) diff --git a/.github/workflows/getdeps_linux.yml b/.github/workflows/getdeps_linux.yml index 5c42165de275..c6323e1994e4 100644 --- a/.github/workflows/getdeps_linux.yml +++ b/.github/workflows/getdeps_linux.yml @@ -36,8 +36,6 @@ jobs: run: python3 build/fbcode_builder/getdeps.py fetch --no-tests glog - name: Fetch googletest run: python3 build/fbcode_builder/getdeps.py fetch --no-tests googletest - - name: Fetch python-six - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests python-six - name: Fetch zstd run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zstd - name: Fetch double-conversion @@ -114,8 +112,6 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --no-tests glog - name: Build googletest run: python3 build/fbcode_builder/getdeps.py build --no-tests googletest - - name: Build python-six - run: python3 build/fbcode_builder/getdeps.py build --no-tests python-six - name: Build zstd run: python3 build/fbcode_builder/getdeps.py build --no-tests zstd - name: Build double-conversion diff --git a/.github/workflows/getdeps_mac.yml b/.github/workflows/getdeps_mac.yml index 2efafe96ea58..214bd352f5f1 100644 --- a/.github/workflows/getdeps_mac.yml +++ b/.github/workflows/getdeps_mac.yml @@ -36,8 +36,6 @@ jobs: run: python3 build/fbcode_builder/getdeps.py fetch --no-tests glog - name: Fetch googletest run: python3 build/fbcode_builder/getdeps.py fetch --no-tests googletest - - name: Fetch python-six - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests python-six - name: Fetch zstd run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zstd - name: Fetch double-conversion @@ -102,8 +100,6 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --no-tests glog - name: Build googletest run: python3 build/fbcode_builder/getdeps.py build --no-tests googletest - - name: Build python-six - run: python3 build/fbcode_builder/getdeps.py build --no-tests python-six - name: Build zstd run: python3 build/fbcode_builder/getdeps.py build --no-tests zstd - name: Build double-conversion diff --git a/.github/workflows/getdeps_windows.yml b/.github/workflows/getdeps_windows.yml index 795be8b72729..6cbdf6526fa1 100644 --- a/.github/workflows/getdeps_windows.yml +++ b/.github/workflows/getdeps_windows.yml @@ -45,8 +45,6 @@ jobs: run: python build/fbcode_builder/getdeps.py fetch --no-tests googletest - name: Fetch libsodium run: python build/fbcode_builder/getdeps.py fetch --no-tests libsodium - - name: Fetch python-six - run: python build/fbcode_builder/getdeps.py fetch --no-tests python-six - name: Fetch zstd run: python build/fbcode_builder/getdeps.py fetch --no-tests zstd - name: Fetch double-conversion @@ -105,8 +103,6 @@ jobs: run: python build/fbcode_builder/getdeps.py build --no-tests googletest - name: Build libsodium run: python build/fbcode_builder/getdeps.py build --no-tests libsodium - - name: Build python-six - run: python build/fbcode_builder/getdeps.py build --no-tests python-six - name: Build zstd run: python build/fbcode_builder/getdeps.py build --no-tests zstd - name: Build double-conversion diff --git a/build/fbcode_builder/manifests/fbthrift b/build/fbcode_builder/manifests/fbthrift index 3d852d8d1c56..81fea9d64ec1 100644 --- a/build/fbcode_builder/manifests/fbthrift +++ b/build/fbcode_builder/manifests/fbthrift @@ -23,7 +23,6 @@ fmt folly googletest libsodium -python-six wangle zstd mvfst From 3695cae8cbad161e5dc0f26392858d2e2c16ea9e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 7 Oct 2024 07:31:22 -0700 Subject: [PATCH 7187/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/372d72c6a8bd5991d4e977a2a1493f6993557e71 https://github.com/facebook/fb303/commit/2bc941309c2b8a0feb6293598c5073e74c38f525 https://github.com/facebook/fbthrift/commit/efb4229b84dd75a77de99b53932b7b89d585554e https://github.com/facebook/folly/commit/45ffb40f2beebb08b37df9b81b39193a6e2057a4 https://github.com/facebook/mvfst/commit/50cf2792205bf8c430600d9bffaf2b0bdb852dd4 https://github.com/facebook/proxygen/commit/98ec40f7cc8ee671a8ca30b65871ebc4ee65ccfa https://github.com/facebook/wangle/commit/6cb8806eb0dba15224696e871b3e28606f193b98 https://github.com/facebookexperimental/edencommon/commit/894e561e84044bf36dc4e841fa8137492591962c https://github.com/facebookexperimental/rust-shed/commit/52622b11bd82b2c133576733a6d3acab5df4e73a https://github.com/facebookincubator/fizz/commit/be606990a5f6da049f30ca9f1df53df89dd1a830 Reviewed By: bigfootjon fbshipit-source-id: eff5552858a45b876f2e4155100eb73fe42153ac --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 22147ffdb42b..31eea75c1cb4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5a51fd828451f5ab6040d3e6e3596367d1104d32 +Subproject commit efb4229b84dd75a77de99b53932b7b89d585554e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index b9f2cd9c5d5f..ea01f90bfab8 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 4bcdc749f85e44a99c50ac9cd7249fcc3fd9431c +Subproject commit 45ffb40f2beebb08b37df9b81b39193a6e2057a4 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 019031e842d3..f968823b6367 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d2327eafd14609303cc9ead2017b65f1d1135b2e +Subproject commit 6cb8806eb0dba15224696e871b3e28606f193b98 From f94a669d6f36d5d2bc80071086a3a71b4611df3e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 7 Oct 2024 09:31:21 -0700 Subject: [PATCH 7188/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/c4d37d315bcc87650f0688c605bdcd92cdbd0655 https://github.com/facebook/fb303/commit/c1f74beb3889d54a5c60ae7c033947e338e249ed https://github.com/facebook/fbthrift/commit/b6f6f91a4294b03100d2c4dd512eb269fa385b2d https://github.com/facebook/mvfst/commit/8240c2cc2668b2fcc883f50dd969b6cbc229df58 https://github.com/facebook/proxygen/commit/5b60dbc668376619e0b3c418390eb4fa8dd84e4c https://github.com/facebook/wangle/commit/ae6297f4994fe0ba78f265589ac7e3c96d2215f8 https://github.com/facebookexperimental/edencommon/commit/c6da108a4a0ddbc18cd2deaa1a33af6c03425323 https://github.com/facebookexperimental/rust-shed/commit/1c8bc8fdd1a17cdb2717952b376053770215e8ca https://github.com/facebookincubator/fizz/commit/c7976216bd64502f11b1b504da7a2e26d820ea8a Reviewed By: bigfootjon fbshipit-source-id: 646fdc899a5494ec94d8411d32e219e3a1f0097a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 31eea75c1cb4..de336bbb69c8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit efb4229b84dd75a77de99b53932b7b89d585554e +Subproject commit b6f6f91a4294b03100d2c4dd512eb269fa385b2d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f968823b6367..94078754bf60 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 6cb8806eb0dba15224696e871b3e28606f193b98 +Subproject commit ae6297f4994fe0ba78f265589ac7e3c96d2215f8 From b63f0d75fe846c5503488771eddacd8c877130e0 Mon Sep 17 00:00:00 2001 From: James Gill Date: Mon, 7 Oct 2024 10:01:13 -0700 Subject: [PATCH 7189/7387] Upgrade serde_json to 1.0.125 Summary: It has some fixes from the previous 1.0.100 Reviewed By: Imxset21 Differential Revision: D63983796 fbshipit-source-id: 5dc5b48ac515d8901a942d737a1f1f1057060cad --- watchman/cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index 91e3a8b9e6db..c181ef7ec635 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -14,7 +14,7 @@ anyhow = "1.0.86" duct = "0.13.6" jwalk = "0.6" serde = { version = "1.0.185", features = ["derive", "rc"] } -serde_json = { version = "1.0.100", features = ["float_roundtrip", "unbounded_depth"] } +serde_json = { version = "1.0.125", features = ["float_roundtrip", "unbounded_depth"] } structopt = "0.3.26" sysinfo = "0.30.11" tabular = "0.2.0" From 0a62cd65d360d774e6eaa1e7a17e27a19441a0c7 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Mon, 7 Oct 2024 10:48:55 -0700 Subject: [PATCH 7190/7387] add github CI signal Summary: sapling github CI had a failure on fb303 and I wasn't sure if fb303 was itself building ok on github, so lets give fb303 a CI. * add a github action to build fb303 * delete fb303 github side packit config [as it is broken](https://github.com/facebook/fb303/pull/58/checks?check_run_id=31169950255). For folly packit was moved to copr side in D54958528 so I think this is fine. (the underlying problem causing a transient [fb303 break in sapling CI](https://github.com/facebook/sapling/actions/runs/11213566522/job/31166881318?pr=963) was that build/deps/github_hashes/facebook/fbthrift-rev.txt was lagging the code using fbthrift, and thus python libs where not installed) X-link: https://github.com/facebook/fb303/pull/58 X-link: https://github.com/facebookincubator/zstrong/pull/1006 Reviewed By: singhsrb Differential Revision: D63976936 fbshipit-source-id: 4601874a993b0e7253954815f6f119ea351f5c6d --- build/fbcode_builder/manifests/mononoke_integration | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build/fbcode_builder/manifests/mononoke_integration b/build/fbcode_builder/manifests/mononoke_integration index e1f171403522..09af47d69acb 100644 --- a/build/fbcode_builder/manifests/mononoke_integration +++ b/build/fbcode_builder/manifests/mononoke_integration @@ -45,9 +45,3 @@ zstd [dependencies.os=linux] sqlite3 - -[dependencies.os=darwin] -gnu-bash -gnu-coreutils -gnu-grep -gnu-sed From c31c7e4030ce5385307ad1d9097e8f38778b12cc Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Mon, 7 Oct 2024 13:46:20 -0700 Subject: [PATCH 7191/7387] run .t tests for getdeps sapling cli build Summary: Connect up the sapling *.t tests so that github CI has visible cli test status. To get them to run: * some needed fbpython on path. I included a shim for that in the test makefile target. * test-rust-hooks: Command not found message, added a glob * test-identity.t: add a glob for the sapling version * test-eolfilename.t: output order was unstable, added sorts to make stable * helpers-testrepo.sh: fix assumption that system hg would be able to read test repo, check if its Sapling first. * added a manifest for the hexdump utility some of the tests required * excluded a few remaining tests (see comments in Makefile for reason) * fixed getdeps support for generating actions steps for test only dependencies NB the tests run as "hg". The expectations would need to be updated if we were to run as "sl" X-link: https://github.com/facebook/sapling/pull/963 X-link: https://github.com/facebookincubator/zstrong/pull/1004 Reviewed By: quark-zju Differential Revision: D63958737 Pulled By: ahornby fbshipit-source-id: 75c0d39258c320100d8d02b31390994bc2f3a3ce --- build/fbcode_builder/getdeps.py | 31 +++++++++++++++++------- build/fbcode_builder/getdeps/manifest.py | 1 + build/fbcode_builder/manifests/hexdump | 12 +++++++++ build/fbcode_builder/manifests/sapling | 6 +++++ 4 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 build/fbcode_builder/manifests/hexdump diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 037a695d2614..8a42fcd43c7c 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -963,6 +963,12 @@ def write_job_for_platform(self, platform, args): # noqa: C901 self.process_project_dir_arguments(args, loader) manifest = loader.load_manifest(args.project) manifest_ctx = loader.ctx_gen.get_context(manifest.name) + run_tests = ( + args.enable_tests + and manifest.get("github.actions", "run_tests", ctx=manifest_ctx) != "off" + ) + if run_tests: + manifest_ctx.set("test", "on") run_on = self.get_run_on(args) # Some projects don't do anything "useful" as a leaf project, only @@ -1075,10 +1081,7 @@ def write_job_for_platform(self, platform, args): # noqa: C901 free_up_disk = "" allow_sys_arg = "" - if ( - build_opts.allow_system_packages - and build_opts.host_type.get_package_manager() - ): + if run_tests: sudo_arg = "sudo " allow_sys_arg = " --allow-system-packages" if build_opts.host_type.get_package_manager() == "deb": @@ -1097,6 +1100,19 @@ def write_job_for_platform(self, platform, args): # noqa: C901 out.write( f" run: {sudo_arg}python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive patchelf\n" ) + required_locales = manifest.get( + "github.actions", "required_locales", ctx=manifest_ctx + ) + if ( + build_opts.host_type.get_package_manager() == "deb" + and required_locales + ): + # ubuntu doesn't include this by default + out.write(" - name: Install locale-gen\n") + out.write(f" run: {sudo_arg}apt-get install locales\n") + for loc in required_locales.split(): + out.write(f" - name: Ensure {loc} locale present\n") + out.write(f" run: {sudo_arg}locale-gen {loc}\n") projects = loader.manifests_in_dependency_order() @@ -1188,11 +1204,7 @@ def write_job_for_platform(self, platform, args): # noqa: C901 out.write(" name: %s\n" % manifest.name) out.write(" path: _artifacts\n") - if ( - args.enable_tests - and manifest.get("github.actions", "run_tests", ctx=manifest_ctx) - != "off" - ): + if run_tests: num_jobs_arg = "" if args.num_jobs: num_jobs_arg = f"--num-jobs {args.num_jobs} " @@ -1203,6 +1215,7 @@ def write_job_for_platform(self, platform, args): # noqa: C901 ) if build_opts.free_up_disk and not build_opts.is_windows(): out.write(" - name: Show disk space at end\n") + out.write(" if: always()\n") out.write(" run: df -h\n") def setup_project_cmd_parser(self, parser): diff --git a/build/fbcode_builder/getdeps/manifest.py b/build/fbcode_builder/getdeps/manifest.py index ae06f4b26858..6af5e3a74dc6 100644 --- a/build/fbcode_builder/getdeps/manifest.py +++ b/build/fbcode_builder/getdeps/manifest.py @@ -87,6 +87,7 @@ "optional_section": True, "fields": { "run_tests": OPTIONAL, + "required_locales": OPTIONAL, }, }, "crate.pathmap": {"optional_section": True}, diff --git a/build/fbcode_builder/manifests/hexdump b/build/fbcode_builder/manifests/hexdump new file mode 100644 index 000000000000..e80674f14beb --- /dev/null +++ b/build/fbcode_builder/manifests/hexdump @@ -0,0 +1,12 @@ +[manifest] +name = hexdump + +[rpms] +util-linux + +[debs] +bsdmainutils + +# only used from system packages currently +[build] +builder = nop diff --git a/build/fbcode_builder/manifests/sapling b/build/fbcode_builder/manifests/sapling index a146b1ac8ac2..bbbfe1e40f87 100644 --- a/build/fbcode_builder/manifests/sapling +++ b/build/fbcode_builder/manifests/sapling @@ -4,6 +4,9 @@ fbsource_path = fbcode/eden shipit_project = eden shipit_fbcode_builder = true +[github.actions] +required_locales = en_US.UTF-8 + [git] repo_url = https://github.com/facebook/sapling.git @@ -57,6 +60,9 @@ fb303 fbthrift rust-shed +[dependencies.test=on] +hexdump + [dependencies.not(os=windows)] python From c16217b85567b5c4a9cc22f9873b7542ad5c4bfa Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 8 Oct 2024 09:31:01 -0700 Subject: [PATCH 7192/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/81f4bf22d3ce6d2b4cf8e6a4f90dc580468105a5 https://github.com/facebook/fb303/commit/591b7e0edd792794c9521e1d77c8e550e70bd200 https://github.com/facebook/fbthrift/commit/7f6edca32fd8ab6361f5ecf9be42d4e64b783098 https://github.com/facebook/folly/commit/c9acd68bad493f6829870e5cc84c117a0e0dd65d https://github.com/facebook/mvfst/commit/c53ebf1b1306037b4ea35af7f427a04647df8235 https://github.com/facebook/proxygen/commit/295872b12238a4f81c3a56b18b9798b1fd92990c https://github.com/facebook/wangle/commit/c7553866812b345e42d7a8282074ac09f84afe02 https://github.com/facebookexperimental/edencommon/commit/191b0dfe8456865cf2c5818e9317d3605dc47af3 https://github.com/facebookexperimental/rust-shed/commit/5d0cfd52e8d178794da27269767823fba8303a40 https://github.com/facebookincubator/fizz/commit/2d4c7d0f21b2111635fec92aca1f4d5476bdc502 Reviewed By: ckwalsh fbshipit-source-id: b0307438583bb26a209312d74dc9362ffab8dc58 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index de336bbb69c8..af7cd250e869 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b6f6f91a4294b03100d2c4dd512eb269fa385b2d +Subproject commit 7f6edca32fd8ab6361f5ecf9be42d4e64b783098 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ea01f90bfab8..29fdd1b876a8 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 45ffb40f2beebb08b37df9b81b39193a6e2057a4 +Subproject commit c9acd68bad493f6829870e5cc84c117a0e0dd65d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 94078754bf60..8c6e94bf7fa0 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ae6297f4994fe0ba78f265589ac7e3c96d2215f8 +Subproject commit c7553866812b345e42d7a8282074ac09f84afe02 From 823e499288c369781f19c5e36058bf214d1af34e Mon Sep 17 00:00:00 2001 From: Konstantin Tsoy Date: Tue, 8 Oct 2024 14:40:13 -0700 Subject: [PATCH 7193/7387] Fix OSS build Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1007 X-link: https://github.com/facebook/proxygen/pull/518 https://github.com/facebook/proxygen/issues/510 git patches on Windows OSS proxygen builds been failing for a while because of new lines Windows vs Unix. I re-generated the patches on Windows and that seems to fix it, and it also works for linux builds so seems fine. Reviewed By: afrind, bigfootjon Differential Revision: D63148510 fbshipit-source-id: 0ee605896820784335c1acd2a3e22b3bdf8394f1 --- .../boost_comparator_operator_fix.patch | 2 +- .../zlib_dont_build_more_than_needed.patch | 67 ++++++++++--------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/build/fbcode_builder/patches/boost_comparator_operator_fix.patch b/build/fbcode_builder/patches/boost_comparator_operator_fix.patch index 3771f2fff340..45ee266b0c39 100644 --- a/build/fbcode_builder/patches/boost_comparator_operator_fix.patch +++ b/build/fbcode_builder/patches/boost_comparator_operator_fix.patch @@ -8,4 +8,4 @@ diff --git a/boost/serialization/strong_typedef.hpp b/boost/serialization/strong + bool operator==(const T& lhs) const {return t == lhs;} \ bool operator<(const D& rhs) const {return t < rhs.t;} \ }; - + diff --git a/build/fbcode_builder/patches/zlib_dont_build_more_than_needed.patch b/build/fbcode_builder/patches/zlib_dont_build_more_than_needed.patch index 2ef115714919..fee6755261fe 100644 --- a/build/fbcode_builder/patches/zlib_dont_build_more_than_needed.patch +++ b/build/fbcode_builder/patches/zlib_dont_build_more_than_needed.patch @@ -1,33 +1,34 @@ -diff -Naur ../zlib-1.3.1/CMakeLists.txt ./CMakeLists.txt ---- ../zlib-1.3.1/CMakeLists.txt 2024-01-22 10:32:37.000000000 -0800 -+++ ./CMakeLists.txt 2024-01-23 13:14:09.870289968 -0800 -@@ -149,10 +149,8 @@ - set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) - endif(MINGW) - --add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) -+add_library(zlib ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) - target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) --add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) --target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) - set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) - set_target_properties(zlib PROPERTIES SOVERSION 1) - -@@ -169,7 +167,7 @@ - - if(UNIX) - # On unix-like platforms the library is almost always called libz -- set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) -+ set_target_properties(zlib PROPERTIES OUTPUT_NAME z) - if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX)) - set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") - endif() -@@ -179,7 +177,7 @@ - endif() - - if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) -- install(TARGETS zlib zlibstatic -+ install(TARGETS zlib - RUNTIME DESTINATION "${INSTALL_BIN_DIR}" - ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" - LIBRARY DESTINATION "${INSTALL_LIB_DIR}" ) +diff -Naur ../zlib-1.3.1/CMakeLists.txt ./CMakeLists.txt +--- ../zlib-1.3.1/CMakeLists.txt 2024-01-22 10:32:37.000000000 -0800 ++++ ./CMakeLists.txt 2024-01-23 13:14:09.870289968 -0800 +@@ -149,10 +149,8 @@ + set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) + endif(MINGW) + +-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) ++add_library(zlib ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) + target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) +-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +-target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) + set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) + set_target_properties(zlib PROPERTIES SOVERSION 1) + +@@ -169,7 +167,7 @@ + + if(UNIX) + # On unix-like platforms the library is almost always called libz +- set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) ++ set_target_properties(zlib PROPERTIES OUTPUT_NAME z) + if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX)) + set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") + endif() +@@ -179,7 +177,7 @@ + endif() + + if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) +- install(TARGETS zlib zlibstatic ++ install(TARGETS zlib + RUNTIME DESTINATION "${INSTALL_BIN_DIR}" + ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" ) + \ No newline at end of file From 608d89975ad392e8a004a0dd4207353cdf19ba54 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 9 Oct 2024 09:31:11 -0700 Subject: [PATCH 7194/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/2601d52c2afb9b72194585f007f8d270390a0ce6 https://github.com/facebook/fb303/commit/3f9d44501374fcd39600f4fc641fc041a561b579 https://github.com/facebook/fbthrift/commit/6edd883bee237a2e726e047f8ce88c8f69775807 https://github.com/facebook/folly/commit/02547bfd861ab21a87cd5b6a2da4ceb2ac7012d7 https://github.com/facebook/mvfst/commit/28748bfad2bce7a5280bd404d1e6fc17e012347d https://github.com/facebook/proxygen/commit/88cb8afcf0bcaaa7998b4874ed72f1c1ddae2d6a https://github.com/facebook/wangle/commit/8628da085e376891df611eec0e61b795b9676056 https://github.com/facebookexperimental/edencommon/commit/523a187b11816d0c954e19be9ffd42fe69193ad8 https://github.com/facebookexperimental/rust-shed/commit/8c2f0368e73afe67eaca5ce80611da760800da25 https://github.com/facebookincubator/fizz/commit/ba36ee510c7afe3d290bb2dfa2de1e1c165d1dea Reviewed By: ckwalsh fbshipit-source-id: 78d506d96034573bac955b61e1b1e735363ea98b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index af7cd250e869..c50c71adbf07 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7f6edca32fd8ab6361f5ecf9be42d4e64b783098 +Subproject commit 6edd883bee237a2e726e047f8ce88c8f69775807 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 29fdd1b876a8..e70edc477b00 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit c9acd68bad493f6829870e5cc84c117a0e0dd65d +Subproject commit 02547bfd861ab21a87cd5b6a2da4ceb2ac7012d7 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8c6e94bf7fa0..7112cefa075f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c7553866812b345e42d7a8282074ac09f84afe02 +Subproject commit 8628da085e376891df611eec0e61b795b9676056 From cbf7f1f52ce3cdc95478998d7df7dbc69e0a09c3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 10 Oct 2024 09:33:35 -0700 Subject: [PATCH 7195/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/bf285aef801001f637f180971d6f3d39c12ed5c1 https://github.com/facebook/fb303/commit/b1748a9eb2e559e3ea96f08c2edbc40ae3a580ba https://github.com/facebook/fbthrift/commit/d4ac595596038eba65a939434c2bc56c5a7e092c https://github.com/facebook/folly/commit/475d3e45a2f64d02df57054bfa81e894fb93e095 https://github.com/facebook/mvfst/commit/b7169e3cf7f708d226e38a0e618acfb4e4f123ef https://github.com/facebook/proxygen/commit/b27bc6df051010629d736cd7fe12083aaa90a098 https://github.com/facebook/wangle/commit/359b3990bafa4c8274a14866fe91aed98df56ab6 https://github.com/facebookexperimental/edencommon/commit/7c8cd15702feac852d2001b3c7112d63c3e6f987 https://github.com/facebookexperimental/rust-shed/commit/66064b2c7832e3d00447643f6f31b5451490959e https://github.com/facebookincubator/fizz/commit/e031936fd1c92c8516ec9f7817158c49134b3ded Reviewed By: ckwalsh fbshipit-source-id: bfba771dfb156514ef21c106c43059106e9dfcb8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c50c71adbf07..b038a158b429 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6edd883bee237a2e726e047f8ce88c8f69775807 +Subproject commit d4ac595596038eba65a939434c2bc56c5a7e092c diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e70edc477b00..a78f32e05925 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 02547bfd861ab21a87cd5b6a2da4ceb2ac7012d7 +Subproject commit 475d3e45a2f64d02df57054bfa81e894fb93e095 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7112cefa075f..3ca1b3f83d70 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8628da085e376891df611eec0e61b795b9676056 +Subproject commit 359b3990bafa4c8274a14866fe91aed98df56ab6 From a907d60427b13128467089a583e4d15461b418b8 Mon Sep 17 00:00:00 2001 From: "Genevieve (Genna) Helsel" Date: Thu, 10 Oct 2024 15:56:11 -0700 Subject: [PATCH 7196/7387] make LogEvents explictly "typed" via inheritance Summary: Right now "type" is strongly associated with these Event structs that we pass to the `StructuredLogger::logEvent()` method. This diff changes the structs to use inheritance to share a common expectation of a "type" member variable, rather than relying on the `static constexpr const char* type`. This gives us the benfit of more flexibility in the future, in particular for datasharing in the `watchman` bits, but also in preparation for "typeless" Events that will be added in a followup diff Reviewed By: jdelliot Differential Revision: D63797385 fbshipit-source-id: cacd8a647a4f017b89908a57caab166dd98c549c --- watchman/telemetry/LogEvent.h | 90 +++++++++++++++++++++++------------ 1 file changed, 59 insertions(+), 31 deletions(-) diff --git a/watchman/telemetry/LogEvent.h b/watchman/telemetry/LogEvent.h index 5e68e9660ffb..3d292ce15a22 100644 --- a/watchman/telemetry/LogEvent.h +++ b/watchman/telemetry/LogEvent.h @@ -17,10 +17,19 @@ #include #include "eden/common/telemetry/DynamicEvent.h" +#include "eden/common/telemetry/LogEvent.h" namespace watchman { using DynamicEvent = facebook::eden::DynamicEvent; +using TypedEvent = facebook::eden::TypedEvent; + +struct WatchmanEvent : public TypedEvent { + // Keep populate() and getType() pure virtual to force subclasses + // to implement them + virtual void populate(DynamicEvent&) const override = 0; + virtual const char* getType() const override = 0; +}; enum LogEventType : uint8_t { DispatchCommandType, @@ -88,68 +97,77 @@ struct MetadataEventData { } }; -struct DispatchCommand { - static constexpr const char* type = "dispatch_command"; +// TODO: add a WatchmanTypedEvent which just contains MetadataEventData and have +// all of these structs inherit from WatchmanTypedEvent rather than TypedEvent +struct DispatchCommand : public WatchmanEvent { MetadataEventData meta; std::string command; std::string args; - void populate(DynamicEvent& event) const { + void populate(DynamicEvent& event) const override { meta.populate(event); event.addString("command", command); if (!args.empty()) { event.addString("args", args); } } -}; -struct ClockTest { - static constexpr const char* type = "clock_test"; + const char* getType() const override { + return "dispatch_command"; + } +}; +struct ClockTest : public WatchmanEvent { BaseEventData base; - void populate(DynamicEvent& event) const { + void populate(DynamicEvent& event) const override { base.populate(event); } -}; -struct AgeOut { - static constexpr const char* type = "age_out"; + const char* getType() const override { + return "clock_test"; + } +}; +struct AgeOut : public WatchmanEvent { MetadataEventData meta; int64_t walked = 0; int64_t files = 0; int64_t dirs = 0; - void populate(DynamicEvent& event) const { + void populate(DynamicEvent& event) const override { meta.populate(event); event.addInt("walked", walked); event.addInt("files", files); event.addInt("dirs", dirs); } -}; -struct SyncToNow { - static constexpr const char* type = "sync_to_now"; + const char* getType() const override { + return "age_out"; + } +}; +struct SyncToNow : public WatchmanEvent { MetadataEventData meta; bool success = true; int64_t timeoutms = 0; - void populate(DynamicEvent& event) const { + void populate(DynamicEvent& event) const override { meta.populate(event); event.addBool("success", success); event.addInt("timeoutms", timeoutms); } + + const char* getType() const override { + return "sync_to_now"; + } }; -struct SavedState { +struct SavedState : public WatchmanEvent { enum Target { Manifold = 1, Xdb = 2 }; enum Action { GetProperties = 1, Connect = 2, Query = 3 }; - static constexpr const char* type = "saved_state"; - MetadataEventData meta; Target target = Manifold; Action action = GetProperties; @@ -160,7 +178,7 @@ struct SavedState { std::string properties; bool success = false; - void populate(DynamicEvent& event) const { + void populate(DynamicEvent& event) const override { meta.populate(event); event.addInt("target", target); event.addInt("action", action); @@ -177,11 +195,13 @@ struct SavedState { } event.addBool("success", success); } -}; -struct QueryExecute { - static constexpr const char* type = "query_execute"; + const char* getType() const override { + return "saved_state"; + } +}; +struct QueryExecute : public WatchmanEvent { MetadataEventData meta; std::string request_id; int64_t num_special_files = 0; @@ -195,7 +215,7 @@ struct QueryExecute { int64_t eden_changed_files_duration_us = 0; int64_t eden_file_properties_duration_us = 0; - void populate(DynamicEvent& event) const { + void populate(DynamicEvent& event) const override { meta.populate(event); if (!request_id.empty()) { event.addString("request_id", request_id); @@ -223,28 +243,36 @@ struct QueryExecute { "eden_file_properties_duration_us", eden_file_properties_duration_us); } } -}; -struct FullCrawl { - static constexpr const char* type = "full_crawl"; + const char* getType() const override { + return "query_execute"; + } +}; +struct FullCrawl : public WatchmanEvent { MetadataEventData meta; - void populate(DynamicEvent& event) const { + void populate(DynamicEvent& event) const override { meta.populate(event); } -}; -struct Dropped { - static constexpr const char* type = "dropped"; + const char* getType() const override { + return "full_crawl"; + } +}; +struct Dropped : public WatchmanEvent { MetadataEventData meta; bool isKernel = false; - void populate(DynamicEvent& event) const { + void populate(DynamicEvent& event) const override { meta.populate(event); event.addBool("isKernel", isKernel); } + + const char* getType() const override { + return "dropped"; + } }; } // namespace watchman From d5107b173ac2f23ab5fbc43374951edb5f28b252 Mon Sep 17 00:00:00 2001 From: "Genevieve (Genna) Helsel" Date: Thu, 10 Oct 2024 15:56:11 -0700 Subject: [PATCH 7197/7387] add the notion of "typeless" events Summary: "type" is a column that exists in some of our datasets, but right now the use of "type" restricts a more freeform table (if a logger only logs one event, type doesn't really make sense). This diff adds a "typeless" log method, where the StructuredLogger can log Dynamic events without a `type` I was debating if I should make this a `std::optional` or just use a `nullptr` for typeless events. It looks to be minimally different after compilation, so I opted for the `std::optional` for readability/safety sake `std::optional`: https://godbolt.org/z/Ms6EqMMKh `nullptr`: https://godbolt.org/z/6YTd9ax3M Reviewed By: jdelliot Differential Revision: D63797398 fbshipit-source-id: a92e4e846e6305b89fcf696c24f6b83d7f1966be --- watchman/telemetry/WatchmanStructuredLogger.cpp | 3 ++- watchman/telemetry/WatchmanStructuredLogger.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/watchman/telemetry/WatchmanStructuredLogger.cpp b/watchman/telemetry/WatchmanStructuredLogger.cpp index 1bb4bb17c373..0d364c9f4941 100644 --- a/watchman/telemetry/WatchmanStructuredLogger.cpp +++ b/watchman/telemetry/WatchmanStructuredLogger.cpp @@ -33,7 +33,8 @@ std::shared_ptr getLogger() { return logger; } -DynamicEvent WatchmanStructuredLogger::populateDefaultFields(const char* type) { +DynamicEvent WatchmanStructuredLogger::populateDefaultFields( + std::optional type) { DynamicEvent event = StructuredLogger::populateDefaultFields(type); if (sessionInfo_.ciInstanceId.has_value()) { event.addInt("sandcastle_instance_id", *sessionInfo_.ciInstanceId); diff --git a/watchman/telemetry/WatchmanStructuredLogger.h b/watchman/telemetry/WatchmanStructuredLogger.h index ea1147424687..a175af00bf8a 100644 --- a/watchman/telemetry/WatchmanStructuredLogger.h +++ b/watchman/telemetry/WatchmanStructuredLogger.h @@ -28,7 +28,8 @@ class WatchmanStructuredLogger : public ScubaStructuredLogger { virtual ~WatchmanStructuredLogger() override = default; protected: - virtual DynamicEvent populateDefaultFields(const char* type) override; + virtual DynamicEvent populateDefaultFields( + std::optional type) override; }; std::shared_ptr getLogger(); From fc2407d18542f649ab566e83efdfb0d5bc011e62 Mon Sep 17 00:00:00 2001 From: "Genevieve (Genna) Helsel" Date: Thu, 10 Oct 2024 15:56:11 -0700 Subject: [PATCH 7198/7387] move BaseEventData and MetadataEventData into the TypedEvent inheritance structure Summary: Followup from D63797385 - moves watchman `LogEvent` into an inheritance structure instead of a aggregation structure Reviewed By: jdelliot Differential Revision: D64086899 fbshipit-source-id: 650652c986f1418f8a9aea73df72ca4d54aff3f7 --- watchman/Client.cpp | 10 ++--- watchman/PerfSample.h | 8 ++-- watchman/SanityCheck.cpp | 7 ++- watchman/query/eval.cpp | 7 ++- watchman/root/ageout.cpp | 10 ++--- watchman/root/iothread.cpp | 8 ++-- watchman/root/sync.cpp | 28 ++++++------ watchman/telemetry/LogEvent.h | 81 ++++++++++++++--------------------- watchman/watcher/fsevents.cpp | 8 ++-- 9 files changed, 74 insertions(+), 93 deletions(-) diff --git a/watchman/Client.cpp b/watchman/Client.cpp index 2ba72f028089..ccc587b73a8c 100644 --- a/watchman/Client.cpp +++ b/watchman/Client.cpp @@ -83,7 +83,7 @@ void Client::sendErrorResponse(std::string_view formatted) { resp.set("error", typed_string_to_json(formatted)); if (dispatch_command) { - dispatch_command->meta.base.error = formatted; + dispatch_command->error = formatted; } if (perf_sample) { @@ -165,7 +165,7 @@ bool Client::dispatchCommand(const Command& command, CommandFlags mode) { enqueueResponse(def->handler(this, rendered)); } catch (const ErrorResponse& e) { sendErrorResponse(e.what()); - dispatchCommand.meta.base.error = e.what(); + dispatchCommand.error = e.what(); } catch (const ResponseWasHandledManually&) { } @@ -180,11 +180,11 @@ bool Client::dispatchCommand(const Command& command, CommandFlags mode) { getLogEventCounters(LogEventType::DispatchCommandType); // Log if override set, or if we have hit the sample rate if (sample.will_log || eventCount == samplingRate) { - dispatchCommand.meta.base.event_count = + dispatchCommand.event_count = eventCount != samplingRate ? 0 : eventCount; dispatchCommand.args = renderedString; - dispatchCommand.meta.client_pid = peerPid_; - dispatchCommand.meta.client_name = + dispatchCommand.client_pid = peerPid_; + dispatchCommand.client_name = facebook::eden::ProcessInfoCache::cleanProcessCommandline( std::move(peerInfo_.get().name)); diff --git a/watchman/PerfSample.h b/watchman/PerfSample.h index 59d389786e86..d0b423bf1e29 100644 --- a/watchman/PerfSample.h +++ b/watchman/PerfSample.h @@ -29,10 +29,10 @@ struct RootMetadata { template void addRootMetadataToEvent(const RootMetadata& root_metadata, T& event) { - event.meta.base.root = root_metadata.root_path.string(); - event.meta.recrawl = root_metadata.recrawl_count; - event.meta.case_sensitive = root_metadata.case_sensitive; - event.meta.watcher = root_metadata.watcher.string(); + event.root = root_metadata.root_path.string(); + event.recrawl = root_metadata.recrawl_count; + event.case_sensitive = root_metadata.case_sensitive; + event.watcher = root_metadata.watcher.string(); } class PerfSample { diff --git a/watchman/SanityCheck.cpp b/watchman/SanityCheck.cpp index 9c81cd577f20..44170c685379 100644 --- a/watchman/SanityCheck.cpp +++ b/watchman/SanityCheck.cpp @@ -158,14 +158,14 @@ void do_clock_check(watchman_stream* client) { auto roots = get_watch_list(client); for (auto& r : roots.array()) { ClockTest clockTest; - clockTest.base.root = r.toString(); + clockTest.root = r.toString(); PerfSample sample("clock-test"); sample.add_meta("root", json_object({{"path", r}})); try { check_clock_command(client, r); } catch (const std::exception& ex) { log(watchman::ERR, "Failed do_clock_check : ", ex.what(), "\n"); - clockTest.base.error = ex.what(); + clockTest.error = ex.what(); sample.add_meta("error", w_string_to_json(ex.what())); sample.force_log(); } @@ -178,8 +178,7 @@ void do_clock_check(watchman_stream* client) { getLogEventCounters(LogEventType::ClockTestType); // Log if override set, or if we have hit the sample rate if (sample.will_log || eventCount == samplingRate) { - clockTest.base.event_count = - eventCount != samplingRate ? 0 : eventCount; + clockTest.event_count = eventCount != samplingRate ? 0 : eventCount; getLogger()->logEvent(clockTest); } } diff --git a/watchman/query/eval.cpp b/watchman/query/eval.cpp index f94880153cf9..8298331962f4 100644 --- a/watchman/query/eval.cpp +++ b/watchman/query/eval.cpp @@ -256,8 +256,7 @@ static void execute_common( // Log if override set, or if we have hit the sample rate if (sample->will_log || eventCount == samplingRate) { addRootMetadataToEvent(root_metadata, *queryExecute); - queryExecute->meta.base.event_count = - eventCount != samplingRate ? 0 : eventCount; + queryExecute->event_count = eventCount != samplingRate ? 0 : eventCount; queryExecute->fresh_instance = res->isFreshInstance; queryExecute->deduped = ctx->num_deduped; queryExecute->results = ctx->resultsArray.size(); @@ -272,8 +271,8 @@ static void execute_common( if (ctx->query->query_spec) { queryExecute->query = ctx->query->query_spec->toString(); } - queryExecute->meta.client_pid = clientInfo.clientPid; - queryExecute->meta.client_name = clientInfo.clientInfo.has_value() + queryExecute->client_pid = clientInfo.clientPid; + queryExecute->client_name = clientInfo.clientInfo.has_value() ? facebook::eden::ProcessInfoCache::cleanProcessCommandline( std::move(clientInfo.clientInfo.value().get().name)) : ""; diff --git a/watchman/root/ageout.cpp b/watchman/root/ageout.cpp index 1023e8667db1..a5918a0eb2c9 100644 --- a/watchman/root/ageout.cpp +++ b/watchman/root/ageout.cpp @@ -70,11 +70,11 @@ void Root::performAgeOut(std::chrono::seconds min_age) { // Log if override set, or if we have hit the sample rate if (sample.will_log || eventCount == samplingRate) { AgeOut ageOut; - ageOut.meta.base.root = root_metadata.root_path.string(); - ageOut.meta.base.event_count = eventCount != samplingRate ? 0 : eventCount; - ageOut.meta.recrawl = root_metadata.recrawl_count; - ageOut.meta.case_sensitive = root_metadata.case_sensitive; - ageOut.meta.watcher = root_metadata.watcher.string(); + ageOut.root = root_metadata.root_path.string(); + ageOut.event_count = eventCount != samplingRate ? 0 : eventCount; + ageOut.recrawl = root_metadata.recrawl_count; + ageOut.case_sensitive = root_metadata.case_sensitive; + ageOut.watcher = root_metadata.watcher.string(); ageOut.walked = walked; ageOut.files = files; ageOut.dirs = dirs; diff --git a/watchman/root/iothread.cpp b/watchman/root/iothread.cpp index 9b660420aa18..5366f31fb26a 100644 --- a/watchman/root/iothread.cpp +++ b/watchman/root/iothread.cpp @@ -90,10 +90,10 @@ void InMemoryView::fullCrawl( sample.log(); FullCrawl fullCrawl; - fullCrawl.meta.base.root = root_metadata.root_path.string(); - fullCrawl.meta.recrawl = root_metadata.recrawl_count; - fullCrawl.meta.case_sensitive = root_metadata.case_sensitive; - fullCrawl.meta.watcher = root_metadata.watcher.string(); + fullCrawl.root = root_metadata.root_path.string(); + fullCrawl.recrawl = root_metadata.recrawl_count; + fullCrawl.case_sensitive = root_metadata.case_sensitive; + fullCrawl.watcher = root_metadata.watcher.string(); getLogger()->logEvent(fullCrawl); logf(ERR, "{}crawl complete\n", recrawlCount ? "re" : ""); diff --git a/watchman/root/sync.cpp b/watchman/root/sync.cpp index 053eb2c5d369..f6a9c7dc1317 100644 --- a/watchman/root/sync.cpp +++ b/watchman/root/sync.cpp @@ -44,17 +44,16 @@ CookieSync::SyncResult Root::syncToNow( getLogEventCounters(LogEventType::SyncToNowType); // Log if override set, or if we have hit the sample rate if (sample.will_log || eventCount == samplingRate) { - syncToNow.meta.client_pid = client_info.clientPid; - syncToNow.meta.client_name = client_info.clientInfo.has_value() + syncToNow.client_pid = client_info.clientPid; + syncToNow.client_name = client_info.clientInfo.has_value() ? facebook::eden::ProcessInfoCache::cleanProcessCommandline( std::move(client_info.clientInfo.value().get().name)) : ""; - syncToNow.meta.base.root = root_metadata.root_path.string(); - syncToNow.meta.base.event_count = - eventCount != samplingRate ? 0 : eventCount; - syncToNow.meta.recrawl = root_metadata.recrawl_count; - syncToNow.meta.case_sensitive = root_metadata.case_sensitive; - syncToNow.meta.watcher = root_metadata.watcher.string(); + syncToNow.root = root_metadata.root_path.string(); + syncToNow.event_count = eventCount != samplingRate ? 0 : eventCount; + syncToNow.recrawl = root_metadata.recrawl_count; + syncToNow.case_sensitive = root_metadata.case_sensitive; + syncToNow.watcher = root_metadata.watcher.string(); syncToNow.timeoutms = timeout.count(); getLogger()->logEvent(syncToNow); } @@ -74,13 +73,12 @@ CookieSync::SyncResult Root::syncToNow( const auto& [samplingRate, eventCount] = getLogEventCounters(LogEventType::SyncToNowType); - syncToNow.meta.base.root = root_metadata.root_path.string(); - syncToNow.meta.base.error = exc.what(); - syncToNow.meta.base.event_count = - eventCount != samplingRate ? 0 : eventCount; - syncToNow.meta.recrawl = root_metadata.recrawl_count; - syncToNow.meta.case_sensitive = root_metadata.case_sensitive; - syncToNow.meta.watcher = root_metadata.watcher.string(); + syncToNow.root = root_metadata.root_path.string(); + syncToNow.error = exc.what(); + syncToNow.event_count = eventCount != samplingRate ? 0 : eventCount; + syncToNow.recrawl = root_metadata.recrawl_count; + syncToNow.case_sensitive = root_metadata.case_sensitive; + syncToNow.watcher = root_metadata.watcher.string(); syncToNow.success = false; syncToNow.timeoutms = timeout.count(); getLogger()->logEvent(syncToNow); diff --git a/watchman/telemetry/LogEvent.h b/watchman/telemetry/LogEvent.h index 3d292ce15a22..1fc112d18d32 100644 --- a/watchman/telemetry/LogEvent.h +++ b/watchman/telemetry/LogEvent.h @@ -24,28 +24,7 @@ namespace watchman { using DynamicEvent = facebook::eden::DynamicEvent; using TypedEvent = facebook::eden::TypedEvent; -struct WatchmanEvent : public TypedEvent { - // Keep populate() and getType() pure virtual to force subclasses - // to implement them - virtual void populate(DynamicEvent&) const override = 0; - virtual const char* getType() const override = 0; -}; - -enum LogEventType : uint8_t { - DispatchCommandType, - ClockTestType, - AgeOutType, - SyncToNowType, - SavedStateType, - QueryExecuteType, - FullCrawlType, - DroppedType -}; - -// Returns samplingRate and eventCount -std::pair getLogEventCounters(const LogEventType& type); - -struct BaseEventData { +struct WatchmanBaseEvent : public TypedEvent { // TODO: add system and user time for Unix systems std::chrono::time_point start_time = std::chrono::system_clock::now(); @@ -53,7 +32,7 @@ struct BaseEventData { std::string error; int64_t event_count = 1; - void populate(DynamicEvent& event) const { + void populate(DynamicEvent& event) const override { std::chrono::duration elapsed_time = std::chrono::system_clock::now() - start_time; event.addInt( @@ -70,18 +49,20 @@ struct BaseEventData { } event.addInt("event_count", event_count); } + + // Keep getType() pure virtual to force subclasses to implement it + virtual const char* getType() const override = 0; }; -struct MetadataEventData { - BaseEventData base; +struct WatchmanEvent : public WatchmanBaseEvent { int64_t recrawl = 0; bool case_sensitive = false; std::string watcher; pid_t client_pid = 0; std::string client_name; - void populate(DynamicEvent& event) const { - base.populate(event); + void populate(DynamicEvent& event) const override { + WatchmanBaseEvent::populate(event); event.addInt("recrawl", recrawl); event.addBool("case_sensitive", case_sensitive); if (!watcher.empty()) { @@ -95,18 +76,31 @@ struct MetadataEventData { event.addString("client", client_name); } } + + // Keep getType() pure virtual to force subclasses to implement it + virtual const char* getType() const override = 0; }; -// TODO: add a WatchmanTypedEvent which just contains MetadataEventData and have -// all of these structs inherit from WatchmanTypedEvent rather than TypedEvent +enum LogEventType : uint8_t { + DispatchCommandType, + ClockTestType, + AgeOutType, + SyncToNowType, + SavedStateType, + QueryExecuteType, + FullCrawlType, + DroppedType +}; + +// Returns samplingRate and eventCount +std::pair getLogEventCounters(const LogEventType& type); struct DispatchCommand : public WatchmanEvent { - MetadataEventData meta; std::string command; std::string args; void populate(DynamicEvent& event) const override { - meta.populate(event); + WatchmanEvent::populate(event); event.addString("command", command); if (!args.empty()) { event.addString("args", args); @@ -118,11 +112,9 @@ struct DispatchCommand : public WatchmanEvent { } }; -struct ClockTest : public WatchmanEvent { - BaseEventData base; - +struct ClockTest : public WatchmanBaseEvent { void populate(DynamicEvent& event) const override { - base.populate(event); + WatchmanBaseEvent::populate(event); } const char* getType() const override { @@ -131,13 +123,12 @@ struct ClockTest : public WatchmanEvent { }; struct AgeOut : public WatchmanEvent { - MetadataEventData meta; int64_t walked = 0; int64_t files = 0; int64_t dirs = 0; void populate(DynamicEvent& event) const override { - meta.populate(event); + WatchmanEvent::populate(event); event.addInt("walked", walked); event.addInt("files", files); event.addInt("dirs", dirs); @@ -149,12 +140,11 @@ struct AgeOut : public WatchmanEvent { }; struct SyncToNow : public WatchmanEvent { - MetadataEventData meta; bool success = true; int64_t timeoutms = 0; void populate(DynamicEvent& event) const override { - meta.populate(event); + WatchmanEvent::populate(event); event.addBool("success", success); event.addInt("timeoutms", timeoutms); } @@ -168,7 +158,6 @@ struct SavedState : public WatchmanEvent { enum Target { Manifold = 1, Xdb = 2 }; enum Action { GetProperties = 1, Connect = 2, Query = 3 }; - MetadataEventData meta; Target target = Manifold; Action action = GetProperties; std::string project; @@ -179,7 +168,7 @@ struct SavedState : public WatchmanEvent { bool success = false; void populate(DynamicEvent& event) const override { - meta.populate(event); + WatchmanEvent::populate(event); event.addInt("target", target); event.addInt("action", action); event.addString("project", project); @@ -202,7 +191,6 @@ struct SavedState : public WatchmanEvent { }; struct QueryExecute : public WatchmanEvent { - MetadataEventData meta; std::string request_id; int64_t num_special_files = 0; std::string special_files; @@ -216,7 +204,7 @@ struct QueryExecute : public WatchmanEvent { int64_t eden_file_properties_duration_us = 0; void populate(DynamicEvent& event) const override { - meta.populate(event); + WatchmanEvent::populate(event); if (!request_id.empty()) { event.addString("request_id", request_id); } @@ -250,10 +238,8 @@ struct QueryExecute : public WatchmanEvent { }; struct FullCrawl : public WatchmanEvent { - MetadataEventData meta; - void populate(DynamicEvent& event) const override { - meta.populate(event); + WatchmanEvent::populate(event); } const char* getType() const override { @@ -262,11 +248,10 @@ struct FullCrawl : public WatchmanEvent { }; struct Dropped : public WatchmanEvent { - MetadataEventData meta; bool isKernel = false; void populate(DynamicEvent& event) const override { - meta.populate(event); + WatchmanEvent::populate(event); event.addBool("isKernel", isKernel); } diff --git a/watchman/watcher/fsevents.cpp b/watchman/watcher/fsevents.cpp index 970b729ea0fa..942ab7930937 100644 --- a/watchman/watcher/fsevents.cpp +++ b/watchman/watcher/fsevents.cpp @@ -139,10 +139,10 @@ std::shared_ptr watcherFromRoot( static void log_drop_event(const std::shared_ptr& root, bool isKernel) { auto root_metadata = root->getRootMetadata(); Dropped dropped; - dropped.meta.base.root = root_metadata.root_path.string(); - dropped.meta.recrawl = root_metadata.recrawl_count; - dropped.meta.case_sensitive = root_metadata.case_sensitive; - dropped.meta.watcher = root_metadata.watcher.string(); + dropped.root = root_metadata.root_path.string(); + dropped.recrawl = root_metadata.recrawl_count; + dropped.case_sensitive = root_metadata.case_sensitive; + dropped.watcher = root_metadata.watcher.string(); dropped.isKernel = isKernel; getLogger()->logEvent(dropped); From 2e88f1e46c165adf1dfe6c4ca639ae6090594720 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Fri, 11 Oct 2024 03:39:48 -0700 Subject: [PATCH 7199/7387] sapling getdeps cli build and test support for python 3.12 Summary: Ubuntu 24.04 and Fedora 40 are both python 3.12 based. Update sapling's OSS getdeps build to allow build/run/test on python 3.12 while keeping 3.10 support. * distutils is deprecated in python 3.12 stdlib, but fortunately setuptools is pretty similar and includes a vendored distutils, so: * added a manifest so we get python3-setuptools installed. * setup.py: removed deprecated usage like `find_executable` in favor of `shutil.which()`, also removed some super old xcode 4/5.1 detection I found * util.py makedate(): datetime.utcfromtimestamp is deprecated in 3.12, so updated to use non-deprecated methods. Tested with test-command-template.t which shows tz offset. * Makefile: disabled test-eager-exchange.t on 3.12 where updating the expectation to run on 3.12 and 3.10 is tricky (debug output differs) * tests modified to run on 3.12 and 3.10: * test-import-eol.t: updated for invalid escape sequence warnings * test-install.t: updated to filter out message that appears in different order on 3.12 vs earlier versions * test-merge-driver2.t: match different debug output in 3.12, remove check for mercurial package * test-sign-commit.t: updated to add --yes for newer gpg that python 3.12 using distros have * found some tests needed bunzip2, so update manifest for sapling and bz2 to install it X-link: https://github.com/facebook/sapling/pull/964 X-link: https://github.com/facebookincubator/zstrong/pull/1005 Reviewed By: quark-zju, singhsrb Differential Revision: D63958742 Pulled By: ahornby fbshipit-source-id: 460c42eb1315f2e1631c74d356e4976469104c1b --- build/fbcode_builder/manifests/bz2 | 2 ++ build/fbcode_builder/manifests/python-setuptools | 9 +++++++++ build/fbcode_builder/manifests/sapling | 1 + 3 files changed, 12 insertions(+) diff --git a/build/fbcode_builder/manifests/bz2 b/build/fbcode_builder/manifests/bz2 index af2f357d5dbe..cfbea9c8fd1c 100644 --- a/build/fbcode_builder/manifests/bz2 +++ b/build/fbcode_builder/manifests/bz2 @@ -3,12 +3,14 @@ name = bz2 [debs] libbz2-dev +bzip2 [homebrew] bzip2 [rpms] bzip2-devel +bzip2 [download] url = https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz diff --git a/build/fbcode_builder/manifests/python-setuptools b/build/fbcode_builder/manifests/python-setuptools index 7ca2e1e498cb..6e71b3b008fd 100644 --- a/build/fbcode_builder/manifests/python-setuptools +++ b/build/fbcode_builder/manifests/python-setuptools @@ -7,3 +7,12 @@ sha256 = 02fa291a0471b3a18b2b2481ed902af520c69e8ae0919c13da936542754b4c56 [build] builder = python-wheel + +[rpms] +python3-setuptools + +[homebrew] +python-setuptools + +[debs] +python3-setuptools diff --git a/build/fbcode_builder/manifests/sapling b/build/fbcode_builder/manifests/sapling index bbbfe1e40f87..c067360ef82b 100644 --- a/build/fbcode_builder/manifests/sapling +++ b/build/fbcode_builder/manifests/sapling @@ -65,6 +65,7 @@ hexdump [dependencies.not(os=windows)] python +python-setuptools # We use the system openssl on linux [dependencies.not(os=linux)] From f2d562e459789956f2ebbb64ecd40890534f34cd Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 11 Oct 2024 09:35:04 -0700 Subject: [PATCH 7200/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/afcbcb9ab6e1850275a80a44ce68b022d704c2a9 https://github.com/facebook/fb303/commit/589a03544b30950be773dc4767ac95d7f94110ed https://github.com/facebook/fbthrift/commit/5ae23ab52d29fec02244a7d50903cf1fb4031ace https://github.com/facebook/folly/commit/452c7438adb67321f99f2bca7395087ef59dd58f https://github.com/facebook/mvfst/commit/23a547dc0ebac4b5c8f8d51543ca98c06278b462 https://github.com/facebook/proxygen/commit/f2be75f983d805d553ae2b09469723446bf12c10 https://github.com/facebook/wangle/commit/95d995a1dc06d5244676f4981393accb205753b3 https://github.com/facebookexperimental/edencommon/commit/e34c881c1821dcd4aa25361c4020109013e01a9c https://github.com/facebookexperimental/rust-shed/commit/557328688eee8de4d2dc9cfeeae28409c3bdab0f https://github.com/facebookincubator/fizz/commit/4af8e7f3a16c3111bf020cd8b547cccd78d37420 Reviewed By: ckwalsh fbshipit-source-id: 78149a32e91b03a1593065248508a5f38151a7ef --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b038a158b429..834e27b2b015 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d4ac595596038eba65a939434c2bc56c5a7e092c +Subproject commit 5ae23ab52d29fec02244a7d50903cf1fb4031ace diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a78f32e05925..dbb0dfb34dcf 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 475d3e45a2f64d02df57054bfa81e894fb93e095 +Subproject commit 452c7438adb67321f99f2bca7395087ef59dd58f diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3ca1b3f83d70..96c2a3e0d9e5 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 359b3990bafa4c8274a14866fe91aed98df56ab6 +Subproject commit 95d995a1dc06d5244676f4981393accb205753b3 From 088d96539eec4f6efc664caa01283851db24e1c2 Mon Sep 17 00:00:00 2001 From: Paul Cruz Date: Fri, 11 Oct 2024 12:38:48 -0700 Subject: [PATCH 7201/7387] Add xxhash as a dependency Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1008 This doesn't seem to be a new dependency, but build errors only recently started surfacing for OSS: https://www.internalfb.com/sandcastle/workflow/3098476543635661395 Reviewed By: robertroeser Differential Revision: D64120664 fbshipit-source-id: 64d6fa130fa41bcbb9a40003b3b02eed38123641 --- build/fbcode_builder/CMake/FindXxhash.cmake | 40 +++++++++++++++++++++ build/fbcode_builder/manifests/fbthrift | 1 + build/fbcode_builder/manifests/xxhash | 15 ++++++++ 3 files changed, 56 insertions(+) create mode 100644 build/fbcode_builder/CMake/FindXxhash.cmake diff --git a/build/fbcode_builder/CMake/FindXxhash.cmake b/build/fbcode_builder/CMake/FindXxhash.cmake new file mode 100644 index 000000000000..04760cbf7801 --- /dev/null +++ b/build/fbcode_builder/CMake/FindXxhash.cmake @@ -0,0 +1,40 @@ +# Copyright (c) Facebook, Inc. and its affiliates. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# +# - Try to find Facebook xxhash library +# This will define +# Xxhash_FOUND +# Xxhash_INCLUDE_DIR +# Xxhash_LIBRARY +# + +find_path(Xxhash_INCLUDE_DIR NAMES xxhash.h) + +find_library(Xxhash_LIBRARY_RELEASE NAMES xxhash) + +include(SelectLibraryConfigurations) +SELECT_LIBRARY_CONFIGURATIONS(Xxhash) + +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS( + Xxhash DEFAULT_MSG + Xxhash_LIBRARY Xxhash_INCLUDE_DIR +) + +if (Xxhash_FOUND) + message(STATUS "Found xxhash: ${Xxhash_LIBRARY}") +endif() + +mark_as_advanced(Xxhash_INCLUDE_DIR Xxhash_LIBRARY) diff --git a/build/fbcode_builder/manifests/fbthrift b/build/fbcode_builder/manifests/fbthrift index 81fea9d64ec1..964b97cc028e 100644 --- a/build/fbcode_builder/manifests/fbthrift +++ b/build/fbcode_builder/manifests/fbthrift @@ -26,6 +26,7 @@ libsodium wangle zstd mvfst +xxhash # Thrift also depends on openssl but since the latter requires a platform- # specific configuration we rely on the folly manifest to provide this # dependency to avoid duplication. diff --git a/build/fbcode_builder/manifests/xxhash b/build/fbcode_builder/manifests/xxhash index 0af55726c12c..8e490011e580 100644 --- a/build/fbcode_builder/manifests/xxhash +++ b/build/fbcode_builder/manifests/xxhash @@ -1,5 +1,20 @@ [manifest] name = xxhash +[download] +url = https://github.com/Cyan4973/xxHash/archive/refs/tags/v0.8.2.tar.gz +sha256 = baee0c6afd4f03165de7a4e67988d16f0f2b257b51d0e3cb91909302a26a79c4 + [rpms] xxhash-devel + +[build.not(os=windows)] +builder = make +subdir = xxHash-0.8.2 + +[make.build_args] +all + +[make.install_args] +install + From 5d4decc32b55519248019fd124c613839064278b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 12 Oct 2024 09:33:32 -0700 Subject: [PATCH 7202/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/ec0105fb4100a6aa7637b14db600a064444a0e2f https://github.com/facebook/buck2-shims-meta/commit/58904ec60bfacea4ad7f4b4bf334b44a2605d263 https://github.com/facebook/fb303/commit/8202aa5404cf50b3334817dd4c670239039efbb6 https://github.com/facebook/fbthrift/commit/c8c7192ab70a99906e076c143165ebe1536735ee https://github.com/facebook/folly/commit/0aa6ed46b941d384214b9a0cdf9b339bf68913c6 https://github.com/facebook/mvfst/commit/90de80c68fc55675dda61ceaa1347dde9d98a80e https://github.com/facebook/proxygen/commit/766cb9b5a7aba502e786f5a862625ccde2a49bb5 https://github.com/facebook/wangle/commit/eaf1ceb283aad40eb70cc2982128477289bf2192 https://github.com/facebookexperimental/edencommon/commit/5f08652d42cef83ea0f84cca48464de6499584dd https://github.com/facebookexperimental/rust-shed/commit/975ce7359cd835664173174f8acc93b37c0a1d36 https://github.com/facebookincubator/fizz/commit/1ae8f729a6c4606c2af9122895d54962e74e1c13 Reviewed By: ckwalsh fbshipit-source-id: bc5645f1e4f1ace8b8455105ebf265b4fd3b73c5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 834e27b2b015..3727c1abf8f2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5ae23ab52d29fec02244a7d50903cf1fb4031ace +Subproject commit c8c7192ab70a99906e076c143165ebe1536735ee diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index dbb0dfb34dcf..e692fc15015c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 452c7438adb67321f99f2bca7395087ef59dd58f +Subproject commit 0aa6ed46b941d384214b9a0cdf9b339bf68913c6 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 96c2a3e0d9e5..3c5ab975f48d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 95d995a1dc06d5244676f4981393accb205753b3 +Subproject commit eaf1ceb283aad40eb70cc2982128477289bf2192 From a974c3315a4365be462d124a3696f0d351e19b48 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 13 Oct 2024 09:33:20 -0700 Subject: [PATCH 7203/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/adcc9b7a0f8149c0899df1734207021d03a0b359 https://github.com/facebook/fbthrift/commit/4408523755ed370e1358acce44a26b350c204f9b https://github.com/facebook/folly/commit/ad90720829db5ba0c3d0e44994856dcce33d7940 https://github.com/facebook/mvfst/commit/e73e1f8303b4dc08a6d260d22fe922e0abf031d7 https://github.com/facebook/proxygen/commit/6570aa90e116c278d31bbe897a8b26f33c2c2b0c https://github.com/facebook/wangle/commit/8107673c3417e7cf88b4953ac7cc199dee63ee8c https://github.com/facebookexperimental/edencommon/commit/96b50e374a43abe7cf88d3b5039044c2e9c7af37 https://github.com/facebookexperimental/rust-shed/commit/0864b31c1c851755425849375ce5e3f0ff932906 https://github.com/facebookincubator/fizz/commit/cbcc84080cacc0006fd5ac464a6c57604057cfb0 Reviewed By: ckwalsh fbshipit-source-id: dadd0290b8a234c4c96f6f73f2dc6148e3d03e3e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3727c1abf8f2..4ebb68b5866b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c8c7192ab70a99906e076c143165ebe1536735ee +Subproject commit 4408523755ed370e1358acce44a26b350c204f9b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e692fc15015c..e0e94d9e9f65 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0aa6ed46b941d384214b9a0cdf9b339bf68913c6 +Subproject commit ad90720829db5ba0c3d0e44994856dcce33d7940 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3c5ab975f48d..97a473c3e664 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit eaf1ceb283aad40eb70cc2982128477289bf2192 +Subproject commit 8107673c3417e7cf88b4953ac7cc199dee63ee8c From 21b1f3bb34e4028d7207cbc6a1d7a21c6868c884 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 14 Oct 2024 09:35:15 -0700 Subject: [PATCH 7204/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/c06384e55772046d1fdd19f3c6d04ab5dc929f91 https://github.com/facebook/fb303/commit/943f36701bb462e9e1fa8f693ac4a6965c5458c2 https://github.com/facebook/fbthrift/commit/f2c4e6c61f8235d909f0af06ac0bb3043a2ce3a5 https://github.com/facebook/folly/commit/b293f9eac370fe89d437a53c73d58ac575407245 https://github.com/facebook/mvfst/commit/71571281fd50deb5cd237f09e334df5851c4d1bc https://github.com/facebook/proxygen/commit/c86014c30b4d5ade2c3849b0e35a4ae070bc80d3 https://github.com/facebook/wangle/commit/997ed56811317851126281e0fdf4cc0a998eb319 https://github.com/facebookexperimental/edencommon/commit/6d4f09aa46a8f2acd91a01e5f404bfda62d875ae https://github.com/facebookexperimental/rust-shed/commit/6543321dba977d6e0081aef8ad4012d9971f8a1a https://github.com/facebookincubator/fizz/commit/6bc89c741356c393fd800ae2b9df8a917769c804 Reviewed By: bigfootjon fbshipit-source-id: 3fd1baadcfb28b95e1502d36b3dad48abb92b986 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4ebb68b5866b..3ccd6761ea75 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4408523755ed370e1358acce44a26b350c204f9b +Subproject commit f2c4e6c61f8235d909f0af06ac0bb3043a2ce3a5 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e0e94d9e9f65..babd0cbb4b83 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ad90720829db5ba0c3d0e44994856dcce33d7940 +Subproject commit b293f9eac370fe89d437a53c73d58ac575407245 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 97a473c3e664..a9ccc4fc6f1d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8107673c3417e7cf88b4953ac7cc199dee63ee8c +Subproject commit 997ed56811317851126281e0fdf4cc0a998eb319 From 44ad73ec505c29d7b8a0532a4c142f5da30be586 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Mon, 14 Oct 2024 12:17:46 -0700 Subject: [PATCH 7205/7387] getdeps: add xxhash ubuntu and homebrew packages, fix actions generation and regenerate Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1010 EdenFS build on github CI was failing with missing xxhash include: https://github.com/facebook/sapling/actions/runs/11311478649/job/31457761727#step:108:3838 Add package mappings to the xxhash manifest When I went to regenerate the github actions found I'd previously introduced a bug in the actions generation with a mis-merged run_tests check. Fix it and regenerate X-link: https://github.com/facebook/sapling/pull/966 Reviewed By: genevievehelsel Differential Revision: D64302134 Pulled By: ahornby fbshipit-source-id: 3384dab4f31e202881310e2b5369bb23fb533a1b --- .github/workflows/getdeps_linux.yml | 4 ++++ .github/workflows/getdeps_mac.yml | 4 ++++ .github/workflows/getdeps_windows.yml | 4 ++++ build/fbcode_builder/getdeps.py | 18 ++++++++++++++---- build/fbcode_builder/manifests/xxhash | 7 +++++++ 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/.github/workflows/getdeps_linux.yml b/.github/workflows/getdeps_linux.yml index c6323e1994e4..cd5561902d86 100644 --- a/.github/workflows/getdeps_linux.yml +++ b/.github/workflows/getdeps_linux.yml @@ -36,6 +36,8 @@ jobs: run: python3 build/fbcode_builder/getdeps.py fetch --no-tests glog - name: Fetch googletest run: python3 build/fbcode_builder/getdeps.py fetch --no-tests googletest + - name: Fetch xxhash + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests xxhash - name: Fetch zstd run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zstd - name: Fetch double-conversion @@ -112,6 +114,8 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --no-tests glog - name: Build googletest run: python3 build/fbcode_builder/getdeps.py build --no-tests googletest + - name: Build xxhash + run: python3 build/fbcode_builder/getdeps.py build --no-tests xxhash - name: Build zstd run: python3 build/fbcode_builder/getdeps.py build --no-tests zstd - name: Build double-conversion diff --git a/.github/workflows/getdeps_mac.yml b/.github/workflows/getdeps_mac.yml index 214bd352f5f1..5a83d03bc6ec 100644 --- a/.github/workflows/getdeps_mac.yml +++ b/.github/workflows/getdeps_mac.yml @@ -36,6 +36,8 @@ jobs: run: python3 build/fbcode_builder/getdeps.py fetch --no-tests glog - name: Fetch googletest run: python3 build/fbcode_builder/getdeps.py fetch --no-tests googletest + - name: Fetch xxhash + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests xxhash - name: Fetch zstd run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zstd - name: Fetch double-conversion @@ -100,6 +102,8 @@ jobs: run: python3 build/fbcode_builder/getdeps.py build --no-tests glog - name: Build googletest run: python3 build/fbcode_builder/getdeps.py build --no-tests googletest + - name: Build xxhash + run: python3 build/fbcode_builder/getdeps.py build --no-tests xxhash - name: Build zstd run: python3 build/fbcode_builder/getdeps.py build --no-tests zstd - name: Build double-conversion diff --git a/.github/workflows/getdeps_windows.yml b/.github/workflows/getdeps_windows.yml index 6cbdf6526fa1..e31ae1b19056 100644 --- a/.github/workflows/getdeps_windows.yml +++ b/.github/workflows/getdeps_windows.yml @@ -45,6 +45,8 @@ jobs: run: python build/fbcode_builder/getdeps.py fetch --no-tests googletest - name: Fetch libsodium run: python build/fbcode_builder/getdeps.py fetch --no-tests libsodium + - name: Fetch xxhash + run: python build/fbcode_builder/getdeps.py fetch --no-tests xxhash - name: Fetch zstd run: python build/fbcode_builder/getdeps.py fetch --no-tests zstd - name: Fetch double-conversion @@ -103,6 +105,8 @@ jobs: run: python build/fbcode_builder/getdeps.py build --no-tests googletest - name: Build libsodium run: python build/fbcode_builder/getdeps.py build --no-tests libsodium + - name: Build xxhash + run: python build/fbcode_builder/getdeps.py build --no-tests xxhash - name: Build zstd run: python build/fbcode_builder/getdeps.py build --no-tests zstd - name: Build double-conversion diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 8a42fcd43c7c..ef81d3c3c887 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -959,6 +959,10 @@ def get_run_on(self, args): def write_job_for_platform(self, platform, args): # noqa: C901 build_opts = setup_build_options(args, platform) ctx_gen = build_opts.get_context_generator() + if args.enable_tests: + ctx_gen.set_value_for_project(args.project, "test", "on") + else: + ctx_gen.set_value_for_project(args.project, "test", "off") loader = ManifestLoader(build_opts, ctx_gen) self.process_project_dir_arguments(args, loader) manifest = loader.load_manifest(args.project) @@ -1081,7 +1085,10 @@ def write_job_for_platform(self, platform, args): # noqa: C901 free_up_disk = "" allow_sys_arg = "" - if run_tests: + if ( + build_opts.allow_system_packages + and build_opts.host_type.get_package_manager() + ): sudo_arg = "sudo " allow_sys_arg = " --allow-system-packages" if build_opts.host_type.get_package_manager() == "deb": @@ -1092,13 +1099,16 @@ def write_job_for_platform(self, platform, args): # noqa: C901 if build_opts.is_darwin(): # brew is installed as regular user sudo_arg = "" + tests_arg = "--no-tests " + if run_tests: + tests_arg = "" out.write( - f" run: {sudo_arg}python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive {manifest.name}\n" + f" run: {sudo_arg}python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps {tests_arg}--recursive {manifest.name}\n" ) if build_opts.is_linux() or build_opts.is_freebsd(): out.write(" - name: Install packaging system deps\n") out.write( - f" run: {sudo_arg}python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive patchelf\n" + f" run: {sudo_arg}python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps {tests_arg}--recursive patchelf\n" ) required_locales = manifest.get( "github.actions", "required_locales", ctx=manifest_ctx @@ -1176,7 +1186,7 @@ def write_job_for_platform(self, platform, args): # noqa: C901 no_deps_arg = "--no-deps " no_tests_arg = "" - if not args.enable_tests: + if not run_tests: no_tests_arg = "--no-tests " out.write( diff --git a/build/fbcode_builder/manifests/xxhash b/build/fbcode_builder/manifests/xxhash index 8e490011e580..557ded0ddd5e 100644 --- a/build/fbcode_builder/manifests/xxhash +++ b/build/fbcode_builder/manifests/xxhash @@ -8,6 +8,13 @@ sha256 = baee0c6afd4f03165de7a4e67988d16f0f2b257b51d0e3cb91909302a26a79c4 [rpms] xxhash-devel +[debs] +libxxhash-dev +xxhash + +[homebrew] +xxhash + [build.not(os=windows)] builder = make subdir = xxHash-0.8.2 From bc9a4677259a356033a916dd91076a82c2552462 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 15 Oct 2024 09:35:36 -0700 Subject: [PATCH 7206/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/03b66ea6b1aa2b33bd4e1be7adf75731265d5658 https://github.com/facebook/fb303/commit/46fe97bd4e39aa594418c3bcdc4c148d9aed34e8 https://github.com/facebook/fbthrift/commit/49dcc35b0d02cae84c7a2055a27e70639f4b8185 https://github.com/facebook/folly/commit/2e079666a2992f4080d52c3e626c47d007575dc3 https://github.com/facebook/mvfst/commit/e652742dcc1d33f752e9744f11e076c458841493 https://github.com/facebook/proxygen/commit/1745e7ce5743674b6a2af2b4f168ad78d196991f https://github.com/facebook/wangle/commit/51ad7353af953a1be8dad0a56e307f07f36b58cc https://github.com/facebookexperimental/edencommon/commit/c8a2a8a99366387c34f8a0c27fc50e9ef1fc2a5e https://github.com/facebookexperimental/rust-shed/commit/056225380f261e9e33d1ebb27032e2310cf0461d https://github.com/facebookincubator/fizz/commit/58924b55cc777e898797c5ee039056bc349b62d2 Reviewed By: bigfootjon fbshipit-source-id: 85402cca4c8f7cf008b141580f4f7844c929f8b0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 3ccd6761ea75..e0d5785c0767 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f2c4e6c61f8235d909f0af06ac0bb3043a2ce3a5 +Subproject commit 49dcc35b0d02cae84c7a2055a27e70639f4b8185 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index babd0cbb4b83..501d2d2c165d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b293f9eac370fe89d437a53c73d58ac575407245 +Subproject commit 2e079666a2992f4080d52c3e626c47d007575dc3 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a9ccc4fc6f1d..2cce7572ebb7 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 997ed56811317851126281e0fdf4cc0a998eb319 +Subproject commit 51ad7353af953a1be8dad0a56e307f07f36b58cc From 9016f0eb9e507010083f5e5427dd972655c66d41 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Tue, 15 Oct 2024 10:52:55 -0700 Subject: [PATCH 7207/7387] enable system deps in CI to fix oss build Summary: watchman github CI [has SIGABRT in tests](https://github.com/facebook/watchman/actions/runs/11333758247/job/31518543288#step:85:2362): Fix by using system packages. If ubuntu/redhat dependencies work better than the getdeps built ones lets use them in the CIs Reviewed By: genevievehelsel Differential Revision: D64405396 fbshipit-source-id: 21ea232f1f882e5568f5c77f99e713fbc01533be --- .github/workflows/getdeps_linux.yml | 168 ++++++++++++++-------------- .github/workflows/getdeps_mac.yml | 140 +++++++++++------------ 2 files changed, 158 insertions(+), 150 deletions(-) diff --git a/.github/workflows/getdeps_linux.yml b/.github/workflows/getdeps_linux.yml index cd5561902d86..f0987aa55c68 100644 --- a/.github/workflows/getdeps_linux.yml +++ b/.github/workflows/getdeps_linux.yml @@ -18,171 +18,177 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 + - name: Update system package info + run: sudo apt-get update + - name: Install system deps + run: sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive watchman + - name: Install packaging system deps + run: sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive patchelf - name: Install Rust Stable uses: dtolnay/rust-toolchain@stable - name: Fetch boost - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests boost + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests boost - name: Fetch ninja - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests ninja + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests ninja - name: Fetch cmake - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests cmake + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests cmake - name: Fetch cpptoml - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests cpptoml + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests cpptoml - name: Fetch fmt - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fmt + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fmt - name: Fetch gflags - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests gflags + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests gflags - name: Fetch glog - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests glog + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests glog - name: Fetch googletest - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests googletest + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests googletest - name: Fetch xxhash - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests xxhash + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests xxhash - name: Fetch zstd - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zstd + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests zstd - name: Fetch double-conversion - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests double-conversion + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests double-conversion - name: Fetch fast_float - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fast_float + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fast_float - name: Fetch libdwarf - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libdwarf + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libdwarf - name: Fetch libevent - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libevent + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libevent - name: Fetch lz4 - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests lz4 + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests lz4 - name: Fetch snappy - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests snappy + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests snappy - name: Fetch pcre2 - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests pcre2 + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests pcre2 - name: Fetch python-setuptools - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests python-setuptools + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests python-setuptools - name: Fetch zlib - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zlib + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests zlib - name: Fetch bz2 - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests bz2 + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests bz2 - name: Fetch openssl - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests openssl + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests openssl - name: Fetch liboqs - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests liboqs + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests liboqs - name: Fetch autoconf - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests autoconf + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests autoconf - name: Fetch automake - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests automake + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests automake - name: Fetch libtool - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libtool + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libtool - name: Fetch libsodium - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libsodium + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libsodium - name: Fetch libiberty - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libiberty + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libiberty - name: Fetch libunwind - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libunwind + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libunwind - name: Fetch xz - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests xz + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests xz - name: Fetch folly - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests folly + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests folly - name: Fetch fizz - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fizz + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fizz - name: Fetch mvfst - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests mvfst + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests mvfst - name: Fetch libffi - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libffi + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libffi - name: Fetch ncurses - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests ncurses + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests ncurses - name: Fetch python - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests python + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests python - name: Fetch wangle - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests wangle + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests wangle - name: Fetch fbthrift - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fbthrift + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fbthrift - name: Fetch fb303 - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fb303 + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fb303 - name: Fetch edencommon - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests edencommon + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests edencommon - name: Build boost - run: python3 build/fbcode_builder/getdeps.py build --no-tests boost + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests boost - name: Build ninja - run: python3 build/fbcode_builder/getdeps.py build --no-tests ninja + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests ninja - name: Build cmake - run: python3 build/fbcode_builder/getdeps.py build --no-tests cmake + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests cmake - name: Build cpptoml - run: python3 build/fbcode_builder/getdeps.py build --no-tests cpptoml + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests cpptoml - name: Build fmt - run: python3 build/fbcode_builder/getdeps.py build --no-tests fmt + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fmt - name: Build gflags - run: python3 build/fbcode_builder/getdeps.py build --no-tests gflags + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests gflags - name: Build glog - run: python3 build/fbcode_builder/getdeps.py build --no-tests glog + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests glog - name: Build googletest - run: python3 build/fbcode_builder/getdeps.py build --no-tests googletest + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests googletest - name: Build xxhash - run: python3 build/fbcode_builder/getdeps.py build --no-tests xxhash + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests xxhash - name: Build zstd - run: python3 build/fbcode_builder/getdeps.py build --no-tests zstd + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests zstd - name: Build double-conversion - run: python3 build/fbcode_builder/getdeps.py build --no-tests double-conversion + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests double-conversion - name: Build fast_float - run: python3 build/fbcode_builder/getdeps.py build --no-tests fast_float + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fast_float - name: Build libdwarf - run: python3 build/fbcode_builder/getdeps.py build --no-tests libdwarf + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libdwarf - name: Build libevent - run: python3 build/fbcode_builder/getdeps.py build --no-tests libevent + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libevent - name: Build lz4 - run: python3 build/fbcode_builder/getdeps.py build --no-tests lz4 + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests lz4 - name: Build snappy - run: python3 build/fbcode_builder/getdeps.py build --no-tests snappy + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests snappy - name: Build pcre2 - run: python3 build/fbcode_builder/getdeps.py build --no-tests pcre2 + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests pcre2 - name: Build python-setuptools - run: python3 build/fbcode_builder/getdeps.py build --no-tests python-setuptools + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests python-setuptools - name: Build zlib - run: python3 build/fbcode_builder/getdeps.py build --no-tests zlib + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests zlib - name: Build bz2 - run: python3 build/fbcode_builder/getdeps.py build --no-tests bz2 + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests bz2 - name: Build openssl - run: python3 build/fbcode_builder/getdeps.py build --no-tests openssl + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests openssl - name: Build liboqs - run: python3 build/fbcode_builder/getdeps.py build --no-tests liboqs + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests liboqs - name: Build autoconf - run: python3 build/fbcode_builder/getdeps.py build --no-tests autoconf + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests autoconf - name: Build automake - run: python3 build/fbcode_builder/getdeps.py build --no-tests automake + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests automake - name: Build libtool - run: python3 build/fbcode_builder/getdeps.py build --no-tests libtool + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libtool - name: Build libsodium - run: python3 build/fbcode_builder/getdeps.py build --no-tests libsodium + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libsodium - name: Build libiberty - run: python3 build/fbcode_builder/getdeps.py build --no-tests libiberty + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libiberty - name: Build libunwind - run: python3 build/fbcode_builder/getdeps.py build --no-tests libunwind + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libunwind - name: Build xz - run: python3 build/fbcode_builder/getdeps.py build --no-tests xz + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests xz - name: Build folly - run: python3 build/fbcode_builder/getdeps.py build --no-tests folly + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests folly - name: Build fizz - run: python3 build/fbcode_builder/getdeps.py build --no-tests fizz + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fizz - name: Build mvfst - run: python3 build/fbcode_builder/getdeps.py build --no-tests mvfst + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests mvfst - name: Build libffi - run: python3 build/fbcode_builder/getdeps.py build --no-tests libffi + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libffi - name: Build ncurses - run: python3 build/fbcode_builder/getdeps.py build --no-tests ncurses + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests ncurses - name: Build python - run: python3 build/fbcode_builder/getdeps.py build --no-tests python + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests python - name: Build wangle - run: python3 build/fbcode_builder/getdeps.py build --no-tests wangle + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests wangle - name: Build fbthrift - run: python3 build/fbcode_builder/getdeps.py build --no-tests fbthrift + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fbthrift - name: Build fb303 - run: python3 build/fbcode_builder/getdeps.py build --no-tests fb303 + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fb303 - name: Build edencommon - run: python3 build/fbcode_builder/getdeps.py build --no-tests edencommon + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests edencommon - name: Build watchman - run: python3 build/fbcode_builder/getdeps.py build --src-dir=. watchman --project-install-prefix watchman:/usr/local + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --src-dir=. watchman --project-install-prefix watchman:/usr/local - name: Copy artifacts - run: python3 build/fbcode_builder/getdeps.py fixup-dyn-deps --strip --src-dir=. watchman _artifacts/linux --project-install-prefix watchman:/usr/local --final-install-prefix /usr/local + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fixup-dyn-deps --strip --src-dir=. watchman _artifacts/linux --project-install-prefix watchman:/usr/local --final-install-prefix /usr/local - uses: actions/upload-artifact@v4 with: name: watchman path: _artifacts - name: Test watchman - run: python3 build/fbcode_builder/getdeps.py test --src-dir=. watchman --project-install-prefix watchman:/usr/local + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages test --src-dir=. watchman --project-install-prefix watchman:/usr/local diff --git a/.github/workflows/getdeps_mac.yml b/.github/workflows/getdeps_mac.yml index 5a83d03bc6ec..9ca14e42399d 100644 --- a/.github/workflows/getdeps_mac.yml +++ b/.github/workflows/getdeps_mac.yml @@ -18,147 +18,149 @@ jobs: runs-on: macOS-latest steps: - uses: actions/checkout@v4 + - name: Install system deps + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive watchman - name: Install Rust Stable uses: dtolnay/rust-toolchain@stable - name: Fetch boost - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests boost + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests boost - name: Fetch ninja - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests ninja + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests ninja - name: Fetch cmake - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests cmake + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests cmake - name: Fetch cpptoml - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests cpptoml + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests cpptoml - name: Fetch fmt - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fmt + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fmt - name: Fetch gflags - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests gflags + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests gflags - name: Fetch glog - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests glog + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests glog - name: Fetch googletest - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests googletest + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests googletest - name: Fetch xxhash - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests xxhash + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests xxhash - name: Fetch zstd - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zstd + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests zstd - name: Fetch double-conversion - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests double-conversion + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests double-conversion - name: Fetch fast_float - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fast_float + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fast_float - name: Fetch libdwarf - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libdwarf + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libdwarf - name: Fetch lz4 - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests lz4 + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests lz4 - name: Fetch openssl - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests openssl + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests openssl - name: Fetch snappy - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests snappy + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests snappy - name: Fetch pcre2 - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests pcre2 + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests pcre2 - name: Fetch python-setuptools - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests python-setuptools + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests python-setuptools - name: Fetch libevent - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libevent + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libevent - name: Fetch liboqs - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests liboqs + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests liboqs - name: Fetch zlib - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zlib + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests zlib - name: Fetch autoconf - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests autoconf + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests autoconf - name: Fetch automake - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests automake + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests automake - name: Fetch libtool - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libtool + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libtool - name: Fetch libsodium - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libsodium + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libsodium - name: Fetch xz - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests xz + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests xz - name: Fetch folly - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests folly + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests folly - name: Fetch fizz - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fizz + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fizz - name: Fetch mvfst - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests mvfst + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests mvfst - name: Fetch wangle - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests wangle + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests wangle - name: Fetch fbthrift - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fbthrift + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fbthrift - name: Fetch fb303 - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fb303 + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fb303 - name: Fetch edencommon - run: python3 build/fbcode_builder/getdeps.py fetch --no-tests edencommon + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests edencommon - name: Build boost - run: python3 build/fbcode_builder/getdeps.py build --no-tests boost + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests boost - name: Build ninja - run: python3 build/fbcode_builder/getdeps.py build --no-tests ninja + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests ninja - name: Build cmake - run: python3 build/fbcode_builder/getdeps.py build --no-tests cmake + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests cmake - name: Build cpptoml - run: python3 build/fbcode_builder/getdeps.py build --no-tests cpptoml + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests cpptoml - name: Build fmt - run: python3 build/fbcode_builder/getdeps.py build --no-tests fmt + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fmt - name: Build gflags - run: python3 build/fbcode_builder/getdeps.py build --no-tests gflags + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests gflags - name: Build glog - run: python3 build/fbcode_builder/getdeps.py build --no-tests glog + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests glog - name: Build googletest - run: python3 build/fbcode_builder/getdeps.py build --no-tests googletest + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests googletest - name: Build xxhash - run: python3 build/fbcode_builder/getdeps.py build --no-tests xxhash + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests xxhash - name: Build zstd - run: python3 build/fbcode_builder/getdeps.py build --no-tests zstd + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests zstd - name: Build double-conversion - run: python3 build/fbcode_builder/getdeps.py build --no-tests double-conversion + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests double-conversion - name: Build fast_float - run: python3 build/fbcode_builder/getdeps.py build --no-tests fast_float + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fast_float - name: Build libdwarf - run: python3 build/fbcode_builder/getdeps.py build --no-tests libdwarf + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libdwarf - name: Build lz4 - run: python3 build/fbcode_builder/getdeps.py build --no-tests lz4 + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests lz4 - name: Build openssl - run: python3 build/fbcode_builder/getdeps.py build --no-tests openssl + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests openssl - name: Build snappy - run: python3 build/fbcode_builder/getdeps.py build --no-tests snappy + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests snappy - name: Build pcre2 - run: python3 build/fbcode_builder/getdeps.py build --no-tests pcre2 + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests pcre2 - name: Build python-setuptools - run: python3 build/fbcode_builder/getdeps.py build --no-tests python-setuptools + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests python-setuptools - name: Build libevent - run: python3 build/fbcode_builder/getdeps.py build --no-tests libevent + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libevent - name: Build liboqs - run: python3 build/fbcode_builder/getdeps.py build --no-tests liboqs + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests liboqs - name: Build zlib - run: python3 build/fbcode_builder/getdeps.py build --no-tests zlib + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests zlib - name: Build autoconf - run: python3 build/fbcode_builder/getdeps.py build --no-tests autoconf + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests autoconf - name: Build automake - run: python3 build/fbcode_builder/getdeps.py build --no-tests automake + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests automake - name: Build libtool - run: python3 build/fbcode_builder/getdeps.py build --no-tests libtool + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libtool - name: Build libsodium - run: python3 build/fbcode_builder/getdeps.py build --no-tests libsodium + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libsodium - name: Build xz - run: python3 build/fbcode_builder/getdeps.py build --no-tests xz + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests xz - name: Build folly - run: python3 build/fbcode_builder/getdeps.py build --no-tests folly + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests folly - name: Build fizz - run: python3 build/fbcode_builder/getdeps.py build --no-tests fizz + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fizz - name: Build mvfst - run: python3 build/fbcode_builder/getdeps.py build --no-tests mvfst + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests mvfst - name: Build wangle - run: python3 build/fbcode_builder/getdeps.py build --no-tests wangle + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests wangle - name: Build fbthrift - run: python3 build/fbcode_builder/getdeps.py build --no-tests fbthrift + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fbthrift - name: Build fb303 - run: python3 build/fbcode_builder/getdeps.py build --no-tests fb303 + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fb303 - name: Build edencommon - run: python3 build/fbcode_builder/getdeps.py build --no-tests edencommon + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests edencommon - name: Build watchman - run: python3 build/fbcode_builder/getdeps.py build --src-dir=. watchman --project-install-prefix watchman:/usr/local + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --src-dir=. watchman --project-install-prefix watchman:/usr/local - name: Copy artifacts - run: python3 build/fbcode_builder/getdeps.py fixup-dyn-deps --src-dir=. watchman _artifacts/mac --project-install-prefix watchman:/usr/local --final-install-prefix /usr/local + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fixup-dyn-deps --src-dir=. watchman _artifacts/mac --project-install-prefix watchman:/usr/local --final-install-prefix /usr/local - uses: actions/upload-artifact@v4 with: name: watchman path: _artifacts - name: Test watchman - run: python3 build/fbcode_builder/getdeps.py test --src-dir=. watchman --project-install-prefix watchman:/usr/local + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages test --src-dir=. watchman --project-install-prefix watchman:/usr/local From 4c48464519897f4a63b8a05da75114a0736f9ed6 Mon Sep 17 00:00:00 2001 From: Richard Barnes Date: Tue, 15 Oct 2024 11:37:18 -0700 Subject: [PATCH 7208/7387] Fix shadowed variable in watchman/Options.cpp Summary: Our upcoming compiler upgrade will require us not to have shadowed variables. Such variables have a _high_ bug rate and reduce readability, so we would like to avoid them even if the compiler was not forcing us to do so. This codemod attempts to fix an instance of a shadowed variable. Please review with care: if it's failed the result will be a silent bug. **What's a shadowed variable?** Shadowed variables are variables in an inner scope with the same name as another variable in an outer scope. Having the same name for both variables might be semantically correct, but it can make the code confusing to read! It can also hide subtle bugs. This diff fixes such an issue by renaming the variable. - If you approve of this diff, please use the "Accept & Ship" button :-) Reviewed By: kmancini Differential Revision: D64398753 fbshipit-source-id: 42ae08573947b6f6f6a5180b40809b3d67985111 --- watchman/Options.cpp | 62 ++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/watchman/Options.cpp b/watchman/Options.cpp index 281198336fcf..676b56935000 100644 --- a/watchman/Options.cpp +++ b/watchman/Options.cpp @@ -225,27 +225,27 @@ void print_command_list_for_help(FILE* where) { /* One does not simply use getopt_long() */ -[[noreturn]] void usage(const OptDesc* opts, FILE* where) { +[[noreturn]] void usage(const OptDesc* opts_2, FILE* where) { int i; size_t len; size_t longest = 0; const char* label; - fprintf(where, "Usage: watchman [opts] command\n"); + fprintf(where, "Usage: watchman [opts_2] command\n"); /* measure up option names so we can format nicely */ - for (i = 0; opts[i].optname; i++) { - label = opts[i].arglabel ? opts[i].arglabel : "ARG"; + for (i = 0; opts_2[i].optname; i++) { + label = opts_2[i].arglabel ? opts_2[i].arglabel : "ARG"; - len = strlen(opts[i].optname); - switch (opts[i].argtype) { + len = strlen(opts_2[i].optname); + switch (opts_2[i].argtype) { case REQ_STRING: len += strlen(label) + strlen("="); break; default:; } - if (opts[i].shortopt) { + if (opts_2[i].shortopt) { len += strlen("-X, "); } @@ -257,34 +257,34 @@ void print_command_list_for_help(FILE* where) { /* space between option definition and help text */ longest += 3; - for (i = 0; opts[i].optname; i++) { + for (i = 0; opts_2[i].optname; i++) { char buf[80]; - if (!opts[i].helptext) { + if (!opts_2[i].helptext) { // This is a signal that this option shouldn't be printed out. continue; } - label = opts[i].arglabel ? opts[i].arglabel : "ARG"; + label = opts_2[i].arglabel ? opts_2[i].arglabel : "ARG"; fprintf(where, "\n "); - if (opts[i].shortopt) { - fprintf(where, "-%c, ", opts[i].shortopt); + if (opts_2[i].shortopt) { + fprintf(where, "-%c, ", opts_2[i].shortopt); } else { fprintf(where, " "); } - switch (opts[i].argtype) { + switch (opts_2[i].argtype) { case REQ_STRING: - snprintf(buf, sizeof(buf), "--%s=%s", opts[i].optname, label); + snprintf(buf, sizeof(buf), "--%s=%s", opts_2[i].optname, label); break; default: - snprintf(buf, sizeof(buf), "--%s", opts[i].optname); + snprintf(buf, sizeof(buf), "--%s", opts_2[i].optname); break; } fprintf(where, "%-*s ", (unsigned int)longest, buf); - fprintf(where, "%s", opts[i].helptext); + fprintf(where, "%s", opts_2[i].helptext); fprintf(where, "\n"); } @@ -302,7 +302,7 @@ void print_command_list_for_help(FILE* where) { } std::vector -w_getopt(const OptDesc* opts, int* argcp, char*** argvp) { +w_getopt(const OptDesc* opts_2, int* argcp, char*** argvp) { int num_opts, i; char* nextshort; int argc = *argcp; @@ -311,7 +311,7 @@ w_getopt(const OptDesc* opts, int* argcp, char*** argvp) { int res; /* first build up the getopt_long bits that we need */ - for (num_opts = 0; opts[num_opts].optname; num_opts++) { + for (num_opts = 0; opts_2[num_opts].optname; num_opts++) { ; } @@ -335,9 +335,9 @@ w_getopt(const OptDesc* opts, int* argcp, char*** argvp) { /* now transfer information into the space we made */ for (i = 0; i < num_opts; i++) { - long_opts[i].name = (char*)opts[i].optname; - long_opts[i].val = opts[i].shortopt; - switch (opts[i].argtype) { + long_opts[i].name = (char*)opts_2[i].optname; + long_opts[i].val = opts_2[i].shortopt; + switch (opts_2[i].argtype) { case OPT_NONE: long_opts[i].has_arg = no_argument; break; @@ -347,8 +347,8 @@ w_getopt(const OptDesc* opts, int* argcp, char*** argvp) { break; } - if (opts[i].shortopt) { - nextshort[0] = (char)opts[i].shortopt; + if (opts_2[i].shortopt) { + nextshort[0] = (char)opts_2[i].shortopt; nextshort++; if (long_opts[i].has_arg != no_argument) { @@ -369,13 +369,13 @@ w_getopt(const OptDesc* opts, int* argcp, char*** argvp) { /* missing option argument. * Check to see if it was actually optional */ for (long_pos = 0; long_pos < num_opts; long_pos++) { - if (opts[long_pos].shortopt == optopt) { - if (IS_REQUIRED(opts[long_pos].argtype)) { + if (opts_2[long_pos].shortopt == optopt) { + if (IS_REQUIRED(opts_2[long_pos].argtype)) { fprintf( stderr, "--%s (-%c) requires an argument", - opts[long_pos].optname, - opts[long_pos].shortopt); + opts_2[long_pos].optname, + opts_2[long_pos].shortopt); return daemon_argv; } } @@ -385,19 +385,19 @@ w_getopt(const OptDesc* opts, int* argcp, char*** argvp) { case '?': /* unknown option */ fprintf(stderr, "Unknown or invalid option! %s\n", argv[optind - 1]); - usage(opts, stderr); + usage(opts_2, stderr); return daemon_argv; default: if (res == 0) { /* we got a long option */ - o = &opts[long_pos]; + o = &opts_2[long_pos]; } else { /* map short option to the real thing */ o = NULL; for (long_pos = 0; long_pos < num_opts; long_pos++) { - if (opts[long_pos].shortopt == res) { - o = &opts[long_pos]; + if (opts_2[long_pos].shortopt == res) { + o = &opts_2[long_pos]; break; } } From b7c4d130a1c86063f0d696b30b819ed376d2327f Mon Sep 17 00:00:00 2001 From: Richard Barnes Date: Tue, 15 Oct 2024 13:59:11 -0700 Subject: [PATCH 7209/7387] Fix shadowed variable in watchman/PDU.cpp Summary: Our upcoming compiler upgrade will require us not to have shadowed variables. Such variables have a _high_ bug rate and reduce readability, so we would like to avoid them even if the compiler was not forcing us to do so. This codemod attempts to fix an instance of a shadowed variable. Please review with care: if it's failed the result will be a silent bug. **What's a shadowed variable?** Shadowed variables are variables in an inner scope with the same name as another variable in an outer scope. Having the same name for both variables might be semantically correct, but it can make the code confusing to read! It can also hide subtle bugs. This diff fixes such an issue by renaming the variable. - If you approve of this diff, please use the "Accept & Ship" button :-) Reviewed By: palmje Differential Revision: D64398726 fbshipit-source-id: a9985cd1f1b104cf878dd12b2a3ad51c14b30d26 --- watchman/PDU.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/watchman/PDU.cpp b/watchman/PDU.cpp index 8d47556d553d..3166069f753b 100644 --- a/watchman/PDU.cpp +++ b/watchman/PDU.cpp @@ -581,18 +581,18 @@ ResultErrno PduBuffer::jsonEncodeToStream( } ResultErrno PduBuffer::pduEncodeToStream( - PduFormat format, + PduFormat format_2, const json_ref& json, watchman_stream* stm) { - switch (format.type) { + switch (format_2.type) { case is_json_compact: return jsonEncodeToStream(json, stm, JSON_COMPACT); case is_json_pretty: return jsonEncodeToStream(json, stm, JSON_INDENT(4)); case is_bser: - return bserEncodeToStream(1, format.capabilities, json, stm); + return bserEncodeToStream(1, format_2.capabilities, json, stm); case is_bser_v2: - return bserEncodeToStream(2, format.capabilities, json, stm); + return bserEncodeToStream(2, format_2.capabilities, json, stm); case need_data: default: return EINVAL; From c1a7bc6e0c738a68b732f5dd8dd9752e07e83c80 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 16 Oct 2024 09:34:19 -0700 Subject: [PATCH 7210/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/26e7c9af954ca262a36a3db362b0eabe2373c219 https://github.com/facebook/fb303/commit/75823600ded1798dbfdc35901c0785355fba53fe https://github.com/facebook/fbthrift/commit/b10cea26ae3009ccecda8d28450434962ab28344 https://github.com/facebook/folly/commit/a53e741eb3685b51c68eece133ca3a4c64e1465a https://github.com/facebook/mvfst/commit/599d410b01eb82222059d28a2a47c3303cc698fe https://github.com/facebook/proxygen/commit/c6292b74def047e71338520c2895c8e6119915de https://github.com/facebook/wangle/commit/e07efce5b192f104406d00ac65137bb5e8352a6e https://github.com/facebookexperimental/edencommon/commit/4f6bfdf8ea1aa5bac99b028c9ca3e4641ddc1320 https://github.com/facebookexperimental/rust-shed/commit/6a02e45b742060f0988201904a6626ee37fe2468 https://github.com/facebookincubator/fizz/commit/67bf31f595d1551818ec9002e4c48cb7d9f64318 Reviewed By: bigfootjon fbshipit-source-id: 162fe1fc52555e2121db3f09cac4bf6d0ad99339 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e0d5785c0767..0fb7624a972e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 49dcc35b0d02cae84c7a2055a27e70639f4b8185 +Subproject commit b10cea26ae3009ccecda8d28450434962ab28344 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 501d2d2c165d..0865d28c3730 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 2e079666a2992f4080d52c3e626c47d007575dc3 +Subproject commit a53e741eb3685b51c68eece133ca3a4c64e1465a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2cce7572ebb7..344381bf2f38 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 51ad7353af953a1be8dad0a56e307f07f36b58cc +Subproject commit e07efce5b192f104406d00ac65137bb5e8352a6e From 96f3c7a3a8cf695477f08866bd47620e69b1b64c Mon Sep 17 00:00:00 2001 From: Richard Barnes Date: Wed, 16 Oct 2024 12:16:11 -0700 Subject: [PATCH 7211/7387] Fix shadowed variable in watchman/bser.cpp Summary: Our upcoming compiler upgrade will require us not to have shadowed variables. Such variables have a _high_ bug rate and reduce readability, so we would like to avoid them even if the compiler was not forcing us to do so. This codemod attempts to fix an instance of a shadowed variable. Please review with care: if it's failed the result will be a silent bug. **What's a shadowed variable?** Shadowed variables are variables in an inner scope with the same name as another variable in an outer scope. Having the same name for both variables might be semantically correct, but it can make the code confusing to read! It can also hide subtle bugs. This diff fixes such an issue by renaming the variable. - If you approve of this diff, please use the "Accept & Ship" button :-) Reviewed By: meyering Differential Revision: D64398679 fbshipit-source-id: a36466237ef4cac69ad261d0b9c60a92a95db758 --- watchman/bser.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/watchman/bser.cpp b/watchman/bser.cpp index dbfc260dfae3..e85655f29b46 100644 --- a/watchman/bser.cpp +++ b/watchman/bser.cpp @@ -492,13 +492,13 @@ class BserParser { } std::string expected = "{"; bool comma = false; - for (char type : types) { + for (char type_2 : types) { if (comma) { expected += ","; } else { comma = true; } - expected += std::to_string(static_cast(type)); + expected += std::to_string(static_cast(type_2)); } expected += "}"; throw BserParseError( From 676521dad921076f30989f2f42c18a4ada9f65b4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 17 Oct 2024 09:32:14 -0700 Subject: [PATCH 7212/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/e273e1330c34dc931b1583516110b7ab74406fdf https://github.com/facebook/buck2-shims-meta/commit/4dbe21665d7ae92b49377b849838c30027668842 https://github.com/facebook/fb303/commit/0394cff4a265b515de139c3e01eefd63ae36a978 https://github.com/facebook/fbthrift/commit/b747cc17021da104c4f8ebf5ae99b307f0eae2d3 https://github.com/facebook/folly/commit/6e300f3a7e540e2ac52ee1546dc125a3cb70d7c3 https://github.com/facebook/mvfst/commit/5f84352adbb956288f454eada1610ba1c5a6148c https://github.com/facebook/proxygen/commit/712b6cd26b2d5250fbca3c77a7b24235d6a90909 https://github.com/facebook/wangle/commit/c7b899a8756d097973e5fb7b6c0eaff1f5a51d91 https://github.com/facebookexperimental/edencommon/commit/79367a4236d4fbc204d57d85aaa8c51b453e2c55 https://github.com/facebookexperimental/rust-shed/commit/2e7315568f5be64b09d77c3f95e079e5e19418d8 https://github.com/facebookincubator/fizz/commit/82e58215d24d4c2c8e166b0171ae68ff18f25449 Reviewed By: bigfootjon fbshipit-source-id: 1270c56f351b151a273fd4285b92ef425bda6a6c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0fb7624a972e..7602dcce4af1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b10cea26ae3009ccecda8d28450434962ab28344 +Subproject commit b747cc17021da104c4f8ebf5ae99b307f0eae2d3 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0865d28c3730..0fe2df71f502 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a53e741eb3685b51c68eece133ca3a4c64e1465a +Subproject commit 6e300f3a7e540e2ac52ee1546dc125a3cb70d7c3 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 344381bf2f38..163109af2317 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e07efce5b192f104406d00ac65137bb5e8352a6e +Subproject commit c7b899a8756d097973e5fb7b6c0eaff1f5a51d91 From 4c8e86650fab236a63b83264283df34f23020909 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 17 Oct 2024 16:36:44 -0700 Subject: [PATCH 7213/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/640258b1e53027bc4af385629aac3e229aecc819 https://github.com/facebook/fb303/commit/132a667f3705e4accf9843ebb3a625cfd304f915 https://github.com/facebook/fbthrift/commit/97518207214e89d6db73da63837f4e1dc2b57acf https://github.com/facebook/folly/commit/ab576d641d9ae77662e6e54a5db7fbe6d215fa6d https://github.com/facebook/mvfst/commit/54c1905f0ca859becb213f76f8e32cc6607a842f https://github.com/facebook/proxygen/commit/7fe5c7cfedd42538778dbeced501900ea493dd7e https://github.com/facebook/wangle/commit/dd5f918c13d1f4c89519cc76edec50e39c0fdc2b https://github.com/facebookexperimental/edencommon/commit/1a728c784248730eda3eaa06bf1f6c57d05766eb https://github.com/facebookexperimental/rust-shed/commit/b9df206a5012cb271e12715d9cebe89660e13db9 https://github.com/facebookincubator/fizz/commit/dc3b522ec9eabcd37f690c7939125b32309b4242 Reviewed By: bigfootjon fbshipit-source-id: e75984068312614653a1115d7ed287c5468589dd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7602dcce4af1..0bae81d110fc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b747cc17021da104c4f8ebf5ae99b307f0eae2d3 +Subproject commit 97518207214e89d6db73da63837f4e1dc2b57acf diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0fe2df71f502..1c314a7909c2 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 6e300f3a7e540e2ac52ee1546dc125a3cb70d7c3 +Subproject commit ab576d641d9ae77662e6e54a5db7fbe6d215fa6d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 163109af2317..6c13ab940e45 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c7b899a8756d097973e5fb7b6c0eaff1f5a51d91 +Subproject commit dd5f918c13d1f4c89519cc76edec50e39c0fdc2b From 6d7dcb279745e54bc60c88cff2749a07107e0e18 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Fri, 18 Oct 2024 03:30:23 -0700 Subject: [PATCH 7214/7387] getdeps: fix xxhash build on windows Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1015 fbthrift needs xxhash but xxhash manifest had no builder defined on windows Add xxhash windows build support using cmake X-link: https://github.com/facebook/fbthrift/pull/624 Reviewed By: andreacampi Differential Revision: D64592635 Pulled By: ahornby fbshipit-source-id: 5dc558e8786fa1264ba0e89026ca750d1a285dea --- build/fbcode_builder/manifests/xxhash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/fbcode_builder/manifests/xxhash b/build/fbcode_builder/manifests/xxhash index 557ded0ddd5e..b06002f667e1 100644 --- a/build/fbcode_builder/manifests/xxhash +++ b/build/fbcode_builder/manifests/xxhash @@ -25,3 +25,6 @@ all [make.install_args] install +[build.os=windows] +builder = cmake +subdir = xxHash-0.8.2/cmake_unofficial From fa659091b95107677e5d2dba6f7a7277dbaf68ee Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 18 Oct 2024 09:34:37 -0700 Subject: [PATCH 7215/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/3d0ddccf2b2fe311bc2c9873b831ea96832ab927 https://github.com/facebook/fb303/commit/80e3fb11397d3c04126250a8c5b0bcad48100303 https://github.com/facebook/fbthrift/commit/a81fe64b93329093639ff15a0eace7cb85fcba73 https://github.com/facebook/folly/commit/74e857c3773d3b125836fe78133a131db2f66fed https://github.com/facebook/mvfst/commit/48fb2aac88d867fa206b4a287ca1f77e6e9b6e66 https://github.com/facebook/proxygen/commit/4d1bbb0be7c9df99fa2dd0e6a1dd6b65815d1205 https://github.com/facebook/wangle/commit/d07f8672dcbc2cc7c76e9e414299c82a6a5dfdf2 https://github.com/facebookexperimental/edencommon/commit/c934d8994a62dcf55e209851d83cbb611d8501e8 https://github.com/facebookexperimental/rust-shed/commit/1630d1f59c72d0d5c2334bdaab4b6eea072a140b https://github.com/facebookincubator/fizz/commit/56482fd17b4f9a25cd1f2254ff4df1804aea879c Reviewed By: zpao fbshipit-source-id: 93e2a3209242c4a1ac27eaa1fdf183b1696bcd1b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 0bae81d110fc..5fcea5a64258 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 97518207214e89d6db73da63837f4e1dc2b57acf +Subproject commit a81fe64b93329093639ff15a0eace7cb85fcba73 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 1c314a7909c2..92e44fd357d5 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ab576d641d9ae77662e6e54a5db7fbe6d215fa6d +Subproject commit 74e857c3773d3b125836fe78133a131db2f66fed diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6c13ab940e45..0aa91b3f05e8 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit dd5f918c13d1f4c89519cc76edec50e39c0fdc2b +Subproject commit d07f8672dcbc2cc7c76e9e414299c82a6a5dfdf2 From c8c5496a706688d61081f9683a80cfc50440e335 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 19 Oct 2024 09:37:04 -0700 Subject: [PATCH 7216/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/f6c58c707013de3eb46e84863acbeaf7e7d89672 https://github.com/facebook/buck2-shims-meta/commit/a519d46b53167f543164c9417e0e54319dff0a56 https://github.com/facebook/fb303/commit/9d49a1723c189f081211acc2f839235012662f82 https://github.com/facebook/fbthrift/commit/843a1cc0b4dff3cefd4ee2f431ab3f74d418fbda https://github.com/facebook/folly/commit/1f718917dd8d9c2c825beda1f9fbbc2bc572bbad https://github.com/facebook/mvfst/commit/54b321dd2925f89b258e0270770413181870cba6 https://github.com/facebook/proxygen/commit/a24a48266084afbc801bdf7a1d8e1e97d695ee94 https://github.com/facebook/wangle/commit/1b99e6a07f4af9f0bac7c1dc275ecaab4f1f790c https://github.com/facebookexperimental/edencommon/commit/1d8f2d43a37caf79b04794c63624875ab9386232 https://github.com/facebookexperimental/rust-shed/commit/a0bbedbb5729b0e29ab03897d68cb0d78e34797d https://github.com/facebookincubator/fizz/commit/ecfef791a15c1321cb2888178eaf05d9fd2d8950 Reviewed By: bigfootjon fbshipit-source-id: f4e71b1243e523bb0e286e8fcdb168e5788a4cea --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5fcea5a64258..d7625c23d4cb 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a81fe64b93329093639ff15a0eace7cb85fcba73 +Subproject commit 843a1cc0b4dff3cefd4ee2f431ab3f74d418fbda diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 92e44fd357d5..9838dc4e3522 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 74e857c3773d3b125836fe78133a131db2f66fed +Subproject commit 1f718917dd8d9c2c825beda1f9fbbc2bc572bbad diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0aa91b3f05e8..3ce42177e40b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d07f8672dcbc2cc7c76e9e414299c82a6a5dfdf2 +Subproject commit 1b99e6a07f4af9f0bac7c1dc275ecaab4f1f790c From aefbee8c6940b802df0d8d246af13f23e9dbaeee Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 20 Oct 2024 09:36:21 -0700 Subject: [PATCH 7217/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/854204088f94a2aa2e5d7f323f27784c894a65be https://github.com/facebook/fb303/commit/22ce5b2743c6b88df6475997e03c0d7f6358952a https://github.com/facebook/fbthrift/commit/af909fac4abc713ab1cd91c1cafd302c38a34c5c https://github.com/facebook/folly/commit/a6e3b26de735c5719b19dd1076089e128f389a47 https://github.com/facebook/mvfst/commit/6809d020e1792d58975e46e2eacb70bb81368115 https://github.com/facebook/proxygen/commit/1f2e31e87987f6178bb000c9254dd73a8bb4cb05 https://github.com/facebook/wangle/commit/888b37c463e0506fc2ec8e11c521a2f03a3cb44f https://github.com/facebookexperimental/edencommon/commit/399293ac7f69b831e0615c2a99673e349bcb5b5f https://github.com/facebookexperimental/rust-shed/commit/f2b747a982178ce9d068d377dff3d282657dd65a https://github.com/facebookincubator/fizz/commit/729cc4ba4ce66146d76b6eb86dfc60c55941853a Reviewed By: bigfootjon fbshipit-source-id: b17e75dc8f740733f1e70babf9cb1c8b3784ca2e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d7625c23d4cb..ec238d011241 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 843a1cc0b4dff3cefd4ee2f431ab3f74d418fbda +Subproject commit af909fac4abc713ab1cd91c1cafd302c38a34c5c diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 9838dc4e3522..862c9dee8ffe 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1f718917dd8d9c2c825beda1f9fbbc2bc572bbad +Subproject commit a6e3b26de735c5719b19dd1076089e128f389a47 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3ce42177e40b..dc8e10e11efd 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1b99e6a07f4af9f0bac7c1dc275ecaab4f1f790c +Subproject commit 888b37c463e0506fc2ec8e11c521a2f03a3cb44f From 10296c0a254ed3dd2695272a91b754cbd84ed089 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 21 Oct 2024 04:07:29 -0700 Subject: [PATCH 7218/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/7ca3b3d224894efb8c783bc350bc4ecfebe9fdc4 https://github.com/facebook/fb303/commit/648dc1e0eeea0e4a4c804a07352c329b3b71b26d https://github.com/facebook/fbthrift/commit/044cf81de37c799c7dbd4d5dd4d22526b978e976 https://github.com/facebook/folly/commit/10817a62c50ac24bf16d3ec6fda8c5152a53737e https://github.com/facebook/mvfst/commit/c4dd9d8da5250e95eff21edd75cf43e43230e603 https://github.com/facebook/proxygen/commit/d8d681c7443d46a31db7d66fcfff1c150a473c82 https://github.com/facebook/wangle/commit/7916247d939bf41cd1da818a290afe39f4a90af3 https://github.com/facebookexperimental/edencommon/commit/96b6fa842cb90b2eae3f7d42c0a92150c139c4a6 https://github.com/facebookexperimental/rust-shed/commit/e1150408e2b8a02d87f957b55be0e603f2911cb3 https://github.com/facebookincubator/fizz/commit/ebba1870a2088598af35dc42cb3d6d2d78ee416b Reviewed By: bigfootjon fbshipit-source-id: 78e2821dcfc49a84ea40ef3c3ef385c5c5be0281 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ec238d011241..662f63c59c59 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit af909fac4abc713ab1cd91c1cafd302c38a34c5c +Subproject commit 044cf81de37c799c7dbd4d5dd4d22526b978e976 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 862c9dee8ffe..fa21338498e8 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a6e3b26de735c5719b19dd1076089e128f389a47 +Subproject commit 10817a62c50ac24bf16d3ec6fda8c5152a53737e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index dc8e10e11efd..ddbdc374c981 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 888b37c463e0506fc2ec8e11c521a2f03a3cb44f +Subproject commit 7916247d939bf41cd1da818a290afe39f4a90af3 From fe9990828fb79ef44089982b089877423bab4992 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 21 Oct 2024 15:31:51 -0700 Subject: [PATCH 7219/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-shims-meta/commit/42067fa345a942abb92ebde7f9808cb618d3eeed https://github.com/facebook/fb303/commit/ca4eba5fc6d47a1e8385a3c181f89ccd68dc15d9 https://github.com/facebook/fbthrift/commit/261e18355195977eefedf1cd8a54d60d89a223a1 https://github.com/facebook/folly/commit/a9bfa31f1aae3a3964f0d8a8b6864ef4911897af https://github.com/facebook/mvfst/commit/d05265fe65d517c7aa28c2e35f8229ac998924a2 https://github.com/facebook/proxygen/commit/5617867029920e6ebe8eecba76010d14ce1682dd https://github.com/facebook/wangle/commit/ecc475c93c1beff42e1e7ddb74c9b79eb666de19 https://github.com/facebookexperimental/edencommon/commit/7964f934832413d561646b971d51e15a0cfb1974 https://github.com/facebookexperimental/rust-shed/commit/9e06717960837a9c4f569a9f598195eff4464414 https://github.com/facebookincubator/fizz/commit/0fe9ab8d9f85c4b211d4b42dee83cb7031a3c721 Reviewed By: ajb85 fbshipit-source-id: 4f155dffe36a3345db50b420e3c954d9c2b0ab62 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 662f63c59c59..2d98d7b69555 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 044cf81de37c799c7dbd4d5dd4d22526b978e976 +Subproject commit 261e18355195977eefedf1cd8a54d60d89a223a1 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index fa21338498e8..2bffcf1fe062 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 10817a62c50ac24bf16d3ec6fda8c5152a53737e +Subproject commit a9bfa31f1aae3a3964f0d8a8b6864ef4911897af diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ddbdc374c981..b6e568290f9e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7916247d939bf41cd1da818a290afe39f4a90af3 +Subproject commit ecc475c93c1beff42e1e7ddb74c9b79eb666de19 From 520758440540b16bfdf31cbdffd6e9a0ab3df30b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 22 Oct 2024 09:37:22 -0700 Subject: [PATCH 7220/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/cddd1d8d9dd78450f6126a7e71319837675f8138 https://github.com/facebook/fb303/commit/43d83c1fbfbe94914dc5e197e5b0a37ea0c38e35 https://github.com/facebook/fbthrift/commit/0101ff3e5233ff3476f0c2dbcb0c439d3ab4cbac https://github.com/facebook/folly/commit/671c75faa7cd0e17b82e465e4e7f0d2a36d26cca https://github.com/facebook/mvfst/commit/58612fd1c3498731ade44db02c3079cf63a19d45 https://github.com/facebook/proxygen/commit/ae4f1ebcd65c74b49aaa4c17a323c40433a5cde8 https://github.com/facebook/wangle/commit/542d380b9bef1b209b34e3618b826a444aceeaa3 https://github.com/facebookexperimental/edencommon/commit/4d13d4d1fe4b7ac7f1bde3cba87b5b228f2884dc https://github.com/facebookexperimental/rust-shed/commit/b5573e18975ead289e1e12c18159fc8ab75ae24a https://github.com/facebookincubator/fizz/commit/63e26d01a6f80ac69fe718efeea1a6565b5d91de Reviewed By: ajb85 fbshipit-source-id: 16663b0647f37947941c355c76d59a4e83a30c69 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2d98d7b69555..400c1310b911 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 261e18355195977eefedf1cd8a54d60d89a223a1 +Subproject commit 0101ff3e5233ff3476f0c2dbcb0c439d3ab4cbac diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 2bffcf1fe062..a0aa0e2b3c7e 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit a9bfa31f1aae3a3964f0d8a8b6864ef4911897af +Subproject commit 671c75faa7cd0e17b82e465e4e7f0d2a36d26cca diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b6e568290f9e..29fe30f92698 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ecc475c93c1beff42e1e7ddb74c9b79eb666de19 +Subproject commit 542d380b9bef1b209b34e3618b826a444aceeaa3 From 9c179cceec7a763383965a178e07af9914e1a486 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Wed, 23 Oct 2024 02:56:47 -0700 Subject: [PATCH 7221/7387] sapling: disable flaky tests on github getdeps cli Summary: X-link: https://github.com/facebook/sapling/pull/973 X-link: https://github.com/facebookincubator/zstrong/pull/1017 * disable flaky tests as per comment in Makefile * fix Makefiles JOBS sed expression to be macOS make compatible * remove Makefile comment in multiline shell, macOS make didn't like it * remove hexdump from deps for macOS where it is a system util Reviewed By: quark-zju Differential Revision: D64781284 fbshipit-source-id: a7f52c67d430219dcf7173b8d03cafe32fe41989 --- build/fbcode_builder/manifests/sapling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/manifests/sapling b/build/fbcode_builder/manifests/sapling index c067360ef82b..cff882c67c87 100644 --- a/build/fbcode_builder/manifests/sapling +++ b/build/fbcode_builder/manifests/sapling @@ -60,7 +60,7 @@ fb303 fbthrift rust-shed -[dependencies.test=on] +[dependencies.all(test=on,not(os=darwin))] hexdump [dependencies.not(os=windows)] From c85913fe7d55333e9484c809a2c67a34c59c3483 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 23 Oct 2024 09:39:50 -0700 Subject: [PATCH 7222/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/d0a7c16a8c8b645e2b2e65dd78cdf9cc143cf96a https://github.com/facebook/buck2-shims-meta/commit/fea994851907bf77ebdd75d0c5b9f8bc021934e6 https://github.com/facebook/fb303/commit/856e9b37bbb6985a9d7b8ae45c0df16a1174dafb https://github.com/facebook/fbthrift/commit/55e3309e4dcc940d351e485d828028bc168be8b8 https://github.com/facebook/folly/commit/e57ce302ff7fe0960043b7d6299d96b35d62dd39 https://github.com/facebook/mvfst/commit/0f215e2211de184169faaac91bd5ac8e492294df https://github.com/facebook/proxygen/commit/62b5ac0219bac626de8fceb53f28ace0ef58a291 https://github.com/facebook/wangle/commit/be3f9f585f4af7011b069cb391a7f667b977713b https://github.com/facebookexperimental/edencommon/commit/ccee163bbba02efd5ddbb843d0f8c0293221535b https://github.com/facebookexperimental/rust-shed/commit/d02bd901e96f3a907f5ba6eeeb090ddcfc2b6866 https://github.com/facebookincubator/fizz/commit/f614c44619f6d0a66f3b7fa8215449a2f0999223 Reviewed By: ajb85 fbshipit-source-id: 49bd284ddc084d87cdd8c5ddba3fddd94d9da1cb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 400c1310b911..d63ed9deee78 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0101ff3e5233ff3476f0c2dbcb0c439d3ab4cbac +Subproject commit 55e3309e4dcc940d351e485d828028bc168be8b8 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a0aa0e2b3c7e..4feb28a16355 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 671c75faa7cd0e17b82e465e4e7f0d2a36d26cca +Subproject commit e57ce302ff7fe0960043b7d6299d96b35d62dd39 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 29fe30f92698..57a18a794154 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 542d380b9bef1b209b34e3618b826a444aceeaa3 +Subproject commit be3f9f585f4af7011b069cb391a7f667b977713b From 813f6845f91e7464249ff8115327eb288a6bd19c Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Thu, 24 Oct 2024 01:49:45 -0700 Subject: [PATCH 7223/7387] get mononoke green in github CI Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1018 * test-cross-repo-mononoke-git-sot.t deleted, remove from exclusion list * exclude flaky integration tests changes done to make this easier: * python-click wasn't found in sapling dir, added package mappings for rpm and deb so that we can pick up the installed version * add a bit more info to the "unknown python exception" message from hg * reduce paths set by getdeps, no point listing non-existing dir, makes it easier to see what is happening X-link: https://github.com/facebook/sapling/pull/974 Reviewed By: quark-zju Differential Revision: D64827811 Pulled By: ahornby fbshipit-source-id: 82b4fa224d8ce957ef85e5ecf1e220f71c93e6c4 --- build/fbcode_builder/getdeps/buildopts.py | 14 ++++++++------ build/fbcode_builder/manifests/python-click | 6 ++++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/build/fbcode_builder/getdeps/buildopts.py b/build/fbcode_builder/getdeps/buildopts.py index b315c175b8ab..8a9c9a99ddea 100644 --- a/build/fbcode_builder/getdeps/buildopts.py +++ b/build/fbcode_builder/getdeps/buildopts.py @@ -304,12 +304,14 @@ def compute_env_for_install_dirs( is_direct_dep = ( manifest is not None and m.name in manifest.get_dependencies(ctx) ) - self.add_prefix_to_env( - loader.get_project_install_dir(m), - env, - append=False, - is_direct_dep=is_direct_dep, - ) + d = loader.get_project_install_dir(m) + if os.path.exists(d): + self.add_prefix_to_env( + d, + env, + append=False, + is_direct_dep=is_direct_dep, + ) # Linux is always system openssl system_openssl = self.is_linux() diff --git a/build/fbcode_builder/manifests/python-click b/build/fbcode_builder/manifests/python-click index ea9a9d2d3dc3..cdf29c4d0c02 100644 --- a/build/fbcode_builder/manifests/python-click +++ b/build/fbcode_builder/manifests/python-click @@ -7,3 +7,9 @@ sha256 = dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc [build] builder = python-wheel + +[rpms] +python3-click + +[debs] +python3-click From f41ed2bea2ec0a07b98a8bd0c355f3f67290cebf Mon Sep 17 00:00:00 2001 From: Sean Lawlor Date: Thu, 24 Oct 2024 09:02:47 -0700 Subject: [PATCH 7224/7387] Vendor ractor 0.12.4 and upgrade tokio to 1.41.0 Summary: From release notes: Ractor v0.12.4 is released! In this release there are 2 primary changes 1. We're adding the ability to runtime inspect the message type of an untyped `ActorCell` which can be helpful for supervision flows 2. We're also adding helpers for interacting with a supervisor's children (retrieval of the children, stopping them, and draining them) without having to have the supervisor keep additional handles around Both are in #277 Tokio is being upgraded to add support for `join_all()` in `JoinSet` which `ractor` leverages (easier to upgrade than backport a hack into ractor) Reviewed By: Imxset21 Differential Revision: D64833735 fbshipit-source-id: 897302bf95467310131348f1ee8c1f766e81f725 --- watchman/cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index c181ef7ec635..c155278a9bb2 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -18,7 +18,7 @@ serde_json = { version = "1.0.125", features = ["float_roundtrip", "unbounded_de structopt = "0.3.26" sysinfo = "0.30.11" tabular = "0.2.0" -tokio = { version = "1.37.0", features = ["full", "test-util", "tracing"] } +tokio = { version = "1.41.0", features = ["full", "test-util", "tracing"] } watchman_client = { version = "0.9.0", path = "../rust/watchman_client" } [target.'cfg(target_os = "linux")'.dependencies] From cd70bcdf2ad271e37db487c923de3227dbcff0d8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 24 Oct 2024 09:35:43 -0700 Subject: [PATCH 7225/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/50dd2de6fe2f98b899e6df6539733f56b4df2e74 https://github.com/facebook/buck2-shims-meta/commit/971b2cb76e43b31983d868c6ccb9ee51c441f6e8 https://github.com/facebook/fb303/commit/05db1baf2aad99a53a8f4bd741f04eeb2026f1d9 https://github.com/facebook/fbthrift/commit/a653fd8196f9720c406a594987e258c52c98e229 https://github.com/facebook/folly/commit/097a5bd8084d056e823d5389389a18ca963167d4 https://github.com/facebook/mvfst/commit/ae3552372f74fffda53423d2ef4d6db41e6ef9ad https://github.com/facebook/proxygen/commit/0e8c86a49890e4e9f70d631d11e308fcaac54c6c https://github.com/facebook/wangle/commit/5aefd05bf887bcbfc04a683b5f19ec35d2ab2048 https://github.com/facebookexperimental/edencommon/commit/0bfb5b1861df5a5beb2e7837707e4310b8c2c303 https://github.com/facebookexperimental/rust-shed/commit/5434f56302a6f48f908c0cbd4d2bbd4890b3710c https://github.com/facebookincubator/fizz/commit/d757c69b3446cc10b23044c3a51efbe270ad5aea Reviewed By: ajb85 fbshipit-source-id: d3e840acb276e4700a96f84bb590ef0c42dfd138 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d63ed9deee78..b61246c0a57c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 55e3309e4dcc940d351e485d828028bc168be8b8 +Subproject commit a653fd8196f9720c406a594987e258c52c98e229 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 4feb28a16355..5d81ec01d205 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e57ce302ff7fe0960043b7d6299d96b35d62dd39 +Subproject commit 097a5bd8084d056e823d5389389a18ca963167d4 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 57a18a794154..fed31f107dec 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit be3f9f585f4af7011b069cb391a7f667b977713b +Subproject commit 5aefd05bf887bcbfc04a683b5f19ec35d2ab2048 From 267bd16c747329a000a0d29568703c2a86fce379 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Thu, 24 Oct 2024 13:22:40 -0700 Subject: [PATCH 7226/7387] getdeps: enable -fcoroutines for GCC in fb303 and eden Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1019 Enable coroutines on GCC for fb303 and eden OSS cmake builds to match folly and [fbthrift](https://github.com/facebook/fbthrift/blob/197890bbedd4942809b91139f9a2890c8f167045/CMakeLists.txt#L64-L75). This stops the eden tests from immediatedly core dumping when they try to open up the thrift server So can check if core dumps: * fix to eden main.py to stub par_telemetry in OSS where its not available * add the missing getdeps dependency from eden to sapling for tests (it needs the sapling binaries for the tests torun) Reviewed By: jdelliot Differential Revision: D64911998 fbshipit-source-id: f6316908314bd821dd8c0e5afb5fe4584f5be23e --- build/fbcode_builder/manifests/eden | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/fbcode_builder/manifests/eden b/build/fbcode_builder/manifests/eden index 168f460e9af7..d7bc911612e3 100644 --- a/build/fbcode_builder/manifests/eden +++ b/build/fbcode_builder/manifests/eden @@ -55,6 +55,10 @@ python # TODO: teach getdeps to compile lmdb on Windows. lmdb +[dependencies.test=on] +# sapling CLI is needed to run the tests +sapling + [shipit.pathmap.fb=on] # for internal builds that use getdeps fbcode/fb303 = fb303 From 1f031a0c78dfef72c990ca7bc747203cb63e32f8 Mon Sep 17 00:00:00 2001 From: Aristidis Papaioannou Date: Thu, 24 Oct 2024 15:25:31 -0700 Subject: [PATCH 7227/7387] fbcode/eden/fs/ Reviewed By: MichaelCuevas Differential Revision: D64464637 fbshipit-source-id: 741bbeb1e6089980373bed4629440caac8d817d7 --- eden/fs/service/eden.thrift | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 4c8925773dba..93feb9e24fb0 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -8,6 +8,7 @@ include "eden/fs/config/eden_config.thrift" include "fb303/thrift/fb303_core.thrift" include "thrift/annotation/thrift.thrift" +include "thrift/annotation/cpp.thrift" namespace cpp2 facebook.eden namespace java com.facebook.eden.thrift @@ -125,10 +126,11 @@ enum EdenErrorType { } exception EdenError { + @thrift.ExceptionMessage 1: string message; 2: optional i32 errorCode; 3: EdenErrorType errorType; -} (message = 'message') +} exception NoValueForKeyError { 1: string key; @@ -175,6 +177,7 @@ struct PrivHelperInfo { /** * The current running state of an EdenMount. */ +@cpp.EnumType{type = cpp.EnumUnderlyingType.U32} enum MountState { /** * The EdenMount object has been constructed but has not started @@ -232,7 +235,7 @@ enum MountState { * before we have attempted to start the user-space filesystem mount. */ INIT_ERROR = 9, -} (cpp2.enum_type = 'uint32_t') +} struct MountInfo { 1: PathString mountPoint; @@ -361,7 +364,7 @@ enum FileAttributes { */ DIGEST_HASH = 64, /* NEXT_ATTR = 2^x */ -} (cpp2.enum_type = 'uint64_t') +} typedef unsigned64 RequestedAttributes @@ -885,7 +888,7 @@ enum DataFetchOrigin { LOCAL_BACKING_STORE = 8, REMOTE_BACKING_STORE = 16, /* NEXT_WHERE = 2^x */ -} (cpp2.enum_type = 'uint64_t') +} struct DebugGetScmBlobRequest { 1: MountId mountId; @@ -2089,9 +2092,8 @@ service EdenService extends fb303_core.BaseService { * for optimization and the result not relied on for operations. This command does not * return the list of prefetched files. */ - void prefetchFiles(1: PrefetchParams params) throws (1: EdenError ex) ( - priority = 'BEST_EFFORT', - ); + @thrift.Priority{level = thrift.RpcPriority.BEST_EFFORT} + void prefetchFiles(1: PrefetchParams params) throws (1: EdenError ex); /** * Has the same behavior as globFiles, but should be called in the case of a prefetch. @@ -2189,7 +2191,8 @@ service EdenService extends fb303_core.BaseService { * Returns information about the running process, including pid and command * line. */ - DaemonInfo getDaemonInfo() throws (1: EdenError ex) (priority = 'IMPORTANT'); + @thrift.Priority{level = thrift.RpcPriority.IMPORTANT} + DaemonInfo getDaemonInfo() throws (1: EdenError ex); /** * Returns information about the privhelper process, including accesibility. From 97f35b8d019786488010f96e523028a77b248a48 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 25 Oct 2024 03:03:40 -0700 Subject: [PATCH 7228/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/5d0cc90040c02b352853efd199116a9987cdc817 https://github.com/facebook/fb303/commit/219abefc2d8a6158d12837359b7a3880c0277991 https://github.com/facebook/fbthrift/commit/36ad9d3b3a93f1dbc85dd4058f594099f14b0049 https://github.com/facebook/folly/commit/16c2c41fec3b0d72c43e494d1c1e4f32776517bf https://github.com/facebook/mvfst/commit/eef79b12029a3b766f678acd61ff20d47825317c https://github.com/facebook/proxygen/commit/23a4134f14d42e80fb95b6cf2b72feb476e121a3 https://github.com/facebook/wangle/commit/1a09d7946acc259d3b018aee5aa6f22c6d1d2455 https://github.com/facebookexperimental/edencommon/commit/b1c60bd012248fce92a0417c74bf9b2ff6a569f4 https://github.com/facebookexperimental/rust-shed/commit/678550d885bda7d43784ac7cd15e0354abaaac6d https://github.com/facebookincubator/fizz/commit/9b87fa5629ccc516993921c6479484dcac2b8c32 Reviewed By: ajb85 fbshipit-source-id: e5bffd4f3a1f61e24c8c4a5ab1850dac15dfcbe4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b61246c0a57c..af07da2b7e0b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a653fd8196f9720c406a594987e258c52c98e229 +Subproject commit 36ad9d3b3a93f1dbc85dd4058f594099f14b0049 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 5d81ec01d205..21cc58d44971 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 097a5bd8084d056e823d5389389a18ca963167d4 +Subproject commit 16c2c41fec3b0d72c43e494d1c1e4f32776517bf diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index fed31f107dec..2b214f69aa53 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5aefd05bf887bcbfc04a683b5f19ec35d2ab2048 +Subproject commit 1a09d7946acc259d3b018aee5aa6f22c6d1d2455 From 38284782b411a828b6bdbf3908b3130b2593801f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 25 Oct 2024 09:34:13 -0700 Subject: [PATCH 7229/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/908b70fccd0fec28ed423f1bf26e6a690f5af93e https://github.com/facebook/fb303/commit/7857d6cbf9ce503127853e813c0cda97f94b3679 https://github.com/facebook/fbthrift/commit/2e08d21959f84ddb84967addfadd7861875d7542 https://github.com/facebook/mvfst/commit/66a621d10e8c4f2330c0f04156e69dd7a9241618 https://github.com/facebook/proxygen/commit/89e23d08feef85ac9022be08305c3cceaab6f200 https://github.com/facebook/wangle/commit/39eea114fbcace505bce2dead228b7cb1e6c2895 https://github.com/facebookexperimental/edencommon/commit/129bb3b5b740e6ca85c9c624f544019b82a60555 https://github.com/facebookexperimental/rust-shed/commit/39641fe9538d39374d5bbd1ed521f0b21f4c06c5 https://github.com/facebookincubator/fizz/commit/8f1a9c02f49bb7ea986d0fa3350b17c284d37026 Reviewed By: ajb85 fbshipit-source-id: 6e7bd661b0b030b4ba9dded14e26078adce3f5ef --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index af07da2b7e0b..a246932f82e1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 36ad9d3b3a93f1dbc85dd4058f594099f14b0049 +Subproject commit 2e08d21959f84ddb84967addfadd7861875d7542 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2b214f69aa53..a357cba98646 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1a09d7946acc259d3b018aee5aa6f22c6d1d2455 +Subproject commit 39eea114fbcace505bce2dead228b7cb1e6c2895 From 34d9ccf37de51fb484b5244a6a2aeb05c1d11fd0 Mon Sep 17 00:00:00 2001 From: Martin Li Date: Fri, 25 Oct 2024 11:14:25 -0700 Subject: [PATCH 7230/7387] update error print to say how many arguments are expected Summary: Current error message is unhelpful :( add some context to how many arguments were expected Reviewed By: chadaustin Differential Revision: D64968870 fbshipit-source-id: d5bea38c5c5f0cbf87441da53db19f7e26fd9285 --- watchman/cmds/query.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/cmds/query.cpp b/watchman/cmds/query.cpp index 4330e410b7be..789a6508d3f3 100644 --- a/watchman/cmds/query.cpp +++ b/watchman/cmds/query.cpp @@ -19,7 +19,7 @@ using namespace watchman; /* query /root {query} */ static UntypedResponse cmd_query(Client* client, const json_ref& args) { if (json_array_size(args) != 3) { - throw ErrorResponse("wrong number of arguments for 'query'"); + throw ErrorResponse("wrong number of arguments for 'query', expected 3"); } auto root = resolveRoot(client, args); From cca4a55091430465823ec04437cc1f4f24215615 Mon Sep 17 00:00:00 2001 From: generatedunixname89002005307016 Date: Fri, 25 Oct 2024 21:48:37 -0700 Subject: [PATCH 7231/7387] upgrade pyre version in `fbcode/opensource` - batch 1 (#1024) Summary: Pull Request resolved: https://github.com/facebookincubator/zstrong/pull/1024 Differential Revision: D64977670 fbshipit-source-id: 505d9709aa088f7811e0f4d6d7ba26b07ffdbc94 --- build/fbcode_builder/getdeps/expr.py | 2 ++ build/fbcode_builder/getdeps/platform.py | 1 - build/fbcode_builder/getdeps/py_wheel_builder.py | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/fbcode_builder/getdeps/expr.py b/build/fbcode_builder/getdeps/expr.py index 0f51521d6581..3b3d2d13d8eb 100644 --- a/build/fbcode_builder/getdeps/expr.py +++ b/build/fbcode_builder/getdeps/expr.py @@ -151,8 +151,10 @@ def top(self): def ident(self) -> str: ident = self.lex.get_token() + # pyre-fixme[6]: For 2nd argument expected `str` but got `Optional[str]`. if not re.match("[a-zA-Z]+", ident): raise Exception("expected identifier found %s" % ident) + # pyre-fixme[7]: Expected `str` but got `Optional[str]`. return ident def parse_not(self) -> NotExpr: diff --git a/build/fbcode_builder/getdeps/platform.py b/build/fbcode_builder/getdeps/platform.py index 1e021d99235a..5e4acdc44e82 100644 --- a/build/fbcode_builder/getdeps/platform.py +++ b/build/fbcode_builder/getdeps/platform.py @@ -216,7 +216,6 @@ def __init__(self, ostype=None, distro=None, distrovers=None) -> None: ostype = "darwin" elif is_windows(): ostype = "windows" - # pyre-fixme[16]: Module `sys` has no attribute `getwindowsversion`. distrovers = str(sys.getwindowsversion().major) elif sys.platform.startswith("freebsd"): ostype = "freebsd" diff --git a/build/fbcode_builder/getdeps/py_wheel_builder.py b/build/fbcode_builder/getdeps/py_wheel_builder.py index 335d74afd1d3..7db5f2cb0127 100644 --- a/build/fbcode_builder/getdeps/py_wheel_builder.py +++ b/build/fbcode_builder/getdeps/py_wheel_builder.py @@ -95,13 +95,14 @@ # something like the following pip3 command: # pip3 --isolated install --no-cache-dir --no-index --system \ # --target -# pyre-fixme[13] fields initialized in _build class PythonWheelBuilder(BuilderBase): """This Builder can take Python wheel archives and install them as python libraries that can be used by add_fb_python_library()/add_fb_python_executable() CMake rules. """ + # pyre-fixme[13]: Attribute `dist_info_dir` is never initialized. dist_info_dir: str + # pyre-fixme[13]: Attribute `template_format_dict` is never initialized. template_format_dict: Dict[str, str] def _build(self, reconfigure: bool) -> None: From bbca53e99f3b16918248106d2a770555ec6b7b11 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 26 Oct 2024 09:34:50 -0700 Subject: [PATCH 7232/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/28856852a1c926ece3fad34f016f1441281e7ade https://github.com/facebook/buck2-shims-meta/commit/3d85b5b3eb9f06cdad2436a0a874dcd0181bf3f2 https://github.com/facebook/fb303/commit/66efc9d44697428e0f33c2c993efa51f80289a75 https://github.com/facebook/fbthrift/commit/5ade17aea7b774a18518056b0214426628f29ae2 https://github.com/facebook/folly/commit/52e1242b8cce2ab6986e1fe109c45e17b60818a8 https://github.com/facebook/mvfst/commit/2ac6b90daa39cd1b55336fbb790c310b4449a5e1 https://github.com/facebook/proxygen/commit/fb32b85ed8a432064ef0fdb44ff8319019725bac https://github.com/facebook/wangle/commit/e22de991f58f80a51309dd9af3bb7deac534a9dd https://github.com/facebookexperimental/edencommon/commit/3fc8dd1786e356e6f35476ca06a2f2a3a3b40c03 https://github.com/facebookexperimental/rust-shed/commit/81988be4f8a53a4f7610607e732edecf971ec527 https://github.com/facebookincubator/fizz/commit/9ef3f0ac3d9cec347e72c0a128a5defb7e2e0a91 Reviewed By: ajb85 fbshipit-source-id: 4321839f70656623daf350c423c2d373ed03852e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a246932f82e1..963ddbde2ada 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2e08d21959f84ddb84967addfadd7861875d7542 +Subproject commit 5ade17aea7b774a18518056b0214426628f29ae2 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 21cc58d44971..c92e4870004f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 16c2c41fec3b0d72c43e494d1c1e4f32776517bf +Subproject commit 52e1242b8cce2ab6986e1fe109c45e17b60818a8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a357cba98646..83f6ed1e3f67 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 39eea114fbcace505bce2dead228b7cb1e6c2895 +Subproject commit e22de991f58f80a51309dd9af3bb7deac534a9dd From b0b69eeed057789e87eeaf38d721e6dfb368035a Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Sun, 27 Oct 2024 04:42:48 -0700 Subject: [PATCH 7233/7387] getdeps: stop error with build --clean and --src-dir=. Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1026 fix the error shown with build --clean and --src-dir=. Reviewed By: jdelliot Differential Revision: D64985193 fbshipit-source-id: f933adb45a7385b13965b89e421b4f9284cf0ecb --- build/fbcode_builder/getdeps/fetcher.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/fbcode_builder/getdeps/fetcher.py b/build/fbcode_builder/getdeps/fetcher.py index 30cff5b7d99b..005b2494d636 100644 --- a/build/fbcode_builder/getdeps/fetcher.py +++ b/build/fbcode_builder/getdeps/fetcher.py @@ -155,6 +155,9 @@ def hash(self) -> str: def get_src_dir(self): return self.path + def clean(self) -> None: + pass + class SystemPackageFetcher(object): def __init__(self, build_options, packages) -> None: From 05418cdba0867f0261d87bf5f28929f5d0c44210 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Sun, 27 Oct 2024 05:01:22 -0700 Subject: [PATCH 7234/7387] getdeps: add env subcommand Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1025 Add getdeps.py `env` subcommand to get the environment from getdeps in a sourcable form so that its easier to run/test/debug the binaries There is an existing `debug` subcommand, but it starts an interactive shell inside getdeps, which isn't so useful for programatic use. To get the output clean enough to source I switched getdeps print() logging to go to stderr. example usage: ``` $ (source <(./build/fbcode_builder/getdeps.py --allow-system-packages env mononoke_integration); which mononoke) ``` Reviewed By: jdelliot Differential Revision: D64982397 fbshipit-source-id: 65212936d42185e4d395557b56d3dba499caa128 --- build/fbcode_builder/getdeps.py | 21 +++++++++++++++++ build/fbcode_builder/getdeps/builder.py | 30 ++++++++++++++++++++++-- build/fbcode_builder/getdeps/cargo.py | 23 ++++++++++++------ build/fbcode_builder/getdeps/manifest.py | 6 ++++- build/fbcode_builder/getdeps/runcmd.py | 8 ++----- 5 files changed, 72 insertions(+), 16 deletions(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index ef81d3c3c887..01c6c1f68a82 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -923,6 +923,27 @@ def run_project_cmd(self, args, loader, manifest): self.create_builder(loader, manifest).debug(reconfigure=False) +@cmd( + "env", + "print the environment in a shell sourceable format", +) +class EnvCmd(ProjectCmdBase): + def setup_project_cmd_parser(self, parser): + parser.add_argument( + "--os-type", + help="Filter to just this OS type to run", + choices=["linux", "darwin", "windows"], + action="store", + dest="ostype", + default=None, + ) + + def run_project_cmd(self, args, loader, manifest): + if args.ostype: + loader.build_opts.host_type.ostype = args.ostype + self.create_builder(loader, manifest).printenv(reconfigure=False) + + @cmd("generate-github-actions", "generate a GitHub actions configuration") class GenerateGitHubActionsCmd(ProjectCmdBase): RUN_ON_ALL = """ [push, pull_request]""" diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 6ad9f2859a98..65bca2692a88 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -15,6 +15,7 @@ import subprocess import sys import typing +from shlex import quote as shellquote from typing import Optional from .dyndeps import create_dyn_dep_munger @@ -157,6 +158,29 @@ def debug(self, reconfigure: bool) -> None: shell = ["powershell.exe"] if sys.platform == "win32" else ["/bin/sh", "-i"] self._run_cmd(shell, cwd=self.build_dir, env=env) + def printenv(self, reconfigure: bool) -> None: + """print the environment in a shell sourcable format""" + reconfigure = self._reconfigure(reconfigure) + self._apply_patchfile() + self._prepare(reconfigure=reconfigure) + env = self._compute_env(env=Env(src={})) + prefix = "export " + sep = ":" + expand = "$" + expandpost = "" + if self.build_opts.is_windows(): + prefix = "SET " + sep = ";" + expand = "%" + expandpost = "%" + for k, v in sorted(env.items()): + existing = os.environ.get(k, None) + if k.endswith("PATH") and existing: + v = shellquote(v) + sep + f"{expand}{k}{expandpost}" + else: + v = shellquote(v) + print("%s%s=%s" % (prefix, k, v)) + def build(self, reconfigure: bool) -> None: print("Building %s..." % self.manifest.name) reconfigure = self._reconfigure(reconfigure) @@ -225,14 +249,16 @@ def _build(self, reconfigure) -> None: system needs to regenerate its rules.""" pass - def _compute_env(self): + def _compute_env(self, env=None) -> Env: + if env is None: + env = self.env # CMAKE_PREFIX_PATH is only respected when passed through the # environment, so we construct an appropriate path to pass down return self.build_opts.compute_env_for_install_dirs( self.loader, self.dep_manifests, self.ctx, - env=self.env, + env=env, manifest=self.manifest, ) diff --git a/build/fbcode_builder/getdeps/cargo.py b/build/fbcode_builder/getdeps/cargo.py index cae8bf54cac1..0e0e0ddfe0b9 100644 --- a/build/fbcode_builder/getdeps/cargo.py +++ b/build/fbcode_builder/getdeps/cargo.py @@ -9,6 +9,7 @@ import os import re import shutil +import sys import typing from .builder import BuilderBase @@ -97,7 +98,7 @@ def _create_cargo_config(self): if os.path.isfile(cargo_config_file): with open(cargo_config_file, "r") as f: - print(f"Reading {cargo_config_file}") + print(f"Reading {cargo_config_file}", file=sys.stderr) cargo_content = f.read() else: cargo_content = "" @@ -142,7 +143,8 @@ def _create_cargo_config(self): if new_content != cargo_content: with open(cargo_config_file, "w") as f: print( - f"Writing cargo config for {self.manifest.name} to {cargo_config_file}" + f"Writing cargo config for {self.manifest.name} to {cargo_config_file}", + file=sys.stderr, ) f.write(new_content) @@ -270,7 +272,10 @@ def _patchup_workspace(self, dep_to_git) -> None: new_content += "\n".join(config) if new_content != manifest_content: with open(patch_cargo, "w") as f: - print(f"writing patch to {patch_cargo}") + print( + f"writing patch to {patch_cargo}", + file=sys.stderr, + ) f.write(new_content) def _resolve_config(self, dep_to_git) -> typing.Dict[str, typing.Dict[str, str]]: @@ -296,7 +301,8 @@ def _resolve_config(self, dep_to_git) -> typing.Dict[str, typing.Dict[str, str]] if c in crate_source_map and c not in crates_to_patch_path: crates_to_patch_path[c] = crate_source_map[c] print( - f"{self.manifest.name}: Patching crate {c} via virtual manifest in {self.workspace_dir()}" + f"{self.manifest.name}: Patching crate {c} via virtual manifest in {self.workspace_dir()}", + file=sys.stderr, ) if crates_to_patch_path: git_url_to_crates_and_paths[git_url] = crates_to_patch_path @@ -352,7 +358,8 @@ def _resolve_dep_to_git(self): subpath = subpath.replace("/", "\\") crate_path = os.path.join(dep_source_dir, subpath) print( - f"{self.manifest.name}: Mapped crate {crate} to dep {dep} dir {crate_path}" + f"{self.manifest.name}: Mapped crate {crate} to dep {dep} dir {crate_path}", + file=sys.stderr, ) crate_source_map[crate] = crate_path elif dep_cargo_conf: @@ -367,7 +374,8 @@ def _resolve_dep_to_git(self): crate = match.group(1) if crate: print( - f"{self.manifest.name}: Discovered crate {crate} in dep {dep} dir {crate_root}" + f"{self.manifest.name}: Discovered crate {crate} in dep {dep} dir {crate_root}", + file=sys.stderr, ) crate_source_map[crate] = crate_root @@ -414,7 +422,8 @@ def _resolve_dep_to_crates(self, build_source_dir, dep_to_git): for c in crates: if c not in existing_crates: print( - f"Patch {self.manifest.name} uses {dep_name} crate {crates}" + f"Patch {self.manifest.name} uses {dep_name} crate {crates}", + file=sys.stderr, ) existing_crates.add(c) dep_to_crates.setdefault(name, set()).update(existing_crates) diff --git a/build/fbcode_builder/getdeps/manifest.py b/build/fbcode_builder/getdeps/manifest.py index 6af5e3a74dc6..d02cfe83f217 100644 --- a/build/fbcode_builder/getdeps/manifest.py +++ b/build/fbcode_builder/getdeps/manifest.py @@ -8,6 +8,7 @@ import configparser import io import os +import sys from typing import List from .builder import ( @@ -391,7 +392,10 @@ def _is_satisfied_by_preinstalled_environment(self, ctx): return False for key in envs: val = os.environ.get(key, None) - print(f"Testing ENV[{key}]: {repr(val)}") + print( + f"Testing ENV[{key}]: {repr(val)}", + file=sys.stderr, + ) if val is None: return False if len(val) == 0: diff --git a/build/fbcode_builder/getdeps/runcmd.py b/build/fbcode_builder/getdeps/runcmd.py index e0b9d2b22fd5..c4a9326f9c2b 100644 --- a/build/fbcode_builder/getdeps/runcmd.py +++ b/build/fbcode_builder/getdeps/runcmd.py @@ -10,16 +10,12 @@ import subprocess import sys +from shlex import quote as shellquote + from .envfuncs import Env from .platform import is_windows -try: - from shlex import quote as shellquote -except ImportError: - from pipes import quote as shellquote - - class RunCommandError(Exception): pass From 9349de5a09b4a35dc252ea2490b37e046e1e728d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 27 Oct 2024 09:33:45 -0700 Subject: [PATCH 7235/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/c7aee89b6a8d56ef520ff1f5a4a988db036b7b2d https://github.com/facebook/fbthrift/commit/d0382bd305db51d947808969a964d86e361c6731 https://github.com/facebook/folly/commit/265a484efce787e7540de54be02b3cefc72a2f6d https://github.com/facebook/mvfst/commit/67c05c17d3fb7b2e1c7eacd563405aef406f38f5 https://github.com/facebook/proxygen/commit/5a007c0e3b9759a43e75d3cb51f9334f747db00c https://github.com/facebook/wangle/commit/164ee9ee522392aa4409caab7bc38559fae8263c https://github.com/facebookexperimental/edencommon/commit/c91eeade46438f706efa80810f961b2e344bc8d4 https://github.com/facebookexperimental/rust-shed/commit/792e16be08045cc8ff1e0c216d12ec4716e97d16 https://github.com/facebookincubator/fizz/commit/5c55ba2a6f64f5efaba6f993d442090098322cfd Reviewed By: ajb85 fbshipit-source-id: d43b2c758fe532537ef77e24fb2812f0d5a78d45 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 963ddbde2ada..6461404d2920 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5ade17aea7b774a18518056b0214426628f29ae2 +Subproject commit d0382bd305db51d947808969a964d86e361c6731 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index c92e4870004f..a453b6176b4d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 52e1242b8cce2ab6986e1fe109c45e17b60818a8 +Subproject commit 265a484efce787e7540de54be02b3cefc72a2f6d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 83f6ed1e3f67..fe6eb0cd82c0 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit e22de991f58f80a51309dd9af3bb7deac534a9dd +Subproject commit 164ee9ee522392aa4409caab7bc38559fae8263c From 1d4c2ab13843ad74c5d21cb814d5faeb4da9816b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 28 Oct 2024 09:38:37 -0700 Subject: [PATCH 7236/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/3fd057717ceec0e0930954ed76c52c1ed34ed650 https://github.com/facebook/fb303/commit/269ab46d0b920b5eacfd1658ef2b373b36554337 https://github.com/facebook/fbthrift/commit/fb180f035fffa69311bec856e04afc8f30da5d47 https://github.com/facebook/mvfst/commit/80bd5e5f374fa90af1bcbeffd90a22972194a12a https://github.com/facebook/proxygen/commit/508af2e7963c349267de28ceef0d485af48b12de https://github.com/facebook/wangle/commit/b890ed7f5aeeb02fd94cf93d12485bfd3f993256 https://github.com/facebookexperimental/edencommon/commit/e888006c9da7ad08bec511c51aaadfabf8bb8d98 https://github.com/facebookexperimental/rust-shed/commit/ce2cfbec70e6d7592ee9f5cb2eb16bfb6357002a https://github.com/facebookincubator/fizz/commit/8bb942a09b29e847eadaff96d582093d028fcb23 Reviewed By: bigfootjon fbshipit-source-id: a1ccf354fb19cd886e5c61d225b4c03051bb30aa --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6461404d2920..e596bd69d326 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d0382bd305db51d947808969a964d86e361c6731 +Subproject commit fb180f035fffa69311bec856e04afc8f30da5d47 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index fe6eb0cd82c0..77721d694068 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 164ee9ee522392aa4409caab7bc38559fae8263c +Subproject commit b890ed7f5aeeb02fd94cf93d12485bfd3f993256 From e5dac86e7998f6c19530f8c9fd4692e9fcceb8fe Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 29 Oct 2024 09:35:42 -0700 Subject: [PATCH 7237/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/bcded3ee58157bb37269e41543eecda47c44e0fb https://github.com/facebook/buck2-shims-meta/commit/461a1b10af7eb8af2f6d0eb0129009d60048e6de https://github.com/facebook/fb303/commit/a19ea131f192bdffbb9d946928c4ad28f7fa5df0 https://github.com/facebook/fbthrift/commit/bc71935c76682c1efa9669cbd65e2f2531048488 https://github.com/facebook/folly/commit/6df9a81e358ca3bbe75f78e58e53d6f6bd3d73e7 https://github.com/facebook/mvfst/commit/5bc71bf3b39d5a147ff9db131e0b8b06172ee814 https://github.com/facebook/proxygen/commit/e4940e1cc72e250be9b338fe81055cd3ba0b9e59 https://github.com/facebook/wangle/commit/24a9d8a27a5cddb6cdd64dde96d0bfd574655ac9 https://github.com/facebookexperimental/rust-shed/commit/05e53dfd930d9142a15fa7ea47b685f42c5d5382 https://github.com/facebookincubator/fizz/commit/979e1ae21bd29b1e298c500da3ff147da4687c60 Reviewed By: bigfootjon fbshipit-source-id: 582715046ab8d6c735629f64618e9976779ac1fd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e596bd69d326..b5633f3d4a34 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit fb180f035fffa69311bec856e04afc8f30da5d47 +Subproject commit bc71935c76682c1efa9669cbd65e2f2531048488 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a453b6176b4d..033ee3ca6a3f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 265a484efce787e7540de54be02b3cefc72a2f6d +Subproject commit 6df9a81e358ca3bbe75f78e58e53d6f6bd3d73e7 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 77721d694068..886f420e70f0 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b890ed7f5aeeb02fd94cf93d12485bfd3f993256 +Subproject commit 24a9d8a27a5cddb6cdd64dde96d0bfd574655ac9 From b01a7d93eda532781aa27a9524728626b54f7eac Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 30 Oct 2024 09:34:54 -0700 Subject: [PATCH 7238/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/987020e7d96a1eeb7c6f04ded40d64b6ac735e26 https://github.com/facebook/fb303/commit/1a4fff202da044af641d798d4cb56cdbfd9763bf https://github.com/facebook/fbthrift/commit/2baf516fb71c49cbafe3c3cfc553967312dfd61b https://github.com/facebook/folly/commit/9173e457bed6af0d058e9f338af31a716a415f83 https://github.com/facebook/mvfst/commit/b37a830892c27d57986712867db2a8942d477e1c https://github.com/facebook/proxygen/commit/3030aef5e8ee4e2b5a8f6f55b12eb0680e74a8a9 https://github.com/facebook/wangle/commit/79c465452e6d3aa6adf2e833546af925dc02d96c https://github.com/facebookexperimental/edencommon/commit/3448914bbe018668f4d056ce52fdb92d30eec1fe https://github.com/facebookexperimental/rust-shed/commit/c9d65d497ef5fcd5698d351bfb19c3a649ebfbbf https://github.com/facebookincubator/fizz/commit/1065a55361c21a84b41e1bb512a01df46e5bc834 Reviewed By: bigfootjon fbshipit-source-id: 2aab06db2281f5a1e84e42acf4e4632a95769424 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b5633f3d4a34..484bbf4ddc7f 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bc71935c76682c1efa9669cbd65e2f2531048488 +Subproject commit 2baf516fb71c49cbafe3c3cfc553967312dfd61b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 033ee3ca6a3f..7de8dd00a40b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 6df9a81e358ca3bbe75f78e58e53d6f6bd3d73e7 +Subproject commit 9173e457bed6af0d058e9f338af31a716a415f83 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 886f420e70f0..8eeda4f1fbeb 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 24a9d8a27a5cddb6cdd64dde96d0bfd574655ac9 +Subproject commit 79c465452e6d3aa6adf2e833546af925dc02d96c From 539a7042ff3e89768867abbf8656bfc2b22e51a3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 31 Oct 2024 09:36:42 -0700 Subject: [PATCH 7239/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/effd26497788faac86ee651d650bf0dd4404137e https://github.com/facebook/fb303/commit/416aa3d1ff335d0dea665989ade77dd9f2a2a99c https://github.com/facebook/fbthrift/commit/78e5b27861982706b85ff5c9009c68d360f042aa https://github.com/facebook/folly/commit/b8b1850df06e286ab510dafc1ebe7ab91ecd4141 https://github.com/facebook/mvfst/commit/ae605980c573045f2f62cd1255070fa2a64cf296 https://github.com/facebook/proxygen/commit/0deaf77d78dbfdc6201750d5855cbddbe4fd1ae3 https://github.com/facebook/wangle/commit/1fc174e3de49c385f33b4fbb4a4e8e0798e15122 https://github.com/facebookexperimental/edencommon/commit/7cbd7dc1a508223adc2dbde4402cdecaa8d0eebf https://github.com/facebookexperimental/rust-shed/commit/cf8f8b9164647c1d6a444fd6ee43687b1e58bdc3 https://github.com/facebookincubator/fizz/commit/787df81d7a579315e35b71500fc358582045c2a5 Reviewed By: bigfootjon fbshipit-source-id: bfc33f7e04820ce97400c2e2592f8e31a5e60ac1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 484bbf4ddc7f..cbd71d447a7c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2baf516fb71c49cbafe3c3cfc553967312dfd61b +Subproject commit 78e5b27861982706b85ff5c9009c68d360f042aa diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7de8dd00a40b..130acc11a398 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9173e457bed6af0d058e9f338af31a716a415f83 +Subproject commit b8b1850df06e286ab510dafc1ebe7ab91ecd4141 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8eeda4f1fbeb..0bdab7884f4c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 79c465452e6d3aa6adf2e833546af925dc02d96c +Subproject commit 1fc174e3de49c385f33b4fbb4a4e8e0798e15122 From 32fc1f9254956e56c047246230c02d47505aeb68 Mon Sep 17 00:00:00 2001 From: Adrian Enache Date: Thu, 31 Oct 2024 16:04:02 -0700 Subject: [PATCH 7240/7387] update serde 1.0.203->1.0.214, serde_json 1.0.125->1.0.132 Summary: - fix some cfg for serde_json which changed in the meantime Reviewed By: dtolnay Differential Revision: D65182502 fbshipit-source-id: 9234db3ca89334552a0e12ac7e90b59b0bdf2897 --- watchman/cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index c155278a9bb2..3f73560f3c7c 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -14,7 +14,7 @@ anyhow = "1.0.86" duct = "0.13.6" jwalk = "0.6" serde = { version = "1.0.185", features = ["derive", "rc"] } -serde_json = { version = "1.0.125", features = ["float_roundtrip", "unbounded_depth"] } +serde_json = { version = "1.0.132", features = ["float_roundtrip", "unbounded_depth"] } structopt = "0.3.26" sysinfo = "0.30.11" tabular = "0.2.0" From b11b57c102be4eec5c00e705d18e986e99268d89 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 1 Nov 2024 09:37:15 -0700 Subject: [PATCH 7241/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/47dcff0842504287ad23c94ba55d0f23986b98b6 https://github.com/facebook/fb303/commit/c8c72a6533f0f0f79f9fcb0c832520de067e324a https://github.com/facebook/fbthrift/commit/9edb038aa28cbca49aa0dc088c9a4c6daa0df7c5 https://github.com/facebook/folly/commit/208949c27d3c7e6f6136d64de3108a6c71fae95b https://github.com/facebook/mvfst/commit/25c2ea70f979000654f405dee9230c864ee79dfb https://github.com/facebook/proxygen/commit/7fbf08cc2c5e22efb51f3d668b0b5d7c7edd5e69 https://github.com/facebook/wangle/commit/f321dbc4a95379f5fee56c7c02fb3190b3f44661 https://github.com/facebookexperimental/edencommon/commit/7e8e245ac12f73276884ee590933802e6fa49b73 https://github.com/facebookexperimental/rust-shed/commit/74c3ee6e46e29780f4feb34b24cd37265206f1ea https://github.com/facebookincubator/fizz/commit/47c316415100ca9fd587515537fd902476858f30 Reviewed By: bigfootjon fbshipit-source-id: 5dcb2c503a7738b6eceaeef47eab32f2a984665d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index cbd71d447a7c..8a05c01d2c92 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 78e5b27861982706b85ff5c9009c68d360f042aa +Subproject commit 9edb038aa28cbca49aa0dc088c9a4c6daa0df7c5 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 130acc11a398..d9c4c4d1cb1b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b8b1850df06e286ab510dafc1ebe7ab91ecd4141 +Subproject commit 208949c27d3c7e6f6136d64de3108a6c71fae95b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0bdab7884f4c..435e4c4808d5 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1fc174e3de49c385f33b4fbb4a4e8e0798e15122 +Subproject commit f321dbc4a95379f5fee56c7c02fb3190b3f44661 From ebfac5f787304e0f955597bcdf9666ff8261d573 Mon Sep 17 00:00:00 2001 From: Paul Cruz Date: Fri, 1 Nov 2024 16:14:12 -0700 Subject: [PATCH 7242/7387] Add systemd libs in manifests Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1034 Add systemd lib as a dependency for fboss via getdeps manifest in preparation for D64922139. This is just to unblock the above diff. A future fix will be needed to add the build mechanism for systemd libs from source. Reviewed By: kevin645 Differential Revision: D65299072 fbshipit-source-id: 65c4df639a5119f1af58b3c48b612a9da7999182 --- build/fbcode_builder/manifests/fboss | 1 + build/fbcode_builder/manifests/systemd | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 build/fbcode_builder/manifests/systemd diff --git a/build/fbcode_builder/manifests/fboss b/build/fbcode_builder/manifests/fboss index ce9b36109e22..25bae49d7dec 100644 --- a/build/fbcode_builder/manifests/fboss +++ b/build/fbcode_builder/manifests/fboss @@ -39,6 +39,7 @@ CLI11 exprtk nlohmann-json libgpiod +systemd [shipit.pathmap] fbcode/fboss/github = . diff --git a/build/fbcode_builder/manifests/systemd b/build/fbcode_builder/manifests/systemd new file mode 100644 index 000000000000..40564970d7f0 --- /dev/null +++ b/build/fbcode_builder/manifests/systemd @@ -0,0 +1,6 @@ +[manifest] +name = systemd + +[rpms] +systemd +systemd-devel From d02acb954ea552f4a997252bb96a7542452b6b69 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 2 Nov 2024 09:32:57 -0700 Subject: [PATCH 7243/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/12b69437e10733347950e0e49501f668614343bf https://github.com/facebook/fb303/commit/a4d28198da003fc05471f35eb51f956c4cdabef4 https://github.com/facebook/fbthrift/commit/b54056c9bfaec8fb9afa168f84561368009f369b https://github.com/facebook/folly/commit/30a4e783a7618f17a5b24048625872e363068887 https://github.com/facebook/mvfst/commit/37cf3495d850e82bbcc755459189aad872e37af9 https://github.com/facebook/proxygen/commit/ff274e80ce3bbcef5a9005e0810da4ab1c3d86be https://github.com/facebook/wangle/commit/a6bda4e9e04316aebf84933c3cb6942618d8f5fb https://github.com/facebookexperimental/edencommon/commit/b034f01292c4a0ca470accd7e9fd42c9c485295f https://github.com/facebookexperimental/rust-shed/commit/cd7b3c7263992db761dec3438945ef109beabadd https://github.com/facebookincubator/fizz/commit/ac9a47f924b1e86bd583c76735e98b2fd96b7d25 Reviewed By: bigfootjon fbshipit-source-id: 1f50d5c9d053d960faf42a0edbb41292bdbf16bd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8a05c01d2c92..ea52874e88b0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9edb038aa28cbca49aa0dc088c9a4c6daa0df7c5 +Subproject commit b54056c9bfaec8fb9afa168f84561368009f369b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d9c4c4d1cb1b..f468f6e6834f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 208949c27d3c7e6f6136d64de3108a6c71fae95b +Subproject commit 30a4e783a7618f17a5b24048625872e363068887 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 435e4c4808d5..be3993c6536a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f321dbc4a95379f5fee56c7c02fb3190b3f44661 +Subproject commit a6bda4e9e04316aebf84933c3cb6942618d8f5fb From e2bb8f00ccc9abd48342da3504fa764e4b7b3814 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Sat, 2 Nov 2024 13:48:09 -0700 Subject: [PATCH 7244/7387] Fix shadowed variable in watchman/Command.cpp Summary: Our upcoming compiler upgrade will require us not to have shadowed variables. Such variables have a _high_ bug rate and reduce readability, so we would like to avoid them even if the compiler was not forcing us to do so. This codemod attempts to fix an instance of a shadowed variable. Please review with care: if it's failed the result will be a silent bug. **What's a shadowed variable?** Shadowed variables are variables in an inner scope with the same name as another variable in an outer scope. Having the same name for both variables might be semantically correct, but it can make the code confusing to read! It can also hide subtle bugs. This diff fixes such an issue by renaming the variable. - If you approve of this diff, please use the "Accept & Ship" button :-) Differential Revision: D65347897 fbshipit-source-id: e1d6c59592526fa650aa84a1a31c2466ce5a26ab --- watchman/Command.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/watchman/Command.cpp b/watchman/Command.cpp index 4a1524c1b3bf..cef9428e3e70 100644 --- a/watchman/Command.cpp +++ b/watchman/Command.cpp @@ -102,10 +102,10 @@ ResultErrno Command::run( PduBuffer output_pdu_buffer; if (persistent) { for (;;) { - auto res = passPduToStdout( + auto result = passPduToStdout( stream, buffer, output_format, output_pdu_buffer, pretty); - if (res.hasError()) { - return res; + if (result.hasError()) { + return result; } } } else { From 5f37681bc99e743cc67af91d594da9aa02306a05 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 3 Nov 2024 09:32:42 -0800 Subject: [PATCH 7245/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/43a8ca1e89fc3ab45abf9eff78b6c0ec4510ebdb https://github.com/facebook/fbthrift/commit/6c55aa9762cffed619c25abf07d273b39985e979 https://github.com/facebook/mvfst/commit/a2514f09dd132d100bfc608a2e5786f76b60f71d https://github.com/facebook/proxygen/commit/cf772ac24d65b35afcc08dfbf0971b0646f7a445 https://github.com/facebook/wangle/commit/46688946ef13435ad9e873a5ba5684677783945b https://github.com/facebookexperimental/edencommon/commit/65d98a426ca27e275514b84bdfaadf71faa49c7e https://github.com/facebookexperimental/rust-shed/commit/d693283cd609c71f9246acb99cdb33324d26a9dc https://github.com/facebookincubator/fizz/commit/4664d02b938a34d05918f2817f53afd2ed6b4ca9 Reviewed By: bigfootjon fbshipit-source-id: 0bd757e3533064c809552652f3c23739f0b75447 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ea52874e88b0..2e120f76285e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b54056c9bfaec8fb9afa168f84561368009f369b +Subproject commit 6c55aa9762cffed619c25abf07d273b39985e979 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index be3993c6536a..0c225b340a4c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a6bda4e9e04316aebf84933c3cb6942618d8f5fb +Subproject commit 46688946ef13435ad9e873a5ba5684677783945b From 7d247bc4dfd484ca63d1ca85423c3a7af02e12c8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 4 Nov 2024 09:34:29 -0800 Subject: [PATCH 7246/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/2c6788d1e89ff0c8b4187ef26f0790baf6525552 https://github.com/facebook/buck2-shims-meta/commit/b79235f6447a07f78644ab08261e3acfe4e12604 https://github.com/facebook/fb303/commit/d15028627fdd473945f04124f118e17142471f81 https://github.com/facebook/fbthrift/commit/300f4d5e79e763ef74243da9a1f3b9f649d5addd https://github.com/facebook/mvfst/commit/fdbaff94049a799c96263045da69ffca985a1d14 https://github.com/facebook/proxygen/commit/e65327bd25c8af08e8b09208db4e15bff8da1bb4 https://github.com/facebook/wangle/commit/d54405ad3588791be7146a19fe4e914af0807c28 https://github.com/facebookexperimental/rust-shed/commit/32bb457ce7c8e57ce98ded6de8e6b464d43ee43b Reviewed By: ckwalsh fbshipit-source-id: 1c06444090cb143208c583d074c71b162ecefff1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2e120f76285e..334bb35fc08b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6c55aa9762cffed619c25abf07d273b39985e979 +Subproject commit 300f4d5e79e763ef74243da9a1f3b9f649d5addd diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0c225b340a4c..d94e75e4f27b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 46688946ef13435ad9e873a5ba5684677783945b +Subproject commit d54405ad3588791be7146a19fe4e914af0807c28 From 9a66b900c19acc91fa6643cc6b78d19b04fbb1d8 Mon Sep 17 00:00:00 2001 From: Justin Kim Date: Tue, 5 Nov 2024 00:44:44 -0800 Subject: [PATCH 7247/7387] SlotPath topology config validation. Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1036 X-link: https://github.com/facebook/fboss/pull/285 __Why__ 1. This is pre-req for other services to validate "PM generated data". e.g `platform_manager::ConfigValidator().isValidSlotPath(...)` 2. Beefing up SlotPath validation. See T205471819 more details. __What__ 1. Dropped ConfigValidator call in `Utils::parseDevicePath` because we can assume that config paths are valid. If ill-input is provided, unexpected behaviour. 2. Added additional regex for group capturing because it doesn't seem to work with a single regex for some reason... 3. Added topological validation on slot path. __Next__ 1. DeviceName validation. basically does device definition exist in the slot path? 2. Suppose VersionedPmUnit... Reviewed By: somasun Differential Revision: D64798493 fbshipit-source-id: 9ca1936bf81250bda1fc6b9d800221055b6b2f48 --- build/fbcode_builder/manifests/fboss | 1 + 1 file changed, 1 insertion(+) diff --git a/build/fbcode_builder/manifests/fboss b/build/fbcode_builder/manifests/fboss index 25bae49d7dec..ec199f83110c 100644 --- a/build/fbcode_builder/manifests/fboss +++ b/build/fbcode_builder/manifests/fboss @@ -40,6 +40,7 @@ exprtk nlohmann-json libgpiod systemd +range-v3 [shipit.pathmap] fbcode/fboss/github = . From b28e7a813282039574b3b9365853346c8f71c86b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 5 Nov 2024 09:37:45 -0800 Subject: [PATCH 7248/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/8b31f7ec735b7caabc2915a3bd3a8e81db7663f1 https://github.com/facebook/fb303/commit/82dc3d7967b9023bd8221d38a19aa2b4e87be070 https://github.com/facebook/fbthrift/commit/09ff66da0f2f24704f9fe69f6e5aa37cc9369bb0 https://github.com/facebook/folly/commit/f60f6e290e2234d0c86f02bb92972476e6a528db https://github.com/facebook/mvfst/commit/18014c04577e73f48e863d5b98d7ab9e5b7fa67f https://github.com/facebook/proxygen/commit/689395cf7e8bdb4e221c9c911f8781f86c9c5f03 https://github.com/facebook/wangle/commit/332629a62b08896e3580572377876ff3f6ab1b9e https://github.com/facebookexperimental/edencommon/commit/6f9119674f82c999729c0f49022aa1a8c4334f09 https://github.com/facebookexperimental/rust-shed/commit/e057718c86b8c8671333728a607ad2d9f459de94 https://github.com/facebookincubator/fizz/commit/2f478b58b7ff3702b8327042fd11c9afb9b0b2bb Reviewed By: ckwalsh fbshipit-source-id: 4da3154bc6cf2f8077654f085116e8832193c35d --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 334bb35fc08b..da656f8e89ae 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 300f4d5e79e763ef74243da9a1f3b9f649d5addd +Subproject commit 09ff66da0f2f24704f9fe69f6e5aa37cc9369bb0 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f468f6e6834f..d27b29eb85e9 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 30a4e783a7618f17a5b24048625872e363068887 +Subproject commit f60f6e290e2234d0c86f02bb92972476e6a528db diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d94e75e4f27b..756774e81085 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d54405ad3588791be7146a19fe4e914af0807c28 +Subproject commit 332629a62b08896e3580572377876ff3f6ab1b9e From e193167cb16d123576a62bafb5a1d2c8f33e3605 Mon Sep 17 00:00:00 2001 From: generatedunixname89002005307016 Date: Tue, 5 Nov 2024 09:52:24 -0800 Subject: [PATCH 7249/7387] Remove default typing argument in PACKAGE file] [batch:140/146] [shard:2/N] Reviewed By: MaggieMoss Differential Revision: D65462475 fbshipit-source-id: 685a4843b07338d170cd8d7fcc9b3d414014120b --- watchman/python/pywatchman/__init__.py | 1 - watchman/python/pywatchman/load.py | 2 -- watchman/python/tests/tests.py | 6 +++++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/watchman/python/pywatchman/__init__.py b/watchman/python/pywatchman/__init__.py index a1a8763e26b1..6c57a2be0e11 100644 --- a/watchman/python/pywatchman/__init__.py +++ b/watchman/python/pywatchman/__init__.py @@ -23,7 +23,6 @@ # Demandimport causes modules to be loaded lazily. Force the load now # so that we can fall back on pybser if bser doesn't exist - # pyre-ignore bser.pdu_info except ImportError: from . import pybser as bser diff --git a/watchman/python/pywatchman/load.py b/watchman/python/pywatchman/load.py index f728f6d600e3..babb8d4115f0 100644 --- a/watchman/python/pywatchman/load.py +++ b/watchman/python/pywatchman/load.py @@ -65,7 +65,6 @@ def load(fp, mutable: bool = True, value_encoding=None, value_errors=None): if read_len < len(header): return None - # pyre-fixme[16]: Module `pywatchman` has no attribute `bser`. total_len = bser.pdu_len(buf) if total_len > len(buf): ctypes.resize(buf, total_len) @@ -75,7 +74,6 @@ def load(fp, mutable: bool = True, value_encoding=None, value_errors=None): if read_len < len(body): raise RuntimeError("bser data ended early") - # pyre-fixme[16]: Module `pywatchman` has no attribute `bser`. return bser.loads( (ctypes.c_char * total_len).from_buffer(buf, 0), mutable, diff --git a/watchman/python/tests/tests.py b/watchman/python/tests/tests.py index d2637bf3f3b5..a2e991fc2a07 100755 --- a/watchman/python/tests/tests.py +++ b/watchman/python/tests/tests.py @@ -28,10 +28,13 @@ ) +# pyre-fixme[16]: Module `pywatchman` has no attribute `bser`. if os.path.basename(bser.__file__) == "pybser.py": raise Exception( "bser module resolved to pybser! Something is broken in your build. __file__={!r}, sys.path={!r}".format( - bser.__file__, sys.path + # pyre-fixme[16]: Module `pywatchman` has no attribute `bser`. + bser.__file__, + sys.path, ) ) @@ -433,6 +436,7 @@ def t(ex: bytes): try: document = b"\x00\x01\x05" + struct.pack("@i", len(ex)) + ex print("encoded", document) + # pyre-fixme[16]: `TestBSERDump` has no attribute `bser_mod`. self.bser_mod.loads(document) except Exception: # Exceptions are okay - abort is not. From 4161e94ed06120c2b9d93b5f22256555b869833a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 6 Nov 2024 09:34:39 -0800 Subject: [PATCH 7250/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/e32a9696e63b1b43e97b354095db68a8ea8313bb https://github.com/facebook/fb303/commit/4f29322d54b7843022ccd30cfcb5f169d51c67e5 https://github.com/facebook/fbthrift/commit/5e64424fcd4390036a2fe351647ec9ac3629a6f3 https://github.com/facebook/folly/commit/0a7af5c691eaec68eb9991ed4d4bfb8136252371 https://github.com/facebook/mvfst/commit/65bc1417f34a08248dc06dd61f5b9540a4d0d04e https://github.com/facebook/proxygen/commit/c0af23d04a5fbe2a015a73c7b0b0ced294329ccf https://github.com/facebook/wangle/commit/4380720aa67ba739397b59a155ee9de51df498ad https://github.com/facebookexperimental/edencommon/commit/c935ad9cb51a224c5d35c16b4efeefa834a8f5b7 https://github.com/facebookexperimental/rust-shed/commit/12d7f23b4b740abe6a6e46bd18d2210cb023900a https://github.com/facebookincubator/fizz/commit/fa26c4332fbd710d04252b4b2d8164ec7ef635d1 Reviewed By: ckwalsh fbshipit-source-id: 61137d97200a1b98f5a31b2634e9041ff07c6745 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index da656f8e89ae..656d541a53bf 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 09ff66da0f2f24704f9fe69f6e5aa37cc9369bb0 +Subproject commit 5e64424fcd4390036a2fe351647ec9ac3629a6f3 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d27b29eb85e9..f87f8ca05a25 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f60f6e290e2234d0c86f02bb92972476e6a528db +Subproject commit 0a7af5c691eaec68eb9991ed4d4bfb8136252371 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 756774e81085..89a7ba9ab034 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 332629a62b08896e3580572377876ff3f6ab1b9e +Subproject commit 4380720aa67ba739397b59a155ee9de51df498ad From 9d3f5ee1c27464577faa4ba2b8e49514bf6b2c49 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Wed, 6 Nov 2024 11:53:23 -0800 Subject: [PATCH 7251/7387] Initial Thrift definitions to support EdenFS filesystem notifications Summary: # Context We are introducing EdenFS notifications to support scalable and ergonomic file system notifications for EdenFS mounts. # This Diff This diff introduces the initial Thrift definitions to support EdenFS filesystem notifications. It defines several new data structures and a single method `streamChangesSinceV2`. # Technical Details Simple-ish Thrift definitions that generate code, but are not used yet. # Discussion Points * There are two existing, simlar methods. One that has never been used as it was a hack-a-month project that was put on hold. The other is in use. The hack-a-month API, `streamSelectedChangesSince` could be removed now. The used method, `streamChangesSince` will need to remain until such time was we remove support for EdenFS mounts from Watchman. Reviewed By: MichaelCuevas Differential Revision: D65305161 fbshipit-source-id: 15a4b7cf89b37ebd1427193bfc06360006fa6bca --- eden/fs/service/streamingeden.thrift | 85 ++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/eden/fs/service/streamingeden.thrift b/eden/fs/service/streamingeden.thrift index ac968f2d27ed..7ee67f8439a7 100644 --- a/eden/fs/service/streamingeden.thrift +++ b/eden/fs/service/streamingeden.thrift @@ -62,6 +62,54 @@ const i64 FS_EVENT_READ = 1; const i64 FS_EVENT_WRITE = 2; const i64 FS_EVENT_OTHER = 4; +struct CommitTransition { + 1: eden.ThriftRootId from; + 2: eden.ThriftRootId to; +} + +struct DirectoryRenamed { + 1: eden.PathString from; + 2: eden.PathString to; +} + +struct Renamed { + 1: eden.Dtype fileType; + 2: eden.PathString from; + 3: eden.PathString to; +} + +struct Added { + 1: eden.Dtype fileType; + 3: eden.PathString path; +} + +struct Deleted { + 1: eden.Dtype fileType; + 3: eden.PathString path; +} + +struct Modified { + 1: eden.Dtype fileType; + 3: eden.PathString path; +} + +union SmallChangeNotification { + 1: Renamed renamed; + 2: Added added; + 3: Deleted deleted; + 4: Modified modified; +} + +union LargeChangeNotification { + 1: DirectoryRenamed directoryRenamed; + 2: CommitTransition commitTransition; +} + +union ChangeNotification { + 1: SmallChangeNotification smallChange; + 2: LargeChangeNotification largeChange; +} + /** * The value of a stream item. * @@ -82,6 +130,23 @@ struct ChangesSinceResult { 1: eden.JournalPosition toPosition; } +/** + * The value of a stream item in a streamChangedSinceV2 result stream. + * + * Each stream item refers to a single change notification + * since the notification clock provided. + */ +struct ChangeNotificationResult { + 1: ChangeNotification change; +} + +/** + * Return value of the streamChangedSinceV2 API + */ +struct ChangesSinceV2Result { + 1: eden.JournalPosition toPosition; +} + /** * Argument to streamChangesSince API. */ @@ -98,6 +163,14 @@ struct StreamSelectedChangesSinceParams { 2: list globs; } +/** + * Argument to streamChangedSinceV2 API + */ +struct StreamChangesSinceV2Params { + 1: eden.PathString mountPoint; + 2: eden.JournalPosition fromPosition; +} + struct TraceTaskEventsRequest {} typedef binary EdenStartStatusUpdate @@ -196,6 +269,18 @@ service StreamingEdenService extends eden.EdenService { 1: eden.EdenError ex, ); + /** + * Returns a stream of change notifications for a given path since a specific point in time. + * + * This does not resolve expensive operations like moving a directory or changing + * commits. Callers must query Sapling to evaluate those potentially expensive operations. + */ + ChangesSinceV2Result, stream< + ChangeNotificationResult throws (1: eden.EdenError ex) + > streamChangesSinceV2(1: StreamChangesSinceV2Params params) throws ( + 1: eden.EdenError ex, + ); + /** * Same as the API above but only returns files that match the globs in filter. * This API is intend to replace the above API but it's currently under development. From 3a732d57e91f3bae818a62efa1953d9711ea885c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 7 Nov 2024 09:36:58 -0800 Subject: [PATCH 7252/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/9284e6c24f849b03cbc2ac7d4d7e8c757232c93f https://github.com/facebook/fb303/commit/69ea52c1a3a93ed29a985624f74029594cba7959 https://github.com/facebook/fbthrift/commit/8125ef473ea5bfa4935e0e1578c2709694dff1c6 https://github.com/facebook/folly/commit/0ce4fcfd82e431d65cceecb393f28989bf459971 https://github.com/facebook/mvfst/commit/db7891bf708146667b55818fc26c0dfdfb224402 https://github.com/facebook/proxygen/commit/a21d3d4fa01d3c8e94b597cf14c966fa6af54417 https://github.com/facebook/wangle/commit/d0b4ca1e9f0230ea7bee4f1038361230c61d8ac6 https://github.com/facebookexperimental/edencommon/commit/fcc7786073e43cd9de653ecfe13b229af61fb24c https://github.com/facebookexperimental/rust-shed/commit/e5037a32cdff9bf931402fb30865bde91b50e0d8 https://github.com/facebookincubator/fizz/commit/1b76a3d5c9b1a7f6ddc58c50174c8e3128341cb9 Reviewed By: ckwalsh fbshipit-source-id: 9cf777326f39bf393c4d28efceeff012eb0ebde6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 656d541a53bf..332a174be26c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5e64424fcd4390036a2fe351647ec9ac3629a6f3 +Subproject commit 8125ef473ea5bfa4935e0e1578c2709694dff1c6 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index f87f8ca05a25..c04ebb00a9f8 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0a7af5c691eaec68eb9991ed4d4bfb8136252371 +Subproject commit 0ce4fcfd82e431d65cceecb393f28989bf459971 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 89a7ba9ab034..bfd892dcf5d7 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 4380720aa67ba739397b59a155ee9de51df498ad +Subproject commit d0b4ca1e9f0230ea7bee4f1038361230c61d8ac6 From 501416a2fb83f4bf551346ab41c8130970161660 Mon Sep 17 00:00:00 2001 From: Chris Dinh Date: Thu, 7 Nov 2024 11:43:38 -0800 Subject: [PATCH 7253/7387] Add simple suffix evaluation Summary: # Context Watchman is a primary vector into the eden globFiles endpoint. How watchman interprets and sends arguments to eden different based on how the query is structured. This change is intended to make a common query pathway more efficient(referred to as SimpleSuffix from here). Query format example: ["query","",{relative_root:"",fields:["content.sha1hex","name"],expression:["allof",["type","f"],["suffix",[""]]]}] This is currently interpreted as [rel_root/**], then post-filtered in watchman. This change is intended to change this to use eden glob's searchRoot field and internal filtering. # This Diff Adds new functions to watchman QueryExprs: evaluateSimpleSuffix - intended to determine if the expression is a valid simple suffix getSuffixQueryGlobPatterns - basically only valid on SuffixExpr. Returns a list of suffixes in glob form. These are intended to allow watchman to determine if a given query is using a simple suffix so we can pass arguments to eden more efficiently. This is primarily targeted at allowing targeted SLAPI offloading, b ut may have benefits for queries that aren't offloaded since we're returning less files from eden. Rollout is controlled by the watchman config value eden_enable_simple_suffix # Technical Details evaluateSimpleSuffix - returns Excluded(Not part of a Simple Suffix), Type, Suffix, or Allof. An Allof result indicates that this is a valis SimpleSuffix. getSuffixQueryGlobPatterns - Takes the suffix expression (eg. ['a', 'b']) and converts it to glob form (**/*.a, **/*.b) Relative root is computed and passed down. Adjustments to filter is made to properly reflect this. Reviewed By: jdelliot Differential Revision: D65302345 fbshipit-source-id: 57c073022452b2ff8ea1c913d45cad2a3eee1484 --- watchman/query/QueryExpr.h | 17 ++++ watchman/query/base.cpp | 53 ++++++++++++ watchman/query/dirname.cpp | 8 ++ watchman/query/empty.cpp | 16 ++++ watchman/query/intcompare.cpp | 8 ++ watchman/query/match.cpp | 8 ++ watchman/query/name.cpp | 8 ++ watchman/query/pcre.cpp | 8 ++ watchman/query/since.cpp | 8 ++ watchman/query/suffix.cpp | 13 +++ watchman/query/type.cpp | 11 +++ watchman/test/SuffixQueryTest.cpp | 133 ++++++++++++++++++++++++++++++ watchman/watcher/eden.cpp | 77 ++++++++++++++--- 13 files changed, 356 insertions(+), 12 deletions(-) create mode 100644 watchman/test/SuffixQueryTest.cpp diff --git a/watchman/query/QueryExpr.h b/watchman/query/QueryExpr.h index 19a8553dc152..28239d815996 100644 --- a/watchman/query/QueryExpr.h +++ b/watchman/query/QueryExpr.h @@ -43,6 +43,11 @@ enum AggregateOp { AllOf, }; +/** + * Describes which part of a simple suffix expression + */ +enum SimpleSuffixType { Excluded, Suffix, IsSimpleSuffix, Type }; + class QueryExpr { public: virtual ~QueryExpr() = default; @@ -78,6 +83,8 @@ class QueryExpr { virtual std::optional> computeGlobUpperBound( CaseSensitivity) const = 0; + virtual std::vector getSuffixQueryGlobPatterns() const = 0; + enum ReturnOnlyFiles { No, Yes, Unrelated }; /** @@ -86,6 +93,16 @@ class QueryExpr { * method to handle this query. */ virtual ReturnOnlyFiles listOnlyFiles() const = 0; + + /** + * Returns whether this expression is a simple suffix expression, or a part + * of a simple suffix expression. A simple suffix expression is an allof + * expression that contains a single suffix expresssion containing one or more + * suffixes, and a type expresssion that wants files only. The intention for + * this is to allow watchman to more accurately determine what arguments to + * pass to eden's globFiles API. + */ + virtual SimpleSuffixType evaluateSimpleSuffix() const = 0; }; } // namespace watchman diff --git a/watchman/query/base.cpp b/watchman/query/base.cpp index 635ee9e2d6d7..8e0b5b4669b2 100644 --- a/watchman/query/base.cpp +++ b/watchman/query/base.cpp @@ -64,6 +64,14 @@ class NotExpr : public QueryExpr { } return ReturnOnlyFiles::Unrelated; } + + SimpleSuffixType evaluateSimpleSuffix() const override { + return SimpleSuffixType::Excluded; + } + + std::vector getSuffixQueryGlobPatterns() const override { + return std::vector{}; + } }; W_TERM_PARSER(not, NotExpr::parse); @@ -87,6 +95,14 @@ class TrueExpr : public QueryExpr { ReturnOnlyFiles listOnlyFiles() const override { return ReturnOnlyFiles::Unrelated; } + + SimpleSuffixType evaluateSimpleSuffix() const override { + return SimpleSuffixType::Excluded; + } + + std::vector getSuffixQueryGlobPatterns() const override { + return std::vector{}; + } }; W_TERM_PARSER(true, TrueExpr::parse); @@ -110,6 +126,14 @@ class FalseExpr : public QueryExpr { ReturnOnlyFiles listOnlyFiles() const override { return ReturnOnlyFiles::Unrelated; } + + SimpleSuffixType evaluateSimpleSuffix() const override { + return SimpleSuffixType::Excluded; + } + + std::vector getSuffixQueryGlobPatterns() const override { + return std::vector{}; + } }; W_TERM_PARSER(false, FalseExpr::parse); @@ -312,6 +336,35 @@ class ListExpr : public QueryExpr { } return result; } + + SimpleSuffixType evaluateSimpleSuffix() const override { + if (allof) { + std::vector types; + for (auto& subExpr : exprs) { + types.push_back(subExpr->evaluateSimpleSuffix()); + } + if (types.size() == 2) { + if ((types[0] == SimpleSuffixType::Type && + types[1] == SimpleSuffixType::Suffix) || + (types[1] == SimpleSuffixType::Type && + types[0] == SimpleSuffixType::Suffix)) { + return SimpleSuffixType::IsSimpleSuffix; + } + } + } + return SimpleSuffixType::Excluded; + } + + std::vector getSuffixQueryGlobPatterns() const override { + if (allof) { + for (auto& subExpr : exprs) { + if (subExpr->evaluateSimpleSuffix() == SimpleSuffixType::Suffix) { + return subExpr->getSuffixQueryGlobPatterns(); + } + } + } + return std::vector{}; + } }; W_TERM_PARSER(anyof, ListExpr::parseAnyOf); diff --git a/watchman/query/dirname.cpp b/watchman/query/dirname.cpp index 5c92a1e61830..3f22c45a3756 100644 --- a/watchman/query/dirname.cpp +++ b/watchman/query/dirname.cpp @@ -178,6 +178,14 @@ class DirNameExpr : public QueryExpr { ReturnOnlyFiles listOnlyFiles() const override { return ReturnOnlyFiles::Unrelated; } + + SimpleSuffixType evaluateSimpleSuffix() const override { + return SimpleSuffixType::Excluded; + } + + std::vector getSuffixQueryGlobPatterns() const override { + return std::vector{}; + } }; W_TERM_PARSER(dirname, DirNameExpr::parseDirName); diff --git a/watchman/query/empty.cpp b/watchman/query/empty.cpp index cc5c3833b873..a001b147d8a6 100644 --- a/watchman/query/empty.cpp +++ b/watchman/query/empty.cpp @@ -34,6 +34,14 @@ class ExistsExpr : public QueryExpr { ReturnOnlyFiles listOnlyFiles() const override { return ReturnOnlyFiles::Unrelated; } + + SimpleSuffixType evaluateSimpleSuffix() const override { + return SimpleSuffixType::Excluded; + } + + std::vector getSuffixQueryGlobPatterns() const override { + return std::vector{}; + } }; W_TERM_PARSER(exists, ExistsExpr::parse); @@ -79,6 +87,14 @@ class EmptyExpr : public QueryExpr { ReturnOnlyFiles listOnlyFiles() const override { return ReturnOnlyFiles::Unrelated; } + + SimpleSuffixType evaluateSimpleSuffix() const override { + return SimpleSuffixType::Excluded; + } + + std::vector getSuffixQueryGlobPatterns() const override { + return std::vector{}; + } }; W_TERM_PARSER(empty, EmptyExpr::parse); diff --git a/watchman/query/intcompare.cpp b/watchman/query/intcompare.cpp index c89da8f78657..4b13bb9d3c16 100644 --- a/watchman/query/intcompare.cpp +++ b/watchman/query/intcompare.cpp @@ -132,6 +132,14 @@ class SizeExpr : public QueryExpr { ReturnOnlyFiles listOnlyFiles() const override { return ReturnOnlyFiles::Unrelated; } + + SimpleSuffixType evaluateSimpleSuffix() const override { + return SimpleSuffixType::Excluded; + } + + std::vector getSuffixQueryGlobPatterns() const override { + return std::vector{}; + } }; W_TERM_PARSER(size, SizeExpr::parse); diff --git a/watchman/query/match.cpp b/watchman/query/match.cpp index c3c0297cfec9..8257ff69ade7 100644 --- a/watchman/query/match.cpp +++ b/watchman/query/match.cpp @@ -212,6 +212,14 @@ class WildMatchExpr : public QueryExpr { ReturnOnlyFiles listOnlyFiles() const override { return ReturnOnlyFiles::Unrelated; } + + SimpleSuffixType evaluateSimpleSuffix() const override { + return SimpleSuffixType::Excluded; + } + + std::vector getSuffixQueryGlobPatterns() const override { + return std::vector{}; + } }; W_TERM_PARSER(match, WildMatchExpr::parseMatch); W_TERM_PARSER(imatch, WildMatchExpr::parseIMatch); diff --git a/watchman/query/name.cpp b/watchman/query/name.cpp index d1d3802f0f4f..1b43bf64d0da 100644 --- a/watchman/query/name.cpp +++ b/watchman/query/name.cpp @@ -186,6 +186,14 @@ class NameExpr : public QueryExpr { ReturnOnlyFiles listOnlyFiles() const override { return ReturnOnlyFiles::Unrelated; } + + SimpleSuffixType evaluateSimpleSuffix() const override { + return SimpleSuffixType::Excluded; + } + + std::vector getSuffixQueryGlobPatterns() const override { + return std::vector{}; + } }; W_TERM_PARSER(name, NameExpr::parseName); diff --git a/watchman/query/pcre.cpp b/watchman/query/pcre.cpp index 5f22e7ca0cd7..7cfcce9bb9df 100644 --- a/watchman/query/pcre.cpp +++ b/watchman/query/pcre.cpp @@ -157,6 +157,14 @@ class PcreExpr : public QueryExpr { ReturnOnlyFiles listOnlyFiles() const override { return ReturnOnlyFiles::Unrelated; } + + SimpleSuffixType evaluateSimpleSuffix() const override { + return SimpleSuffixType::Excluded; + } + + std::vector getSuffixQueryGlobPatterns() const override { + return std::vector{}; + } }; W_TERM_PARSER(pcre, PcreExpr::parsePcre); W_TERM_PARSER(ipcre, PcreExpr::parseIPcre); diff --git a/watchman/query/since.cpp b/watchman/query/since.cpp index e290a10ffa7b..da725905d8d2 100644 --- a/watchman/query/since.cpp +++ b/watchman/query/since.cpp @@ -170,6 +170,14 @@ class SinceExpr : public QueryExpr { ReturnOnlyFiles listOnlyFiles() const override { return ReturnOnlyFiles::Unrelated; } + + SimpleSuffixType evaluateSimpleSuffix() const override { + return SimpleSuffixType::Excluded; + } + + std::vector getSuffixQueryGlobPatterns() const override { + return std::vector{}; + } }; W_TERM_PARSER(since, SinceExpr::parse); diff --git a/watchman/query/suffix.cpp b/watchman/query/suffix.cpp index f33230b75fb9..c193c654a22e 100644 --- a/watchman/query/suffix.cpp +++ b/watchman/query/suffix.cpp @@ -100,6 +100,19 @@ class SuffixExpr : public QueryExpr { ReturnOnlyFiles listOnlyFiles() const override { return ReturnOnlyFiles::Unrelated; } + + SimpleSuffixType evaluateSimpleSuffix() const override { + return SimpleSuffixType::Suffix; + } + + std::vector getSuffixQueryGlobPatterns() const override { + std::vector patterns; + for (const auto& suffix : suffixSet_) { + patterns.push_back("**/*." + suffix.string()); + } + + return patterns; + } }; W_TERM_PARSER(suffix, SuffixExpr::parse); W_CAP_REG("suffix-set") diff --git a/watchman/query/type.cpp b/watchman/query/type.cpp index d1b1b68addd8..cf87e9f7d601 100644 --- a/watchman/query/type.cpp +++ b/watchman/query/type.cpp @@ -119,6 +119,17 @@ class TypeExpr : public QueryExpr { } return ReturnOnlyFiles::Yes; } + + SimpleSuffixType evaluateSimpleSuffix() const override { + if (arg == 'f') { + return SimpleSuffixType::Type; + } + return SimpleSuffixType::Excluded; + } + + std::vector getSuffixQueryGlobPatterns() const override { + return std::vector{}; + } }; W_TERM_PARSER(type, TypeExpr::parse); diff --git a/watchman/test/SuffixQueryTest.cpp b/watchman/test/SuffixQueryTest.cpp new file mode 100644 index 000000000000..eff657d0115d --- /dev/null +++ b/watchman/test/SuffixQueryTest.cpp @@ -0,0 +1,133 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +#include +#include +#include +#include "watchman/query/GlobTree.h" +#include "watchman/query/Query.h" +#include "watchman/query/QueryExpr.h" +#include "watchman/query/TermRegistry.h" +#include "watchman/thirdparty/jansson/jansson.h" + +using namespace watchman; +using namespace testing; + +namespace { + +std::optional parse_json(std::string expression_json) { + json_error_t err{}; + auto expression = json_loads(expression_json.c_str(), JSON_DECODE_ANY, &err); + if (!expression.has_value()) { + ADD_FAILURE() << "JSON parse error in fixture: " << err.text << " at " + << err.source << ":" << err.line << ":" << err.column; + return std::nullopt; + } + return expression; +} + +std::optional expr_evaluate_simple_suffix( + std::string expression_json) { + json_error_t err{}; + auto expression = parse_json(expression_json); + if (!expression.has_value()) { + return std::nullopt; + } + Query query; + // Disable automatic parsing of "match" as "imatch", "name" as "iname", etc. + auto expr = watchman::parseQueryExpr(&query, *expression); + return expr->evaluateSimpleSuffix(); +} + +std::optional> expr_get_suffix_glob( + std::string expression_json) { + json_error_t err{}; + auto expression = parse_json(expression_json); + if (!expression.has_value()) { + return std::nullopt; + } + Query query; + // Disable automatic parsing of "match" as "imatch", "name" as "iname", etc. + auto expr = watchman::parseQueryExpr(&query, *expression); + auto rv = expr->getSuffixQueryGlobPatterns(); + std::sort(rv.begin(), rv.end()); + return rv; +} + +} // namespace + +TEST(SuffixQueryTest, false) { + EXPECT_THAT( + expr_evaluate_simple_suffix(R"( ["false"] )"), + Optional(SimpleSuffixType::Excluded)); +} + +TEST(SuffixQueryTest, false_glob) { + EXPECT_THAT( + expr_get_suffix_glob(R"( ["false"] )"), + Optional(std::vector{})); +} + +TEST(SuffixQueryTest, type_d) { + EXPECT_THAT( + expr_evaluate_simple_suffix(R"( ["type", "d"] )"), + Optional(SimpleSuffixType::Excluded)); +} + +TEST(SuffixQueryTest, type_d_glob) { + EXPECT_THAT( + expr_get_suffix_glob(R"( ["type", "d"] )"), + Optional(std::vector{})); +} + +TEST(SuffixQueryTest, type_f) { + EXPECT_THAT( + expr_evaluate_simple_suffix(R"( ["type", "f"] )"), + Optional(SimpleSuffixType::Type)); +} + +TEST(SuffixQueryTest, type_f_glob) { + EXPECT_THAT( + expr_get_suffix_glob(R"( ["type", "f"] )"), + Optional(std::vector{})); +} +TEST(SuffixQueryTest, suffix) { + EXPECT_THAT( + expr_evaluate_simple_suffix(R"( ["suffix", ["a", "f"]] )"), + Optional(SimpleSuffixType::Suffix)); +} + +TEST(SuffixQueryTest, suffix_glob) { + EXPECT_THAT( + expr_get_suffix_glob(R"( ["suffix", ["a", "f"]] )"), + Optional(std::vector{"**/*.a", "**/*.f"})); +} + +TEST(SuffixQueryTest, allof_excl) { + EXPECT_THAT( + expr_evaluate_simple_suffix(R"( ["allof", ["type", "f"], ["exists"]] )"), + Optional(SimpleSuffixType::Excluded)); +} + +TEST(SuffixQueryTest, allof_excl_glob) { + EXPECT_THAT( + expr_get_suffix_glob(R"( ["allof", ["type", "f"], ["exists"]] )"), + Optional(std::vector{})); +} + +TEST(SuffixQueryTest, allof_yes) { + EXPECT_THAT( + expr_evaluate_simple_suffix( + R"( ["allof", ["type", "f"], ["suffix", ["a"]]] )"), + Optional(SimpleSuffixType::IsSimpleSuffix)); +} + +TEST(SuffixQueryTest, allof_yes_glob) { + EXPECT_THAT( + expr_get_suffix_glob(R"( ["allof", ["type", "f"], ["suffix", ["a"]]] )"), + Optional(std::vector{"**/*.a"})); +} diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index 1352ec161fe9..1b74306c5a27 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -613,13 +613,18 @@ static std::string escapeGlobSpecialChars(w_string_piece str) { * We need to respect the ignore_dirs configuration setting and * also remove anything that doesn't match the relative_root constraint * in the query. */ -void filterOutPaths(std::vector& files, QueryContext* ctx) { +void filterOutPaths( + std::vector& files, + QueryContext* ctx, + const std::string& relative_root = "") { files.erase( std::remove_if( files.begin(), files.end(), - [ctx](const NameAndDType& item) { - auto full = w_string::pathCat({ctx->root->root_path, item.name}); + [ctx, relative_root](const NameAndDType& item) { + w_string full; + full = w_string::pathCat( + {ctx->root->root_path, relative_root, item.name}); if (!ctx->fileMatchesRelativeRoot(full)) { // Not in the desired area, so filter it out @@ -655,7 +660,8 @@ std::vector globNameAndDType( const std::vector& globPatterns, bool includeDotfiles, bool splitGlobPattern = false, - bool listOnlyFiles = false) { + bool listOnlyFiles = false, + const std::string& relative_root = "") { // TODO(xavierd): Once the config: "eden_split_glob_pattern" is rolled out // everywhere, remove this code. if (splitGlobPattern && globPatterns.size() > 1) { @@ -672,6 +678,7 @@ std::vector globNameAndDType( params.wantDtype() = true; params.listOnlyFiles() = listOnlyFiles; params.sync() = getSyncBehavior(); + params.searchRoot() = relative_root; globFutures.emplace_back( client->semifuture_globFiles(params).via(executor)); @@ -691,6 +698,7 @@ std::vector globNameAndDType( params.wantDtype() = true; params.listOnlyFiles() = listOnlyFiles; params.sync() = getSyncBehavior(); + params.searchRoot() = relative_root; Glob glob; try { @@ -867,7 +875,8 @@ class EdenView final : public QueryableView { const std::vector& globStrings, QueryContext* ctx, bool includeDotfiles, - bool includeDir = true) const { + bool includeDir = true, + const std::string& relative_root = "") const { auto client = getEdenClient(thriftChannel_); bool listOnlyFiles = false; @@ -882,12 +891,13 @@ class EdenView final : public QueryableView { globStrings, includeDotfiles, splitGlobPattern_, - listOnlyFiles); + listOnlyFiles, + relative_root); ctx->edenGlobFilesDurationUs.store( timer.elapsed().count(), std::memory_order_relaxed); // Filter out any ignored files - filterOutPaths(fileInfo, ctx); + filterOutPaths(fileInfo, ctx, relative_root); for (auto& item : fileInfo) { auto file = make_unique( @@ -997,8 +1007,23 @@ class EdenView final : public QueryableView { void allFilesGenerator(const Query*, QueryContext* ctx) const override { ctx->generationStarted(); - auto globPatterns = getGlobPatternsForAllFiles(ctx); - executeGlobBasedQuery(globPatterns, ctx, /*includeDotfiles=*/true); + std::string relative_root = ""; + std::vector globPatterns; + bool includeDir = true; + if (isSimpleSuffixQuery(ctx)) { + globPatterns = getSuffixQueryGlobPatterns(ctx); + relative_root = getSuffixQueryRelativeRoot(ctx); + includeDir = false; + } else { + globPatterns = getGlobPatternsForAllFiles(ctx); + } + + executeGlobBasedQuery( + globPatterns, + ctx, + /*includeDotfiles=*/true, + includeDir, + relative_root); } ClockPosition getMostRecentRootNumberAndTickValue() const override { @@ -1191,6 +1216,26 @@ class EdenView final : public QueryableView { return globPatterns; } + bool isSimpleSuffixQuery(QueryContext* ctx) const { + // Checks if this query expression is a simple suffix query. + // A simple suffix query is an allof expression that only contains + // 1. Type = f + // 2. Suffix + if (ctx->query->expr) { + return ctx->query->expr->evaluateSimpleSuffix() == + SimpleSuffixType::IsSimpleSuffix; + } + return false; + } + + std::vector getSuffixQueryGlobPatterns(QueryContext* ctx) const { + return ctx->query->expr->getSuffixQueryGlobPatterns(); + } + + std::string getSuffixQueryRelativeRoot(QueryContext* ctx) const { + return computeRelativePathPiece(ctx).string(); + } + /** * Returns all the files in the watched directory for a fresh instance. * @@ -1203,8 +1248,14 @@ class EdenView final : public QueryableView { // Avoid a full tree walk if we don't need it! return std::vector(); } - - auto globPatterns = getGlobPatternsForAllFiles(ctx); + std::string relative_root = ""; + std::vector globPatterns; + if (isSimpleSuffixQuery(ctx)) { + globPatterns = getSuffixQueryGlobPatterns(ctx); + relative_root = getSuffixQueryRelativeRoot(ctx); + } else { + globPatterns = getGlobPatternsForAllFiles(ctx); + } auto client = getEdenClient(thriftChannel_); return globNameAndDType( @@ -1212,7 +1263,9 @@ class EdenView final : public QueryableView { mountPoint_, std::move(globPatterns), /*includeDotfiles=*/true, - splitGlobPattern_); + splitGlobPattern_, + /*listOnlyFiles=*/false, + relative_root); } struct GetAllChangesSinceResult { From 08e51e41c6d389ac5bfae19aec18fbefaa494908 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 8 Nov 2024 09:35:03 -0800 Subject: [PATCH 7254/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/2955d13ecec59ec88894947ba64d7d29fd27ed9d https://github.com/facebook/fb303/commit/3160ad6cb649bf8c2462c78b628fd983c86cc2fe https://github.com/facebook/fbthrift/commit/be5066778cd8ae6db4075c10f196c255be3d5b2c https://github.com/facebook/folly/commit/cf549a4be8aa7bd28930c75d9529b2389da113a1 https://github.com/facebook/mvfst/commit/2f8b5cbfa1871e5743c31c0237c897141347ee23 https://github.com/facebook/proxygen/commit/16f8f63750ba3f5f6792a76180fef40f0de60478 https://github.com/facebook/wangle/commit/f43ecba6c03bab1ac3e14efc9eb70570fcfa8d8e https://github.com/facebookexperimental/edencommon/commit/855ba11ff1c0acfeb8e11a316a8c141301d0ad27 https://github.com/facebookexperimental/rust-shed/commit/7bdfd22bd466bc6896e7a51fe6605778075febea https://github.com/facebookincubator/fizz/commit/c4379b412512d3bed6a7cf96ae0d1e77c2edae2e Reviewed By: ckwalsh fbshipit-source-id: c319cce6fc8e8de4755f9e6750cecd9685c84f56 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 332a174be26c..4aa635e09051 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8125ef473ea5bfa4935e0e1578c2709694dff1c6 +Subproject commit be5066778cd8ae6db4075c10f196c255be3d5b2c diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index c04ebb00a9f8..d7006421d64f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0ce4fcfd82e431d65cceecb393f28989bf459971 +Subproject commit cf549a4be8aa7bd28930c75d9529b2389da113a1 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index bfd892dcf5d7..4a16aeb48396 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d0b4ca1e9f0230ea7bee4f1038361230c61d8ac6 +Subproject commit f43ecba6c03bab1ac3e14efc9eb70570fcfa8d8e From 828be723b8ee3d5c5f4252d60fa265f4f2e01179 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Fri, 8 Nov 2024 20:35:41 -0800 Subject: [PATCH 7255/7387] Add initial implementation of streamChangesSinceV2 Summary: # Context We are introducing EdenFS notifications to support scalable and ergonomic file system notifications for EdenFS mounts. # This Diff This diff tweaks the Thrift API a bit - reorganizing, renaming and adding some types. Additionally, it adds an initial, partially correct, implementation of this API. The current implementation returns changes in ordered buckets (filesystem followed by commits). It also doesn't capture all of the changes nore the dtypes. Subsequent diffs will get to these. # Technical Details Code is mostly a copy-paste from `streamChangesSince`, replacing API types where needed. Changes are around the processing of overlay and snapshot changes to now return the new API change events. # Discussion Points None Differential Revision: D65625598 fbshipit-source-id: 5151473ab7237c8ac792ab59ccd41d4f070204d9 --- eden/fs/service/streamingeden.thrift | 43 +++++++++++++++++----------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/eden/fs/service/streamingeden.thrift b/eden/fs/service/streamingeden.thrift index 7ee67f8439a7..077a3df88944 100644 --- a/eden/fs/service/streamingeden.thrift +++ b/eden/fs/service/streamingeden.thrift @@ -62,14 +62,14 @@ const i64 FS_EVENT_READ = 1; const i64 FS_EVENT_WRITE = 2; const i64 FS_EVENT_OTHER = 4; -struct CommitTransition { - 1: eden.ThriftRootId from; - 2: eden.ThriftRootId to; +struct Added { + 1: eden.Dtype fileType; + 3: eden.PathString path; } -struct DirectoryRenamed { - 1: eden.PathString from; - 2: eden.PathString to; +struct Modified { + 1: eden.Dtype fileType; + 3: eden.PathString path; } struct Renamed { @@ -78,26 +78,35 @@ struct Renamed { 3: eden.PathString to; } -struct Added { +struct Replaced { 1: eden.Dtype fileType; - 3: eden.PathString path; + 2: eden.PathString from; + 3: eden.PathString to; } -struct Deleted { +struct Removed { 1: eden.Dtype fileType; 3: eden.PathString path; } -struct Modified { - 1: eden.Dtype fileType; - 3: eden.PathString path; +union SmallChangeNotification { + // @lint-ignore-every FBTHRIFTCOMPAT FBTHRIFTCOMPAT1 FBTHRIFTCOMPAT2 + 1: Added added; + // @lint-ignore-every FBTHRIFTCOMPAT FBTHRIFTCOMPAT1 FBTHRIFTCOMPAT2 + 2: Modified modified; + // @lint-ignore-every FBTHRIFTCOMPAT FBTHRIFTCOMPAT1 FBTHRIFTCOMPAT2 + 3: Renamed renamed; + 4: Replaced replaced; + 5: Removed removed; } -union SmallChangeNotification { - 1: Renamed renamed; - 2: Added added; - 3: Deleted deleted; - 4: Modified modified; +struct DirectoryRenamed { + 1: eden.PathString from; + 2: eden.PathString to; +} +struct CommitTransition { + 1: eden.ThriftRootId from; + 2: eden.ThriftRootId to; } union LargeChangeNotification { From 1a810731af61b07ecb30651a04d2903fe6a10a03 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 9 Nov 2024 09:33:26 -0800 Subject: [PATCH 7256/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/508bccde12e9fe52f29298140b6c6666ed80efab https://github.com/facebook/fb303/commit/120ac497b7164cd9cf98aad002973a0e87908fef https://github.com/facebook/fbthrift/commit/61aaa86ac4badc9c28e5e6ecde7f53aa78d0fa06 https://github.com/facebook/folly/commit/23d7a4c430cb6bc6c0bceac7d5ff7599a965c9db https://github.com/facebook/mvfst/commit/f8a587611148dd52ad1b28399b52775659201304 https://github.com/facebook/proxygen/commit/8ca8644303df149ac9a8c17a50c2170ca7852915 https://github.com/facebook/wangle/commit/d244abf6d646f19234ef1e6b03fb2963f3892079 https://github.com/facebookexperimental/edencommon/commit/5af1bd11c09c55c56b8fc9da5e4bea19605a467e https://github.com/facebookexperimental/rust-shed/commit/6baae5855aa6b7791710493865bc20543ae7a63b https://github.com/facebookincubator/fizz/commit/79253e0c7a965cf1460a020b363d5878cb1e094d Reviewed By: ckwalsh fbshipit-source-id: 3c9bf14127c09c284a1c9d27f25aedb023368316 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4aa635e09051..309dc9086af0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit be5066778cd8ae6db4075c10f196c255be3d5b2c +Subproject commit 61aaa86ac4badc9c28e5e6ecde7f53aa78d0fa06 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d7006421d64f..521271965985 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit cf549a4be8aa7bd28930c75d9529b2389da113a1 +Subproject commit 23d7a4c430cb6bc6c0bceac7d5ff7599a965c9db diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4a16aeb48396..2950b1374f11 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f43ecba6c03bab1ac3e14efc9eb70570fcfa8d8e +Subproject commit d244abf6d646f19234ef1e6b03fb2963f3892079 From 78abdb74936a6319136e2de787a83daf94d28f6f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 10 Nov 2024 09:34:34 -0800 Subject: [PATCH 7257/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/9b50671a7f8841e4fedff6f6dd0b9e88879f18b6 https://github.com/facebook/fbthrift/commit/03d775ab4ef3b8fd6b341b704ea8cd762b21c98b https://github.com/facebook/mvfst/commit/4917dc8929fcb06e4feb67ee8c3ce4e8d2f4666f https://github.com/facebook/proxygen/commit/8ec261915ab9c3b6e7b1f5106559a282af11fed4 https://github.com/facebook/wangle/commit/ce76286e48ba7c33c4bf3dcb9221afe3a8dd2d84 https://github.com/facebookexperimental/edencommon/commit/fdeceeb22044bd54e2026dcb75cc266e8de9bf87 https://github.com/facebookexperimental/rust-shed/commit/e050f6804620793d45ad6c048c81cb8155fe40e4 https://github.com/facebookincubator/fizz/commit/60b8ec13bc8f9d8daae75af3105a9a4a3eb9bf09 Reviewed By: ckwalsh fbshipit-source-id: 7749f4d310013c1b3f8e3c4c0fa318b4bb4b62d6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 309dc9086af0..40f7cc0d1d08 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 61aaa86ac4badc9c28e5e6ecde7f53aa78d0fa06 +Subproject commit 03d775ab4ef3b8fd6b341b704ea8cd762b21c98b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2950b1374f11..eb9803850d85 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d244abf6d646f19234ef1e6b03fb2963f3892079 +Subproject commit ce76286e48ba7c33c4bf3dcb9221afe3a8dd2d84 From 792015b823c376ed77fefe4d6eb5ccebcd0f2cc0 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 11 Nov 2024 09:33:34 -0800 Subject: [PATCH 7258/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/a8469362eb073e02a2c12e0c745997c83d78bcd5 https://github.com/facebook/fb303/commit/10f51dd63cf8263a1ce713c3a01bd043933274c5 https://github.com/facebook/fbthrift/commit/5c4a27e35822a56b701658de18b465a965530798 https://github.com/facebook/mvfst/commit/66ac0ed5ba4a45a68ec48695f08d95318c2901e5 https://github.com/facebook/proxygen/commit/86c8132f6eb6dbb0677497e279815c6886969c58 https://github.com/facebook/wangle/commit/bb9c4209c099921ab84fd6e52217ae395c96fab6 https://github.com/facebookexperimental/rust-shed/commit/0b2880880246a25466fc9107a75240bb65817f64 Reviewed By: JurjenLelifeld fbshipit-source-id: 1aa302f6aab4ac1a190ccb86cd53a5289e0ec61f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 40f7cc0d1d08..051c135d65f1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 03d775ab4ef3b8fd6b341b704ea8cd762b21c98b +Subproject commit 5c4a27e35822a56b701658de18b465a965530798 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index eb9803850d85..92efde087853 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ce76286e48ba7c33c4bf3dcb9221afe3a8dd2d84 +Subproject commit bb9c4209c099921ab84fd6e52217ae395c96fab6 From a20729f285bbe2e030fefefb878ced96d3281f1c Mon Sep 17 00:00:00 2001 From: Paul Cruz Date: Tue, 12 Nov 2024 07:35:42 -0800 Subject: [PATCH 7259/7387] Workaround build failure for range-v3 example code Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1051 In `range-v3`, the calendar example app fails to build. This was not detected when building range-v3 itself because the calendar app is only added as a buildable executable when `boost` is available ([code](https://github.com/ericniebler/range-v3/blob/master/example/CMakeLists.txt#L32)), but `boost` is not marked as a required dependency of `range-v3` in the manifest ([code](https://www.internalfb.com/code/fbsource/fbcode/opensource/fbcode_builder/manifests/range-v3)). During FBOSS OSS builds however, `boost` is pulled in as an indirect dependency, so the build will fail: P1677307273 This change omits building the example code. Reviewed By: harshitgulati18 Differential Revision: D65774962 fbshipit-source-id: 7f9f1238f08d6785981a53ae669989b95c63fa43 --- build/fbcode_builder/manifests/range-v3 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/fbcode_builder/manifests/range-v3 b/build/fbcode_builder/manifests/range-v3 index f96403c83f8c..e3778a368a55 100644 --- a/build/fbcode_builder/manifests/range-v3 +++ b/build/fbcode_builder/manifests/range-v3 @@ -9,3 +9,6 @@ sha256 = 376376615dbba43d3bef75aa590931431ecb49eb36d07bb726a19f680c75e20c [build] builder = cmake subdir = range-v3-0.11.0 + +[cmake.defines] +RANGE_V3_EXAMPLES=OFF From 61f6234ae97f242f0c80fb1c6ee21d7979bf26d7 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 12 Nov 2024 09:40:25 -0800 Subject: [PATCH 7260/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/d9758737ecc9360cd1c8044205eaabfea43c7ab3 https://github.com/facebook/buck2-shims-meta/commit/89b0e8cfcdfbcb435926aa62dda3276b9a722d1a https://github.com/facebook/fb303/commit/cad9cac59c68a1091bc81e9410bae8289da03bcf https://github.com/facebook/fbthrift/commit/3a374b269bf9c2a5ae60b0bfc49a93b763861c14 https://github.com/facebook/folly/commit/4f0f935e27afa6cae386c7f22e268f57a9633095 https://github.com/facebook/mvfst/commit/27dce043037e62b994e94ccfd9ee35745689ebaa https://github.com/facebook/proxygen/commit/36da42c390744e838d92a014dd26459f6b4b323d https://github.com/facebook/wangle/commit/fbfbc50510a1b4a02ca249c9fe857d8925f8991d https://github.com/facebookexperimental/edencommon/commit/b22c1fb29d339a776297b7f89c347ab7b9942f37 https://github.com/facebookexperimental/rust-shed/commit/d82320ac4a4e429a0476f534f82fd5536572e03d https://github.com/facebookincubator/fizz/commit/bde106d3e79d3d4f87a8ed4540fcc87126a1e619 Reviewed By: JurjenLelifeld fbshipit-source-id: 362a726d95c6ad8727c0ddb2511f192a427586ab --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 051c135d65f1..f438228b82ae 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 5c4a27e35822a56b701658de18b465a965530798 +Subproject commit 3a374b269bf9c2a5ae60b0bfc49a93b763861c14 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 521271965985..d95b134d7440 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 23d7a4c430cb6bc6c0bceac7d5ff7599a965c9db +Subproject commit 4f0f935e27afa6cae386c7f22e268f57a9633095 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 92efde087853..35cad25a5465 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit bb9c4209c099921ab84fd6e52217ae395c96fab6 +Subproject commit fbfbc50510a1b4a02ca249c9fe857d8925f8991d From 37830b280bbda0d1b57f01ce31fd795339b85134 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 13 Nov 2024 09:37:51 -0800 Subject: [PATCH 7261/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/ffe5c0355c445dd0fa41a2b904eee38cd6162251 https://github.com/facebook/buck2-shims-meta/commit/dc8551f7918c9e7c54f823864852b6f3f455e906 https://github.com/facebook/fb303/commit/99629f10cb3dee7786f7c7c4db62413d1232f6c2 https://github.com/facebook/fbthrift/commit/48b37a3f8c0887b0423ea826a1b3d5311a531c34 https://github.com/facebook/folly/commit/51492988a522ef09a0c3ca1222dc797f797e297a https://github.com/facebook/mvfst/commit/be2de20e8707114592e37b541525bc7134f276ab https://github.com/facebook/proxygen/commit/8f69f90a14403524281c37652b12bbf1916febac https://github.com/facebook/wangle/commit/5d68247e443057404fe433571ebca53641ac7f46 https://github.com/facebookexperimental/edencommon/commit/870e0ea332c3d147663eacad2337313588b5b2c9 https://github.com/facebookexperimental/rust-shed/commit/0fc0bf7271ed0c47ee046cad396055888a36f6f8 https://github.com/facebookincubator/fizz/commit/c24a39b6f1ab142d91bd3a17147fec01f560dad6 Reviewed By: JurjenLelifeld fbshipit-source-id: 6144ffd29a5d0e85d3650c317881d9deaaabb414 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f438228b82ae..45da81394ba8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3a374b269bf9c2a5ae60b0bfc49a93b763861c14 +Subproject commit 48b37a3f8c0887b0423ea826a1b3d5311a531c34 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d95b134d7440..e69eac08b2f4 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 4f0f935e27afa6cae386c7f22e268f57a9633095 +Subproject commit 51492988a522ef09a0c3ca1222dc797f797e297a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 35cad25a5465..55ec15fda976 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit fbfbc50510a1b4a02ca249c9fe857d8925f8991d +Subproject commit 5d68247e443057404fe433571ebca53641ac7f46 From a6a75aa95ce25f0419c24a96c459717f3cbb6aba Mon Sep 17 00:00:00 2001 From: Chris Dinh Date: Wed, 13 Nov 2024 12:53:54 -0800 Subject: [PATCH 7262/7387] Fix for missing paths in simple suffix evaluation Summary: # Bug Description Watchman would return with missing path components S468253 # This Diff Adds the relative root into the path evaluation # Technical Details Previously without this change, the contents of the EdenFileResult would be missing the relative root component, causing following path evaluators to remove the same number of paths from the head of the desired path Reviewed By: ezzak Differential Revision: D65901018 fbshipit-source-id: b47700a3802a23f59af2b7da7f172f8e0caf631b --- watchman/watcher/eden.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index 1b74306c5a27..e4209a4881cf 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -903,7 +903,7 @@ class EdenView final : public QueryableView { auto file = make_unique( rootPath_, thriftChannel_, - w_string::pathCat({mountPoint_, item.name}), + w_string::pathCat({mountPoint_, relative_root, item.name}), /*ticks=*/nullptr, /*isNew=*/false, item.dtype); From c932fb2a5176d2ebc1f21650a673088c82650084 Mon Sep 17 00:00:00 2001 From: Chris Dinh Date: Wed, 13 Nov 2024 15:28:11 -0800 Subject: [PATCH 7263/7387] Tests for simple suffix Summary: # Bug Description Watchman would return with missing path components S468253 # This Diff Adds tests for relative root path evaluation Reviewed By: jdelliot Differential Revision: D65908843 fbshipit-source-id: c62c60eda0a324731a94e68b518468d8011e91b8 --- watchman/integration/eden/test_eden_suffix.py | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 watchman/integration/eden/test_eden_suffix.py diff --git a/watchman/integration/eden/test_eden_suffix.py b/watchman/integration/eden/test_eden_suffix.py new file mode 100644 index 000000000000..021ec98657ca --- /dev/null +++ b/watchman/integration/eden/test_eden_suffix.py @@ -0,0 +1,89 @@ +# Copyright (c) Meta Platforms, Inc. and affiliates. +# +# This source code is licensed under the MIT license found in the +# LICENSE file in the root directory of this source tree. + +# pyre-unsafe + +from watchman.integration.lib import WatchmanEdenTestCase + + +def populate(repo) -> None: + # We ignore ".hg" here just so some of the tests that list files don't have to + # explicitly filter out the contents of this directory. However, in most situations + # the .hg directory normally should not be ignored. + repo.write_file(".watchmanconfig", '{"ignore_dirs":[".hg"]}') + + # Create multiple nested directories to test the relative_root option + repo.write_file("foo.c", "1\n") + repo.write_file("subdir/bar.c", "1\n") + repo.write_file("subdir/bar.h", "1\n") + repo.write_file("subdir/subdir2/baz.c", "1\n") + repo.write_file("subdir/subdir2/baz.h", "1\n") + repo.write_file("subdir/subdir2/subdir3/baz.c", "1\n") + + repo.commit("initial commit.") + + +class TestEdenQuery(WatchmanEdenTestCase.WatchmanEdenTestCase): + def test_simple_suffix(self) -> None: + root = self.makeEdenMount(populate) + self.watchmanCommand("watch", root) + + # Test each permutation of relative root + relative_roots = ["", "subdir", "subdir/subdir2", "subdir/subdir2/subdir3"] + expected_output = [ + [ + "foo.c", + "subdir/bar.c", + "subdir/subdir2/baz.c", + "subdir/subdir2/subdir3/baz.c", + ], + [ + "bar.c", + "subdir2/baz.c", + "subdir2/subdir3/baz.c", + ], + [ + "baz.c", + "subdir3/baz.c", + ], + [ + "baz.c", + ], + ] + for relative_root, output in zip(relative_roots, expected_output): + # Test Simple suffix eval + self.assertFileListsEqual( + self.watchmanCommand( + "query", + root, + { + "relative_root": relative_root, + "expression": ["allof", ["type", "f"], ["suffix", ["c"]]], + "fields": ["name"], + }, + )["files"], + output, + ) + + # Check that it is the same as normal suffix eval + self.assertFileListsEqual( + self.watchmanCommand( + "query", + root, + { + "relative_root": relative_root, + "expression": [ + "allof", + # Adding a true expression causes watchman to + # evaluate this normally instead of as a simple suffix + ["true"], + ["type", "f"], + ["suffix", ["c"]], + ], + "fields": ["name"], + }, + )["files"], + output, + ) From 10385568365d92f1b4f82db8ea323eea8cf3b5ed Mon Sep 17 00:00:00 2001 From: Simon Krueger Date: Thu, 14 Nov 2024 08:55:29 -0800 Subject: [PATCH 7264/7387] Use `folly::fileops` qualified name lookup Summary: This is a codemod. It was automatically generated and will be landed once it is approved and tests are passing in sandcastle. You have been added as a reviewer by Sentinel or Butterfly. Autodiff project: fileops2 Autodiff partition: fbcode.watchman Autodiff bookmark: ad.fileops2.fbcode.watchman This updates `open`, `close`, `read`, `write`, and `pipe` call sites to use `folly::fileops` qualified name lookup. This is the 2nd phase in a 3-phase change to remove folly's global definitions of the posix functions that conflict with windows CRT. The 1st phase created namespaces for folly's posix functions. The 2nd phase updates callsites to use the qualified name of folly's `open`, `close`, `read`, `write`, and `pipe` functions. The 3rd and final phase will remove folly's globally defined posix functions and have windows CRT define them again. **What is the reason for this change?** Folly's global definitions of posix functions on Windows causes `#include` order issues if folly is not included first. For example, when `gtest/gtest.h` is included before folly, gtest includes `windows.h` and that declares `open`, `read`, and `chdir`, which creates ambiguous references to folly's `open`, `read`, and `chdir`. Another example is where posix functions go undeclared when `folly/portability/windows.h` is included without other portability headers (e.g., `folly/portability/unistd.h`). `folly/portability/windows.h` includes `windows.h` in a way that only underscore versions of the posix functions are available (e.g., `_open`, `_close`). These issues create friction for windows development. **Background: What is the purpose of `folly::portability::{fcntl,stdlib,sysstat,unistd}`?** It is a portability layer to make posix functions available and behave consistently across platforms. Some posix functions don't exist on windows (e.g., `sysconf`). Some other posix functions, folly changes to adapt behavior across platforms. For example, on windows folly defines `open`, `read`, `write`, and `close` functions to work with sockets. Folly makes these functions available in the global scope for convenience. Reviewed By: MichaelCuevas Differential Revision: D65855144 fbshipit-source-id: 2c9df0d0ee833a8c063798e360f29e6b93f90683 --- watchman/Logging.cpp | 5 +++-- watchman/Logging.h | 2 +- watchman/main.cpp | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/watchman/Logging.cpp b/watchman/Logging.cpp index e0f717858db2..124fcafb2368 100644 --- a/watchman/Logging.cpp +++ b/watchman/Logging.cpp @@ -33,7 +33,8 @@ namespace { template void write_stderr(const String& str) { w_string_piece piece = str; - ignore_result(::write(STDERR_FILENO, piece.data(), piece.size())); + ignore_result( + folly::fileops::write(STDERR_FILENO, piece.data(), piece.size())); } template @@ -202,7 +203,7 @@ void Log::doLogToStdErr() { for (auto& item : items) { auto& log = json_to_w_string(item->payload.get("log")); - ignore_result(::write(STDERR_FILENO, log.data(), log.size())); + ignore_result(folly::fileops::write(STDERR_FILENO, log.data(), log.size())); auto level = json_to_w_string(item->payload.get("level")); if (level == kFatal) { diff --git a/watchman/Logging.h b/watchman/Logging.h index 5076c8a44d8c..9eb2fd5d2175 100644 --- a/watchman/Logging.h +++ b/watchman/Logging.h @@ -135,7 +135,7 @@ void logf(LogLevel level, fmt::string_view format_str, Args&&... args) { template void logf_stderr(fmt::string_view format_str, Args&&... args) { auto msg = fmt::format(fmt::runtime(format_str), std::forward(args)...); - ignore_result(write(STDERR_FILENO, msg.data(), msg.size())); + ignore_result(folly::fileops::write(STDERR_FILENO, msg.data(), msg.size())); } #ifdef _WIN32 diff --git a/watchman/main.cpp b/watchman/main.cpp index 8775fafdcbcb..501cf8e2db10 100644 --- a/watchman/main.cpp +++ b/watchman/main.cpp @@ -141,7 +141,7 @@ std::optional detect_starting_command(pid_t ppid) { int fd = ::open("/dev/null", O_RDONLY); if (fd != -1) { ignore_result(::dup2(fd, STDIN_FILENO)); - ::close(fd); + folly::fileops::close(fd); } if (logging::log_name != "-") { @@ -149,7 +149,7 @@ std::optional detect_starting_command(pid_t ppid) { if (fd != -1) { ignore_result(::dup2(fd, STDOUT_FILENO)); ignore_result(::dup2(fd, STDERR_FILENO)); - ::close(fd); + folly::fileops::close(fd); } } @@ -259,7 +259,7 @@ static void close_random_fds() { } for (max_fd = open_max; max_fd > STDERR_FILENO; --max_fd) { - close(max_fd); + folly::fileops::close(max_fd); } #endif } From 717329cfdf07c73b73ec5c74a911e6484f84b68a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 14 Nov 2024 09:33:57 -0800 Subject: [PATCH 7265/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/a67e462f8c1812ca118c13a6040249187f35dbbe https://github.com/facebook/fb303/commit/86c95479982c00ba03fc5638250c2e60afc51ea2 https://github.com/facebook/fbthrift/commit/2fee9c1a5f20399bb66a73a41ae12a72ef4d6ee5 https://github.com/facebook/folly/commit/334481fe3221856aa519c980bec2966513271dd4 https://github.com/facebook/mvfst/commit/95898ef8b700a289fd71a19fed51692efce414ae https://github.com/facebook/proxygen/commit/516d99114c88dd4e5381ec41e48eae036f3e9d63 https://github.com/facebook/wangle/commit/5913bbff38bbf57bc989739e411c54bf5329dccc https://github.com/facebookexperimental/edencommon/commit/6907e24a841362930c1492c44e4bd926d340e020 https://github.com/facebookexperimental/rust-shed/commit/79559a3b8ec76c55f4822e21e19eae777a3fa157 https://github.com/facebookincubator/fizz/commit/dac3fb44886c7870c03c9a7c063e0c4160ade4a7 Reviewed By: JurjenLelifeld fbshipit-source-id: 1d0ae6a91196faec159a018f7448ce37dec6ae80 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 45da81394ba8..8bcf1433ab0b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 48b37a3f8c0887b0423ea826a1b3d5311a531c34 +Subproject commit 2fee9c1a5f20399bb66a73a41ae12a72ef4d6ee5 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e69eac08b2f4..753f7f648bb3 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 51492988a522ef09a0c3ca1222dc797f797e297a +Subproject commit 334481fe3221856aa519c980bec2966513271dd4 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 55ec15fda976..05642272e3a3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5d68247e443057404fe433571ebca53641ac7f46 +Subproject commit 5913bbff38bbf57bc989739e411c54bf5329dccc From d7e290a22f35caf1fb61dcce94915c3ed3221b00 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Thu, 14 Nov 2024 09:38:58 -0800 Subject: [PATCH 7266/7387] getdeps: enable -fcoroutines for GCC in edencommon and watchman Summary: Enable -fcoroutines on GCC for edencommon and watchman OSS cmake builds to match folly and [fbthrift](https://github.com/facebook/fbthrift/blob/197890bbedd4942809b91139f9a2890c8f167045/CMakeLists.txt#L64-L75). This is similar to changes made in D64911998 Also regenerated edencommon github CI, it was outdated and [broken](https://github.com/facebookexperimental/edencommon/actions/runs/11822790846/job/32940614642) Reviewed By: xavierd Differential Revision: D65944686 fbshipit-source-id: 23c323b484638934d107af6c3487528945c45b06 --- CMakeLists.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a8ea43029e07..dd6eec33209f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,17 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/fbcode_builder/CMake" ${CMAKE_MODULE_PATH}) -set(CMAKE_CXX_STANDARD 17) +if(NOT CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + message(STATUS "setting C++ standard to C++${CMAKE_CXX_STANDARD}") +endif() + +# Explicitly enable coroutine support, since GCC does not enable it +# by default when targeting C++17. +if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + add_compile_options($<$:-fcoroutines>) +endif() if (WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWIN32_LEAN_AND_MEAN -DNOMINMAX -DSTRICT") From 7ec833c91cabb439061d99466e92d4e5b67a36ea Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 14 Nov 2024 10:29:46 -0800 Subject: [PATCH 7267/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fbthrift/commit/60b4e8b6a822af215938a12817c0de8b4f81697c https://github.com/facebook/folly/commit/dbf25839da7d5699991ea76df73a59216bf4f246 https://github.com/facebookincubator/fizz/commit/88132b2a58b9443c94731b05a3aa71840557afc2 Reviewed By: JurjenLelifeld fbshipit-source-id: d6001574e9982a7a3ede8ef1fd4e40a5c8d52f4a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8bcf1433ab0b..9eceb5e65871 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2fee9c1a5f20399bb66a73a41ae12a72ef4d6ee5 +Subproject commit 60b4e8b6a822af215938a12817c0de8b4f81697c diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 753f7f648bb3..723456115a66 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 334481fe3221856aa519c980bec2966513271dd4 +Subproject commit dbf25839da7d5699991ea76df73a59216bf4f246 From e60f7f88cc20e7bd54335b9d93a29a046be1f81c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 15 Nov 2024 09:45:48 -0800 Subject: [PATCH 7268/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/0fb34c27a7808f62aa6a46081fb60dba339e91f6 https://github.com/facebook/buck2-shims-meta/commit/9a7f4d630a0ea37a65175f8e330839d82823a42a https://github.com/facebook/fb303/commit/2e5951c4caf66cf919b88127cc4af4b103e5baa1 https://github.com/facebook/fbthrift/commit/7f33f571ac8c8e43fcbaad99bf18a68774b03edc https://github.com/facebook/folly/commit/49d920691a609f40e31a0ca8b2d5d23a4def5f38 https://github.com/facebook/mvfst/commit/bea51cf5f203248ace2d34aa8cdb11b2cfef661e https://github.com/facebook/proxygen/commit/b5e0231560b6502f1120b062940d012d44e8800a https://github.com/facebook/wangle/commit/b496c25312abe5fdde040bc445075b84f43f8d93 https://github.com/facebookexperimental/edencommon/commit/8578413cd3dd3cb75854cc7da3a30e607aa8f052 https://github.com/facebookexperimental/rust-shed/commit/80062daa56fb9dbbcd13c6db4ea6bf1418927d81 https://github.com/facebookincubator/fizz/commit/519ca76f3fc6d108afb317e84342e29b2492c7d6 Reviewed By: bigfootjon fbshipit-source-id: 2af1d496dbb946b910faa2611f6e9081deecc7ea --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9eceb5e65871..1addb57848d3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 60b4e8b6a822af215938a12817c0de8b4f81697c +Subproject commit 7f33f571ac8c8e43fcbaad99bf18a68774b03edc diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 723456115a66..8fc5d4800fa6 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit dbf25839da7d5699991ea76df73a59216bf4f246 +Subproject commit 49d920691a609f40e31a0ca8b2d5d23a4def5f38 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 05642272e3a3..b49525f50a08 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5913bbff38bbf57bc989739e411c54bf5329dccc +Subproject commit b496c25312abe5fdde040bc445075b84f43f8d93 From 10c03e82e952db2a8543483a784bd1204466da09 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Fri, 15 Nov 2024 17:58:36 -0800 Subject: [PATCH 7269/7387] Update implementation of streamChangesSinceV2 to use ForEachDelta Summary: # Context We are introducing EdenFS notifications to support scalable and ergonomic file system notifications for EdenFS mounts. # This Diff * Introduces a new, public `forEachDelta` method on `Journal` so that we can use it to properly traverse the journal for `streamChangesSinceV2` * Replaces the usage of `accumulateRange` in `streamChangesSinceV2` to compute changes - still used to collect some summary data # Next Steps * Addresses the outstanding TODOs in `Journal` and `streamChangesSinceV2` - specifically, any range type information that was being computed and now is not and any information we are relying on from `acucumlateRange` * Remove call to `accumulateRange` * Add DType to journal entries. * Testing, testing, testing # Discussion Points * `streamChangesSinceV2` is being executed inline. This seems OK as it makes no blocking calls and has an expected termination that does not take long to reeach. However, if we evolve this method to also support waiting for events (i.e. subscribe), then we would need to change that. Should we make those changes now? * `streamChangesSinceV2` is returning changes from most recent to the requested postion - in other words in reverse order. To change this would require either: a) collecting all changes in memory then reversing them (what the previous version did) or b) locating the poistion in the journal and then traversing to the tail. Is this needed? Differential Revision: D65906174 fbshipit-source-id: 5dc300872dd8d6b80f832a8b53725436935b7103 --- eden/fs/service/streamingeden.thrift | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/eden/fs/service/streamingeden.thrift b/eden/fs/service/streamingeden.thrift index 077a3df88944..578baaed6768 100644 --- a/eden/fs/service/streamingeden.thrift +++ b/eden/fs/service/streamingeden.thrift @@ -90,11 +90,8 @@ struct Removed { } union SmallChangeNotification { - // @lint-ignore-every FBTHRIFTCOMPAT FBTHRIFTCOMPAT1 FBTHRIFTCOMPAT2 1: Added added; - // @lint-ignore-every FBTHRIFTCOMPAT FBTHRIFTCOMPAT1 FBTHRIFTCOMPAT2 2: Modified modified; - // @lint-ignore-every FBTHRIFTCOMPAT FBTHRIFTCOMPAT1 FBTHRIFTCOMPAT2 3: Renamed renamed; 4: Replaced replaced; 5: Removed removed; @@ -104,6 +101,7 @@ struct DirectoryRenamed { 1: eden.PathString from; 2: eden.PathString to; } + struct CommitTransition { 1: eden.ThriftRootId from; 2: eden.ThriftRootId to; From 749660d0a3a115b088341b7513929d14594aa27b Mon Sep 17 00:00:00 2001 From: John Elliott Date: Fri, 15 Nov 2024 18:36:32 -0800 Subject: [PATCH 7270/7387] Prepare to move changes since API from streaming to non-streaming Summary: # Context We are introducing EdenFS notifications to support scalable and ergonomic file system notifications for EdenFS mounts. # This Diff Based on user feedback as well as discussions with former Watchman/EdenFS SWEs, we are planning to move from a streaming endpoint to a non-streaming endpoint. There are many reasons, but ergonomics and peformance (for this use case) are top reasons. This diff moves some defintions from the streaming API to the non-streaming API. # Next Steps * Continue migrating the streaming interface to a non-streaming interface. * Collapsing journal entries * .t tests, Python integration tests, C++ unit tests # Discussion Points None Differential Revision: D66026081 fbshipit-source-id: c7d1652f3a42d2854db5fba948706fe316376ef9 --- eden/fs/service/eden.thrift | 58 ++++++++++++++++++++++++++++ eden/fs/service/streamingeden.thrift | 57 +-------------------------- 2 files changed, 59 insertions(+), 56 deletions(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 93feb9e24fb0..ed273ffc868b 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1752,6 +1752,64 @@ union CheckoutProgressInfoResponse { 2: CheckoutNotInProgress noProgress; } +/* + * Structs/Unionts for changesSince API + */ +struct Added { + 1: Dtype fileType; + 3: PathString path; +} + +struct Modified { + 1: Dtype fileType; + 3: PathString path; +} + +struct Renamed { + 1: Dtype fileType; + 2: PathString from; + 3: PathString to; +} + +struct Replaced { + 1: Dtype fileType; + 2: PathString from; + 3: PathString to; +} + +struct Removed { + 1: Dtype fileType; + 3: PathString path; +} + +union SmallChangeNotification { + 1: Added added; + 2: Modified modified; + 3: Renamed renamed; + 4: Replaced replaced; + 5: Removed removed; +} + +struct DirectoryRenamed { + 1: PathString from; + 2: PathString to; +} + +struct CommitTransition { + 1: ThriftRootId from; + 2: ThriftRootId to; +} + +union LargeChangeNotification { + 1: DirectoryRenamed directoryRenamed; + 2: CommitTransition commitTransition; +} + +union ChangeNotification { + 1: SmallChangeNotification smallChange; + 2: LargeChangeNotification largeChange; +} + service EdenService extends fb303_core.BaseService { list listMounts() throws (1: EdenError ex); void mount(1: MountArgument info) throws (1: EdenError ex); diff --git a/eden/fs/service/streamingeden.thrift b/eden/fs/service/streamingeden.thrift index 578baaed6768..d7b39c2a30b9 100644 --- a/eden/fs/service/streamingeden.thrift +++ b/eden/fs/service/streamingeden.thrift @@ -62,61 +62,6 @@ const i64 FS_EVENT_READ = 1; const i64 FS_EVENT_WRITE = 2; const i64 FS_EVENT_OTHER = 4; -struct Added { - 1: eden.Dtype fileType; - 3: eden.PathString path; -} - -struct Modified { - 1: eden.Dtype fileType; - 3: eden.PathString path; -} - -struct Renamed { - 1: eden.Dtype fileType; - 2: eden.PathString from; - 3: eden.PathString to; -} - -struct Replaced { - 1: eden.Dtype fileType; - 2: eden.PathString from; - 3: eden.PathString to; -} - -struct Removed { - 1: eden.Dtype fileType; - 3: eden.PathString path; -} - -union SmallChangeNotification { - 1: Added added; - 2: Modified modified; - 3: Renamed renamed; - 4: Replaced replaced; - 5: Removed removed; -} - -struct DirectoryRenamed { - 1: eden.PathString from; - 2: eden.PathString to; -} - -struct CommitTransition { - 1: eden.ThriftRootId from; - 2: eden.ThriftRootId to; -} - -union LargeChangeNotification { - 1: DirectoryRenamed directoryRenamed; - 2: CommitTransition commitTransition; -} - -union ChangeNotification { - 1: SmallChangeNotification smallChange; - 2: LargeChangeNotification largeChange; -} - /** * The value of a stream item. * @@ -144,7 +89,7 @@ struct ChangesSinceResult { * since the notification clock provided. */ struct ChangeNotificationResult { - 1: ChangeNotification change; + 1: eden.ChangeNotification change; } /** From f433f4d10e40a082063eb51f0fd183f4f2eaa980 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Sat, 16 Nov 2024 00:46:50 -0800 Subject: [PATCH 7271/7387] Move changes since API from streaming to non-streaming Summary: # Context We are introducing EdenFS notifications to support scalable and ergonomic file system notifications for EdenFS mounts. # This Diff This diff moves the changes since API from the streaming interface to the non-streaming interface. # Next Steps * Collapsing journal entries * .t tests, Python integration tests, C++ unit tests # Discussion Points None Differential Revision: D66039653 fbshipit-source-id: 3d884bed0c632e59739433b8e372ad0601a0089f --- eden/fs/service/eden.thrift | 29 +++++++++++++++++++++- eden/fs/service/streamingeden.thrift | 37 ---------------------------- 2 files changed, 28 insertions(+), 38 deletions(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index ed273ffc868b..ccabd86f8c03 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1753,7 +1753,7 @@ union CheckoutProgressInfoResponse { } /* - * Structs/Unionts for changesSince API + * Structs/Unions for changesSinceV2 API */ struct Added { 1: Dtype fileType; @@ -1810,6 +1810,22 @@ union ChangeNotification { 2: LargeChangeNotification largeChange; } +/** + * Return value of the changesSinceV2 API + */ +struct ChangesSinceV2Result { + 1: JournalPosition toPosition; + 2: list changes; +} + +/** + * Argument to changesSinceV2 API + */ +struct ChangesSinceV2Params { + 1: PathString mountPoint; + 2: JournalPosition fromPosition; +} + service EdenService extends fb303_core.BaseService { list listMounts() throws (1: EdenError ex); void mount(1: MountArgument info) throws (1: EdenError ex); @@ -2646,6 +2662,17 @@ service EdenService extends fb303_core.BaseService { void ensureMaterialized(1: EnsureMaterializedParams params) throws ( 1: EdenError ex, ); + + /** + * Returns a list of change notifications along with a new journal position for a given mount + * since a specific journal position. + * + * This does not resolve expensive operations like moving a directory or changing + * commits. Callers must query Sapling to evaluate those potentially expensive operations. + */ + ChangesSinceV2Result changesSinceV2(1: ChangesSinceV2Params params) throws ( + 1: EdenError ex, + ); } // The following were automatically generated and may benefit from renaming. diff --git a/eden/fs/service/streamingeden.thrift b/eden/fs/service/streamingeden.thrift index d7b39c2a30b9..ac968f2d27ed 100644 --- a/eden/fs/service/streamingeden.thrift +++ b/eden/fs/service/streamingeden.thrift @@ -82,23 +82,6 @@ struct ChangesSinceResult { 1: eden.JournalPosition toPosition; } -/** - * The value of a stream item in a streamChangedSinceV2 result stream. - * - * Each stream item refers to a single change notification - * since the notification clock provided. - */ -struct ChangeNotificationResult { - 1: eden.ChangeNotification change; -} - -/** - * Return value of the streamChangedSinceV2 API - */ -struct ChangesSinceV2Result { - 1: eden.JournalPosition toPosition; -} - /** * Argument to streamChangesSince API. */ @@ -115,14 +98,6 @@ struct StreamSelectedChangesSinceParams { 2: list globs; } -/** - * Argument to streamChangedSinceV2 API - */ -struct StreamChangesSinceV2Params { - 1: eden.PathString mountPoint; - 2: eden.JournalPosition fromPosition; -} - struct TraceTaskEventsRequest {} typedef binary EdenStartStatusUpdate @@ -221,18 +196,6 @@ service StreamingEdenService extends eden.EdenService { 1: eden.EdenError ex, ); - /** - * Returns a stream of change notifications for a given path since a specific point in time. - * - * This does not resolve expensive operations like moving a directory or changing - * commits. Callers must query Sapling to evaluate those potentially expensive operations. - */ - ChangesSinceV2Result, stream< - ChangeNotificationResult throws (1: eden.EdenError ex) - > streamChangesSinceV2(1: StreamChangesSinceV2Params params) throws ( - 1: eden.EdenError ex, - ); - /** * Same as the API above but only returns files that match the globs in filter. * This API is intend to replace the above API but it's currently under development. From 49dd7c6d77a3f7bfea99499448ac4cf3afc5d194 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 16 Nov 2024 09:34:25 -0800 Subject: [PATCH 7272/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/9f90f624ad4415141f57e1039f4ca88c31cc2d71 https://github.com/facebook/fb303/commit/b3d72ef4e4402726fd187bfbfc0a9e038722cea4 https://github.com/facebook/fbthrift/commit/250e3b78866affb5250f787cc8b6d12e980e88d2 https://github.com/facebook/folly/commit/0660ead5b610047a279cc291129e98e3f2a1fc37 https://github.com/facebook/mvfst/commit/348ed570167bae5df571aefff0d6118df982580b https://github.com/facebook/proxygen/commit/65d8f553f6af4c4321590171cca054357290faf6 https://github.com/facebook/wangle/commit/49d8f8f8349194c57d355742c5bd686a20789ca1 https://github.com/facebookexperimental/edencommon/commit/fd3f9682d1d9787b1f6965da8114919db402efe4 https://github.com/facebookexperimental/rust-shed/commit/5de7965b6cf132abb529027ec9fcd15f0066673b https://github.com/facebookincubator/fizz/commit/5050d1d21af23eec5ae522f7f4542a7c26baa061 Reviewed By: JurjenLelifeld fbshipit-source-id: 12f8c87236a534e1d88e240060ced6dcc84ac4b5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1addb57848d3..f10603878df6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 7f33f571ac8c8e43fcbaad99bf18a68774b03edc +Subproject commit 250e3b78866affb5250f787cc8b6d12e980e88d2 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8fc5d4800fa6..a46d7c2fd6f3 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 49d920691a609f40e31a0ca8b2d5d23a4def5f38 +Subproject commit 0660ead5b610047a279cc291129e98e3f2a1fc37 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b49525f50a08..55f05549b834 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b496c25312abe5fdde040bc445075b84f43f8d93 +Subproject commit 49d8f8f8349194c57d355742c5bd686a20789ca1 From 8cb8f8ae82aa0e994966c6939c76c776817636b6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 17 Nov 2024 09:37:38 -0800 Subject: [PATCH 7273/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/f28157da97c9bbf7c749c7017de5d6169ba71c53 https://github.com/facebook/fbthrift/commit/77e6ce520a1a115688409ab828c4714a172eb49d https://github.com/facebook/mvfst/commit/17ed5c9be72556fc7cf97a75a10524cd550e9cf0 https://github.com/facebook/proxygen/commit/6db794b6aa4070419f49f11f94e0bcd67bd29f94 https://github.com/facebook/wangle/commit/68e5d223fbd3e8a39776dc53ae3bd40c05ace193 https://github.com/facebookexperimental/edencommon/commit/9b7a7968fcbd7651e0c75c076a5c29c54efc561f https://github.com/facebookexperimental/rust-shed/commit/feba7e23d3c96c74d0098c580c18a6188996c33f https://github.com/facebookincubator/fizz/commit/8e1f5185e619c78946c274a04a4806eb463bba52 Reviewed By: JurjenLelifeld fbshipit-source-id: cf79b49a2e30c74229fd170600524adbf9c0c655 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f10603878df6..8a965d826393 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 250e3b78866affb5250f787cc8b6d12e980e88d2 +Subproject commit 77e6ce520a1a115688409ab828c4714a172eb49d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 55f05549b834..671d54427845 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 49d8f8f8349194c57d355742c5bd686a20789ca1 +Subproject commit 68e5d223fbd3e8a39776dc53ae3bd40c05ace193 From fdf1896b20331389a2d3dcec177277c0ce3af4ae Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 18 Nov 2024 09:35:11 -0800 Subject: [PATCH 7274/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/d7d1b136008874ed39cfb01406a6461c143c2f11 https://github.com/facebook/fb303/commit/19f936647046d27e2b55f9b30b69bfc38c82b763 https://github.com/facebook/fbthrift/commit/ed316767335c65f31a643520e7a7e2636bd9d3dc https://github.com/facebook/mvfst/commit/0e1550f2e09afb38db8f9992eada0bda5f57d661 https://github.com/facebook/proxygen/commit/6a5fa1879ec531359b7fe8ea001d621c7d9dd007 https://github.com/facebook/wangle/commit/11537335a2a5ffe2f2d4bfa7fc13b3dceb56ff8e https://github.com/facebookexperimental/rust-shed/commit/d388fdbd4ab872f95ea8648bf641fce84ce986ae Reviewed By: ajb85 fbshipit-source-id: 172717ef506429f4e46ef64c59609d37fb4b935b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8a965d826393..910473a7390d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 77e6ce520a1a115688409ab828c4714a172eb49d +Subproject commit ed316767335c65f31a643520e7a7e2636bd9d3dc diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 671d54427845..12f7e41c94db 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 68e5d223fbd3e8a39776dc53ae3bd40c05ace193 +Subproject commit 11537335a2a5ffe2f2d4bfa7fc13b3dceb56ff8e From b3c21a919f966262168de67c8b68738965f455cc Mon Sep 17 00:00:00 2001 From: Paul Cruz Date: Mon, 18 Nov 2024 10:53:53 -0800 Subject: [PATCH 7275/7387] Allow systemd libs to be built from source Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1066 Changes to enable building systemd libs from source (rather than relying on system packages i.e. systemd, systemd-devel). From the FBOSS perspective, this is desirable because statically linking the dependencies into the binaries makes them easier to package without relying on similar state between build and runtime environments. Reviewed By: somasun Differential Revision: D65827936 Privacy Context Container: L1125642 fbshipit-source-id: c0ba2f0690466a969bb4d9a4db664b9a5b3d3d79 --- build/fbcode_builder/getdeps/builder.py | 55 ++++++++++++++++++++++++ build/fbcode_builder/getdeps/manifest.py | 13 ++++++ build/fbcode_builder/manifests/systemd | 9 ++++ 3 files changed, 77 insertions(+) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 65bca2692a88..10bd2a62a62a 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -487,6 +487,61 @@ def _build(self, reconfigure) -> None: self._run_cmd(install_cmd, env=env) +class SystemdBuilder(BuilderBase): + # SystemdBuilder assumes that meson build tool has already been installed on + # the machine. + def __init__( + self, + loader, + dep_manifests, + build_opts, + ctx, + manifest, + src_dir, + build_dir, + inst_dir, + ) -> None: + super(SystemdBuilder, self).__init__( + loader, + dep_manifests, + build_opts, + ctx, + manifest, + src_dir, + build_dir, + inst_dir, + ) + + def _build(self, reconfigure) -> None: + env = self._compute_env() + meson = path_search(env, "meson") + if meson is None: + raise Exception("Failed to find Meson") + + # Meson builds typically require setup, compile, and install steps. + # During this setup step we ensure that the static library is built and + # the prefix is empty. + self._run_cmd( + [ + meson, + "setup", + "-Dstatic-libsystemd=true", + "-Dprefix=/", + self.build_dir, + self.src_dir, + ] + ) + + # Compile step needs to satisfy the build directory that was previously + # prepared during setup. + self._run_cmd([meson, "compile", "-C", self.build_dir]) + + # Install step + self._run_cmd( + [meson, "install", "-C", self.build_dir, "--destdir", self.inst_dir] + ) + + class CMakeBuilder(BuilderBase): MANUAL_BUILD_SCRIPT = """\ #!{sys.executable} diff --git a/build/fbcode_builder/getdeps/manifest.py b/build/fbcode_builder/getdeps/manifest.py index d02cfe83f217..e329da1ee69c 100644 --- a/build/fbcode_builder/getdeps/manifest.py +++ b/build/fbcode_builder/getdeps/manifest.py @@ -22,6 +22,7 @@ NopBuilder, OpenSSLBuilder, SqliteBuilder, + SystemdBuilder, ) from .cargo import CargoBuilder from .expr import parse_expr @@ -661,6 +662,18 @@ def create_builder( # noqa:C901 inst_dir, ) + if builder == "systemd": + return SystemdBuilder( + loader, + dep_manifests, + build_options, + ctx, + self, + src_dir, + build_dir, + inst_dir, + ) + if builder == "cargo": return self.create_cargo_builder( loader, diff --git a/build/fbcode_builder/manifests/systemd b/build/fbcode_builder/manifests/systemd index 40564970d7f0..0fb2a6f5a519 100644 --- a/build/fbcode_builder/manifests/systemd +++ b/build/fbcode_builder/manifests/systemd @@ -4,3 +4,12 @@ name = systemd [rpms] systemd systemd-devel + +[download] +url = https://github.com/systemd/systemd/archive/refs/tags/v256.7.tar.gz +sha256 = 896d76ff65c88f5fd9e42f90d152b0579049158a163431dd77cdc57748b1d7b0 + + +[build] +builder = systemd +subdir = systemd-256.7 From 4e8f678dd4bbe469821a52a3987c8c9ad47b6a56 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Mon, 18 Nov 2024 23:38:26 -0800 Subject: [PATCH 7276/7387] Added basic Thrift API docs for new changesSinceV2 API and depdendent types Summary: # Context We are introducing EdenFS notifications to support scalable and ergonomic file system notifications for EdenFS mounts. # This Diff Previous diffs had no documentation for all of the newly introducted types. This diff adds some basic docs for all of these types. # Next Steps * Collapsing journal entries * .t tests, Python integration tests, C++ unit tests # Discussion Points None Reviewed By: MichaelCuevas Differential Revision: D66119843 fbshipit-source-id: 11fb999601e6431fb4e0a41020cd4ab182f29275 --- eden/fs/service/eden.thrift | 85 ++++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index ccabd86f8c03..a8463cd98cfc 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1755,33 +1755,81 @@ union CheckoutProgressInfoResponse { /* * Structs/Unions for changesSinceV2 API */ + +/* + * Small change notification returned when invoking changesSinceV2. + * Indicates that a new filesystem entry has been added to the + * given mount point since the provided journal position. + * + * fileType - Dtype of added filesystem entry. + * path - path (vector of bytes) of added filesystem entry. + */ struct Added { 1: Dtype fileType; 3: PathString path; } +/* + * Small change notification returned when invoking changesSinceV2. + * Indicates that an existing filesystem entry has been modified within + * the given mount point since the provided journal position. + * + * fileType - Dtype of modified filesystem entry. + * path - path (vector of bytes) of modified filesystem entry. + */ struct Modified { 1: Dtype fileType; 3: PathString path; } +/* + * Small change notification returned when invoking changesSinceV2. + * Indicates that an existing filesystem entry has been renamed within + * the given mount point since the provided journal position. + * + * fileType - Dtype of renamed filesystem entry. + * from - path (vector of bytes) the filesystem entry was previously located at. + * to - path (vector of bytes) the filesystem entry was relocated to. + */ struct Renamed { 1: Dtype fileType; 2: PathString from; 3: PathString to; } +/* + * Small change notification returned when invoking changesSinceV2. + * Indicates that an existing filesystem entry has been replaced within + * the given mount point since the provided journal position. + * + * fileType - Dtype of replaced filesystem entry. + * from - path (vector of bytes) the filesystem entry was previously located at. + * to - path (vector of bytes) the filesystem entry was relocated over. + */ struct Replaced { 1: Dtype fileType; 2: PathString from; 3: PathString to; } +/* + * Small change notification returned when invoking changesSinceV2. + * Indicates that an existing filesystem entry has been removed from + * the given mount point since the provided journal position. + * + * fileType - Dtype of removed filesystem entry. + * path - path (vector of bytes) of removed filesystem entry. + */ struct Removed { 1: Dtype fileType; 3: PathString path; } +/* + * Change notification returned when invoking changesSinceV2. + * Indicates that the given change is small in impact - affecting + * one or two filesystem entries at most. + */ union SmallChangeNotification { 1: Added added; 2: Modified modified; @@ -1790,21 +1838,41 @@ union SmallChangeNotification { 5: Removed removed; } +/* + * Large change notification returned when invoking changesSinceV2. + * Indicates that an existing directory has been renamed within + * the given mount point since the provided journal position. + */ struct DirectoryRenamed { 1: PathString from; 2: PathString to; } +/* + * Large change notification returned when invoking changesSinceV2. + * Indicates that a commit transition has occurred within the + * given mount point since the provided journal position. + */ struct CommitTransition { 1: ThriftRootId from; 2: ThriftRootId to; } +/* + * Change notification returned when invoking changesSinceV2. + * Indicates that the given change is large in impact - affecting + * an unknown number of filesystem entries. + */ union LargeChangeNotification { 1: DirectoryRenamed directoryRenamed; 2: CommitTransition commitTransition; } +/* + * Changed returned when invoking changesSinceV2. + * Contains a change that occured within the given mount point + * since the provided journal position. + */ union ChangeNotification { 1: SmallChangeNotification smallChange; 2: LargeChangeNotification largeChange; @@ -1812,6 +1880,13 @@ union ChangeNotification { /** * Return value of the changesSinceV2 API + * + * toPosition - a new journal poistion that indicates the next change + * that will occur in the future. Should be used in the next call to + * changesSinceV2 go get the next list of changes. + * + * changes - a list of all change notifications that have ocurred in + * within the given mount point since the provided journal position. */ struct ChangesSinceV2Result { 1: JournalPosition toPosition; @@ -1820,6 +1895,14 @@ struct ChangesSinceV2Result { /** * Argument to changesSinceV2 API + * + * mountPoint - the EdenFS checkout to request changes about. + * + * fromPosition - the journal position used as the starting point to + * request changes since. Typically, fromPosition is the set to the + * toPostiion value returned in ChangesSinceV2Result. However, for + * the initial invocation of changesSinceV2, the caller can obtain + * the current journal position by calling getCurrentJournalPosition. */ struct ChangesSinceV2Params { 1: PathString mountPoint; @@ -2665,7 +2748,7 @@ service EdenService extends fb303_core.BaseService { /** * Returns a list of change notifications along with a new journal position for a given mount - * since a specific journal position. + * point since a provided journal position. * * This does not resolve expensive operations like moving a directory or changing * commits. Callers must query Sapling to evaluate those potentially expensive operations. From 204dd6919047dfd85d2cb798bb700fc9381fc570 Mon Sep 17 00:00:00 2001 From: John Elliott Date: Mon, 18 Nov 2024 23:38:26 -0800 Subject: [PATCH 7277/7387] Added support for returning LostChagnes (large change) and first lost change of TruncatedJournal Summary: # Context We are introducing EdenFS notifications to support scalable and ergonomic file system notifications for EdenFS mounts. # This Diff Adds new type of LargeChangeNotification - LostChanges. To validate the end-to-end support, this change also include detecting and reporting when the journal has been truncated. # Next Steps * Additional LostChanges: EdenFsRestarted and TooManyChanges * Collapsing journal entries * .t tests, Python integration tests, C++ unit tests # Discussion Points None Reviewed By: MichaelCuevas Differential Revision: D66126209 fbshipit-source-id: d5deed4d1b50d9a425275614b45a09024ae50679 --- eden/fs/service/eden.thrift | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index a8463cd98cfc..78f6c25237b8 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1858,6 +1858,31 @@ struct CommitTransition { 2: ThriftRootId to; } +/* + * Large change notification returned when invoking changesSinceV2. + * Indicates that EdenfS was unable to track changes within the given + * mount point since the provided journal poistion. Callers should + * treat all filesystem entries as changed. + */ +enum LostChangesReason { + // Unknown reason. + UNKNOWN = 0, + // The given mount point was remounted (or EdenFS was restarted). + EDENFS_REMOUNTED = 1, + // EdenFS' journal was truncated. + JOURNAL_TRUNCATED = 2, + // There were too many change notifications to report to the caller. + TOO_MANY_CHANGES = 3, +} + +/* + * Large change notification returned when invoking changesSinceV2. + * Indicates that EdenFS was unable to provide the changes to the caller. + */ +struct LostChanges { + 1: LostChangesReason reason; +} + /* * Change notification returned when invoking changesSinceV2. * Indicates that the given change is large in impact - affecting @@ -1866,6 +1891,7 @@ struct CommitTransition { union LargeChangeNotification { 1: DirectoryRenamed directoryRenamed; 2: CommitTransition commitTransition; + 3: LostChanges lostChanges; } /* From fd9010a968d46779e8fda0c29bfb7a77d31aa810 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 19 Nov 2024 07:12:05 -0800 Subject: [PATCH 7278/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/3a78a72b2b91d90fb9a79d079521beb67c9ab448 https://github.com/facebook/fb303/commit/eb7069e419dd7e735134cc1f4209d05264cad22f https://github.com/facebook/fbthrift/commit/3e94a1bc274aebfc5e74e6e20e9caa51c758a20f https://github.com/facebook/folly/commit/126e2bbb072a90e0de2f4e36437c1304121bb698 https://github.com/facebook/mvfst/commit/742921b8f73ee28fe855902a7e482a48705e33a4 https://github.com/facebook/proxygen/commit/91f6c336c8bc94dda6de10a16f5c5a98d09132e2 https://github.com/facebook/wangle/commit/cdf8628b1fe75175ba7f6efc4f5b6e3b680ef5a2 https://github.com/facebookexperimental/edencommon/commit/1a2e4841a80d18e8f43204da64988da66a5727fd https://github.com/facebookexperimental/rust-shed/commit/eaa8177cf58bb0d7d0242060409fa6e660644ed5 https://github.com/facebookincubator/fizz/commit/e4480320e4d0cd8b1a9c084cff33e29afb0e85a4 Reviewed By: ajb85 fbshipit-source-id: fc4c2859470bb66a40243a5aa01a410c19d52593 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 910473a7390d..4086c8ef1178 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ed316767335c65f31a643520e7a7e2636bd9d3dc +Subproject commit 3e94a1bc274aebfc5e74e6e20e9caa51c758a20f diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a46d7c2fd6f3..7baa673798a0 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0660ead5b610047a279cc291129e98e3f2a1fc37 +Subproject commit 126e2bbb072a90e0de2f4e36437c1304121bb698 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 12f7e41c94db..d8c86e1133e4 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 11537335a2a5ffe2f2d4bfa7fc13b3dceb56ff8e +Subproject commit cdf8628b1fe75175ba7f6efc4f5b6e3b680ef5a2 From 3199d3f993f4988fe878739d590417ac8b81c0ba Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 19 Nov 2024 09:36:17 -0800 Subject: [PATCH 7279/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/e60472b1530588b971206d88a772673b10659031 https://github.com/facebook/fbthrift/commit/f7489f65b768e789ae5d5b358dcf290c862c20cf https://github.com/facebook/mvfst/commit/2a613149327666ae3cca78d7d9912d6ed10f0f84 https://github.com/facebook/proxygen/commit/0df619d125de104db5f0275602a583841b830f81 https://github.com/facebook/wangle/commit/7eb2a49a3bfae109afe3a3985ebfe35463d79767 https://github.com/facebookexperimental/edencommon/commit/3763d075c72835b78b8f08cf5021d9625174591d https://github.com/facebookexperimental/rust-shed/commit/aa9838d61337964382710083531526635ef4a5da https://github.com/facebookincubator/fizz/commit/7dd309f648ba1112dd491ec1c11c7dcbec48f49c Reviewed By: ajb85 fbshipit-source-id: a41cbdf8d7fba42008de027e7d2a70c83728c5f9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4086c8ef1178..4293ec77734a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3e94a1bc274aebfc5e74e6e20e9caa51c758a20f +Subproject commit f7489f65b768e789ae5d5b358dcf290c862c20cf diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index d8c86e1133e4..637f0e37f03e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit cdf8628b1fe75175ba7f6efc4f5b6e3b680ef5a2 +Subproject commit 7eb2a49a3bfae109afe3a3985ebfe35463d79767 From ea860b52b983ab379df787ef6b63afc8190a8d43 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 20 Nov 2024 09:34:52 -0800 Subject: [PATCH 7280/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/c5e397d89b03f81b630616a78d1b5b13e15bfb9d https://github.com/facebook/fb303/commit/e4905798485d3e609dde6330a869a5a40f250baf https://github.com/facebook/fbthrift/commit/8b78f41c507f965c1b5236af9f3f69fa219f9f82 https://github.com/facebook/folly/commit/98c8bfbc3ecfb022dc2d077031d4c3eee29d4e0b https://github.com/facebook/mvfst/commit/8e06ca7df7aaa76833f9ebeba3b8125e5db561d8 https://github.com/facebook/proxygen/commit/c7faa4cf4f58df1c6955de6dbb2e600e4cda75f8 https://github.com/facebook/wangle/commit/0fe6d39cf550f45cbc2db3e24aa8ad1a8f698489 https://github.com/facebookexperimental/rust-shed/commit/172039af61dd0aba47bc1f8f858022ad7e5b6a35 Reviewed By: ajb85 fbshipit-source-id: fec343e72f49c5ba18eed233cd661b7b55306b1b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4293ec77734a..2f6337bcd80c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f7489f65b768e789ae5d5b358dcf290c862c20cf +Subproject commit 8b78f41c507f965c1b5236af9f3f69fa219f9f82 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7baa673798a0..bd2fdb74b166 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 126e2bbb072a90e0de2f4e36437c1304121bb698 +Subproject commit 98c8bfbc3ecfb022dc2d077031d4c3eee29d4e0b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 637f0e37f03e..8baa41199c31 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7eb2a49a3bfae109afe3a3985ebfe35463d79767 +Subproject commit 0fe6d39cf550f45cbc2db3e24aa8ad1a8f698489 From 9d7f5adf85d4c065ed983e0f3b403c320c141377 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 21 Nov 2024 09:43:38 -0800 Subject: [PATCH 7281/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/baa0886043d0bd20ee3a542fc0acfd141a05eab3 https://github.com/facebook/fb303/commit/a4146ca08abb0da2e04d1c06e89296f1a443bd7f https://github.com/facebook/fbthrift/commit/2790d46ed1fedd125e1840b983ac3150d2d7ea4b https://github.com/facebook/mvfst/commit/456904656654220192b079139fc20b807f3d2e9f https://github.com/facebook/proxygen/commit/9359d386cd5650ce1b4112ff5c22147fe3de0f6c https://github.com/facebook/wangle/commit/3429ff79def2db8f518d29b4422dbd62918cd274 https://github.com/facebookexperimental/edencommon/commit/0e73eb2d781974e49dff460469d4e038a67b3487 https://github.com/facebookexperimental/rust-shed/commit/d05670d58a41b1e2339ff1a35c8328680bcb5136 https://github.com/facebookincubator/fizz/commit/3e6fb1ce8dd7bc9e80f7498bf2f4b723223245dc Reviewed By: ajb85 fbshipit-source-id: 3415ff431668e7ccdbff74835f3c00c2d6509c94 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2f6337bcd80c..6ed5e9f7c814 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8b78f41c507f965c1b5236af9f3f69fa219f9f82 +Subproject commit 2790d46ed1fedd125e1840b983ac3150d2d7ea4b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8baa41199c31..fc3868fba73c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0fe6d39cf550f45cbc2db3e24aa8ad1a8f698489 +Subproject commit 3429ff79def2db8f518d29b4422dbd62918cd274 From 94ee5cd6002bfaf0d9eb5f5e65216f3f2dd3cc96 Mon Sep 17 00:00:00 2001 From: Simon Krueger Date: Thu, 21 Nov 2024 11:33:48 -0800 Subject: [PATCH 7282/7387] Use folly::fileops qualified name Summary: This updates `open`, `close`, `read`, `write`, and `pipe` call sites to use `folly::fileops` qualified name lookup. This is the 2nd phase in a 3-phase change to remove folly's global definitions of the posix functions that conflict with windows CRT. The 1st phase created namespaces for folly's posix functions. The 2nd phase updates callsites to use the qualified name of folly's `open`, `close`, `read`, `write`, and `pipe` functions. The 3rd and final phase will remove folly's globally defined posix functions and have windows CRT define them again. **What is the reason for this change?** Folly's global definitions of posix functions on Windows causes `#include` order issues if folly is not included first. For example, when `gtest/gtest.h` is included before folly, gtest includes `windows.h` and that declares `open`, `read`, and `chdir`, which creates ambiguous references to folly's `open`, `read`, and `chdir`. Another example is where posix functions go undeclared when `folly/portability/windows.h` is included without other portability headers (e.g., `folly/portability/unistd.h`). `folly/portability/windows.h` includes `windows.h` in a way that only underscore versions of the posix functions are available (e.g., `_open`, `_close`). These issues create friction for windows development. **Background: What is the purpose of `folly::portability::{fcntl,stdlib,sysstat,unistd}`?** It is a portability layer to make posix functions available and behave consistently across platforms. Some posix functions don't exist on windows (e.g., `sysconf`). Some other posix functions, folly changes to adapt behavior across platforms. For example, on windows folly defines `open`, `read`, `write`, and `close` functions to work with sockets. Folly makes these functions available in the global scope for convenience. Reviewed By: Orvid Differential Revision: D66192152 fbshipit-source-id: d585746baae0e174bfdc22e9e4565e323f5e08fe --- watchman/main.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/watchman/main.cpp b/watchman/main.cpp index 501cf8e2db10..fc9f496dca8d 100644 --- a/watchman/main.cpp +++ b/watchman/main.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -138,14 +139,15 @@ std::optional detect_starting_command(pid_t ppid) { #endif // redirect std{in,out,err} - int fd = ::open("/dev/null", O_RDONLY); + int fd = folly::fileops::open("/dev/null", O_RDONLY); if (fd != -1) { ignore_result(::dup2(fd, STDIN_FILENO)); folly::fileops::close(fd); } if (logging::log_name != "-") { - fd = open(logging::log_name.c_str(), O_WRONLY | O_APPEND | O_CREAT, 0600); + fd = folly::fileops::open( + logging::log_name.c_str(), O_WRONLY | O_APPEND | O_CREAT, 0600); if (fd != -1) { ignore_result(::dup2(fd, STDOUT_FILENO)); ignore_result(::dup2(fd, STDERR_FILENO)); From 51a2b4c4e2873d8692fe90296d993b0325534fc7 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Thu, 21 Nov 2024 18:20:07 -0800 Subject: [PATCH 7283/7387] upgrade nix to 0.26.4 Summary: I am upgrading nix to 0.29.0. To ensure each step produces clean CI and is bisectable if something goes wrong, start by going from 0.25 to 0.26.4. Reviewed By: zertosh Differential Revision: D66275116 fbshipit-source-id: 63c87ff4f4c631061e5a1c721f52563dc90b7e2b --- watchman/cli/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index 3f73560f3c7c..dc7558dae241 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -22,13 +22,13 @@ tokio = { version = "1.41.0", features = ["full", "test-util", "tracing"] } watchman_client = { version = "0.9.0", path = "../rust/watchman_client" } [target.'cfg(target_os = "linux")'.dependencies] -nix = "0.25" +nix = "0.26.4" [target.'cfg(target_os = "macos")'.dependencies] -nix = "0.25" +nix = "0.26.4" [target.'cfg(unix)'.dependencies] -nix = "0.25" +nix = "0.26.4" [features] default = [] From 0d6de943370088121ea527fd09a1dce052ae5b9a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 22 Nov 2024 09:38:43 -0800 Subject: [PATCH 7284/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/e593e8a2ba68380e756cefcd8bf1366e40b8354f https://github.com/facebook/buck2-shims-meta/commit/90eba8ff98ac49163a203def21ef20683b0c8ac7 https://github.com/facebook/fb303/commit/b7b26216364b0bb6a598247ff6677e960492cae9 https://github.com/facebook/fbthrift/commit/c161d0bb7d490ecc15a73d2e1956b79d04f37679 https://github.com/facebook/folly/commit/ec6d9c91ee3a5c8d61e3647c07978c8729185564 https://github.com/facebook/mvfst/commit/bab60ce1ebb84a5626fa69d0dd24066d54a7fa1c https://github.com/facebook/proxygen/commit/b07919a869a3e369f8469b97166359904c257d37 https://github.com/facebook/wangle/commit/ef3684329f2d8300cacdc44b977f3d9e23e2a64c https://github.com/facebookexperimental/rust-shed/commit/02c36948a549fca86721cecde0c363a7afbf74cf Reviewed By: ajb85 fbshipit-source-id: 3b6112e712cebd0cd291717c2240e2ca0ba95c5f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 6ed5e9f7c814..e44d736d796b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2790d46ed1fedd125e1840b983ac3150d2d7ea4b +Subproject commit c161d0bb7d490ecc15a73d2e1956b79d04f37679 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index bd2fdb74b166..a116d71c9e2f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 98c8bfbc3ecfb022dc2d077031d4c3eee29d4e0b +Subproject commit ec6d9c91ee3a5c8d61e3647c07978c8729185564 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index fc3868fba73c..3feea84e739e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3429ff79def2db8f518d29b4422dbd62918cd274 +Subproject commit ef3684329f2d8300cacdc44b977f3d9e23e2a64c From 55d4a1e4cd7c55113c54d8aad11c17149c31691d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 23 Nov 2024 02:57:00 -0800 Subject: [PATCH 7285/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/080a7cced440499c4537b550d39ae46a4e8ea0a9 https://github.com/facebook/buck2-shims-meta/commit/13a2db651a662e75e0b896bcc3cfc04852d9f448 https://github.com/facebook/fb303/commit/a8de9bf0525d48c44808e8d5fc74d9ac997ded7e https://github.com/facebook/fbthrift/commit/e5d44cf75579b6595d7c85b482d14e61ed7c3be6 https://github.com/facebook/folly/commit/1cbea3a5c5dc51699c88144dbef835e8b10bba99 https://github.com/facebook/mvfst/commit/761e3813c73d3679ed5c38d6e25f194e9825dd73 https://github.com/facebook/proxygen/commit/1a24c1bc2a5db5a11e6f5bb9d9f181482c1965af https://github.com/facebook/wangle/commit/9918e8b64c01aef656f71592b03414e26ad4b636 https://github.com/facebookexperimental/edencommon/commit/d14968511ae2062ddb1b8d11da08926434474116 https://github.com/facebookexperimental/rust-shed/commit/6d1975fb1626fedcbd06aa2b897278fcb054f37e https://github.com/facebookincubator/fizz/commit/38928c3fd05cd8a3fc354758748f5cd3f98c6531 Reviewed By: ajb85 fbshipit-source-id: 56ecbd7b01dce92aea3e622b0f0a4841061b9771 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index e44d736d796b..a992f3073633 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c161d0bb7d490ecc15a73d2e1956b79d04f37679 +Subproject commit e5d44cf75579b6595d7c85b482d14e61ed7c3be6 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a116d71c9e2f..bd0802ae4141 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ec6d9c91ee3a5c8d61e3647c07978c8729185564 +Subproject commit 1cbea3a5c5dc51699c88144dbef835e8b10bba99 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 3feea84e739e..1351bc738081 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ef3684329f2d8300cacdc44b977f3d9e23e2a64c +Subproject commit 9918e8b64c01aef656f71592b03414e26ad4b636 From e63661c3e116d928445bab3fccd918d54abbf363 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 23 Nov 2024 09:33:46 -0800 Subject: [PATCH 7286/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/980769430c1c340f11d7fb6317be89befa59f205 https://github.com/facebook/fbthrift/commit/f068ba9c8ebd55d91be0e1cb8a38792a146796ea https://github.com/facebook/folly/commit/87a00286dbf93aa76652161ee54a506a8bf80ff5 https://github.com/facebook/mvfst/commit/a2de3a3c5fba23dc40b945638072426a9d267fb8 https://github.com/facebook/proxygen/commit/fad942b9c68dea120f8fec75c4895f3797b6d8ff https://github.com/facebook/wangle/commit/cb9b748f510b939b6a2b58d71f4e2c877f617724 https://github.com/facebookexperimental/edencommon/commit/e9b749bdedf5a023bed244589cd9d74bf7cdbc1e https://github.com/facebookexperimental/rust-shed/commit/47b57e2e36c0cce91fac38a51b41ab84daffbcfe https://github.com/facebookincubator/fizz/commit/7139813d2b20bcf6197f81b7761ac964b4041052 Reviewed By: ajb85 fbshipit-source-id: b4911e0b43c06afba218ceac78d7afcca8632459 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a992f3073633..8102f236879c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e5d44cf75579b6595d7c85b482d14e61ed7c3be6 +Subproject commit f068ba9c8ebd55d91be0e1cb8a38792a146796ea diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index bd0802ae4141..8977cdcc57de 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1cbea3a5c5dc51699c88144dbef835e8b10bba99 +Subproject commit 87a00286dbf93aa76652161ee54a506a8bf80ff5 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1351bc738081..09455df72b3b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9918e8b64c01aef656f71592b03414e26ad4b636 +Subproject commit cb9b748f510b939b6a2b58d71f4e2c877f617724 From 3c53dbe85c019b4c05ea5ddfde8552c8f4cbb227 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 24 Nov 2024 09:33:21 -0800 Subject: [PATCH 7287/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/dd82d3bc132cf8140b2b9b0c4936e5bbba5cb3f2 https://github.com/facebook/fbthrift/commit/01695935bbb834a7140df245b19fea439b544afb https://github.com/facebook/mvfst/commit/a8e2065a2264eb62af9c644dc25b3a5ee3163a28 https://github.com/facebook/proxygen/commit/05d89b528785ca68d788d45551273fd17d465d95 https://github.com/facebook/wangle/commit/f5eb7e585367ec762c1baee90360158a8bb13097 https://github.com/facebookexperimental/edencommon/commit/61d2327ae3dd8692f6cb8a7cc44044a7c0dcb744 https://github.com/facebookexperimental/rust-shed/commit/0185c2fe9d9012949b87513e7bed42e863c4d2b1 https://github.com/facebookincubator/fizz/commit/2b71657549ae4334502ea4d82bc2a01d5353c472 Reviewed By: ajb85 fbshipit-source-id: fe543bb04cc85b058267a6cd13340df54a7ca61b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8102f236879c..89bddfcc4e75 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f068ba9c8ebd55d91be0e1cb8a38792a146796ea +Subproject commit 01695935bbb834a7140df245b19fea439b544afb diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 09455df72b3b..1809ac6711d4 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit cb9b748f510b939b6a2b58d71f4e2c877f617724 +Subproject commit f5eb7e585367ec762c1baee90360158a8bb13097 From b1c4ac21c7f9007300f2295df1fd5245e0e45dd9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 25 Nov 2024 09:33:34 -0800 Subject: [PATCH 7288/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/65665402d604bd8ebac4c4e5b03723f29ef1d258 https://github.com/facebook/fb303/commit/63993307c4697ea649da95bb0c4fc695eaba568e https://github.com/facebook/fbthrift/commit/13a0cd43ea3f14bc58b7685dbb28bb5325c6a398 https://github.com/facebook/mvfst/commit/b9e37500a80ab900804e0805a717c33c14154863 https://github.com/facebook/proxygen/commit/f787aeb18b1d57aad82354212e40565c44a9846f https://github.com/facebook/wangle/commit/4c3eb5a828560d2c4154cdd03c79589a601e0cad https://github.com/facebookexperimental/rust-shed/commit/a7ef79aade471898c8b6f1502503ea03f192bb02 Reviewed By: ajb85 fbshipit-source-id: 5919da214d078f46b2c293806696d6f7aa232b38 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 89bddfcc4e75..4180ff8f08a2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 01695935bbb834a7140df245b19fea439b544afb +Subproject commit 13a0cd43ea3f14bc58b7685dbb28bb5325c6a398 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1809ac6711d4..8bdc5c2d0add 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f5eb7e585367ec762c1baee90360158a8bb13097 +Subproject commit 4c3eb5a828560d2c4154cdd03c79589a601e0cad From e6602309d782715a2897a8824783321d50a2545b Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Mon, 25 Nov 2024 09:59:30 -0800 Subject: [PATCH 7289/7387] fix hangs in watchman oss ubuntu tests by excluding liblzma-dev Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1072 watchman oss tests on ubuntu are [hanging 2 hours on github and then failing](https://github.com/facebook/watchman/actions/runs/11989130985/job/33425158244), and locally show errors. One clue was that tests worked locally on centos stream 9 and fedora 40, pointing to one or more of the ubuntu system packages being the trigger. Turns out that having the ubuntu xz aka liblzma-dev system packages linked is triggering the issue on both ubuntu 22.04 and 24.04. Disabled system packages for xz and for glog and libunwind that also bring in the xz system packages on ubuntu. Why ubuntu's liblzma triggers this problem is unknown at this time. This change seems to be an improvement in that we get test results, with two tests showing intermittent failutes on ubuntu-22.04 runs. Reviewed By: ckwalsh Differential Revision: D66446570 fbshipit-source-id: 8a631e51012c7b90e867268451fd023304039589 --- build/fbcode_builder/manifests/glog | 3 ++- build/fbcode_builder/manifests/libunwind | 3 ++- build/fbcode_builder/manifests/xz | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/manifests/glog b/build/fbcode_builder/manifests/glog index b5d5fa814cc2..2649eaad1805 100644 --- a/build/fbcode_builder/manifests/glog +++ b/build/fbcode_builder/manifests/glog @@ -24,7 +24,8 @@ HAVE_TR1_UNORDERED_SET=OFF [homebrew] glog -[debs] +# on ubuntu glog brings in liblzma-dev, which in turn breaks watchman tests +[debs.not(distro=ubuntu)] libgoogle-glog-dev [rpms.distro=fedora] diff --git a/build/fbcode_builder/manifests/libunwind b/build/fbcode_builder/manifests/libunwind index 0a4f03bc8fef..fda19209ad32 100644 --- a/build/fbcode_builder/manifests/libunwind +++ b/build/fbcode_builder/manifests/libunwind @@ -5,7 +5,8 @@ name = libunwind libunwind-devel libunwind -[debs] +# on ubuntu this brings in liblzma-dev, which in turn breaks watchman tests +[debs.not(distro=ubuntu)] libunwind-dev [download] diff --git a/build/fbcode_builder/manifests/xz b/build/fbcode_builder/manifests/xz index 0b27ad63cc91..e6c0808ff01f 100644 --- a/build/fbcode_builder/manifests/xz +++ b/build/fbcode_builder/manifests/xz @@ -1,7 +1,8 @@ [manifest] name = xz -[debs] +# ubuntu's package causes watchman's tests to hang +[debs.not(distro=ubuntu)] liblzma-dev [homebrew] From 0aee5d1bc91a8d8c7ca22eec2bcdbe60b8b001e9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 26 Nov 2024 09:34:12 -0800 Subject: [PATCH 7290/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/29e5819fffbc6f139f944de6bc3e5a7d905978d5 https://github.com/facebook/buck2-shims-meta/commit/8fc88930320931d4ebe35f2b588dce4c95384d20 https://github.com/facebook/fb303/commit/77cfad9d9f293fc5889e5f17f107e218df3c5858 https://github.com/facebook/fbthrift/commit/bff4376a8205a9f5a9cfcad7156cfa103acdd890 https://github.com/facebook/folly/commit/3729257c5a05210d9e8ce62ba6130a94421ab7bf https://github.com/facebook/mvfst/commit/465dd36a75e271ef6205a92867ba3b4e3321285e https://github.com/facebook/proxygen/commit/85499c66e296cdab04174a1874868954119c7de3 https://github.com/facebook/wangle/commit/ba5a5199cc34a2c2d09efe1c27024b3548cebbed https://github.com/facebookexperimental/edencommon/commit/6d24b4c82746c98193fb734936ab5c183a2c795e https://github.com/facebookexperimental/rust-shed/commit/fae21382fa85cb2b023d747c8b548b4f7f5d8ae2 https://github.com/facebookincubator/fizz/commit/2b3200a7b102bd077b988d4d19be07076933f75a Reviewed By: ajb85 fbshipit-source-id: 76a56e9fb513414d47b153fd3732c9b732178627 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4180ff8f08a2..36f361bdcc8b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 13a0cd43ea3f14bc58b7685dbb28bb5325c6a398 +Subproject commit bff4376a8205a9f5a9cfcad7156cfa103acdd890 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8977cdcc57de..e9951e5d56aa 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 87a00286dbf93aa76652161ee54a506a8bf80ff5 +Subproject commit 3729257c5a05210d9e8ce62ba6130a94421ab7bf diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8bdc5c2d0add..5c627077c674 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 4c3eb5a828560d2c4154cdd03c79589a601e0cad +Subproject commit ba5a5199cc34a2c2d09efe1c27024b3548cebbed From 520b55a3105f61a9f12af6a3edfbc6a3dbab70de Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 27 Nov 2024 09:40:46 -0800 Subject: [PATCH 7291/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/9c2bca662d6b0dade4739b2bbd093c39cd12f8fa https://github.com/facebook/fbthrift/commit/c2812a8afeddde67ebd9fd8ea275be269e5dc79d https://github.com/facebook/folly/commit/dd1de90149f37d91674272e3721620a69ed9841d https://github.com/facebook/mvfst/commit/058f5db28c1686683fdb70f5cc184e773a06e71a https://github.com/facebook/proxygen/commit/5c693600d782017867243292b25350a0586ed0d0 https://github.com/facebook/wangle/commit/562c4a1a4c65deb1a2007c4056a885efedbab021 https://github.com/facebookexperimental/edencommon/commit/782c5737c65729542a8f7babeed01629de91f2cb https://github.com/facebookexperimental/rust-shed/commit/7d02be54cd7d4c6e42dcb2fe72bd67ddb5ed52de https://github.com/facebookincubator/fizz/commit/4c3c90f3d01289d44114ecc7cf01139d8c1de6ea Reviewed By: ajb85 fbshipit-source-id: ac8b1cc8d7d1790da28b3badb0ebc36cfd0b2cc5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 36f361bdcc8b..4ca0246a737d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bff4376a8205a9f5a9cfcad7156cfa103acdd890 +Subproject commit c2812a8afeddde67ebd9fd8ea275be269e5dc79d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e9951e5d56aa..de58e7f75f72 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 3729257c5a05210d9e8ce62ba6130a94421ab7bf +Subproject commit dd1de90149f37d91674272e3721620a69ed9841d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5c627077c674..a0555762c6c7 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ba5a5199cc34a2c2d09efe1c27024b3548cebbed +Subproject commit 562c4a1a4c65deb1a2007c4056a885efedbab021 From c603e6f53f260a16cacd00363f24aae6c1e93f31 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 28 Nov 2024 09:33:54 -0800 Subject: [PATCH 7292/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/e43c7c88c723533a17631fa3296e1843f4adebd9 https://github.com/facebook/buck2-shims-meta/commit/3451718bd8a107d0883a4d1427ca3652d4d46c91 https://github.com/facebook/fb303/commit/e5775afd4d5b17c247bba212427bd2a398533cd2 https://github.com/facebook/fbthrift/commit/11b6422e3f73639d8e01af034feb0effea13dfa0 https://github.com/facebook/folly/commit/2256efba9142b3e22502d9bf238e97fa1381f086 https://github.com/facebook/mvfst/commit/c59b3bf6516bde71b02b0053a93e866be0d3998e https://github.com/facebook/proxygen/commit/b2072d79b573f5fa51ddb484015eb40b641a36ad https://github.com/facebook/wangle/commit/3335109a4bd0ca508f9a28acc1af0a5592f81eb5 https://github.com/facebookexperimental/edencommon/commit/f04117e94aa1efc3c0978e9076c3f0ca3bf0aa30 https://github.com/facebookexperimental/rust-shed/commit/f6b7664c03e7506339d39cbff44cec7119b4ec4d https://github.com/facebookincubator/fizz/commit/4e9b55f9d503302514637c7352c044eebb7453a2 Reviewed By: ajb85 fbshipit-source-id: 73fdecd6d4a0fd59376ce96af3016120902d469f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4ca0246a737d..5ee1bea8ebbc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit c2812a8afeddde67ebd9fd8ea275be269e5dc79d +Subproject commit 11b6422e3f73639d8e01af034feb0effea13dfa0 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index de58e7f75f72..2b2010c61226 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit dd1de90149f37d91674272e3721620a69ed9841d +Subproject commit 2256efba9142b3e22502d9bf238e97fa1381f086 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a0555762c6c7..4a6f75521921 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 562c4a1a4c65deb1a2007c4056a885efedbab021 +Subproject commit 3335109a4bd0ca508f9a28acc1af0a5592f81eb5 From d3fa776f7d319c74ba279e4ac5e368b54f8f28df Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 29 Nov 2024 09:33:08 -0800 Subject: [PATCH 7293/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/84ab909891fb2b9c26dc5ebfe1bb47c7183b3423 https://github.com/facebook/fbthrift/commit/fd6006066e1cfb0b5f55b196b2ec2fd0215d6b69 https://github.com/facebook/folly/commit/b59298fd63cc9f5b31b85d3bfa3627578d3333fa https://github.com/facebook/mvfst/commit/d5a7eb56926eebee78575379a2634f5c3583fc23 https://github.com/facebook/proxygen/commit/f53c5615cbc0f9195ba31762cb09fa2646d8389c https://github.com/facebook/wangle/commit/d4b543a8a1b2106d7a189e608347bab5f2d68f5d https://github.com/facebookexperimental/edencommon/commit/51a1dbcd75c7b69efc40cd860caa507dd97548ed https://github.com/facebookexperimental/rust-shed/commit/64ad8a4456fbac8b1c51f48caf3c8bbcb04db74c https://github.com/facebookincubator/fizz/commit/bd0628898b1f85f57c6bccfe45e879b09d56b903 Reviewed By: ajb85 fbshipit-source-id: 6c3eaed37f5d03255a597b891abab9bb67b30414 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 5ee1bea8ebbc..38b4626ea68a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 11b6422e3f73639d8e01af034feb0effea13dfa0 +Subproject commit fd6006066e1cfb0b5f55b196b2ec2fd0215d6b69 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 2b2010c61226..23b601fd4768 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 2256efba9142b3e22502d9bf238e97fa1381f086 +Subproject commit b59298fd63cc9f5b31b85d3bfa3627578d3333fa diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4a6f75521921..78985838b607 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3335109a4bd0ca508f9a28acc1af0a5592f81eb5 +Subproject commit d4b543a8a1b2106d7a189e608347bab5f2d68f5d From c4d5c445d866334a28db1b460d40d13d59bd2b99 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Mon, 2 Dec 2024 01:42:44 -0800 Subject: [PATCH 7294/7387] make openssl install less confusing, align openssl version Summary: X-link: https://github.com/facebookincubator/fizz/pull/152 X-link: https://github.com/facebookincubator/zstrong/pull/1073 On linux getdeps uses system openssl, on macOS we mostly use the homebrew one on github CI. Both of these are openssl3.x, however the fallback build from source version is still set as openssl1.1. This can be confusing, giving the impression getdeps based builds need openssl1.1 * Update the openssl manifest source url to openssl-3.0.15, this version picked to match the ubuntu 22.04 LTS system packages. The other potentially confusing part was that the openssl source tarball was downloaded even when on on a platform like Linux where openssl is always taken from the system packages. * Make the download configurable so that does nothing if satisfied from system packages, and no need to check the cache. Reviewed By: ckwalsh Differential Revision: D66495352 fbshipit-source-id: 4d24bb82bfabe44c7764b819de7f4a05f80daed1 --- build/fbcode_builder/getdeps.py | 7 ++++++- build/fbcode_builder/getdeps/manifest.py | 21 +++++++++++++-------- build/fbcode_builder/manifests/openssl | 12 +++++++----- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 01c6c1f68a82..5f66374f7d98 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -333,6 +333,12 @@ def run_project_cmd(self, args, loader, manifest): cache = cache_module.create_cache() for m in projects: + fetcher = loader.create_fetcher(m) + if isinstance(fetcher, SystemPackageFetcher): + # We are guaranteed that if the fetcher is set to + # SystemPackageFetcher then this item is completely + # satisfied by the appropriate system packages + continue cached_project = CachedProject(cache, loader, m) if cached_project.download(): continue @@ -348,7 +354,6 @@ def run_project_cmd(self, args, loader, manifest): continue # We need to fetch the sources - fetcher = loader.create_fetcher(m) fetcher.update() diff --git a/build/fbcode_builder/getdeps/manifest.py b/build/fbcode_builder/getdeps/manifest.py index e329da1ee69c..5cec33aabba7 100644 --- a/build/fbcode_builder/getdeps/manifest.py +++ b/build/fbcode_builder/getdeps/manifest.py @@ -430,23 +430,27 @@ def _create_fetcher(self, build_options, ctx): # We can use the code from fbsource return ShipitTransformerFetcher(build_options, self.shipit_project) + # If both of these are None, the package can only be coming from + # preinstalled toolchain or system packages + repo_url = self.get_repo_url(ctx) + url = self.get("download", "url", ctx=ctx) + # Can we satisfy this dep with system packages? - if build_options.allow_system_packages: + if (repo_url is None and url is None) or build_options.allow_system_packages: if self._is_satisfied_by_preinstalled_environment(ctx): return PreinstalledNopFetcher() - packages = self.get_required_system_packages(ctx) - package_fetcher = SystemPackageFetcher(build_options, packages) - if package_fetcher.packages_are_installed(): - return package_fetcher + if build_options.host_type.get_package_manager(): + packages = self.get_required_system_packages(ctx) + package_fetcher = SystemPackageFetcher(build_options, packages) + if package_fetcher.packages_are_installed(): + return package_fetcher - repo_url = self.get_repo_url(ctx) if repo_url: rev = self.get("git", "rev") depth = self.get("git", "depth") return GitFetcher(build_options, self, repo_url, rev, depth) - url = self.get("download", "url", ctx=ctx) if url: # We need to defer this import until now to avoid triggering # a cycle when the facebook/__init__.py is loaded. @@ -464,7 +468,8 @@ def _create_fetcher(self, build_options, ctx): ) raise KeyError( - "project %s has no fetcher configuration matching %s" % (self.name, ctx) + "project %s has no fetcher configuration or system packages matching %s" + % (self.name, ctx) ) def create_fetcher(self, build_options, loader, ctx): diff --git a/build/fbcode_builder/manifests/openssl b/build/fbcode_builder/manifests/openssl index beef31c9e2e0..7dd40727cc2e 100644 --- a/build/fbcode_builder/manifests/openssl +++ b/build/fbcode_builder/manifests/openssl @@ -5,7 +5,7 @@ name = openssl libssl-dev [homebrew] -openssl@1.1 +openssl # on homebrew need the matching curl and ca- [rpms] @@ -16,9 +16,11 @@ openssl-libs [pps] openssl -[download] -url = https://www.openssl.org/source/openssl-1.1.1l.tar.gz -sha256 = 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 +# no need to download on the systems where we always use the system libs +[download.not(any(os=linux, os=freebsd))] +# match the openssl version packages in ubuntu LTS folly current supports +url = https://www.openssl.org/source/openssl-3.0.15.tar.gz +sha256 = 23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533 # We use the system openssl on these platforms even without --allow-system-packages [build.any(os=linux, os=freebsd)] @@ -26,7 +28,7 @@ builder = nop [build.not(any(os=linux, os=freebsd))] builder = openssl -subdir = openssl-1.1.1l +subdir = openssl-3.0.15 [dependencies.os=windows] perl From 68516ce0697a71436d96304d56729192b8097e51 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Tue, 3 Dec 2024 00:25:33 -0800 Subject: [PATCH 7295/7387] fetch dependencies in parallel on sandcastle Reviewed By: bigfootjon Differential Revision: D66661978 fbshipit-source-id: 8ba5906b4e1e9273b3df834e3c50d984a987ba1c --- build/fbcode_builder/getdeps/buildopts.py | 14 +++++++------- build/fbcode_builder/getdeps/fetcher.py | 16 +++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/build/fbcode_builder/getdeps/buildopts.py b/build/fbcode_builder/getdeps/buildopts.py index 8a9c9a99ddea..e7e13c22ec7d 100644 --- a/build/fbcode_builder/getdeps/buildopts.py +++ b/build/fbcode_builder/getdeps/buildopts.py @@ -523,7 +523,8 @@ def find_unused_drive_letter(): return available[-1] -def create_subst_path(path: str) -> str: +def map_subst_path(path: str) -> str: + """find a short drive letter mapping for a path""" for _attempt in range(0, 24): drive = find_existing_win32_subst_for_path( path, subst_mapping=list_win32_subst_letters() @@ -544,9 +545,11 @@ def create_subst_path(path: str) -> str: # other processes on the same host, so this may not succeed. try: subprocess.check_call(["subst", "%s:" % available, path]) - return "%s:\\" % available + subst = "%s:\\" % available + print("Mapped scratch dir %s -> %s" % (path, subst), file=sys.stderr) + return subst except Exception: - print("Failed to map %s -> %s" % (available, path)) + print("Failed to map %s -> %s" % (available, path), file=sys.stderr) raise Exception("failed to set up a subst path for %s" % path) @@ -619,10 +622,7 @@ def setup_build_options(args, host_type=None) -> BuildOptions: os.makedirs(scratch_dir) if is_windows(): - subst = create_subst_path(scratch_dir) - print( - "Mapping scratch dir %s -> %s" % (scratch_dir, subst), file=sys.stderr - ) + subst = map_subst_path(scratch_dir) scratch_dir = subst else: if not os.path.exists(scratch_dir): diff --git a/build/fbcode_builder/getdeps/fetcher.py b/build/fbcode_builder/getdeps/fetcher.py index 005b2494d636..ccc7d5e5180a 100644 --- a/build/fbcode_builder/getdeps/fetcher.py +++ b/build/fbcode_builder/getdeps/fetcher.py @@ -868,6 +868,7 @@ def update(self) -> ChangeStatus: if not os.path.exists(self.file_name): self._download() + self._verify_hash() if tarfile.is_tarfile(self.file_name): opener = tarfile.open @@ -877,19 +878,20 @@ def update(self) -> ChangeStatus: raise Exception("don't know how to extract %s" % self.file_name) os.makedirs(self.src_dir) print("Extract %s -> %s" % (self.file_name, self.src_dir)) - t = opener(self.file_name) if is_windows(): # Ensure that we don't fall over when dealing with long paths # on windows src = r"\\?\%s" % os.path.normpath(self.src_dir) else: src = self.src_dir - # The `str` here is necessary to ensure that we don't pass a unicode - # object down to tarfile.extractall on python2. When extracting - # the boost tarball it makes some assumptions and tries to convert - # a non-ascii path to ascii and throws. - src = str(src) - t.extractall(src) + + with opener(self.file_name) as t: + # The `str` here is necessary to ensure that we don't pass a unicode + # object down to tarfile.extractall on python2. When extracting + # the boost tarball it makes some assumptions and tries to convert + # a non-ascii path to ascii and throws. + src = str(src) + t.extractall(src) with open(self.hash_file, "w") as f: f.write(self.sha256) From 59b4eb748dd82e49fdca10fc7d5b326d971c8246 Mon Sep 17 00:00:00 2001 From: Rob Hogan Date: Tue, 3 Dec 2024 12:02:55 -0800 Subject: [PATCH 7296/7387] Format with Prettier Summary: Format this file with `format` (prettier defaults), ahead of some other refactoring, to reduce noise. Reviewed By: huntie Differential Revision: D66599371 fbshipit-source-id: 6b20b4df885abae2072adbb550777e1c46276595 --- watchman/node/index.js | 154 ++++++++++++++++++++++++----------------- 1 file changed, 89 insertions(+), 65 deletions(-) diff --git a/watchman/node/index.js b/watchman/node/index.js index 388bcc699137..7abbed080689 100644 --- a/watchman/node/index.js +++ b/watchman/node/index.js @@ -3,6 +3,8 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. + * + * @format */ 'use strict'; @@ -29,7 +31,7 @@ function Client(options) { this.watchmanBinaryPath = 'watchman'; if (options && options.watchmanBinaryPath) { this.watchmanBinaryPath = options.watchmanBinaryPath.trim(); - }; + } this.commands = []; } util.inherits(Client, EE); @@ -37,7 +39,7 @@ util.inherits(Client, EE); module.exports.Client = Client; // Try to send the next queued command, if any -Client.prototype.sendNextCommand = function() { +Client.prototype.sendNextCommand = function () { if (this.currentCommand) { // There's a command pending response, don't send this new one yet return; @@ -50,9 +52,9 @@ Client.prototype.sendNextCommand = function() { } this.socket.write(bser.dumpToBuffer(this.currentCommand.cmd)); -} +}; -Client.prototype.cancelCommands = function(why) { +Client.prototype.cancelCommands = function (why) { var error = new Error(why); // Steal all pending commands before we start cancellation, in @@ -66,19 +68,19 @@ Client.prototype.cancelCommands = function(why) { } // Synthesize an error condition for any commands that were queued - cmds.forEach(function(cmd) { + cmds.forEach(function (cmd) { cmd.cb(error); }); -} +}; -Client.prototype.connect = function() { +Client.prototype.connect = function () { var self = this; function makeSock(sockname) { // bunser will decode the watchman BSER protocol for us self.bunser = new bser.BunserBuf(); // For each decoded line: - self.bunser.on('value', function(obj) { + self.bunser.on('value', function (obj) { // Figure out if this is a unliteral response or if it is the // response portion of a request-response sequence. At the time // of writing, there are only two possible unilateral responses. @@ -107,26 +109,26 @@ Client.prototype.connect = function() { // See if we can dispatch the next queued command, if any self.sendNextCommand(); }); - self.bunser.on('error', function(err) { + self.bunser.on('error', function (err) { self.emit('error', err); }); self.socket = net.createConnection(sockname); - self.socket.on('connect', function() { + self.socket.on('connect', function () { self.connecting = false; self.emit('connect'); self.sendNextCommand(); }); - self.socket.on('error', function(err) { + self.socket.on('error', function (err) { self.connecting = false; self.emit('error', err); }); - self.socket.on('data', function(buf) { + self.socket.on('data', function (buf) { if (self.bunser) { self.bunser.append(buf); } }); - self.socket.on('end', function() { + self.socket.on('end', function () { self.socket = null; self.bunser = null; self.cancelCommands('The watchman connection was closed'); @@ -163,12 +165,14 @@ Client.prototype.connect = function() { } spawnFailed = true; if (error.code === 'EACCES' || error.errno === 'EACCES') { - error.message = 'The Watchman CLI is installed but cannot ' + - 'be spawned because of a permission problem'; + error.message = + 'The Watchman CLI is installed but cannot ' + + 'be spawned because of a permission problem'; } else if (error.code === 'ENOENT' || error.errno === 'ENOENT') { - error.message = 'Watchman was not found in PATH. See ' + - 'https://facebook.github.io/watchman/docs/install.html ' + - 'for installation instructions'; + error.message = + 'Watchman was not found in PATH. See ' + + 'https://facebook.github.io/watchman/docs/install.html ' + + 'for installation instructions'; } console.error('Watchman: ', error.message); self.emit('error', error); @@ -177,7 +181,7 @@ Client.prototype.connect = function() { try { proc = childProcess.spawn(this.watchmanBinaryPath, args, { stdio: ['ignore', 'pipe', 'pipe'], - windowsHide: true + windowsHide: true, }); } catch (error) { spawnError(error); @@ -186,24 +190,33 @@ Client.prototype.connect = function() { var stdout = []; var stderr = []; - proc.stdout.on('data', function(data) { + proc.stdout.on('data', function (data) { stdout.push(data); }); - proc.stderr.on('data', function(data) { + proc.stderr.on('data', function (data) { data = data.toString('utf8'); stderr.push(data); console.error(data); }); - proc.on('error', function(error) { + proc.on('error', function (error) { spawnError(error); }); proc.on('close', function (code, signal) { if (code !== 0) { - spawnError(new Error( - self.watchmanBinaryPath + ' ' + args.join(' ') + - ' returned with exit code=' + code + ', signal=' + - signal + ', stderr= ' + stderr.join(''))); + spawnError( + new Error( + self.watchmanBinaryPath + + ' ' + + args.join(' ') + + ' returned with exit code=' + + code + + ', signal=' + + signal + + ', stderr= ' + + stderr.join(''), + ), + ); return; } try { @@ -219,10 +232,10 @@ Client.prototype.connect = function() { self.emit('error', e); } }); -} +}; -Client.prototype.command = function(args, done) { - done = done || function() {}; +Client.prototype.command = function (args, done) { + done = done || function () {}; // Queue up the command this.commands.push({cmd: args, cb: done}); @@ -239,16 +252,16 @@ Client.prototype.command = function(args, done) { // If we're already connected and idle, try sending the command immediately this.sendNextCommand(); -} +}; var cap_versions = { - "cmd-watch-del-all": "3.1.1", - "cmd-watch-project": "3.1", - "relative_root": "3.3", - "term-dirname": "3.1", - "term-idirname": "3.1", - "wildmatch": "3.7", -} + 'cmd-watch-del-all': '3.1.1', + 'cmd-watch-project': '3.1', + relative_root: '3.3', + 'term-dirname': '3.1', + 'term-idirname': '3.1', + wildmatch: '3.7', +}; // Compares a vs b, returns < 0 if a < b, > 0 if b > b, 0 if a == b function vers_compare(a, b) { @@ -271,9 +284,12 @@ function have_cap(vers, name) { } // This is a helper that we expose for testing purposes -Client.prototype._synthesizeCapabilityCheck = function( - resp, optional, required) { - resp.capabilities = {} +Client.prototype._synthesizeCapabilityCheck = function ( + resp, + optional, + required, +) { + resp.capabilities = {}; var version = resp.version; optional.forEach(function (name) { resp.capabilities[name] = have_cap(version, name); @@ -282,46 +298,54 @@ Client.prototype._synthesizeCapabilityCheck = function( var have = have_cap(version, name); resp.capabilities[name] = have; if (!have) { - resp.error = 'client required capability `' + name + - '` is not supported by this server'; + resp.error = + 'client required capability `' + + name + + '` is not supported by this server'; } }); return resp; -} +}; -Client.prototype.capabilityCheck = function(caps, done) { +Client.prototype.capabilityCheck = function (caps, done) { var optional = caps.optional || []; var required = caps.required || []; var self = this; - this.command(['version', { - optional: optional, - required: required - }], function (error, resp) { - if (error) { - done(error); - return; - } - if (!('capabilities' in resp)) { - // Server doesn't support capabilities, so we need to - // synthesize the results based on the version - resp = self._synthesizeCapabilityCheck(resp, optional, required); - if (resp.error) { - error = new Error(resp.error); - error.watchmanResponse = resp; + this.command( + [ + 'version', + { + optional: optional, + required: required, + }, + ], + function (error, resp) { + if (error) { done(error); return; } - } - done(null, resp); - }); -} + if (!('capabilities' in resp)) { + // Server doesn't support capabilities, so we need to + // synthesize the results based on the version + resp = self._synthesizeCapabilityCheck(resp, optional, required); + if (resp.error) { + error = new Error(resp.error); + error.watchmanResponse = resp; + done(error); + return; + } + } + done(null, resp); + }, + ); +}; // Close the connection to the service -Client.prototype.end = function() { +Client.prototype.end = function () { this.cancelCommands('The client was ended'); if (this.socket) { this.socket.end(); this.socket = null; } this.bunser = null; -} +}; From b987a81edda277f15d98b785d64684d96b893c10 Mon Sep 17 00:00:00 2001 From: Rob Hogan Date: Tue, 3 Dec 2024 12:02:55 -0800 Subject: [PATCH 7297/7387] Switch to class syntax Summary: Update the `fb-watchman` source file to use ES6 class syntax, which can be type-checked by Flow in a subsequent diff. This is technically a breaking change for OSS, so should be released as semver major - though it's unlikely to affect anyone. Node.js added class support [way back in 2016, with v6](https://nodejs.org/en/blog/release/v6.0.0). Reviewed By: huntie Differential Revision: D66600075 fbshipit-source-id: 1dfdb57767fb5f2621914713b8976db98f6bb66f --- watchman/node/example.js | 2 +- watchman/node/index.js | 518 +++++++++++++++++++-------------------- 2 files changed, 258 insertions(+), 262 deletions(-) diff --git a/watchman/node/example.js b/watchman/node/example.js index f31aaada1e47..6e5b5025b542 100644 --- a/watchman/node/example.js +++ b/watchman/node/example.js @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -var watchman = require('fb-watchman'); +var watchman = require('./index.js'); var client = new watchman.Client(); client.on('end', function() { diff --git a/watchman/node/index.js b/watchman/node/index.js index 7abbed080689..18c374ff904d 100644 --- a/watchman/node/index.js +++ b/watchman/node/index.js @@ -11,7 +11,6 @@ var net = require('net'); var EE = require('events').EventEmitter; -var util = require('util'); var childProcess = require('child_process'); var bser = require('bser'); @@ -24,235 +23,297 @@ var unilateralTags = ['subscription', 'log']; * If not provided, the Client locates the binary using the PATH specified * by the node child_process's default env. */ -function Client(options) { - var self = this; - EE.call(this); - - this.watchmanBinaryPath = 'watchman'; - if (options && options.watchmanBinaryPath) { - this.watchmanBinaryPath = options.watchmanBinaryPath.trim(); +class Client extends EE { + constructor(options) { + super(); + const self = this; + + this.watchmanBinaryPath = 'watchman'; + if (options && options.watchmanBinaryPath) { + this.watchmanBinaryPath = options.watchmanBinaryPath.trim(); + } + this.commands = []; } - this.commands = []; -} -util.inherits(Client, EE); -module.exports.Client = Client; + // Try to send the next queued command, if any + sendNextCommand() { + if (this.currentCommand) { + // There's a command pending response, don't send this new one yet + return; + } -// Try to send the next queued command, if any -Client.prototype.sendNextCommand = function () { - if (this.currentCommand) { - // There's a command pending response, don't send this new one yet - return; - } + this.currentCommand = this.commands.shift(); + if (!this.currentCommand) { + // No further commands are queued + return; + } - this.currentCommand = this.commands.shift(); - if (!this.currentCommand) { - // No further commands are queued - return; + this.socket.write(bser.dumpToBuffer(this.currentCommand.cmd)); } - this.socket.write(bser.dumpToBuffer(this.currentCommand.cmd)); -}; + cancelCommands(why) { + var error = new Error(why); -Client.prototype.cancelCommands = function (why) { - var error = new Error(why); + // Steal all pending commands before we start cancellation, in + // case something decides to schedule more commands + var cmds = this.commands; + this.commands = []; - // Steal all pending commands before we start cancellation, in - // case something decides to schedule more commands - var cmds = this.commands; - this.commands = []; + if (this.currentCommand) { + cmds.unshift(this.currentCommand); + this.currentCommand = null; + } - if (this.currentCommand) { - cmds.unshift(this.currentCommand); - this.currentCommand = null; + // Synthesize an error condition for any commands that were queued + cmds.forEach(function (cmd) { + cmd.cb(error); + }); } - // Synthesize an error condition for any commands that were queued - cmds.forEach(function (cmd) { - cmd.cb(error); - }); -}; + connect() { + var self = this; + + function makeSock(sockname) { + // bunser will decode the watchman BSER protocol for us + self.bunser = new bser.BunserBuf(); + // For each decoded line: + self.bunser.on('value', function (obj) { + // Figure out if this is a unliteral response or if it is the + // response portion of a request-response sequence. At the time + // of writing, there are only two possible unilateral responses. + var unilateral = false; + for (var i = 0; i < unilateralTags.length; i++) { + var tag = unilateralTags[i]; + if (tag in obj) { + unilateral = tag; + } + } -Client.prototype.connect = function () { - var self = this; - - function makeSock(sockname) { - // bunser will decode the watchman BSER protocol for us - self.bunser = new bser.BunserBuf(); - // For each decoded line: - self.bunser.on('value', function (obj) { - // Figure out if this is a unliteral response or if it is the - // response portion of a request-response sequence. At the time - // of writing, there are only two possible unilateral responses. - var unilateral = false; - for (var i = 0; i < unilateralTags.length; i++) { - var tag = unilateralTags[i]; - if (tag in obj) { - unilateral = tag; + if (unilateral) { + self.emit(unilateral, obj); + } else if (self.currentCommand) { + var cmd = self.currentCommand; + self.currentCommand = null; + if ('error' in obj) { + var error = new Error(obj.error); + error.watchmanResponse = obj; + cmd.cb(error); + } else { + cmd.cb(null, obj); + } } - } - if (unilateral) { - self.emit(unilateral, obj); - } else if (self.currentCommand) { - var cmd = self.currentCommand; - self.currentCommand = null; - if ('error' in obj) { - var error = new Error(obj.error); - error.watchmanResponse = obj; - cmd.cb(error); - } else { - cmd.cb(null, obj); + // See if we can dispatch the next queued command, if any + self.sendNextCommand(); + }); + self.bunser.on('error', function (err) { + self.emit('error', err); + }); + + self.socket = net.createConnection(sockname); + self.socket.on('connect', function () { + self.connecting = false; + self.emit('connect'); + self.sendNextCommand(); + }); + self.socket.on('error', function (err) { + self.connecting = false; + self.emit('error', err); + }); + self.socket.on('data', function (buf) { + if (self.bunser) { + self.bunser.append(buf); } + }); + self.socket.on('end', function () { + self.socket = null; + self.bunser = null; + self.cancelCommands('The watchman connection was closed'); + self.emit('end'); + }); + } + + // triggers will export the sock path to the environment. + // If we're invoked in such a way, we can simply pick up the + // definition from the environment and avoid having to fork off + // a process to figure it out + if (process.env.WATCHMAN_SOCK) { + makeSock(process.env.WATCHMAN_SOCK); + return; + } + + // We need to ask the client binary where to find it. + // This will cause the service to start for us if it isn't + // already running. + var args = ['--no-pretty', 'get-sockname']; + + // We use the more elaborate spawn rather than exec because there + // are some error cases on Windows where process spawning can hang. + // It is desirable to pipe stderr directly to stderr live so that + // we can discover the problem. + var proc = null; + var spawnFailed = false; + + function spawnError(error) { + if (spawnFailed) { + // For ENOENT, proc 'close' will also trigger with a negative code, + // let's suppress that second error. + return; } + spawnFailed = true; + if (error.code === 'EACCES' || error.errno === 'EACCES') { + error.message = + 'The Watchman CLI is installed but cannot ' + + 'be spawned because of a permission problem'; + } else if (error.code === 'ENOENT' || error.errno === 'ENOENT') { + error.message = + 'Watchman was not found in PATH. See ' + + 'https://facebook.github.io/watchman/docs/install.html ' + + 'for installation instructions'; + } + console.error('Watchman: ', error.message); + self.emit('error', error); + } - // See if we can dispatch the next queued command, if any - self.sendNextCommand(); - }); - self.bunser.on('error', function (err) { - self.emit('error', err); - }); + try { + proc = childProcess.spawn(this.watchmanBinaryPath, args, { + stdio: ['ignore', 'pipe', 'pipe'], + windowsHide: true, + }); + } catch (error) { + spawnError(error); + return; + } - self.socket = net.createConnection(sockname); - self.socket.on('connect', function () { - self.connecting = false; - self.emit('connect'); - self.sendNextCommand(); + var stdout = []; + var stderr = []; + proc.stdout.on('data', function (data) { + stdout.push(data); }); - self.socket.on('error', function (err) { - self.connecting = false; - self.emit('error', err); + proc.stderr.on('data', function (data) { + data = data.toString('utf8'); + stderr.push(data); + console.error(data); }); - self.socket.on('data', function (buf) { - if (self.bunser) { - self.bunser.append(buf); - } + proc.on('error', function (error) { + spawnError(error); }); - self.socket.on('end', function () { - self.socket = null; - self.bunser = null; - self.cancelCommands('The watchman connection was closed'); - self.emit('end'); + + proc.on('close', function (code, signal) { + if (code !== 0) { + spawnError( + new Error( + self.watchmanBinaryPath + + ' ' + + args.join(' ') + + ' returned with exit code=' + + code + + ', signal=' + + signal + + ', stderr= ' + + stderr.join(''), + ), + ); + return; + } + try { + var obj = JSON.parse(stdout.join('')); + if ('error' in obj) { + var error = new Error(obj.error); + error.watchmanResponse = obj; + self.emit('error', error); + return; + } + makeSock(obj.sockname); + } catch (e) { + self.emit('error', e); + } }); } - // triggers will export the sock path to the environment. - // If we're invoked in such a way, we can simply pick up the - // definition from the environment and avoid having to fork off - // a process to figure it out - if (process.env.WATCHMAN_SOCK) { - makeSock(process.env.WATCHMAN_SOCK); - return; - } + command(args, done) { + done = done || function () {}; - // We need to ask the client binary where to find it. - // This will cause the service to start for us if it isn't - // already running. - var args = ['--no-pretty', 'get-sockname']; - - // We use the more elaborate spawn rather than exec because there - // are some error cases on Windows where process spawning can hang. - // It is desirable to pipe stderr directly to stderr live so that - // we can discover the problem. - var proc = null; - var spawnFailed = false; - - function spawnError(error) { - if (spawnFailed) { - // For ENOENT, proc 'close' will also trigger with a negative code, - // let's suppress that second error. + // Queue up the command + this.commands.push({cmd: args, cb: done}); + + // Establish a connection if we don't already have one + if (!this.socket) { + if (!this.connecting) { + this.connecting = true; + this.connect(); + return; + } return; } - spawnFailed = true; - if (error.code === 'EACCES' || error.errno === 'EACCES') { - error.message = - 'The Watchman CLI is installed but cannot ' + - 'be spawned because of a permission problem'; - } else if (error.code === 'ENOENT' || error.errno === 'ENOENT') { - error.message = - 'Watchman was not found in PATH. See ' + - 'https://facebook.github.io/watchman/docs/install.html ' + - 'for installation instructions'; - } - console.error('Watchman: ', error.message); - self.emit('error', error); - } - try { - proc = childProcess.spawn(this.watchmanBinaryPath, args, { - stdio: ['ignore', 'pipe', 'pipe'], - windowsHide: true, - }); - } catch (error) { - spawnError(error); - return; + // If we're already connected and idle, try sending the command immediately + this.sendNextCommand(); } - var stdout = []; - var stderr = []; - proc.stdout.on('data', function (data) { - stdout.push(data); - }); - proc.stderr.on('data', function (data) { - data = data.toString('utf8'); - stderr.push(data); - console.error(data); - }); - proc.on('error', function (error) { - spawnError(error); - }); - - proc.on('close', function (code, signal) { - if (code !== 0) { - spawnError( - new Error( - self.watchmanBinaryPath + - ' ' + - args.join(' ') + - ' returned with exit code=' + - code + - ', signal=' + - signal + - ', stderr= ' + - stderr.join(''), - ), - ); - return; - } - try { - var obj = JSON.parse(stdout.join('')); - if ('error' in obj) { - var error = new Error(obj.error); - error.watchmanResponse = obj; - self.emit('error', error); - return; + // This is a helper that we expose for testing purposes + _synthesizeCapabilityCheck(resp, optional, required) { + resp.capabilities = {}; + var version = resp.version; + optional.forEach(function (name) { + resp.capabilities[name] = have_cap(version, name); + }); + required.forEach(function (name) { + var have = have_cap(version, name); + resp.capabilities[name] = have; + if (!have) { + resp.error = + 'client required capability `' + + name + + '` is not supported by this server'; } - makeSock(obj.sockname); - } catch (e) { - self.emit('error', e); - } - }); -}; - -Client.prototype.command = function (args, done) { - done = done || function () {}; + }); + return resp; + } - // Queue up the command - this.commands.push({cmd: args, cb: done}); + capabilityCheck(caps, done) { + var optional = caps.optional || []; + var required = caps.required || []; + var self = this; + this.command( + [ + 'version', + { + optional: optional, + required: required, + }, + ], + function (error, resp) { + if (error) { + done(error); + return; + } + if (!('capabilities' in resp)) { + // Server doesn't support capabilities, so we need to + // synthesize the results based on the version + resp = self._synthesizeCapabilityCheck(resp, optional, required); + if (resp.error) { + error = new Error(resp.error); + error.watchmanResponse = resp; + done(error); + return; + } + } + done(null, resp); + }, + ); + } - // Establish a connection if we don't already have one - if (!this.socket) { - if (!this.connecting) { - this.connecting = true; - this.connect(); - return; + // Close the connection to the service + end() { + this.cancelCommands('The client was ended'); + if (this.socket) { + this.socket.end(); + this.socket = null; } - return; + this.bunser = null; } - - // If we're already connected and idle, try sending the command immediately - this.sendNextCommand(); -}; +} var cap_versions = { 'cmd-watch-del-all': '3.1.1', @@ -283,69 +344,4 @@ function have_cap(vers, name) { return false; } -// This is a helper that we expose for testing purposes -Client.prototype._synthesizeCapabilityCheck = function ( - resp, - optional, - required, -) { - resp.capabilities = {}; - var version = resp.version; - optional.forEach(function (name) { - resp.capabilities[name] = have_cap(version, name); - }); - required.forEach(function (name) { - var have = have_cap(version, name); - resp.capabilities[name] = have; - if (!have) { - resp.error = - 'client required capability `' + - name + - '` is not supported by this server'; - } - }); - return resp; -}; - -Client.prototype.capabilityCheck = function (caps, done) { - var optional = caps.optional || []; - var required = caps.required || []; - var self = this; - this.command( - [ - 'version', - { - optional: optional, - required: required, - }, - ], - function (error, resp) { - if (error) { - done(error); - return; - } - if (!('capabilities' in resp)) { - // Server doesn't support capabilities, so we need to - // synthesize the results based on the version - resp = self._synthesizeCapabilityCheck(resp, optional, required); - if (resp.error) { - error = new Error(resp.error); - error.watchmanResponse = resp; - done(error); - return; - } - } - done(null, resp); - }, - ); -}; - -// Close the connection to the service -Client.prototype.end = function () { - this.cancelCommands('The client was ended'); - if (this.socket) { - this.socket.end(); - this.socket = null; - } - this.bunser = null; -}; +module.exports.Client = Client; From 63b8750f69d60c9f0e3723b84a0b8559e5603f45 Mon Sep 17 00:00:00 2001 From: Rob Hogan Date: Tue, 3 Dec 2024 12:02:55 -0800 Subject: [PATCH 7298/7387] Use arrow functions, avoid self = this, var => const/let Summary: Modernises this file a bit further by: - Preferring `const` (where possible) or `let` over `var`. - Preferring arrow functions (which don't have a `this` binding) in callbacks and utilities to obviate the need to capture the class instance as `self`. Reviewed By: huntie Differential Revision: D66600171 fbshipit-source-id: 0cb24c1918eaf25802d5acb1d7a4238cd38e2418 --- watchman/node/index.js | 144 ++++++++++++++++++++--------------------- 1 file changed, 69 insertions(+), 75 deletions(-) diff --git a/watchman/node/index.js b/watchman/node/index.js index 18c374ff904d..8c32a2b393df 100644 --- a/watchman/node/index.js +++ b/watchman/node/index.js @@ -9,13 +9,13 @@ 'use strict'; -var net = require('net'); -var EE = require('events').EventEmitter; -var childProcess = require('child_process'); -var bser = require('bser'); +const bser = require('bser'); +const childProcess = require('child_process'); +const {EventEmitter} = require('events'); +const net = require('net'); // We'll emit the responses to these when they get sent down to us -var unilateralTags = ['subscription', 'log']; +const unilateralTags = ['subscription', 'log']; /** * @param options An object with the following optional keys: @@ -23,10 +23,9 @@ var unilateralTags = ['subscription', 'log']; * If not provided, the Client locates the binary using the PATH specified * by the node child_process's default env. */ -class Client extends EE { +class Client extends EventEmitter { constructor(options) { super(); - const self = this; this.watchmanBinaryPath = 'watchman'; if (options && options.watchmanBinaryPath) { @@ -52,11 +51,11 @@ class Client extends EE { } cancelCommands(why) { - var error = new Error(why); + const error = new Error(why); // Steal all pending commands before we start cancellation, in // case something decides to schedule more commands - var cmds = this.commands; + const cmds = this.commands; this.commands = []; if (this.currentCommand) { @@ -65,37 +64,35 @@ class Client extends EE { } // Synthesize an error condition for any commands that were queued - cmds.forEach(function (cmd) { + cmds.forEach(cmd => { cmd.cb(error); }); } connect() { - var self = this; - - function makeSock(sockname) { + const makeSock = sockname => { // bunser will decode the watchman BSER protocol for us - self.bunser = new bser.BunserBuf(); + this.bunser = new bser.BunserBuf(); // For each decoded line: - self.bunser.on('value', function (obj) { + this.bunser.on('value', obj => { // Figure out if this is a unliteral response or if it is the // response portion of a request-response sequence. At the time // of writing, there are only two possible unilateral responses. - var unilateral = false; - for (var i = 0; i < unilateralTags.length; i++) { - var tag = unilateralTags[i]; + let unilateral = false; + for (let i = 0; i < unilateralTags.length; i++) { + const tag = unilateralTags[i]; if (tag in obj) { unilateral = tag; } } if (unilateral) { - self.emit(unilateral, obj); - } else if (self.currentCommand) { - var cmd = self.currentCommand; - self.currentCommand = null; + this.emit(unilateral, obj); + } else if (this.currentCommand) { + const cmd = this.currentCommand; + this.currentCommand = null; if ('error' in obj) { - var error = new Error(obj.error); + const error = new Error(obj.error); error.watchmanResponse = obj; cmd.cb(error); } else { @@ -104,34 +101,34 @@ class Client extends EE { } // See if we can dispatch the next queued command, if any - self.sendNextCommand(); + this.sendNextCommand(); }); - self.bunser.on('error', function (err) { - self.emit('error', err); + this.bunser.on('error', err => { + this.emit('error', err); }); - self.socket = net.createConnection(sockname); - self.socket.on('connect', function () { - self.connecting = false; - self.emit('connect'); - self.sendNextCommand(); + this.socket = net.createConnection(sockname); + this.socket.on('connect', () => { + this.connecting = false; + this.emit('connect'); + this.sendNextCommand(); }); - self.socket.on('error', function (err) { - self.connecting = false; - self.emit('error', err); + this.socket.on('error', err => { + this.connecting = false; + this.emit('error', err); }); - self.socket.on('data', function (buf) { - if (self.bunser) { - self.bunser.append(buf); + this.socket.on('data', buf => { + if (this.bunser) { + this.bunser.append(buf); } }); - self.socket.on('end', function () { - self.socket = null; - self.bunser = null; - self.cancelCommands('The watchman connection was closed'); - self.emit('end'); + this.socket.on('end', () => { + this.socket = null; + this.bunser = null; + this.cancelCommands('The watchman connection was closed'); + this.emit('end'); }); - } + }; // triggers will export the sock path to the environment. // If we're invoked in such a way, we can simply pick up the @@ -145,16 +142,16 @@ class Client extends EE { // We need to ask the client binary where to find it. // This will cause the service to start for us if it isn't // already running. - var args = ['--no-pretty', 'get-sockname']; + const args = ['--no-pretty', 'get-sockname']; // We use the more elaborate spawn rather than exec because there // are some error cases on Windows where process spawning can hang. // It is desirable to pipe stderr directly to stderr live so that // we can discover the problem. - var proc = null; - var spawnFailed = false; + let proc = null; + let spawnFailed = false; - function spawnError(error) { + const spawnError = error => { if (spawnFailed) { // For ENOENT, proc 'close' will also trigger with a negative code, // let's suppress that second error. @@ -172,8 +169,8 @@ class Client extends EE { 'for installation instructions'; } console.error('Watchman: ', error.message); - self.emit('error', error); - } + this.emit('error', error); + }; try { proc = childProcess.spawn(this.watchmanBinaryPath, args, { @@ -185,25 +182,25 @@ class Client extends EE { return; } - var stdout = []; - var stderr = []; - proc.stdout.on('data', function (data) { + const stdout = []; + const stderr = []; + proc.stdout.on('data', data => { stdout.push(data); }); - proc.stderr.on('data', function (data) { + proc.stderr.on('data', data => { data = data.toString('utf8'); stderr.push(data); console.error(data); }); - proc.on('error', function (error) { + proc.on('error', error => { spawnError(error); }); - proc.on('close', function (code, signal) { + proc.on('close', (code, signal) => { if (code !== 0) { spawnError( new Error( - self.watchmanBinaryPath + + this.watchmanBinaryPath + ' ' + args.join(' ') + ' returned with exit code=' + @@ -217,23 +214,21 @@ class Client extends EE { return; } try { - var obj = JSON.parse(stdout.join('')); + const obj = JSON.parse(stdout.join('')); if ('error' in obj) { - var error = new Error(obj.error); + const error = new Error(obj.error); error.watchmanResponse = obj; - self.emit('error', error); + this.emit('error', error); return; } makeSock(obj.sockname); } catch (e) { - self.emit('error', e); + this.emit('error', e); } }); } - command(args, done) { - done = done || function () {}; - + command(args, done = () => {}) { // Queue up the command this.commands.push({cmd: args, cb: done}); @@ -254,12 +249,12 @@ class Client extends EE { // This is a helper that we expose for testing purposes _synthesizeCapabilityCheck(resp, optional, required) { resp.capabilities = {}; - var version = resp.version; - optional.forEach(function (name) { + const version = resp.version; + optional.forEach(name => { resp.capabilities[name] = have_cap(version, name); }); - required.forEach(function (name) { - var have = have_cap(version, name); + required.forEach(name => { + const have = have_cap(version, name); resp.capabilities[name] = have; if (!have) { resp.error = @@ -272,9 +267,8 @@ class Client extends EE { } capabilityCheck(caps, done) { - var optional = caps.optional || []; - var required = caps.required || []; - var self = this; + const optional = caps.optional || []; + const required = caps.required || []; this.command( [ 'version', @@ -283,7 +277,7 @@ class Client extends EE { required: required, }, ], - function (error, resp) { + (error, resp) => { if (error) { done(error); return; @@ -291,7 +285,7 @@ class Client extends EE { if (!('capabilities' in resp)) { // Server doesn't support capabilities, so we need to // synthesize the results based on the version - resp = self._synthesizeCapabilityCheck(resp, optional, required); + resp = this._synthesizeCapabilityCheck(resp, optional, required); if (resp.error) { error = new Error(resp.error); error.watchmanResponse = resp; @@ -315,7 +309,7 @@ class Client extends EE { } } -var cap_versions = { +const cap_versions = { 'cmd-watch-del-all': '3.1.1', 'cmd-watch-project': '3.1', relative_root: '3.3', @@ -328,8 +322,8 @@ var cap_versions = { function vers_compare(a, b) { a = a.split('.'); b = b.split('.'); - for (var i = 0; i < 3; i++) { - var d = parseInt(a[i] || '0') - parseInt(b[i] || '0'); + for (let i = 0; i < 3; i++) { + const d = parseInt(a[i] || '0') - parseInt(b[i] || '0'); if (d != 0) { return d; } From 8923797f9144e21494bad25ae0fb5e693b28bc91 Mon Sep 17 00:00:00 2001 From: Rob Hogan Date: Tue, 3 Dec 2024 12:02:55 -0800 Subject: [PATCH 7299/7387] Add Flow comment types Summary: Adds Flow type checks `fb-watchman`'s `index.js`, making it easier to maintain and consume. Use comment syntax so that we can still publish this file directly, without a build step. Reviewed By: huntie Differential Revision: D66599994 fbshipit-source-id: 9574adc4b91e8c8e74e3654089fd60399188881e --- watchman/node/.flowconfig | 0 watchman/node/index.js | 118 +++++++++++++++++++++++++++----------- 2 files changed, 86 insertions(+), 32 deletions(-) create mode 100644 watchman/node/.flowconfig diff --git a/watchman/node/.flowconfig b/watchman/node/.flowconfig new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/watchman/node/index.js b/watchman/node/index.js index 8c32a2b393df..e654ec47063e 100644 --- a/watchman/node/index.js +++ b/watchman/node/index.js @@ -5,6 +5,7 @@ * LICENSE file in the root directory of this source tree. * * @format + * @flow */ 'use strict'; @@ -17,6 +18,35 @@ const net = require('net'); // We'll emit the responses to these when they get sent down to us const unilateralTags = ['subscription', 'log']; +/*:: +interface BunserBuf extends EventEmitter { + append(buf: Buffer): void; +} + +type Options = { + watchmanBinaryPath?: string, + ... +}; + +type Response = { + capabilities?: ?{[key: string]: boolean}, + version: string, + error?: string, + ... +}; + +type CommandCallback = (error: ?Error, result?: Response) => void; + +type Command = { + cb: CommandCallback, + cmd: mixed, +}; +*/ + +class WatchmanError extends Error { + watchmanResponse /*: mixed */; +} + /** * @param options An object with the following optional keys: * * 'watchmanBinaryPath' (string) Absolute path to the watchman binary. @@ -24,7 +54,14 @@ const unilateralTags = ['subscription', 'log']; * by the node child_process's default env. */ class Client extends EventEmitter { - constructor(options) { + bunser /*: ?BunserBuf */; + commands /*: Array */; + connecting /*: boolean */; + currentCommand /*: ?Command */; + socket /*: ?net.Socket */; + watchmanBinaryPath /*: string */; + + constructor(options /*: Options */) { super(); this.watchmanBinaryPath = 'watchman'; @@ -47,10 +84,17 @@ class Client extends EventEmitter { return; } - this.socket.write(bser.dumpToBuffer(this.currentCommand.cmd)); + if (this.socket) { + this.socket.write(bser.dumpToBuffer(this.currentCommand.cmd)); + } else { + this.emit( + 'error', + new Error('socket is null attempting to send command'), + ); + } } - cancelCommands(why) { + cancelCommands(why /*: string*/) { const error = new Error(why); // Steal all pending commands before we start cancellation, in @@ -70,15 +114,15 @@ class Client extends EventEmitter { } connect() { - const makeSock = sockname => { + const makeSock = (sockname /*:string*/) => { // bunser will decode the watchman BSER protocol for us - this.bunser = new bser.BunserBuf(); + const bunser = (this.bunser = new bser.BunserBuf()); // For each decoded line: - this.bunser.on('value', obj => { + bunser.on('value', obj => { // Figure out if this is a unliteral response or if it is the // response portion of a request-response sequence. At the time // of writing, there are only two possible unilateral responses. - let unilateral = false; + let unilateral /*: false | string */ = false; for (let i = 0; i < unilateralTags.length; i++) { const tag = unilateralTags[i]; if (tag in obj) { @@ -92,7 +136,7 @@ class Client extends EventEmitter { const cmd = this.currentCommand; this.currentCommand = null; if ('error' in obj) { - const error = new Error(obj.error); + const error = new WatchmanError(obj.error); error.watchmanResponse = obj; cmd.cb(error); } else { @@ -103,26 +147,26 @@ class Client extends EventEmitter { // See if we can dispatch the next queued command, if any this.sendNextCommand(); }); - this.bunser.on('error', err => { + bunser.on('error', err => { this.emit('error', err); }); - this.socket = net.createConnection(sockname); - this.socket.on('connect', () => { + const socket = (this.socket = net.createConnection(sockname)); + socket.on('connect', () => { this.connecting = false; this.emit('connect'); this.sendNextCommand(); }); - this.socket.on('error', err => { + socket.on('error', err => { this.connecting = false; this.emit('error', err); }); - this.socket.on('data', buf => { + socket.on('data', buf => { if (this.bunser) { this.bunser.append(buf); } }); - this.socket.on('end', () => { + socket.on('end', () => { this.socket = null; this.bunser = null; this.cancelCommands('The watchman connection was closed'); @@ -151,7 +195,9 @@ class Client extends EventEmitter { let proc = null; let spawnFailed = false; - const spawnError = error => { + const spawnError = ( + error /*: Error | {message: string, code?: string, errno?: string}*/, + ) => { if (spawnFailed) { // For ENOENT, proc 'close' will also trigger with a negative code, // let's suppress that second error. @@ -216,7 +262,7 @@ class Client extends EventEmitter { try { const obj = JSON.parse(stdout.join('')); if ('error' in obj) { - const error = new Error(obj.error); + const error = new WatchmanError(obj.error); error.watchmanResponse = obj; this.emit('error', error); return; @@ -228,7 +274,7 @@ class Client extends EventEmitter { }); } - command(args, done = () => {}) { + command(args /*: mixed*/, done /*: CommandCallback */ = () => {}) { // Queue up the command this.commands.push({cmd: args, cb: done}); @@ -247,15 +293,20 @@ class Client extends EventEmitter { } // This is a helper that we expose for testing purposes - _synthesizeCapabilityCheck(resp, optional, required) { - resp.capabilities = {}; + _synthesizeCapabilityCheck /*:: */( + resp /*: T */, + optional /*: $ReadOnlyArray */, + required /*: $ReadOnlyArray */, + ) /*: T & { error?: string, ...} */ { + const capabilities /*:{[key: string]: boolean} */ = (resp.capabilities = + {}); const version = resp.version; optional.forEach(name => { - resp.capabilities[name] = have_cap(version, name); + capabilities[name] = have_cap(version, name); }); required.forEach(name => { const have = have_cap(version, name); - resp.capabilities[name] = have; + capabilities[name] = have; if (!have) { resp.error = 'client required capability `' + @@ -266,7 +317,10 @@ class Client extends EventEmitter { return resp; } - capabilityCheck(caps, done) { + capabilityCheck( + caps /*: $ReadOnly<{optional?: $ReadOnlyArray, required?: $ReadOnlyArray, ...}>*/, + done /*: CommandCallback */, + ) { const optional = caps.optional || []; const required = caps.required || []; this.command( @@ -277,9 +331,9 @@ class Client extends EventEmitter { required: required, }, ], - (error, resp) => { - if (error) { - done(error); + (error, resp /*: ?Response */) => { + if (error || !resp) { + done(error || new Error('no watchman response')); return; } if (!('capabilities' in resp)) { @@ -287,7 +341,7 @@ class Client extends EventEmitter { // synthesize the results based on the version resp = this._synthesizeCapabilityCheck(resp, optional, required); if (resp.error) { - error = new Error(resp.error); + error = new WatchmanError(resp.error); error.watchmanResponse = resp; done(error); return; @@ -309,7 +363,7 @@ class Client extends EventEmitter { } } -const cap_versions = { +const cap_versions /*: $ReadOnly<{[key:string]: ?string}>*/ = { 'cmd-watch-del-all': '3.1.1', 'cmd-watch-project': '3.1', relative_root: '3.3', @@ -319,9 +373,9 @@ const cap_versions = { }; // Compares a vs b, returns < 0 if a < b, > 0 if b > b, 0 if a == b -function vers_compare(a, b) { - a = a.split('.'); - b = b.split('.'); +function vers_compare(aStr /*:string*/, bStr /*:string*/) { + const a = aStr.split('.'); + const b = bStr.split('.'); for (let i = 0; i < 3; i++) { const d = parseInt(a[i] || '0') - parseInt(b[i] || '0'); if (d != 0) { @@ -331,8 +385,8 @@ function vers_compare(a, b) { return 0; // Equal } -function have_cap(vers, name) { - if (name in cap_versions) { +function have_cap(vers /*:string */, name /*:string*/) { + if (cap_versions[name] != null) { return vers_compare(vers, cap_versions[name]) >= 0; } return false; From 562b62e64132a29b7a61f9d9adead41f4977369e Mon Sep 17 00:00:00 2001 From: John Elliott Date: Tue, 3 Dec 2024 15:43:11 -0800 Subject: [PATCH 7300/7387] Added root inclusion/exclusion params to changesSinceV2 Summary: # Context We are introducing EdenFS notifications to support scalable and ergonomic file system notifications for EdenFS mounts. # This Diff * Added optional includeVCSRoots flag to ChangesSinceV2Params * Added optional includedRoots list to ChangesSinceV2Params * Added optional excludedRoots list to ChangesSinceV2Params * Changed VCSDirectories config to be a vector to make it ordered * Added new buildIncludedAndExcludedRoots to construct the included and excluded roots - including VCS roorts * Updated isPathIncluded to use new included and excluded roots # Next Steps * Add suffix (extension) filters - inclusion and exclusion. * Investigate best performance data structures for modeling inclusion and exclusion path filters (Watchman uses a radix tree search). * Change the journal walking code to scan for position then walk forwards - current implemantion walks backward. * .t tests, Python integration tests, C++ unit tests # Discussion Points None Reviewed By: MichaelCuevas Differential Revision: D66685181 fbshipit-source-id: ba412e3009e66e88a8c7b117549226f4cb81d427 --- eden/fs/service/eden.thrift | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 78f6c25237b8..6b0837206dbf 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1908,11 +1908,11 @@ union ChangeNotification { * Return value of the changesSinceV2 API * * toPosition - a new journal poistion that indicates the next change - * that will occur in the future. Should be used in the next call to - * changesSinceV2 go get the next list of changes. + * that will occur in the future. Should be used in the next call to + * changesSinceV2 go get the next list of changes. * * changes - a list of all change notifications that have ocurred in - * within the given mount point since the provided journal position. + * within the given mount point since the provided journal position. */ struct ChangesSinceV2Result { 1: JournalPosition toPosition; @@ -1925,14 +1925,29 @@ struct ChangesSinceV2Result { * mountPoint - the EdenFS checkout to request changes about. * * fromPosition - the journal position used as the starting point to - * request changes since. Typically, fromPosition is the set to the - * toPostiion value returned in ChangesSinceV2Result. However, for - * the initial invocation of changesSinceV2, the caller can obtain - * the current journal position by calling getCurrentJournalPosition. + * request changes since. Typically, fromPosition is the set to the + * toPostiion value returned in ChangesSinceV2Result. However, for + * the initial invocation of changesSinceV2, the caller can obtain + * the current journal position by calling getCurrentJournalPosition. + * + * includeVCSRoots - optional flag indicating the VCS roots should be included + * in the returned results. By default, VCS roots will be excluded from + * results. + * + * includedRoots - optional list of roots to include in results. If not + * provided or an empty list, all roots will be included in results. + * Applied before roots are excluded - see excludedRoots. + * + * excludedRoots - optional ist of roots to exclude from results. If not + * provided or an empty list, no roots will be excluded from results. + * Applied after roots are included - see includedRoots. */ struct ChangesSinceV2Params { 1: PathString mountPoint; 2: JournalPosition fromPosition; + 3: optional bool includeVCSRoots; + 4: optional list includedRoots; + 5: optional list excludedRoots; } service EdenService extends fb303_core.BaseService { From d56f056687d6983d9d1f1a17bdd36da8d97dfa28 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Tue, 3 Dec 2024 18:01:58 -0800 Subject: [PATCH 7301/7387] reduce shipit fetcher update logs (#1081) Summary: Pull Request resolved: https://github.com/facebookincubator/zstrong/pull/1081 Reviewed By: bigfootjon Differential Revision: D66702321 fbshipit-source-id: 6b16249fb48357a452d82067fb6a468b5d10bc13 --- build/fbcode_builder/getdeps/fetcher.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/getdeps/fetcher.py b/build/fbcode_builder/getdeps/fetcher.py index ccc7d5e5180a..c769c118d1d3 100644 --- a/build/fbcode_builder/getdeps/fetcher.py +++ b/build/fbcode_builder/getdeps/fetcher.py @@ -366,10 +366,8 @@ def copy_if_different(src_name, dest_name) -> bool: if exc.errno != errno.ENOENT: raise target = os.readlink(src_name) - print("Symlinking %s -> %s" % (dest_name, target)) os.symlink(target, dest_name) else: - print("Copying %s -> %s" % (src_name, dest_name)) shutil.copy2(src_name, dest_name) return True @@ -474,7 +472,7 @@ def st_dev(path): raise Exception( "%s doesn't exist; check your sparse profile!" % dir_to_mirror ) - + update_count = 0 for root, dirs, files in os.walk(dir_to_mirror): dirs[:] = [d for d in dirs if root_dev == st_dev(os.path.join(root, d))] @@ -488,6 +486,13 @@ def st_dev(path): full_file_list.add(target_name) if copy_if_different(full_name, target_name): change_status.record_change(target_name) + if update_count < 10: + print("Updated %s -> %s" % (full_name, target_name)) + elif update_count == 10: + print("...") + update_count += 1 + if update_count: + print("Updated %s for %s" % (update_count, fbsource_subdir)) # Compare the list of previously shipped files; if a file is # in the old list but not the new list then it has been From c1b62ab1a44c6aeac21adc6fa0a691ead23e03f5 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 4 Dec 2024 11:53:56 -0800 Subject: [PATCH 7302/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/0558806265ce71ef6b8221b3a07beef78ebe5b63 https://github.com/facebook/fb303/commit/fa6d610ba55d994b9b801c701944e2695d43777d https://github.com/facebook/fbthrift/commit/54c8b2583fe45225a719204e681353f960e43489 https://github.com/facebook/folly/commit/935b5d07e041ba00ae1bc916cf025eeedad0390e https://github.com/facebook/mvfst/commit/3d240a399d4a77114d25c01480d1fcc9c86551fd https://github.com/facebook/proxygen/commit/994b741e06067f30684be35768e7eafe672e68a6 https://github.com/facebook/wangle/commit/868959fa37e6d7ee58deeead5fe7c0689b8051f0 https://github.com/facebookexperimental/edencommon/commit/c72728d9f2ee3e8c70178f809aa8080f0f9edce2 https://github.com/facebookexperimental/rust-shed/commit/3de121c2f7817fa38b4250eaaa150cf31ceb06d7 https://github.com/facebookincubator/facebook-pixel-for-wordpress/commit/a4faccfe3bfb5750c0d3fc2787f6795dccddad9d https://github.com/facebookincubator/fizz/commit/6df1caf233b6135fee4f7a182152d34efc94d195 Reviewed By: ckwalsh fbshipit-source-id: 621f1e796c93bbca53237b5ce894e3dee5006370 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 38b4626ea68a..2be0ad77ecc1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit fd6006066e1cfb0b5f55b196b2ec2fd0215d6b69 +Subproject commit 54c8b2583fe45225a719204e681353f960e43489 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 23b601fd4768..69e3012263f1 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b59298fd63cc9f5b31b85d3bfa3627578d3333fa +Subproject commit 935b5d07e041ba00ae1bc916cf025eeedad0390e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 78985838b607..a49914f87bca 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d4b543a8a1b2106d7a189e608347bab5f2d68f5d +Subproject commit 868959fa37e6d7ee58deeead5fe7c0689b8051f0 From d64186b4595011ce036be39b21926ff09382c5b1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 5 Dec 2024 09:42:41 -0800 Subject: [PATCH 7303/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/8b745afa59177e12c6e02f1bb2fc6f95e7656d1d https://github.com/facebook/fb303/commit/fe917b2e6adda55fe4f544af009f6cb917215dc0 https://github.com/facebook/fbthrift/commit/b906a1f75b07576d2dbf5daaada32b17b17e3015 https://github.com/facebook/folly/commit/d8d0aa423348156142f51c3bc742b2b7dc8b7909 https://github.com/facebook/mvfst/commit/426272d9be223820037bcd93ca7aef3a8ca324ee https://github.com/facebook/proxygen/commit/924fff065f7376473ba597f53345edd66a240cf6 https://github.com/facebook/wangle/commit/0cc11fbad16ffb75dd4b9c7780b00152b706726a https://github.com/facebookexperimental/edencommon/commit/620a28b549f3d2c517fc60293ecd78a34c06b1ee https://github.com/facebookexperimental/rust-shed/commit/f935985d8391f7ce4ed2418dfa22f890ee6847bc https://github.com/facebookincubator/facebook-pixel-for-wordpress/commit/fcb69b299dc66f35832f34ec64b872c5e0bf7858 https://github.com/facebookincubator/fizz/commit/3c202136bcc8fcc94ef2b45bd24548f08012da50 Reviewed By: bigfootjon fbshipit-source-id: e482344019f9e16a25f51038f8b7f4e523c95bb3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2be0ad77ecc1..08d3994b562e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 54c8b2583fe45225a719204e681353f960e43489 +Subproject commit b906a1f75b07576d2dbf5daaada32b17b17e3015 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 69e3012263f1..11d74ec5facb 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 935b5d07e041ba00ae1bc916cf025eeedad0390e +Subproject commit d8d0aa423348156142f51c3bc742b2b7dc8b7909 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a49914f87bca..1b8237f5bf10 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 868959fa37e6d7ee58deeead5fe7c0689b8051f0 +Subproject commit 0cc11fbad16ffb75dd4b9c7780b00152b706726a From 7270f5dfe6ed4e585969330f2f97322a721417b7 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Thu, 5 Dec 2024 14:41:06 -0800 Subject: [PATCH 7304/7387] jom (parallel nmake) build for openssl windows Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1084 openssl build on windows is slow due to nmake being single threaded fortunately the Qt developers had the same problem and produced jom - a nmake compatible make that adds the /j flag add a jom manifest and use it for the openssl build on windows Reviewed By: bigfootjon Differential Revision: D66818562 fbshipit-source-id: 88938dbc862da18ae7f75df51aa99bb669aae71a --- build/fbcode_builder/getdeps/builder.py | 14 +++++++++++--- build/fbcode_builder/manifests/jom | 15 +++++++++++++++ build/fbcode_builder/manifests/openssl | 1 + 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 build/fbcode_builder/manifests/jom diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 10bd2a62a62a..6bd5f526e7fb 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -1165,9 +1165,14 @@ def _build(self, reconfigure) -> None: perl = typing.cast(str, path_search(env, "perl", "perl")) make_j_args = [] + extra_args = [] if self.build_opts.is_windows(): - make = "nmake.exe" + # jom is compatible with nmake, adds the /j argument for parallel build + make = "jom.exe" + make_j_args = ["/j%s" % self.num_jobs] args = ["VC-WIN64A-masm", "-utf-8"] + # fixes "if multiple CL.EXE write to the same .PDB file, please use /FS" + extra_args = ["/FS"] elif self.build_opts.is_darwin(): make = "make" make_j_args = ["-j%s" % self.num_jobs] @@ -1200,11 +1205,14 @@ def _build(self, reconfigure) -> None: "no-unit-test", "no-tests", ] + + extra_args ) + # show the config produced + self._run_cmd([perl, "configdata.pm", "--dump"], env=env) make_build = [make] + make_j_args - self._run_cmd(make_build) + self._run_cmd(make_build, env=env) make_install = [make, "install_sw", "install_ssldirs"] - self._run_cmd(make_install) + self._run_cmd(make_install, env=env) class Boost(BuilderBase): diff --git a/build/fbcode_builder/manifests/jom b/build/fbcode_builder/manifests/jom new file mode 100644 index 000000000000..effecab67a16 --- /dev/null +++ b/build/fbcode_builder/manifests/jom @@ -0,0 +1,15 @@ +# jom is compatible with MSVC nmake, but adds the /j argment which +# speeds up openssl build a lot +[manifest] +name = jom + +# see https://download.qt.io/official_releases/jom/changelog.txt for latest version +[download.os=windows] +url = https://download.qt.io/official_releases/jom/jom_1_1_4.zip +sha256 = d533c1ef49214229681e90196ed2094691e8c4a0a0bef0b2c901debcb562682b + +[build.os=windows] +builder = nop + +[install.files.os=windows] +. = bin diff --git a/build/fbcode_builder/manifests/openssl b/build/fbcode_builder/manifests/openssl index 7dd40727cc2e..ebd680e7e1e6 100644 --- a/build/fbcode_builder/manifests/openssl +++ b/build/fbcode_builder/manifests/openssl @@ -31,4 +31,5 @@ builder = openssl subdir = openssl-3.0.15 [dependencies.os=windows] +jom perl From 2f2b01c8ca1717e8830e757307364d7f43e2c3a6 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Fri, 6 Dec 2024 01:30:06 -0800 Subject: [PATCH 7305/7387] speed up file copy on windows Summary: X-link: https://github.com/facebookincubator/fizz/pull/155 X-link: https://github.com/facebookincubator/zstrong/pull/1085 getdeps windows file copy is very slow, speed it up Reviewed By: bigfootjon Differential Revision: D66830544 fbshipit-source-id: 43213e258c71ae706bb059600619e276e7491a90 --- build/fbcode_builder/getdeps/builder.py | 5 ++- build/fbcode_builder/getdeps/cargo.py | 3 +- build/fbcode_builder/getdeps/copytree.py | 47 ++++++++++++++++-------- 3 files changed, 37 insertions(+), 18 deletions(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 6bd5f526e7fb..83916fde9472 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -18,6 +18,7 @@ from shlex import quote as shellquote from typing import Optional +from .copytree import simple_copytree from .dyndeps import create_dyn_dep_munger from .envfuncs import add_path_entry, Env, path_search from .fetcher import copy_if_different @@ -1329,7 +1330,7 @@ def build(self, reconfigure: bool) -> None: os.makedirs(dest_parent) if os.path.isdir(full_src): if not os.path.exists(full_dest): - shutil.copytree(full_src, full_dest) + simple_copytree(full_src, full_dest) else: shutil.copyfile(full_src, full_dest) shutil.copymode(full_src, full_dest) @@ -1341,7 +1342,7 @@ def build(self, reconfigure: bool) -> None: os.chmod(full_dest, st.st_mode | stat.S_IXUSR) else: if not os.path.exists(self.inst_dir): - shutil.copytree(self.src_dir, self.inst_dir) + simple_copytree(self.src_dir, self.inst_dir) class SqliteBuilder(BuilderBase): diff --git a/build/fbcode_builder/getdeps/cargo.py b/build/fbcode_builder/getdeps/cargo.py index 0e0e0ddfe0b9..5bb2ada85c2e 100644 --- a/build/fbcode_builder/getdeps/cargo.py +++ b/build/fbcode_builder/getdeps/cargo.py @@ -13,6 +13,7 @@ import typing from .builder import BuilderBase +from .copytree import simple_copytree if typing.TYPE_CHECKING: from .buildopts import BuildOptions @@ -79,7 +80,7 @@ def recreate_dir(self, src, dst) -> None: os.remove(dst) else: shutil.rmtree(dst) - shutil.copytree(src, dst) + simple_copytree(src, dst) def cargo_config_file(self): build_source_dir = self.build_dir diff --git a/build/fbcode_builder/getdeps/copytree.py b/build/fbcode_builder/getdeps/copytree.py index 2297bd3aa80a..6815f74c898e 100644 --- a/build/fbcode_builder/getdeps/copytree.py +++ b/build/fbcode_builder/getdeps/copytree.py @@ -10,6 +10,7 @@ import subprocess from .platform import is_windows +from .runcmd import run_cmd PREFETCHED_DIRS = set() @@ -65,18 +66,34 @@ def prefetch_dir_if_eden(dirpath) -> None: PREFETCHED_DIRS.add(dirpath) -# pyre-fixme[9]: ignore has type `bool`; used as `None`. -def copytree(src_dir, dest_dir, ignore: bool = None): - """Recursively copy the src_dir to the dest_dir, filtering - out entries using the ignore lambda. The behavior of the - ignore lambda must match that described by `shutil.copytree`. - This `copytree` function knows how to prefetch data when - running in an eden repo. - TODO: I'd like to either extend this or add a variant that - uses watchman to mirror src_dir into dest_dir. - """ - prefetch_dir_if_eden(src_dir) - # pyre-fixme[6]: For 3rd param expected - # `Union[typing.Callable[[Union[PathLike[str], str], List[str]], Iterable[str]], - # typing.Callable[[str, List[str]], Iterable[str]], None]` but got `bool`. - return shutil.copytree(src_dir, dest_dir, ignore=ignore) +def simple_copytree(src_dir, dest_dir, symlinks=False): + """A simple version of shutil.copytree() that can delegate to native tools if faster""" + if is_windows(): + os.makedirs(dest_dir, exist_ok=True) + cmd = [ + "robocopy.exe", + src_dir, + dest_dir, + # copy directories, including empty ones + "/E", + # Ignore Extra files in destination + "/XX", + # enable parallel copy + "/MT", + # be quiet + "/NFL", + "/NDL", + "/NJH", + "/NJS", + "/NP", + ] + if symlinks: + cmd.append("/SL") + # robocopy exits with code 1 if it copied ok, hence allow_fail + # https://learn.microsoft.com/en-us/troubleshoot/windows-server/backup-and-storage/return-codes-used-robocopy-utility + exit_code = run_cmd(cmd, allow_fail=True) + if exit_code > 1: + raise subprocess.CalledProcessError(exit_code, cmd) + return dest_dir + else: + return shutil.copytree(src_dir, dest_dir, symlinks=symlinks) From 453dd204574b6e475a514c1b527d33868c377861 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 6 Dec 2024 03:09:19 -0800 Subject: [PATCH 7306/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/30d75d2a154dbdaa06f3df516a7070ebd55395d9 https://github.com/facebook/fb303/commit/8410bcacebcc044b0263e2a85cb22ad6ba0d9711 https://github.com/facebook/fbthrift/commit/2ebb69d4f5b30baab32bfab24a0075eb257003a8 https://github.com/facebook/folly/commit/be79ab6d1dd4cf8e27e2019e3c13b994e598a6ab https://github.com/facebook/mvfst/commit/f3a41899157e952976c1f1e3def3c7a255c1b456 https://github.com/facebook/proxygen/commit/18fefedec8cc5d39fa887861ea33bc1cbb5e59d5 https://github.com/facebook/wangle/commit/570834446e1c02b4fe6ada984e93ca57da0aba8c https://github.com/facebookexperimental/edencommon/commit/154a5401349d23bca52f644741993b452a7164a9 https://github.com/facebookexperimental/rust-shed/commit/e83cd058cc3fb0df09d1194286ac87b80b34bfc8 https://github.com/facebookincubator/fizz/commit/e94ec2b99fcfea046ebbab91752a3449f750209c Reviewed By: ckwalsh fbshipit-source-id: 06229426bac78c2c4566e2791d784ab2ff2c0d50 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 08d3994b562e..d2c90167a624 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b906a1f75b07576d2dbf5daaada32b17b17e3015 +Subproject commit 2ebb69d4f5b30baab32bfab24a0075eb257003a8 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 11d74ec5facb..75ddfb84f3c1 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d8d0aa423348156142f51c3bc742b2b7dc8b7909 +Subproject commit be79ab6d1dd4cf8e27e2019e3c13b994e598a6ab diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1b8237f5bf10..2af0b5da14bd 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 0cc11fbad16ffb75dd4b9c7780b00152b706726a +Subproject commit 570834446e1c02b4fe6ada984e93ca57da0aba8c From 3f1f5b382c6baee743821c30bc7c2a07eb4a9c00 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 6 Dec 2024 09:36:04 -0800 Subject: [PATCH 7307/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/4f5f328378bf20925bf9c5b0e378fbb7e61fed2d https://github.com/facebook/fb303/commit/990b5c757960dcba7de0e47ed3de994e4eccd4f3 https://github.com/facebook/fbthrift/commit/e76a86270b847bd6e513b9eacc89644de88946b1 https://github.com/facebook/folly/commit/36e5c5bb55b80235e35550151c7bfe74ff9f65e2 https://github.com/facebook/mvfst/commit/f6c08c35e438cb68fba18747d0d8595bf619b6f8 https://github.com/facebook/proxygen/commit/f52587f0e5c2c93453ca4048b2fc0b61a38f72e8 https://github.com/facebook/wangle/commit/9744777571cd21bbb87fe3e9a0e8c6f10100a8ba https://github.com/facebookexperimental/edencommon/commit/ef3812943f80edcfad6e8b4122cf8f9638ee1573 https://github.com/facebookexperimental/rust-shed/commit/bc0a59ca6abeb18d1afbe589cfa1e3db7a359a1a https://github.com/facebookincubator/facebook-pixel-for-wordpress/commit/10a772c8970a5a40981444e613ef044f3e11b21d https://github.com/facebookincubator/fizz/commit/1bacf63cb85872b12f1afd88c33162f5c4b56aa0 Reviewed By: ckwalsh fbshipit-source-id: 905a14106a34a6d1d9ffdfa9660b86267b7a8696 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d2c90167a624..a07271209b1e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2ebb69d4f5b30baab32bfab24a0075eb257003a8 +Subproject commit e76a86270b847bd6e513b9eacc89644de88946b1 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 75ddfb84f3c1..7904ef0c2edf 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit be79ab6d1dd4cf8e27e2019e3c13b994e598a6ab +Subproject commit 36e5c5bb55b80235e35550151c7bfe74ff9f65e2 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2af0b5da14bd..060fa312ef53 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 570834446e1c02b4fe6ada984e93ca57da0aba8c +Subproject commit 9744777571cd21bbb87fe3e9a0e8c6f10100a8ba From d8e7897ff7cdf68ef79835df5a73c44dcccf7808 Mon Sep 17 00:00:00 2001 From: Thomas Polasek Date: Fri, 6 Dec 2024 10:37:02 -0800 Subject: [PATCH 7308/7387] Convert FBCODE to use the Ruff Formatter Summary: Converts the directory specified to use the Ruff formatter. This is the last big diff to convert all of Fbcode to Ruff. pomsky_fix_bugs drop-conflicts bypass-github-export-checks allow-large-files Reviewed By: amyreese Differential Revision: D66886610 fbshipit-source-id: 8276a7f6164efec189ca0b87e535543ed5bc3615 --- watchman/integration/eden/test_eden_glob_upper_bound.py | 6 ++++-- watchman/integration/eden/test_eden_unmount.py | 1 - watchman/integration/lib/path_utils.py | 1 - watchman/integration/test_dir_move.py | 1 - watchman/integration/test_path_generator.py | 8 ++++++-- watchman/python/tests/tests.py | 2 +- watchman/test/async/AsyncWatchmanTestCase.py | 1 - 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/watchman/integration/eden/test_eden_glob_upper_bound.py b/watchman/integration/eden/test_eden_glob_upper_bound.py index 0e7c7710b476..7c78a4c515c8 100644 --- a/watchman/integration/eden/test_eden_glob_upper_bound.py +++ b/watchman/integration/eden/test_eden_glob_upper_bound.py @@ -137,8 +137,10 @@ def test_eden_since_upper_bound_case_insensitive(self) -> None: ["mixedCASE/file1", "MIXEDcase/file2"], ) self.assertGlobUpperBound( - # We can't bound this query with a glob on a case-sensitive FS. - (None if self.isCaseSensitiveMount(root) else {"mixedcase/**"}) + ( + # We can't bound this query with a glob on a case-sensitive FS. + None if self.isCaseSensitiveMount(root) else {"mixedcase/**"} + ) ) def test_eden_since_upper_bound_includedotfiles(self) -> None: diff --git a/watchman/integration/eden/test_eden_unmount.py b/watchman/integration/eden/test_eden_unmount.py index d440412b3054..8f43acdfbc70 100644 --- a/watchman/integration/eden/test_eden_unmount.py +++ b/watchman/integration/eden/test_eden_unmount.py @@ -19,7 +19,6 @@ def populate(repo): class TestEdenUnmount(WatchmanEdenTestCase.WatchmanEdenTestCase): def test_eden_unmount(self) -> None: - root = self.makeEdenMount(populate) self.watchmanCommand("watch", root) diff --git a/watchman/integration/lib/path_utils.py b/watchman/integration/lib/path_utils.py index 9cff6576929d..bfca3a7af238 100644 --- a/watchman/integration/lib/path_utils.py +++ b/watchman/integration/lib/path_utils.py @@ -15,7 +15,6 @@ if os.name == "nt": def open_file_win(path): - create_file = ctypes.windll.kernel32.CreateFileW c_path = ctypes.create_unicode_buffer(path) diff --git a/watchman/integration/test_dir_move.py b/watchman/integration/test_dir_move.py index 07058c7ca44d..bf620d465ea5 100644 --- a/watchman/integration/test_dir_move.py +++ b/watchman/integration/test_dir_move.py @@ -17,7 +17,6 @@ @WatchmanTestCase.expand_matrix class TestDirMove(WatchmanTestCase.WatchmanTestCase): - # testing this is flaky at best on windows due to latency # and exclusivity of file handles, so skip it. def checkOSApplicability(self) -> None: diff --git a/watchman/integration/test_path_generator.py b/watchman/integration/test_path_generator.py index e5cbd05326ef..6761982e3ff0 100644 --- a/watchman/integration/test_path_generator.py +++ b/watchman/integration/test_path_generator.py @@ -48,7 +48,9 @@ def test_path_generator_case(self) -> None: self.assertFileListsEqual( self.watchmanCommand( - "query", root, {"fields": ["name"], "path": ["foo"]} # not Foo! + "query", + root, + {"fields": ["name"], "path": ["foo"]}, # not Foo! )["files"], [], message="Case insensitive matching not implemented \ @@ -89,7 +91,9 @@ def test_path_generator_relative_root(self) -> None: self.assertFileListsEqual( self.watchmanCommand( - "query", root, {"fields": ["name"], "path": ["foo"]} # not Foo! + "query", + root, + {"fields": ["name"], "path": ["foo"]}, # not Foo! )["files"], [], message="Case insensitive matching not implemented \ diff --git a/watchman/python/tests/tests.py b/watchman/python/tests/tests.py index a2e991fc2a07..5b2c4410fcdf 100755 --- a/watchman/python/tests/tests.py +++ b/watchman/python/tests/tests.py @@ -38,7 +38,7 @@ ) ) -PILE_OF_POO = "\U0001F4A9" +PILE_OF_POO = "\U0001f4a9" NON_UTF8_STRING = b"\xff\xff\xff" diff --git a/watchman/test/async/AsyncWatchmanTestCase.py b/watchman/test/async/AsyncWatchmanTestCase.py index ca63a8c23376..737a2fd0d6e7 100644 --- a/watchman/test/async/AsyncWatchmanTestCase.py +++ b/watchman/test/async/AsyncWatchmanTestCase.py @@ -43,7 +43,6 @@ def touch_relative(self, base, *fname): self.touch(fname, None) def watchman_command(self, *args): - task = asyncio.wait_for(self.client.query(*args), 10) return self.loop.run_until_complete(task) From ddc0c88032eacc162fceaf43e65b44ba68cbd36b Mon Sep 17 00:00:00 2001 From: Shitanshu Shah Date: Fri, 6 Dec 2024 22:16:27 -0800 Subject: [PATCH 7309/7387] Follow-up to earlier commit to change label to 8-core Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1086 Discussed with Opensource team further. 4-core-ubuntu-22.04 label does not work since it does not exist and runners can work only with the allocated list of labels. Opensource team has now added necessary label, is added for 8-core as requested. So, now making code change for good, hopefully! https://fb.workplace.com/groups/osssupport/permalink/27367197886235467/ Reviewed By: xiangxu1121 Differential Revision: D66487987 fbshipit-source-id: 62fa2b60b5613876aaa1f0c1a47dde8826746926 --- build/fbcode_builder/getdeps.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 5f66374f7d98..03a5f3c0430d 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -1021,6 +1021,8 @@ def write_job_for_platform(self, platform, args): # noqa: C901 if build_opts.is_linux(): artifacts = "linux" runs_on = f"ubuntu-{args.ubuntu_version}" + if args.cpu_cores: + runs_on = f"{args.cpu_cores}-core-ubuntu-{args.ubuntu_version}" elif build_opts.is_windows(): artifacts = "windows" runs_on = "windows-2019" @@ -1272,6 +1274,10 @@ def setup_project_cmd_parser(self, parser): parser.add_argument( "--ubuntu-version", default="22.04", help="Version of Ubuntu to use" ) + parser.add_argument( + "--cpu-cores", + help="Number of CPU cores to use (applicable for Linux OS)", + ) parser.add_argument( "--cron", help="Specify that the job runs on a cron schedule instead of on pushes", From b77c78e3793c4e4a8e32fd697e6b01f31c48429a Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 7 Dec 2024 09:34:13 -0800 Subject: [PATCH 7310/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/05c8216b700edaa6f18f29a889d3a8559e7326c5 https://github.com/facebook/fb303/commit/8f0cc2afb584a9009bdce2ba58e11a4fb4174306 https://github.com/facebook/fbthrift/commit/05f3cc5ca2999fbbf67c5485265bd038a2606dd7 https://github.com/facebook/folly/commit/3366269ef51cd14d162492814d367ced270144bd https://github.com/facebook/mvfst/commit/5cd8b2b6c877ce7892f1de0e369bee8810f73eb0 https://github.com/facebook/proxygen/commit/38454e0f22e62c38c0cf828353f9b68200c6dba2 https://github.com/facebook/wangle/commit/85e8d9bedea93305b483a55f47259a085440b569 https://github.com/facebookexperimental/edencommon/commit/14d0dfd804cfd714238e6bce0c28c5e275b43177 https://github.com/facebookexperimental/rust-shed/commit/1b1457af78e10e19b453f03efd6be2abf2567cff https://github.com/facebookincubator/fizz/commit/1273ae3546725b150f57973d2eaaf3bb61d7fcd9 Reviewed By: ckwalsh fbshipit-source-id: 5988ec02de56553a1be6fd34aeb954c673740109 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a07271209b1e..06b276a77f81 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e76a86270b847bd6e513b9eacc89644de88946b1 +Subproject commit 05f3cc5ca2999fbbf67c5485265bd038a2606dd7 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 7904ef0c2edf..06921ff0a022 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 36e5c5bb55b80235e35550151c7bfe74ff9f65e2 +Subproject commit 3366269ef51cd14d162492814d367ced270144bd diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 060fa312ef53..9c541ef481b1 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9744777571cd21bbb87fe3e9a0e8c6f10100a8ba +Subproject commit 85e8d9bedea93305b483a55f47259a085440b569 From 83a8597c6826f71d55960d78be05fcbb360f4e44 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 8 Dec 2024 09:35:55 -0800 Subject: [PATCH 7311/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/6cdd5e5cb0f4836b675223c7aa96acbb5b98599e https://github.com/facebook/fbthrift/commit/3c31cc43a1433c2b8e3e64265856ecb7597f58af https://github.com/facebook/mvfst/commit/b85079280d9b2ba1ac52b23a264a3aa6a26e45af https://github.com/facebook/proxygen/commit/58b7ba1f41adcb944b5b49712a2e1e3451fe974d https://github.com/facebook/wangle/commit/f230cd1c258ec4cba11329c3c467b4495afb843f https://github.com/facebookexperimental/edencommon/commit/d8c1a1cc3296bdb413c6bdf4b13771901047a18b https://github.com/facebookexperimental/rust-shed/commit/945b36f4ea1a62f2e0ea858497994572a71dc6e0 https://github.com/facebookincubator/fizz/commit/6448c39b70e6006cea7061094cdc3598097d4f46 Reviewed By: ckwalsh fbshipit-source-id: 7620f48fecc64e372288171c8cf5d5759672f090 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 06b276a77f81..2dfdcec64db4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 05f3cc5ca2999fbbf67c5485265bd038a2606dd7 +Subproject commit 3c31cc43a1433c2b8e3e64265856ecb7597f58af diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9c541ef481b1..6dd2673b7637 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 85e8d9bedea93305b483a55f47259a085440b569 +Subproject commit f230cd1c258ec4cba11329c3c467b4495afb843f From 9d5a37c6f63f7eeebc785be4de63da8952ea959d Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 9 Dec 2024 09:36:35 -0800 Subject: [PATCH 7312/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/97cd4b4f29fd9b93e45d60fe5c2a5a6762cec6ef https://github.com/facebook/fb303/commit/7d66d61c7bbbd6026454e68cd9255eab98320a94 https://github.com/facebook/fbthrift/commit/a8a40b1ac4c846b334762d90517b38905fb5a1e0 https://github.com/facebook/folly/commit/e270aa1727d89bb486d0f278d69ddfb4a51c5800 https://github.com/facebook/mvfst/commit/ba503c75144e95cc21c8b93050fe6d5519b4b5f1 https://github.com/facebook/proxygen/commit/56ae08716c1ab10812c84224190e32f47ed1f9ed https://github.com/facebook/wangle/commit/a82ca7045b6c352099209f96ee765f053a341ef5 https://github.com/facebookexperimental/rust-shed/commit/2a5fdd6814ef3b3c5eb25e1c85a96249fc54daeb Reviewed By: JurjenLelifeld fbshipit-source-id: 85a54d5b00baccc00cfa415b89ad57b36c3af415 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2dfdcec64db4..7df22181db6a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 3c31cc43a1433c2b8e3e64265856ecb7597f58af +Subproject commit a8a40b1ac4c846b334762d90517b38905fb5a1e0 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 06921ff0a022..37b3d6ccc82a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 3366269ef51cd14d162492814d367ced270144bd +Subproject commit e270aa1727d89bb486d0f278d69ddfb4a51c5800 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 6dd2673b7637..4d0eae17f9ec 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f230cd1c258ec4cba11329c3c467b4495afb843f +Subproject commit a82ca7045b6c352099209f96ee765f053a341ef5 From 05cdd23b039e92f699375ced4b3d8b7c16c6ad69 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 10 Dec 2024 09:33:37 -0800 Subject: [PATCH 7313/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/9d30891d75b0ca58c78a0f7346480a81b952daf4 https://github.com/facebook/fb303/commit/d830eff711d47c81907de360c14adc0938f2f475 https://github.com/facebook/fbthrift/commit/75f1db03b3c00da702fcb1e88748793196fc9981 https://github.com/facebook/folly/commit/44e3865ec6b0e87e1a60dcd0cbb84b1d2a40eb35 https://github.com/facebook/mvfst/commit/d3efad20939ab92c322dfe53b0776f9c6cb9d671 https://github.com/facebook/proxygen/commit/4dc71c5ce61630bc0988dd2eec085ee3d00f53cf https://github.com/facebook/wangle/commit/f3abd0524705debc62f7ef4d485f452be773cf3d https://github.com/facebookexperimental/edencommon/commit/d38b6be6759cf3e0ed1906016e313e9e97a439b0 https://github.com/facebookexperimental/rust-shed/commit/602be92f6a02ba7550dd9f211c938138ce153cb2 https://github.com/facebookincubator/fizz/commit/a52532eed12892a41e42c6b2366f51d07a5938bd Reviewed By: JurjenLelifeld fbshipit-source-id: 5a4c4ba3577d410cfbc47b694dd99d57fa9f139e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7df22181db6a..1670c8efdacc 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a8a40b1ac4c846b334762d90517b38905fb5a1e0 +Subproject commit 75f1db03b3c00da702fcb1e88748793196fc9981 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 37b3d6ccc82a..ddb8cf4dd3b1 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e270aa1727d89bb486d0f278d69ddfb4a51c5800 +Subproject commit 44e3865ec6b0e87e1a60dcd0cbb84b1d2a40eb35 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4d0eae17f9ec..aeba5077c738 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a82ca7045b6c352099209f96ee765f053a341ef5 +Subproject commit f3abd0524705debc62f7ef4d485f452be773cf3d From 52acaa4391ab7bc645ba45ebb7e5d2d1efa2c6b9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 11 Dec 2024 09:34:37 -0800 Subject: [PATCH 7314/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/262d198f0be8da0a599270cfa96f8510da61413a https://github.com/facebook/buck2-shims-meta/commit/ca687cb9c337a782b43471867fd2770b262b898f https://github.com/facebook/fb303/commit/011643331a3fffb59977218ccbaa735d60f85963 https://github.com/facebook/fbthrift/commit/e651ddb6765611508805825b02e6fb61fbc21329 https://github.com/facebook/folly/commit/abf77ba9340d7fb225c0a0fe6b355ca2a5652231 https://github.com/facebook/mvfst/commit/7255535c13dae67282f037cead7daa339304cb48 https://github.com/facebook/proxygen/commit/3664efacf300fab0f4fb736871ac698fe0651cae https://github.com/facebook/wangle/commit/c2544d3277464b1dc2a0ebe04caf682a885bf431 https://github.com/facebookexperimental/edencommon/commit/4ed8442a5e9a569efdb9cb42a9a72f81bc16e9a8 https://github.com/facebookexperimental/rust-shed/commit/8857c044bcf69d163f26869f3156ba304c5356c0 https://github.com/facebookincubator/facebook-pixel-for-wordpress/commit/10ce527a4d7eeb42a3ed7019b2a0e62af0c69531 https://github.com/facebookincubator/fizz/commit/680fbabdc45468ef60e633c2d90e3cbe16a4a1cb Reviewed By: JurjenLelifeld fbshipit-source-id: c19968a133fb14c8bc5756e6e90051204fc5c606 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1670c8efdacc..44652f69292d 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 75f1db03b3c00da702fcb1e88748793196fc9981 +Subproject commit e651ddb6765611508805825b02e6fb61fbc21329 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ddb8cf4dd3b1..d551787244fd 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 44e3865ec6b0e87e1a60dcd0cbb84b1d2a40eb35 +Subproject commit abf77ba9340d7fb225c0a0fe6b355ca2a5652231 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index aeba5077c738..1e4846da3e43 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f3abd0524705debc62f7ef4d485f452be773cf3d +Subproject commit c2544d3277464b1dc2a0ebe04caf682a885bf431 From 760541952c49975917b673cddb6c29c09d61c7a9 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 12 Dec 2024 09:35:05 -0800 Subject: [PATCH 7315/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/6c1818e8dd595d79d60428ca552c2be161ab0934 https://github.com/facebook/fb303/commit/f3589ff30c5674470419c0f97f47a9d2002b7f0f https://github.com/facebook/fbthrift/commit/0993c974a07cc47f0776007027a047344357203e https://github.com/facebook/folly/commit/e5ffaf604cdfc2ee3e6719bc9605843ac99b5c71 https://github.com/facebook/mvfst/commit/4dea55152c84e27645d30763c2bc26e89e40ee2d https://github.com/facebook/proxygen/commit/3ab47a2c3e6f0a1b88e5ed882e9c49f308bb2902 https://github.com/facebook/wangle/commit/93c3db7d28661292228acd633217e86dba2aa7ba https://github.com/facebookexperimental/edencommon/commit/82f537e7741ea53986e5feeaeefddf2872da446e https://github.com/facebookexperimental/rust-shed/commit/5200540ce3ecc759b67c2cb1bf09f1c4d5289ea5 https://github.com/facebookincubator/fizz/commit/7875ccf6838a89970f8c361bb9883c3d841cb126 Reviewed By: JurjenLelifeld fbshipit-source-id: d882ac329b29f05c308e22c37e336b25aeacd29b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 44652f69292d..c74087f9f633 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit e651ddb6765611508805825b02e6fb61fbc21329 +Subproject commit 0993c974a07cc47f0776007027a047344357203e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d551787244fd..055be3be77f2 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit abf77ba9340d7fb225c0a0fe6b355ca2a5652231 +Subproject commit e5ffaf604cdfc2ee3e6719bc9605843ac99b5c71 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1e4846da3e43..b2f7e110c2aa 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c2544d3277464b1dc2a0ebe04caf682a885bf431 +Subproject commit 93c3db7d28661292228acd633217e86dba2aa7ba From 81804c31ceda2a2288de52ebd8e556d3a077b379 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 13 Dec 2024 09:36:51 -0800 Subject: [PATCH 7316/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/bd95c36cef38d54a38264a2cbec2b8d611436749 https://github.com/facebook/fb303/commit/27d167eeb4fb27511edc40df97ef7b6b0a1a8254 https://github.com/facebook/fbthrift/commit/1ecfb2ff949c16997f029086fc62da92b36d9f30 https://github.com/facebook/folly/commit/62baa6ba07ff0a23ee4f2ea2f5207e4c88464deb https://github.com/facebook/mvfst/commit/842702b27b16773ff93a4c1c550871c21f975205 https://github.com/facebook/proxygen/commit/0ba72ed46968a7caf3a00baf489e5d9225302862 https://github.com/facebook/wangle/commit/a4a09691b18cefb84ab60fbfbb441d3bab4511b2 https://github.com/facebookexperimental/edencommon/commit/7aa805ee79f07370dbb9aea557b589166c2cafe4 https://github.com/facebookexperimental/rust-shed/commit/9cb7209940ede317e173dc8e82b124759df847a3 https://github.com/facebookincubator/fizz/commit/747d86557f746e44d2c1ad83b07954033c74c1c2 Reviewed By: JurjenLelifeld fbshipit-source-id: ac0eae249098bc079daaca3275d7aa7b9b56ad3a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c74087f9f633..46b52cf1e8c9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0993c974a07cc47f0776007027a047344357203e +Subproject commit 1ecfb2ff949c16997f029086fc62da92b36d9f30 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 055be3be77f2..fe074d617da9 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit e5ffaf604cdfc2ee3e6719bc9605843ac99b5c71 +Subproject commit 62baa6ba07ff0a23ee4f2ea2f5207e4c88464deb diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b2f7e110c2aa..ec770fa02108 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 93c3db7d28661292228acd633217e86dba2aa7ba +Subproject commit a4a09691b18cefb84ab60fbfbb441d3bab4511b2 From de8958ac79df368dcbe74f2d5a2514b3d92dfbd0 Mon Sep 17 00:00:00 2001 From: Simon Krueger Date: Fri, 13 Dec 2024 17:25:36 -0800 Subject: [PATCH 7317/7387] Remove facebook-hte-PortabilityInclude-{gtest,gmock} clang-tidy lints Summary: Remove facebook-hte-PortabilityInclude-{gtest,gmock} clang-tidy lints because they are no longer needed now that windows UCRT declares its own posix functions. Reviewed By: Jason-M-Fugate Differential Revision: D67056931 fbshipit-source-id: d57afba50577191c72b0cd07dc96a538e1ecc8c1 --- watchman/.clang-tidy | 2 -- 1 file changed, 2 deletions(-) diff --git a/watchman/.clang-tidy b/watchman/.clang-tidy index a761f4c64ae9..130299acf0d8 100644 --- a/watchman/.clang-tidy +++ b/watchman/.clang-tidy @@ -7,8 +7,6 @@ InheritParentConfig: true Checks: ' facebook-hte-PortabilityInclude-gflags/gflags.h, -facebook-hte-PortabilityInclude-gmock/gmock.h, -facebook-hte-PortabilityInclude-gtest/gtest.h, -facebook-hte-RelativeInclude, ' ... From 4b365b5da0786103f1eacbc2a874dba6750a686f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 14 Dec 2024 09:36:01 -0800 Subject: [PATCH 7318/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/851d3f09c452937fc5adef27e2c50f7f304f1646 https://github.com/facebook/buck2-shims-meta/commit/b74887e4e5d2042de64f429a348a6eb84c80f977 https://github.com/facebook/fb303/commit/85e3cc75c9d71d9142baf7ffa5c44e9157b2780c https://github.com/facebook/fbthrift/commit/8c09d666488e6c0eb961e2aa20b096763411ba2b https://github.com/facebook/folly/commit/d6c2c777fb81becc1865bd4ba12228ba68033b75 https://github.com/facebook/mvfst/commit/8242617c546bfb761390c495dccdc4dfe78ddeb9 https://github.com/facebook/proxygen/commit/7ed1d57bcf37fc0c32e0621b5aec3d0174de42ef https://github.com/facebook/wangle/commit/5f977132b3486a3ba6b5e02739316ae0b32f45d8 https://github.com/facebookexperimental/edencommon/commit/c880f31c71723a8ca0192276f5b1765871e37881 https://github.com/facebookexperimental/rust-shed/commit/e1c7e12a568a94f96a03484ed70259dd58183446 https://github.com/facebookincubator/fizz/commit/d869e77f2e81251b42b739a31dd81d2c5d696a1d Reviewed By: JurjenLelifeld fbshipit-source-id: 7001752fe3709ab6fcea8a50456b5d22d3e78ce2 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 46b52cf1e8c9..d0f0fb30f0f2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1ecfb2ff949c16997f029086fc62da92b36d9f30 +Subproject commit 8c09d666488e6c0eb961e2aa20b096763411ba2b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index fe074d617da9..cbab6168c57d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 62baa6ba07ff0a23ee4f2ea2f5207e4c88464deb +Subproject commit d6c2c777fb81becc1865bd4ba12228ba68033b75 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ec770fa02108..7bad8dbb9569 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a4a09691b18cefb84ab60fbfbb441d3bab4511b2 +Subproject commit 5f977132b3486a3ba6b5e02739316ae0b32f45d8 From 4d8e950555c20e6eff628a692c0ff79da06a240e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 15 Dec 2024 09:33:50 -0800 Subject: [PATCH 7319/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/591c6353794d72afa2a9adb6bd9cfbfe87654a8d https://github.com/facebook/fbthrift/commit/6b0b4c812dbd0c3c4254193c8ed9876c97590841 https://github.com/facebook/folly/commit/1acde9a87ebc110f06aae2d0ced136b00262bbe8 https://github.com/facebook/mvfst/commit/7899ed3340ce3f5f462c9aa5e206c440e203160c https://github.com/facebook/proxygen/commit/a0d9fda4dce0bb140b5689abd7bcb77584489e4d https://github.com/facebook/wangle/commit/2aad803c6866f95f6a0d6a30091a3d31c4819360 https://github.com/facebookexperimental/edencommon/commit/acaec873ea19d80b126bcf85988f3906e9457f2b https://github.com/facebookexperimental/rust-shed/commit/bf274fd34875399a976bb77ab540e5d49c83704c https://github.com/facebookincubator/fizz/commit/964ccaf6648e8d4d88eb27529fa8597268c48e4f Reviewed By: JurjenLelifeld fbshipit-source-id: 3de368826b835847d0a4e3022793a09c809aae44 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d0f0fb30f0f2..32e7e62fbfff 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8c09d666488e6c0eb961e2aa20b096763411ba2b +Subproject commit 6b0b4c812dbd0c3c4254193c8ed9876c97590841 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index cbab6168c57d..0e3ae88ea25f 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d6c2c777fb81becc1865bd4ba12228ba68033b75 +Subproject commit 1acde9a87ebc110f06aae2d0ced136b00262bbe8 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7bad8dbb9569..050363d536c3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5f977132b3486a3ba6b5e02739316ae0b32f45d8 +Subproject commit 2aad803c6866f95f6a0d6a30091a3d31c4819360 From 7d7a3f457e5755d8697e23a2d58f9ac0a54a28d1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 16 Dec 2024 09:35:51 -0800 Subject: [PATCH 7320/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/27ee7ffd2565834a61bb6e738ad1f6ec66787e3f https://github.com/facebook/fb303/commit/bd331a2bdcc1d37f2813e17b3e43678a1593257a https://github.com/facebook/fbthrift/commit/b00e4f58c14aac44de2bde10222d5af656d18203 https://github.com/facebook/folly/commit/132d899b9423526dfcfd205c749878f3d7905feb https://github.com/facebook/mvfst/commit/291284edef15ac543dd8b6d896b1ed3621d11bcb https://github.com/facebook/proxygen/commit/3633c7a0126aec03ee794e427a01d8c070f9df88 https://github.com/facebook/wangle/commit/8aa14491a3ee69c234b6d976072af55cd5bafaf2 https://github.com/facebookexperimental/edencommon/commit/72f60de058eb66ae3d840e5de0a5debf4e4cb72e https://github.com/facebookexperimental/rust-shed/commit/729b885a506de79eb0c4bdcf9c56c1aea501a8ac https://github.com/facebookincubator/fizz/commit/3b75fe88d6fd8fc16ed2e39da973a281a36a2b24 Reviewed By: bigfootjon fbshipit-source-id: cdd812f64bf72f2ae0b1090bc5db77f597620bb6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 32e7e62fbfff..8419e2bc5f5e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 6b0b4c812dbd0c3c4254193c8ed9876c97590841 +Subproject commit b00e4f58c14aac44de2bde10222d5af656d18203 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0e3ae88ea25f..0a86e1c7b4bf 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 1acde9a87ebc110f06aae2d0ced136b00262bbe8 +Subproject commit 132d899b9423526dfcfd205c749878f3d7905feb diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 050363d536c3..ad69d1255397 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2aad803c6866f95f6a0d6a30091a3d31c4819360 +Subproject commit 8aa14491a3ee69c234b6d976072af55cd5bafaf2 From 7fa0184143b82c40021511ccb8ffba08f5418c62 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 17 Dec 2024 09:36:38 -0800 Subject: [PATCH 7321/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/1bd21b2d4ed6edc272a57f72a70d346bda2124b6 https://github.com/facebook/buck2-shims-meta/commit/7e642459b7444c44fcdda109ce515ac4d23d428e https://github.com/facebook/fb303/commit/571ecc78b0246814291253f3c3a5b39768961231 https://github.com/facebook/fbthrift/commit/386acea2cf4e1c54c76e77e88abb98bdabf01d48 https://github.com/facebook/folly/commit/264b8b73a0ea6724782d5e7086a4da021995c2b7 https://github.com/facebook/mvfst/commit/1932fcee57bce1a90e461af287f0e8167db54c30 https://github.com/facebook/proxygen/commit/b6168bc67244f69bd3aa688786ef0b76964b9ac9 https://github.com/facebook/wangle/commit/f71e81cb38ee2927280f407766e7280c1dc3a256 https://github.com/facebookexperimental/edencommon/commit/d7e87717137fe53c98cc1a780d60dd73896b26c0 https://github.com/facebookexperimental/rust-shed/commit/01bb7f3761bc9857034234ec2e1eac3061d1c467 https://github.com/facebookincubator/facebook-pixel-for-wordpress/commit/583009c5484537ebddf48c3bb8cb0ff8740cc8fb https://github.com/facebookincubator/fizz/commit/b9f6a81e756493729eabce1a86576d1ad7bb4c53 Reviewed By: bigfootjon fbshipit-source-id: c296aadff0a3e095a854edf0f5d67d7a547f86bb --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8419e2bc5f5e..ae490995bbea 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b00e4f58c14aac44de2bde10222d5af656d18203 +Subproject commit 386acea2cf4e1c54c76e77e88abb98bdabf01d48 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 0a86e1c7b4bf..cc9c8fa88702 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 132d899b9423526dfcfd205c749878f3d7905feb +Subproject commit 264b8b73a0ea6724782d5e7086a4da021995c2b7 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ad69d1255397..8b1e0cfcc015 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 8aa14491a3ee69c234b6d976072af55cd5bafaf2 +Subproject commit f71e81cb38ee2927280f407766e7280c1dc3a256 From 5fd689fdd0c70d34e8e1beaf41ea0e63cc704412 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Tue, 17 Dec 2024 12:44:23 -0800 Subject: [PATCH 7322/7387] upgrade nix to 0.29.0 Summary: Enable more features that are disabled by default and update call sites. Reviewed By: opsound, jasonwhite Differential Revision: D66275420 fbshipit-source-id: 4969045de7751c7d16b6ed5c7411f04077eb0ddc --- watchman/cli/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index dc7558dae241..80a56c17f7f0 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -22,13 +22,13 @@ tokio = { version = "1.41.0", features = ["full", "test-util", "tracing"] } watchman_client = { version = "0.9.0", path = "../rust/watchman_client" } [target.'cfg(target_os = "linux")'.dependencies] -nix = "0.26.4" +nix = { version = "0.29.0", features = ["dir", "event", "hostname", "inotify", "ioctl", "mman", "mount", "net", "poll", "ptrace", "reboot", "resource", "sched", "term", "time", "user", "zerocopy"] } [target.'cfg(target_os = "macos")'.dependencies] -nix = "0.26.4" +nix = { version = "0.29.0", features = ["dir", "event", "hostname", "inotify", "ioctl", "mman", "mount", "net", "poll", "ptrace", "reboot", "resource", "sched", "term", "time", "user", "zerocopy"] } [target.'cfg(unix)'.dependencies] -nix = "0.26.4" +nix = { version = "0.29.0", features = ["dir", "event", "hostname", "inotify", "ioctl", "mman", "mount", "net", "poll", "ptrace", "reboot", "resource", "sched", "term", "time", "user", "zerocopy"] } [features] default = [] From ad6ed6406609c9ceb56dd48757b5cac2c93c6967 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 18 Dec 2024 09:34:30 -0800 Subject: [PATCH 7323/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/b6848d843c26ed4af80416031f5d434f59a2c2a1 https://github.com/facebook/fb303/commit/e2393b1676373ac53d097fc15c99c333d0f1a3f0 https://github.com/facebook/fbthrift/commit/1ee3bf9ecbdfc36d6d530bb1a7b9475877bceeb6 https://github.com/facebook/folly/commit/8a0687a616c028edaf90b2f8c6fc477d4bb938bd https://github.com/facebook/mvfst/commit/30df3f532a32db9fce16f1982bf749fc78272877 https://github.com/facebook/proxygen/commit/944b2078c3f213738b52dc768fac16ffca422bbe https://github.com/facebook/wangle/commit/a9b845957058c19e8aac66146f655b97a791ab52 https://github.com/facebookexperimental/edencommon/commit/669b623942d284a3987aff6e64da7b0c2fef69f0 https://github.com/facebookexperimental/rust-shed/commit/c81e6773a48626b937ddd2fe8edd707a7b8e5bd0 https://github.com/facebookincubator/fizz/commit/0e2074fe1c9fc77670c0c084cff50682f4390d25 Reviewed By: bigfootjon fbshipit-source-id: e50fc6db38d8c006c8b5a654e361f8620a8a0084 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ae490995bbea..96019fd129f2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 386acea2cf4e1c54c76e77e88abb98bdabf01d48 +Subproject commit 1ee3bf9ecbdfc36d6d530bb1a7b9475877bceeb6 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index cc9c8fa88702..65f44742b7e5 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 264b8b73a0ea6724782d5e7086a4da021995c2b7 +Subproject commit 8a0687a616c028edaf90b2f8c6fc477d4bb938bd diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 8b1e0cfcc015..107fa7ca5f20 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f71e81cb38ee2927280f407766e7280c1dc3a256 +Subproject commit a9b845957058c19e8aac66146f655b97a791ab52 From 98f850001b30d160fb319895cd3e20157b1214d3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 19 Dec 2024 09:35:51 -0800 Subject: [PATCH 7324/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/2b5a01cea823b80660cdd80108894ad9e25ffe2d https://github.com/facebook/fb303/commit/7dfdaf00e4f160410405b9d7f691eaa7f863daee https://github.com/facebook/fbthrift/commit/addb3d0de20e561b6193581a8cd6a6910455d50e https://github.com/facebook/folly/commit/ad12236877cd0e06b54c24d49df2eff9d268d71d https://github.com/facebook/mvfst/commit/a172fbfdc7133642b0f55c32c8c20050d7ac4d59 https://github.com/facebook/proxygen/commit/7dc494e7c46f72fbe110e032e64276c631b63fe0 https://github.com/facebook/wangle/commit/b8dfd8f8b1bfa2422683f9b8194b0832d1ca1a11 https://github.com/facebookexperimental/edencommon/commit/ea54f733691402d572deec0e9f2d8b9d8c3acb9e https://github.com/facebookexperimental/rust-shed/commit/184e80bff30b5d4717f50fe982b01f19be5cc3f6 https://github.com/facebookincubator/fizz/commit/af44b6ac6e066cfb7ef95fd59627349e1c1067a1 Reviewed By: bigfootjon fbshipit-source-id: a97180cf508fd7127d0189d11b298a0d6fe4e1b3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 96019fd129f2..14422b38311c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1ee3bf9ecbdfc36d6d530bb1a7b9475877bceeb6 +Subproject commit addb3d0de20e561b6193581a8cd6a6910455d50e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 65f44742b7e5..fbe83f920169 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 8a0687a616c028edaf90b2f8c6fc477d4bb938bd +Subproject commit ad12236877cd0e06b54c24d49df2eff9d268d71d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 107fa7ca5f20..cb57c4c0c92b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a9b845957058c19e8aac66146f655b97a791ab52 +Subproject commit b8dfd8f8b1bfa2422683f9b8194b0832d1ca1a11 From 3187346b149e0a6e8b08ec8e482beba1ffc1a350 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 20 Dec 2024 09:34:45 -0800 Subject: [PATCH 7325/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/6e8e562a3391312e45805fee407a123564f8ecbb https://github.com/facebook/fb303/commit/f863e5c033c4d3946fd19e17310b739b36594d04 https://github.com/facebook/fbthrift/commit/4662bb3dd9ff5cc4324e794e29509b8acb1c8a4b https://github.com/facebook/folly/commit/819b4c4d46a7d6447584e46a7eb0731297622acf https://github.com/facebook/mvfst/commit/d976163429c49c0d84d327a989e1a3585745e605 https://github.com/facebook/proxygen/commit/f03a4d5ae7510473a7d2be738a39a89cab2c444d https://github.com/facebook/wangle/commit/7beae5da9cc5293dd785dd424b5ad5f7d819c64b https://github.com/facebookexperimental/edencommon/commit/f6f881b84ab62dc1f1bfcc6650ca5364e8d86521 https://github.com/facebookexperimental/rust-shed/commit/24ff797a0de04e36436532098845a82d2dfd4503 https://github.com/facebookincubator/fizz/commit/e0042c4813da422be05dcd0c794cce6d4f45963a Reviewed By: bigfootjon fbshipit-source-id: ad6e0e8ea5e9b0859fd9b8e912cc4caf97f43cfd --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 14422b38311c..acb44cf511e6 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit addb3d0de20e561b6193581a8cd6a6910455d50e +Subproject commit 4662bb3dd9ff5cc4324e794e29509b8acb1c8a4b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index fbe83f920169..24cd2b417c39 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ad12236877cd0e06b54c24d49df2eff9d268d71d +Subproject commit 819b4c4d46a7d6447584e46a7eb0731297622acf diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index cb57c4c0c92b..05fc1ac31f3e 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b8dfd8f8b1bfa2422683f9b8194b0832d1ca1a11 +Subproject commit 7beae5da9cc5293dd785dd424b5ad5f7d819c64b From cd8f642719d9186112a547984c96e2de02aee05b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 21 Dec 2024 09:35:38 -0800 Subject: [PATCH 7326/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/4d6c19bf5f8540019f89b9c0bf0cfab7d9a400f9 https://github.com/facebook/fbthrift/commit/8c617d5c4e1cacb76c3d24fdc21d7b2e59f77bb5 https://github.com/facebook/folly/commit/10713ddc674b3f18a4a88c1da2656702d2c7526a https://github.com/facebook/mvfst/commit/0948f93c8d2fff469bb58ae8ee391e4ef1c058a3 https://github.com/facebook/proxygen/commit/8e05f706a5bc7505812e34af5fd3e1f0b15dea3a https://github.com/facebook/wangle/commit/ae5c7ba1d659ddce4f9f2c4435fe5ee6c024a364 https://github.com/facebookexperimental/edencommon/commit/e8f21e9d8fa4acd558ec735578280d74d67ccb33 https://github.com/facebookexperimental/rust-shed/commit/f6585ee84725b401828a0af4ae22d07c159bf80a https://github.com/facebookincubator/fizz/commit/73a0aca7ccdcc8cee80dabb3adbc134039510454 Reviewed By: ckwalsh fbshipit-source-id: 35fbd4941654da0387bf0c68eb48c53b24a63da5 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index acb44cf511e6..a8bea02ae0e4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 4662bb3dd9ff5cc4324e794e29509b8acb1c8a4b +Subproject commit 8c617d5c4e1cacb76c3d24fdc21d7b2e59f77bb5 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 24cd2b417c39..e1b26944e717 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 819b4c4d46a7d6447584e46a7eb0731297622acf +Subproject commit 10713ddc674b3f18a4a88c1da2656702d2c7526a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 05fc1ac31f3e..4ee5e9f3b24b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7beae5da9cc5293dd785dd424b5ad5f7d819c64b +Subproject commit ae5c7ba1d659ddce4f9f2c4435fe5ee6c024a364 From 43a2bebe5be64f08a893b2dee814e79e7140f896 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 22 Dec 2024 09:34:27 -0800 Subject: [PATCH 7327/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ecd70a94ad1ea0525935d772d69697088670bbdc https://github.com/facebook/fbthrift/commit/bbcb19a1aa07b99fd1395103bd24c5523a0aa8df https://github.com/facebook/mvfst/commit/227cd9eae60ade7445714f741f13e358054af962 https://github.com/facebook/proxygen/commit/0e13320de5d1f1b84845d9b39aedbe0bb3a193d4 https://github.com/facebook/wangle/commit/cbb4f0707ee0e5a4577a748d2afa627be9d3cb36 https://github.com/facebookexperimental/edencommon/commit/c4a0920a9c98c027ad2d4f7e0f061e40dcd1054c https://github.com/facebookexperimental/rust-shed/commit/927c754ce65f82884cd38b70e48569d73fcd81d5 https://github.com/facebookincubator/fizz/commit/707f9c2e46a6fe3aa19164b9098c8919e23ba9c3 Reviewed By: ckwalsh fbshipit-source-id: cd199a2c8e1c34e64b4d0c868e9b6c7b860d636a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a8bea02ae0e4..7fee62f024e4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8c617d5c4e1cacb76c3d24fdc21d7b2e59f77bb5 +Subproject commit bbcb19a1aa07b99fd1395103bd24c5523a0aa8df diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 4ee5e9f3b24b..0079946166a9 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ae5c7ba1d659ddce4f9f2c4435fe5ee6c024a364 +Subproject commit cbb4f0707ee0e5a4577a748d2afa627be9d3cb36 From 46d8587fc3c3fff76cd0297e124e0695e0fd4bca Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 23 Dec 2024 09:34:21 -0800 Subject: [PATCH 7328/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/9fb53da01fbf0d27395c6825b28f342aef71c653 https://github.com/facebook/fbthrift/commit/da6df76bbc48cd45d032711b0ee0b01ca38c275c https://github.com/facebook/mvfst/commit/8a08b8e607e70c0c430be16380f9400974d92214 https://github.com/facebook/proxygen/commit/82fcabe398c9dbc29693ad11601117ea813586e0 https://github.com/facebook/wangle/commit/b343999e124acbb04f996e7c32b6d4954181f794 https://github.com/facebookexperimental/rust-shed/commit/c30cdfbb2b8b978aff5c59d85155e13d31102c6f Reviewed By: ckwalsh fbshipit-source-id: f183d37b8fa37baab320a82817a23b128d8b3c65 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7fee62f024e4..d01d6d5e6709 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bbcb19a1aa07b99fd1395103bd24c5523a0aa8df +Subproject commit da6df76bbc48cd45d032711b0ee0b01ca38c275c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0079946166a9..18742e08f240 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit cbb4f0707ee0e5a4577a748d2afa627be9d3cb36 +Subproject commit b343999e124acbb04f996e7c32b6d4954181f794 From 32cbe3665e9d925a8689802404f7f915cdd54d92 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 24 Dec 2024 09:36:33 -0800 Subject: [PATCH 7329/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/6345e0bc13d0fba0b60dd3515f2f854c8cbd160b https://github.com/facebook/buck2-shims-meta/commit/e40bd231a5f6631e9c005502b04ee174af0462fa https://github.com/facebook/fb303/commit/202563c973c2daaa33e20087f9aa981b3b3a070e https://github.com/facebook/fbthrift/commit/50f38801ec38029b8f52a494de591d457e4310f4 https://github.com/facebook/mvfst/commit/2795a0d7604e64979f3cd0c406b8b3cbaf23d7d5 https://github.com/facebook/proxygen/commit/13ca9bf2f623cb0112342bf94730fea32fb68bef https://github.com/facebookexperimental/rust-shed/commit/4ec9f39b25ec3082031512129c53368ea507c4de Reviewed By: ckwalsh fbshipit-source-id: 2d612c527379c1690053b9e52a8072526f819ca9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d01d6d5e6709..847376ef4cb1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit da6df76bbc48cd45d032711b0ee0b01ca38c275c +Subproject commit 50f38801ec38029b8f52a494de591d457e4310f4 From 1bfcff72bccca4880a50af6a9539b949c4e6553b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 25 Dec 2024 09:34:38 -0800 Subject: [PATCH 7330/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-shims-meta/commit/5476ee7b2fc6e89f1dc625695c3457c42368e4d3 https://github.com/facebook/fb303/commit/10eda3e97b1bf5ba299353ffc48f31d9c742fdef https://github.com/facebook/fbthrift/commit/67546d1a37b30932cb3c7c0bd4f046a2202c2115 https://github.com/facebook/folly/commit/7a747a50a4e97c57973a77ff0a74eb9c0fa5bb38 https://github.com/facebook/mvfst/commit/686b40a7341234da1e0a8ac2f33815f839b55e02 https://github.com/facebook/proxygen/commit/036313a78d964d244538147c33e35d2b1dfbb831 https://github.com/facebook/wangle/commit/fa6a371fe788baee74e5fa791e90b24b24a1da49 https://github.com/facebookexperimental/rust-shed/commit/8dd14bf7c0aaf2ae68f63ba342a788d75c1984ec https://github.com/facebookincubator/fizz/commit/cd1db8a034efcce07a44eefd941ac061a2993c64 Reviewed By: ckwalsh fbshipit-source-id: a9901b0b829eecd71d3cfdff65ea6c131272e1c9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 847376ef4cb1..319706c80e2e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 50f38801ec38029b8f52a494de591d457e4310f4 +Subproject commit 67546d1a37b30932cb3c7c0bd4f046a2202c2115 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e1b26944e717..dcf6cb166d50 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 10713ddc674b3f18a4a88c1da2656702d2c7526a +Subproject commit 7a747a50a4e97c57973a77ff0a74eb9c0fa5bb38 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 18742e08f240..9c2114a4ec60 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b343999e124acbb04f996e7c32b6d4954181f794 +Subproject commit fa6a371fe788baee74e5fa791e90b24b24a1da49 From fd40fd3864a6d1e3c542ade53c89ca9e905c5752 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 26 Dec 2024 09:35:12 -0800 Subject: [PATCH 7331/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/64bdd771bbcccad080ed9074930dd467c20ce228 https://github.com/facebook/fbthrift/commit/b3faa6e263f4ed924d1c638ae2c99a18b8d4cde5 https://github.com/facebook/folly/commit/d83089f0858b20bc3035ee27e2b2b2a62230f3df https://github.com/facebook/mvfst/commit/57bf5ac97e9a9c347a781912b468909f600188d7 https://github.com/facebook/proxygen/commit/b93fda12e344ccf85f7e9edc9ec86c7dfb9b8394 https://github.com/facebook/wangle/commit/a2e96979043d202206edde1b1a54b1982947451c https://github.com/facebookexperimental/edencommon/commit/317a3fa3b63aeeac15f66c3f6100ae64ba5fced0 https://github.com/facebookexperimental/rust-shed/commit/e587961b3a6fbef7ee4ea381ce74f44539043266 https://github.com/facebookincubator/fizz/commit/aecd5c408ca1a6ae65234a0d0de9edc25dc46565 Reviewed By: ckwalsh fbshipit-source-id: 9599ea468448a3d4e2d386353edeba996900ae0f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 319706c80e2e..9ad40ffc4b1a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 67546d1a37b30932cb3c7c0bd4f046a2202c2115 +Subproject commit b3faa6e263f4ed924d1c638ae2c99a18b8d4cde5 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index dcf6cb166d50..443d592c4c3d 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7a747a50a4e97c57973a77ff0a74eb9c0fa5bb38 +Subproject commit d83089f0858b20bc3035ee27e2b2b2a62230f3df diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9c2114a4ec60..95fd244455bf 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit fa6a371fe788baee74e5fa791e90b24b24a1da49 +Subproject commit a2e96979043d202206edde1b1a54b1982947451c From b7858f79853e4d83978f87dec41e0c51581294ae Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 27 Dec 2024 09:39:12 -0800 Subject: [PATCH 7332/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/b4a778722dcd93853f773d5e0d1aaf6a49adb084 https://github.com/facebook/fb303/commit/06c4cc4a3884929053830ec9e0fe0a8b7abe2130 https://github.com/facebook/fbthrift/commit/a32053c4c0b54bae20d82de6e0d79a82075c8533 https://github.com/facebook/folly/commit/4dcc2ab6505712584afdfe658f002626c307d67c https://github.com/facebook/mvfst/commit/3eac9a6dc9e892711a35884288c7c6cfd8ae92a8 https://github.com/facebook/proxygen/commit/f4a21455c5baca2c1e92d7fb9da4535c794cab97 https://github.com/facebook/wangle/commit/2a45a757a9c6d1e1c4799f38b1456eface947611 https://github.com/facebookexperimental/edencommon/commit/336d8ad8cf1e72462e970753c242e55b33593f84 https://github.com/facebookexperimental/rust-shed/commit/3d01a497d801e6d38fb7ea6147971c947653ab4d https://github.com/facebookincubator/fizz/commit/76aad45bbc9a6f8fb0c2112b46dceae1af80ceeb Reviewed By: ajb85 fbshipit-source-id: 8569d24fc820f98d5f5d27f492185c585811ff1a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9ad40ffc4b1a..4bbac878fe57 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b3faa6e263f4ed924d1c638ae2c99a18b8d4cde5 +Subproject commit a32053c4c0b54bae20d82de6e0d79a82075c8533 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 443d592c4c3d..8f20b921e446 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit d83089f0858b20bc3035ee27e2b2b2a62230f3df +Subproject commit 4dcc2ab6505712584afdfe658f002626c307d67c diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 95fd244455bf..9c6fa1f5937a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a2e96979043d202206edde1b1a54b1982947451c +Subproject commit 2a45a757a9c6d1e1c4799f38b1456eface947611 From 13bf42ddd970a47eb69efb7ab7b6a2191fd4356c Mon Sep 17 00:00:00 2001 From: Pranav Bhandari Date: Fri, 27 Dec 2024 13:48:31 -0800 Subject: [PATCH 7333/7387] Migrate OSS build from custom to getdeps Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1098 We have been manually syncing our builds when there is a change in builds of our dependencies (folly, thrift). This has been one of the major source of work in OSS maintenance. Migrating to getdeps will automatically sync the dependencies which means we only have to manage our own builds. NOTE: There is a dependency of getdeps on zlib which requires us to first run sudo dnf install -y zlib-devel before we successfully run getdeps. I don't think this should affect the OSS build as it is a getdeps dependency. Reviewed By: haowu14 Differential Revision: D65844211 fbshipit-source-id: 8e89e670cdec4a21ca7aba48ae58b5b72ddbf832 --- build/fbcode_builder/manifests/cachelib | 38 ++++++++++++++++++++++++ build/fbcode_builder/manifests/numa | 13 ++++++++ build/fbcode_builder/manifests/sparsemap | 10 +++++++ 3 files changed, 61 insertions(+) create mode 100644 build/fbcode_builder/manifests/cachelib create mode 100644 build/fbcode_builder/manifests/numa create mode 100644 build/fbcode_builder/manifests/sparsemap diff --git a/build/fbcode_builder/manifests/cachelib b/build/fbcode_builder/manifests/cachelib new file mode 100644 index 000000000000..4f0c6dbf2757 --- /dev/null +++ b/build/fbcode_builder/manifests/cachelib @@ -0,0 +1,38 @@ +[manifest] +name = cachelib +fbsource_path = fbcode/cachelib +shipit_project = cachelib +shipit_fbcode_builder = true + +[git] +repo_url = https://github.com/facebook/cachelib.git + +[build] +builder = cmake +subdir = cachelib +job_weight_mib = 2048 + +[dependencies] +zlib +fizz +fmt +folly +fbthrift +googletest +sparsemap +wangle +zstd +mvfst +numa +# cachelib also depends on openssl but since the latter requires a platform- +# specific configuration we rely on the folly manifest to provide this +# dependency to avoid duplication. + +[shipit.pathmap] +fbcode/cachelib = cachelib +fbcode/cachelib/public_tld = . + +[shipit.strip] +^fbcode/cachelib/examples(/|$) +^fbcode/cachelib/facebook(/|$) +^fbcode/cachelib/public_tld/website/docs/facebook(/|$) diff --git a/build/fbcode_builder/manifests/numa b/build/fbcode_builder/manifests/numa new file mode 100644 index 000000000000..d57b8afabd9c --- /dev/null +++ b/build/fbcode_builder/manifests/numa @@ -0,0 +1,13 @@ +[manifest] +name = numa + +[download] +url = https://github.com/numactl/numactl/releases/download/v2.0.19/numactl-2.0.19.tar.gz +sha256 = f2672a0381cb59196e9c246bf8bcc43d5568bc457700a697f1a1df762b9af884 + +[build] +builder = autoconf +subdir = numactl-2.0.19 + +[rpms.distro=centos_stream] +numactl-devel diff --git a/build/fbcode_builder/manifests/sparsemap b/build/fbcode_builder/manifests/sparsemap new file mode 100644 index 000000000000..330b6439fca1 --- /dev/null +++ b/build/fbcode_builder/manifests/sparsemap @@ -0,0 +1,10 @@ +[manifest] +name = sparsemap + +[download] +url = https://github.com/Tessil/sparse-map/archive/refs/tags/v0.6.2.tar.gz +sha256 = 7020c21e8752e59d72e37456cd80000e18671c803890a3e55ae36b295eba99f6 + +[build] +builder = cmake +subdir = sparse-map-0.6.2/ From bd0ddabf3c71ea9dd4ea1792c45fb01912f38a0b Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 28 Dec 2024 09:35:33 -0800 Subject: [PATCH 7334/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/5b7690fc87c91bda27bf3743e52fd8702926d5b2 https://github.com/facebook/fb303/commit/7bae662ed80600c58c3e7ab775557ebf5a9bb87f https://github.com/facebook/fbthrift/commit/fe35c044ed4cdf5bbb8ac3dec60996b97cfeb6ef https://github.com/facebook/folly/commit/7fad06e3d1ce4e427ea68abca9e862cced07607a https://github.com/facebook/mvfst/commit/4e03dabb91d9d8b33fa5fb7979a106f66977d571 https://github.com/facebook/proxygen/commit/6b2dd9af5d3846b3a31fd6c3c0efd01976c36575 https://github.com/facebook/wangle/commit/c211074c8198a889b027f0fd128f72d7a660958c https://github.com/facebookexperimental/edencommon/commit/83710d26ae5f13e8995124d530a38dcbc1c9d30c https://github.com/facebookexperimental/rust-shed/commit/ab32c7180f179d9e182eb65b9099a6cb968b4954 https://github.com/facebookincubator/fizz/commit/a07c7a72740e733a917ae306294d76e2b40f65a5 Reviewed By: ajb85 fbshipit-source-id: a42b5c96dc14ba5dcdc043398ddb731dbdc79c07 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4bbac878fe57..b6e785ba4970 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a32053c4c0b54bae20d82de6e0d79a82075c8533 +Subproject commit fe35c044ed4cdf5bbb8ac3dec60996b97cfeb6ef diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8f20b921e446..3606e5b792b5 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 4dcc2ab6505712584afdfe658f002626c307d67c +Subproject commit 7fad06e3d1ce4e427ea68abca9e862cced07607a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9c6fa1f5937a..7c574795b5f3 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 2a45a757a9c6d1e1c4799f38b1456eface947611 +Subproject commit c211074c8198a889b027f0fd128f72d7a660958c From 9a7516524f562597bf476a8d754c6e99d928da94 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 29 Dec 2024 09:34:01 -0800 Subject: [PATCH 7335/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/2f4b7f276624df3612228961736863a6b75370cd https://github.com/facebook/fbthrift/commit/f1d7916bb2dd58203b45b4ac288b8982cac61436 https://github.com/facebook/mvfst/commit/02cf66de564ba0cefa0cc1c492010f2116710d0e https://github.com/facebook/proxygen/commit/6c34cb749150da46247f2c0ff408561f0d6389aa https://github.com/facebook/wangle/commit/667ab81877aa47dd4a893997edbe429deea59e7d https://github.com/facebookexperimental/edencommon/commit/aa3979b5a79dbffab950599120321488b27ec5eb https://github.com/facebookexperimental/rust-shed/commit/4e11205d96f0466c990b3610933af78606a9e463 https://github.com/facebookincubator/fizz/commit/916c9194f01cb3eb8027428581e3ed8a6221c1f2 Reviewed By: ajb85 fbshipit-source-id: ef3c89c08a21a3369f3420b45929c0636f9c0513 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b6e785ba4970..36fa7de9f8a1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit fe35c044ed4cdf5bbb8ac3dec60996b97cfeb6ef +Subproject commit f1d7916bb2dd58203b45b4ac288b8982cac61436 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 7c574795b5f3..470ea52f5bf7 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c211074c8198a889b027f0fd128f72d7a660958c +Subproject commit 667ab81877aa47dd4a893997edbe429deea59e7d From ce94b0e8df5d21221452a212187cd71c996e597c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 30 Dec 2024 09:35:37 -0800 Subject: [PATCH 7336/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ba55be567000fb8161c59dba893f20a1302c19d2 https://github.com/facebook/fbthrift/commit/0b9eb8d3981a50994b2510418cc30311d11bc4a7 https://github.com/facebook/mvfst/commit/86546b704c13c6281bed59c3be3f74451ef54b5c https://github.com/facebook/proxygen/commit/6ab4360f88ffa921dddf603a304139ee44873f7b https://github.com/facebook/wangle/commit/b9e121dcfb6b6257457391508a484c0e1f22b411 https://github.com/facebookexperimental/rust-shed/commit/3c5713f370317804d822dbdde552c3e79c5a52f4 Reviewed By: ajb85 fbshipit-source-id: eb15bc935135cc3fe0f802f6bc1a6330ffbd15f8 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 36fa7de9f8a1..7b93c917c58a 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f1d7916bb2dd58203b45b4ac288b8982cac61436 +Subproject commit 0b9eb8d3981a50994b2510418cc30311d11bc4a7 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 470ea52f5bf7..cce782f44479 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 667ab81877aa47dd4a893997edbe429deea59e7d +Subproject commit b9e121dcfb6b6257457391508a484c0e1f22b411 From 1f0df9f04c928fe07fa89fe172e3e454ef31dfa4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 31 Dec 2024 09:39:25 -0800 Subject: [PATCH 7337/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/eb8d4f7e5526caad92beb1e73457bc41b26b911a https://github.com/facebook/fbthrift/commit/ea577d502b6bfdbbcb7dc8207463c05d2dba887f https://github.com/facebook/proxygen/commit/ed4dfc18d53604c810a926c97076ff7cb6c3e59c https://github.com/facebookexperimental/rust-shed/commit/92a2ca365890cb274f0d66242d7bf015e692e44f Reviewed By: ajb85 fbshipit-source-id: 18528711e74e227d585dd498d4abbdc1c5648b76 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 7b93c917c58a..d3a5b8321825 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 0b9eb8d3981a50994b2510418cc30311d11bc4a7 +Subproject commit ea577d502b6bfdbbcb7dc8207463c05d2dba887f From af07e429c5a5f3cf210421bd711af4d269863d7e Mon Sep 17 00:00:00 2001 From: Chris Dinh Date: Thu, 2 Jan 2025 09:06:21 -0800 Subject: [PATCH 7338/7387] Add suffix support for Notifications Summary: # Context We are introducing EdenFS notifications to support scalable and ergonomic file system notifications for EdenFS mounts. # This Diff This diff introduces the concepts of included/excluded Suffixes to the getChangesV2 pipeline. The files returned from the API will always match any defined included suffixes, and never have any excluded suffixes. If a suffix is both included and excluded, then it is excluded. A suffix is defined as the substring that ends the string. As currently defined, a suffix could include content past the file extention, including the , eg for file.ext1.ext2, ex2, ext1.ext2, and file.ext1.ext2 are valid suffixes # Technical Details This diff creates the thrift definitions for the included/excluded suffix types # Discussion Points Reviewed By: jdelliot Differential Revision: D67613986 fbshipit-source-id: f18957a490d3095324d46046f57233bba92565aa --- eden/fs/service/eden.thrift | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 6b0837206dbf..ed38eaf96b29 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -1941,6 +1941,14 @@ struct ChangesSinceV2Result { * excludedRoots - optional ist of roots to exclude from results. If not * provided or an empty list, no roots will be excluded from results. * Applied after roots are included - see includedRoots. + * + * includedSuffixes - optional list of suffixes to include in results. If not + * provided or an empty list, all suffixes will be included in results. + * Applied before suffixes are excluded - see excludedSuffixes. + * + * excludedSuffixes - optional ist of suffixes to exclude from results. If not + * provided or an empty list, no suffixes will be excluded from results. + * Applied after suffixes are included - see includedSuffixes. */ struct ChangesSinceV2Params { 1: PathString mountPoint; @@ -1948,6 +1956,8 @@ struct ChangesSinceV2Params { 3: optional bool includeVCSRoots; 4: optional list includedRoots; 5: optional list excludedRoots; + 6: optional list includedSuffixes; + 7: optional list excludedSuffixes; } service EdenService extends fb303_core.BaseService { From f78b9fe0b6d2713264f3dc109dae477451ef711e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 2 Jan 2025 09:36:09 -0800 Subject: [PATCH 7339/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/d11a72de049a37b9b218a3ab8db33d3f97b9413c https://github.com/facebook/fbthrift/commit/a22442c4a1bd70ef8d71ea7e17bc595fc0481d45 https://github.com/facebook/folly/commit/13928647cc43264bdb8bbc67978b36d049083819 https://github.com/facebookexperimental/rust-shed/commit/61d5f207ffa9376d773dc2fe6360f51097007616 Reviewed By: ajb85 fbshipit-source-id: aba9df1752eb7a9a63852128f55a867183cf680e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d3a5b8321825..f8391915daf4 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ea577d502b6bfdbbcb7dc8207463c05d2dba887f +Subproject commit a22442c4a1bd70ef8d71ea7e17bc595fc0481d45 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 3606e5b792b5..ffd295ae0644 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7fad06e3d1ce4e427ea68abca9e862cced07607a +Subproject commit 13928647cc43264bdb8bbc67978b36d049083819 From 4515dc441048cc3b6a95bbe5738453b153cd57ed Mon Sep 17 00:00:00 2001 From: Paul Iatchenii Date: Fri, 3 Jan 2025 04:28:28 -0800 Subject: [PATCH 7340/7387] upgrade anyhow: 1.0.86 -> 1.0.95 Summary: Mainly due to the need to have [`Error::from_boxed`](https://docs.rs/anyhow/1.0.95/anyhow/struct.Error.html#method.from_boxed) and stop using less ergonomic alternatives. Thankfully, this API comes in the latest [1.0.95](https://github.com/dtolnay/anyhow/releases/tag/1.0.95) Reviewed By: dtolnay Differential Revision: D67775008 fbshipit-source-id: b9c0d3ff169dbb69d4c8b96e378334b37d200fd2 --- watchman/cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index 80a56c17f7f0..d785e9ff8f0c 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT" [dependencies] ahash = "0.8" -anyhow = "1.0.86" +anyhow = "1.0.95" duct = "0.13.6" jwalk = "0.6" serde = { version = "1.0.185", features = ["derive", "rc"] } From 22a9a4302ca924ed9465e5fec89922fa41bf19d7 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 3 Jan 2025 09:37:41 -0800 Subject: [PATCH 7341/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/857917c2298ae90e2e729acaaaca60d6c351c3cc https://github.com/facebook/buck2-shims-meta/commit/83ff4969ed0461c363f2e20077f01fcf5801119b https://github.com/facebook/fb303/commit/9a68b5b82a2829db63e844d563ebbee4ed59a2aa https://github.com/facebook/fbthrift/commit/02ab38972b961082010acdaab6c72628eb817303 https://github.com/facebook/folly/commit/25759e9e244f73f4f450b336c6905d069e406690 https://github.com/facebook/mvfst/commit/1724f61ccf96714f1a214841866998317a0d1d5f https://github.com/facebook/proxygen/commit/1da7dfab0b9805a3119e0bb6f2e23e7d0e2f3d78 https://github.com/facebook/wangle/commit/b257d471a179bd2d448bf5ed41e0f7a73c7859ac https://github.com/facebookexperimental/edencommon/commit/cee58776b95d38a310e0a789773a538f5641b1aa https://github.com/facebookexperimental/rust-shed/commit/78d6ad3fefb2c85aa5d65a279abee2f49f1c545d https://github.com/facebookincubator/fizz/commit/8b3f5162d1d58ae85f3d5d4ad0447dd669b92590 Reviewed By: ajb85 fbshipit-source-id: 756047b10603daea1492f9844cbca9505d79974e --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f8391915daf4..17caafa75356 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit a22442c4a1bd70ef8d71ea7e17bc595fc0481d45 +Subproject commit 02ab38972b961082010acdaab6c72628eb817303 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ffd295ae0644..d9b68de7e8ca 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 13928647cc43264bdb8bbc67978b36d049083819 +Subproject commit 25759e9e244f73f4f450b336c6905d069e406690 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index cce782f44479..68a63aa61f5f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b9e121dcfb6b6257457391508a484c0e1f22b411 +Subproject commit b257d471a179bd2d448bf5ed41e0f7a73c7859ac From cc4d869e9a5fda8af7de93cafb9dd800ebb478e3 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 4 Jan 2025 09:35:42 -0800 Subject: [PATCH 7342/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/f6d5eb44b04d0768356d97e412ff355f466d63ef https://github.com/facebook/fb303/commit/02f1d02bb3fc516e31bb786b68ffa6b2916b40c6 https://github.com/facebook/fbthrift/commit/1ccf70694ea9143952cc14a3921b325053889c04 https://github.com/facebook/folly/commit/b5650df8bc2d88472aa335a4ccebf6717e470994 https://github.com/facebook/mvfst/commit/ca032a4383b3d5d11e6320784ab662690e867020 https://github.com/facebook/proxygen/commit/80fbd5a91ed706adaf9bfc26287e40303b5f95b2 https://github.com/facebook/wangle/commit/9389b37c01fbc77841542ca1dcd4398820397bf1 https://github.com/facebookexperimental/edencommon/commit/af2e8a3371e9a09179d7f00617ddf1dff1453f32 https://github.com/facebookexperimental/rust-shed/commit/f03882a34a9dcadf57dc2790af3b6431abc8f963 https://github.com/facebookincubator/fizz/commit/dea388b438ca2f1b2f777e4dd8adb3dda136fc6e Reviewed By: ajb85 fbshipit-source-id: f7da6dfe747fc27b894d228e1432c3f90e911da3 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 17caafa75356..2394e53c4aac 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 02ab38972b961082010acdaab6c72628eb817303 +Subproject commit 1ccf70694ea9143952cc14a3921b325053889c04 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index d9b68de7e8ca..54ac2c5464de 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 25759e9e244f73f4f450b336c6905d069e406690 +Subproject commit b5650df8bc2d88472aa335a4ccebf6717e470994 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 68a63aa61f5f..1e0676a2d226 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b257d471a179bd2d448bf5ed41e0f7a73c7859ac +Subproject commit 9389b37c01fbc77841542ca1dcd4398820397bf1 From 6e416822c1ae48b2963adbba2912f74ac6074cd5 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 5 Jan 2025 09:37:28 -0800 Subject: [PATCH 7343/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/5a01c8180bdd3ee3aca5990f12d39b650f4e4412 https://github.com/facebook/fbthrift/commit/dd994f49c35aed4011fd8c4e3cda55f5e7e3545d https://github.com/facebook/folly/commit/7828768079d6876db2834bd75d7356757f88be86 https://github.com/facebook/mvfst/commit/c0d459abfe39e9818fe211d7074abcb5244c37ca https://github.com/facebook/proxygen/commit/fe3bdfe4ece5d65daa12e3296ac3695300adac96 https://github.com/facebook/wangle/commit/c89914e4269af73c379a96d5b3a4c3e8b7f5f4fb https://github.com/facebookexperimental/edencommon/commit/c4d142ff769f53d8b241ee630ee5195e221fd5ec https://github.com/facebookexperimental/rust-shed/commit/e76c806379071f5b0fc16e64de26d5824c88aa65 https://github.com/facebookincubator/fizz/commit/3879c421ac613b464834096028a13785d2eb3d41 Reviewed By: ajb85 fbshipit-source-id: 3d83805cd27a2a78a8251986966dc4665dabba78 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 2394e53c4aac..a87d69fec68e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 1ccf70694ea9143952cc14a3921b325053889c04 +Subproject commit dd994f49c35aed4011fd8c4e3cda55f5e7e3545d diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 54ac2c5464de..ee973d3d1d12 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b5650df8bc2d88472aa335a4ccebf6717e470994 +Subproject commit 7828768079d6876db2834bd75d7356757f88be86 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 1e0676a2d226..dba06f36ee8f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9389b37c01fbc77841542ca1dcd4398820397bf1 +Subproject commit c89914e4269af73c379a96d5b3a4c3e8b7f5f4fb From af2dcb0a1273c3d939f60593b412cc5d27acd66c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 6 Jan 2025 09:39:14 -0800 Subject: [PATCH 7344/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/6de11b858970a187fa5aafdc412e24dbbc24dae0 https://github.com/facebook/fbthrift/commit/36f7a80163b8d6bc386954d2a440b8d5559e1336 https://github.com/facebook/mvfst/commit/db8aa1644ade3300f144778c57c7562c346120e7 https://github.com/facebook/proxygen/commit/5a4f182efe13885aeb471d3b7c50334e01955bfa https://github.com/facebook/wangle/commit/d5721807caf3afe0638ff29803ecacc8e4b91f77 https://github.com/facebookexperimental/edencommon/commit/61ac45ceef6b1936b8dd100aa8f88287357a5472 https://github.com/facebookexperimental/rust-shed/commit/eff48fb338691f788026f747fac1c241ac1eda39 https://github.com/facebookincubator/fizz/commit/db3ee3ea0de4c18595c85609fa1ede5488a2f927 https://github.com/facebookresearch/mvdust3r/commit/60324038d659add40364a584727a735a47a3c18e Reviewed By: JurjenLelifeld fbshipit-source-id: b5c07bdbd66ae51ba32452a67b35928132f8fd98 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a87d69fec68e..c9c4b5ba4a38 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit dd994f49c35aed4011fd8c4e3cda55f5e7e3545d +Subproject commit 36f7a80163b8d6bc386954d2a440b8d5559e1336 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index dba06f36ee8f..0c69f23ae2ce 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit c89914e4269af73c379a96d5b3a4c3e8b7f5f4fb +Subproject commit d5721807caf3afe0638ff29803ecacc8e4b91f77 From d9d0e2aec6e963c5e483a517510a25733a856a53 Mon Sep 17 00:00:00 2001 From: Pranav Bhandari Date: Mon, 6 Jan 2025 10:49:37 -0800 Subject: [PATCH 7345/7387] Add libaio as a library Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1103 CacheLib OSS builds are failing because getdeps assumes libaio is already installed but for navy is a requirement for us to compile folly successfully. Reviewed By: fanzeyi Differential Revision: D67814070 fbshipit-source-id: 29d9b7038178bffa459fc7b983bf0eb7f3a86598 --- build/fbcode_builder/manifests/cachelib | 1 + build/fbcode_builder/manifests/libaio | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 build/fbcode_builder/manifests/libaio diff --git a/build/fbcode_builder/manifests/cachelib b/build/fbcode_builder/manifests/cachelib index 4f0c6dbf2757..c340a2bb5633 100644 --- a/build/fbcode_builder/manifests/cachelib +++ b/build/fbcode_builder/manifests/cachelib @@ -24,6 +24,7 @@ wangle zstd mvfst numa +libaio # cachelib also depends on openssl but since the latter requires a platform- # specific configuration we rely on the folly manifest to provide this # dependency to avoid duplication. diff --git a/build/fbcode_builder/manifests/libaio b/build/fbcode_builder/manifests/libaio new file mode 100644 index 000000000000..e35991923b36 --- /dev/null +++ b/build/fbcode_builder/manifests/libaio @@ -0,0 +1,8 @@ +[manifest] +name = libaio + +[debs] +libaio-dev + +[rpms.distro=centos_stream] +libaio-devel From 22b2c114c3f39bcd30f244cfdbd45d138444b29c Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Mon, 6 Jan 2025 11:16:30 -0800 Subject: [PATCH 7346/7387] regenerate github actions Summary: regenerate the github actions before making any real changes Reviewed By: bigfootjon Differential Revision: D67839617 fbshipit-source-id: 87dd1bf4e5923a85b9e2078f8c9144b1da0643dd --- .github/workflows/getdeps_windows.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/getdeps_windows.yml b/.github/workflows/getdeps_windows.yml index e31ae1b19056..df3f9e1f228e 100644 --- a/.github/workflows/getdeps_windows.yml +++ b/.github/workflows/getdeps_windows.yml @@ -65,6 +65,8 @@ jobs: run: python build/fbcode_builder/getdeps.py fetch --no-tests pcre2 - name: Fetch python-setuptools run: python build/fbcode_builder/getdeps.py fetch --no-tests python-setuptools + - name: Fetch jom + run: python build/fbcode_builder/getdeps.py fetch --no-tests jom - name: Fetch perl run: python build/fbcode_builder/getdeps.py fetch --no-tests perl - name: Fetch openssl @@ -125,6 +127,8 @@ jobs: run: python build/fbcode_builder/getdeps.py build --no-tests pcre2 - name: Build python-setuptools run: python build/fbcode_builder/getdeps.py build --no-tests python-setuptools + - name: Build jom + run: python build/fbcode_builder/getdeps.py build --no-tests jom - name: Build perl run: python build/fbcode_builder/getdeps.py build --no-tests perl - name: Build openssl From d45fbbf8931e78eaaf7a1db8249a5111e2afc1ef Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Mon, 6 Jan 2025 11:16:30 -0800 Subject: [PATCH 7347/7387] skip unnecessary github actions steps Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1100 Update generated github actions to only run the fetch and and build steps when there are sources expected for a manifest For local github actions testing using `act` this speeds up the test runs, and in real github CI it makes it clearer which steps are actually doing something on the given runner (we don't know exactly what it has installed beforehand) Also set the windows git config the same as on internal CI Reviewed By: bigfootjon Differential Revision: D67839708 fbshipit-source-id: 0a60c6fc89e8c6abb2464f879459aa23d5aec969 --- .github/workflows/getdeps_linux.yml | 85 +++++++++++++++++- .github/workflows/getdeps_mac.yml | 69 +++++++++++++++ .github/workflows/getdeps_windows.yml | 74 +++++++++++++++- build/fbcode_builder/getdeps.py | 111 ++++++++++++++++-------- build/fbcode_builder/getdeps/fetcher.py | 4 +- 5 files changed, 302 insertions(+), 41 deletions(-) diff --git a/.github/workflows/getdeps_linux.yml b/.github/workflows/getdeps_linux.yml index f0987aa55c68..2309ad3b86a0 100644 --- a/.github/workflows/getdeps_linux.yml +++ b/.github/workflows/getdeps_linux.yml @@ -21,166 +21,245 @@ jobs: - name: Update system package info run: sudo apt-get update - name: Install system deps - run: sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive watchman - - name: Install packaging system deps - run: sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive patchelf + run: sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive watchman && sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive patchelf + - id: paths + name: Query paths + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages query-paths --recursive --src-dir=. watchman >> "$GITHUB_OUTPUT" - name: Install Rust Stable uses: dtolnay/rust-toolchain@stable - name: Fetch boost + if: ${{ steps.paths.outputs.boost_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests boost - name: Fetch ninja + if: ${{ steps.paths.outputs.ninja_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests ninja - name: Fetch cmake + if: ${{ steps.paths.outputs.cmake_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests cmake - name: Fetch cpptoml + if: ${{ steps.paths.outputs.cpptoml_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests cpptoml - name: Fetch fmt + if: ${{ steps.paths.outputs.fmt_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fmt - name: Fetch gflags + if: ${{ steps.paths.outputs.gflags_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests gflags - name: Fetch glog + if: ${{ steps.paths.outputs.glog_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests glog - name: Fetch googletest + if: ${{ steps.paths.outputs.googletest_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests googletest - name: Fetch xxhash + if: ${{ steps.paths.outputs.xxhash_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests xxhash - name: Fetch zstd + if: ${{ steps.paths.outputs.zstd_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests zstd - name: Fetch double-conversion + if: ${{ steps.paths.outputs.double-conversion_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests double-conversion - name: Fetch fast_float + if: ${{ steps.paths.outputs.fast_float_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fast_float - name: Fetch libdwarf + if: ${{ steps.paths.outputs.libdwarf_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libdwarf - name: Fetch libevent + if: ${{ steps.paths.outputs.libevent_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libevent - name: Fetch lz4 + if: ${{ steps.paths.outputs.lz4_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests lz4 - name: Fetch snappy + if: ${{ steps.paths.outputs.snappy_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests snappy - name: Fetch pcre2 + if: ${{ steps.paths.outputs.pcre2_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests pcre2 - name: Fetch python-setuptools + if: ${{ steps.paths.outputs.python-setuptools_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests python-setuptools - name: Fetch zlib + if: ${{ steps.paths.outputs.zlib_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests zlib - name: Fetch bz2 + if: ${{ steps.paths.outputs.bz2_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests bz2 - name: Fetch openssl + if: ${{ steps.paths.outputs.openssl_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests openssl - name: Fetch liboqs + if: ${{ steps.paths.outputs.liboqs_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests liboqs - name: Fetch autoconf + if: ${{ steps.paths.outputs.autoconf_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests autoconf - name: Fetch automake + if: ${{ steps.paths.outputs.automake_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests automake - name: Fetch libtool + if: ${{ steps.paths.outputs.libtool_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libtool - name: Fetch libsodium + if: ${{ steps.paths.outputs.libsodium_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libsodium - name: Fetch libiberty + if: ${{ steps.paths.outputs.libiberty_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libiberty - name: Fetch libunwind + if: ${{ steps.paths.outputs.libunwind_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libunwind - name: Fetch xz + if: ${{ steps.paths.outputs.xz_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests xz - name: Fetch folly + if: ${{ steps.paths.outputs.folly_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests folly - name: Fetch fizz + if: ${{ steps.paths.outputs.fizz_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fizz - name: Fetch mvfst + if: ${{ steps.paths.outputs.mvfst_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests mvfst - name: Fetch libffi + if: ${{ steps.paths.outputs.libffi_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libffi - name: Fetch ncurses + if: ${{ steps.paths.outputs.ncurses_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests ncurses - name: Fetch python + if: ${{ steps.paths.outputs.python_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests python - name: Fetch wangle + if: ${{ steps.paths.outputs.wangle_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests wangle - name: Fetch fbthrift + if: ${{ steps.paths.outputs.fbthrift_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fbthrift - name: Fetch fb303 + if: ${{ steps.paths.outputs.fb303_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fb303 - name: Fetch edencommon + if: ${{ steps.paths.outputs.edencommon_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests edencommon - name: Build boost + if: ${{ steps.paths.outputs.boost_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests boost - name: Build ninja + if: ${{ steps.paths.outputs.ninja_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests ninja - name: Build cmake + if: ${{ steps.paths.outputs.cmake_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests cmake - name: Build cpptoml + if: ${{ steps.paths.outputs.cpptoml_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests cpptoml - name: Build fmt + if: ${{ steps.paths.outputs.fmt_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fmt - name: Build gflags + if: ${{ steps.paths.outputs.gflags_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests gflags - name: Build glog + if: ${{ steps.paths.outputs.glog_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests glog - name: Build googletest + if: ${{ steps.paths.outputs.googletest_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests googletest - name: Build xxhash + if: ${{ steps.paths.outputs.xxhash_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests xxhash - name: Build zstd + if: ${{ steps.paths.outputs.zstd_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests zstd - name: Build double-conversion + if: ${{ steps.paths.outputs.double-conversion_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests double-conversion - name: Build fast_float + if: ${{ steps.paths.outputs.fast_float_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fast_float - name: Build libdwarf + if: ${{ steps.paths.outputs.libdwarf_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libdwarf - name: Build libevent + if: ${{ steps.paths.outputs.libevent_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libevent - name: Build lz4 + if: ${{ steps.paths.outputs.lz4_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests lz4 - name: Build snappy + if: ${{ steps.paths.outputs.snappy_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests snappy - name: Build pcre2 + if: ${{ steps.paths.outputs.pcre2_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests pcre2 - name: Build python-setuptools + if: ${{ steps.paths.outputs.python-setuptools_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests python-setuptools - name: Build zlib + if: ${{ steps.paths.outputs.zlib_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests zlib - name: Build bz2 + if: ${{ steps.paths.outputs.bz2_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests bz2 - name: Build openssl + if: ${{ steps.paths.outputs.openssl_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests openssl - name: Build liboqs + if: ${{ steps.paths.outputs.liboqs_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests liboqs - name: Build autoconf + if: ${{ steps.paths.outputs.autoconf_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests autoconf - name: Build automake + if: ${{ steps.paths.outputs.automake_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests automake - name: Build libtool + if: ${{ steps.paths.outputs.libtool_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libtool - name: Build libsodium + if: ${{ steps.paths.outputs.libsodium_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libsodium - name: Build libiberty + if: ${{ steps.paths.outputs.libiberty_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libiberty - name: Build libunwind + if: ${{ steps.paths.outputs.libunwind_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libunwind - name: Build xz + if: ${{ steps.paths.outputs.xz_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests xz - name: Build folly + if: ${{ steps.paths.outputs.folly_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests folly - name: Build fizz + if: ${{ steps.paths.outputs.fizz_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fizz - name: Build mvfst + if: ${{ steps.paths.outputs.mvfst_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests mvfst - name: Build libffi + if: ${{ steps.paths.outputs.libffi_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libffi - name: Build ncurses + if: ${{ steps.paths.outputs.ncurses_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests ncurses - name: Build python + if: ${{ steps.paths.outputs.python_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests python - name: Build wangle + if: ${{ steps.paths.outputs.wangle_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests wangle - name: Build fbthrift + if: ${{ steps.paths.outputs.fbthrift_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fbthrift - name: Build fb303 + if: ${{ steps.paths.outputs.fb303_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fb303 - name: Build edencommon + if: ${{ steps.paths.outputs.edencommon_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests edencommon - name: Build watchman run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --src-dir=. watchman --project-install-prefix watchman:/usr/local diff --git a/.github/workflows/getdeps_mac.yml b/.github/workflows/getdeps_mac.yml index 9ca14e42399d..67c1a5bfeb00 100644 --- a/.github/workflows/getdeps_mac.yml +++ b/.github/workflows/getdeps_mac.yml @@ -20,139 +20,208 @@ jobs: - uses: actions/checkout@v4 - name: Install system deps run: python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive watchman + - id: paths + name: Query paths + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages query-paths --recursive --src-dir=. watchman >> "$GITHUB_OUTPUT" - name: Install Rust Stable uses: dtolnay/rust-toolchain@stable - name: Fetch boost + if: ${{ steps.paths.outputs.boost_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests boost - name: Fetch ninja + if: ${{ steps.paths.outputs.ninja_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests ninja - name: Fetch cmake + if: ${{ steps.paths.outputs.cmake_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests cmake - name: Fetch cpptoml + if: ${{ steps.paths.outputs.cpptoml_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests cpptoml - name: Fetch fmt + if: ${{ steps.paths.outputs.fmt_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fmt - name: Fetch gflags + if: ${{ steps.paths.outputs.gflags_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests gflags - name: Fetch glog + if: ${{ steps.paths.outputs.glog_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests glog - name: Fetch googletest + if: ${{ steps.paths.outputs.googletest_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests googletest - name: Fetch xxhash + if: ${{ steps.paths.outputs.xxhash_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests xxhash - name: Fetch zstd + if: ${{ steps.paths.outputs.zstd_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests zstd - name: Fetch double-conversion + if: ${{ steps.paths.outputs.double-conversion_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests double-conversion - name: Fetch fast_float + if: ${{ steps.paths.outputs.fast_float_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fast_float - name: Fetch libdwarf + if: ${{ steps.paths.outputs.libdwarf_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libdwarf - name: Fetch lz4 + if: ${{ steps.paths.outputs.lz4_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests lz4 - name: Fetch openssl + if: ${{ steps.paths.outputs.openssl_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests openssl - name: Fetch snappy + if: ${{ steps.paths.outputs.snappy_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests snappy - name: Fetch pcre2 + if: ${{ steps.paths.outputs.pcre2_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests pcre2 - name: Fetch python-setuptools + if: ${{ steps.paths.outputs.python-setuptools_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests python-setuptools - name: Fetch libevent + if: ${{ steps.paths.outputs.libevent_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libevent - name: Fetch liboqs + if: ${{ steps.paths.outputs.liboqs_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests liboqs - name: Fetch zlib + if: ${{ steps.paths.outputs.zlib_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests zlib - name: Fetch autoconf + if: ${{ steps.paths.outputs.autoconf_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests autoconf - name: Fetch automake + if: ${{ steps.paths.outputs.automake_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests automake - name: Fetch libtool + if: ${{ steps.paths.outputs.libtool_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libtool - name: Fetch libsodium + if: ${{ steps.paths.outputs.libsodium_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libsodium - name: Fetch xz + if: ${{ steps.paths.outputs.xz_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests xz - name: Fetch folly + if: ${{ steps.paths.outputs.folly_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests folly - name: Fetch fizz + if: ${{ steps.paths.outputs.fizz_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fizz - name: Fetch mvfst + if: ${{ steps.paths.outputs.mvfst_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests mvfst - name: Fetch wangle + if: ${{ steps.paths.outputs.wangle_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests wangle - name: Fetch fbthrift + if: ${{ steps.paths.outputs.fbthrift_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fbthrift - name: Fetch fb303 + if: ${{ steps.paths.outputs.fb303_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fb303 - name: Fetch edencommon + if: ${{ steps.paths.outputs.edencommon_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests edencommon - name: Build boost + if: ${{ steps.paths.outputs.boost_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests boost - name: Build ninja + if: ${{ steps.paths.outputs.ninja_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests ninja - name: Build cmake + if: ${{ steps.paths.outputs.cmake_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests cmake - name: Build cpptoml + if: ${{ steps.paths.outputs.cpptoml_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests cpptoml - name: Build fmt + if: ${{ steps.paths.outputs.fmt_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fmt - name: Build gflags + if: ${{ steps.paths.outputs.gflags_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests gflags - name: Build glog + if: ${{ steps.paths.outputs.glog_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests glog - name: Build googletest + if: ${{ steps.paths.outputs.googletest_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests googletest - name: Build xxhash + if: ${{ steps.paths.outputs.xxhash_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests xxhash - name: Build zstd + if: ${{ steps.paths.outputs.zstd_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests zstd - name: Build double-conversion + if: ${{ steps.paths.outputs.double-conversion_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests double-conversion - name: Build fast_float + if: ${{ steps.paths.outputs.fast_float_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fast_float - name: Build libdwarf + if: ${{ steps.paths.outputs.libdwarf_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libdwarf - name: Build lz4 + if: ${{ steps.paths.outputs.lz4_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests lz4 - name: Build openssl + if: ${{ steps.paths.outputs.openssl_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests openssl - name: Build snappy + if: ${{ steps.paths.outputs.snappy_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests snappy - name: Build pcre2 + if: ${{ steps.paths.outputs.pcre2_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests pcre2 - name: Build python-setuptools + if: ${{ steps.paths.outputs.python-setuptools_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests python-setuptools - name: Build libevent + if: ${{ steps.paths.outputs.libevent_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libevent - name: Build liboqs + if: ${{ steps.paths.outputs.liboqs_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests liboqs - name: Build zlib + if: ${{ steps.paths.outputs.zlib_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests zlib - name: Build autoconf + if: ${{ steps.paths.outputs.autoconf_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests autoconf - name: Build automake + if: ${{ steps.paths.outputs.automake_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests automake - name: Build libtool + if: ${{ steps.paths.outputs.libtool_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libtool - name: Build libsodium + if: ${{ steps.paths.outputs.libsodium_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libsodium - name: Build xz + if: ${{ steps.paths.outputs.xz_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests xz - name: Build folly + if: ${{ steps.paths.outputs.folly_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests folly - name: Build fizz + if: ${{ steps.paths.outputs.fizz_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fizz - name: Build mvfst + if: ${{ steps.paths.outputs.mvfst_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests mvfst - name: Build wangle + if: ${{ steps.paths.outputs.wangle_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests wangle - name: Build fbthrift + if: ${{ steps.paths.outputs.fbthrift_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fbthrift - name: Build fb303 + if: ${{ steps.paths.outputs.fb303_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fb303 - name: Build edencommon + if: ${{ steps.paths.outputs.edencommon_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests edencommon - name: Build watchman run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --src-dir=. watchman --project-install-prefix watchman:/usr/local diff --git a/.github/workflows/getdeps_windows.yml b/.github/workflows/getdeps_windows.yml index df3f9e1f228e..a337cf93a096 100644 --- a/.github/workflows/getdeps_windows.yml +++ b/.github/workflows/getdeps_windows.yml @@ -21,135 +21,203 @@ jobs: run: "echo BOOST_ROOT=%BOOST_ROOT_1_83_0% >> %GITHUB_ENV%" shell: cmd - name: Fix Git config - run: git config --system core.longpaths true - - name: Disable autocrlf - run: git config --system core.autocrlf false + run: > + git config --system core.longpaths true && + git config --system core.autocrlf false && + git config --system core.symlinks true + shell: cmd - uses: actions/checkout@v4 + - id: paths + name: Query paths + run: python build/fbcode_builder/getdeps.py query-paths --recursive --src-dir=. watchman >> $env:GITHUB_OUTPUT + shell: pwsh - name: Install Rust Stable uses: dtolnay/rust-toolchain@stable - name: Fetch boost + if: ${{ steps.paths.outputs.boost_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests boost - name: Fetch ninja + if: ${{ steps.paths.outputs.ninja_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests ninja - name: Fetch cmake + if: ${{ steps.paths.outputs.cmake_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests cmake - name: Fetch cpptoml + if: ${{ steps.paths.outputs.cpptoml_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests cpptoml - name: Fetch fmt + if: ${{ steps.paths.outputs.fmt_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests fmt - name: Fetch gflags + if: ${{ steps.paths.outputs.gflags_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests gflags - name: Fetch glog + if: ${{ steps.paths.outputs.glog_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests glog - name: Fetch googletest + if: ${{ steps.paths.outputs.googletest_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests googletest - name: Fetch libsodium + if: ${{ steps.paths.outputs.libsodium_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests libsodium - name: Fetch xxhash + if: ${{ steps.paths.outputs.xxhash_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests xxhash - name: Fetch zstd + if: ${{ steps.paths.outputs.zstd_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests zstd - name: Fetch double-conversion + if: ${{ steps.paths.outputs.double-conversion_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests double-conversion - name: Fetch fast_float + if: ${{ steps.paths.outputs.fast_float_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests fast_float - name: Fetch libdwarf + if: ${{ steps.paths.outputs.libdwarf_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests libdwarf - name: Fetch lz4 + if: ${{ steps.paths.outputs.lz4_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests lz4 - name: Fetch snappy + if: ${{ steps.paths.outputs.snappy_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests snappy - name: Fetch zlib + if: ${{ steps.paths.outputs.zlib_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests zlib - name: Fetch pcre2 + if: ${{ steps.paths.outputs.pcre2_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests pcre2 - name: Fetch python-setuptools + if: ${{ steps.paths.outputs.python-setuptools_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests python-setuptools - name: Fetch jom + if: ${{ steps.paths.outputs.jom_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests jom - name: Fetch perl + if: ${{ steps.paths.outputs.perl_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests perl - name: Fetch openssl + if: ${{ steps.paths.outputs.openssl_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests openssl - name: Fetch libevent + if: ${{ steps.paths.outputs.libevent_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests libevent - name: Fetch folly + if: ${{ steps.paths.outputs.folly_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests folly - name: Fetch liboqs + if: ${{ steps.paths.outputs.liboqs_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests liboqs - name: Fetch fizz + if: ${{ steps.paths.outputs.fizz_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests fizz - name: Fetch mvfst + if: ${{ steps.paths.outputs.mvfst_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests mvfst - name: Fetch wangle + if: ${{ steps.paths.outputs.wangle_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests wangle - name: Fetch fbthrift + if: ${{ steps.paths.outputs.fbthrift_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests fbthrift - name: Fetch fb303 + if: ${{ steps.paths.outputs.fb303_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests fb303 - name: Fetch edencommon + if: ${{ steps.paths.outputs.edencommon_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests edencommon - name: Build boost + if: ${{ steps.paths.outputs.boost_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests boost - name: Build ninja + if: ${{ steps.paths.outputs.ninja_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests ninja - name: Build cmake + if: ${{ steps.paths.outputs.cmake_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests cmake - name: Build cpptoml + if: ${{ steps.paths.outputs.cpptoml_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests cpptoml - name: Build fmt + if: ${{ steps.paths.outputs.fmt_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests fmt - name: Build gflags + if: ${{ steps.paths.outputs.gflags_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests gflags - name: Build glog + if: ${{ steps.paths.outputs.glog_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests glog - name: Build googletest + if: ${{ steps.paths.outputs.googletest_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests googletest - name: Build libsodium + if: ${{ steps.paths.outputs.libsodium_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests libsodium - name: Build xxhash + if: ${{ steps.paths.outputs.xxhash_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests xxhash - name: Build zstd + if: ${{ steps.paths.outputs.zstd_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests zstd - name: Build double-conversion + if: ${{ steps.paths.outputs.double-conversion_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests double-conversion - name: Build fast_float + if: ${{ steps.paths.outputs.fast_float_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests fast_float - name: Build libdwarf + if: ${{ steps.paths.outputs.libdwarf_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests libdwarf - name: Build lz4 + if: ${{ steps.paths.outputs.lz4_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests lz4 - name: Build snappy + if: ${{ steps.paths.outputs.snappy_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests snappy - name: Build zlib + if: ${{ steps.paths.outputs.zlib_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests zlib - name: Build pcre2 + if: ${{ steps.paths.outputs.pcre2_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests pcre2 - name: Build python-setuptools + if: ${{ steps.paths.outputs.python-setuptools_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests python-setuptools - name: Build jom + if: ${{ steps.paths.outputs.jom_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests jom - name: Build perl + if: ${{ steps.paths.outputs.perl_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests perl - name: Build openssl + if: ${{ steps.paths.outputs.openssl_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests openssl - name: Build libevent + if: ${{ steps.paths.outputs.libevent_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests libevent - name: Build folly + if: ${{ steps.paths.outputs.folly_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests folly - name: Build liboqs + if: ${{ steps.paths.outputs.liboqs_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests liboqs - name: Build fizz + if: ${{ steps.paths.outputs.fizz_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests fizz - name: Build mvfst + if: ${{ steps.paths.outputs.mvfst_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests mvfst - name: Build wangle + if: ${{ steps.paths.outputs.wangle_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests wangle - name: Build fbthrift + if: ${{ steps.paths.outputs.fbthrift_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests fbthrift - name: Build fb303 + if: ${{ steps.paths.outputs.fb303_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests fb303 - name: Build edencommon + if: ${{ steps.paths.outputs.edencommon_SOURCE }} run: python build/fbcode_builder/getdeps.py build --no-tests edencommon - name: Build watchman run: python build/fbcode_builder/getdeps.py build --src-dir=. watchman diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 03a5f3c0430d..138e729e7fff 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -552,6 +552,33 @@ def setup_project_cmd_parser(self, parser): ) +@cmd("query-paths", "print the paths for tooling to use") +class QueryPathsCmd(ProjectCmdBase): + def run_project_cmd(self, args, loader, manifest): + if args.recursive: + manifests = loader.manifests_in_dependency_order() + else: + manifests = [manifest] + + for m in manifests: + fetcher = loader.create_fetcher(m) + if isinstance(fetcher, SystemPackageFetcher): + # We are guaranteed that if the fetcher is set to + # SystemPackageFetcher then this item is completely + # satisfied by the appropriate system packages + continue + src_dir = fetcher.get_src_dir() + print(f"{m.name}_SOURCE={src_dir}") + + def setup_project_cmd_parser(self, parser): + parser.add_argument( + "--recursive", + help="print the transitive deps also", + action="store_true", + default=False, + ) + + @cmd("show-source-dir", "print the source dir for a given project") class ShowSourceDirCmd(ProjectCmdBase): def run_project_cmd(self, args, loader, manifest): @@ -1001,6 +1028,10 @@ def write_job_for_platform(self, platform, args): # noqa: C901 manifest_ctx.set("test", "on") run_on = self.get_run_on(args) + tests_arg = "--no-tests " + if run_tests: + tests_arg = "" + # Some projects don't do anything "useful" as a leaf project, only # as a dep for a leaf project. Check for those here; we don't want # to waste the effort scheduling them on CI. @@ -1086,12 +1117,14 @@ def write_job_for_platform(self, platform, args): # noqa: C901 ) out.write(" shell: cmd\n") - # The git installation may not like long filenames, so tell it - # that we want it to use them! out.write(" - name: Fix Git config\n") - out.write(" run: git config --system core.longpaths true\n") - out.write(" - name: Disable autocrlf\n") - out.write(" run: git config --system core.autocrlf false\n") + out.write(" run: >\n") + out.write(" git config --system core.longpaths true &&\n") + out.write(" git config --system core.autocrlf false &&\n") + # cxx crate needs symlinks enabled + out.write(" git config --system core.symlinks true\n") + # && is not supported on default windows powershell, so use cmd + out.write(" shell: cmd\n") out.write(" - uses: actions/checkout@v4\n") @@ -1127,17 +1160,12 @@ def write_job_for_platform(self, platform, args): # noqa: C901 if build_opts.is_darwin(): # brew is installed as regular user sudo_arg = "" - tests_arg = "--no-tests " - if run_tests: - tests_arg = "" - out.write( - f" run: {sudo_arg}python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps {tests_arg}--recursive {manifest.name}\n" - ) + + system_deps_cmd = f"{sudo_arg}{getdepscmd}{allow_sys_arg} install-system-deps {tests_arg}--recursive {manifest.name}" if build_opts.is_linux() or build_opts.is_freebsd(): - out.write(" - name: Install packaging system deps\n") - out.write( - f" run: {sudo_arg}python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps {tests_arg}--recursive patchelf\n" - ) + system_deps_cmd += f" && {sudo_arg}{getdepscmd}{allow_sys_arg} install-system-deps {tests_arg}--recursive patchelf" + out.write(f" run: {system_deps_cmd}\n") + required_locales = manifest.get( "github.actions", "required_locales", ctx=manifest_ctx ) @@ -1152,6 +1180,18 @@ def write_job_for_platform(self, platform, args): # noqa: C901 out.write(f" - name: Ensure {loc} locale present\n") out.write(f" run: {sudo_arg}locale-gen {loc}\n") + out.write(" - id: paths\n") + out.write(" name: Query paths\n") + if build_opts.is_windows(): + out.write( + f" run: {getdepscmd}{allow_sys_arg} query-paths {tests_arg}--recursive --src-dir=. {manifest.name} >> $env:GITHUB_OUTPUT\n" + ) + out.write(" shell: pwsh\n") + else: + out.write( + f' run: {getdepscmd}{allow_sys_arg} query-paths {tests_arg}--recursive --src-dir=. {manifest.name} >> "$GITHUB_OUTPUT"\n' + ) + projects = loader.manifests_in_dependency_order() main_repo_url = manifest.get_repo_url(manifest_ctx) @@ -1178,25 +1218,32 @@ def write_job_for_platform(self, platform, args): # noqa: C901 ctx = loader.ctx_gen.get_context(m.name) if m.get_repo_url(ctx) != main_repo_url: out.write(" - name: Fetch %s\n" % m.name) + out.write( + f" if: ${{{{ steps.paths.outputs.{m.name}_SOURCE }}}}\n" + ) out.write( f" run: {getdepscmd}{allow_sys_arg} fetch --no-tests {m.name}\n" ) for m in projects: - if m != manifest: - if m.name == "rust": - continue - else: - src_dir_arg = "" - ctx = loader.ctx_gen.get_context(m.name) - if main_repo_url and m.get_repo_url(ctx) == main_repo_url: - # Its in the same repo, so src-dir is also . - src_dir_arg = "--src-dir=. " - has_same_repo_dep = True - out.write(" - name: Build %s\n" % m.name) - out.write( - f" run: {getdepscmd}{allow_sys_arg} build {build_type_arg}{src_dir_arg}{free_up_disk}--no-tests {m.name}\n" - ) + if m == manifest or m.name == "rust": + continue + src_dir_arg = "" + ctx = loader.ctx_gen.get_context(m.name) + if main_repo_url and m.get_repo_url(ctx) == main_repo_url: + # Its in the same repo, so src-dir is also . + src_dir_arg = "--src-dir=. " + has_same_repo_dep = True + + out.write(" - name: Build %s\n" % m.name) + if not src_dir_arg: + # only run the step if needed + out.write( + f" if: ${{{{ steps.paths.outputs.{m.name}_SOURCE }}}}\n" + ) + out.write( + f" run: {getdepscmd}{allow_sys_arg} build {build_type_arg}{src_dir_arg}{free_up_disk}--no-tests {m.name}\n" + ) out.write(" - name: Build %s\n" % manifest.name) @@ -1213,12 +1260,8 @@ def write_job_for_platform(self, platform, args): # noqa: C901 if has_same_repo_dep: no_deps_arg = "--no-deps " - no_tests_arg = "" - if not run_tests: - no_tests_arg = "--no-tests " - out.write( - f" run: {getdepscmd}{allow_sys_arg} build {build_type_arg}{no_tests_arg}{no_deps_arg}--src-dir=. {manifest.name} {project_prefix}\n" + f" run: {getdepscmd}{allow_sys_arg} build {build_type_arg}{tests_arg}{no_deps_arg}--src-dir=. {manifest.name} {project_prefix}\n" ) out.write(" - name: Copy artifacts\n") diff --git a/build/fbcode_builder/getdeps/fetcher.py b/build/fbcode_builder/getdeps/fetcher.py index c769c118d1d3..a1737089bfb2 100644 --- a/build/fbcode_builder/getdeps/fetcher.py +++ b/build/fbcode_builder/getdeps/fetcher.py @@ -244,7 +244,9 @@ def __init__(self, build_options, manifest, repo_url, rev, depth) -> None: if not m: raise Exception("Failed to parse rev from %s" % hash_file) rev = m.group(1) - print("Using pinned rev %s for %s" % (rev, repo_url)) + print( + "Using pinned rev %s for %s" % (rev, repo_url), file=sys.stderr + ) self.rev = rev or "main" self.origin_repo = repo_url From 3afb87c40501b9aadbf9c700eb050f348301f8c5 Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Mon, 6 Jan 2025 15:15:49 -0800 Subject: [PATCH 7348/7387] add github actions caching Summary: X-link: https://github.com/facebook/sapling/pull/1005 Speed up github builds with github actions CI caching based on the cache-key mechanism already present in getdeps. Cached fizz windows build completed in 22% of original time, linux build in 54% of the original time, and mac in 72% of original time. This saves a lot of waiting around for PR builds on OSS changes as windows signal is usually the lagging one. Speed ups will vary across the different Meta OSS projects. Windows benefits most from caching dependencies as we don't use system packages there at all, linux next as its default runner is slower than mac, and then finaly mac (the strongest hardware of the default github runners). Github allows [up to 10GB cache per repo](https://github.blog/changelog/2021-11-23-github-actions-cache-size-is-now-increased-to-10gb-per-repository/), expiring data over capacity. You can see the size of the caches generated in the [caches view of githhub actions UX](https://github.com/ahornby/fizz/actions/caches?query=sort%3Asize-desc), looks like our usage is pretty small so far. More background: Github actions caching decides its own compression format (currently it prefers zstd), but they are free to change that in future, hence no .zstd suffix or similar on the cache keys. Github actions caches from main are used from feature branches but not vice versa, hence a PR can't pollute cache for the trunk build. This allows us to benefit from caching on main and PRs where dependency versions match. The final item being built, and dependencies inside the same repo as the final are not cached. A different mechanism would be necessary for those (e.g. using a tool like ccache/sccache or caching cargo/buck2 output). This means that when building EdenFS, sapling could not be cached (its in the same repo), but folly could be as we have a key for it based on the folly-rev.txt file. When there is a cache hit the build step is skipped using extension of the conditionals introduced in previous diff D67839708 Reviewed By: bigfootjon Differential Revision: D67839730 fbshipit-source-id: c384a216eb27ccd3f816e3c31b167232bda571a6 --- .github/workflows/getdeps_linux.yml | 585 ++++++++++++++++++++++++-- .github/workflows/getdeps_mac.yml | 495 ++++++++++++++++++++-- .github/workflows/getdeps_windows.yml | 465 ++++++++++++++++++-- build/fbcode_builder/getdeps.py | 56 ++- build/fbcode_builder/getdeps/cargo.py | 12 +- 5 files changed, 1504 insertions(+), 109 deletions(-) diff --git a/.github/workflows/getdeps_linux.yml b/.github/workflows/getdeps_linux.yml index 2309ad3b86a0..723569aa10ce 100644 --- a/.github/workflows/getdeps_linux.yml +++ b/.github/workflows/getdeps_linux.yml @@ -144,123 +144,630 @@ jobs: - name: Fetch edencommon if: ${{ steps.paths.outputs.edencommon_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests edencommon - - name: Build boost + - name: Restore boost from cache + id: restore_boost if: ${{ steps.paths.outputs.boost_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.boost_INSTALL }} + key: ${{ steps.paths.outputs.boost_CACHE_KEY }}-install + - name: Build boost + if: ${{ steps.paths.outputs.boost_SOURCE && ! steps.restore_boost.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests boost - - name: Build ninja + - name: Save boost to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.boost_SOURCE && ! steps.restore_boost.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.boost_INSTALL }} + key: ${{ steps.paths.outputs.boost_CACHE_KEY }}-install + - name: Restore ninja from cache + id: restore_ninja if: ${{ steps.paths.outputs.ninja_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.ninja_INSTALL }} + key: ${{ steps.paths.outputs.ninja_CACHE_KEY }}-install + - name: Build ninja + if: ${{ steps.paths.outputs.ninja_SOURCE && ! steps.restore_ninja.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests ninja - - name: Build cmake + - name: Save ninja to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.ninja_SOURCE && ! steps.restore_ninja.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.ninja_INSTALL }} + key: ${{ steps.paths.outputs.ninja_CACHE_KEY }}-install + - name: Restore cmake from cache + id: restore_cmake if: ${{ steps.paths.outputs.cmake_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.cmake_INSTALL }} + key: ${{ steps.paths.outputs.cmake_CACHE_KEY }}-install + - name: Build cmake + if: ${{ steps.paths.outputs.cmake_SOURCE && ! steps.restore_cmake.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests cmake - - name: Build cpptoml + - name: Save cmake to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.cmake_SOURCE && ! steps.restore_cmake.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.cmake_INSTALL }} + key: ${{ steps.paths.outputs.cmake_CACHE_KEY }}-install + - name: Restore cpptoml from cache + id: restore_cpptoml if: ${{ steps.paths.outputs.cpptoml_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.cpptoml_INSTALL }} + key: ${{ steps.paths.outputs.cpptoml_CACHE_KEY }}-install + - name: Build cpptoml + if: ${{ steps.paths.outputs.cpptoml_SOURCE && ! steps.restore_cpptoml.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests cpptoml - - name: Build fmt + - name: Save cpptoml to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.cpptoml_SOURCE && ! steps.restore_cpptoml.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.cpptoml_INSTALL }} + key: ${{ steps.paths.outputs.cpptoml_CACHE_KEY }}-install + - name: Restore fmt from cache + id: restore_fmt if: ${{ steps.paths.outputs.fmt_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.fmt_INSTALL }} + key: ${{ steps.paths.outputs.fmt_CACHE_KEY }}-install + - name: Build fmt + if: ${{ steps.paths.outputs.fmt_SOURCE && ! steps.restore_fmt.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fmt - - name: Build gflags + - name: Save fmt to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.fmt_SOURCE && ! steps.restore_fmt.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.fmt_INSTALL }} + key: ${{ steps.paths.outputs.fmt_CACHE_KEY }}-install + - name: Restore gflags from cache + id: restore_gflags if: ${{ steps.paths.outputs.gflags_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.gflags_INSTALL }} + key: ${{ steps.paths.outputs.gflags_CACHE_KEY }}-install + - name: Build gflags + if: ${{ steps.paths.outputs.gflags_SOURCE && ! steps.restore_gflags.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests gflags - - name: Build glog + - name: Save gflags to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.gflags_SOURCE && ! steps.restore_gflags.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.gflags_INSTALL }} + key: ${{ steps.paths.outputs.gflags_CACHE_KEY }}-install + - name: Restore glog from cache + id: restore_glog if: ${{ steps.paths.outputs.glog_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.glog_INSTALL }} + key: ${{ steps.paths.outputs.glog_CACHE_KEY }}-install + - name: Build glog + if: ${{ steps.paths.outputs.glog_SOURCE && ! steps.restore_glog.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests glog - - name: Build googletest + - name: Save glog to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.glog_SOURCE && ! steps.restore_glog.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.glog_INSTALL }} + key: ${{ steps.paths.outputs.glog_CACHE_KEY }}-install + - name: Restore googletest from cache + id: restore_googletest if: ${{ steps.paths.outputs.googletest_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.googletest_INSTALL }} + key: ${{ steps.paths.outputs.googletest_CACHE_KEY }}-install + - name: Build googletest + if: ${{ steps.paths.outputs.googletest_SOURCE && ! steps.restore_googletest.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests googletest - - name: Build xxhash + - name: Save googletest to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.googletest_SOURCE && ! steps.restore_googletest.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.googletest_INSTALL }} + key: ${{ steps.paths.outputs.googletest_CACHE_KEY }}-install + - name: Restore xxhash from cache + id: restore_xxhash if: ${{ steps.paths.outputs.xxhash_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.xxhash_INSTALL }} + key: ${{ steps.paths.outputs.xxhash_CACHE_KEY }}-install + - name: Build xxhash + if: ${{ steps.paths.outputs.xxhash_SOURCE && ! steps.restore_xxhash.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests xxhash - - name: Build zstd + - name: Save xxhash to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.xxhash_SOURCE && ! steps.restore_xxhash.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.xxhash_INSTALL }} + key: ${{ steps.paths.outputs.xxhash_CACHE_KEY }}-install + - name: Restore zstd from cache + id: restore_zstd if: ${{ steps.paths.outputs.zstd_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.zstd_INSTALL }} + key: ${{ steps.paths.outputs.zstd_CACHE_KEY }}-install + - name: Build zstd + if: ${{ steps.paths.outputs.zstd_SOURCE && ! steps.restore_zstd.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests zstd - - name: Build double-conversion + - name: Save zstd to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.zstd_SOURCE && ! steps.restore_zstd.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.zstd_INSTALL }} + key: ${{ steps.paths.outputs.zstd_CACHE_KEY }}-install + - name: Restore double-conversion from cache + id: restore_double-conversion if: ${{ steps.paths.outputs.double-conversion_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.double-conversion_INSTALL }} + key: ${{ steps.paths.outputs.double-conversion_CACHE_KEY }}-install + - name: Build double-conversion + if: ${{ steps.paths.outputs.double-conversion_SOURCE && ! steps.restore_double-conversion.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests double-conversion - - name: Build fast_float + - name: Save double-conversion to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.double-conversion_SOURCE && ! steps.restore_double-conversion.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.double-conversion_INSTALL }} + key: ${{ steps.paths.outputs.double-conversion_CACHE_KEY }}-install + - name: Restore fast_float from cache + id: restore_fast_float if: ${{ steps.paths.outputs.fast_float_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.fast_float_INSTALL }} + key: ${{ steps.paths.outputs.fast_float_CACHE_KEY }}-install + - name: Build fast_float + if: ${{ steps.paths.outputs.fast_float_SOURCE && ! steps.restore_fast_float.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fast_float - - name: Build libdwarf + - name: Save fast_float to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.fast_float_SOURCE && ! steps.restore_fast_float.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.fast_float_INSTALL }} + key: ${{ steps.paths.outputs.fast_float_CACHE_KEY }}-install + - name: Restore libdwarf from cache + id: restore_libdwarf if: ${{ steps.paths.outputs.libdwarf_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.libdwarf_INSTALL }} + key: ${{ steps.paths.outputs.libdwarf_CACHE_KEY }}-install + - name: Build libdwarf + if: ${{ steps.paths.outputs.libdwarf_SOURCE && ! steps.restore_libdwarf.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libdwarf - - name: Build libevent + - name: Save libdwarf to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.libdwarf_SOURCE && ! steps.restore_libdwarf.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.libdwarf_INSTALL }} + key: ${{ steps.paths.outputs.libdwarf_CACHE_KEY }}-install + - name: Restore libevent from cache + id: restore_libevent if: ${{ steps.paths.outputs.libevent_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.libevent_INSTALL }} + key: ${{ steps.paths.outputs.libevent_CACHE_KEY }}-install + - name: Build libevent + if: ${{ steps.paths.outputs.libevent_SOURCE && ! steps.restore_libevent.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libevent - - name: Build lz4 + - name: Save libevent to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.libevent_SOURCE && ! steps.restore_libevent.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.libevent_INSTALL }} + key: ${{ steps.paths.outputs.libevent_CACHE_KEY }}-install + - name: Restore lz4 from cache + id: restore_lz4 if: ${{ steps.paths.outputs.lz4_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.lz4_INSTALL }} + key: ${{ steps.paths.outputs.lz4_CACHE_KEY }}-install + - name: Build lz4 + if: ${{ steps.paths.outputs.lz4_SOURCE && ! steps.restore_lz4.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests lz4 - - name: Build snappy + - name: Save lz4 to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.lz4_SOURCE && ! steps.restore_lz4.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.lz4_INSTALL }} + key: ${{ steps.paths.outputs.lz4_CACHE_KEY }}-install + - name: Restore snappy from cache + id: restore_snappy if: ${{ steps.paths.outputs.snappy_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.snappy_INSTALL }} + key: ${{ steps.paths.outputs.snappy_CACHE_KEY }}-install + - name: Build snappy + if: ${{ steps.paths.outputs.snappy_SOURCE && ! steps.restore_snappy.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests snappy - - name: Build pcre2 + - name: Save snappy to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.snappy_SOURCE && ! steps.restore_snappy.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.snappy_INSTALL }} + key: ${{ steps.paths.outputs.snappy_CACHE_KEY }}-install + - name: Restore pcre2 from cache + id: restore_pcre2 if: ${{ steps.paths.outputs.pcre2_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.pcre2_INSTALL }} + key: ${{ steps.paths.outputs.pcre2_CACHE_KEY }}-install + - name: Build pcre2 + if: ${{ steps.paths.outputs.pcre2_SOURCE && ! steps.restore_pcre2.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests pcre2 - - name: Build python-setuptools + - name: Save pcre2 to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.pcre2_SOURCE && ! steps.restore_pcre2.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.pcre2_INSTALL }} + key: ${{ steps.paths.outputs.pcre2_CACHE_KEY }}-install + - name: Restore python-setuptools from cache + id: restore_python-setuptools if: ${{ steps.paths.outputs.python-setuptools_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.python-setuptools_INSTALL }} + key: ${{ steps.paths.outputs.python-setuptools_CACHE_KEY }}-install + - name: Build python-setuptools + if: ${{ steps.paths.outputs.python-setuptools_SOURCE && ! steps.restore_python-setuptools.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests python-setuptools - - name: Build zlib + - name: Save python-setuptools to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.python-setuptools_SOURCE && ! steps.restore_python-setuptools.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.python-setuptools_INSTALL }} + key: ${{ steps.paths.outputs.python-setuptools_CACHE_KEY }}-install + - name: Restore zlib from cache + id: restore_zlib if: ${{ steps.paths.outputs.zlib_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.zlib_INSTALL }} + key: ${{ steps.paths.outputs.zlib_CACHE_KEY }}-install + - name: Build zlib + if: ${{ steps.paths.outputs.zlib_SOURCE && ! steps.restore_zlib.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests zlib - - name: Build bz2 + - name: Save zlib to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.zlib_SOURCE && ! steps.restore_zlib.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.zlib_INSTALL }} + key: ${{ steps.paths.outputs.zlib_CACHE_KEY }}-install + - name: Restore bz2 from cache + id: restore_bz2 if: ${{ steps.paths.outputs.bz2_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.bz2_INSTALL }} + key: ${{ steps.paths.outputs.bz2_CACHE_KEY }}-install + - name: Build bz2 + if: ${{ steps.paths.outputs.bz2_SOURCE && ! steps.restore_bz2.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests bz2 - - name: Build openssl + - name: Save bz2 to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.bz2_SOURCE && ! steps.restore_bz2.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.bz2_INSTALL }} + key: ${{ steps.paths.outputs.bz2_CACHE_KEY }}-install + - name: Restore openssl from cache + id: restore_openssl if: ${{ steps.paths.outputs.openssl_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.openssl_INSTALL }} + key: ${{ steps.paths.outputs.openssl_CACHE_KEY }}-install + - name: Build openssl + if: ${{ steps.paths.outputs.openssl_SOURCE && ! steps.restore_openssl.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests openssl - - name: Build liboqs + - name: Save openssl to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.openssl_SOURCE && ! steps.restore_openssl.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.openssl_INSTALL }} + key: ${{ steps.paths.outputs.openssl_CACHE_KEY }}-install + - name: Restore liboqs from cache + id: restore_liboqs if: ${{ steps.paths.outputs.liboqs_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.liboqs_INSTALL }} + key: ${{ steps.paths.outputs.liboqs_CACHE_KEY }}-install + - name: Build liboqs + if: ${{ steps.paths.outputs.liboqs_SOURCE && ! steps.restore_liboqs.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests liboqs - - name: Build autoconf + - name: Save liboqs to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.liboqs_SOURCE && ! steps.restore_liboqs.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.liboqs_INSTALL }} + key: ${{ steps.paths.outputs.liboqs_CACHE_KEY }}-install + - name: Restore autoconf from cache + id: restore_autoconf if: ${{ steps.paths.outputs.autoconf_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.autoconf_INSTALL }} + key: ${{ steps.paths.outputs.autoconf_CACHE_KEY }}-install + - name: Build autoconf + if: ${{ steps.paths.outputs.autoconf_SOURCE && ! steps.restore_autoconf.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests autoconf - - name: Build automake + - name: Save autoconf to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.autoconf_SOURCE && ! steps.restore_autoconf.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.autoconf_INSTALL }} + key: ${{ steps.paths.outputs.autoconf_CACHE_KEY }}-install + - name: Restore automake from cache + id: restore_automake if: ${{ steps.paths.outputs.automake_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.automake_INSTALL }} + key: ${{ steps.paths.outputs.automake_CACHE_KEY }}-install + - name: Build automake + if: ${{ steps.paths.outputs.automake_SOURCE && ! steps.restore_automake.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests automake - - name: Build libtool + - name: Save automake to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.automake_SOURCE && ! steps.restore_automake.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.automake_INSTALL }} + key: ${{ steps.paths.outputs.automake_CACHE_KEY }}-install + - name: Restore libtool from cache + id: restore_libtool if: ${{ steps.paths.outputs.libtool_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.libtool_INSTALL }} + key: ${{ steps.paths.outputs.libtool_CACHE_KEY }}-install + - name: Build libtool + if: ${{ steps.paths.outputs.libtool_SOURCE && ! steps.restore_libtool.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libtool - - name: Build libsodium + - name: Save libtool to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.libtool_SOURCE && ! steps.restore_libtool.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.libtool_INSTALL }} + key: ${{ steps.paths.outputs.libtool_CACHE_KEY }}-install + - name: Restore libsodium from cache + id: restore_libsodium if: ${{ steps.paths.outputs.libsodium_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.libsodium_INSTALL }} + key: ${{ steps.paths.outputs.libsodium_CACHE_KEY }}-install + - name: Build libsodium + if: ${{ steps.paths.outputs.libsodium_SOURCE && ! steps.restore_libsodium.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libsodium - - name: Build libiberty + - name: Save libsodium to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.libsodium_SOURCE && ! steps.restore_libsodium.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.libsodium_INSTALL }} + key: ${{ steps.paths.outputs.libsodium_CACHE_KEY }}-install + - name: Restore libiberty from cache + id: restore_libiberty if: ${{ steps.paths.outputs.libiberty_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.libiberty_INSTALL }} + key: ${{ steps.paths.outputs.libiberty_CACHE_KEY }}-install + - name: Build libiberty + if: ${{ steps.paths.outputs.libiberty_SOURCE && ! steps.restore_libiberty.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libiberty - - name: Build libunwind + - name: Save libiberty to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.libiberty_SOURCE && ! steps.restore_libiberty.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.libiberty_INSTALL }} + key: ${{ steps.paths.outputs.libiberty_CACHE_KEY }}-install + - name: Restore libunwind from cache + id: restore_libunwind if: ${{ steps.paths.outputs.libunwind_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.libunwind_INSTALL }} + key: ${{ steps.paths.outputs.libunwind_CACHE_KEY }}-install + - name: Build libunwind + if: ${{ steps.paths.outputs.libunwind_SOURCE && ! steps.restore_libunwind.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libunwind - - name: Build xz + - name: Save libunwind to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.libunwind_SOURCE && ! steps.restore_libunwind.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.libunwind_INSTALL }} + key: ${{ steps.paths.outputs.libunwind_CACHE_KEY }}-install + - name: Restore xz from cache + id: restore_xz if: ${{ steps.paths.outputs.xz_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.xz_INSTALL }} + key: ${{ steps.paths.outputs.xz_CACHE_KEY }}-install + - name: Build xz + if: ${{ steps.paths.outputs.xz_SOURCE && ! steps.restore_xz.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests xz - - name: Build folly + - name: Save xz to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.xz_SOURCE && ! steps.restore_xz.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.xz_INSTALL }} + key: ${{ steps.paths.outputs.xz_CACHE_KEY }}-install + - name: Restore folly from cache + id: restore_folly if: ${{ steps.paths.outputs.folly_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.folly_INSTALL }} + key: ${{ steps.paths.outputs.folly_CACHE_KEY }}-install + - name: Build folly + if: ${{ steps.paths.outputs.folly_SOURCE && ! steps.restore_folly.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests folly - - name: Build fizz + - name: Save folly to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.folly_SOURCE && ! steps.restore_folly.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.folly_INSTALL }} + key: ${{ steps.paths.outputs.folly_CACHE_KEY }}-install + - name: Restore fizz from cache + id: restore_fizz if: ${{ steps.paths.outputs.fizz_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.fizz_INSTALL }} + key: ${{ steps.paths.outputs.fizz_CACHE_KEY }}-install + - name: Build fizz + if: ${{ steps.paths.outputs.fizz_SOURCE && ! steps.restore_fizz.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fizz - - name: Build mvfst + - name: Save fizz to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.fizz_SOURCE && ! steps.restore_fizz.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.fizz_INSTALL }} + key: ${{ steps.paths.outputs.fizz_CACHE_KEY }}-install + - name: Restore mvfst from cache + id: restore_mvfst if: ${{ steps.paths.outputs.mvfst_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.mvfst_INSTALL }} + key: ${{ steps.paths.outputs.mvfst_CACHE_KEY }}-install + - name: Build mvfst + if: ${{ steps.paths.outputs.mvfst_SOURCE && ! steps.restore_mvfst.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests mvfst - - name: Build libffi + - name: Save mvfst to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.mvfst_SOURCE && ! steps.restore_mvfst.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.mvfst_INSTALL }} + key: ${{ steps.paths.outputs.mvfst_CACHE_KEY }}-install + - name: Restore libffi from cache + id: restore_libffi if: ${{ steps.paths.outputs.libffi_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.libffi_INSTALL }} + key: ${{ steps.paths.outputs.libffi_CACHE_KEY }}-install + - name: Build libffi + if: ${{ steps.paths.outputs.libffi_SOURCE && ! steps.restore_libffi.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libffi - - name: Build ncurses + - name: Save libffi to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.libffi_SOURCE && ! steps.restore_libffi.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.libffi_INSTALL }} + key: ${{ steps.paths.outputs.libffi_CACHE_KEY }}-install + - name: Restore ncurses from cache + id: restore_ncurses if: ${{ steps.paths.outputs.ncurses_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.ncurses_INSTALL }} + key: ${{ steps.paths.outputs.ncurses_CACHE_KEY }}-install + - name: Build ncurses + if: ${{ steps.paths.outputs.ncurses_SOURCE && ! steps.restore_ncurses.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests ncurses - - name: Build python + - name: Save ncurses to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.ncurses_SOURCE && ! steps.restore_ncurses.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.ncurses_INSTALL }} + key: ${{ steps.paths.outputs.ncurses_CACHE_KEY }}-install + - name: Restore python from cache + id: restore_python if: ${{ steps.paths.outputs.python_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.python_INSTALL }} + key: ${{ steps.paths.outputs.python_CACHE_KEY }}-install + - name: Build python + if: ${{ steps.paths.outputs.python_SOURCE && ! steps.restore_python.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests python - - name: Build wangle + - name: Save python to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.python_SOURCE && ! steps.restore_python.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.python_INSTALL }} + key: ${{ steps.paths.outputs.python_CACHE_KEY }}-install + - name: Restore wangle from cache + id: restore_wangle if: ${{ steps.paths.outputs.wangle_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.wangle_INSTALL }} + key: ${{ steps.paths.outputs.wangle_CACHE_KEY }}-install + - name: Build wangle + if: ${{ steps.paths.outputs.wangle_SOURCE && ! steps.restore_wangle.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests wangle - - name: Build fbthrift + - name: Save wangle to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.wangle_SOURCE && ! steps.restore_wangle.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.wangle_INSTALL }} + key: ${{ steps.paths.outputs.wangle_CACHE_KEY }}-install + - name: Restore fbthrift from cache + id: restore_fbthrift if: ${{ steps.paths.outputs.fbthrift_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.fbthrift_INSTALL }} + key: ${{ steps.paths.outputs.fbthrift_CACHE_KEY }}-install + - name: Build fbthrift + if: ${{ steps.paths.outputs.fbthrift_SOURCE && ! steps.restore_fbthrift.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fbthrift - - name: Build fb303 + - name: Save fbthrift to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.fbthrift_SOURCE && ! steps.restore_fbthrift.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.fbthrift_INSTALL }} + key: ${{ steps.paths.outputs.fbthrift_CACHE_KEY }}-install + - name: Restore fb303 from cache + id: restore_fb303 if: ${{ steps.paths.outputs.fb303_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.fb303_INSTALL }} + key: ${{ steps.paths.outputs.fb303_CACHE_KEY }}-install + - name: Build fb303 + if: ${{ steps.paths.outputs.fb303_SOURCE && ! steps.restore_fb303.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fb303 - - name: Build edencommon + - name: Save fb303 to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.fb303_SOURCE && ! steps.restore_fb303.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.fb303_INSTALL }} + key: ${{ steps.paths.outputs.fb303_CACHE_KEY }}-install + - name: Restore edencommon from cache + id: restore_edencommon if: ${{ steps.paths.outputs.edencommon_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.edencommon_INSTALL }} + key: ${{ steps.paths.outputs.edencommon_CACHE_KEY }}-install + - name: Build edencommon + if: ${{ steps.paths.outputs.edencommon_SOURCE && ! steps.restore_edencommon.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests edencommon + - name: Save edencommon to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.edencommon_SOURCE && ! steps.restore_edencommon.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.edencommon_INSTALL }} + key: ${{ steps.paths.outputs.edencommon_CACHE_KEY }}-install - name: Build watchman run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --src-dir=. watchman --project-install-prefix watchman:/usr/local - name: Copy artifacts diff --git a/.github/workflows/getdeps_mac.yml b/.github/workflows/getdeps_mac.yml index 67c1a5bfeb00..9e6423a1a59f 100644 --- a/.github/workflows/getdeps_mac.yml +++ b/.github/workflows/getdeps_mac.yml @@ -124,105 +124,534 @@ jobs: - name: Fetch edencommon if: ${{ steps.paths.outputs.edencommon_SOURCE }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests edencommon - - name: Build boost + - name: Restore boost from cache + id: restore_boost if: ${{ steps.paths.outputs.boost_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.boost_INSTALL }} + key: ${{ steps.paths.outputs.boost_CACHE_KEY }}-install + - name: Build boost + if: ${{ steps.paths.outputs.boost_SOURCE && ! steps.restore_boost.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests boost - - name: Build ninja + - name: Save boost to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.boost_SOURCE && ! steps.restore_boost.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.boost_INSTALL }} + key: ${{ steps.paths.outputs.boost_CACHE_KEY }}-install + - name: Restore ninja from cache + id: restore_ninja if: ${{ steps.paths.outputs.ninja_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.ninja_INSTALL }} + key: ${{ steps.paths.outputs.ninja_CACHE_KEY }}-install + - name: Build ninja + if: ${{ steps.paths.outputs.ninja_SOURCE && ! steps.restore_ninja.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests ninja - - name: Build cmake + - name: Save ninja to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.ninja_SOURCE && ! steps.restore_ninja.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.ninja_INSTALL }} + key: ${{ steps.paths.outputs.ninja_CACHE_KEY }}-install + - name: Restore cmake from cache + id: restore_cmake if: ${{ steps.paths.outputs.cmake_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.cmake_INSTALL }} + key: ${{ steps.paths.outputs.cmake_CACHE_KEY }}-install + - name: Build cmake + if: ${{ steps.paths.outputs.cmake_SOURCE && ! steps.restore_cmake.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests cmake - - name: Build cpptoml + - name: Save cmake to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.cmake_SOURCE && ! steps.restore_cmake.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.cmake_INSTALL }} + key: ${{ steps.paths.outputs.cmake_CACHE_KEY }}-install + - name: Restore cpptoml from cache + id: restore_cpptoml if: ${{ steps.paths.outputs.cpptoml_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.cpptoml_INSTALL }} + key: ${{ steps.paths.outputs.cpptoml_CACHE_KEY }}-install + - name: Build cpptoml + if: ${{ steps.paths.outputs.cpptoml_SOURCE && ! steps.restore_cpptoml.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests cpptoml - - name: Build fmt + - name: Save cpptoml to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.cpptoml_SOURCE && ! steps.restore_cpptoml.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.cpptoml_INSTALL }} + key: ${{ steps.paths.outputs.cpptoml_CACHE_KEY }}-install + - name: Restore fmt from cache + id: restore_fmt if: ${{ steps.paths.outputs.fmt_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.fmt_INSTALL }} + key: ${{ steps.paths.outputs.fmt_CACHE_KEY }}-install + - name: Build fmt + if: ${{ steps.paths.outputs.fmt_SOURCE && ! steps.restore_fmt.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fmt - - name: Build gflags + - name: Save fmt to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.fmt_SOURCE && ! steps.restore_fmt.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.fmt_INSTALL }} + key: ${{ steps.paths.outputs.fmt_CACHE_KEY }}-install + - name: Restore gflags from cache + id: restore_gflags if: ${{ steps.paths.outputs.gflags_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.gflags_INSTALL }} + key: ${{ steps.paths.outputs.gflags_CACHE_KEY }}-install + - name: Build gflags + if: ${{ steps.paths.outputs.gflags_SOURCE && ! steps.restore_gflags.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests gflags - - name: Build glog + - name: Save gflags to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.gflags_SOURCE && ! steps.restore_gflags.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.gflags_INSTALL }} + key: ${{ steps.paths.outputs.gflags_CACHE_KEY }}-install + - name: Restore glog from cache + id: restore_glog if: ${{ steps.paths.outputs.glog_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.glog_INSTALL }} + key: ${{ steps.paths.outputs.glog_CACHE_KEY }}-install + - name: Build glog + if: ${{ steps.paths.outputs.glog_SOURCE && ! steps.restore_glog.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests glog - - name: Build googletest + - name: Save glog to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.glog_SOURCE && ! steps.restore_glog.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.glog_INSTALL }} + key: ${{ steps.paths.outputs.glog_CACHE_KEY }}-install + - name: Restore googletest from cache + id: restore_googletest if: ${{ steps.paths.outputs.googletest_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.googletest_INSTALL }} + key: ${{ steps.paths.outputs.googletest_CACHE_KEY }}-install + - name: Build googletest + if: ${{ steps.paths.outputs.googletest_SOURCE && ! steps.restore_googletest.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests googletest - - name: Build xxhash + - name: Save googletest to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.googletest_SOURCE && ! steps.restore_googletest.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.googletest_INSTALL }} + key: ${{ steps.paths.outputs.googletest_CACHE_KEY }}-install + - name: Restore xxhash from cache + id: restore_xxhash if: ${{ steps.paths.outputs.xxhash_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.xxhash_INSTALL }} + key: ${{ steps.paths.outputs.xxhash_CACHE_KEY }}-install + - name: Build xxhash + if: ${{ steps.paths.outputs.xxhash_SOURCE && ! steps.restore_xxhash.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests xxhash - - name: Build zstd + - name: Save xxhash to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.xxhash_SOURCE && ! steps.restore_xxhash.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.xxhash_INSTALL }} + key: ${{ steps.paths.outputs.xxhash_CACHE_KEY }}-install + - name: Restore zstd from cache + id: restore_zstd if: ${{ steps.paths.outputs.zstd_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.zstd_INSTALL }} + key: ${{ steps.paths.outputs.zstd_CACHE_KEY }}-install + - name: Build zstd + if: ${{ steps.paths.outputs.zstd_SOURCE && ! steps.restore_zstd.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests zstd - - name: Build double-conversion + - name: Save zstd to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.zstd_SOURCE && ! steps.restore_zstd.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.zstd_INSTALL }} + key: ${{ steps.paths.outputs.zstd_CACHE_KEY }}-install + - name: Restore double-conversion from cache + id: restore_double-conversion if: ${{ steps.paths.outputs.double-conversion_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.double-conversion_INSTALL }} + key: ${{ steps.paths.outputs.double-conversion_CACHE_KEY }}-install + - name: Build double-conversion + if: ${{ steps.paths.outputs.double-conversion_SOURCE && ! steps.restore_double-conversion.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests double-conversion - - name: Build fast_float + - name: Save double-conversion to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.double-conversion_SOURCE && ! steps.restore_double-conversion.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.double-conversion_INSTALL }} + key: ${{ steps.paths.outputs.double-conversion_CACHE_KEY }}-install + - name: Restore fast_float from cache + id: restore_fast_float if: ${{ steps.paths.outputs.fast_float_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.fast_float_INSTALL }} + key: ${{ steps.paths.outputs.fast_float_CACHE_KEY }}-install + - name: Build fast_float + if: ${{ steps.paths.outputs.fast_float_SOURCE && ! steps.restore_fast_float.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fast_float - - name: Build libdwarf + - name: Save fast_float to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.fast_float_SOURCE && ! steps.restore_fast_float.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.fast_float_INSTALL }} + key: ${{ steps.paths.outputs.fast_float_CACHE_KEY }}-install + - name: Restore libdwarf from cache + id: restore_libdwarf if: ${{ steps.paths.outputs.libdwarf_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.libdwarf_INSTALL }} + key: ${{ steps.paths.outputs.libdwarf_CACHE_KEY }}-install + - name: Build libdwarf + if: ${{ steps.paths.outputs.libdwarf_SOURCE && ! steps.restore_libdwarf.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libdwarf - - name: Build lz4 + - name: Save libdwarf to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.libdwarf_SOURCE && ! steps.restore_libdwarf.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.libdwarf_INSTALL }} + key: ${{ steps.paths.outputs.libdwarf_CACHE_KEY }}-install + - name: Restore lz4 from cache + id: restore_lz4 if: ${{ steps.paths.outputs.lz4_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.lz4_INSTALL }} + key: ${{ steps.paths.outputs.lz4_CACHE_KEY }}-install + - name: Build lz4 + if: ${{ steps.paths.outputs.lz4_SOURCE && ! steps.restore_lz4.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests lz4 - - name: Build openssl + - name: Save lz4 to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.lz4_SOURCE && ! steps.restore_lz4.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.lz4_INSTALL }} + key: ${{ steps.paths.outputs.lz4_CACHE_KEY }}-install + - name: Restore openssl from cache + id: restore_openssl if: ${{ steps.paths.outputs.openssl_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.openssl_INSTALL }} + key: ${{ steps.paths.outputs.openssl_CACHE_KEY }}-install + - name: Build openssl + if: ${{ steps.paths.outputs.openssl_SOURCE && ! steps.restore_openssl.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests openssl - - name: Build snappy + - name: Save openssl to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.openssl_SOURCE && ! steps.restore_openssl.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.openssl_INSTALL }} + key: ${{ steps.paths.outputs.openssl_CACHE_KEY }}-install + - name: Restore snappy from cache + id: restore_snappy if: ${{ steps.paths.outputs.snappy_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.snappy_INSTALL }} + key: ${{ steps.paths.outputs.snappy_CACHE_KEY }}-install + - name: Build snappy + if: ${{ steps.paths.outputs.snappy_SOURCE && ! steps.restore_snappy.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests snappy - - name: Build pcre2 + - name: Save snappy to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.snappy_SOURCE && ! steps.restore_snappy.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.snappy_INSTALL }} + key: ${{ steps.paths.outputs.snappy_CACHE_KEY }}-install + - name: Restore pcre2 from cache + id: restore_pcre2 if: ${{ steps.paths.outputs.pcre2_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.pcre2_INSTALL }} + key: ${{ steps.paths.outputs.pcre2_CACHE_KEY }}-install + - name: Build pcre2 + if: ${{ steps.paths.outputs.pcre2_SOURCE && ! steps.restore_pcre2.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests pcre2 - - name: Build python-setuptools + - name: Save pcre2 to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.pcre2_SOURCE && ! steps.restore_pcre2.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.pcre2_INSTALL }} + key: ${{ steps.paths.outputs.pcre2_CACHE_KEY }}-install + - name: Restore python-setuptools from cache + id: restore_python-setuptools if: ${{ steps.paths.outputs.python-setuptools_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.python-setuptools_INSTALL }} + key: ${{ steps.paths.outputs.python-setuptools_CACHE_KEY }}-install + - name: Build python-setuptools + if: ${{ steps.paths.outputs.python-setuptools_SOURCE && ! steps.restore_python-setuptools.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests python-setuptools - - name: Build libevent + - name: Save python-setuptools to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.python-setuptools_SOURCE && ! steps.restore_python-setuptools.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.python-setuptools_INSTALL }} + key: ${{ steps.paths.outputs.python-setuptools_CACHE_KEY }}-install + - name: Restore libevent from cache + id: restore_libevent if: ${{ steps.paths.outputs.libevent_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.libevent_INSTALL }} + key: ${{ steps.paths.outputs.libevent_CACHE_KEY }}-install + - name: Build libevent + if: ${{ steps.paths.outputs.libevent_SOURCE && ! steps.restore_libevent.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libevent - - name: Build liboqs + - name: Save libevent to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.libevent_SOURCE && ! steps.restore_libevent.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.libevent_INSTALL }} + key: ${{ steps.paths.outputs.libevent_CACHE_KEY }}-install + - name: Restore liboqs from cache + id: restore_liboqs if: ${{ steps.paths.outputs.liboqs_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.liboqs_INSTALL }} + key: ${{ steps.paths.outputs.liboqs_CACHE_KEY }}-install + - name: Build liboqs + if: ${{ steps.paths.outputs.liboqs_SOURCE && ! steps.restore_liboqs.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests liboqs - - name: Build zlib + - name: Save liboqs to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.liboqs_SOURCE && ! steps.restore_liboqs.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.liboqs_INSTALL }} + key: ${{ steps.paths.outputs.liboqs_CACHE_KEY }}-install + - name: Restore zlib from cache + id: restore_zlib if: ${{ steps.paths.outputs.zlib_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.zlib_INSTALL }} + key: ${{ steps.paths.outputs.zlib_CACHE_KEY }}-install + - name: Build zlib + if: ${{ steps.paths.outputs.zlib_SOURCE && ! steps.restore_zlib.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests zlib - - name: Build autoconf + - name: Save zlib to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.zlib_SOURCE && ! steps.restore_zlib.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.zlib_INSTALL }} + key: ${{ steps.paths.outputs.zlib_CACHE_KEY }}-install + - name: Restore autoconf from cache + id: restore_autoconf if: ${{ steps.paths.outputs.autoconf_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.autoconf_INSTALL }} + key: ${{ steps.paths.outputs.autoconf_CACHE_KEY }}-install + - name: Build autoconf + if: ${{ steps.paths.outputs.autoconf_SOURCE && ! steps.restore_autoconf.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests autoconf - - name: Build automake + - name: Save autoconf to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.autoconf_SOURCE && ! steps.restore_autoconf.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.autoconf_INSTALL }} + key: ${{ steps.paths.outputs.autoconf_CACHE_KEY }}-install + - name: Restore automake from cache + id: restore_automake if: ${{ steps.paths.outputs.automake_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.automake_INSTALL }} + key: ${{ steps.paths.outputs.automake_CACHE_KEY }}-install + - name: Build automake + if: ${{ steps.paths.outputs.automake_SOURCE && ! steps.restore_automake.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests automake - - name: Build libtool + - name: Save automake to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.automake_SOURCE && ! steps.restore_automake.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.automake_INSTALL }} + key: ${{ steps.paths.outputs.automake_CACHE_KEY }}-install + - name: Restore libtool from cache + id: restore_libtool if: ${{ steps.paths.outputs.libtool_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.libtool_INSTALL }} + key: ${{ steps.paths.outputs.libtool_CACHE_KEY }}-install + - name: Build libtool + if: ${{ steps.paths.outputs.libtool_SOURCE && ! steps.restore_libtool.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libtool - - name: Build libsodium + - name: Save libtool to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.libtool_SOURCE && ! steps.restore_libtool.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.libtool_INSTALL }} + key: ${{ steps.paths.outputs.libtool_CACHE_KEY }}-install + - name: Restore libsodium from cache + id: restore_libsodium if: ${{ steps.paths.outputs.libsodium_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.libsodium_INSTALL }} + key: ${{ steps.paths.outputs.libsodium_CACHE_KEY }}-install + - name: Build libsodium + if: ${{ steps.paths.outputs.libsodium_SOURCE && ! steps.restore_libsodium.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libsodium - - name: Build xz + - name: Save libsodium to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.libsodium_SOURCE && ! steps.restore_libsodium.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.libsodium_INSTALL }} + key: ${{ steps.paths.outputs.libsodium_CACHE_KEY }}-install + - name: Restore xz from cache + id: restore_xz if: ${{ steps.paths.outputs.xz_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.xz_INSTALL }} + key: ${{ steps.paths.outputs.xz_CACHE_KEY }}-install + - name: Build xz + if: ${{ steps.paths.outputs.xz_SOURCE && ! steps.restore_xz.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests xz - - name: Build folly + - name: Save xz to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.xz_SOURCE && ! steps.restore_xz.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.xz_INSTALL }} + key: ${{ steps.paths.outputs.xz_CACHE_KEY }}-install + - name: Restore folly from cache + id: restore_folly if: ${{ steps.paths.outputs.folly_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.folly_INSTALL }} + key: ${{ steps.paths.outputs.folly_CACHE_KEY }}-install + - name: Build folly + if: ${{ steps.paths.outputs.folly_SOURCE && ! steps.restore_folly.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests folly - - name: Build fizz + - name: Save folly to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.folly_SOURCE && ! steps.restore_folly.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.folly_INSTALL }} + key: ${{ steps.paths.outputs.folly_CACHE_KEY }}-install + - name: Restore fizz from cache + id: restore_fizz if: ${{ steps.paths.outputs.fizz_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.fizz_INSTALL }} + key: ${{ steps.paths.outputs.fizz_CACHE_KEY }}-install + - name: Build fizz + if: ${{ steps.paths.outputs.fizz_SOURCE && ! steps.restore_fizz.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fizz - - name: Build mvfst + - name: Save fizz to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.fizz_SOURCE && ! steps.restore_fizz.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.fizz_INSTALL }} + key: ${{ steps.paths.outputs.fizz_CACHE_KEY }}-install + - name: Restore mvfst from cache + id: restore_mvfst if: ${{ steps.paths.outputs.mvfst_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.mvfst_INSTALL }} + key: ${{ steps.paths.outputs.mvfst_CACHE_KEY }}-install + - name: Build mvfst + if: ${{ steps.paths.outputs.mvfst_SOURCE && ! steps.restore_mvfst.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests mvfst - - name: Build wangle + - name: Save mvfst to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.mvfst_SOURCE && ! steps.restore_mvfst.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.mvfst_INSTALL }} + key: ${{ steps.paths.outputs.mvfst_CACHE_KEY }}-install + - name: Restore wangle from cache + id: restore_wangle if: ${{ steps.paths.outputs.wangle_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.wangle_INSTALL }} + key: ${{ steps.paths.outputs.wangle_CACHE_KEY }}-install + - name: Build wangle + if: ${{ steps.paths.outputs.wangle_SOURCE && ! steps.restore_wangle.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests wangle - - name: Build fbthrift + - name: Save wangle to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.wangle_SOURCE && ! steps.restore_wangle.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.wangle_INSTALL }} + key: ${{ steps.paths.outputs.wangle_CACHE_KEY }}-install + - name: Restore fbthrift from cache + id: restore_fbthrift if: ${{ steps.paths.outputs.fbthrift_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.fbthrift_INSTALL }} + key: ${{ steps.paths.outputs.fbthrift_CACHE_KEY }}-install + - name: Build fbthrift + if: ${{ steps.paths.outputs.fbthrift_SOURCE && ! steps.restore_fbthrift.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fbthrift - - name: Build fb303 + - name: Save fbthrift to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.fbthrift_SOURCE && ! steps.restore_fbthrift.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.fbthrift_INSTALL }} + key: ${{ steps.paths.outputs.fbthrift_CACHE_KEY }}-install + - name: Restore fb303 from cache + id: restore_fb303 if: ${{ steps.paths.outputs.fb303_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.fb303_INSTALL }} + key: ${{ steps.paths.outputs.fb303_CACHE_KEY }}-install + - name: Build fb303 + if: ${{ steps.paths.outputs.fb303_SOURCE && ! steps.restore_fb303.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fb303 - - name: Build edencommon + - name: Save fb303 to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.fb303_SOURCE && ! steps.restore_fb303.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.fb303_INSTALL }} + key: ${{ steps.paths.outputs.fb303_CACHE_KEY }}-install + - name: Restore edencommon from cache + id: restore_edencommon if: ${{ steps.paths.outputs.edencommon_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.edencommon_INSTALL }} + key: ${{ steps.paths.outputs.edencommon_CACHE_KEY }}-install + - name: Build edencommon + if: ${{ steps.paths.outputs.edencommon_SOURCE && ! steps.restore_edencommon.outputs.cache-hit }} run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests edencommon + - name: Save edencommon to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.edencommon_SOURCE && ! steps.restore_edencommon.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.edencommon_INSTALL }} + key: ${{ steps.paths.outputs.edencommon_CACHE_KEY }}-install - name: Build watchman run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --src-dir=. watchman --project-install-prefix watchman:/usr/local - name: Copy artifacts diff --git a/.github/workflows/getdeps_windows.yml b/.github/workflows/getdeps_windows.yml index a337cf93a096..c273020cfcfd 100644 --- a/.github/workflows/getdeps_windows.yml +++ b/.github/workflows/getdeps_windows.yml @@ -126,99 +126,502 @@ jobs: - name: Fetch edencommon if: ${{ steps.paths.outputs.edencommon_SOURCE }} run: python build/fbcode_builder/getdeps.py fetch --no-tests edencommon - - name: Build boost + - name: Restore boost from cache + id: restore_boost if: ${{ steps.paths.outputs.boost_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.boost_INSTALL }} + key: ${{ steps.paths.outputs.boost_CACHE_KEY }}-install + - name: Build boost + if: ${{ steps.paths.outputs.boost_SOURCE && ! steps.restore_boost.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests boost - - name: Build ninja + - name: Save boost to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.boost_SOURCE && ! steps.restore_boost.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.boost_INSTALL }} + key: ${{ steps.paths.outputs.boost_CACHE_KEY }}-install + - name: Restore ninja from cache + id: restore_ninja if: ${{ steps.paths.outputs.ninja_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.ninja_INSTALL }} + key: ${{ steps.paths.outputs.ninja_CACHE_KEY }}-install + - name: Build ninja + if: ${{ steps.paths.outputs.ninja_SOURCE && ! steps.restore_ninja.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests ninja - - name: Build cmake + - name: Save ninja to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.ninja_SOURCE && ! steps.restore_ninja.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.ninja_INSTALL }} + key: ${{ steps.paths.outputs.ninja_CACHE_KEY }}-install + - name: Restore cmake from cache + id: restore_cmake if: ${{ steps.paths.outputs.cmake_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.cmake_INSTALL }} + key: ${{ steps.paths.outputs.cmake_CACHE_KEY }}-install + - name: Build cmake + if: ${{ steps.paths.outputs.cmake_SOURCE && ! steps.restore_cmake.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests cmake - - name: Build cpptoml + - name: Save cmake to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.cmake_SOURCE && ! steps.restore_cmake.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.cmake_INSTALL }} + key: ${{ steps.paths.outputs.cmake_CACHE_KEY }}-install + - name: Restore cpptoml from cache + id: restore_cpptoml if: ${{ steps.paths.outputs.cpptoml_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.cpptoml_INSTALL }} + key: ${{ steps.paths.outputs.cpptoml_CACHE_KEY }}-install + - name: Build cpptoml + if: ${{ steps.paths.outputs.cpptoml_SOURCE && ! steps.restore_cpptoml.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests cpptoml - - name: Build fmt + - name: Save cpptoml to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.cpptoml_SOURCE && ! steps.restore_cpptoml.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.cpptoml_INSTALL }} + key: ${{ steps.paths.outputs.cpptoml_CACHE_KEY }}-install + - name: Restore fmt from cache + id: restore_fmt if: ${{ steps.paths.outputs.fmt_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.fmt_INSTALL }} + key: ${{ steps.paths.outputs.fmt_CACHE_KEY }}-install + - name: Build fmt + if: ${{ steps.paths.outputs.fmt_SOURCE && ! steps.restore_fmt.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests fmt - - name: Build gflags + - name: Save fmt to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.fmt_SOURCE && ! steps.restore_fmt.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.fmt_INSTALL }} + key: ${{ steps.paths.outputs.fmt_CACHE_KEY }}-install + - name: Restore gflags from cache + id: restore_gflags if: ${{ steps.paths.outputs.gflags_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.gflags_INSTALL }} + key: ${{ steps.paths.outputs.gflags_CACHE_KEY }}-install + - name: Build gflags + if: ${{ steps.paths.outputs.gflags_SOURCE && ! steps.restore_gflags.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests gflags - - name: Build glog + - name: Save gflags to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.gflags_SOURCE && ! steps.restore_gflags.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.gflags_INSTALL }} + key: ${{ steps.paths.outputs.gflags_CACHE_KEY }}-install + - name: Restore glog from cache + id: restore_glog if: ${{ steps.paths.outputs.glog_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.glog_INSTALL }} + key: ${{ steps.paths.outputs.glog_CACHE_KEY }}-install + - name: Build glog + if: ${{ steps.paths.outputs.glog_SOURCE && ! steps.restore_glog.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests glog - - name: Build googletest + - name: Save glog to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.glog_SOURCE && ! steps.restore_glog.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.glog_INSTALL }} + key: ${{ steps.paths.outputs.glog_CACHE_KEY }}-install + - name: Restore googletest from cache + id: restore_googletest if: ${{ steps.paths.outputs.googletest_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.googletest_INSTALL }} + key: ${{ steps.paths.outputs.googletest_CACHE_KEY }}-install + - name: Build googletest + if: ${{ steps.paths.outputs.googletest_SOURCE && ! steps.restore_googletest.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests googletest - - name: Build libsodium + - name: Save googletest to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.googletest_SOURCE && ! steps.restore_googletest.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.googletest_INSTALL }} + key: ${{ steps.paths.outputs.googletest_CACHE_KEY }}-install + - name: Restore libsodium from cache + id: restore_libsodium if: ${{ steps.paths.outputs.libsodium_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.libsodium_INSTALL }} + key: ${{ steps.paths.outputs.libsodium_CACHE_KEY }}-install + - name: Build libsodium + if: ${{ steps.paths.outputs.libsodium_SOURCE && ! steps.restore_libsodium.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests libsodium - - name: Build xxhash + - name: Save libsodium to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.libsodium_SOURCE && ! steps.restore_libsodium.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.libsodium_INSTALL }} + key: ${{ steps.paths.outputs.libsodium_CACHE_KEY }}-install + - name: Restore xxhash from cache + id: restore_xxhash if: ${{ steps.paths.outputs.xxhash_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.xxhash_INSTALL }} + key: ${{ steps.paths.outputs.xxhash_CACHE_KEY }}-install + - name: Build xxhash + if: ${{ steps.paths.outputs.xxhash_SOURCE && ! steps.restore_xxhash.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests xxhash - - name: Build zstd + - name: Save xxhash to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.xxhash_SOURCE && ! steps.restore_xxhash.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.xxhash_INSTALL }} + key: ${{ steps.paths.outputs.xxhash_CACHE_KEY }}-install + - name: Restore zstd from cache + id: restore_zstd if: ${{ steps.paths.outputs.zstd_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.zstd_INSTALL }} + key: ${{ steps.paths.outputs.zstd_CACHE_KEY }}-install + - name: Build zstd + if: ${{ steps.paths.outputs.zstd_SOURCE && ! steps.restore_zstd.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests zstd - - name: Build double-conversion + - name: Save zstd to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.zstd_SOURCE && ! steps.restore_zstd.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.zstd_INSTALL }} + key: ${{ steps.paths.outputs.zstd_CACHE_KEY }}-install + - name: Restore double-conversion from cache + id: restore_double-conversion if: ${{ steps.paths.outputs.double-conversion_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.double-conversion_INSTALL }} + key: ${{ steps.paths.outputs.double-conversion_CACHE_KEY }}-install + - name: Build double-conversion + if: ${{ steps.paths.outputs.double-conversion_SOURCE && ! steps.restore_double-conversion.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests double-conversion - - name: Build fast_float + - name: Save double-conversion to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.double-conversion_SOURCE && ! steps.restore_double-conversion.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.double-conversion_INSTALL }} + key: ${{ steps.paths.outputs.double-conversion_CACHE_KEY }}-install + - name: Restore fast_float from cache + id: restore_fast_float if: ${{ steps.paths.outputs.fast_float_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.fast_float_INSTALL }} + key: ${{ steps.paths.outputs.fast_float_CACHE_KEY }}-install + - name: Build fast_float + if: ${{ steps.paths.outputs.fast_float_SOURCE && ! steps.restore_fast_float.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests fast_float - - name: Build libdwarf + - name: Save fast_float to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.fast_float_SOURCE && ! steps.restore_fast_float.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.fast_float_INSTALL }} + key: ${{ steps.paths.outputs.fast_float_CACHE_KEY }}-install + - name: Restore libdwarf from cache + id: restore_libdwarf if: ${{ steps.paths.outputs.libdwarf_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.libdwarf_INSTALL }} + key: ${{ steps.paths.outputs.libdwarf_CACHE_KEY }}-install + - name: Build libdwarf + if: ${{ steps.paths.outputs.libdwarf_SOURCE && ! steps.restore_libdwarf.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests libdwarf - - name: Build lz4 + - name: Save libdwarf to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.libdwarf_SOURCE && ! steps.restore_libdwarf.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.libdwarf_INSTALL }} + key: ${{ steps.paths.outputs.libdwarf_CACHE_KEY }}-install + - name: Restore lz4 from cache + id: restore_lz4 if: ${{ steps.paths.outputs.lz4_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.lz4_INSTALL }} + key: ${{ steps.paths.outputs.lz4_CACHE_KEY }}-install + - name: Build lz4 + if: ${{ steps.paths.outputs.lz4_SOURCE && ! steps.restore_lz4.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests lz4 - - name: Build snappy + - name: Save lz4 to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.lz4_SOURCE && ! steps.restore_lz4.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.lz4_INSTALL }} + key: ${{ steps.paths.outputs.lz4_CACHE_KEY }}-install + - name: Restore snappy from cache + id: restore_snappy if: ${{ steps.paths.outputs.snappy_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.snappy_INSTALL }} + key: ${{ steps.paths.outputs.snappy_CACHE_KEY }}-install + - name: Build snappy + if: ${{ steps.paths.outputs.snappy_SOURCE && ! steps.restore_snappy.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests snappy - - name: Build zlib + - name: Save snappy to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.snappy_SOURCE && ! steps.restore_snappy.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.snappy_INSTALL }} + key: ${{ steps.paths.outputs.snappy_CACHE_KEY }}-install + - name: Restore zlib from cache + id: restore_zlib if: ${{ steps.paths.outputs.zlib_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.zlib_INSTALL }} + key: ${{ steps.paths.outputs.zlib_CACHE_KEY }}-install + - name: Build zlib + if: ${{ steps.paths.outputs.zlib_SOURCE && ! steps.restore_zlib.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests zlib - - name: Build pcre2 + - name: Save zlib to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.zlib_SOURCE && ! steps.restore_zlib.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.zlib_INSTALL }} + key: ${{ steps.paths.outputs.zlib_CACHE_KEY }}-install + - name: Restore pcre2 from cache + id: restore_pcre2 if: ${{ steps.paths.outputs.pcre2_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.pcre2_INSTALL }} + key: ${{ steps.paths.outputs.pcre2_CACHE_KEY }}-install + - name: Build pcre2 + if: ${{ steps.paths.outputs.pcre2_SOURCE && ! steps.restore_pcre2.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests pcre2 - - name: Build python-setuptools + - name: Save pcre2 to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.pcre2_SOURCE && ! steps.restore_pcre2.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.pcre2_INSTALL }} + key: ${{ steps.paths.outputs.pcre2_CACHE_KEY }}-install + - name: Restore python-setuptools from cache + id: restore_python-setuptools if: ${{ steps.paths.outputs.python-setuptools_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.python-setuptools_INSTALL }} + key: ${{ steps.paths.outputs.python-setuptools_CACHE_KEY }}-install + - name: Build python-setuptools + if: ${{ steps.paths.outputs.python-setuptools_SOURCE && ! steps.restore_python-setuptools.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests python-setuptools - - name: Build jom + - name: Save python-setuptools to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.python-setuptools_SOURCE && ! steps.restore_python-setuptools.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.python-setuptools_INSTALL }} + key: ${{ steps.paths.outputs.python-setuptools_CACHE_KEY }}-install + - name: Restore jom from cache + id: restore_jom if: ${{ steps.paths.outputs.jom_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.jom_INSTALL }} + key: ${{ steps.paths.outputs.jom_CACHE_KEY }}-install + - name: Build jom + if: ${{ steps.paths.outputs.jom_SOURCE && ! steps.restore_jom.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests jom - - name: Build perl + - name: Save jom to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.jom_SOURCE && ! steps.restore_jom.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.jom_INSTALL }} + key: ${{ steps.paths.outputs.jom_CACHE_KEY }}-install + - name: Restore perl from cache + id: restore_perl if: ${{ steps.paths.outputs.perl_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.perl_INSTALL }} + key: ${{ steps.paths.outputs.perl_CACHE_KEY }}-install + - name: Build perl + if: ${{ steps.paths.outputs.perl_SOURCE && ! steps.restore_perl.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests perl - - name: Build openssl + - name: Save perl to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.perl_SOURCE && ! steps.restore_perl.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.perl_INSTALL }} + key: ${{ steps.paths.outputs.perl_CACHE_KEY }}-install + - name: Restore openssl from cache + id: restore_openssl if: ${{ steps.paths.outputs.openssl_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.openssl_INSTALL }} + key: ${{ steps.paths.outputs.openssl_CACHE_KEY }}-install + - name: Build openssl + if: ${{ steps.paths.outputs.openssl_SOURCE && ! steps.restore_openssl.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests openssl - - name: Build libevent + - name: Save openssl to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.openssl_SOURCE && ! steps.restore_openssl.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.openssl_INSTALL }} + key: ${{ steps.paths.outputs.openssl_CACHE_KEY }}-install + - name: Restore libevent from cache + id: restore_libevent if: ${{ steps.paths.outputs.libevent_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.libevent_INSTALL }} + key: ${{ steps.paths.outputs.libevent_CACHE_KEY }}-install + - name: Build libevent + if: ${{ steps.paths.outputs.libevent_SOURCE && ! steps.restore_libevent.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests libevent - - name: Build folly + - name: Save libevent to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.libevent_SOURCE && ! steps.restore_libevent.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.libevent_INSTALL }} + key: ${{ steps.paths.outputs.libevent_CACHE_KEY }}-install + - name: Restore folly from cache + id: restore_folly if: ${{ steps.paths.outputs.folly_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.folly_INSTALL }} + key: ${{ steps.paths.outputs.folly_CACHE_KEY }}-install + - name: Build folly + if: ${{ steps.paths.outputs.folly_SOURCE && ! steps.restore_folly.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests folly - - name: Build liboqs + - name: Save folly to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.folly_SOURCE && ! steps.restore_folly.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.folly_INSTALL }} + key: ${{ steps.paths.outputs.folly_CACHE_KEY }}-install + - name: Restore liboqs from cache + id: restore_liboqs if: ${{ steps.paths.outputs.liboqs_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.liboqs_INSTALL }} + key: ${{ steps.paths.outputs.liboqs_CACHE_KEY }}-install + - name: Build liboqs + if: ${{ steps.paths.outputs.liboqs_SOURCE && ! steps.restore_liboqs.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests liboqs - - name: Build fizz + - name: Save liboqs to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.liboqs_SOURCE && ! steps.restore_liboqs.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.liboqs_INSTALL }} + key: ${{ steps.paths.outputs.liboqs_CACHE_KEY }}-install + - name: Restore fizz from cache + id: restore_fizz if: ${{ steps.paths.outputs.fizz_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.fizz_INSTALL }} + key: ${{ steps.paths.outputs.fizz_CACHE_KEY }}-install + - name: Build fizz + if: ${{ steps.paths.outputs.fizz_SOURCE && ! steps.restore_fizz.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests fizz - - name: Build mvfst + - name: Save fizz to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.fizz_SOURCE && ! steps.restore_fizz.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.fizz_INSTALL }} + key: ${{ steps.paths.outputs.fizz_CACHE_KEY }}-install + - name: Restore mvfst from cache + id: restore_mvfst if: ${{ steps.paths.outputs.mvfst_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.mvfst_INSTALL }} + key: ${{ steps.paths.outputs.mvfst_CACHE_KEY }}-install + - name: Build mvfst + if: ${{ steps.paths.outputs.mvfst_SOURCE && ! steps.restore_mvfst.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests mvfst - - name: Build wangle + - name: Save mvfst to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.mvfst_SOURCE && ! steps.restore_mvfst.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.mvfst_INSTALL }} + key: ${{ steps.paths.outputs.mvfst_CACHE_KEY }}-install + - name: Restore wangle from cache + id: restore_wangle if: ${{ steps.paths.outputs.wangle_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.wangle_INSTALL }} + key: ${{ steps.paths.outputs.wangle_CACHE_KEY }}-install + - name: Build wangle + if: ${{ steps.paths.outputs.wangle_SOURCE && ! steps.restore_wangle.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests wangle - - name: Build fbthrift + - name: Save wangle to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.wangle_SOURCE && ! steps.restore_wangle.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.wangle_INSTALL }} + key: ${{ steps.paths.outputs.wangle_CACHE_KEY }}-install + - name: Restore fbthrift from cache + id: restore_fbthrift if: ${{ steps.paths.outputs.fbthrift_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.fbthrift_INSTALL }} + key: ${{ steps.paths.outputs.fbthrift_CACHE_KEY }}-install + - name: Build fbthrift + if: ${{ steps.paths.outputs.fbthrift_SOURCE && ! steps.restore_fbthrift.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests fbthrift - - name: Build fb303 + - name: Save fbthrift to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.fbthrift_SOURCE && ! steps.restore_fbthrift.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.fbthrift_INSTALL }} + key: ${{ steps.paths.outputs.fbthrift_CACHE_KEY }}-install + - name: Restore fb303 from cache + id: restore_fb303 if: ${{ steps.paths.outputs.fb303_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.fb303_INSTALL }} + key: ${{ steps.paths.outputs.fb303_CACHE_KEY }}-install + - name: Build fb303 + if: ${{ steps.paths.outputs.fb303_SOURCE && ! steps.restore_fb303.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests fb303 - - name: Build edencommon + - name: Save fb303 to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.fb303_SOURCE && ! steps.restore_fb303.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.fb303_INSTALL }} + key: ${{ steps.paths.outputs.fb303_CACHE_KEY }}-install + - name: Restore edencommon from cache + id: restore_edencommon if: ${{ steps.paths.outputs.edencommon_SOURCE }} + uses: actions/cache/restore@v4 + with: + path: ${{ steps.paths.outputs.edencommon_INSTALL }} + key: ${{ steps.paths.outputs.edencommon_CACHE_KEY }}-install + - name: Build edencommon + if: ${{ steps.paths.outputs.edencommon_SOURCE && ! steps.restore_edencommon.outputs.cache-hit }} run: python build/fbcode_builder/getdeps.py build --no-tests edencommon + - name: Save edencommon to cache + uses: actions/cache/save@v4 + if: ${{ steps.paths.outputs.edencommon_SOURCE && ! steps.restore_edencommon.outputs.cache-hit }} + with: + path: ${{ steps.paths.outputs.edencommon_INSTALL }} + key: ${{ steps.paths.outputs.edencommon_CACHE_KEY }}-install - name: Build watchman run: python build/fbcode_builder/getdeps.py build --src-dir=. watchman - name: Copy artifacts diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 138e729e7fff..5efd2efc638a 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -245,16 +245,16 @@ def __init__(self, cache, loader, m): self.loader = loader self.cache = cache - self.cache_file_name = "-".join( + self.cache_key = "-".join( ( m.name, self.ctx.get("os"), self.ctx.get("distro") or "none", self.ctx.get("distro_vers") or "none", self.project_hash, - "buildcache.tgz", ) ) + self.cache_file_name = self.cache_key + "-buildcache.tgz" def is_cacheable(self): """We only cache third party projects""" @@ -560,6 +560,7 @@ def run_project_cmd(self, args, loader, manifest): else: manifests = [manifest] + cache = cache_module.create_cache() for m in manifests: fetcher = loader.create_fetcher(m) if isinstance(fetcher, SystemPackageFetcher): @@ -569,6 +570,10 @@ def run_project_cmd(self, args, loader, manifest): continue src_dir = fetcher.get_src_dir() print(f"{m.name}_SOURCE={src_dir}") + inst_dir = loader.get_project_install_dir_respecting_install_prefix(m) + print(f"{m.name}_INSTALL={inst_dir}") + cached_project = CachedProject(cache, loader, m) + print(f"{m.name}_CACHE_KEY={cached_project.cache_key}") def setup_project_cmd_parser(self, parser): parser.add_argument( @@ -1235,16 +1240,50 @@ def write_job_for_platform(self, platform, args): # noqa: C901 src_dir_arg = "--src-dir=. " has_same_repo_dep = True - out.write(" - name: Build %s\n" % m.name) - if not src_dir_arg: - # only run the step if needed + if args.use_build_cache and not src_dir_arg: + out.write(f" - name: Restore {m.name} from cache\n") + out.write(f" id: restore_{m.name}\n") + # only need to restore if would build it out.write( f" if: ${{{{ steps.paths.outputs.{m.name}_SOURCE }}}}\n" ) + out.write(" uses: actions/cache/restore@v4\n") + out.write(" with:\n") + out.write( + f" path: ${{{{ steps.paths.outputs.{m.name}_INSTALL }}}}\n" + ) + out.write( + f" key: ${{{{ steps.paths.outputs.{m.name}_CACHE_KEY }}}}-install\n" + ) + + out.write(" - name: Build %s\n" % m.name) + if not src_dir_arg: + if args.use_build_cache: + out.write( + f" if: ${{{{ steps.paths.outputs.{m.name}_SOURCE && ! steps.restore_{m.name}.outputs.cache-hit }}}}\n" + ) + else: + out.write( + f" if: ${{{{ steps.paths.outputs.{m.name}_SOURCE }}}}\n" + ) out.write( f" run: {getdepscmd}{allow_sys_arg} build {build_type_arg}{src_dir_arg}{free_up_disk}--no-tests {m.name}\n" ) + if args.use_build_cache and not src_dir_arg: + out.write(f" - name: Save {m.name} to cache\n") + out.write(" uses: actions/cache/save@v4\n") + out.write( + f" if: ${{{{ steps.paths.outputs.{m.name}_SOURCE && ! steps.restore_{m.name}.outputs.cache-hit }}}}\n" + ) + out.write(" with:\n") + out.write( + f" path: ${{{{ steps.paths.outputs.{m.name}_INSTALL }}}}\n" + ) + out.write( + f" key: ${{{{ steps.paths.outputs.{m.name}_CACHE_KEY }}}}-install\n" + ) + out.write(" - name: Build %s\n" % manifest.name) project_prefix = "" @@ -1363,6 +1402,13 @@ def setup_project_cmd_parser(self, parser): action="store", default=None, ) + parser.add_argument( + "--no-build-cache", + action="store_false", + default=True, + dest="use_build_cache", + help="Do not attempt to use the build cache.", + ) def get_arg_var_name(args): diff --git a/build/fbcode_builder/getdeps/cargo.py b/build/fbcode_builder/getdeps/cargo.py index 5bb2ada85c2e..c1d6dae914cd 100644 --- a/build/fbcode_builder/getdeps/cargo.py +++ b/build/fbcode_builder/getdeps/cargo.py @@ -82,6 +82,14 @@ def recreate_dir(self, src, dst) -> None: shutil.rmtree(dst) simple_copytree(src, dst) + def recreate_linked_dir(self, src, dst) -> None: + if os.path.isdir(dst): + if os.path.islink(dst): + os.remove(dst) + elif os.path.isdir(dst): + shutil.rmtree(dst) + os.symlink(src, dst) + def cargo_config_file(self): build_source_dir = self.build_dir if self.cargo_config_file_subdir: @@ -191,7 +199,9 @@ def _build(self, reconfigure) -> None: ], ) - self.recreate_dir(build_source_dir, os.path.join(self.inst_dir, "source")) + self.recreate_linked_dir( + build_source_dir, os.path.join(self.inst_dir, "source") + ) def run_tests(self, schedule_type, owner, test_filter, retry, no_testpilot) -> None: if test_filter: From d0e920be2ccd183e76410214b21648bb4eb7b06d Mon Sep 17 00:00:00 2001 From: Alex Hornby Date: Tue, 7 Jan 2025 02:43:19 -0800 Subject: [PATCH 7349/7387] preserve http_proxy in generated github actions sudo invocatons Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1102 make it possible to run the generated github actions locally with [act](https://github.com/nektos/act) when behind a proxy by preserving http_proxy in generated github actions sudo invocatons also updated to consistently write `apt-get` instead of the interactive `apt` (we had a mix) example usage (substitute myproxy for your actual proxy): ``` mkdir $HOME/act-artifacts cd ~/fizz time act -r -j build -W .github/workflows/getdeps_linux.yml --artifact-server-path=$HOME/act-artifacts --artifact-server-addr=127.0.0.1 --cache-server-addr=127.0.0.1 --env http_proxy=http://myproxy:8080 --env https_proxy=myproxy:8080 --action-offline-mode ``` Reviewed By: bigfootjon Differential Revision: D67864689 fbshipit-source-id: 45695675ca5672e56104c8c33803afe004ff98da --- .github/workflows/getdeps_linux.yml | 4 ++-- build/fbcode_builder/getdeps.py | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/getdeps_linux.yml b/.github/workflows/getdeps_linux.yml index 723569aa10ce..b66430078752 100644 --- a/.github/workflows/getdeps_linux.yml +++ b/.github/workflows/getdeps_linux.yml @@ -19,9 +19,9 @@ jobs: steps: - uses: actions/checkout@v4 - name: Update system package info - run: sudo apt-get update + run: sudo --preserve-env=http_proxy apt-get update - name: Install system deps - run: sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive watchman && sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive patchelf + run: sudo --preserve-env=http_proxy python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive watchman && sudo --preserve-env=http_proxy python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive patchelf - id: paths name: Query paths run: python3 build/fbcode_builder/getdeps.py --allow-system-packages query-paths --recursive --src-dir=. watchman >> "$GITHUB_OUTPUT" diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 5efd2efc638a..968d3a41c581 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -440,7 +440,13 @@ def run_project_cmd(self, args, loader, manifest): elif manager == "deb": packages = sorted(set(all_packages["deb"])) if packages: - cmd_args = ["sudo", "apt", "install", "-y"] + packages + cmd_args = [ + "sudo", + "--preserve-env=http_proxy", + "apt-get", + "install", + "-y", + ] + packages elif manager == "homebrew": packages = sorted(set(all_packages["homebrew"])) if packages: @@ -1155,7 +1161,7 @@ def write_job_for_platform(self, platform, args): # noqa: C901 build_opts.allow_system_packages and build_opts.host_type.get_package_manager() ): - sudo_arg = "sudo " + sudo_arg = "sudo --preserve-env=http_proxy " allow_sys_arg = " --allow-system-packages" if build_opts.host_type.get_package_manager() == "deb": out.write(" - name: Update system package info\n") From df14d2e578119b937b7ad141f957308ee4d6ff87 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 7 Jan 2025 09:35:06 -0800 Subject: [PATCH 7350/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/e7e59eb1cde4503258d0f20cdaa31ce14d65f6e7 https://github.com/facebook/buck2-shims-meta/commit/80f0602c5da7da05a37b840246b6c3e2505f59ac https://github.com/facebook/fb303/commit/76b61d6e89330da75ef6d525b9395d7228e88a44 https://github.com/facebook/fbthrift/commit/ef2b40a0e0721359b16eb87467e1c63e011bbffc https://github.com/facebook/folly/commit/9a85079fc2385a8f0e7817c792d1abafca3a47f9 https://github.com/facebook/mvfst/commit/e4cfb0631a35126c52b6022cae0aa1bacecc425a https://github.com/facebook/proxygen/commit/11f351855f5aa8684b71e10e14d06048e02d9651 https://github.com/facebook/wangle/commit/d672ce845b0f1d23c3b578534fe02be97fff4baf https://github.com/facebookexperimental/edencommon/commit/9413c0df615ab4d74a820399d83b181ca214f154 https://github.com/facebookexperimental/rust-shed/commit/a031e413f70e284ecb201717745c6e7b5c4ce7dc https://github.com/facebookincubator/fizz/commit/0887cd3971e10781ebdd9048cfbcd064e2c5a19f https://github.com/facebookresearch/mvdust3r/commit/b88621493c8093bbdd0780ad009c9707fa2124d5 Reviewed By: JurjenLelifeld fbshipit-source-id: f091a3f0543e60db1bbf55e978e4ee3afa31dc0c --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c9c4b5ba4a38..a6e9d17d061c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 36f7a80163b8d6bc386954d2a440b8d5559e1336 +Subproject commit ef2b40a0e0721359b16eb87467e1c63e011bbffc diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index ee973d3d1d12..8e47c174ae20 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 7828768079d6876db2834bd75d7356757f88be86 +Subproject commit 9a85079fc2385a8f0e7817c792d1abafca3a47f9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0c69f23ae2ce..5f3128e6e746 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d5721807caf3afe0638ff29803ecacc8e4b91f77 +Subproject commit d672ce845b0f1d23c3b578534fe02be97fff4baf From 1f321aea165e95d1663e0319a1bd4e3ff8906484 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 8 Jan 2025 09:35:14 -0800 Subject: [PATCH 7351/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/590b2632e939ea2e8ed64d4079e1ea33bec007c3 https://github.com/facebook/fb303/commit/b651217a28196e7749391e94fcdf604538d3205e https://github.com/facebook/fbthrift/commit/f5f39773b04a64e8879977e96d8966e63d6279c5 https://github.com/facebook/folly/commit/b7954d2ef5c87b4583ae408cefb421baa7be804a https://github.com/facebook/mvfst/commit/4de0df68c75f1a678044b55dd3844d1167308e4b https://github.com/facebook/proxygen/commit/392459b46341173c68b78e72b9700e2da53f6579 https://github.com/facebook/wangle/commit/346e1ffd4cc31b2ca11c47e8cf4141eef81f4ac4 https://github.com/facebookexperimental/edencommon/commit/824d1296435118acbe01566ba0fa8e373adb519b https://github.com/facebookexperimental/rust-shed/commit/4c3cc2aea5ed8104c5efd515c2fbc5325c3b7dd7 https://github.com/facebookincubator/facebook-pixel-for-wordpress/commit/3f409bf7c512e0812d8fa310c6564bbcc06e65d2 https://github.com/facebookincubator/fizz/commit/c82fdf59ad20c874f31366754da47bde9c4c684d https://github.com/facebookresearch/mvdust3r/commit/1c4bfb6dec3605303738e2aa02b5653b3eece797 Reviewed By: JurjenLelifeld fbshipit-source-id: 9b1e51dd0ce235007f41d74f117434b551254bd0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a6e9d17d061c..ca195f0688dd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit ef2b40a0e0721359b16eb87467e1c63e011bbffc +Subproject commit f5f39773b04a64e8879977e96d8966e63d6279c5 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8e47c174ae20..e5f9fc5b1b2b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9a85079fc2385a8f0e7817c792d1abafca3a47f9 +Subproject commit b7954d2ef5c87b4583ae408cefb421baa7be804a diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 5f3128e6e746..9709cd2e1502 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d672ce845b0f1d23c3b578534fe02be97fff4baf +Subproject commit 346e1ffd4cc31b2ca11c47e8cf4141eef81f4ac4 From 611a2185323677dd74b1b426664e381df55d5f1f Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 9 Jan 2025 09:34:51 -0800 Subject: [PATCH 7352/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/307072ea1c2bc999a3e1907756a595fec75c14bf https://github.com/facebook/fb303/commit/71b0c19087e769ec1a78476c35a3b4b70b8366c0 https://github.com/facebook/fbthrift/commit/35c947e8e9d4bb9b1628a4419374ed3cb77f5c71 https://github.com/facebook/folly/commit/64b370a68917929aaad9a7b9cc43bf1a807f6258 https://github.com/facebook/mvfst/commit/1d82b3a1fdd4052793656abe31157c5b59bdd093 https://github.com/facebook/proxygen/commit/959d8e3244724639249316939d0a2b894d6fd0a4 https://github.com/facebook/wangle/commit/f31ed0bf9e41adcd3bf2e6834a71831f59bc8fcd https://github.com/facebookexperimental/edencommon/commit/c9d29167287e71ba62dd3f6717d630fc47acee8c https://github.com/facebookexperimental/rust-shed/commit/e651f7483a957e4275e6ca8ce120a67c669ac395 https://github.com/facebookincubator/fizz/commit/32cf75c618e43a1fa2d2451bd277c662d70bcec2 https://github.com/facebookresearch/mvdust3r/commit/91167a3b5418705e4d5d228a8b75564bffd9daf8 Reviewed By: JurjenLelifeld fbshipit-source-id: 2ee010941bcb7b6a4b59fc6e240ec1c7db0307b1 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index ca195f0688dd..c7217c22343c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit f5f39773b04a64e8879977e96d8966e63d6279c5 +Subproject commit 35c947e8e9d4bb9b1628a4419374ed3cb77f5c71 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index e5f9fc5b1b2b..a0c34d5cfe0c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit b7954d2ef5c87b4583ae408cefb421baa7be804a +Subproject commit 64b370a68917929aaad9a7b9cc43bf1a807f6258 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 9709cd2e1502..19f05a856898 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 346e1ffd4cc31b2ca11c47e8cf4141eef81f4ac4 +Subproject commit f31ed0bf9e41adcd3bf2e6834a71831f59bc8fcd From 217151d3ee0193ca27cae394d095606d385299e6 Mon Sep 17 00:00:00 2001 From: Jolene Tan Date: Thu, 9 Jan 2025 13:44:45 -0800 Subject: [PATCH 7353/7387] Upgrade liboqs to 0.12.0 Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1099 Fizz requires liboqs, if present, to be version >=0.11.0 Reviewed By: frqiu Differential Revision: D67806173 fbshipit-source-id: 2480028c023269ae5ff196a1aa102cb32677b2c9 --- build/fbcode_builder/manifests/liboqs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/manifests/liboqs b/build/fbcode_builder/manifests/liboqs index e1aaeea1c383..74dcfd5b329d 100644 --- a/build/fbcode_builder/manifests/liboqs +++ b/build/fbcode_builder/manifests/liboqs @@ -2,12 +2,15 @@ name = liboqs [download] -url = https://github.com/open-quantum-safe/liboqs/archive/refs/tags/0.10.1.tar.gz -sha256 = 00ca8aba65cd8c8eac00ddf978f4cac9dd23bb039f357448b60b7e3eed8f02da +url = https://github.com/open-quantum-safe/liboqs/archive/refs/tags/0.12.0.tar.gz +sha256 = df999915204eb1eba311d89e83d1edd3a514d5a07374745d6a9e5b2dd0d59c08 [build] builder = cmake -subdir = liboqs-0.10.1 +subdir = liboqs-0.12.0 + +[cmake.defines] +OQS_MINIMAL_BUILD = KEM_kyber_512;KEM_kyber_768;KEM_kyber_1024;KEM_ml_kem_512;KEM_ml_kem_768;KEM_ml_kem_1024 [dependencies] openssl From 5dc420bf70a3edd4175a0b69c9f91607e4db3047 Mon Sep 17 00:00:00 2001 From: Yifan Yuan Date: Fri, 10 Jan 2025 01:29:14 -0800 Subject: [PATCH 7354/7387] update libunwind version to avoid aarch64-related issues Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1108 the current libunwind v1.8.1 has compiler issues with aarch64 (https://github.com/libunwind/libunwind/issues/702). This has been fixed in more recent libunwind version. Reviewed By: chadaustin Differential Revision: D67800413 fbshipit-source-id: 6e924cf74909063be2319eb2263592f4c074e093 --- build/fbcode_builder/manifests/libunwind | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/manifests/libunwind b/build/fbcode_builder/manifests/libunwind index fda19209ad32..3f0a3bbf4569 100644 --- a/build/fbcode_builder/manifests/libunwind +++ b/build/fbcode_builder/manifests/libunwind @@ -9,10 +9,12 @@ libunwind [debs.not(distro=ubuntu)] libunwind-dev +# The current libunwind v1.8.1 release has compiler issues with aarch64 (https://github.com/libunwind/libunwind/issues/702). +# This more recent libunwind version (based on the latest commit, not a release version) got it fixed. [download] -url = https://github.com/libunwind/libunwind/releases/download/v1.8.1/libunwind-1.8.1.tar.gz -sha256 = ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157 +url = https://github.com/libunwind/libunwind/archive/f081cf42917bdd5c428b77850b473f31f81767cf.tar.gz +sha256 = 4ff5c335c02d225491d6c885db827fb5fa505fee4e68b4d7e866efc0087e7264 [build] builder = autoconf -subdir = libunwind-1.8.1 +subdir = libunwind-081cf42917bdd5c428b77850b473f31f81767cf From e6ae2cd1f992bae7870b06a6c21bfc1ac4b2e92c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 10 Jan 2025 09:35:21 -0800 Subject: [PATCH 7355/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/b6c8893aee1457ab0d188a7dd9e0f0b7c01d15fb https://github.com/facebook/buck2-shims-meta/commit/5e6fb9fd1e0f750f10d6c622a143e1c3dd9ea98e https://github.com/facebook/fb303/commit/68c069a912c36d2d2a2df307c24fb8fb0ad34a93 https://github.com/facebook/fbthrift/commit/8b689f8ef103a0e57c75915c8e1a3fe4ce714124 https://github.com/facebook/folly/commit/3b586154a4f77a5a4ee2fc884586bfaed05883f9 https://github.com/facebook/mvfst/commit/36633970b100681fbc807d1169d947aef4f22f96 https://github.com/facebook/proxygen/commit/88245e64bcaa3f13dbfd503ea6cbbdff2fbf2747 https://github.com/facebook/wangle/commit/1f2623a7ce9d762c28a5fb625efe072d562a3509 https://github.com/facebookexperimental/edencommon/commit/a2468d257abab2d7a2c8416c042de0cfbad669a7 https://github.com/facebookexperimental/rust-shed/commit/818e2e5e665a64798dd5919241372331955a09be https://github.com/facebookincubator/facebook-pixel-for-wordpress/commit/3b2c6fa08eb185e1c250a1c9e68ca63d3065cfa5 https://github.com/facebookincubator/fizz/commit/5cf9ce5ebd304167acfaf4eaee30ca2bf8899053 Reviewed By: JurjenLelifeld fbshipit-source-id: 21d5812f1538c85527261d22acd533e969659d05 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index c7217c22343c..9da7f46f4426 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 35c947e8e9d4bb9b1628a4419374ed3cb77f5c71 +Subproject commit 8b689f8ef103a0e57c75915c8e1a3fe4ce714124 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a0c34d5cfe0c..8ac67481be85 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 64b370a68917929aaad9a7b9cc43bf1a807f6258 +Subproject commit 3b586154a4f77a5a4ee2fc884586bfaed05883f9 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 19f05a856898..a9bfa506be12 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit f31ed0bf9e41adcd3bf2e6834a71831f59bc8fcd +Subproject commit 1f2623a7ce9d762c28a5fb625efe072d562a3509 From 452946ab49c33413e9f8175d18bca2d1c01c0c7b Mon Sep 17 00:00:00 2001 From: generatedunixname89002005287564 Date: Fri, 10 Jan 2025 11:19:54 -0800 Subject: [PATCH 7356/7387] Auto-fix lint violations from Fixit] fbcode//opensource/fbcode_builder/getdeps/test (#1109) Summary: Pull Request resolved: https://github.com/facebookincubator/zstrong/pull/1109 Reviewed By: ahornby, aleivag Differential Revision: D68009422 fbshipit-source-id: 1404341fe19ec0b001e93e4348590f0c4d1e0488 --- build/fbcode_builder/getdeps/test/manifest_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/getdeps/test/manifest_test.py b/build/fbcode_builder/getdeps/test/manifest_test.py index 05b2c58b1885..2bb133196419 100644 --- a/build/fbcode_builder/getdeps/test/manifest_test.py +++ b/build/fbcode_builder/getdeps/test/manifest_test.py @@ -231,4 +231,4 @@ def test_duplicate_manifest(self) -> None: if sys.version_info < (3, 2): def assertRaisesRegex(self, *args, **kwargs): - return self.assertRaisesRegexp(*args, **kwargs) + return self.assertRaisesRegex(*args, **kwargs) From c29881246cbf5c5bc69283a5f88d55ca6b7be116 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 11 Jan 2025 09:35:22 -0800 Subject: [PATCH 7357/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/ce25c17fc27752a0d79ee8e5c2d86c6568698d4f https://github.com/facebook/fbthrift/commit/bcaf2f06c16ea8ec295ce7420b3efc6bb2d5553c https://github.com/facebook/folly/commit/ac5512494ce6c8b3ec896bb1267ffb38dadf0473 https://github.com/facebook/mvfst/commit/2d5120ad01cb0b00b32ef827fea4d76327b27ba0 https://github.com/facebook/proxygen/commit/89c43de5b1dd69a26e7c3ddafa393628e07a999d https://github.com/facebook/wangle/commit/9eebb36d55cf0aedf67ee65117d2c5f714f6767f https://github.com/facebookexperimental/edencommon/commit/5462c46f13f207e9d408d852947f635016e2a263 https://github.com/facebookexperimental/rust-shed/commit/3c61cae46ccaf3c1a7fbf97b65784435deb46953 https://github.com/facebookincubator/fizz/commit/23f3850ec26932d5a968035f44534858df2b6949 Reviewed By: JurjenLelifeld fbshipit-source-id: 8f99bfdee9eaf7f2a869219c8c9da6611956efed --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 9da7f46f4426..610a5cbcaa34 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 8b689f8ef103a0e57c75915c8e1a3fe4ce714124 +Subproject commit bcaf2f06c16ea8ec295ce7420b3efc6bb2d5553c diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8ac67481be85..a7b35f3d707b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 3b586154a4f77a5a4ee2fc884586bfaed05883f9 +Subproject commit ac5512494ce6c8b3ec896bb1267ffb38dadf0473 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index a9bfa506be12..213411140967 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 1f2623a7ce9d762c28a5fb625efe072d562a3509 +Subproject commit 9eebb36d55cf0aedf67ee65117d2c5f714f6767f From fedef8a53badc97a7a832657dbdeb87c3ed88cf8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 12 Jan 2025 09:35:04 -0800 Subject: [PATCH 7358/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/7bfe530d7f00f5bd1787c4fcc21fa21cdfdcae00 https://github.com/facebook/fbthrift/commit/19d6e9738b44b5b69177479bb9a8832076b348d7 https://github.com/facebook/mvfst/commit/d8f10ba5ca5bf8f2085456c04360004f42b4ba88 https://github.com/facebook/proxygen/commit/fe06b868740afd23ded0034f6df746e5fb04821d https://github.com/facebook/wangle/commit/d11ed55ae214811d894b98d44536e828542e4651 https://github.com/facebookexperimental/edencommon/commit/fd439f716cf13ac6f022fba8d25379935edc524e https://github.com/facebookexperimental/rust-shed/commit/878cba5f484472dcc51b84b9631eb25e8ee3578a https://github.com/facebookincubator/fizz/commit/a66a0d59b8789572570475aaa8c9d59eeb464f4f Reviewed By: JurjenLelifeld fbshipit-source-id: 28b85cf27a9e38c58a1073c6429c928cf24111d7 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 610a5cbcaa34..792cfea6c709 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bcaf2f06c16ea8ec295ce7420b3efc6bb2d5553c +Subproject commit 19d6e9738b44b5b69177479bb9a8832076b348d7 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 213411140967..c9ef6025e728 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 9eebb36d55cf0aedf67ee65117d2c5f714f6767f +Subproject commit d11ed55ae214811d894b98d44536e828542e4651 From d87746ebdf91addf50227c77427e3f7e6aa7e048 Mon Sep 17 00:00:00 2001 From: Yifan Yuan Date: Mon, 13 Jan 2025 01:54:29 -0800 Subject: [PATCH 7359/7387] fixing typo in libunwind Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1111 as title Reviewed By: ahornby Differential Revision: D68023567 fbshipit-source-id: 388befe8d6a080b7cb912764508fa9daf092082c --- build/fbcode_builder/manifests/libunwind | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/manifests/libunwind b/build/fbcode_builder/manifests/libunwind index 3f0a3bbf4569..560edcd7907d 100644 --- a/build/fbcode_builder/manifests/libunwind +++ b/build/fbcode_builder/manifests/libunwind @@ -17,4 +17,4 @@ sha256 = 4ff5c335c02d225491d6c885db827fb5fa505fee4e68b4d7e866efc0087e7264 [build] builder = autoconf -subdir = libunwind-081cf42917bdd5c428b77850b473f31f81767cf +subdir = libunwind-f081cf42917bdd5c428b77850b473f31f81767cf From b52c7f73c8115dcb97b4c0bd858eaae6616166ac Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 13 Jan 2025 09:36:36 -0800 Subject: [PATCH 7360/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/d7098df5094a6898bdf4008a76033112cc9fb66f https://github.com/facebook/buck2-shims-meta/commit/fcefc53dbcd126c5d3b483d3270e0a5ba50ab5cf https://github.com/facebook/fb303/commit/9fccf42fecae253daeedca8f366c53212a921124 https://github.com/facebook/fbthrift/commit/50b90937feb036902f8824529d77ed6d6e5f9033 https://github.com/facebook/folly/commit/94a7bd4976a0ff53cae3ffd756add2d5df0a6d67 https://github.com/facebook/mvfst/commit/b2b4e9fd5cc2b8f46f8e449306121d267cf01857 https://github.com/facebook/proxygen/commit/6d891551687e698be382c3899ac5177a600635bf https://github.com/facebook/wangle/commit/576d5c0acc97035c9fb85b7d3e22250d8865391f https://github.com/facebookexperimental/edencommon/commit/acc634ffd2411889e04cc009e3019fb06039317a https://github.com/facebookexperimental/rust-shed/commit/0689efa29a2fc7d17c3e6c4703328b09a9bb607a https://github.com/facebookincubator/fizz/commit/0461cdced9bd3ff1f589051872674b2820509ab9 Reviewed By: ajb85 fbshipit-source-id: 1f7433651d24a834934004ce773572d965e4f3fe --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 792cfea6c709..03a71f6f03e3 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 19d6e9738b44b5b69177479bb9a8832076b348d7 +Subproject commit 50b90937feb036902f8824529d77ed6d6e5f9033 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a7b35f3d707b..8a3a8cca9320 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit ac5512494ce6c8b3ec896bb1267ffb38dadf0473 +Subproject commit 94a7bd4976a0ff53cae3ffd756add2d5df0a6d67 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c9ef6025e728..ca2d5765a48a 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d11ed55ae214811d894b98d44536e828542e4651 +Subproject commit 576d5c0acc97035c9fb85b7d3e22250d8865391f From e69b79fc8f5450eaf68be6b90d850149675f0fba Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 14 Jan 2025 09:35:22 -0800 Subject: [PATCH 7361/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/ab209e9295404fee2cf5a507272ec4ba7ef1ca3d https://github.com/facebook/fb303/commit/ba9ea428173bc74f952b2d08eddf8bc8476785ef https://github.com/facebook/fbthrift/commit/14c7e92570b4f7cd353581251b95583079e562f0 https://github.com/facebook/folly/commit/9007c1c7c9cedae979ede0a1ce876c050012f581 https://github.com/facebook/mvfst/commit/afee69d57700d32e34cfbbb10caecc2f10207416 https://github.com/facebook/proxygen/commit/468ad8033a83422bcea3b7e040dfc70b5575abf8 https://github.com/facebook/wangle/commit/02f76f813ee8fb570ae4a038a41213f56521a64d https://github.com/facebookexperimental/edencommon/commit/8b434a110a9f76b679180a7789570c583119ab35 https://github.com/facebookexperimental/rust-shed/commit/98c85be5d339933b8e945c80a157545baecf61be https://github.com/facebookincubator/fizz/commit/d4a050fe291df73165370d2acd538306f924f0ef Reviewed By: ajb85 fbshipit-source-id: 9c7c6b29141f5ae3b40cfeaba0fdbbf9ec573d78 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 03a71f6f03e3..b0a946f1244b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 50b90937feb036902f8824529d77ed6d6e5f9033 +Subproject commit 14c7e92570b4f7cd353581251b95583079e562f0 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 8a3a8cca9320..5878e1eb51a7 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 94a7bd4976a0ff53cae3ffd756add2d5df0a6d67 +Subproject commit 9007c1c7c9cedae979ede0a1ce876c050012f581 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index ca2d5765a48a..93242fbc419c 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 576d5c0acc97035c9fb85b7d3e22250d8865391f +Subproject commit 02f76f813ee8fb570ae4a038a41213f56521a64d From 1e6e27eb44f2fd9223e875f2eab5aed6b8f8c736 Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Tue, 14 Jan 2025 10:09:58 -0800 Subject: [PATCH 7362/7387] Merge mustache between fbcode and xplat Summary: Demonstrate feasibility of merging fbcode and xplat copies of thrift on a single target, `thrift/compiler/detail/mustache:mustache`. To this end: * Switch fbcode_builder from fbcode to xplat. * Map dependencies to the correct variants for fbcode. * Exclude mustache directory from target remapping. Once the merge is complete remapping rules will no longer be necessary at all, further reducing maintenance burden and complexity. * Remove one copy of mustache (~2.6kLOC). This also demonstrates that autodeps are working as expected after the fix in D67919546. Reviewed By: yoney Differential Revision: D67676056 fbshipit-source-id: ba3854c0997c4dd10f47a5e623381c3dadef4ecc --- build/fbcode_builder/manifests/fbthrift | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build/fbcode_builder/manifests/fbthrift b/build/fbcode_builder/manifests/fbthrift index 964b97cc028e..803163ccb39f 100644 --- a/build/fbcode_builder/manifests/fbthrift +++ b/build/fbcode_builder/manifests/fbthrift @@ -1,6 +1,6 @@ [manifest] name = fbthrift -fbsource_path = fbcode/thrift +fbsource_path = xplat/thrift shipit_project = fbthrift shipit_fbcode_builder = true @@ -37,11 +37,11 @@ xxhash python [shipit.pathmap] -fbcode/thrift/public_tld = . -fbcode/thrift = thrift +xplat/thrift/public_tld = . +xplat/thrift = thrift [shipit.strip] -^fbcode/thrift/thrift-config\.h$ -^fbcode/thrift/perf/canary.py$ -^fbcode/thrift/perf/loadtest.py$ -^fbcode/thrift/.castle/.* +^xplat/thrift/thrift-config\.h$ +^xplat/thrift/perf/canary.py$ +^xplat/thrift/perf/loadtest.py$ +^xplat/thrift/.castle/.* From 3c1616d84ff7d9543c3e3e7f09e84938f191d326 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 15 Jan 2025 09:37:14 -0800 Subject: [PATCH 7363/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/6bc175b3212d30a65b24280406b36158be309f1d https://github.com/facebook/fb303/commit/9172c36465b89f96dd20aae2ebc9ce064b7eca7b https://github.com/facebook/fbthrift/commit/b744781978634b318317c9c2191c0f6579b70168 https://github.com/facebook/folly/commit/69479fe413d3638827fde4b4418fef9a8413612d https://github.com/facebook/mvfst/commit/ceb40727c3e07a7501e38bd2867366e1285fa9bf https://github.com/facebook/proxygen/commit/8e783ebd8f1eac5c6c5cf9f82e5f07ab519ab460 https://github.com/facebook/wangle/commit/090a94b79b65b70b4f3e248d07997542f5429482 https://github.com/facebookexperimental/edencommon/commit/a6ae1e066f61b9ea8dfcfb14c3be113af81d6eeb https://github.com/facebookexperimental/rust-shed/commit/1d7c199b4b001096b9e28a256423504a9df3ee03 https://github.com/facebookincubator/fizz/commit/e1f180a119110fec61c2ab577b3eca457ae8c56b Reviewed By: ajb85 fbshipit-source-id: 80cf775174b571c56a0e26a01dd315fcc7fa8edf --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index b0a946f1244b..8c8be05983a9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 14c7e92570b4f7cd353581251b95583079e562f0 +Subproject commit b744781978634b318317c9c2191c0f6579b70168 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 5878e1eb51a7..da229f136080 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9007c1c7c9cedae979ede0a1ce876c050012f581 +Subproject commit 69479fe413d3638827fde4b4418fef9a8413612d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 93242fbc419c..544c3b49aaa6 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 02f76f813ee8fb570ae4a038a41213f56521a64d +Subproject commit 090a94b79b65b70b4f3e248d07997542f5429482 From 00aef294a5c69e48ac4b2a1bf1cce564045d541f Mon Sep 17 00:00:00 2001 From: generatedunixname226714639793621 Date: Wed, 15 Jan 2025 15:07:03 -0800 Subject: [PATCH 7364/7387] fbcode/eden/ [A] Reviewed By: MichaelCuevas Differential Revision: D68170270 fbshipit-source-id: b1265070a0ca79370d062b351b2cbc64a3e3bd19 --- eden/fs/service/eden.thrift | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index ed38eaf96b29..18e0feba7477 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -2810,6 +2810,10 @@ service EdenService extends fb303_core.BaseService { } // The following were automatically generated and may benefit from renaming. -typedef map ( - rust.type = "sorted_vector_map::SortedVectorMap", -) map_PathString_FileAttributeDataOrErrorV2_3516 +@thrift.DeprecatedUnvalidatedAnnotations{ + items = {"rust.type": "sorted_vector_map::SortedVectorMap"}, +} +typedef map< + PathString, + FileAttributeDataOrErrorV2 +> map_PathString_FileAttributeDataOrErrorV2_3516 From 99ed1678c3671bbbfb95d6dbd788e91f431377ed Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 16 Jan 2025 09:40:27 -0800 Subject: [PATCH 7365/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/dc47a8c75e33d9e800d8dbb8a598456c6d251dac https://github.com/facebook/fb303/commit/4380ec810a95458b55c064dfa673393a884f6a0b https://github.com/facebook/fbthrift/commit/13da71cb41726c6176d0c8f3d21fc4b408d41035 https://github.com/facebook/folly/commit/14c4e179c8293abad6a0a97b2d2b90b8870d56af https://github.com/facebook/mvfst/commit/a83a2c93fe831e1e7c88e1f52b446459c7a42dd1 https://github.com/facebook/proxygen/commit/987c9e64ca8c2f9904fa4b33e3c0589443bf3362 https://github.com/facebook/wangle/commit/d1f973b58e3aa882f29251b4754ec46f906a49bb https://github.com/facebookexperimental/edencommon/commit/1216fd4ff5c8443fcd2f968cff9702053425e646 https://github.com/facebookexperimental/rust-shed/commit/7e8e285b1e410a3aeaa8c89d607e48c2331639fb https://github.com/facebookincubator/fizz/commit/6419db6c249007c49c97d7cf3031089645ee5f95 https://github.com/facebookresearch/mvdust3r/commit/1940f0c9468d44c05d190a6458ff327a59f79bb6 Reviewed By: ajb85 fbshipit-source-id: 8678186dcf38af57baea30aeb52f7f003a718a59 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8c8be05983a9..4bb763809ba8 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit b744781978634b318317c9c2191c0f6579b70168 +Subproject commit 13da71cb41726c6176d0c8f3d21fc4b408d41035 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index da229f136080..72c4d525be3c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 69479fe413d3638827fde4b4418fef9a8413612d +Subproject commit 14c4e179c8293abad6a0a97b2d2b90b8870d56af diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 544c3b49aaa6..c33f25b9325f 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 090a94b79b65b70b4f3e248d07997542f5429482 +Subproject commit d1f973b58e3aa882f29251b4754ec46f906a49bb From 1408ee9c9abbbb1c493fe9ce3c58247961484bf8 Mon Sep 17 00:00:00 2001 From: Jon Maltiel Swenson Date: Thu, 16 Jan 2025 16:31:42 -0800 Subject: [PATCH 7366/7387] Minor tweaks to xz and libiberty builds Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1145 This diff contains a few changes to the xz and libiberty getdeps builds that are required in order for folly to build as a shared library, which in turn is needed for folly's Python extensions to build correctly. Reviewed By: hyuen Differential Revision: D68252093 fbshipit-source-id: 036bc4a0e7bf9a11f0a4aa6ec0014f7935afbb5b --- build/fbcode_builder/manifests/libiberty | 9 ++++----- build/fbcode_builder/manifests/xz | 3 --- .../patches/libiberty_install_pic_lib.patch | 13 +++++++++++++ 3 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 build/fbcode_builder/patches/libiberty_install_pic_lib.patch diff --git a/build/fbcode_builder/manifests/libiberty b/build/fbcode_builder/manifests/libiberty index da022dfcab3e..1e116f11e2b4 100644 --- a/build/fbcode_builder/manifests/libiberty +++ b/build/fbcode_builder/manifests/libiberty @@ -9,19 +9,18 @@ binutils binutils-dev [download] -url = https://ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz -sha256 = f6e4d41fd5fc778b06b7891457b3620da5ecea1006c6a4a41ae998109f85a800 +url = https://ftp.gnu.org/gnu/binutils/binutils-2.43.tar.xz +sha256 = b53606f443ac8f01d1d5fc9c39497f2af322d99e14cea5c0b4b124d630379365 [dependencies] zlib [build] builder = autoconf -subdir = binutils-2.42/libiberty +subdir = binutils-2.43/libiberty +patchfile = libiberty_install_pic_lib.patch # only build the parts needed for demangling # as we still want to use system linker and assembler etc [autoconf.args] ---disable-shared ---disable-testsuite --enable-install-libiberty diff --git a/build/fbcode_builder/manifests/xz b/build/fbcode_builder/manifests/xz index e6c0808ff01f..6552f2871a5d 100644 --- a/build/fbcode_builder/manifests/xz +++ b/build/fbcode_builder/manifests/xz @@ -18,6 +18,3 @@ sha256 = f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10 [build] builder = autoconf subdir = xz-5.2.5 - -[autoconf.args] ---disable-shared diff --git a/build/fbcode_builder/patches/libiberty_install_pic_lib.patch b/build/fbcode_builder/patches/libiberty_install_pic_lib.patch new file mode 100644 index 000000000000..6346c3b30cda --- /dev/null +++ b/build/fbcode_builder/patches/libiberty_install_pic_lib.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index b77a41c..cbe71fe 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -389,7 +389,7 @@ MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory` + install_to_libdir: all + if test -n "${target_header_dir}"; then \ + ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ +- $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \ ++ $(INSTALL_DATA) pic/$(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \ + ( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ); \ + mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB); \ + case "${target_header_dir}" in \ From 150318644b2a59717b877d04af28be5c7b4ad82c Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 17 Jan 2025 09:37:27 -0800 Subject: [PATCH 7367/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/f80ca5d6a6124454f08f3359a4b626985093fefa https://github.com/facebook/buck2-shims-meta/commit/df09226e8022572c3840179f33267099050db94f https://github.com/facebook/fb303/commit/dcdadc8bbc64681511679bdb2fe4cd1f22edf3d8 https://github.com/facebook/fbthrift/commit/cf4395572c039076c229d554498cf0aadf35d493 https://github.com/facebook/folly/commit/4a78cb578fd4087f2a09732b37ce2aba3df63853 https://github.com/facebook/mvfst/commit/bf2b2fea01a081c1ba8e1fcffcd4ba42220e7d0d https://github.com/facebook/proxygen/commit/f2e2414e2a3fc22182c33df74dc6189093b65e4e https://github.com/facebook/wangle/commit/7572b3cb1515dc048b877b249bbf8cb15348bae1 https://github.com/facebookexperimental/edencommon/commit/405f5269b5696a4293ca2428cc23cee90f411473 https://github.com/facebookexperimental/rust-shed/commit/c251e543ef24655cd72d563902052348f77145b8 https://github.com/facebookincubator/fizz/commit/b4a3ccc0867a578ef6285d5646bd64361830b9bd Reviewed By: ajb85 fbshipit-source-id: dc8ef08c48d2354def23fd75bc1236d0b3171f57 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4bb763809ba8..4e4615c235c9 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 13da71cb41726c6176d0c8f3d21fc4b408d41035 +Subproject commit cf4395572c039076c229d554498cf0aadf35d493 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 72c4d525be3c..43081218c46a 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 14c4e179c8293abad6a0a97b2d2b90b8870d56af +Subproject commit 4a78cb578fd4087f2a09732b37ce2aba3df63853 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index c33f25b9325f..bb80ff95b9c0 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit d1f973b58e3aa882f29251b4754ec46f906a49bb +Subproject commit 7572b3cb1515dc048b877b249bbf8cb15348bae1 From e792889c91531b2ddb4e508f60cb36bfa0733ec6 Mon Sep 17 00:00:00 2001 From: Chris Dinh Date: Fri, 17 Jan 2025 10:59:07 -0800 Subject: [PATCH 7368/7387] Rename subscribeStreamTemporary to subscribeStreamChangesSince Summary: # Context SubscribeStreamTemporary is a function that allows users to recieve notifications whenever there is a change to the edenFS journal. Despite intended to be a temporary function, it's been named as such for about 6 years. # This Diff Creates a new function subscribeStreamChangesSince. Move the logic of subscribeStreamTemporary to this new function and have subscribeStreamTemporary call it. Reviewed By: jdelliot Differential Revision: D68220555 fbshipit-source-id: de630f60dd66fba77ba3935ca27d95e994acbc7c --- eden/fs/service/streamingeden.thrift | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/eden/fs/service/streamingeden.thrift b/eden/fs/service/streamingeden.thrift index ac968f2d27ed..3908e566815b 100644 --- a/eden/fs/service/streamingeden.thrift +++ b/eden/fs/service/streamingeden.thrift @@ -110,25 +110,26 @@ typedef binary EdenStartStatusUpdate */ service StreamingEdenService extends eden.EdenService { /** - * Request notification about changes to the journal for - * the specified mountPoint. + * subscribeStreamTemporary is deprecated. Please use streamJournalChanged. + */ + stream subscribeStreamTemporary( + 1: eden.PathString mountPoint, + ) (deprecated); + + /** + * + * Returns a stream of "events" indicating that the Journal has changed. * * IMPORTANT: Do not use the JournalPosition values in the stream. They are - * meaningless. Instead, call getFilesChangedSince or + * meaningless. Instead, call changesSinceV2 or * getCurrentJournalPosition which will return up-to-date information and * unblock future notifications on this subscription. If the subscriber - * never calls getFilesChangedSince or getCurrentJournalPosition in + * never calls changesSinceV2 or getCurrentJournalPosition in * response to a notification on this stream, future notifications may not * arrive. - * - * This is an implementation of the subscribe API using the - * new rsocket based streaming thrift protocol. - * The name is temporary: we want to make some API changes - * but want to start pushing out an implementation now because - * we've seen inflated memory usage for the older `subscribe` - * method above. + */ - stream subscribeStreamTemporary( + stream streamJournalChanged( 1: eden.PathString mountPoint, ); From 207a42974b4d3f0e8a189f609512608cce51d63d Mon Sep 17 00:00:00 2001 From: Chris Dinh Date: Fri, 17 Jan 2025 10:59:07 -0800 Subject: [PATCH 7369/7387] Add call+fallback for streamJournalChanged to watchman Summary: # Context SubscribeStreamTemporary is a function that allows users to recieve notifications whenever there is a change to the edenFS journal. Despite intended to be a temporary function, it's been named as such for about 6 years. # This Diff This diff replaces the call for watchman to subscribeStreamTemporary with a call for streamJournalChanged. It adds a fallback call for older versions without streamJournalChanged Reviewed By: jdelliot Differential Revision: D68240121 fbshipit-source-id: 0c3f9e98060bf80c1e0e78b06d8ac102a8a19060 --- watchman/watcher/eden.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index e4209a4881cf..772285fbd76e 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -1068,8 +1068,19 @@ class EdenView final : public QueryableView { GetJournalPositionCallback& getJournalPositionCallback, std::chrono::milliseconds settleTimeout) { auto client = getEdenClient(thriftChannel_); - auto stream = client->sync_subscribeStreamTemporary( - std::string(root->root_path.data(), root->root_path.size())); + apache::thrift::ClientBufferedStream<::facebook::eden::JournalPosition> + stream; + try { + stream = client->sync_streamJournalChanged( + std::string(root->root_path.data(), root->root_path.size())); + } catch (const apache::thrift::TApplicationException& exc) { + log(DBG, + "running eden version does not have streamJournalChanged, falling back to subscribeStreamTemporary: ", + exc.what(), + "\n"); + stream = client->sync_subscribeStreamTemporary( + std::string(root->root_path.data(), root->root_path.size())); + } return std::move(stream).subscribeExTry( &subscriberEventBase_, [&settleCallback, From 34383e0feefc388be1fddac39c4a5dc9681cdf59 Mon Sep 17 00:00:00 2001 From: generatedunixname89002005307016 Date: Fri, 17 Jan 2025 14:36:30 -0800 Subject: [PATCH 7370/7387] Add missing Pyre mode headers] [batch:19/1531] [shard:41/N] Differential Revision: D68319423 fbshipit-source-id: aca02063fb6092db7261d5264a6b34a4c60aa7da --- watchman/node/bser/test_bser.py | 2 ++ watchman/python/pywatchman/__init__.py | 2 ++ watchman/python/pywatchman/capabilities.py | 2 ++ watchman/python/pywatchman/encoding.py | 2 ++ watchman/python/pywatchman/load.py | 2 ++ watchman/python/pywatchman/pybser.py | 2 ++ watchman/python/pywatchman/windows.py | 2 ++ watchman/python/pywatchman_aio/__init__.py | 2 ++ watchman/python/tests/tests.py | 2 ++ 9 files changed, 18 insertions(+) diff --git a/watchman/node/bser/test_bser.py b/watchman/node/bser/test_bser.py index 756d0d84cb9e..34e316377a43 100644 --- a/watchman/node/bser/test_bser.py +++ b/watchman/node/bser/test_bser.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import distutils.spawn import os import shutil diff --git a/watchman/python/pywatchman/__init__.py b/watchman/python/pywatchman/__init__.py index 6c57a2be0e11..54580145c9ec 100644 --- a/watchman/python/pywatchman/__init__.py +++ b/watchman/python/pywatchman/__init__.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import inspect import math diff --git a/watchman/python/pywatchman/capabilities.py b/watchman/python/pywatchman/capabilities.py index 3fbf8c291686..80a05e1c6ce2 100644 --- a/watchman/python/pywatchman/capabilities.py +++ b/watchman/python/pywatchman/capabilities.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import re diff --git a/watchman/python/pywatchman/encoding.py b/watchman/python/pywatchman/encoding.py index 629929a1e105..ee1d73653d62 100644 --- a/watchman/python/pywatchman/encoding.py +++ b/watchman/python/pywatchman/encoding.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import sys diff --git a/watchman/python/pywatchman/load.py b/watchman/python/pywatchman/load.py index babb8d4115f0..843dbcb8e9b6 100644 --- a/watchman/python/pywatchman/load.py +++ b/watchman/python/pywatchman/load.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import ctypes diff --git a/watchman/python/pywatchman/pybser.py b/watchman/python/pywatchman/pybser.py index db3a95ecd82e..3122afc9a24b 100644 --- a/watchman/python/pywatchman/pybser.py +++ b/watchman/python/pywatchman/pybser.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import binascii import collections.abc as collections_abc diff --git a/watchman/python/pywatchman/windows.py b/watchman/python/pywatchman/windows.py index 80e53d289e5f..49a0a5f6cae5 100644 --- a/watchman/python/pywatchman/windows.py +++ b/watchman/python/pywatchman/windows.py @@ -3,6 +3,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import ctypes import ctypes.wintypes diff --git a/watchman/python/pywatchman_aio/__init__.py b/watchman/python/pywatchman_aio/__init__.py index 592a7e3b9685..4e8d3e1ae6e9 100644 --- a/watchman/python/pywatchman_aio/__init__.py +++ b/watchman/python/pywatchman_aio/__init__.py @@ -4,6 +4,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import asyncio import os diff --git a/watchman/python/tests/tests.py b/watchman/python/tests/tests.py index 5b2c4410fcdf..fa1f125cd12c 100755 --- a/watchman/python/tests/tests.py +++ b/watchman/python/tests/tests.py @@ -5,6 +5,8 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +# pyre-unsafe + import binascii import collections From 6e7b25ec4faebf9e59f001c9db4bddbcaeede0a6 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 18 Jan 2025 09:36:00 -0800 Subject: [PATCH 7371/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/856a3ec7bc67691a57994bee455842aeb57dfc9a https://github.com/facebook/fb303/commit/cd81fc49f117448e2ccc7a4ad5e25c2a44b6102a https://github.com/facebook/fbthrift/commit/13a122b13c4503a5fd49d1f111f41ce85afd0110 https://github.com/facebook/folly/commit/f1c1542fb071e9d88181279ec24043400222aef1 https://github.com/facebook/mvfst/commit/c64c82aa0e2a010fa6010e88b93f9bcae6a02afd https://github.com/facebook/proxygen/commit/370a80b546a3243d1dfdb088c8b7f2395ac33e9b https://github.com/facebook/wangle/commit/a6a7eaf6534ef557937456ba32b34efd2a0c82cc https://github.com/facebookexperimental/edencommon/commit/22d409028e706bb9cd4674347e6399d3338a29f3 https://github.com/facebookexperimental/rust-shed/commit/9737eeac65ee6f755d0d80625743d9e4968338f0 https://github.com/facebookincubator/fizz/commit/0a27723d4add7d75bdac6da274d4d7f3db6cf990 Reviewed By: ajb85 fbshipit-source-id: 06d7ad6ebf1c55c6339d04419c70a2fdabd65d3a --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 4e4615c235c9..f655df77bcb2 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cf4395572c039076c229d554498cf0aadf35d493 +Subproject commit 13a122b13c4503a5fd49d1f111f41ce85afd0110 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 43081218c46a..13d3cadc4ace 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 4a78cb578fd4087f2a09732b37ce2aba3df63853 +Subproject commit f1c1542fb071e9d88181279ec24043400222aef1 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index bb80ff95b9c0..bb2230052d74 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 7572b3cb1515dc048b877b249bbf8cb15348bae1 +Subproject commit a6a7eaf6534ef557937456ba32b34efd2a0c82cc From 3f73adf11b3a630f4faad7bdb944284cc90529b8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 19 Jan 2025 09:34:39 -0800 Subject: [PATCH 7372/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/7f49f9c87b4a1addaa18bf3bd331273edf36f31a https://github.com/facebook/fbthrift/commit/9f52858a415ac5a0cb68e35812096544c5969315 https://github.com/facebook/mvfst/commit/646bd6b3b582b29a0966868d4ed75dfe19a8f80c https://github.com/facebook/proxygen/commit/02d68f7fe3fc29e7ae07d61d6bdec101aada7611 https://github.com/facebook/wangle/commit/68f3ae2b25a47a50f6af3eb6a92a7243d7e0c1fa https://github.com/facebookexperimental/edencommon/commit/e78f53ad329ac7339e7afc4a4d512daaed364c1b https://github.com/facebookexperimental/rust-shed/commit/ae3835da9a670263516b99f8fef535f7b0081896 https://github.com/facebookincubator/fizz/commit/f007763f483c17a9bba178f2e24337a6959b1eca Reviewed By: ajb85 fbshipit-source-id: 395397b862c0a5149229260be8bf7be0193532cf --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f655df77bcb2..d9a06e79541b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 13a122b13c4503a5fd49d1f111f41ce85afd0110 +Subproject commit 9f52858a415ac5a0cb68e35812096544c5969315 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index bb2230052d74..b8471fa9d410 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit a6a7eaf6534ef557937456ba32b34efd2a0c82cc +Subproject commit 68f3ae2b25a47a50f6af3eb6a92a7243d7e0c1fa From ba2747a8b356df502830e45418fccd68f9b84f24 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Mon, 20 Jan 2025 03:15:03 -0800 Subject: [PATCH 7373/7387] Support GHC 9.2.8 in the OSS build Summary: X-link: https://github.com/facebookincubator/Glean/pull/482 X-link: https://github.com/facebookincubator/zstrong/pull/1147 Reviewed By: josefs Differential Revision: D68326697 fbshipit-source-id: 4aaebfe64b6b481ae1c8857f850c722507be4ff2 --- build/fbcode_builder/manifests/ghc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/fbcode_builder/manifests/ghc b/build/fbcode_builder/manifests/ghc index 0e452195c21d..2da8f5ffd5d9 100644 --- a/build/fbcode_builder/manifests/ghc +++ b/build/fbcode_builder/manifests/ghc @@ -2,12 +2,12 @@ name = ghc [download.os=linux] -url = https://downloads.haskell.org/~ghc/8.10.7/ghc-8.10.7-x86_64-fedora27-linux.tar.xz -sha256 = b6ed67049a23054a8042e65c9976d5e196e5ee4e83b29b2ee35c8a22ab1e5b73 +url = https://downloads.haskell.org/~ghc/9.2.8/ghc-9.2.8-x86_64-fedora27-linux.tar.xz +sha256 = 845f63cd365317bb764d81025554a2527dbe315d6fa268c9859e21b911bf2d3c [build] builder = autoconf -subdir = ghc-8.10.7 +subdir = ghc-9.2.8 build_in_src_dir = true only_install = true From baf5e3600d5277aa42616fab1e0183a3fd17332e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 20 Jan 2025 09:35:34 -0800 Subject: [PATCH 7374/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/a979e497eb1df99e664120eb498aece9f9cddeba https://github.com/facebook/facebook-for-woocommerce/commit/20397efbd41d39df7bba948f964d95a5e51913d5 https://github.com/facebook/fb303/commit/494285413ac97da93ee318dcf60e855e9509ed48 https://github.com/facebook/fbthrift/commit/2979524b28f0519adc1c6150a689c5436953b22e https://github.com/facebook/folly/commit/0ca60440cd8bc7292e724ff5e5aff3ffb0cc9e63 https://github.com/facebook/mvfst/commit/44205f7461d66876d4522fac92dc63d0a7944577 https://github.com/facebook/proxygen/commit/e3aa2255eb1f1cee50b3844005bea43b0aec526f https://github.com/facebook/wangle/commit/5c6eca0480be716378aa4ef0adef89e44c01c4c9 https://github.com/facebookexperimental/edencommon/commit/10a6b1e11294c6c32566921742e60ed830c7c6de https://github.com/facebookexperimental/rust-shed/commit/60b13bcfad43a6ec790d5e88372f70170dc0489b https://github.com/facebookincubator/fizz/commit/fb537485ad194e857459a92066844a564ea327cc Reviewed By: bigfootjon fbshipit-source-id: eb0f5dcce49fdae9ac4000ea5f9d0a637be88b4f --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d9a06e79541b..dd64adf00ff1 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9f52858a415ac5a0cb68e35812096544c5969315 +Subproject commit 2979524b28f0519adc1c6150a689c5436953b22e diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 13d3cadc4ace..21136fd26680 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit f1c1542fb071e9d88181279ec24043400222aef1 +Subproject commit 0ca60440cd8bc7292e724ff5e5aff3ffb0cc9e63 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b8471fa9d410..0cac4be55dfc 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 68f3ae2b25a47a50f6af3eb6a92a7243d7e0c1fa +Subproject commit 5c6eca0480be716378aa4ef0adef89e44c01c4c9 From 037be86ab5d2cb94b9d2f4d485620efcfaea06cb Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Tue, 21 Jan 2025 01:37:32 -0800 Subject: [PATCH 7375/7387] Add GHC 9.2.8 to github CI Summary: X-link: https://github.com/facebookincubator/zstrong/pull/1149 X-link: https://github.com/facebookincubator/Glean/pull/483 Reviewed By: josefs Differential Revision: D68326850 fbshipit-source-id: 2cde0d2b133781ae7ffdfa59dfe782ba0bf74761 --- build/fbcode_builder/manifests/glean | 1 + 1 file changed, 1 insertion(+) diff --git a/build/fbcode_builder/manifests/glean b/build/fbcode_builder/manifests/glean index 7cb422c9b979..a8d3466dc0e0 100644 --- a/build/fbcode_builder/manifests/glean +++ b/build/fbcode_builder/manifests/glean @@ -31,6 +31,7 @@ builder = make [make.build_args] cabal-update all +glean-hiedb glass glean-clang EXTRA_GHC_OPTS=-j4 +RTS -A32m -n4m -RTS From e8eece7142c7eb2caaf34f6a53250c67ce086e23 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 21 Jan 2025 09:35:43 -0800 Subject: [PATCH 7376/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/0119f68a22ebc1934cb278e6581ffdc1cb3a6f3b https://github.com/facebook/fb303/commit/e9e7e368fa0d5c3db31bb87297a77fc43494b79d https://github.com/facebook/fbthrift/commit/84d64ccee636375fcce063b0bf07e19188dfb808 https://github.com/facebook/folly/commit/95c9b2b57fa47f316a4c6d7b89c12e93346df04e https://github.com/facebook/mvfst/commit/0fb2f673dd29d16c28dcaf168f6563ebf41e151b https://github.com/facebook/proxygen/commit/8ab1a04e36901a55ef68867ff147fac48d72abfa https://github.com/facebook/wangle/commit/77ab2ac5f6fd36da304d96b76de5cd28359e3035 https://github.com/facebookexperimental/edencommon/commit/309e215fa58e40536bec3fef3f866f2a1940f893 https://github.com/facebookexperimental/rust-shed/commit/4aefa76398b9a884cce4e1522b59a75845b5d935 https://github.com/facebookincubator/facebook-pixel-for-wordpress/commit/ad9eaebecd0bf4518747160497f702c674b1583b https://github.com/facebookincubator/fizz/commit/8bdef3795c11069ab99e3d81e2453410d08b4a29 Reviewed By: bigfootjon fbshipit-source-id: 3bfa955b5880bd8b90913e51a7829c96c7e19203 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index dd64adf00ff1..116e482f25fd 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 2979524b28f0519adc1c6150a689c5436953b22e +Subproject commit 84d64ccee636375fcce063b0bf07e19188dfb808 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 21136fd26680..86e5b5da4bf2 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 0ca60440cd8bc7292e724ff5e5aff3ffb0cc9e63 +Subproject commit 95c9b2b57fa47f316a4c6d7b89c12e93346df04e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 0cac4be55dfc..2b81f0749b49 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 5c6eca0480be716378aa4ef0adef89e44c01c4c9 +Subproject commit 77ab2ac5f6fd36da304d96b76de5cd28359e3035 From e612230a36cc779568e60fe30af493b49baba09e Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 22 Jan 2025 21:42:01 -0800 Subject: [PATCH 7377/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/cc2b297ff0a01a513d0cc50c285e1fa9485545aa https://github.com/facebook/buck2-shims-meta/commit/2e34abf3f04ee81a06f43a73ffeafbf6780bb513 https://github.com/facebook/fb303/commit/215e9c70afcc436df99402a5295aa4adac560b83 https://github.com/facebook/fbthrift/commit/9a67d5b6bfd28474ff1c1f5faca223b2337c9034 https://github.com/facebook/folly/commit/28c1fb03fc3289c846afa7ac76205ad9b4be29ff https://github.com/facebook/mvfst/commit/d0c124fe158a3215c187d5db07ad4e186fc72b46 https://github.com/facebook/proxygen/commit/cb05fe9cd9141d072dec3edaaeef27039e68d81e https://github.com/facebook/wangle/commit/fe27504015cc610950234fc5e31f095c633d3844 https://github.com/facebookexperimental/edencommon/commit/114a775267d88958529da89a79700f5834b1cba7 https://github.com/facebookexperimental/rust-shed/commit/440cf21e0bab8ab0b61d8b70ab0518f71a8f2eac https://github.com/facebookincubator/fizz/commit/d6c9a5adae8a6f666ece05b0204eb297c254ac07 https://github.com/facebookresearch/mvdust3r/commit/2a089a7c3c0ed00c9a2bcf1e361a762cc3a730c3 Reviewed By: bigfootjon fbshipit-source-id: e0f398b361b5248853fddca2a1f50a4b31b16eb6 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 116e482f25fd..8385d666abda 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 84d64ccee636375fcce063b0bf07e19188dfb808 +Subproject commit 9a67d5b6bfd28474ff1c1f5faca223b2337c9034 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 86e5b5da4bf2..70be55ff7d7c 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 95c9b2b57fa47f316a4c6d7b89c12e93346df04e +Subproject commit 28c1fb03fc3289c846afa7ac76205ad9b4be29ff diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 2b81f0749b49..841d42cba76d 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 77ab2ac5f6fd36da304d96b76de5cd28359e3035 +Subproject commit fe27504015cc610950234fc5e31f095c633d3844 From a1f8d9210318b04ec6c34168146155835f0063bf Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 23 Jan 2025 09:36:52 -0800 Subject: [PATCH 7378/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/fb303/commit/bb107e122c4f1a41b04cdf0d205c6b4aec2bc75e https://github.com/facebook/fbthrift/commit/9cc7d2e41a15d44b2d7232f205fc35aacc190c9b https://github.com/facebook/folly/commit/9e54a45ed40abd094528da68e3c36b6c0d4574ec https://github.com/facebook/mvfst/commit/8a0ef54c64d209d8edb7f07fb3eba0fa58a0327b https://github.com/facebook/proxygen/commit/a5a20959c81483ff97fdbbc0a92e4991a7c7b3de https://github.com/facebook/wangle/commit/85f5393d3ca0caa221168449628475e241ab44df https://github.com/facebookexperimental/edencommon/commit/6679fec717d91280f4c37fab5b4769d9078342f6 https://github.com/facebookexperimental/rust-shed/commit/b893682f35e2a7ddc574bf23846aaf511612242b https://github.com/facebookincubator/fizz/commit/6b976b79093d7cad71b2c3b363d30857ba99fba4 Reviewed By: bigfootjon fbshipit-source-id: 7628394d38883b9d86a7e9265b1c8915e7de11a9 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 8385d666abda..a27024ed579b 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9a67d5b6bfd28474ff1c1f5faca223b2337c9034 +Subproject commit 9cc7d2e41a15d44b2d7232f205fc35aacc190c9b diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 70be55ff7d7c..c0892adf62e1 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 28c1fb03fc3289c846afa7ac76205ad9b4be29ff +Subproject commit 9e54a45ed40abd094528da68e3c36b6c0d4574ec diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 841d42cba76d..b5d747c9eadc 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit fe27504015cc610950234fc5e31f095c633d3844 +Subproject commit 85f5393d3ca0caa221168449628475e241ab44df From f101e22da230ed9529015505255ce8a4f2d98060 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Fri, 24 Jan 2025 09:37:00 -0800 Subject: [PATCH 7379/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/5661a1c937da592b2c889fa99d0972deccded6db https://github.com/facebook/buck2-shims-meta/commit/0b32ea082a2e79807b4015ed1e75308404e69e23 https://github.com/facebook/facebook-for-woocommerce/commit/d0afc3f47e3955646e01587435a4e70d55928945 https://github.com/facebook/fb303/commit/3acae67ee346691dc383fb036df636f5851ecbc8 https://github.com/facebook/fbthrift/commit/bd490e6b1e260c0bfa7552b8b6bf72bc58a72282 https://github.com/facebook/folly/commit/60a68b763d275a209576ae4b613f58d860f8523e https://github.com/facebook/mvfst/commit/b56f42c4337ebe5ae44466ee3154c442c809c4d6 https://github.com/facebook/proxygen/commit/464735f0a8976a4924de35aa595a4764405c564a https://github.com/facebook/wangle/commit/dc4926972bdd2e5df68bee1f70baf07f2d854c8d https://github.com/facebookexperimental/edencommon/commit/6a84c884954104fb85be88ad49516eb1e2fbd8e0 https://github.com/facebookexperimental/rust-shed/commit/79c9c0eafebf11a8d099de60bb64b08209351675 https://github.com/facebookincubator/fizz/commit/f16ab71d65e88b194f71713c9f58547574ab3c64 Reviewed By: bigfootjon fbshipit-source-id: 15313be0bf8365b2ee7d0fb40201a33ed54f0578 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a27024ed579b..f79cb47a9926 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 9cc7d2e41a15d44b2d7232f205fc35aacc190c9b +Subproject commit bd490e6b1e260c0bfa7552b8b6bf72bc58a72282 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index c0892adf62e1..88c3ba0f0fdf 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 9e54a45ed40abd094528da68e3c36b6c0d4574ec +Subproject commit 60a68b763d275a209576ae4b613f58d860f8523e diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index b5d747c9eadc..80200da5b7ed 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 85f5393d3ca0caa221168449628475e241ab44df +Subproject commit dc4926972bdd2e5df68bee1f70baf07f2d854c8d From 25198a1a2a87d2939e2d5425fdd76eff0827cdf8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sat, 25 Jan 2025 09:36:17 -0800 Subject: [PATCH 7380/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/c7c1d89a02f5a90191f4232df58d0a1a48ca01c8 https://github.com/facebook/fb303/commit/df955b844aea16a3d449b442804116c5ecd0d74a https://github.com/facebook/fbthrift/commit/d800dd5e4537f124331711d81c24550044f63b63 https://github.com/facebook/folly/commit/5009049e96ecc8c6f5e8d147f6c93a3d645f195b https://github.com/facebook/mvfst/commit/60ca08943f21b21093476691daa84b296a954025 https://github.com/facebook/proxygen/commit/a527cc621f8bfa406c3b6a44d1c2936414ac4fdf https://github.com/facebook/wangle/commit/bf5785284987c46bc3e432ce81668d01afca391a https://github.com/facebookexperimental/edencommon/commit/1b339fd4dcd8bc9fb330bf7588d163e670a2ac85 https://github.com/facebookexperimental/rust-shed/commit/411c74219e82482e5b7d448cd24f974dd0a77bb4 https://github.com/facebookincubator/fizz/commit/c242ea50dd6cc08ebaa5a0d8fc5c5530db906dc9 Reviewed By: bigfootjon fbshipit-source-id: 0fc1c6bb2fc6d62344932ba4a7c4a5330b9e6332 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index f79cb47a9926..d54089c4be58 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit bd490e6b1e260c0bfa7552b8b6bf72bc58a72282 +Subproject commit d800dd5e4537f124331711d81c24550044f63b63 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 88c3ba0f0fdf..791a54aa65b5 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 60a68b763d275a209576ae4b613f58d860f8523e +Subproject commit 5009049e96ecc8c6f5e8d147f6c93a3d645f195b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 80200da5b7ed..09df3b8fc58b 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit dc4926972bdd2e5df68bee1f70baf07f2d854c8d +Subproject commit bf5785284987c46bc3e432ce81668d01afca391a From 65e717e79c1ef573b8ee0f723ac715767f4b58f1 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Sun, 26 Jan 2025 09:35:17 -0800 Subject: [PATCH 7381/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/50a45b17015728d1ef10b29be5372907c0cbb1e5 https://github.com/facebook/fb303/commit/25a99dbc671dd96b6579b831c70fa5b7d84ef44a https://github.com/facebook/fbthrift/commit/53115e1bbe3eb264dc28d0eff8cf4a0e83bf4156 https://github.com/facebook/mvfst/commit/2f69a816b8e24456d249d54a2493b65b73ba32b3 https://github.com/facebook/proxygen/commit/cefc779d220a07016f18e46a70c4761d2b0de14e https://github.com/facebook/wangle/commit/b19eb4c652cf5d3f375cde9ce3495d4fc2ee98d0 https://github.com/facebookexperimental/edencommon/commit/c017d798fe0c3f941170abafa756b2ebad7baa3c https://github.com/facebookexperimental/rust-shed/commit/6939773c8d4a3574a3cba5d3029a3a91b5ad22ee https://github.com/facebookincubator/fizz/commit/6e568597b43a9c9230b4f753795fe730d1366a1d Reviewed By: bigfootjon fbshipit-source-id: f18bc9731c0beada53e8eab7884caaee53bff28b --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index d54089c4be58..132033554f4e 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit d800dd5e4537f124331711d81c24550044f63b63 +Subproject commit 53115e1bbe3eb264dc28d0eff8cf4a0e83bf4156 diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 09df3b8fc58b..82378abac5ef 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit bf5785284987c46bc3e432ce81668d01afca391a +Subproject commit b19eb4c652cf5d3f375cde9ce3495d4fc2ee98d0 From 711e99b3ca33414d06eef5b2fa96ee729a491ec8 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Mon, 27 Jan 2025 09:36:00 -0800 Subject: [PATCH 7382/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/f6ccb637d24ea93b67fff582a186273604971e71 https://github.com/facebook/fb303/commit/06d73d20b1d72344bfc028ef85d3ed3033b28df7 https://github.com/facebook/fbthrift/commit/889b195802c131ddd0bd2f36f83e10f86978997d https://github.com/facebook/mvfst/commit/92d8044759dea9d1523b7e56574ade19d4fb3a3e https://github.com/facebook/proxygen/commit/162c4eef1dda469aafd07f0484600d744f435691 https://github.com/facebook/wangle/commit/3b10eed3d7b377c2fba1f04caf9234c6ebab2bbd https://github.com/facebookexperimental/rust-shed/commit/c284fd1300951093b8ad316469aed0a62d663f2e https://github.com/facebookincubator/facebook-pixel-for-wordpress/commit/69388b3f6289970a95f42a2e162bd7ab124983ac Reviewed By: ckwalsh fbshipit-source-id: cf1ab78dd8154e8ba73efa7f40256b4d54ccccd0 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 132033554f4e..26124fee1e57 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 53115e1bbe3eb264dc28d0eff8cf4a0e83bf4156 +Subproject commit 889b195802c131ddd0bd2f36f83e10f86978997d diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index 82378abac5ef..f2804316fdcb 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit b19eb4c652cf5d3f375cde9ce3495d4fc2ee98d0 +Subproject commit 3b10eed3d7b377c2fba1f04caf9234c6ebab2bbd From e69452195eec8d3439f0a33a91b342e48af337c4 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Tue, 28 Jan 2025 09:37:59 -0800 Subject: [PATCH 7383/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/44d60402c40a96b054b619d526d186f90572b87f https://github.com/facebook/fb303/commit/3a66ed42951eb859009d34934c7e5cfd97f52c93 https://github.com/facebook/fbthrift/commit/52a1426962c07da48d5ff40460a172e1550be3f5 https://github.com/facebook/folly/commit/22f500fb9da0772db27d1ba782163558a1ad91fe https://github.com/facebook/mvfst/commit/bdc0b344438b8a1b0d2df1af8c573326be304381 https://github.com/facebook/proxygen/commit/ebe2759b743fe440812398f32732fe6cb3296000 https://github.com/facebookexperimental/rust-shed/commit/9f0cfca2ee35600fe2db05c24da914fbbce13fb9 https://github.com/facebookincubator/facebook-pixel-for-wordpress/commit/541c7f4c9f8a800da7f18336d7372ae24d9e7f28 https://github.com/facebookincubator/fizz/commit/27e4bc5eeb32b492f7212ba72a94f7098653fd2f Reviewed By: ckwalsh fbshipit-source-id: 5aa112aa5e86f3246675a00cdb152688dde9cdd4 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 26124fee1e57..a15c0687e351 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 889b195802c131ddd0bd2f36f83e10f86978997d +Subproject commit 52a1426962c07da48d5ff40460a172e1550be3f5 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 791a54aa65b5..a5e55f19e4be 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 5009049e96ecc8c6f5e8d147f6c93a3d645f195b +Subproject commit 22f500fb9da0772db27d1ba782163558a1ad91fe From 4a39a7327f6844b0be58bebcf7915bd9b1a62a6c Mon Sep 17 00:00:00 2001 From: Marius Eriksen Date: Tue, 28 Jan 2025 10:22:25 -0800 Subject: [PATCH 7384/7387] third-party: enable signal feature in crate `nix` Summary: This only seems to affect how autocargo works -- it is usable already through Buck. Reviewed By: manav-a, dtolnay Differential Revision: D68734129 fbshipit-source-id: c49432f3eab2a89ca786c8b5d981970f0bed6c7b --- watchman/cli/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/watchman/cli/Cargo.toml b/watchman/cli/Cargo.toml index d785e9ff8f0c..2dbf50ef2638 100644 --- a/watchman/cli/Cargo.toml +++ b/watchman/cli/Cargo.toml @@ -22,13 +22,13 @@ tokio = { version = "1.41.0", features = ["full", "test-util", "tracing"] } watchman_client = { version = "0.9.0", path = "../rust/watchman_client" } [target.'cfg(target_os = "linux")'.dependencies] -nix = { version = "0.29.0", features = ["dir", "event", "hostname", "inotify", "ioctl", "mman", "mount", "net", "poll", "ptrace", "reboot", "resource", "sched", "term", "time", "user", "zerocopy"] } +nix = { version = "0.29.0", features = ["dir", "event", "hostname", "inotify", "ioctl", "mman", "mount", "net", "poll", "ptrace", "reboot", "resource", "sched", "signal", "term", "time", "user", "zerocopy"] } [target.'cfg(target_os = "macos")'.dependencies] -nix = { version = "0.29.0", features = ["dir", "event", "hostname", "inotify", "ioctl", "mman", "mount", "net", "poll", "ptrace", "reboot", "resource", "sched", "term", "time", "user", "zerocopy"] } +nix = { version = "0.29.0", features = ["dir", "event", "hostname", "inotify", "ioctl", "mman", "mount", "net", "poll", "ptrace", "reboot", "resource", "sched", "signal", "term", "time", "user", "zerocopy"] } [target.'cfg(unix)'.dependencies] -nix = { version = "0.29.0", features = ["dir", "event", "hostname", "inotify", "ioctl", "mman", "mount", "net", "poll", "ptrace", "reboot", "resource", "sched", "term", "time", "user", "zerocopy"] } +nix = { version = "0.29.0", features = ["dir", "event", "hostname", "inotify", "ioctl", "mman", "mount", "net", "poll", "ptrace", "reboot", "resource", "sched", "signal", "term", "time", "user", "zerocopy"] } [features] default = [] From d26af7439044d0268bb7ac788d9b3f14aa534c51 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Wed, 29 Jan 2025 09:40:00 -0800 Subject: [PATCH 7385/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/21b037277cb3ceeb07a8a6651c76a37c737c1f65 https://github.com/facebook/facebook-for-woocommerce/commit/08afb6835e1059f8e2dc40fd80b4f5c6481d9277 https://github.com/facebook/fb303/commit/0dd928f626376cc50d854a367c912c811abb5ded https://github.com/facebook/fbthrift/commit/cb9dbc9b987639288b2558fd18990cccc57e7629 https://github.com/facebook/folly/commit/33aba632b8e22ad87dd18997682976ac51b7c62b https://github.com/facebook/mvfst/commit/26c69ab5be01a54a60cca4607d675931f16592f2 https://github.com/facebook/proxygen/commit/ac03e61f343d2ec508169cea039b22731fec5ea8 https://github.com/facebook/wangle/commit/ee9bac99b937e795918eb68f31f15deb03e20a2f https://github.com/facebookexperimental/edencommon/commit/812277f4d93d5ddd95c0f18236dcee4f17683276 https://github.com/facebookexperimental/rust-shed/commit/97f21533e7168343a4c251820844220121ded419 https://github.com/facebookincubator/fizz/commit/88cb93d1beb2ffa1d1211ced4ee4258ac82c1bca Reviewed By: bigfootjon fbshipit-source-id: bde6844e87b7ffe2e08cf45d11edd7f2db6e8b92 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index a15c0687e351..1a8a45b0c49c 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit 52a1426962c07da48d5ff40460a172e1550be3f5 +Subproject commit cb9dbc9b987639288b2558fd18990cccc57e7629 diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index a5e55f19e4be..475c0335644b 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 22f500fb9da0772db27d1ba782163558a1ad91fe +Subproject commit 33aba632b8e22ad87dd18997682976ac51b7c62b diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index f2804316fdcb..dbe6b5c58bed 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit 3b10eed3d7b377c2fba1f04caf9234c6ebab2bbd +Subproject commit ee9bac99b937e795918eb68f31f15deb03e20a2f From 62b49b2037559e9c4c9e885828c3fece197add81 Mon Sep 17 00:00:00 2001 From: Open Source Bot Date: Thu, 30 Jan 2025 09:35:12 -0800 Subject: [PATCH 7386/7387] Updating submodules Summary: GitHub commits: https://github.com/facebook/buck2-prelude/commit/0192a33bd389bd7044d9617060e5e3858f81c4da https://github.com/facebook/fb303/commit/46d6ca62b157689dafc3584f9ecd115fa999a5da https://github.com/facebook/fbthrift/commit/54e3b773ffdb9e0c2216a654d5c19a81c82bfeca https://github.com/facebook/folly/commit/78286282478e1ae05b2e8cbcf0e2139eab283bea https://github.com/facebook/mvfst/commit/2ba5e9137931e1a42110ebcb617c4bbe48f0c318 https://github.com/facebook/proxygen/commit/88adfe44406690496de618f6850827bca655624e https://github.com/facebook/wangle/commit/f4fff3d0bcbe97c038c31220f7281f7b9627a8fb https://github.com/facebookexperimental/edencommon/commit/6b429c4be91c67222e16d66a59d2d7902102bc87 https://github.com/facebookexperimental/rust-shed/commit/9ecc4bf9f5e25afedf29fe1e7aa745dcff8c5c00 https://github.com/facebookincubator/fizz/commit/5ec77739d813daf9e46fcceacea4fb1f032503f1 https://github.com/facebookincubator/llm_orchestrator/commit/3c7cc5138a33c0767a169d18f0d0a188bb705aab Reviewed By: ckwalsh fbshipit-source-id: e843d0a624d4c056d996965a831c2205a735a658 --- build/deps/github_hashes/facebook/fbthrift-rev.txt | 2 +- build/deps/github_hashes/facebook/folly-rev.txt | 2 +- build/deps/github_hashes/facebook/wangle-rev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt index 1a8a45b0c49c..ae80edcb55a0 100644 --- a/build/deps/github_hashes/facebook/fbthrift-rev.txt +++ b/build/deps/github_hashes/facebook/fbthrift-rev.txt @@ -1 +1 @@ -Subproject commit cb9dbc9b987639288b2558fd18990cccc57e7629 +Subproject commit 54e3b773ffdb9e0c2216a654d5c19a81c82bfeca diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt index 475c0335644b..b40b693981eb 100644 --- a/build/deps/github_hashes/facebook/folly-rev.txt +++ b/build/deps/github_hashes/facebook/folly-rev.txt @@ -1 +1 @@ -Subproject commit 33aba632b8e22ad87dd18997682976ac51b7c62b +Subproject commit 78286282478e1ae05b2e8cbcf0e2139eab283bea diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt index dbe6b5c58bed..ee7a4951ccec 100644 --- a/build/deps/github_hashes/facebook/wangle-rev.txt +++ b/build/deps/github_hashes/facebook/wangle-rev.txt @@ -1 +1 @@ -Subproject commit ee9bac99b937e795918eb68f31f15deb03e20a2f +Subproject commit f4fff3d0bcbe97c038c31220f7281f7b9627a8fb From f5fc46177b5a16a2bd5ae94b198c40d7d247bf56 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Thu, 30 Jan 2025 23:33:42 -0800 Subject: [PATCH 7387/7387] Replace "rust.type" DeprecatedUnvalidatedAnnotations with @rust.Type Summary: {D68909054} implemented support for `rust.Type` on typedefs. The existing uses of `thrift.DeprecatedUnvalidatedAnnotations{items = {"rust.type": "..."}}` can be replaced variously by: - typedef-level `rust.Type` - field-level `rust.Type` - deleting unused typedef Reviewed By: iahs Differential Revision: D68927539 fbshipit-source-id: caa32ab32e98f1e43ce43d1f8cb3ebc97aa7232f --- eden/fs/service/eden.thrift | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/eden/fs/service/eden.thrift b/eden/fs/service/eden.thrift index 18e0feba7477..7858a1c23afb 100644 --- a/eden/fs/service/eden.thrift +++ b/eden/fs/service/eden.thrift @@ -7,8 +7,9 @@ include "eden/fs/config/eden_config.thrift" include "fb303/thrift/fb303_core.thrift" -include "thrift/annotation/thrift.thrift" include "thrift/annotation/cpp.thrift" +include "thrift/annotation/rust.thrift" +include "thrift/annotation/thrift.thrift" namespace cpp2 facebook.eden namespace java com.facebook.eden.thrift @@ -486,7 +487,8 @@ union FileAttributeDataOrErrorV2 { * in a certain directory. */ union DirListAttributeDataOrError { - 1: map_PathString_FileAttributeDataOrErrorV2_3516 dirListAttributeData; + @rust.Type{name = "sorted_vector_map::SortedVectorMap"} + 1: map dirListAttributeData; 2: EdenError error; } @@ -2808,12 +2810,3 @@ service EdenService extends fb303_core.BaseService { 1: EdenError ex, ); } - -// The following were automatically generated and may benefit from renaming. -@thrift.DeprecatedUnvalidatedAnnotations{ - items = {"rust.type": "sorted_vector_map::SortedVectorMap"}, -} -typedef map< - PathString, - FileAttributeDataOrErrorV2 -> map_PathString_FileAttributeDataOrErrorV2_3516