fix generate_projects.sh fails in M1 Mac (#31868)

* fix generate_projects.sh fails in m1 mac

* use buildozer-linux-arm64 for linux arm64 platform
pull/32007/head^2
Hannah Shi 2 years ago committed by GitHub
parent 8bd2b9af52
commit 2adab34f7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      tools/distrib/buildozer.sh
  2. 41
      tools/distrib/fix_build_deps.py

@ -30,11 +30,13 @@ function error_handling() {
} }
function download_buildozer() { function download_buildozer() {
platform="$(uname -s)" platform="$(uname -sm)"
case "${platform}" in case "${platform}" in
Linux*) download_link="https://github.com/bazelbuild/buildtools/releases/download/${BUILDOZER_VERSION}/buildozer-linux-amd64";; "Linux x86_64") download_link="https://github.com/bazelbuild/buildtools/releases/download/${BUILDOZER_VERSION}/buildozer-linux-amd64";;
Darwin*) download_link="https://github.com/bazelbuild/buildtools/releases/download/${BUILDOZER_VERSION}/buildozer-darwin-amd64";; "Linux aarch64") download_link="https://github.com/bazelbuild/buildtools/releases/download/${BUILDOZER_VERSION}/buildozer-linux-arm64";;
*) error_handling "Unsupported platform: ${platform}";; "Darwin x86_64") download_link="https://github.com/bazelbuild/buildtools/releases/download/${BUILDOZER_VERSION}/buildozer-darwin-amd64";;
"Darwin arm64") download_link="https://github.com/bazelbuild/buildtools/releases/download/${BUILDOZER_VERSION}/buildozer-darwin-arm64";;
*) error_handling "Unsupported platform: ${platform}";;
esac esac
download_success=0 download_success=0

@ -637,25 +637,26 @@ def make_library(library):
return (library, error, deps, external_deps) return (library, error, deps, external_deps)
update_libraries = [] if __name__ == "__main__":
for library in sorted(consumes.keys()): update_libraries = []
if library in no_update: for library in sorted(consumes.keys()):
continue if library in no_update:
if args.targets and library not in args.targets: continue
continue if args.targets and library not in args.targets:
update_libraries.append(library) continue
with multiprocessing.Pool(processes=multiprocessing.cpu_count()) as p: update_libraries.append(library)
updated_libraries = p.map(make_library, update_libraries, 1) with multiprocessing.Pool(processes=multiprocessing.cpu_count()) as p:
updated_libraries = p.map(make_library, update_libraries, 1)
error = False
for library, lib_error, deps, external_deps in updated_libraries: error = False
if lib_error: for library, lib_error, deps, external_deps in updated_libraries:
error = True if lib_error:
continue error = True
buildozer_set_list('external_deps', external_deps, library, via='deps') continue
buildozer_set_list('deps', deps, library) buildozer_set_list('external_deps', external_deps, library, via='deps')
buildozer_set_list('deps', deps, library)
run_buildozer.run_buildozer(buildozer_commands) run_buildozer.run_buildozer(buildozer_commands)
if error: if error:
sys.exit(1) sys.exit(1)

Loading…
Cancel
Save