diff options
| author | Philip Withnall <pwithnall@gnome.org> | 2023-12-04 14:17:39 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2024-02-01 09:15:37 +0000 |
| commit | 55353d23ec45796b689f2c482cbc048656a0ed98 (patch) | |
| tree | ca0b0793c5ba0fc222c6673c6a9d46e403550d2d /.gitlab-ci.yml | |
| parent | 58389952ca8d6b0011728b11ca392541cda691bf (diff) | |
build: Move xdgmime to a meson subproject
This means:
- It’s always available, so the tests no longer have to be optional
- It gets bundled in release tarballs so the above is always true
- The `meson setup` and `meson build` commands will automatically
update it if needed
- It gets built using meson, rather than autotools, so the old
GNU make build system in xdgmime can be dropped (see
https://gitlab.freedesktop.org/xdg/xdgmime/-/issues/36)
- The `xdgmime-path` meson option is no longer needed and has been
dropped
Signed-off-by: Philip Withnall <pwithnall@gnome.org>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 05b8cb8..b1aa762 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,7 +70,7 @@ variables: FDO_DISTRIBUTION_TAG: "2022-08-15.0" BUILD_OS: fedora FDO_DISTRIBUTION_VERSION: 38 - FDO_DISTRIBUTION_PACKAGES: "gcc gcc-c++ glibc-devel make libxml2-devel glib2-devel gettext git xmlto findutils gettext-devel meson" + FDO_DISTRIBUTION_PACKAGES: "gcc gcc-c++ glibc-devel libxml2-devel glib2-devel gettext git xmlto findutils gettext-devel meson" .fedora-x86_64: extends: @@ -100,9 +100,6 @@ fedora-x86_64-container_prep: .do-build: stage: "Build and test" script: - # Compile xdgmime - - make -C xdgmime - # Compile and test shared-mime-info - meson setup _build - meson compile -C _build |