Skip to content

Commit 04d5121

Browse files
committed
Update formatting script.
Since we're based on llvm/main now, our previous formatting script won't work anymore. Let's try formatting any changes since ykjit/main instead.
1 parent 547b537 commit 04d5121

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

.buildbot.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22

33
set -e
44

5-
# Buildbot will have done a shallow clone, but the formatting step requires
6-
# both full git history, and a complete set of upstream llvm release tags.
7-
git fetch --unshallow
8-
git fetch --tags https://github.com/llvm/llvm-project
9-
105
INST_DIR=`pwd`/inst
116

127
mkdir -p build
@@ -22,6 +17,7 @@ make -j `nproc` install
2217
# clang-format any new files that we've introduced ourselves.
2318
cd ..
2419
PATH=${INST_DIR}/bin:${PATH}
20+
git fetch origin main:refs/remotes/origin/main
2521
sh yk_format_new_files.sh
2622
git diff --exit-code
2723

yk_format_new_files.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,4 @@
44

55
set -e
66

7-
# The LLVM version tag we are forked from.
8-
FORKED_LLVM_VERSION=`git describe --abbrev=0 --match 'llvmorg-*'`
9-
10-
git diff --name-only --diff-filter=A ${FORKED_LLVM_VERSION} \
11-
`git branch --show-current` | egrep '\.(cpp|h)$' | xargs clang-format -i
7+
clang/tools/clang-format/git-clang-format origin/main

0 commit comments

Comments
 (0)