diff options
Diffstat (limited to '.ci/scripts/format')
| -rw-r--r-- | .ci/scripts/format/exec.sh | 3 | ||||
| -rw-r--r-- | .ci/scripts/format/script.sh | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.ci/scripts/format/exec.sh b/.ci/scripts/format/exec.sh index 5d6393b38..e9e9d2e17 100644 --- a/.ci/scripts/format/exec.sh +++ b/.ci/scripts/format/exec.sh @@ -1,4 +1,7 @@ #!/bin/bash -ex chmod a+x ./.ci/scripts/format/docker.sh +# the UID for the container yuzu user is 1027 +sudo chown -R 1027 ./ docker run -v $(pwd):/yuzu yuzuemu/build-environments:linux-clang-format /bin/bash -ex /yuzu/.ci/scripts/format/docker.sh +sudo chown -R $UID ./ diff --git a/.ci/scripts/format/script.sh b/.ci/scripts/format/script.sh index 5ab828d5e..969ab637c 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 fi # Default clang-format points to default 3.5 version one -CLANG_FORMAT=clang-format-6.0 +CLANG_FORMAT=clang-format-10 $CLANG_FORMAT --version if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then |