summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2019-10-30 09:40:46 +0100
committerMike Blumenkrantz <zmike@samsung.com>2019-11-27 09:42:53 -0500
commit626f3cfe515d1611b637d3b57294bf20eefa9b48 (patch)
treef6c09302f3078a65eb41d8dff7b64d537481f69d
parent97b65a6280435c6780b96168161323afb4225b24 (diff)
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 54ed89d4a5..a0b7747f8b 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -17,7 +17,7 @@ if [ "$DISTRO" != "" ] ; then
17 # - RPM fusion repo for xine and libvlc 17 # - RPM fusion repo for xine and libvlc
18 ENABLED_LINUX_COPTS=" -Dfb=true -Dsdl=true -Dbuffer=true -Dbuild-id=travis-build \ 18 ENABLED_LINUX_COPTS=" -Dfb=true -Dsdl=true -Dbuffer=true -Dbuild-id=travis-build \
19 -Ddebug-threads=true -Dg-mainloop=true -Dxpresent=true -Dxgesture=false -Dxinput22=true \ 19 -Ddebug-threads=true -Dg-mainloop=true -Dxpresent=true -Dxgesture=false -Dxinput22=true \
20 -Devas-loaders-disabler=json -Decore-imf-loaders-disabler= -Demotion-loaders-disabler=libvlc,xine \ 20 -Devas-loaders-disabler=json -Decore-imf-loaders-disabler= -Demotion-loaders-disabler=gstreamer,libvlc,xine \
21 -Demotion-generic-loaders-disabler=vlc -Dharfbuzz=true -Dpixman=true -Dhyphen=true \ 21 -Demotion-generic-loaders-disabler=vlc -Dharfbuzz=true -Dpixman=true -Dhyphen=true \
22 -Dvnc-server=true -Dbindings=luajit -Delogind=false -Dinstall-eo-files=true" 22 -Dvnc-server=true -Dbindings=luajit -Delogind=false -Dinstall-eo-files=true"
23 23
diff --git a/.travis.yml b/.travis.yml
index 08c9fc2cd1..e55cf38b84 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,18 +46,18 @@ jobs:
46 include: 46 include:
47 - os: osx 47 - os: osx
48 - os: linux 48 - os: linux
49 env: DISTRO=Fedora30-mingw CI_BUILD_TYPE=mingw 49 env: DISTRO=Fedora31-mingw CI_BUILD_TYPE=mingw
50 - os: linux 50 - os: linux
51 env: DISTRO=Fedora30 CI_BUILD_TYPE=options-enabled 51 env: DISTRO=Fedora31 CI_BUILD_TYPE=options-enabled
52 - os: linux 52 - os: linux
53 env: DISTRO=Fedora30 CI_BUILD_TYPE=options-disabled 53 env: DISTRO=Fedora31 CI_BUILD_TYPE=options-disabled
54 - os: linux 54 - os: linux
55 env: DISTRO=Fedora30 CI_BUILD_TYPE=wayland 55 env: DISTRO=Fedora31 CI_BUILD_TYPE=wayland
56 - os: linux 56 - os: linux
57 env: DISTRO=Fedora30 CI_BUILD_TYPE=default 57 env: DISTRO=Fedora31 CI_BUILD_TYPE=default
58 - os: linux 58 - os: linux
59 if: type = cron 59 if: type = cron
60 env: DISTRO=Fedora30 CI_BUILD_TYPE=release-ready 60 env: DISTRO=Fedora31 CI_BUILD_TYPE=release-ready
61 - os: linux 61 - os: linux
62 if: type = cron 62 if: type = cron
63 env: DISTRO=Ubuntu1804 63 env: DISTRO=Ubuntu1804
@@ -69,7 +69,7 @@ jobs:
69 env: DISTRO=Debian96 69 env: DISTRO=Debian96
70 - os: linux 70 - os: linux
71 if: type = cron 71 if: type = cron
72 env: DISTRO=Fedora30 CI_BUILD_TYPE=coverity 72 env: DISTRO=Fedora31 CI_BUILD_TYPE=coverity
73 73
74services: 74services:
75 - docker 75 - docker