Skip to content

Commit 4150f71

Browse files
iamirzhanmeta-codesync[bot]
authored andcommitted
Fix OSS CI
Summary: The OSS CI (getdeps) is broken for more than 6 month already. Because of that we introduce github ci failures very often. Here's what fixed: * Add `-f-bundled-folly` flag and run `setup-folly` and `setup-folly-version`. Same is done for github CI: facebookincubator/Glean#564. This is needed after we introduced folly-clib with cabal facebookincubator/hsthrift#155 * limit `async` version as in newer versions `Control.Concurrent.Stream` conflicts `fb-util` Reviewed By: malanka, phlalx Differential Revision: D90992416 fbshipit-source-id: d3bc015544775dbd855258bee50ecd7231684366
1 parent bd9c82a commit 4150f71

File tree

1 file changed

+4
-2
lines changed
  • build/fbcode_builder/manifests

1 file changed

+4
-2
lines changed

build/fbcode_builder/manifests/glean

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,20 @@ re2
2929
builder = make
3030

3131
[make.build_args]
32+
setup-folly
33+
setup-folly-version
3234
cabal-update
3335
all
3436
glean-hie
3537
glass
3638
glean-clang
3739
EXTRA_GHC_OPTS=-j4 +RTS -A32m -n4m -RTS
38-
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
40+
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 -f-bundled-folly
3941

4042
[make.install_args]
4143
install
4244

4345
[make.test_args]
4446
test
4547
EXTRA_GHC_OPTS=-j4 +RTS -A32m -n4m -RTS
46-
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
48+
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 -f-bundled-folly

0 commit comments

Comments
 (0)