diff options
| author | bunnei <bunneidev@gmail.com> | 2018-11-18 19:54:38 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-18 19:54:38 -0800 |
| commit | 5e6ad795cc914d4c3f8bb016b122bdc6713f477a (patch) | |
| tree | 73cdfd4432c650e24b070d61fb56aa0ae69c1ec7 /.travis | |
| parent | 997c3dc6ff1eddecaca5b9d79d834631145cb1f4 (diff) | |
| parent | 34eaf3a366a3a7c7ec3207443afeea40f63fdff8 (diff) | |
Merge pull request #1555 from ccawley2011/clang-format-docker
travis: Use pre-built image for clang-format target
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/clang-format/build.sh | 2 | ||||
| -rwxr-xr-x | .travis/clang-format/deps.sh | 2 | ||||
| -rwxr-xr-x | .travis/clang-format/docker.sh | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/.travis/clang-format/build.sh b/.travis/clang-format/build.sh index 3707be3c9..36c276c43 100755 --- a/.travis/clang-format/build.sh +++ b/.travis/clang-format/build.sh @@ -1,3 +1,3 @@ #!/bin/bash -ex -docker run -v $(pwd):/yuzu ubuntu:18.04 /bin/bash -ex /yuzu/.travis/clang-format/docker.sh +docker run --env-file .travis/common/travis-ci.env -v $(pwd):/yuzu -v "$HOME/.ccache":/root/.ccache citraemu/build-environments:linux-clang-format /bin/bash -ex /yuzu/.travis/clang-format/docker.sh diff --git a/.travis/clang-format/deps.sh b/.travis/clang-format/deps.sh index 540bb934a..a15d164c7 100755 --- a/.travis/clang-format/deps.sh +++ b/.travis/clang-format/deps.sh @@ -1,3 +1,3 @@ #!/bin/sh -ex -docker pull ubuntu:18.04 +docker pull citraemu/build-environments:linux-clang-format diff --git a/.travis/clang-format/docker.sh b/.travis/clang-format/docker.sh index 05047e9b8..b519ab40e 100755 --- a/.travis/clang-format/docker.sh +++ b/.travis/clang-format/docker.sh @@ -1,8 +1,5 @@ #!/bin/bash -ex -apt-get update -apt-get install -y clang-format-6.0 - # Run clang-format cd /yuzu ./.travis/clang-format/script.sh |