mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-26 16:43:55 -07:00
travis: more cleanup (#3336)
* add links to build image update history * remove cmake from apt * remove bc from apt * remove clang-format from apt * test clang-format * Revert "test clang-format" This reverts commitb2f12da427. * remove protobuf from apt * Revert "remove protobuf from apt" This reverts commit9162c8800c. * remove qt from apt * test with versions which differ from what xenial provides * Revert "test with versions which differ from what xenial provides" This reverts commit6192e58169. * Revert "remove qt from apt" This reverts commit0d9aff1c4c. * conditions v1 are the default now https://blog.travis-ci.com/2018-07-18-build-stages-officially-released * add new job names https://docs.travis-ci.com/user/customizing-the-build/?utm_source=blog&utm_medium=web&utm_campaign=build_stages_ga#Naming-Jobs-within-Matrices * disable mail * clang-format version * remove clang source * cmake version * macOS: remove clang-format formatting only checked on linux build * add compiler info * cmake version2 * remove fast_finish only useful if allowed failures are configured in the matrix: https://docs.travis-ci.com/user/customizing-the-build/#fast-finishing
This commit is contained in:
parent
ed01752cb4
commit
135c02ea41
4 changed files with 29 additions and 24 deletions
|
|
@ -16,6 +16,8 @@ if [[ $TRAVIS_OS_NAME == "linux" ]]; then
|
|||
prefix="-DCMAKE_PREFIX_PATH=$(echo /opt/qt5*/lib/cmake/)"
|
||||
fi
|
||||
|
||||
cmake --version
|
||||
|
||||
if [[ $BUILDTYPE == "Debug" ]]; then
|
||||
cmake .. -DWITH_SERVER=1 -DCMAKE_BUILD_TYPE=$BUILDTYPE $prefix -DTEST=1
|
||||
make -j2
|
||||
|
|
@ -27,6 +29,7 @@ if [[ $BUILDTYPE == "Debug" ]]; then
|
|||
|
||||
if [[ $TRAVIS_OS_NAME == "linux" ]]; then
|
||||
cd ..
|
||||
clang-format -version
|
||||
clang-format -i \
|
||||
common/*.h \
|
||||
common/*.cpp \
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
if [[ $TRAVIS_OS_NAME == "osx" ]] ; then
|
||||
brew update
|
||||
brew install ccache clang-format protobuf qt
|
||||
brew install ccache protobuf qt
|
||||
fi
|
||||
if [[ $TRAVIS_OS_NAME == "linux" ]] ; then
|
||||
echo Skipping... packages are installed with the Travis apt addon for sudo disabled container builds
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue