diff options
| author |  liamwhite | 2022-12-30 15:20:20 -0500 |
|---|---|---|
| committer |  GitHub | 2022-12-30 15:20:20 -0500 |
| commit | 88f5d38b9349afefd9257a779323531b21001500 (patch) | |
| tree | 56dc617070177f11938ab02dd81b783bfa2496b6 | |
| parent | Merge pull request #9524 from bunnei/touch-button-crash-fix (diff) | |
| parent | ci: Allow setting clang-format binary (diff) | |
| download | yuzu-88f5d38b9349afefd9257a779323531b21001500.tar.gz yuzu-88f5d38b9349afefd9257a779323531b21001500.tar.xz yuzu-88f5d38b9349afefd9257a779323531b21001500.zip | |
Merge pull request #9526 from ColinKinloch/choose_clang_format
ci: Allow setting clang-format binary
| -rwxr-xr-x[-rw-r--r--] | .ci/scripts/format/script.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.ci/scripts/format/script.sh b/.ci/scripts/format/script.sh index 119abae6a..225bbc972 100644..100755 --- a/.ci/scripts/format/script.sh +++ b/.ci/scripts/format/script.sh | |||
| @@ -10,7 +10,7 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .ci* dis | |||
| 10 | fi | 10 | fi |
| 11 | 11 | ||
| 12 | # Default clang-format points to default 3.5 version one | 12 | # Default clang-format points to default 3.5 version one |
| 13 | CLANG_FORMAT=clang-format-12 | 13 | CLANG_FORMAT=${CLANG_FORMAT:-clang-format-12} |
| 14 | $CLANG_FORMAT --version | 14 | $CLANG_FORMAT --version |
| 15 | 15 | ||
| 16 | if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then | 16 | if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then |