[json-glib] ci: Use Meson sub-commands
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [json-glib] ci: Use Meson sub-commands
- Date: Tue, 9 Feb 2021 17:22:25 +0000 (UTC)
commit 4142cda8846ac1bb9925277a6e0619df6e902509
Author: Emmanuele Bassi <ebassi gnome org>
Date: Tue Feb 9 17:20:51 2021 +0000
ci: Use Meson sub-commands
Instead of using `ninja` directly, and entering the build directory, we
can use `meson compile`, `meson test`, and `meson dist`.
.gitlab-ci.yml | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 22fd4c1..7928765 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,10 +9,9 @@ before_script:
build-json-glib:
stage: build
script:
- - meson --prefix /usr -Dman=true _build .
- - cd _build
- - ninja
- - meson test
+ - meson setup --prefix /usr -Dman=true _build .
+ - meson compile -C _build
+ - meson test -C _build
except:
- tags
artifacts:
@@ -26,10 +25,10 @@ dist-json-glib:
only:
- tags
script:
- - meson --prefix /usr --buildtype release -Dman=true -Ddocs=true _build .
- - cd _build
- - ninja dist
- - ninja json-glib-doc
+ - meson setup --prefix /usr --buildtype release -Dman=true -Dgtk_doc=enabled_build .
+ - meson compile -C _build
+ - meson dist -C _build
+ - ninja -C _build json-glib-doc
- tar -c -f "json-glib-docs-${CI_COMMIT_TAG}.tar.xz" -C docs html
artifacts:
paths:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]