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 11:42:43 +0200
commit29c491b977543e9ef86147604ab3a297ece18327 (patch)
treee07e0b0144862c212afb6a1c0bf426764dbae289
parent9be9e9f5ffd50b0079143f18a9c99ff793daa81a (diff)
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"
6travis_time_start "meson" 6travis_time_start "meson"
7if [ "$DISTRO" != "" ] ; then 7if [ "$DISTRO" != "" ] ; then
8 # Why do we need to disable the imf loaders here? 8 # Why do we need to disable the imf loaders here?
9 OPTS=" -Decore-imf-loaders-disabler=scim,ibus" 9 # Once libwebp 1.1.0 is available in more distros we can enable it by default again
10 OPTS=" -Decore-imf-loaders-disabler=scim,ibus -Devas-loaders-disabler=json,webp"
10 11
11 MONO_LINUX_COPTS=" -Dbindings=cxx,mono -Dmono-beta=true" 12 MONO_LINUX_COPTS=" -Dbindings=cxx,mono -Dmono-beta=true"
12 13
@@ -98,7 +99,7 @@ elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
98 export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig:$(pwd)/.ci" 99 export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig:$(pwd)/.ci"
99 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 100 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
100else # Native Ubuntu Linux Travis builds (non-docker) 101else # Native Ubuntu Linux Travis builds (non-docker)
101 OPTS=" -Decore-imf-loaders-disabler=scim,ibus" 102 OPTS=" -Decore-imf-loaders-disabler=scim,ibus -Devas-loaders-disabler=json,webp"
102 103
103 if [ "$TRAVIS_CPU_ARCH" = "ppc64le" ]; then 104 if [ "$TRAVIS_CPU_ARCH" = "ppc64le" ]; then
104 OPTS="$OPTS -Dbindings=" 105 OPTS="$OPTS -Dbindings="