d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 19:08:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bump up Qt versions on travis & appveyor

Browse source
This commit is contained in:
Konstantinos Sideris 2018-01-29 02:12:05 +02:00
parent 597f829c57
commit ccb904315e
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.ci/install.sh
View file

@ -13,7 +13,7 @@ fi
if [ $TRAVIS_OS_NAME == linux ]; then if [ $TRAVIS_OS_NAME == linux ]; then
if [ -z "$QT_VERSION" ]; then if [ -z "$QT_VERSION" ]; then
QT_VERSION="592" QT_VERSION="594"
fi fi
export QT_PKG=${QT_VERSION:0:2} export QT_PKG=${QT_VERSION:0:2}

4
.travis.yml
View file

@ -22,7 +22,7 @@ matrix:
env: env:
- CXX_COMPILER=g++-6 - CXX_COMPILER=g++-6
- C_COMPILER=gcc-6 - C_COMPILER=gcc-6
- QT_VERSION=592 - QT_VERSION=594
- DEPLOYMENT=1 - DEPLOYMENT=1
addons: addons:
apt: apt:
@ -43,7 +43,7 @@ matrix:
env: env:
- 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=594
addons: addons:
apt: apt:
sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"] sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"]

12
appveyor.yml
View file

@ -1,3 +1,5 @@
---
version: 0.1.0-{build} version: 0.1.0-{build}
environment: environment:
@ -10,10 +12,10 @@ configuration:
- Release - Release
build: build:
verbosity: minimal verbosity: minimal
install: install:
- set QT_DIR=C:\Qt\5.9.2\msvc2015_64 - set QT_DIR=C:\Qt\5.10.0\msvc2015_64
- set PATH=%PATH%;%QT_DIR%\bin;C:\MinGW\bin - set PATH=%PATH%;%QT_DIR%\bin;C:\MinGW\bin
build_script: build_script:
@ -43,7 +45,7 @@ after_build:
- echo %BUILD% - echo %BUILD%
- mkdir NhekoRelease - mkdir NhekoRelease
- copy build\Release\nheko.exe NhekoRelease\nheko.exe - copy build\Release\nheko.exe NhekoRelease\nheko.exe
- windeployqt --qmldir C:\Qt\5.9.2\msvc2015_64\qml\ --release NhekoRelease\nheko.exe - windeployqt --qmldir C:\Qt\5.10.0\msvc2015_64\qml\ --release NhekoRelease\nheko.exe
- copy C:\OpenSSL-Win64\bin\ssleay32.dll .\NhekoRelease\ssleay32.dll - copy C:\OpenSSL-Win64\bin\ssleay32.dll .\NhekoRelease\ssleay32.dll
- copy C:\OpenSSL-Win64\bin\libeay32.dll .\NhekoRelease\libeay32.dll - copy C:\OpenSSL-Win64\bin\libeay32.dll .\NhekoRelease\libeay32.dll
- copy C:\OpenSSL-Win64\lib\libeay32.lib .\NhekoRelease\libeay32.lib - copy C:\OpenSSL-Win64\lib\libeay32.lib .\NhekoRelease\libeay32.lib
@ -94,12 +96,12 @@ deploy:
description: "Development builds" description: "Development builds"
provider: GitHub provider: GitHub
auth_token: auth_token:
secure: YqB7hcM+4482eSHhtVR7ZA7N7lE78y8BC897/7UDTBQd+NWdWFW/6S+oKDie9TT7 secure: YqB7hcM+4482eSHhtVR7ZA7N7lE78y8BC897/7UDTBQd+NWdWFW/6S+oKDie9TT7
artifact: nheko-installer.exe artifact: nheko-installer.exe
force_update: true force_update: true
prerelease: true prerelease: true
on: on:
appveyor_repo_tag: true appveyor_repo_tag: true
artifacts: artifacts:
- path: nheko_win_64.zip - path: nheko_win_64.zip