diff options
| author | Philip Withnall <pwithnall@gnome.org> | 2023-12-04 12:50:11 +0000 |
|---|---|---|
| committer | Philip Withnall <pwithnall@gnome.org> | 2023-12-04 13:12:21 +0000 |
| commit | d6d5987bb5daceb017ea65ccac4d769fc47951fe (patch) | |
| tree | e195c2fd73a2af3a425d6f7cc70ed414d9370da7 | |
| parent | a806522cabd729c45dc4e7b691e09856f77970dc (diff) | |
ci: Use modern meson subcommands to setup and compile
Signed-off-by: Philip Withnall <pwithnall@gnome.org>
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b538a94..45aaa49 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,19 +25,21 @@ build:autotools: # Compile shared-mime-info - git clone https://gitlab.freedesktop.org/xdg/shared-mime-info.git - cd shared-mime-info - - meson _build -Dxdgmime-path=$PWD/../ - - ninja -C _build test + - meson setup _build -Dxdgmime-path=$PWD/../ + - meson compile -C _build + - meson test -C _build build:meson: before_script: - dnf5 update -y --nogpgcheck - dnf5 install -y --nogpgcheck $DEPENDENCIES script: - - meson _build - - ninja -C _build + - meson setup _build + - meson compile -C _build # Compile shared-mime-info - git clone https://gitlab.freedesktop.org/xdg/shared-mime-info.git - cd shared-mime-info - - meson _build -Dxdgmime-path=$PWD/../_build/ - - ninja -C _build test + - meson setup _build -Dxdgmime-path=$PWD/../_build/ + - meson compile -C _build + - meson test -C _build |