Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nheko
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nheko Reborn
nheko
Commits
ccb90431
Commit
ccb90431
authored
7 years ago
by
Konstantinos Sideris
Browse files
Options
Downloads
Patches
Plain Diff
Bump up Qt versions on travis & appveyor
parent
597f829c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.ci/install.sh
+1
-1
1 addition, 1 deletion
.ci/install.sh
.travis.yml
+2
-2
2 additions, 2 deletions
.travis.yml
appveyor.yml
+7
-5
7 additions, 5 deletions
appveyor.yml
with
10 additions
and
8 deletions
.ci/install.sh
+
1
−
1
View file @
ccb90431
...
...
@@ -13,7 +13,7 @@ fi
if
[
$TRAVIS_OS_NAME
==
linux
]
;
then
if
[
-z
"
$QT_VERSION
"
]
;
then
QT_VERSION
=
"59
2
"
QT_VERSION
=
"59
4
"
fi
export
QT_PKG
=
${
QT_VERSION
:0:2
}
...
...
This diff is collapsed.
Click to expand it.
.travis.yml
+
2
−
2
View file @
ccb90431
...
...
@@ -22,7 +22,7 @@ matrix:
env
:
-
CXX_COMPILER=g++-6
-
C_COMPILER=gcc-6
-
QT_VERSION=59
2
-
QT_VERSION=59
4
-
DEPLOYMENT=1
addons
:
apt
:
...
...
@@ -43,7 +43,7 @@ matrix:
env
:
-
CXX_COMPILER=clang++-5.0
-
C_COMPILER=clang-5.0
-
QT_VERSION=59
2
-
QT_VERSION=59
4
addons
:
apt
:
sources
:
[
"
ubuntu-toolchain-r-test"
,
"
llvm-toolchain-trusty-5.0"
]
...
...
This diff is collapsed.
Click to expand it.
appveyor.yml
+
7
−
5
View file @
ccb90431
---
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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment