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

Update clang-format-diff.py path (#7944)

Browse Source 
Summary:
Recent Github actions of format checking fail due to invalid location
from where clang-format-diff.py is downloaded. Update the path to point
to a stable, archived location.

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

Test Plan: manually check the result of Github action.

Reviewed By: ltamasi

Differential Revision: D26345066

Pulled By: riversand963

fbshipit-source-id: 2b1a58c2e59c2f1eb11202d321d2ea002cb0917e
This commit is contained in:
Yanqin Jin 2021-02-09 12:47:17 -08:00 committed by Facebook GitHub Bot
parent 91e2c151d2
commit 48669be618
3 changed files with 7 additions and 3 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/llvm-project/master/clang/tools/clang-format/clang-format-diff.py args: https://raw.githubusercontent.com/llvm/llvm-project/main/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

4
Makefile
View File

@ -2514,6 +2514,8 @@ build_subset_tests: $(ROCKSDBTESTS_SUBSET)
# working solution. # working solution.
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)
ifneq ($(MAKECMDGOALS),format) ifneq ($(MAKECMDGOALS),format)
ifneq ($(MAKECMDGOALS),check-format)
ifneq ($(MAKECMDGOALS),check-buck-targets)
ifneq ($(MAKECMDGOALS),jclean) ifneq ($(MAKECMDGOALS),jclean)
ifneq ($(MAKECMDGOALS),jtest) ifneq ($(MAKECMDGOALS),jtest)
ifneq ($(MAKECMDGOALS),rocksdbjavastatic) ifneq ($(MAKECMDGOALS),rocksdbjavastatic)
@ -2529,3 +2531,5 @@ endif
endif endif
endif endif
endif endif
endif
endif

4
build_tools/format-diff.sh
View File

@ -52,7 +52,7 @@ 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 https://tinyurl.com/y2kvokof -o ${REPO_ROOT}/clang-format-diff.py" echo " curl --location tinyurl.com/16e4xpg1 -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"
@ -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 https://tinyurl.com/y2kvokof -o ${REPO_ROOT}/clang-format-diff.py" echo " curl --location tinyurl.com/16e4xpg1 -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"