Skip to content

Commit 661bcd4

Browse files
r-barnesmeta-codesync[bot]
authored andcommitted
getdeps generate-github-actions: remove --recursive from build cmd
Summary: The `build` subcommand already builds all transitive deps unconditionally (`manifests_in_dependency_order()` always returns the full dep graph). The `--recursive` flag added to `final_build_cmd` in D106028158 is not a recognized argument for `build`, so argparse exits non-zero and every GHA job fails before building anything. Fix: remove `--recursive` from the generated build step in `workflow_generator.py`. Regenerated all affected workflow files via `update-all-github-actions.sh` and updated test fixtures with `UPDATE_FIXTURES=1 buck run`. The `--recursive` flag remains correct on `install-system-deps` and `query-paths` steps, where it is a defined and meaningful argument. Supersedes D106119149. Reviewed By: bigfootjon Differential Revision: D106122539 fbshipit-source-id: f10dc25bee75b64171844d94cd35eec0f37e8445
1 parent 4acfa49 commit 661bcd4

10 files changed

Lines changed: 10 additions & 10 deletions

File tree

.github/workflows/getdeps_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ jobs:
167167
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests edencommon
168168

169169
- name: Build watchman
170-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --build-type RelWithDebInfo --recursive --src-dir=. watchman --project-install-prefix watchman:/usr/local
170+
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --build-type RelWithDebInfo --src-dir=. watchman --project-install-prefix watchman:/usr/local
171171

172172
- name: Show sccache stats
173173
if: always()

.github/workflows/getdeps_mac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ jobs:
162162
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests edencommon
163163

164164
- name: Build watchman
165-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --build-type RelWithDebInfo --recursive --src-dir=. watchman --project-install-prefix watchman:/usr/local
165+
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --build-type RelWithDebInfo --src-dir=. watchman --project-install-prefix watchman:/usr/local
166166

167167
- name: Show sccache stats
168168
if: always()

.github/workflows/getdeps_windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
run: python build/fbcode_builder/getdeps.py fetch --no-tests edencommon
154154

155155
- name: Build watchman
156-
run: python build/fbcode_builder/getdeps.py build --build-type RelWithDebInfo --recursive --src-dir=. watchman
156+
run: python build/fbcode_builder/getdeps.py build --build-type RelWithDebInfo --src-dir=. watchman
157157

158158
- name: Show sccache stats
159159
if: always()

build/fbcode_builder/getdeps/test/fixtures/expected/folly_shared_libs/getdeps_shared-libs_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests xz
126126

127127
- name: Build folly
128-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --build-type RelWithDebInfo --shared-lib --recursive --src-dir=. folly --project-install-prefix folly:/usr/local
128+
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --build-type RelWithDebInfo --shared-lib --src-dir=. folly --project-install-prefix folly:/usr/local
129129

130130
- name: Show sccache stats
131131
if: always()

build/fbcode_builder/getdeps/test/fixtures/expected/openr/getdeps_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fb303
141141

142142
- name: Build openr
143-
run: python3 build/fbcode_builder/getdeps.py build --build-type RelWithDebInfo --recursive --src-dir=. openr --project-install-prefix openr:/usr/local
143+
run: python3 build/fbcode_builder/getdeps.py build --build-type RelWithDebInfo --src-dir=. openr --project-install-prefix openr:/usr/local
144144

145145
- name: Show sccache stats
146146
if: always()

build/fbcode_builder/getdeps/test/fixtures/expected/rebalancer_linux/getdeps_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ jobs:
145145
df -h
146146
147147
- name: Build rebalancer
148-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --build-type RelWithDebInfo --recursive --src-dir=. rebalancer --project-install-prefix rebalancer:/usr/local --extra-cmake-defines '{"CMAKE_POSITION_INDEPENDENT_CODE":"ON"}'
148+
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --build-type RelWithDebInfo --src-dir=. rebalancer --project-install-prefix rebalancer:/usr/local --extra-cmake-defines '{"CMAKE_POSITION_INDEPENDENT_CODE":"ON"}'
149149

150150
- name: Show sccache stats
151151
if: always()

build/fbcode_builder/getdeps/test/fixtures/expected/xxhash_plain/getdeps_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
run: python3 build/fbcode_builder/getdeps.py query-paths --recursive --src-dir=. xxhash >> "$GITHUB_OUTPUT"
4141

4242
- name: Build xxhash
43-
run: python3 build/fbcode_builder/getdeps.py build --build-type RelWithDebInfo --recursive --src-dir=. xxhash --project-install-prefix xxhash:/usr/local
43+
run: python3 build/fbcode_builder/getdeps.py build --build-type RelWithDebInfo --src-dir=. xxhash --project-install-prefix xxhash:/usr/local
4444

4545
- name: Show sccache stats
4646
if: always()

build/fbcode_builder/getdeps/test/fixtures/expected/xxhash_plain/getdeps_mac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
run: python3 build/fbcode_builder/getdeps.py query-paths --recursive --src-dir=. xxhash >> "$GITHUB_OUTPUT"
4747

4848
- name: Build xxhash
49-
run: python3 build/fbcode_builder/getdeps.py build --build-type RelWithDebInfo --recursive --src-dir=. xxhash --project-install-prefix xxhash:/usr/local
49+
run: python3 build/fbcode_builder/getdeps.py build --build-type RelWithDebInfo --src-dir=. xxhash --project-install-prefix xxhash:/usr/local
5050

5151
- name: Show sccache stats
5252
if: always()

build/fbcode_builder/getdeps/test/fixtures/expected/xxhash_plain/getdeps_windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
shell: pwsh
5454

5555
- name: Build xxhash
56-
run: python build/fbcode_builder/getdeps.py build --build-type RelWithDebInfo --recursive --src-dir=. xxhash
56+
run: python build/fbcode_builder/getdeps.py build --build-type RelWithDebInfo --src-dir=. xxhash
5757

5858
- name: Show sccache stats
5959
if: always()

build/fbcode_builder/getdeps/workflow_generator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ def cmake_arg_for(name):
280280
# round-trips are net-negative at typical sccache hit rates.
281281
final_build_cmd = (
282282
f"{getdepscmd}{allow_sys_arg} build {build_type_arg}{tests_arg}"
283-
f"--recursive --src-dir=. {manifest.name}{project_prefix}"
283+
f"--src-dir=. {manifest.name}{project_prefix}"
284284
f"{cmake_arg_for(manifest.name)}"
285285
)
286286

0 commit comments

Comments
 (0)