From d7ba7b18d1b48dca9ae1f31724066743c8aa27ed Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 10 Nov 2020 17:40:40 +1000 Subject: [PATCH] gitlab CI: pass MESON_ARGS down to the wayland-web job Now that we're firing the wayland website generation as trigger, we're automatically passing down the variables to the pipeline. Let's pass down something sensible, we already had one issue with our space-separated 'build dir' and let's not require more than absolutely necessary to build the docs. Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 3 +++ .gitlab-ci/ci.template | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 08e512f..15e563a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -907,6 +907,9 @@ wayland-web: except: refs: - schedules + variables: + MESON_ARGS: '-Ddebug-gui=false -Dlibwacom=false -Dtests=false' + MESON_BUILDDIR: 'builddir' only: refs: - master diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 12fe896..f7e50c9 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -714,6 +714,9 @@ wayland-web: except: refs: - schedules + variables: + MESON_ARGS: '-Ddebug-gui=false -Dlibwacom=false -Dtests=false' + MESON_BUILDDIR: 'builddir' only: refs: - master -- 2.7.4