restore CI clang 5.0 and 6.0

This commit is contained in:
2019-05-30 19:55:37 +07:00
parent 89d983d60c
commit 922bcd2bf2
5 changed files with 12 additions and 1 deletions

View File

@@ -9,6 +9,14 @@ matrix:
dist: trusty
addons: { apt: { sources: ubuntu-toolchain-r-test, packages: ["xorg-dev", "g++-8"] } }
env: MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
- os: linux
dist: trusty
addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"], packages: ["xorg-dev", "clang-5.0", "g++-7"] } }
env: MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
- os: linux
dist: trusty
addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-6.0"], packages: ["xorg-dev", "clang-6.0", "g++-7"] } }
env: MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0"
- os: linux
dist: trusty
addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-7"], packages: ["xorg-dev", "clang-7", "g++-7"] } }

View File

@@ -5,7 +5,7 @@
- [git](https://git-scm.com/)
- [git-lfs](https://git-lfs.github.com/)
- [cmake](https://cmake.org/) **>= 3.11**
- [gcc](https://www.gnu.org/software/gcc/) **>= 7** or [clang](https://clang.llvm.org/) **>= 7** or [msvc](https://visualstudio.microsoft.com/) **>= 2017**
- [gcc](https://www.gnu.org/software/gcc/) **>= 7** or [clang](https://clang.llvm.org/) **>= 5.0** or [msvc](https://visualstudio.microsoft.com/) **>= 2017**
## * Cloning

View File

@@ -3,6 +3,7 @@ SCRIPT_DIR=`dirname "$BASH_SOURCE"`
cloc \
$SCRIPT_DIR/../headers/enduro2d \
$SCRIPT_DIR/../headers/3rdparty/ecs.hpp \
$SCRIPT_DIR/../headers/3rdparty/flat.hpp \
$SCRIPT_DIR/../headers/3rdparty/promise.hpp \
$SCRIPT_DIR/../sources/enduro2d \
$SCRIPT_DIR/../samples/sources \

View File

@@ -3,5 +3,6 @@ SCRIPT_DIR=`dirname "$BASH_SOURCE"`
cloc \
$SCRIPT_DIR/../headers/enduro2d \
$SCRIPT_DIR/../headers/3rdparty/ecs.hpp \
$SCRIPT_DIR/../headers/3rdparty/flat.hpp \
$SCRIPT_DIR/../headers/3rdparty/promise.hpp \
$SCRIPT_DIR/../sources/enduro2d

View File

@@ -3,4 +3,5 @@ SCRIPT_DIR=`dirname "$BASH_SOURCE"`
cloc \
$SCRIPT_DIR/../headers/enduro2d \
$SCRIPT_DIR/../headers/3rdparty/ecs.hpp \
$SCRIPT_DIR/../headers/3rdparty/flat.hpp \
$SCRIPT_DIR/../headers/3rdparty/promise.hpp \