CI: Enable gcc5 with samples disabled

This commit is contained in:
mocabe 2020-01-31 04:54:13 +09:00 committed by Markus Tavenrath
parent 32d0bc6843
commit 955b7330ba

View File

@ -6,6 +6,21 @@ language: cpp
matrix: matrix:
include: include:
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-5
- ninja-build
- xorg-dev
- libglu1-mesa-dev
env:
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
- ADDITIONAL_BUILD_OPTIONS="-DSAMPLES_BUILD=OFF"
compiler: g++-5
- os: linux - os: linux
addons: addons:
apt: apt:
@ -64,8 +79,6 @@ matrix:
- ninja-build - ninja-build
- xorg-dev - xorg-dev
- libglu1-mesa-dev - libglu1-mesa-dev
env:
- MATRIX_EVAL=""
compiler: clang++-3.6 compiler: clang++-3.6
- os: linux - os: linux
@ -84,8 +97,6 @@ matrix:
- ninja-build - ninja-build
- xorg-dev - xorg-dev
- libglu1-mesa-dev - libglu1-mesa-dev
env:
- MATRIX_EVAL=""
compiler: clang++-4.0 compiler: clang++-4.0
- os: linux - os: linux
@ -104,8 +115,6 @@ matrix:
- ninja-build - ninja-build
- xorg-dev - xorg-dev
- libglu1-mesa-dev - libglu1-mesa-dev
env:
- MATRIX_EVAL=""
compiler: clang++-5.0 compiler: clang++-5.0
- os: linux - os: linux
@ -124,8 +133,6 @@ matrix:
- ninja-build - ninja-build
- xorg-dev - xorg-dev
- libglu1-mesa-dev - libglu1-mesa-dev
env:
- MATRIX_EVAL=""
compiler: clang++-6.0 compiler: clang++-6.0
before_install: before_install:
@ -135,5 +142,11 @@ script:
- mkdir build - mkdir build
- cd build - cd build
- cmake --version - cmake --version
- cmake -GNinja .. -DSAMPLES_BUILD=ON -DTESTS_BUILD=ON -DSAMPLES_BUILD_ONLY_DYNAMIC=ON -DSAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP=ON -DTESTS_BUILD_ONLY_DYNAMIC=ON -DTESTS_BUILD_WITH_LOCAL_VULKAN_HPP=ON - cmake -GNinja ..
-DSAMPLES_BUILD=ON
-DTESTS_BUILD=ON
-DSAMPLES_BUILD_ONLY_DYNAMIC=ON
-DSAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP=ON
-DTESTS_BUILD_ONLY_DYNAMIC=ON -DTESTS_BUILD_WITH_LOCAL_VULKAN_HPP=ON
$ADDITIONAL_BUILD_OPTIONS
- cmake --build . - cmake --build .