summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2022-09-12 09:44:07 +0000
committerBastien Nocera <hadess@hadess.net>2022-09-12 09:44:07 +0000
commitbdaa159697d14d10ec9ff6dfe6b104308b242395 (patch)
tree2e478b5b7af565645d4e4f98e6d2a2db6e495f91
parent2e71c29ff9c2d979bfd0cf74fcca5978bb6f1f23 (diff)
parente661cc8645fa4582c460f20f766ec136cd207bb2 (diff)
downloadgnome-online-accounts-bdaa159697d14d10ec9ff6dfe6b104308b242395.tar.gz
Merge branch 'wip/hadess/build-fix' into 'master'
build: Don't compile schemas if none are installed See merge request GNOME/gnome-online-accounts!100
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--meson.build2
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e194baa..e407454 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,7 @@ build-meson:
- meson setup -Dgtk_doc=true _build
- meson compile -C _build
- meson test -C _build
+ - meson install -C _build
build-meson-nobackend:
image: fedora:latest
@@ -27,3 +28,4 @@ build-meson-nobackend:
- meson setup -Dgtk_doc=false -Dgoabackend=false _build
- meson compile -C _build
- meson test -C _build
+ - meson install -C _build
diff --git a/meson.build b/meson.build
index 562451b..dbb2e52 100644
--- a/meson.build
+++ b/meson.build
@@ -266,7 +266,7 @@ endif
subdir('po')
gnome.post_install(
- glib_compile_schemas: true,
+ glib_compile_schemas: enable_goabackend,
gtk_update_icon_cache: true,
)