[gdk-pixbuf/ebassi/gi-docgen] ci: Use the appropriate meson incantation
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdk-pixbuf/ebassi/gi-docgen] ci: Use the appropriate meson incantation
- Date: Sat, 20 Mar 2021 23:18:58 +0000 (UTC)
commit 2d70bbf16bae572a775e9b6a5f6a4aca374c6af9
Author: Emmanuele Bassi <ebassi gnome org>
Date: Sat Mar 20 23:18:26 2021 +0000
ci: Use the appropriate meson incantation
Use `meson setup` to configure the build, and `meson compile` to build.
.gitlab-ci.yml | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8a3bfca8..5f5bcad4e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,8 +23,8 @@ variables:
before_script:
- mkdir -p _ccache
script:
- - meson ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _build .
- - ninja -C _build
+ - meson setup ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _build .
+ - meson compile -C _build
- .gitlab/scripts/run-tests.sh _build
artifacts:
when: always
@@ -69,7 +69,7 @@ macos:
- export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
script:
- meson setup -Dintrospection=disabled -Dinstalled_tests=false -Dman=false -Dgtk_doc=false _build
- - meson compile -C_build
+ - meson compile -C _build
artifacts:
when: always
paths:
@@ -90,8 +90,8 @@ reference:
variables:
BUILD_OPTS: "-Dbuildtype=release -Dgtk_doc=true"
script:
- - meson ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _build .
- - ninja -C _build gdk-pixbuf-doc
+ - meson setup ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _build .
+ - meson compile -C _build
- mv _build/docs/gdk-pixbuf/ _reference/gdk-pixbuf/
- mv _build/docs/gdk-pixdata/ _reference/gdk-pixdata/
artifacts:
@@ -106,7 +106,7 @@ static-scan:
variables:
BUILD_OPTS: "--buildtype=debug"
script:
- - meson ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _scan_build
+ - meson setup ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _scan_build
- ninja -C _scan_build scan-build
artifacts:
paths:
@@ -122,8 +122,8 @@ asan-build:
needs: []
variables:
script:
- - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false
-Dintrospection=disabled _build
- - ninja -C _build
+ - CC=clang meson setup --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false
-Dintrospection=disabled _build
+ - meson compile -C _build
- .gitlab/scripts/run-tests.sh _build
artifacts:
paths:
@@ -140,8 +140,6 @@ release-dist:
- meson ${COMMON_MESON_FLAGS} ${LOADERS_FLAGS} ${BUILD_OPTS} _build .
- meson compile -C _build
- meson dist -C _build
- - ninja -C _build gdk-pixbuf-doc
- - ninja -C _build gdk-pixdata-doc
- tar -c -J -f _build/gdk-pixbuf-docs-${CI_COMMIT_TAG}.tar.xz _build/docs/gdk-pixbuf/
- tar -c -J -f _build/gdk-pixdata-docs-${CI_COMMIT_TAG}.tar.xz _build/docs/gdk-pixdata/
artifacts:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]