Generate experiments during sanitization (#30966)

* Generate experiments during sanitization

Also adds gen_experiments to sanity checks.

* format after gen_experiments

* add clang_format to the gen_experiments sanitize job

* fix clang_format_code whith no CHANGED_FILES

* cpu_cost: 1000

* de-parallelize generate_projects

* Make the check fail if --check is passed, otherwise just gen & format

* test

* fix file paths
pull/31193/head
AJ Heller 2 years ago committed by GitHub
parent e7ad460c7b
commit 59b3a03f0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 18
      tools/distrib/clang_format_code.sh
  2. 31
      tools/distrib/gen_experiments_and_format.sh
  3. 1
      tools/distrib/sanitize.sh
  4. 2
      tools/run_tests/sanity/sanity_tests.yaml

@ -19,15 +19,25 @@ set -ex
cd $(dirname $0)/../..
REPO_ROOT=$(pwd)
if [ "$CLANG_FORMAT_SKIP_DOCKER" == "" ]
then
if [ "$CLANG_FORMAT_SKIP_DOCKER" == "" ]; then
CLANG_FORMAT_ROOT="/local-code"
# build clang-format docker image
docker build -t grpc_clang_format tools/dockerfile/grpc_clang_format
if [ "$CHANGED_FILES" != "" ]; then
# ensure the CLANG_FORMAT_ROOT is properly set for any CHANGED_FILES
CHANGED_FILES=$(printf "$CLANG_FORMAT_ROOT/%s " $CHANGED_FILES)
fi
# run clang-format against the checked out codebase
# when modifying the checked-out files, the current user will be impersonated
# so that the updated files don't end up being owned by "root".
docker run -e TEST="$TEST" -e CHANGED_FILES="$CHANGED_FILES" -e CLANG_FORMAT_ROOT="/local-code" --rm=true -v "${REPO_ROOT}":/local-code --user "$(id -u):$(id -g)" -t grpc_clang_format /clang_format_all_the_things.sh
docker run -e TEST="$TEST" -e CHANGED_FILES="$CHANGED_FILES" -e CLANG_FORMAT_ROOT=$CLANG_FORMAT_ROOT --rm=true -v "${REPO_ROOT}":/local-code --user "$(id -u):$(id -g)" -t grpc_clang_format /clang_format_all_the_things.sh
else
CLANG_FORMAT_ROOT="${REPO_ROOT}" tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh
export CLANG_FORMAT_ROOT="${REPO_ROOT}"
if [ "$CHANGED_FILES" != "" ]; then
# ensure the CLANG_FORMAT_ROOT is properly set for any CHANGED_FILES
CHANGED_FILES=$(printf "$CLANG_FORMAT_ROOT/%s " $CHANGED_FILES)
fi
tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh
fi

@ -0,0 +1,31 @@
#!/bin/bash
# Copyright 2022 gRPC authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
set -e
cd $(dirname $0)/../..
tools/codegen/core/gen_experiments.py
# clang format
TEST='' \
CHANGED_FILES="$(git status --porcelain | awk '{print $2}' | tr '\n' ' ')" \
tools/distrib/clang_format_code.sh
if [[ $# == 1 && $1 == '--check' ]]; then
CHANGES="$(git diff)"
if [[ $CHANGES ]]; then
echo >&2 "ERROR: Experiment code needs to be generated. Please run tools/distrib/gen_experiments_and_format.sh"
echo >&2 -e "Changes:\n$CHANGES"
exit 1
fi
fi

@ -31,6 +31,7 @@ tools/distrib/yapf_code.sh
tools/distrib/isort_code.sh
tools/distrib/check_redundant_namespace_qualifiers.py || true
tools/codegen/core/gen_grpc_tls_credentials_options.py
tools/distrib/gen_experiments_and_format.sh
# Formatters should always run last
tools/distrib/clang_format_code.sh

@ -32,6 +32,8 @@
- script: tools/codegen/core/gen_grpc_tls_credentials_options.py --test
- script: tools/distrib/clang_format_code.sh
cpu_cost: 1000
- script: tools/distrib/gen_experiments_and_format.sh --check
cpu_cost: 1000
- script: tools/distrib/pylint_code.sh
- script: tools/distrib/python/check_grpcio_tools.py
- script: tools/distrib/yapf_code.sh --diff

Loading…
Cancel
Save