andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update clang-format-diff.py (#7609)

Browse Source 
Summary:
`llvm-mirror/clang` is archived. Get the `clang-format-diff.py` file from the active source.

Pull Request resolved: https://github.com/facebook/rocksdb/pull/7609

Reviewed By: ajkr

Differential Revision: D24711608

Pulled By: pdillinger

fbshipit-source-id: b115d8765ff23fbb8190290a170de21565daba84
This commit is contained in:
Xie Yanbo 2020-11-04 16:07:39 -08:00 committed by Facebook GitHub Bot
parent b6d8e36741
commit c9c9709a1a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/sanity_check.yml vendored
View File

@ -32,7 +32,7 @@ jobs:
- name: Download clang-format-diff.py - name: Download clang-format-diff.py
uses: wei/wget@v1 uses: wei/wget@v1
with: with:
args: https://raw.githubusercontent.com/llvm-mirror/clang/master/tools/clang-format/clang-format-diff.py args: https://raw.githubusercontent.com/llvm/llvm-project/master/clang/tools/clang-format/clang-format-diff.py
- name: Check format - name: Check format
run: VERBOSE_CHECK=1 make check-format run: VERBOSE_CHECK=1 make check-format

8
build_tools/format-diff.sh
View File

@ -52,15 +52,15 @@ else
else else
echo "You didn't have clang-format-diff.py and/or clang-format available in your computer!" echo "You didn't have clang-format-diff.py and/or clang-format available in your computer!"
echo "You can download clang-format-diff.py by running: " echo "You can download clang-format-diff.py by running: "
echo " curl --location http://goo.gl/iUW1u2 -o ${CLANG_FORMAT_DIFF}" echo " curl --location https://tinyurl.com/y2kvokof -o ${REPO_ROOT}/clang-format-diff.py"
echo "You can download clang-format by running:" echo "You can download clang-format by running:"
echo " brew install clang-format" echo " brew install clang-format"
echo " Or" echo " Or"
echo " apt install clang-format" echo " apt install clang-format"
echo " This might work too:" echo " This might work too:"
echo " yum install git-clang-format" echo " yum install git-clang-format"
echo "Then, move both files (i.e. ${CLANG_FORMAT_DIFF} and clang-format) to some directory within PATH=${PATH}" echo "Then make sure clang-format is available and executable from \$PATH:"
echo "and make sure ${CLANG_FORMAT_DIFF} is executable." echo " clang-format --version"
exit 128 exit 128
fi fi
# Check argparse pre-req on interpreter, or it will fail # Check argparse pre-req on interpreter, or it will fail
@ -82,7 +82,7 @@ else
echo "You have clang-format-diff.py for Python 2 but are using a Python 3" echo "You have clang-format-diff.py for Python 2 but are using a Python 3"
echo "interpreter (${PYTHON:-python3})." echo "interpreter (${PYTHON:-python3})."
echo "You can download clang-format-diff.py for Python 3 by running: " echo "You can download clang-format-diff.py for Python 3 by running: "
echo " curl --location http://goo.gl/iUW1u2 -o ${REPO_ROOT}/clang-format-diff.py" echo " curl --location https://tinyurl.com/y2kvokof -o ${REPO_ROOT}/clang-format-diff.py"
exit 130 exit 130
fi fi
CLANG_FORMAT_DIFF="${PYTHON:-python3} $CFD_PATH" CLANG_FORMAT_DIFF="${PYTHON:-python3} $CFD_PATH"