Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper-Free
Commits
ae61b84c
Commit
ae61b84c
authored
Apr 12, 2019
by
Jan Möbius
Browse files
Run test with qt 12.2
parent
5276f5f0
Changes
2
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
ae61b84c
...
...
@@ -6,12 +6,14 @@ stages:
variables
:
GET_SOURCES_ATTEMPTS
:
3
gcc-c++11-Qt5.11.2
:
gcc-c++11-Qt5.12.2
:
stage
:
Build
variables
:
COMPILER
:
"
gcc"
LANGUAGE
:
"
C++11"
QTVERSION
:
"
QT5.1
1
.2"
QTVERSION
:
"
QT5.1
2
.2"
GIT_SUBMODULE_STRATEGY
:
recursive
script
:
"
CI/ci-linux-build.sh"
tags
:
...
...
@@ -21,8 +23,26 @@ gcc-c++11-Qt5.11.2:
expire_in
:
1 week
paths
:
-
artifacts
gcc-c++11-Qt5.11.2-nopython
:
test-gcc-c++11-Qt5.12.2
:
stage
:
Test
variables
:
COMPILER
:
"
gcc"
LANGUAGE
:
"
C++11"
QTVERSION
:
"
QT5.12.2"
GIT_STRATEGY
:
none
script
:
"
artifacts/CI/ci-linux-test.sh"
tags
:
-
Linux
-
stretch
dependencies
:
-
gcc-c++11-Qt5.12.2
artifacts
:
paths
:
-
build-Release-gcc-cpp11-qt5/Testing/Temporary/LastTest.log
gcc-c++11-Qt5.12.2-nopython
:
stage
:
Build
variables
:
COMPILER
:
"
gcc"
...
...
@@ -31,6 +51,23 @@ gcc-c++11-Qt5.11.2-nopython:
PYTHON
:
"
no"
GIT_SUBMODULE_STRATEGY
:
recursive
script
:
"
CI/ci-linux-build.sh"
tags
:
-
Linux
-
stretch
artifacts
:
expire_in
:
1 week
paths
:
-
artifacts
gcc-c++11-Qt5.11.2
:
stage
:
Build
variables
:
COMPILER
:
"
gcc"
LANGUAGE
:
"
C++11"
QTVERSION
:
"
QT5.11.2"
GIT_SUBMODULE_STRATEGY
:
recursive
script
:
"
CI/ci-linux-build.sh"
tags
:
-
Linux
-
stretch
...
...
@@ -38,9 +75,7 @@ gcc-c++11-Qt5.11.2-nopython:
expire_in
:
1 week
paths
:
-
artifacts
test-gcc-c++11-Qt5.11.2
:
stage
:
Test
variables
:
...
...
@@ -56,8 +91,27 @@ test-gcc-c++11-Qt5.11.2:
-
gcc-c++11-Qt5.11.2
artifacts
:
paths
:
-
build-Release-gcc-cpp11-qt5/Testing/Temporary/LastTest.log
-
build-Release-gcc-cpp11-qt5/Testing/Temporary/LastTest.log
gcc-c++11-Qt5.11.2-nopython
:
stage
:
Build
variables
:
COMPILER
:
"
gcc"
LANGUAGE
:
"
C++11"
QTVERSION
:
"
QT5.11.2"
PYTHON
:
"
no"
GIT_SUBMODULE_STRATEGY
:
recursive
script
:
"
CI/ci-linux-build.sh"
tags
:
-
Linux
-
stretch
artifacts
:
expire_in
:
1 week
paths
:
-
artifacts
gcc-c++11-Qt5.9.0
:
stage
:
Build
variables
:
...
...
CI/ci-linux-config.sh
View file @
ae61b84c
...
...
@@ -47,7 +47,13 @@ elif [ "$LANGUAGE" == "C++11" ]; then
BUILDPATH
=
"
$BUILDPATH
-cpp11"
fi
if
[
"
$QTVERSION
"
==
"QT5.11.2"
]
;
then
if
[
"
$QTVERSION
"
==
"QT5.12.2"
]
;
then
echo
"Using QT5.12.2"
;
BUILDPATH
=
"
$BUILDPATH
-qt5.12.2"
OPTIONS
=
"
$OPTIONS
-DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.4-qt5.12.2/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.4-qt5.12.2/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.4-qt5.12.2/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.12.2/gcc_64"
elif
[
"
$QTVERSION
"
==
"QT5.11.2"
]
;
then
echo
"Using QT5.11.2"
;
BUILDPATH
=
"
$BUILDPATH
-qt5.11.2"
OPTIONS
=
"
$OPTIONS
-DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.3-qt5.11.2/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.3-qt5.11.2/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.3-qt5.11.2/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.11.2/gcc_64"
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment