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 commit b2f12da4276095bbd7442d171c81479a3939e312. * remove protobuf from apt * Revert "remove protobuf from apt" This reverts commit 9162c8800c10b958e132aa0d68322fd03942660f. * 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 commit 6192e581696d5493920dd08d4c142b1ba53cf5b0. * Revert "remove qt from apt" This reverts commit 0d9aff1c4c9bb19dd9da0b41769f4fad197046cc. * 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
|
@ -97,6 +97,7 @@ build_script:
|
||||||
$protodir = "c:\protobuf-release"
|
$protodir = "c:\protobuf-release"
|
||||||
$protoc = "c:\protobuf-release\bin\protoc.exe"
|
$protoc = "c:\protobuf-release\bin\protoc.exe"
|
||||||
$mysqldll = "c:\Program Files\MySQL\MySQL Server 5.7\lib\libmysql.dll"
|
$mysqldll = "c:\Program Files\MySQL\MySQL Server 5.7\lib\libmysql.dll"
|
||||||
|
cmake --version
|
||||||
cmake .. -G "$env:cmake_generator" -T "$env:cmake_toolset" "-DCMAKE_PREFIX_PATH=c:/Qt/$env:qt_ver;$protodir;$zlibdir;$openssldir" "-DWITH_SERVER=1" "-DPROTOBUF_PROTOC_EXECUTABLE=$protoc" "-DMYSQLCLIENT_LIBRARIES=$mysqldll"
|
cmake .. -G "$env:cmake_generator" -T "$env:cmake_toolset" "-DCMAKE_PREFIX_PATH=c:/Qt/$env:qt_ver;$protodir;$zlibdir;$openssldir" "-DWITH_SERVER=1" "-DPROTOBUF_PROTOC_EXECUTABLE=$protoc" "-DMYSQLCLIENT_LIBRARIES=$mysqldll"
|
||||||
- msbuild PACKAGE.vcxproj /p:Configuration=Release
|
- msbuild PACKAGE.vcxproj /p:Configuration=Release
|
||||||
- ps: |
|
- ps: |
|
||||||
|
@ -145,5 +146,6 @@ deploy:
|
||||||
APPVEYOR_REPO_TAG_NAME: /([0-9]|[1-9][0-9])(\.([0-9]|[1-9][0-9])){2}$/ # regex to match semver naming convention for stable full releases
|
APPVEYOR_REPO_TAG_NAME: /([0-9]|[1-9][0-9])(\.([0-9]|[1-9][0-9])){2}$/ # regex to match semver naming convention for stable full releases
|
||||||
|
|
||||||
|
|
||||||
# official validator for ".appveyor.yml" config file: https://ci.appveyor.com/tools/validate-yaml
|
# Announcements of build image updates: https://www.appveyor.com/updates/
|
||||||
# appveyor config documentation: https://www.appveyor.com/docs/build-configuration/
|
# Official validator for ".appveyor.yml" config file: https://ci.appveyor.com/tools/validate-yaml
|
||||||
|
# AppVeyor config documentation: https://www.appveyor.com/docs/build-configuration/
|
||||||
|
|
|
@ -16,6 +16,8 @@ if [[ $TRAVIS_OS_NAME == "linux" ]]; then
|
||||||
prefix="-DCMAKE_PREFIX_PATH=$(echo /opt/qt5*/lib/cmake/)"
|
prefix="-DCMAKE_PREFIX_PATH=$(echo /opt/qt5*/lib/cmake/)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
cmake --version
|
||||||
|
|
||||||
if [[ $BUILDTYPE == "Debug" ]]; then
|
if [[ $BUILDTYPE == "Debug" ]]; then
|
||||||
cmake .. -DWITH_SERVER=1 -DCMAKE_BUILD_TYPE=$BUILDTYPE $prefix -DTEST=1
|
cmake .. -DWITH_SERVER=1 -DCMAKE_BUILD_TYPE=$BUILDTYPE $prefix -DTEST=1
|
||||||
make -j2
|
make -j2
|
||||||
|
@ -27,6 +29,7 @@ if [[ $BUILDTYPE == "Debug" ]]; then
|
||||||
|
|
||||||
if [[ $TRAVIS_OS_NAME == "linux" ]]; then
|
if [[ $TRAVIS_OS_NAME == "linux" ]]; then
|
||||||
cd ..
|
cd ..
|
||||||
|
clang-format -version
|
||||||
clang-format -i \
|
clang-format -i \
|
||||||
common/*.h \
|
common/*.h \
|
||||||
common/*.cpp \
|
common/*.cpp \
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
if [[ $TRAVIS_OS_NAME == "osx" ]] ; then
|
if [[ $TRAVIS_OS_NAME == "osx" ]] ; then
|
||||||
brew update
|
brew update
|
||||||
brew install ccache clang-format protobuf qt
|
brew install ccache protobuf qt
|
||||||
fi
|
fi
|
||||||
if [[ $TRAVIS_OS_NAME == "linux" ]] ; then
|
if [[ $TRAVIS_OS_NAME == "linux" ]] ; then
|
||||||
echo Skipping... packages are installed with the Travis apt addon for sudo disabled container builds
|
echo Skipping... packages are installed with the Travis apt addon for sudo disabled container builds
|
||||||
|
|
42
.travis.yml
42
.travis.yml
|
@ -1,42 +1,38 @@
|
||||||
language: cpp
|
language: cpp
|
||||||
|
compiler: gcc
|
||||||
cache: ccache
|
cache: ccache
|
||||||
|
|
||||||
conditions: v1
|
|
||||||
|
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
fast_finish: true
|
|
||||||
include:
|
include:
|
||||||
- os: linux
|
#Ubuntu
|
||||||
|
- name: Ubuntu (Debug)
|
||||||
|
if: tag IS NOT present
|
||||||
|
os: linux
|
||||||
dist: xenial
|
dist: xenial
|
||||||
group: stable
|
group: stable
|
||||||
env: BUILDTYPE=Debug
|
env: BUILDTYPE=Debug
|
||||||
if: tag IS NOT present
|
- name: Ubuntu (Release)
|
||||||
- os: linux
|
if: (branch = master AND NOT type = pull_request) OR tag IS present
|
||||||
|
os: linux
|
||||||
dist: xenial
|
dist: xenial
|
||||||
group: stable
|
group: stable
|
||||||
env: BUILDTYPE=Release
|
env: BUILDTYPE=Release
|
||||||
if: (branch = master AND NOT type = pull_request) OR tag IS present
|
#macOS
|
||||||
- os: osx
|
- name: macOS (Debug)
|
||||||
|
if: tag IS NOT present
|
||||||
|
os: osx
|
||||||
osx_image: xcode8
|
osx_image: xcode8
|
||||||
env: BUILDTYPE=Debug
|
env: BUILDTYPE=Debug
|
||||||
if: tag IS NOT present
|
- name: macOS (Release)
|
||||||
- os: osx
|
if: (branch = master AND NOT type = pull_request) OR tag IS present
|
||||||
|
os: osx
|
||||||
osx_image: xcode8
|
osx_image: xcode8
|
||||||
env: BUILDTYPE=Release
|
env: BUILDTYPE=Release
|
||||||
if: (branch = master AND NOT type = pull_request) OR tag IS present
|
|
||||||
|
|
||||||
#install dependencies for container-based "linux" builds
|
#install dependencies for container-based "linux" builds
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
sources:
|
|
||||||
- sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main'
|
|
||||||
key_url: 'http://llvm.org/apt/llvm-snapshot.gpg.key'
|
|
||||||
packages:
|
packages:
|
||||||
- bc
|
|
||||||
- clang-format-5.0
|
|
||||||
- cmake
|
|
||||||
- libprotobuf-dev
|
- libprotobuf-dev
|
||||||
- protobuf-compiler
|
- protobuf-compiler
|
||||||
- qt5-default
|
- qt5-default
|
||||||
|
@ -48,6 +44,7 @@ addons:
|
||||||
- libqt5sql5-mysql
|
- libqt5sql5-mysql
|
||||||
- libqt5websockets5-dev
|
- libqt5websockets5-dev
|
||||||
|
|
||||||
|
|
||||||
before_install: bash ./.ci/travis-dependencies.sh
|
before_install: bash ./.ci/travis-dependencies.sh
|
||||||
|
|
||||||
script: bash ./.ci/travis-compile.sh
|
script: bash ./.ci/travis-compile.sh
|
||||||
|
@ -89,6 +86,7 @@ deploy:
|
||||||
|
|
||||||
|
|
||||||
notifications:
|
notifications:
|
||||||
|
email: false
|
||||||
webhooks:
|
webhooks:
|
||||||
urls:
|
urls:
|
||||||
- https://webhooks.gitter.im/e/d94969c3b01b22cbdcb7
|
- https://webhooks.gitter.im/e/d94969c3b01b22cbdcb7
|
||||||
|
@ -99,5 +97,7 @@ notifications:
|
||||||
on_error: change
|
on_error: change
|
||||||
|
|
||||||
|
|
||||||
# official validator for ".travis.yml" config file: https://yaml.travis-ci.org
|
# Announcements of build image updates: https://docs.travis-ci.com/user/build-environment-updates/
|
||||||
# travis config documentation: https://docs.travis-ci.com/user/customizing-the-build
|
# For precise versions of preinstalled tools on the VM, check “Build system information” in the build log!
|
||||||
|
# Official validator for ".travis.yml" config file: https://yaml.travis-ci.org
|
||||||
|
# Travis CI config documentation: https://docs.travis-ci.com/user/customizing-the-build
|
||||||
|
|
Loading…
Reference in a new issue