Add qt5.7 on travis ci

This commit is contained in:
Konstantinos Sideris 2018-01-13 14:59:48 +02:00
parent f87b8fe817
commit d2962ec0b2
7 changed files with 89 additions and 35 deletions

30
.ci/install.sh Executable file
View file

@ -0,0 +1,30 @@
#!/usr/bin/env bash
set -ex
if [ $TRAVIS_OS_NAME == osx ]; then
brew update
brew install qt5 lmdb clang-format ninja
export CMAKE_PREFIX_PATH=/usr/local/opt/qt5
fi
if [ $TRAVIS_OS_NAME == linux ]; then
if [ -z "$QT_VERSION" ]; then
QT_VERSION="592"
fi
export QT_PKG=${QT_VERSION:0:2}
sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty
sudo add-apt-repository -y ppa:george-edison55/cmake-3.x
sudo apt-get update -qq
sudo apt-get install -qq -y \
qt${QT_PKG}base \
qt${QT_PKG}tools \
qt${QT_PKG}multimedia \
cmake \
liblmdb-dev
fi

View file

@ -1,5 +1,7 @@
#!/usr/bin/env bash
set -ex
#
# Create deb & rpm packages from the AppImage.
#

View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -e
set -ex
APP=nheko
DIR=${APP}.AppDir

View file

@ -1,6 +0,0 @@
#!/usr/bin/env bash
sudo add-apt-repository -y ppa:beineri/opt-qt592-trusty
sudo add-apt-repository -y ppa:george-edison55/cmake-3.x
sudo apt-get update -qq
sudo apt-get install -qq -y qt59base qt59tools cmake liblmdb-dev qt59multimedia

View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash
set -e
set -ex
TAG=`git tag -l --points-at HEAD`

22
.ci/script.sh Executable file
View file

@ -0,0 +1,22 @@
#!/usr/bin/env bash
set -ex
if [ $TRAVIS_OS_NAME == linux ]; then
QT_PKG=${QT_VERSION:0:2}
source /opt/qt${QT_PKG}/bin/qt${QT_PKG}-env.sh || true;
fi
make ci
if [ $TRAVIS_OS_NAME == osx ]; then
make lint;
if [ $DEPLOYMENT == 1 ] && [ ! -z $TRAVIS_TAG ]; then
make macos-deploy;
fi
fi
if [ $TRAVIS_OS_NAME == linux ] && [ $DEPLOYMENT == 1 ] && [ ! -z $TRAVIS_TAG ]; then
make linux-deploy;
fi

View file

@ -1,3 +1,5 @@
---
language: cpp
sudo: required
dist: trusty
@ -20,16 +22,28 @@ matrix:
env:
- CXX_COMPILER=g++-6
- C_COMPILER=gcc-6
- QT_VERSION=592
- DEPLOYMENT=1
addons:
apt:
sources: ["ubuntu-toolchain-r-test"]
packages: ["g++-6", "ninja-build"]
- os: linux
compiler: gcc
env:
- CXX_COMPILER=g++-6
- C_COMPILER=gcc-6
- QT_VERSION=571
addons:
apt:
sources: ["ubuntu-toolchain-r-test"]
packages: ["g++-6", "ninja-build"]
- os: linux
compiler: clang
env:
- CXX_COMPILER=clang++-5.0
- C_COMPILER=clang-5.0
- QT_VERSION=592
addons:
apt:
sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"]
@ -40,18 +54,10 @@ before_install:
- export CC=${C_COMPILER}
install:
- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install qt5 lmdb clang-format ninja; fi
- if [ $TRAVIS_OS_NAME == osx ]; then export CMAKE_PREFIX_PATH=/usr/local/opt/qt5; fi
- if [ $TRAVIS_OS_NAME == linux ]; then ./.ci/linux/install-deps.sh; fi
before_script:
- if [ $TRAVIS_OS_NAME == linux ]; then source /opt/qt59/bin/qt59-env.sh; fi
- ./.ci/install.sh
script:
- make ci
- if [ $TRAVIS_OS_NAME == osx ]; then make lint; fi
- if [ $TRAVIS_OS_NAME == osx ] && [ $DEPLOYMENT == 1 ] && [ ! -z $TRAVIS_TAG ]; then make macos-deploy; fi
- if [ $TRAVIS_OS_NAME == linux ] && [ $DEPLOYMENT == 1 ] && [ ! -z $TRAVIS_TAG ]; then make linux-deploy; fi
- ./.ci/script.sh
before_deploy:
- export RELEASE_DEB_FILE=$(ls *.deb)