[gjs: 5/13] CI: Add test-ci.sh SETUP command



commit 5aeee4539504609a318c713f1037e5b91d6a06b1
Author: Philip Chimento <philip endlessm com>
Date:   Wed Oct 16 16:20:53 2019 -0700

    CI: Add test-ci.sh SETUP command
    
    We'll use this command in the Meson script, so that the environment
    variables are set exactly as in the Autotools builds, and we also get
    the CI system information printed out at the beginning.

 .gitlab-ci.yml  | 3 ++-
 test/test-ci.sh | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db7d3865..93873eb2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -129,7 +129,6 @@ build_meson:
   image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs60
   variables:
     TASK_ID: "fedora-x86_64-gcc-meson-check"
-    PKG_CONFIG_PATH: /usr/local/lib/pkgconfig
     BUILD_OPTS: >-
       -Dcairo=enabled -Dreadline=enabled -Dprofiler=enabled
       -Ddtrace=true -Dsystemtap=true -Dverbose_logs=true
@@ -144,7 +143,9 @@ build_meson:
       - _build/meson-logs/*log.txt
 
   script:
+    - export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
     - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
+    - test/test-ci.sh SETUP
     - meson _build $BUILD_OPTS
     - ninja -C _build
     - xvfb-run -a meson test -C _build --verbose --no-stdsplit --print-errorlogs
diff --git a/test/test-ci.sh b/test/test-ci.sh
index add9b55a..d6a3acac 100755
--- a/test/test-ci.sh
+++ b/test/test-ci.sh
@@ -120,7 +120,12 @@ echo "Doing: $1 $extra_opts"
 
 do_Create_Artifacts_Folder "$1"
 
-if test "$1" = "GJS"; then
+if test "$1" = "SETUP"; then
+    do_Show_Info
+    do_Print_Labels 'Show GJS git information'
+    git log --pretty=format:"%h %cd %s" -1
+
+elif test "$1" = "GJS"; then
     do_Set_Env
     do_Show_Info
 


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