rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Install qt5-svg in travis

This commit is contained in:
Konstantinos Sideris 2018-04-28 21:34:40 +03:00
parent 2c9aa72d13
commit b67024149c
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/install.sh
View File

@ -20,16 +20,16 @@ if [ $TRAVIS_OS_NAME == linux ]; then
if [ -z "$QT_VERSION" ]; then if [ -z "$QT_VERSION" ]; then
QT_VERSION="592" QT_VERSION="592"
QT_PKG="59"
fi 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:beineri/opt-qt${QT_VERSION}-trusty
sudo add-apt-repository -y ppa:george-edison55/cmake-3.x sudo add-apt-repository -y ppa:george-edison55/cmake-3.x
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -qq -y \ sudo apt-get install -qq -y \
qt${QT_PKG}base \ qt${QT_PKG}base \
qt${QT_PKG}tools \ qt${QT_PKG}tools \
qt${QT_PKG}svg \
qt${QT_PKG}multimedia \ qt${QT_PKG}multimedia \
cmake \ cmake \
liblmdb-dev liblmdb-dev

1
.ci/script.sh
View File

@ -3,7 +3,6 @@
set -ex set -ex
if [ $TRAVIS_OS_NAME == linux ]; then if [ $TRAVIS_OS_NAME == linux ]; then
QT_PKG=${QT_VERSION:0:2}
source /opt/qt${QT_PKG}/bin/qt${QT_PKG}-env.sh || true; source /opt/qt${QT_PKG}/bin/qt${QT_PKG}-env.sh || true;
fi fi

5
.travis.yml
View File

@ -19,7 +19,8 @@ matrix:
env: env:
- CXX_COMPILER=g++-7 - CXX_COMPILER=g++-7
- C_COMPILER=gcc-7 - C_COMPILER=gcc-7
- QT_VERSION=592 - QT_VERSION="-5.10.1"
- QT_PKG=510
- DEPLOYMENT=1 - DEPLOYMENT=1
addons: addons:
apt: apt:
@ -31,6 +32,7 @@ matrix:
- CXX_COMPILER=g++-7 - CXX_COMPILER=g++-7
- C_COMPILER=gcc-7 - C_COMPILER=gcc-7
- QT_VERSION=571 - QT_VERSION=571
- QT_PKG=57
addons: addons:
apt: apt:
sources: ["ubuntu-toolchain-r-test"] sources: ["ubuntu-toolchain-r-test"]
@ -41,6 +43,7 @@ matrix:
- CXX_COMPILER=clang++-5.0 - CXX_COMPILER=clang++-5.0
- C_COMPILER=clang-5.0 - C_COMPILER=clang-5.0
- QT_VERSION=592 - QT_VERSION=592
- QT_PKG=59
addons: addons:
apt: apt:
sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"] sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"]

4
README.md
View File

@ -89,7 +89,7 @@ Debian as the build host in an attempt to work around this [issue](https://githu
##### Arch Linux ##### Arch Linux
```bash ```bash
sudo pacman -S qt5-base qt5-tools qt5-multimedia cmake gcc fontconfig lmdb sudo pacman -S qt5-base qt5-tools qt5-multimedia qt5-svg cmake gcc fontconfig lmdb
``` ```
##### Gentoo Linux ##### Gentoo Linux
@ -105,7 +105,7 @@ sudo add-apt-repository ppa:beineri/opt-qt592-trusty
sudo add-apt-repository ppa:george-edison55/cmake-3.x sudo add-apt-repository ppa:george-edison55/cmake-3.x
sudo add-apt-repository ppa:ubuntu-toolchain-r-test sudo add-apt-repository ppa:ubuntu-toolchain-r-test
sudo apt-get update sudo apt-get update
sudo apt-get install -y g++-7 qt59base qt59tools qt59multimedia cmake liblmdb-dev sudo apt-get install -y g++-7 qt59base qt59svg qt59tools qt59multimedia cmake liblmdb-dev
``` ```
##### macOS (Xcode 8 or later) ##### macOS (Xcode 8 or later)