diff options
| author | N00byKing <N00byKing@hotmail.de> | 2018-02-16 21:37:35 +0100 |
|---|---|---|
| committer | N00byKing <N00byKing@hotmail.de> | 2018-02-16 22:21:31 +0100 |
| commit | 947831ff1e09fa1892e0e584dd57360ebf4e2f4d (patch) | |
| tree | 9b2b09f53e471e3aa0f5ed4a2cda08f491f65e88 | |
| parent | Merge pull request #195 from bunnei/shared-font (diff) | |
| download | yuzu-947831ff1e09fa1892e0e584dd57360ebf4e2f4d.tar yuzu-947831ff1e09fa1892e0e584dd57360ebf4e2f4d.tar.gz yuzu-947831ff1e09fa1892e0e584dd57360ebf4e2f4d.tar.bz2 yuzu-947831ff1e09fa1892e0e584dd57360ebf4e2f4d.tar.lz yuzu-947831ff1e09fa1892e0e584dd57360ebf4e2f4d.tar.xz yuzu-947831ff1e09fa1892e0e584dd57360ebf4e2f4d.tar.zst yuzu-947831ff1e09fa1892e0e584dd57360ebf4e2f4d.zip | |
| -rw-r--r-- | .travis.yml | 13 | ||||
| -rwxr-xr-x | .travis/clang-format/build.sh | 3 | ||||
| -rwxr-xr-x | .travis/clang-format/deps.sh | 3 | ||||
| -rwxr-xr-x | .travis/clang-format/docker.sh | 8 |
4 files changed, 18 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index e2742b5fe..044708b1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,16 +3,11 @@ matrix: include: - os: linux env: NAME="clang-format" + sudo: required dist: trusty - addons: - apt: - sources: - - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-6.0 main' - key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' - - sourceline: 'deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main' - packages: - - clang-format-6.0 - script: "./.travis/clang-format/script.sh" + services: docker + install: "./.travis/clang-format/deps.sh" + script: "./.travis/clang-format/build.sh" - os: linux env: NAME="linux build" sudo: required diff --git a/.travis/clang-format/build.sh b/.travis/clang-format/build.sh new file mode 100755 index 000000000..ad8960950 --- /dev/null +++ b/.travis/clang-format/build.sh @@ -0,0 +1,3 @@ +#!/bin/bash -ex + +docker run -v $(pwd):/yuzu ubuntu:18.04 /bin/bash /yuzu/.travis/clang-format/docker.sh diff --git a/.travis/clang-format/deps.sh b/.travis/clang-format/deps.sh new file mode 100755 index 000000000..540bb934a --- /dev/null +++ b/.travis/clang-format/deps.sh @@ -0,0 +1,3 @@ +#!/bin/sh -ex + +docker pull ubuntu:18.04 diff --git a/.travis/clang-format/docker.sh b/.travis/clang-format/docker.sh new file mode 100755 index 000000000..05047e9b8 --- /dev/null +++ b/.travis/clang-format/docker.sh @@ -0,0 +1,8 @@ +#!/bin/bash -ex + +apt-get update +apt-get install -y clang-format-6.0 + +# Run clang-format +cd /yuzu +./.travis/clang-format/script.sh |