File tree Expand file tree Collapse file tree
build/fbcode_builder/manifests Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -135,6 +135,9 @@ jobs:
135135 make setup-folly
136136 make setup-folly-version
137137
138+ - name : Setup cabal.project
139+ ln -s cabal-github.project cabal.project
140+
138141 - name : Populate hackage index
139142 run : cabal update
140143
Original file line number Diff line number Diff line change @@ -183,10 +183,13 @@ setup-folly::
183183.PHONY : setup-folly-version setup-folly-0
184184ver: =$(shell cd folly-clib/folly && date -u "--date=@$$(git log -1 --format=%ct ) " +% Y% m% d.% -k% M | sed 's/\.0* /\./')
185185setup-folly-version ::
186- sed -i " s/^version:\(\s*\).*$$ /version:\1$( ver) /" folly-clib/folly-clib.cabal
186+ sed -i " s/^version:\(\s*\).*$$ /version:\1$( ver) /" folly-clib/folly-clib.cabal
187187 sed -i " s/^\(\s*\)build-depends:\(\s*\)folly-clib\s*$$ /\1build-depends: folly-clib==$( ver) /" common/util/fb-util.cabal
188188
189189# Make version 0.0 of folly-clib, the empty package
190190setup-folly-0 ::
191191 sed " s|__CPP_FILES__||;s|__H_FILES__||" < folly-clib/folly-clib.cabal.in | grep -v ' ^\s*install-includes' | grep -v ' \.h$$' > folly-clib/folly-clib.cabal
192- sed -i " s/^version:\(\s*\).*$$ /version:\10.0/" folly-clib/folly-clib.cabal
192+ sed -i " s/^version:\(\s*\).*$$ /version:\10.0/" folly-clib/folly-clib.cabal
193+
194+ setup-meta ::
195+ ln -s cabal-meta.project cabal.project
Original file line number Diff line number Diff line change 2424builder = make
2525
2626[make.build_args]
27- setup-folly-0
27+ setup-folly
28+ setup-meta
2829cabal-update
2930all
3031
File renamed without changes.
Original file line number Diff line number Diff line change 1+ -- Copyright (c) Facebook, Inc. and its affiliates.
2+
3+ packages:
4+ folly-clib/folly-clib.cabal
5+ common/util/fb-util.cabal
6+ common/github/fb-stubs.cabal
7+ common/mangle/mangle.cabal
8+ lib/thrift-lib.cabal
9+ server/thrift-server.cabal
10+ compiler/thrift-compiler.cabal
11+ tests/thrift-tests.cabal
12+ haxl/thrift-haxl.cabal
13+ cpp-channel/thrift-cpp-channel.cabal
14+ http/thrift-http.cabal
15+
16+ package fb-util
17+ flags: +folly
18+ package folly-clib
19+ flags: -bundled-folly
20+ package thrift-tests
21+ flags: -fbthrift
22+
23+ tests: true
You can’t perform that action at this time.
0 commit comments