summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>2019-04-23 12:33:43 -0300
committerGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>2019-05-03 14:15:30 -0300
commit160d2d56d9ff2f205f2ddea2da8171fef668f376 (patch)
tree994497f5873518fd95812403b43da91e33672a36 /.gitlab-ci.yml
parent3468144847aaea5d3d26c945cd3815025e87ecf1 (diff)
downloadmutter-160d2d56d9ff2f205f2ddea2da8171fef668f376.tar.gz
ci: Install to Mutter and GNOME Shell to /usr
So GNOME Shell can find the pkg-config files properly. https://gitlab.gnome.org/GNOME/mutter/merge_requests/548
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d06190f4..07475af12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ check-commit-log:
build-mutter:
stage: build
script:
- - meson . build -Dbuildtype=debugoptimized -Degl_device=true -Dwayland_eglstream=true --werror
+ - meson . build -Dbuildtype=debugoptimized -Degl_device=true -Dwayland_eglstream=true --werror --prefix /usr
- ninja -C build
- ninja -C build install
artifacts:
@@ -54,7 +54,7 @@ can-build-gnome-shell:
- meson install --no-rebuild -C build
script:
- .gitlab-ci/checkout-gnome-shell.sh
- - meson gnome-shell gnome-shell/build
+ - meson gnome-shell gnome-shell/build --prefix /usr
- ninja -C gnome-shell/build install
only:
- merge_requests