Correct tabs to spaces
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
This commit is contained in:
parent
0f126a7795
commit
1d9f16af3a
1 changed files with 28 additions and 28 deletions
56
.travis.yml
56
.travis.yml
|
@ -1,6 +1,6 @@
|
||||||
# Optimize git clone
|
# Optimize git clone
|
||||||
git:
|
git:
|
||||||
depth: 5
|
depth: 5
|
||||||
|
|
||||||
# No need for sudo
|
# No need for sudo
|
||||||
sudo: false
|
sudo: false
|
||||||
|
@ -33,7 +33,7 @@ matrix:
|
||||||
compiler: clang
|
compiler: clang
|
||||||
name: OSX Clang Release
|
name: OSX Clang Release
|
||||||
|
|
||||||
# TODO add gcc from https://docs.travis-ci.com/user/languages/cpp/#gcc-on-macos
|
# TODO add gcc from https://docs.travis-ci.com/user/languages/cpp/#gcc-on-macos
|
||||||
|
|
||||||
# Clang on Linux
|
# Clang on Linux
|
||||||
- env: COMPILER=clang++-8 BUILD_TYPE=Debug
|
- env: COMPILER=clang++-8 BUILD_TYPE=Debug
|
||||||
|
@ -89,19 +89,19 @@ install:
|
||||||
# Recommanded build directory
|
# Recommanded build directory
|
||||||
- CMAKE_BUILD_DIR=build
|
- CMAKE_BUILD_DIR=build
|
||||||
|
|
||||||
# Install ccache on OSX
|
# Install ccache on OSX
|
||||||
- |
|
- |
|
||||||
if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
|
if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
|
||||||
# This is OSX
|
# This is OSX
|
||||||
brew install ccache || brew upgrade cmake
|
brew install ccache || brew upgrade cmake
|
||||||
export PATH="/usr/local/opt/ccache/libexec:$PATH"
|
export PATH="/usr/local/opt/ccache/libexec:$PATH"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Install required libraries
|
# Install required libraries
|
||||||
- mkdir travisLibs && cd travisLibs
|
- mkdir travisLibs && cd travisLibs
|
||||||
|
|
||||||
# Install modern CMake
|
# Install modern CMake
|
||||||
- CMAKE_VERSION=3.14.5
|
- CMAKE_VERSION=3.14.5
|
||||||
- |
|
- |
|
||||||
if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
|
if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
|
||||||
# This is Linux
|
# This is Linux
|
||||||
|
@ -114,32 +114,32 @@ install:
|
||||||
brew install cmake || brew upgrade cmake
|
brew install cmake || brew upgrade cmake
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Display CMake version
|
# Display CMake version
|
||||||
- cmake --version
|
- cmake --version
|
||||||
|
|
||||||
# Install modern SDL2
|
# Install modern SDL2
|
||||||
- SDL2_VERSION=2.0.10
|
- SDL2_VERSION=2.0.10
|
||||||
- |
|
- |
|
||||||
travis_retry curl -L https://www.libsdl.org/release/SDL2-${SDL2_VERSION}.tar.gz | tar xz
|
travis_retry curl -L https://www.libsdl.org/release/SDL2-${SDL2_VERSION}.tar.gz | tar xz
|
||||||
cd SDL2-${SDL2_VERSION}
|
cd SDL2-${SDL2_VERSION}
|
||||||
./configure
|
./configure
|
||||||
make -j ${JOBS}
|
make -j ${JOBS}
|
||||||
sudo make install -j ${JOBS}
|
sudo make install -j ${JOBS}
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
# Finished installing required libraries
|
# Finished installing required libraries
|
||||||
- cd ..
|
- cd ..
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
# Make build directory and generate CMake build files
|
# Make build directory and generate CMake build files
|
||||||
- mkdir -p ${CMAKE_BUILD_DIR} && cd ${CMAKE_BUILD_DIR}
|
- mkdir -p ${CMAKE_BUILD_DIR} && cd ${CMAKE_BUILD_DIR}
|
||||||
- cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DFIX_BUGS=ON -DWARNINGS=ON -DALL_WARNINGS=ON
|
- cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DFIX_BUGS=ON -DWARNINGS=ON -DALL_WARNINGS=ON
|
||||||
|
|
||||||
script:
|
script:
|
||||||
# CMake build
|
# CMake build
|
||||||
- cmake --build . --config ${BUILD_TYPE} --parallel ${JOBS}
|
- cmake --build . --config ${BUILD_TYPE} --parallel ${JOBS}
|
||||||
|
|
||||||
# Make build
|
# Make build
|
||||||
- cd ..
|
- cd ..
|
||||||
- make -j ${JOBS} FIX_BUGS=1 RELEASE=1 WARNINGS=1 ALL_WARNINGS=1
|
- make -j ${JOBS} FIX_BUGS=1 RELEASE=1 WARNINGS=1 ALL_WARNINGS=1
|
||||||
- cd ${CMAKE_BUILD_DIR}
|
- cd ${CMAKE_BUILD_DIR}
|
||||||
|
|
Loading…
Add table
Reference in a new issue