[mutter/wip/3v1n0/ci-norebuilds] gitlab-ci: Define exported global variables once



commit 8d1564d91374c71066707d5f5d96a2556063a621
Author: Marco Trevisan (TreviƱo) <mail 3v1n0 net>
Date:   Thu Jan 24 00:24:32 2019 +0100

    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

 .gitlab-ci.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 249c38400..990a76163 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,11 +22,12 @@ test-mutter:
   artifacts:
     paths:
       - build
+  environment:
+    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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]