summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2019-10-30 09:40:46 +0100
committerStefan Schmidt <s.schmidt@samsung.com>2019-11-05 16:59:12 +0100
commit5ad0f5f7d022e78b8fc3f5a87490ce0621f799d8 (patch)
tree548cca4f4e3e841e05e03c20554c910284981b89
parent6108ea0978871eae23b1083dc59263ed10309fa7 (diff)
downloadefl-5ad0f5f7d022e78b8fc3f5a87490ce0621f799d8.tar.gz
travis/ci: update Fedora CI images to 31
Also disable the gstreamer 0.10 module since this version is no longer shipped with Fedora 31. Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D10597
-rwxr-xr-x.ci/ci-configure.sh2
-rw-r--r--.travis.yml14
2 files changed, 8 insertions, 8 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 97fcb1785d..b7466f6575 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -17,7 +17,7 @@ if [ "$DISTRO" != "" ] ; then
# - RPM fusion repo for xine and libvlc
ENABLED_LINUX_COPTS=" -Dfb=true -Dsdl=true -Dbuffer=true -Dbuild-id=travis-build \
-Ddebug-threads=true -Dg-mainloop=true -Dxpresent=true -Dxgesture=false -Dxinput22=true \
- -Devas-loaders-disabler=json -Decore-imf-loaders-disabler= -Demotion-loaders-disabler=libvlc,xine \
+ -Devas-loaders-disabler=json -Decore-imf-loaders-disabler= -Demotion-loaders-disabler=gstreamer,libvlc,xine \
-Demotion-generic-loaders-disabler=vlc -Dharfbuzz=true -Dpixman=true -Dhyphen=true \
-Dvnc-server=true -Dbindings=luajit -Delogind=false -Dinstall-eo-files=true"
diff --git a/.travis.yml b/.travis.yml
index 08c9fc2cd1..e55cf38b84 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,18 +46,18 @@ jobs:
include:
- os: osx
- os: linux
- env: DISTRO=Fedora30-mingw CI_BUILD_TYPE=mingw
+ env: DISTRO=Fedora31-mingw CI_BUILD_TYPE=mingw
- os: linux
- env: DISTRO=Fedora30 CI_BUILD_TYPE=options-enabled
+ env: DISTRO=Fedora31 CI_BUILD_TYPE=options-enabled
- os: linux
- env: DISTRO=Fedora30 CI_BUILD_TYPE=options-disabled
+ env: DISTRO=Fedora31 CI_BUILD_TYPE=options-disabled
- os: linux
- env: DISTRO=Fedora30 CI_BUILD_TYPE=wayland
+ env: DISTRO=Fedora31 CI_BUILD_TYPE=wayland
- os: linux
- env: DISTRO=Fedora30 CI_BUILD_TYPE=default
+ env: DISTRO=Fedora31 CI_BUILD_TYPE=default
- os: linux
if: type = cron
- env: DISTRO=Fedora30 CI_BUILD_TYPE=release-ready
+ env: DISTRO=Fedora31 CI_BUILD_TYPE=release-ready
- os: linux
if: type = cron
env: DISTRO=Ubuntu1804
@@ -69,7 +69,7 @@ jobs:
env: DISTRO=Debian96
- os: linux
if: type = cron
- env: DISTRO=Fedora30 CI_BUILD_TYPE=coverity
+ env: DISTRO=Fedora31 CI_BUILD_TYPE=coverity
services:
- docker