Fix build abseil/boringssl/protobuf at head (#25638)

* Update PyYAML install steps

* F-string is 3.6+

* Regenerate project
pull/25641/head
Lidi Zheng 4 years ago committed by GitHub
parent 8f2f3d555a
commit e7d9cccf9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      CMakeLists.txt
  2. 2
      tools/buildgen/generate_projects.py
  3. 6
      tools/buildgen/generate_projects.sh

@ -13782,7 +13782,6 @@ target_include_directories(rbac_translator_test
${_gRPC_UPB_GENERATED_DIR}
${_gRPC_UPB_GRPC_GENERATED_DIR}
${_gRPC_UPB_INCLUDE_DIR}
${_gRPC_XXHASH_INCLUDE_DIR}
${_gRPC_ZLIB_INCLUDE_DIR}
third_party/googletest/googletest/include
third_party/googletest/googletest

@ -126,7 +126,7 @@ def main() -> None:
err_cnt, _ = jobset.run(generate_template_render_jobs(templates),
maxjobs=args.jobs)
if err_cnt != 0:
print(f'ERROR: {err_cnt} error(s) found while generating projects.',
print('ERROR: %s error(s) found while generating projects.' % err_cnt,
file=sys.stderr)
sys.exit(1)

@ -1,4 +1,4 @@
#!/bin/sh
#! /bin/bash
# Copyright 2015 gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@ -21,7 +21,9 @@ export TEST=${TEST:-false}
YAML_OK=$(python3 -c "import yaml; print(yaml.__version__.split('.') >= ['5', '4', '1'])")
if [[ "${YAML_OK}" != "True" ]]; then
python3 -m pip install --upgrade --ignore-installed PyYAML==5.4.1 --user
# PyYAML dropped 3.5 support at 5.4.1, which makes 5.3.1 the latest version we
# can use.
python3 -m pip install --upgrade --ignore-installed PyYAML==5.3.1 --user
fi
echo "Generating build_autogenerated.yaml from bazel BUILD file"

Loading…
Cancel
Save