fix folly ci

.circleci/config.yml

@@ -901,11 +901,11 @@ workflows:
   jobs-linux-run-tests:
     jobs:
       - build-linux
-#      - build-linux-cmake-with-folly
-#      - build-linux-cmake-with-folly-lite-no-test
-#      - build-linux-gcc-7-with-folly
-#      - build-linux-gcc-7-with-folly-lite-no-test
-#      - build-linux-cmake-with-folly-coroutines
+      - build-linux-cmake-with-folly
+      - build-linux-cmake-with-folly-lite-no-test
+      - build-linux-gcc-7-with-folly
+      - build-linux-gcc-7-with-folly-lite-no-test
+      - build-linux-cmake-with-folly-coroutines
       - build-linux-cmake-with-benchmark
       - build-linux-encrypted_env-no_compression
   jobs-linux-run-tests-san:
@@ -979,7 +979,7 @@ workflows:
       - build-linux-arm-test-full
       - build-linux-run-microbench
       - build-linux-non-shm
-#      - build-linux-clang-13-asan-ubsan-with-folly
+      - build-linux-clang-13-asan-ubsan-with-folly
       - build-linux-valgrind
       - build-windows-vs2022-avx2
       - build-windows-vs2022

Makefile

@@ -2501,8 +2501,6 @@ build_folly:
 		echo "Please run checkout_folly first"; \
 		false; \
 	fi
-	# Restore the original version of Invoke.h with boost dependency
-	cd third-party/folly && ${GIT_COMMAND} checkout folly/functional/Invoke.h
 	cd third-party/folly && \
 		CXXFLAGS=" $(CXX_M_FLAGS) -DHAVE_CXX11_ATOMIC " $(PYTHON) build/fbcode_builder/getdeps.py build --no-tests