Skip to content

ci: support custom TEST_TMPDIR and clang-format #17020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phlax merged 2 commits into from
Jun 21, 2021
Merged

ci: support custom TEST_TMPDIR and clang-format #17020

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a242f2f
ci: support custom TEST_TMPDIR and clang-format
daixiang0 Jun 17, 2021
d5f77a6
fix ci issue
daixiang0 Jun 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ci/build_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,9 @@ then
fi

# Environment setup.
export TEST_TMPDIR=${BUILD_DIR}/tmp
export PATH=/opt/llvm/bin:${PATH}
export TEST_TMPDIR="${TEST_TMPDIR:-$BUILD_DIR/tmp}"
export LLVM_ROOT="${LLVM_ROOT:-/opt/llvm}"
export PATH=${LLVM_ROOT}/bin:${PATH}
export CLANG_FORMAT="${CLANG_FORMAT:-clang-format}"

if [[ -f "/etc/redhat-release" ]]; then
Expand All @@ -81,7 +82,6 @@ function cleanup() {
cleanup
trap cleanup EXIT

export LLVM_ROOT="${LLVM_ROOT:-/opt/llvm}"
"$(dirname "$0")"/../bazel/setup_clang.sh "${LLVM_ROOT}"

[[ "${BUILD_REASON}" != "PullRequest" ]] && BAZEL_EXTRA_TEST_OPTIONS+=("--nocache_test_results")
Expand Down