diff --git a/.github/workflows/getdeps_linux.yml b/.github/workflows/getdeps_linux.yml index 7b9e24a56..4d4e7e816 100644 --- a/.github/workflows/getdeps_linux.yml +++ b/.github/workflows/getdeps_linux.yml @@ -16,102 +16,102 @@ jobs: steps: - uses: actions/checkout@v1 - name: Install system deps - run: sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive proxygen + run: sudo python3 build/fbcode_builder/getdeps.py install-system-deps --recursive proxygen - name: Fetch zlib - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests zlib + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zlib - name: Fetch boost - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests boost + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests boost - name: Fetch ninja - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests ninja + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests ninja - name: Fetch cmake - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests cmake + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests cmake - name: Fetch double-conversion - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests double-conversion + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests double-conversion - name: Fetch fmt - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fmt + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fmt - name: Fetch gflags - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests gflags + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests gflags - name: Fetch glog - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests glog + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests glog - name: Fetch googletest - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests googletest + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests googletest - name: Fetch libevent - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libevent + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libevent - name: Fetch lz4 - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests lz4 + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests lz4 - name: Fetch snappy - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests snappy + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests snappy - name: Fetch zstd - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests zstd + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zstd - name: Fetch folly - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests folly + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests folly - name: Fetch autoconf - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests autoconf + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests autoconf - name: Fetch automake - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests automake + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests automake - name: Fetch libtool - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libtool + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libtool - name: Fetch gperf - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests gperf + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests gperf - name: Fetch libsodium - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libsodium + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libsodium - name: Fetch fizz - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fizz + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fizz - name: Fetch mvfst - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests mvfst + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests mvfst - name: Fetch wangle - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests wangle + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests wangle - name: Build zlib - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests zlib + run: python3 build/fbcode_builder/getdeps.py build --no-tests zlib - name: Build boost - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests boost + run: python3 build/fbcode_builder/getdeps.py build --no-tests boost - name: Build ninja - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests ninja + run: python3 build/fbcode_builder/getdeps.py build --no-tests ninja - name: Build cmake - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests cmake + run: python3 build/fbcode_builder/getdeps.py build --no-tests cmake - name: Build double-conversion - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests double-conversion + run: python3 build/fbcode_builder/getdeps.py build --no-tests double-conversion - name: Build fmt - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fmt + run: python3 build/fbcode_builder/getdeps.py build --no-tests fmt - name: Build gflags - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests gflags + run: python3 build/fbcode_builder/getdeps.py build --no-tests gflags - name: Build glog - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests glog + run: python3 build/fbcode_builder/getdeps.py build --no-tests glog - name: Build googletest - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests googletest + run: python3 build/fbcode_builder/getdeps.py build --no-tests googletest - name: Build libevent - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libevent + run: python3 build/fbcode_builder/getdeps.py build --no-tests libevent - name: Build lz4 - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests lz4 + run: python3 build/fbcode_builder/getdeps.py build --no-tests lz4 - name: Build snappy - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests snappy + run: python3 build/fbcode_builder/getdeps.py build --no-tests snappy - name: Build zstd - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests zstd + run: python3 build/fbcode_builder/getdeps.py build --no-tests zstd - name: Build folly - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests folly + run: python3 build/fbcode_builder/getdeps.py build --no-tests folly - name: Build autoconf - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests autoconf + run: python3 build/fbcode_builder/getdeps.py build --no-tests autoconf - name: Build automake - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests automake + run: python3 build/fbcode_builder/getdeps.py build --no-tests automake - name: Build libtool - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libtool + run: python3 build/fbcode_builder/getdeps.py build --no-tests libtool - name: Build gperf - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests gperf + run: python3 build/fbcode_builder/getdeps.py build --no-tests gperf - name: Build libsodium - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libsodium + run: python3 build/fbcode_builder/getdeps.py build --no-tests libsodium - name: Build fizz - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fizz + run: python3 build/fbcode_builder/getdeps.py build --no-tests fizz - name: Build mvfst - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests mvfst + run: python3 build/fbcode_builder/getdeps.py build --no-tests mvfst - name: Build wangle - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests wangle + run: python3 build/fbcode_builder/getdeps.py build --no-tests wangle - name: Build proxygen - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --src-dir=. proxygen --project-install-prefix proxygen:/usr/local + run: python3 build/fbcode_builder/getdeps.py 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 --strip --src-dir=. proxygen _artifacts/linux --project-install-prefix proxygen:/usr/local --final-install-prefix /usr/local + run: python3 build/fbcode_builder/getdeps.py fixup-dyn-deps --strip --src-dir=. proxygen _artifacts/linux --project-install-prefix proxygen:/usr/local --final-install-prefix /usr/local - uses: actions/upload-artifact@master with: name: proxygen path: _artifacts - name: Test proxygen - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages test --src-dir=. proxygen --project-install-prefix proxygen:/usr/local + run: python3 build/fbcode_builder/getdeps.py test --src-dir=. proxygen --project-install-prefix proxygen:/usr/local diff --git a/.github/workflows/getdeps_mac.yml b/.github/workflows/getdeps_mac.yml index 3f4ca5944..108c26422 100644 --- a/.github/workflows/getdeps_mac.yml +++ b/.github/workflows/getdeps_mac.yml @@ -16,106 +16,106 @@ jobs: steps: - uses: actions/checkout@v1 - name: Install system deps - run: sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive proxygen + run: sudo python3 build/fbcode_builder/getdeps.py install-system-deps --recursive proxygen - name: Fetch zlib - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests zlib + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zlib - name: Fetch boost - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests boost + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests boost - name: Fetch openssl - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests openssl + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests openssl - name: Fetch ninja - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests ninja + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests ninja - name: Fetch cmake - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests cmake + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests cmake - name: Fetch double-conversion - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests double-conversion + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests double-conversion - name: Fetch fmt - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fmt + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fmt - name: Fetch gflags - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests gflags + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests gflags - name: Fetch glog - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests glog + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests glog - name: Fetch googletest - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests googletest + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests googletest - name: Fetch libevent - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libevent + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libevent - name: Fetch lz4 - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests lz4 + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests lz4 - name: Fetch snappy - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests snappy + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests snappy - name: Fetch zstd - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests zstd + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests zstd - name: Fetch folly - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests folly + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests folly - name: Fetch autoconf - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests autoconf + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests autoconf - name: Fetch automake - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests automake + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests automake - name: Fetch libtool - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libtool + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libtool - name: Fetch gperf - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests gperf + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests gperf - name: Fetch libsodium - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libsodium + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libsodium - name: Fetch fizz - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fizz + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fizz - name: Fetch mvfst - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests mvfst + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests mvfst - name: Fetch wangle - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests wangle + run: python3 build/fbcode_builder/getdeps.py fetch --no-tests wangle - name: Build zlib - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests zlib + run: python3 build/fbcode_builder/getdeps.py build --no-tests zlib - name: Build boost - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests boost + run: python3 build/fbcode_builder/getdeps.py build --no-tests boost - name: Build openssl - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests openssl + run: python3 build/fbcode_builder/getdeps.py build --no-tests openssl - name: Build ninja - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests ninja + run: python3 build/fbcode_builder/getdeps.py build --no-tests ninja - name: Build cmake - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests cmake + run: python3 build/fbcode_builder/getdeps.py build --no-tests cmake - name: Build double-conversion - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests double-conversion + run: python3 build/fbcode_builder/getdeps.py build --no-tests double-conversion - name: Build fmt - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fmt + run: python3 build/fbcode_builder/getdeps.py build --no-tests fmt - name: Build gflags - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests gflags + run: python3 build/fbcode_builder/getdeps.py build --no-tests gflags - name: Build glog - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests glog + run: python3 build/fbcode_builder/getdeps.py build --no-tests glog - name: Build googletest - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests googletest + run: python3 build/fbcode_builder/getdeps.py build --no-tests googletest - name: Build libevent - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libevent + run: python3 build/fbcode_builder/getdeps.py build --no-tests libevent - name: Build lz4 - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests lz4 + run: python3 build/fbcode_builder/getdeps.py build --no-tests lz4 - name: Build snappy - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests snappy + run: python3 build/fbcode_builder/getdeps.py build --no-tests snappy - name: Build zstd - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests zstd + run: python3 build/fbcode_builder/getdeps.py build --no-tests zstd - name: Build folly - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests folly + run: python3 build/fbcode_builder/getdeps.py build --no-tests folly - name: Build autoconf - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests autoconf + run: python3 build/fbcode_builder/getdeps.py build --no-tests autoconf - name: Build automake - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests automake + run: python3 build/fbcode_builder/getdeps.py build --no-tests automake - name: Build libtool - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libtool + run: python3 build/fbcode_builder/getdeps.py build --no-tests libtool - name: Build gperf - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests gperf + run: python3 build/fbcode_builder/getdeps.py build --no-tests gperf - name: Build libsodium - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests libsodium + run: python3 build/fbcode_builder/getdeps.py build --no-tests libsodium - name: Build fizz - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fizz + run: python3 build/fbcode_builder/getdeps.py build --no-tests fizz - name: Build mvfst - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests mvfst + run: python3 build/fbcode_builder/getdeps.py build --no-tests mvfst - name: Build wangle - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests wangle + run: python3 build/fbcode_builder/getdeps.py build --no-tests wangle - name: Build proxygen - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --src-dir=. proxygen --project-install-prefix proxygen:/usr/local + run: python3 build/fbcode_builder/getdeps.py 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 --project-install-prefix proxygen:/usr/local --final-install-prefix /usr/local + run: python3 build/fbcode_builder/getdeps.py 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 path: _artifacts - name: Test proxygen - run: python3 build/fbcode_builder/getdeps.py --allow-system-packages test --src-dir=. proxygen --project-install-prefix proxygen:/usr/local + run: python3 build/fbcode_builder/getdeps.py test --src-dir=. proxygen --project-install-prefix proxygen:/usr/local diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py index 5dae195e3..5f661e614 100755 --- a/build/fbcode_builder/getdeps.py +++ b/build/fbcode_builder/getdeps.py @@ -851,8 +851,6 @@ jobs: ) getdeps = f"{py3} build/fbcode_builder/getdeps.py" - if not args.disallow_system_packages: - getdeps += " --allow-system-packages" out.write(" build:\n") out.write(" runs-on: %s\n" % runs_on) @@ -878,11 +876,6 @@ jobs: # that we want it to use them! out.write(" - name: Fix Git config\n") out.write(" run: git config --system core.longpaths true\n") - elif not args.disallow_system_packages: - out.write(" - name: Install system deps\n") - out.write( - f" run: sudo {getdeps} install-system-deps --recursive {manifest.name}\n" - ) projects = loader.manifests_in_dependency_order()