summaryrefslogtreecommitdiffstats
path: root/.travis
diff options
context:
space:
mode:
authorCameron Cawley <ccawley2011@gmail.com>2018-10-24 00:10:46 +0200
committerCameron Cawley <ccawley2011@gmail.com>2018-10-24 01:08:38 +0200
commit34eaf3a366a3a7c7ec3207443afeea40f63fdff8 (patch)
tree3c4bf70f55a32a3342502bf615ff3bd2f4916d11 /.travis
parentMerge pull request #1542 from lioncash/project (diff)
downloadyuzu-34eaf3a366a3a7c7ec3207443afeea40f63fdff8.tar
yuzu-34eaf3a366a3a7c7ec3207443afeea40f63fdff8.tar.gz
yuzu-34eaf3a366a3a7c7ec3207443afeea40f63fdff8.tar.bz2
yuzu-34eaf3a366a3a7c7ec3207443afeea40f63fdff8.tar.lz
yuzu-34eaf3a366a3a7c7ec3207443afeea40f63fdff8.tar.xz
yuzu-34eaf3a366a3a7c7ec3207443afeea40f63fdff8.tar.zst
yuzu-34eaf3a366a3a7c7ec3207443afeea40f63fdff8.zip
Diffstat (limited to '.travis')
-rwxr-xr-x.travis/clang-format/build.sh2
-rwxr-xr-x.travis/clang-format/deps.sh2
-rwxr-xr-x.travis/clang-format/docker.sh3
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