summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2020-06-09 09:11:52 +0200
committerStefan Schmidt <s.schmidt@samsung.com>2020-06-09 10:00:12 +0200
commitc485e7cc70cc48c62002c9dc0d3845be2a44a3af (patch)
treef90fbc18ad4de2d773a0ee91577b8795bb57a549
parent4c2cbecc69c4c08ccacba7d2f6bef072addc3e33 (diff)
downloadefl-c485e7cc70cc48c62002c9dc0d3845be2a44a3af.tar.gz
ci: travis: disable the webp loader on CI builds for now
With the bump of the needed libwebp version to 1.1.0 we have have our Debian and Ubuntu builds failing with a to old version. Disable by default in CI for now and check back later.
-rwxr-xr-x.ci/ci-configure.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index dced2544ff..b6e99e9f96 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -6,7 +6,8 @@ travis_fold start "meson"
travis_time_start "meson"
if [ "$DISTRO" != "" ] ; then
# Why do we need to disable the imf loaders here?
- OPTS=" -Decore-imf-loaders-disabler=scim,ibus"
+ # Once libwebp 1.1.0 is available in more distros we can enable it by default again
+ OPTS=" -Decore-imf-loaders-disabler=scim,ibus -Devas-loaders-disabler=json,webp"
MONO_LINUX_COPTS=" -Dbindings=cxx,mono -Dmono-beta=true"
@@ -98,7 +99,7 @@ elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig:$(pwd)/.ci"
mkdir build && meson build -Dopengl=full -Decore-imf-loaders-disabler=scim,ibus -Dx11=false -Davahi=false -Deeze=false -Dsystemd=false -Dnls=false -Dcocoa=true -Dgstreamer=false
else # Native Ubuntu Linux Travis builds (non-docker)
- OPTS=" -Decore-imf-loaders-disabler=scim,ibus"
+ OPTS=" -Decore-imf-loaders-disabler=scim,ibus -Devas-loaders-disabler=json,webp"
if [ "$TRAVIS_CPU_ARCH" = "ppc64le" ]; then
OPTS="$OPTS -Dbindings="