diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2020-03-08 13:24:08 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2020-03-13 15:51:57 +0000 |
| commit | 14dba9545e1d86dddae669c54af7dc8934209b9e (patch) | |
| tree | fd9ecdb0a82d1f1635674701ecafc8d5447ecb61 /.gitlab-ci.yml | |
| parent | 603c3ba533fe7d902038e53bbacf55fdf52a3604 (diff) | |
| download | gtk+-14dba9545e1d86dddae669c54af7dc8934209b9e.tar.gz | |
ci: Build both static and shared libraries at once
There's no need to have two separate CI jobs: Meson can build both
libraries at the same time.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cef2446537..96488f2ccd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,8 +20,10 @@ fedora-distcheck: script: - bash -x ./.gitlab-ci/test-docker-autotools.sh -fedora-meson: &fedora-meson-defaults +fedora-meson: stage: build + variables: + EXTRA_MESON_FLAGS: "-Ddefault_library=both" script: - bash -x ./.gitlab-ci/test-docker-meson.sh artifacts: @@ -31,11 +33,6 @@ fedora-meson: &fedora-meson-defaults - "_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" |