CI: for now, switch off PythonQt
This commit is contained in:
parent
3b82e655d7
commit
f73f4bdea2
12
ci/travis-config.sh
Normal file
12
ci/travis-config.sh
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
# Build configuration on Travis.
|
||||||
|
#
|
||||||
|
# Defines a CMAKE_ARGS variable for use with cmake
|
||||||
|
#
|
||||||
|
# This file is sourced by travis.sh, and exports the variables
|
||||||
|
# to the environment.
|
||||||
|
CMAKE_ARGS="\
|
||||||
|
-DWEBVIEW_FORCE_WEBKIT=1 \
|
||||||
|
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
|
||||||
|
-DWITH_PYTHONQT=OFF"
|
||||||
|
|
||||||
|
export CMAKE_ARGS
|
@ -12,4 +12,4 @@ test -f $SRCDIR/CMakeLists.txt || exit 1
|
|||||||
|
|
||||||
cd $BUILDDIR || exit 1
|
cd $BUILDDIR || exit 1
|
||||||
|
|
||||||
cmake -DWEBVIEW_FORCE_WEBKIT=1 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON $SRCDIR && make -j2 && make install DESTDIR=/build/INSTALL_ROOT
|
cmake $CMAKE_ARGS $SRCDIR && make -j2 && make install DESTDIR=/build/INSTALL_ROOT
|
||||||
|
@ -21,7 +21,7 @@ tar xvf coverity_tool.tar.gz -C "$BUILDDIR/coveritytool" --strip-components 2
|
|||||||
export PATH="$BUILDDIR/coveritytool/bin:$PATH"
|
export PATH="$BUILDDIR/coveritytool/bin:$PATH"
|
||||||
|
|
||||||
|
|
||||||
cmake -DCMAKE_BUILD_TYPE=Debug -DWEBVIEW_FORCE_WEBKIT=1 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON $SRCDIR || exit 1
|
cmake -DCMAKE_BUILD_TYPE=Debug $CMAKE_ARGS $SRCDIR || exit 1
|
||||||
cov-build --dir cov-int make -j2
|
cov-build --dir cov-int make -j2
|
||||||
|
|
||||||
tar caf calamares-ci.tar.xz cov-int
|
tar caf calamares-ci.tar.xz cov-int
|
||||||
|
@ -12,6 +12,8 @@ test -d "$D" || exit 1
|
|||||||
test -x "$D/travis-continuous.sh" || exit 1
|
test -x "$D/travis-continuous.sh" || exit 1
|
||||||
test -x "$D/travis-coverity.sh" || exit 1
|
test -x "$D/travis-coverity.sh" || exit 1
|
||||||
|
|
||||||
|
test -f "$D/travis-common.sh" && . "$D/travis-config.sh"
|
||||||
|
|
||||||
if test "$TRAVIS_EVENT_TYPE" = "cron" ; then
|
if test "$TRAVIS_EVENT_TYPE" = "cron" ; then
|
||||||
exec "$D/travis-coverity.sh"
|
exec "$D/travis-coverity.sh"
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user