diff options
| author |  Lioncash | 2020-08-02 20:40:28 -0400 |
|---|---|---|
| committer | Lioncash | 2020-08-02 20:55:54 -0400 |
| commit | 0105368cc122c8aabfd60ebda3498c7666aef29c (patch) | |
| tree | cd00f1ab6a31ea154b2314ac7a36ec0f49dd87d4 | |
| parent | Merge pull request #4437 from lioncash/ptr (diff) | |
| download | yuzu-0105368cc122c8aabfd60ebda3498c7666aef29c.tar.gz yuzu-0105368cc122c8aabfd60ebda3498c7666aef29c.tar.xz yuzu-0105368cc122c8aabfd60ebda3498c7666aef29c.zip | |
ci: Make use of clang-format 10.0
10.0 seems to play nicer with C++ attributes compared to clang-format
6.0.
Diffstat (limited to '')
| -rw-r--r-- | .ci/scripts/format/script.sh | 2 | ||||
| -rwxr-xr-x | .travis/clang-format/script.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.ci/scripts/format/script.sh b/.ci/scripts/format/script.sh index 5ab828d5e..991fe1552 100644 --- a/.ci/scripts/format/script.sh +++ b/.ci/scripts/format/script.sh | |||
| @@ -7,7 +7,7 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .ci* dis | |||
| 7 | fi | 7 | fi |
| 8 | 8 | ||
| 9 | # Default clang-format points to default 3.5 version one | 9 | # Default clang-format points to default 3.5 version one |
| 10 | CLANG_FORMAT=clang-format-6.0 | 10 | CLANG_FORMAT=clang-format-10.0 |
| 11 | $CLANG_FORMAT --version | 11 | $CLANG_FORMAT --version |
| 12 | 12 | ||
| 13 | if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then | 13 | if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then |
diff --git a/.travis/clang-format/script.sh b/.travis/clang-format/script.sh index 3eff6322f..56a785fe0 100755 --- a/.travis/clang-format/script.sh +++ b/.travis/clang-format/script.sh | |||
| @@ -7,7 +7,7 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .travis* | |||
| 7 | fi | 7 | fi |
| 8 | 8 | ||
| 9 | # Default clang-format points to default 3.5 version one | 9 | # Default clang-format points to default 3.5 version one |
| 10 | CLANG_FORMAT=clang-format-6.0 | 10 | CLANG_FORMAT=clang-format-10.0 |
| 11 | $CLANG_FORMAT --version | 11 | $CLANG_FORMAT --version |
| 12 | 12 | ||
| 13 | if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then | 13 | if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then |