diff options
| author |  bunnei | 2020-08-07 09:12:08 -0400 |
|---|---|---|
| committer |  GitHub | 2020-08-07 09:12:08 -0400 |
| commit | 62fa00f586ba193e18115062d6e53c1034b3b415 (patch) | |
| tree | 8e93c2632ffe7fc374d0bc7a1c0b45110a9893fa | |
| parent | Merge pull request #4501 from lioncash/is_base_of (diff) | |
| parent | ci: Make use of clang-format 10.0 (diff) | |
| download | yuzu-62fa00f586ba193e18115062d6e53c1034b3b415.tar.gz yuzu-62fa00f586ba193e18115062d6e53c1034b3b415.tar.xz yuzu-62fa00f586ba193e18115062d6e53c1034b3b415.zip | |
Merge pull request #4464 from lioncash/format-pass
ci: Make use of clang-format 10.0
| -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 |