diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2019-01-24 00:24:32 +0100 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2019-01-30 19:16:46 +0100 |
| commit | f63b69bb238eddb17623107df44ddac729e13f76 (patch) | |
| tree | 366e780a63a6fafc5c4dceb098c9b945875e3edf /.gitlab-ci.yml | |
| parent | a54f9e835cd42e196a6eb64bfff41ef7fa44a915 (diff) | |
| download | mutter-f63b69bb238eddb17623107df44ddac729e13f76.tar.gz | |
gitlab-ci: Define exported global variables once
Don't redefine XDG runtime and gsettings schema paths multiple times, just
export the variables once and reuse them.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/408
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 249c38400..cdc5e4878 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,11 +22,12 @@ test-mutter: artifacts: paths: - build + variables: + XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir" + GSETTINGS_SCHEMA_DIR: "$CI_PROJECT_DIR/build/data" script: - - glib-compile-schemas $PWD/build/data - - mkdir -m 700 $PWD/runtime-dir + - mkdir -m 700 $XDG_RUNTIME_DIR + - glib-compile-schemas $GSETTINGS_SCHEMA_DIR - > - env XDG_RUNTIME_DIR=$PWD/runtime-dir - GSETTINGS_SCHEMA_DIR=$PWD/build/data dbus-run-session -- xvfb-run -s '+iglx -noreset' meson test -C build --no-rebuild -t 10 --verbose --no-stdsplit --wrap catchsegv |