diff options
| author | Philip Withnall <pwithnall@gnome.org> | 2024-04-12 16:23:14 +0100 |
|---|---|---|
| committer | Philip Withnall <pwithnall@gnome.org> | 2024-04-12 16:54:53 +0100 |
| commit | 950731702d03d2f1b4b1fa2b23c4233e54f9a181 (patch) | |
| tree | 79e75e701649971662a2663a436fb05e3621b7c0 | |
| parent | 74a00cf508a24ba3b3bedeb4d4c05fd6d1211ead (diff) | |
ci: Stop passing -Dxdgmime-path to shared-mime-info
Since December, shared-mime-info has built xdgmime as a subproject, and
no longer accepts the -Dxdgmime-path option.
So, add a symlink to its checked-out subprojects directory so that it
uses the xdgmime we’re testing, and drop use of -Dxdgmime-path.
Signed-off-by: Philip Withnall <pwithnall@gnome.org>
| -rw-r--r-- | .gitlab-ci.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff59c9d..9c10e94 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,7 @@ build:meson: # Compile shared-mime-info - git clone https://gitlab.freedesktop.org/xdg/shared-mime-info.git - cd shared-mime-info - - meson setup _build -Dxdgmime-path=$PWD/../_build/ + - ln --relative --symbolic .. subprojects/xdgmime + - meson setup _build - meson compile -C _build - meson test -C _build |