diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | .gitlab/ci/test-docker.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c3d8dbac..464d2aaad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,8 @@ stages: meson-fedora-x86_64: image: registry.gitlab.gnome.org/gnome/gdk-pixbuf/master:v1 stage: build + variables: + BUILD_OPTS: "-Dpng=true -Djpeg=true -Dtiff=true -Djasper=true" script: - bash -x ./.gitlab/ci/test-docker.sh artifacts: diff --git a/.gitlab/ci/test-docker.sh b/.gitlab/ci/test-docker.sh index 5c2ecd688..f99a25c8c 100755 --- a/.gitlab/ci/test-docker.sh +++ b/.gitlab/ci/test-docker.sh @@ -14,7 +14,7 @@ ccache --show-stats # Disable ccache while running Meson, to avoid cached compiler tests export CCACHE_DISABLE=true -meson ${builddir} ${srcdir} || exit $? +meson ${BUILD_OPTS} ${builddir} ${srcdir} || exit $? unset CCACHE_DISABLE cd ${builddir} |