diff --git a/.circleci/torchscript_bc_test/common.sh b/.circleci/torchscript_bc_test/common.sh index 51d258a2d9..24ad5e45fb 100644 --- a/.circleci/torchscript_bc_test/common.sh +++ b/.circleci/torchscript_bc_test/common.sh @@ -59,9 +59,6 @@ install_release() { install_build_dependencies() { printf "* Installing torchaudio dependencies except PyTorch - (Python: %s)\n" "$1" conda env update -q --file "${_this_dir}/environment.yml" --prune - if [ "${_os}" == Linux ]; then - pip install clang-format - fi } build_master() { diff --git a/.circleci/unittest/linux/scripts/run_style_checks.sh b/.circleci/unittest/linux/scripts/run_style_checks.sh index 70b83e19f5..62d4bba09c 100755 --- a/.circleci/unittest/linux/scripts/run_style_checks.sh +++ b/.circleci/unittest/linux/scripts/run_style_checks.sh @@ -20,9 +20,9 @@ if [ "${status}" -ne 0 ]; then fi printf "\x1b[34mRunning clang-format: " -clang-format --version +./clang-format --version printf "\x1b[0m\n" -git-clang-format origin/master +git-clang-format --binary ./clang-format origin/master git diff --exit-code status=$? exit_status="$((exit_status+status))" diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index 290f0f8f97..82e1e7970a 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -38,7 +38,9 @@ conda activate "${env_dir}" printf "* Installing dependencies (except PyTorch)\n" conda env update --file "${this_dir}/environment.yml" --prune if [ "${os}" == Linux ] ; then - pip install clang-format + clangformat_path="${root_dir}/clang-format" + curl https://oss-clang-format.s3.us-east-2.amazonaws.com/linux64/clang-format-linux64 -o "${clangformat_path}" + chmod +x "${clangformat_path}" fi # 4. Buld codecs