Skip to content

Commit

Permalink
get mononoke green in github CI
Browse files Browse the repository at this point in the history
Summary:
X-link: facebookincubator/zstrong#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: facebook/sapling#974

Reviewed By: quark-zju

Differential Revision: D64827811

Pulled By: ahornby

fbshipit-source-id: 82b4fa224d8ce957ef85e5ecf1e220f71c93e6c4
  • Loading branch information
ahornby authored and facebook-github-bot committed Oct 24, 2024
1 parent 4c97c4c commit 0bfb5b1
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
14 changes: 8 additions & 6 deletions build/fbcode_builder/getdeps/buildopts.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
6 changes: 6 additions & 0 deletions build/fbcode_builder/manifests/python-click
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,9 @@ sha256 = dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc

[build]
builder = python-wheel

[rpms]
python3-click

[debs]
python3-click

0 comments on commit 0bfb5b1

Please sign in to comment.