diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d0f9ccd47..7475b1b0ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ fedora-distcheck: script: - bash -x ./.gitlab-ci/test-docker-autotools.sh -fedora-meson: +fedora-meson: &fedora-meson-defaults stage: build script: - bash -x ./.gitlab-ci/test-docker-meson.sh @@ -31,6 +31,11 @@ fedora-meson: - "_build/meson-logs" - "_build/testsuite/reftests/output" +fedora-meson-staticlibs: + variables: + EXTRA_MESON_FLAGS: "-Ddefault_library=both" + <<: *fedora-meson-defaults + msys2-mingw32-meson: variables: MSYSTEM: "MINGW32" diff --git a/.gitlab-ci/test-docker-meson.sh b/.gitlab-ci/test-docker-meson.sh index b7ac83e091..df3ed90ef8 100755 --- a/.gitlab-ci/test-docker-meson.sh +++ b/.gitlab-ci/test-docker-meson.sh @@ -16,6 +16,7 @@ meson \ -Dbroadway_backend=true \ -Dxinerama=yes \ -Dprint_backends="file,lpr,test,cloudprint,cups" \ + ${EXTRA_MESON_FLAGS:-} \ _build cd _build