jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-30 10:33:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Travis: minor changes (#3321)

Browse source 
Use the xenial version of llvm's toolchain for clang-format
Add qt5.5's websocket library for servatrice
This commit is contained in:
ctrlaltca 2018-07-11 17:43:33 +02:00 • committed by GitHub
parent d0d662f73a
commit c01aad6767
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.travis.yml
View file

@ -31,7 +31,7 @@ matrix:
addons: addons:
apt: apt:
sources: sources:
- sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main' - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main'
key_url: 'http://llvm.org/apt/llvm-snapshot.gpg.key' key_url: 'http://llvm.org/apt/llvm-snapshot.gpg.key'
packages: packages:
- bc - bc
@ -46,6 +46,7 @@ addons:
- libqt5multimedia5-plugins - libqt5multimedia5-plugins
- libqt5svg5-dev - libqt5svg5-dev
- libqt5sql5-mysql - libqt5sql5-mysql
- libqt5websockets5-dev
before_install: bash ./.ci/travis-dependencies.sh before_install: bash ./.ci/travis-dependencies.sh
@ -70,7 +71,7 @@ deploy:
tags: true tags: true
repo: Cockatrice/Cockatrice repo: Cockatrice/Cockatrice
condition: $BUILDTYPE = Release && $TRAVIS_TAG =~ ([0-9]|[1-9][0-9])(\.([0-9]|[1-9][0-9])){2}-beta(\.([2-9]|[1-9][0-9]))?$ # regex to match semver naming convention for beta pre-releases condition: $BUILDTYPE = Release && $TRAVIS_TAG =~ ([0-9]|[1-9][0-9])(\.([0-9]|[1-9][0-9])){2}-beta(\.([2-9]|[1-9][0-9]))?$ # regex to match semver naming convention for beta pre-releases
# Deploy configuration for "stable" releases # Deploy configuration for "stable" releases
- provider: releases - provider: releases
api_key: api_key:
@ -96,7 +97,7 @@ notifications:
on_start: never on_start: never
on_cancel: change on_cancel: change
on_error: change on_error: change
# official validator for ".travis.yml" config file: https://yaml.travis-ci.org # official validator for ".travis.yml" config file: https://yaml.travis-ci.org
# travis config documentation: https://docs.travis-ci.com/user/customizing-the-build # travis config documentation: https://docs.travis-ci.com/user/customizing-the-build