diff options
| author | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2018-01-29 02:12:05 +0200 |
|---|---|---|
| committer | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2018-01-29 02:12:05 +0200 |
| commit | ccb904315eb8dd7fd193798c08505fcb357d1eb7 (patch) | |
| tree | a12e54dba3cc34382e632b397e570733e753410e | |
| parent | Remove '#' from the room avatars (diff) | |
| download | nheko-ccb904315eb8dd7fd193798c08505fcb357d1eb7.tar.xz | |
Bump up Qt versions on travis & appveyor
| -rwxr-xr-x | .ci/install.sh | 2 | ||||
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | appveyor.yml | 12 |
3 files changed, 10 insertions, 8 deletions
diff --git a/.ci/install.sh b/.ci/install.sh index e7e99c1f..a3b11559 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -13,7 +13,7 @@ fi if [ $TRAVIS_OS_NAME == linux ]; then if [ -z "$QT_VERSION" ]; then - QT_VERSION="592" + QT_VERSION="594" fi export QT_PKG=${QT_VERSION:0:2} diff --git a/.travis.yml b/.travis.yml index caba1f0d..a8557fe5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ matrix: env: - CXX_COMPILER=g++-6 - C_COMPILER=gcc-6 - - QT_VERSION=592 + - QT_VERSION=594 - DEPLOYMENT=1 addons: apt: @@ -43,7 +43,7 @@ matrix: env: - CXX_COMPILER=clang++-5.0 - C_COMPILER=clang-5.0 - - QT_VERSION=592 + - QT_VERSION=594 addons: apt: sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"] diff --git a/appveyor.yml b/appveyor.yml index bda2ace2..7cb7d1e9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,3 +1,5 @@ +--- + version: 0.1.0-{build} environment: @@ -10,10 +12,10 @@ configuration: - Release build: - verbosity: minimal + verbosity: minimal 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 build_script: @@ -43,7 +45,7 @@ after_build: - echo %BUILD% - mkdir NhekoRelease - 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\libeay32.dll .\NhekoRelease\libeay32.dll - copy C:\OpenSSL-Win64\lib\libeay32.lib .\NhekoRelease\libeay32.lib @@ -94,12 +96,12 @@ deploy: description: "Development builds" provider: GitHub auth_token: - secure: YqB7hcM+4482eSHhtVR7ZA7N7lE78y8BC897/7UDTBQd+NWdWFW/6S+oKDie9TT7 + secure: YqB7hcM+4482eSHhtVR7ZA7N7lE78y8BC897/7UDTBQd+NWdWFW/6S+oKDie9TT7 artifact: nheko-installer.exe force_update: true prerelease: true on: - appveyor_repo_tag: true + appveyor_repo_tag: true artifacts: - path: nheko_win_64.zip |