From 5434f56302a6f48f908c0cbd4d2bbd4890b3710c Mon Sep 17 00:00:00 2001
From: Alex Hornby <alex@hornby.org.uk>
Date: Thu, 24 Oct 2024 01:49:45 -0700
Subject: [PATCH] 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 b315c175b..8a9c9a99d 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 ea9a9d2d3..cdf29c4d0 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