Merge pull request #198 from N00byKing/clang

Use Docker for Build Target clang-format for travis.
This commit is contained in:
bunnei 2018-02-18 14:12:11 -05:00 committed by GitHub
commit de43db3400
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 9 deletions

View file

@ -3,16 +3,11 @@ matrix:
include: include:
- os: linux - os: linux
env: NAME="clang-format" env: NAME="clang-format"
sudo: required
dist: trusty dist: trusty
addons: services: docker
apt: install: "./.travis/clang-format/deps.sh"
sources: script: "./.travis/clang-format/build.sh"
- 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"
- os: linux - os: linux
env: NAME="linux build" env: NAME="linux build"
sudo: required sudo: required

3
.travis/clang-format/build.sh Executable file
View file

@ -0,0 +1,3 @@
#!/bin/bash -ex
docker run -v $(pwd):/yuzu ubuntu:18.04 /bin/bash -ex /yuzu/.travis/clang-format/docker.sh

3
.travis/clang-format/deps.sh Executable file
View file

@ -0,0 +1,3 @@
#!/bin/sh -ex
docker pull ubuntu:18.04

8
.travis/clang-format/docker.sh Executable file
View file

@ -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