Просмотр исходного кода

Merge pull request #198 from N00byKing/clang

Use Docker for Build Target clang-format for travis.
bunnei 8 лет назад
Родитель
Сommit
de43db3400
4 измененных файлов с 18 добавлено и 9 удалено
  1. 4 9
      .travis.yml
  2. 3 0
      .travis/clang-format/build.sh
  3. 3 0
      .travis/clang-format/deps.sh
  4. 8 0
      .travis/clang-format/docker.sh

+ 4 - 9
.travis.yml

@@ -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:
-        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
     - os: linux
       env: NAME="linux build"
       env: NAME="linux build"
       sudo: required
       sudo: required

+ 3 - 0
.travis/clang-format/build.sh

@@ -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 - 0
.travis/clang-format/deps.sh

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

+ 8 - 0
.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