From ac0bfe3c4fca425e6152de585e5fe45d9d93fd97 Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Wed, 29 Apr 2020 18:43:06 -0700 Subject: [PATCH] getdeps: fix artifact generation (#808) Summary: The mismatched project output settings were causing the dyndeps fixup to fail to find any objects and thus none of the artifacts are populated for posix platforms. Pull Request resolved: https://github.com/facebook/watchman/pull/808 Test Plan: The PR published artifacts to: * https://github.com/facebook/watchman/actions/runs/91617994 * https://github.com/facebook/watchman/actions/runs/91617996 * https://github.com/facebook/watchman/actions/runs/91617997 Reviewed By: simpkins Differential Revision: D21315090 Pulled By: wez fbshipit-source-id: 60461809f55e73119f7206e3f392d5b237722f85 --- .github/workflows/getdeps_linux.yml | 2 +- .github/workflows/getdeps_mac.yml | 2 +- build/fbcode_builder/getdeps.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/getdeps_linux.yml b/.github/workflows/getdeps_linux.yml index 3f1f7c7af..a990a3307 100644 --- a/.github/workflows/getdeps_linux.yml +++ b/.github/workflows/getdeps_linux.yml @@ -100,7 +100,7 @@ jobs: - name: Build proxygen run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --src-dir=. proxygen --project-install-prefix proxygen:/usr/local - name: Copy artifacts - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fixup-dyn-deps --src-dir=. proxygen _artifacts/linux --final-install-prefix /usr/local + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fixup-dyn-deps --src-dir=. proxygen _artifacts/linux --project-install-prefix proxygen:/usr/local --final-install-prefix /usr/local - uses: actions/upload-artifact@master with: name: proxygen diff --git a/.github/workflows/getdeps_mac.yml b/.github/workflows/getdeps_mac.yml index 4001ac4e1..14b32d758 100644 --- a/.github/workflows/getdeps_mac.yml +++ b/.github/workflows/getdeps_mac.yml @@ -104,7 +104,7 @@ jobs: - name: Build proxygen run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --src-dir=. proxygen --project-install-prefix proxygen:/usr/local - name: Copy artifacts - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fixup-dyn-deps --src-dir=. proxygen _artifacts/mac --final-install-prefix /usr/local + run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fixup-dyn-deps --src-dir=. proxygen _artifacts/mac --project-install-prefix proxygen:/usr/local --final-install-prefix /usr/local - uses: actions/upload-artifact@master with: name: proxygen diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index f6508a119..467b981ac 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -759,7 +759,8 @@ jobs: out.write(" - name: Copy artifacts\n") out.write( f" run: {getdeps} fixup-dyn-deps " - f"--src-dir=. {manifest.name} _artifacts/{job_name} --final-install-prefix /usr/local\n" + f"--src-dir=. {manifest.name} _artifacts/{job_name} {project_prefix} " + f"--final-install-prefix /usr/local\n" ) out.write(" - uses: actions/upload-artifact@master\n")