summaryrefslogtreecommitdiff
path: root/.ci
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2020-05-28 19:32:03 +0200
committerStefan Schmidt <s.schmidt@samsung.com>2020-06-02 14:15:32 +0200
commit7e1da900934fcb2d837c65bafe1d086d54830803 (patch)
treef593b0c3a7ec8b947719e2c5f658284a44fc0f43 /.ci
parent41c90a9ae3d48796884f65efbee995fae50bf7cd (diff)
ci: travis: enable efl-one in our all enabled build
After a successful build we run the efl-one test script to see if it drags in unwanted libs. Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D11906
Diffstat (limited to '.ci')
-rwxr-xr-x.ci/ci-configure.sh2
-rwxr-xr-x.ci/ci-make.sh3
2 files changed, 4 insertions, 1 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 6c2e4e9190..a83535c4c1 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -17,7 +17,7 @@ if [ "$DISTRO" != "" ] ; then
17 ENABLED_LINUX_COPTS=" -Dfb=true -Dsdl=true -Dbuffer=true -Dbuild-id=travis-build \ 17 ENABLED_LINUX_COPTS=" -Dfb=true -Dsdl=true -Dbuffer=true -Dbuild-id=travis-build \
18 -Ddebug-threads=true -Dglib=true -Dg-mainloop=true -Dxpresent=true -Dxinput22=true \ 18 -Ddebug-threads=true -Dglib=true -Dg-mainloop=true -Dxpresent=true -Dxinput22=true \
19 -Devas-loaders-disabler=json -Decore-imf-loaders-disabler= \ 19 -Devas-loaders-disabler=json -Decore-imf-loaders-disabler= \
20 -Dharfbuzz=true -Dpixman=true -Dhyphen=true \ 20 -Dharfbuzz=true -Dpixman=true -Dhyphen=true -Defl-one=true \
21 -Dvnc-server=true -Dbindings=lua,cxx,mono -Delogind=false -Dinstall-eo-files=true -Dphysics=true" 21 -Dvnc-server=true -Dbindings=lua,cxx,mono -Delogind=false -Dinstall-eo-files=true -Dphysics=true"
22 22
23 # Enabled png, jpeg evas loader for in tree edje file builds 23 # Enabled png, jpeg evas loader for in tree edje file builds
diff --git a/.ci/ci-make.sh b/.ci/ci-make.sh
index fcb99f781b..210929db2a 100755
--- a/.ci/ci-make.sh
+++ b/.ci/ci-make.sh
@@ -15,6 +15,9 @@ if [ "$DISTRO" != "" ] ; then
15 docker exec --env EIO_MONITOR_POLL=1 --env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN $(cat $HOME/cid) sh -c ".ci/coverity-upload.sh" 15 docker exec --env EIO_MONITOR_POLL=1 --env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN $(cat $HOME/cid) sh -c ".ci/coverity-upload.sh"
16 else 16 else
17 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build 17 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build
18 if [ "$1" = "options-enabled" ]; then # we have efl-one on and want to check it after build
19 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) python scripts/test-efl-one.py build
20 fi
18 fi 21 fi
19elif [ "$TRAVIS_OS_NAME" = "osx" ]; then 22elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
20 latest_brew_python3_bin="$(ls -1d /usr/local/Cellar/python/3.*/bin | sort -n | tail -n1)" 23 latest_brew_python3_bin="$(ls -1d /usr/local/Cellar/python/3.*/bin | sort -n | tail -n1)"