diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2021-02-09 17:20:51 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2021-02-09 17:20:51 +0000 |
| commit | 4142cda8846ac1bb9925277a6e0619df6e902509 (patch) | |
| tree | 49e12ca212ee56f7c02e2e855b7919e8f562a451 | |
| parent | 956a91644bf11696415ba48e96446e4953d9885b (diff) | |
| download | json-glib-4142cda8846ac1bb9925277a6e0619df6e902509.tar.gz | |
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`.
| -rw-r--r-- | .gitlab-ci.yml | 15 |
1 files 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: |